diff options
21 files changed, 95 insertions, 23 deletions
diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog index b0f1984..8f351f6 100644 --- a/libgomp/ChangeLog +++ b/libgomp/ChangeLog @@ -1,3 +1,71 @@ +2020-04-13 Thomas Schwinge <thomas@codesourcery.com> + + PR libgomp/92843 + * testsuite/libgomp.oacc-c-c++-common/static-dynamic-lifetimes-1-lib.c: + Rename to... + * testsuite/libgomp.oacc-c-c++-common/structured-dynamic-lifetimes-1-lib.c: + ... this. + * testsuite/libgomp.oacc-c-c++-common/static-dynamic-lifetimes-1.c: + Rename to... + * testsuite/libgomp.oacc-c-c++-common/structured-dynamic-lifetimes-1.c: + ... this. + * testsuite/libgomp.oacc-c-c++-common/static-dynamic-lifetimes-2-lib.c: + Rename to... + * testsuite/libgomp.oacc-c-c++-common/structured-dynamic-lifetimes-2-lib.c: + ... this. + * testsuite/libgomp.oacc-c-c++-common/static-dynamic-lifetimes-2.c: + Rename to... + * testsuite/libgomp.oacc-c-c++-common/structured-dynamic-lifetimes-2.c: + ... this. + * testsuite/libgomp.oacc-c-c++-common/static-dynamic-lifetimes-3-lib.c: + Rename to... + * testsuite/libgomp.oacc-c-c++-common/structured-dynamic-lifetimes-3-lib.c: + ... this. + * testsuite/libgomp.oacc-c-c++-common/static-dynamic-lifetimes-3.c: + Rename to... + * testsuite/libgomp.oacc-c-c++-common/structured-dynamic-lifetimes-3.c: + ... this. + * testsuite/libgomp.oacc-c-c++-common/static-dynamic-lifetimes-4-lib.c: + Rename to... + * testsuite/libgomp.oacc-c-c++-common/structured-dynamic-lifetimes-4-lib.c: + ... this. + * testsuite/libgomp.oacc-c-c++-common/static-dynamic-lifetimes-4.c: + Rename to... + * testsuite/libgomp.oacc-c-c++-common/structured-dynamic-lifetimes-4.c: + ... this. + * testsuite/libgomp.oacc-c-c++-common/static-dynamic-lifetimes-5-lib.c: + Rename to... + * testsuite/libgomp.oacc-c-c++-common/structured-dynamic-lifetimes-5-lib.c: + ... this. + * testsuite/libgomp.oacc-c-c++-common/static-dynamic-lifetimes-5.c: + Rename to... + * testsuite/libgomp.oacc-c-c++-common/structured-dynamic-lifetimes-5.c: + ... this. + * testsuite/libgomp.oacc-c-c++-common/static-dynamic-lifetimes-6-lib.c: + Rename to... + * testsuite/libgomp.oacc-c-c++-common/structured-dynamic-lifetimes-6-lib.c: + ... this. + * testsuite/libgomp.oacc-c-c++-common/static-dynamic-lifetimes-6.c: + Rename to... + * testsuite/libgomp.oacc-c-c++-common/structured-dynamic-lifetimes-6.c: + ... this. + * testsuite/libgomp.oacc-c-c++-common/static-dynamic-lifetimes-7-lib.c: + Rename to... + * testsuite/libgomp.oacc-c-c++-common/structured-dynamic-lifetimes-7-lib.c: + ... this. + * testsuite/libgomp.oacc-c-c++-common/static-dynamic-lifetimes-7.c: + Rename to... + * testsuite/libgomp.oacc-c-c++-common/structured-dynamic-lifetimes-7.c: + ... this. + * testsuite/libgomp.oacc-c-c++-common/static-dynamic-lifetimes-8-lib.c: + Rename to... + * testsuite/libgomp.oacc-c-c++-common/structured-dynamic-lifetimes-8-lib.c: + ... this. + * testsuite/libgomp.oacc-c-c++-common/static-dynamic-lifetimes-8.c:: + Rename to... + * testsuite/libgomp.oacc-c-c++-common/structured-dynamic-lifetimes-8.c: + ... this. + 2020-04-10 Julian Brown <julian@codesourcery.com> Thomas Schwinge <thomas@codesourcery.com> diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/static-dynamic-lifetimes-5-lib.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/static-dynamic-lifetimes-5-lib.c deleted file mode 100644 index 7770312..0000000 --- a/libgomp/testsuite/libgomp.oacc-c-c++-common/static-dynamic-lifetimes-5-lib.c +++ /dev/null @@ -1,3 +0,0 @@ -/* { dg-skip-if "" { *-*-* } { "-DACC_MEM_SHARED=1" } } */ -/* { dg-additional-options "-DOPENACC_API" } */ -#include "static-dynamic-lifetimes-5.c" diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/static-dynamic-lifetimes-6-lib.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/static-dynamic-lifetimes-6-lib.c deleted file mode 100644 index 4a87dd7..0000000 --- a/libgomp/testsuite/libgomp.oacc-c-c++-common/static-dynamic-lifetimes-6-lib.c +++ /dev/null @@ -1,3 +0,0 @@ -/* { dg-skip-if "" { *-*-* } { "-DACC_MEM_SHARED=1" } } */ -/* { dg-additional-options "-DOPENACC_API" } */ -#include "static-dynamic-lifetimes-6.c" diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/static-dynamic-lifetimes-7-lib.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/static-dynamic-lifetimes-7-lib.c deleted file mode 100644 index 8ccbb12..0000000 --- a/libgomp/testsuite/libgomp.oacc-c-c++-common/static-dynamic-lifetimes-7-lib.c +++ /dev/null @@ -1,3 +0,0 @@ -/* { dg-skip-if "" { *-*-* } { "-DACC_MEM_SHARED=1" } } */ -/* { dg-additional-options "-DOPENACC_API" } */ -#include "static-dynamic-lifetimes-7.c" diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/static-dynamic-lifetimes-8-lib.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/static-dynamic-lifetimes-8-lib.c deleted file mode 100644 index f3104cb..0000000 --- a/libgomp/testsuite/libgomp.oacc-c-c++-common/static-dynamic-lifetimes-8-lib.c +++ /dev/null @@ -1,3 +0,0 @@ -/* { dg-skip-if "" { *-*-* } { "-DACC_MEM_SHARED=1" } } */ -/* { dg-additional-options "-DOPENACC_API" } */ -#include "static-dynamic-lifetimes-8.c" diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/static-dynamic-lifetimes-1-lib.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/structured-dynamic-lifetimes-1-lib.c index 23c20d4..8fa87777 100644 --- a/libgomp/testsuite/libgomp.oacc-c-c++-common/static-dynamic-lifetimes-1-lib.c +++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/structured-dynamic-lifetimes-1-lib.c @@ -1,3 +1,3 @@ /* { dg-skip-if "" { *-*-* } { "-DACC_MEM_SHARED=1" } } */ /* { dg-additional-options "-DOPENACC_API" } */ -#include "static-dynamic-lifetimes-1.c" +#include "structured-dynamic-lifetimes-1.c" diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/static-dynamic-lifetimes-1.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/structured-dynamic-lifetimes-1.c index a743660..0d6b415 100644 --- a/libgomp/testsuite/libgomp.oacc-c-c++-common/static-dynamic-lifetimes-1.c +++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/structured-dynamic-lifetimes-1.c @@ -1,4 +1,4 @@ -/* Test transitioning of data lifetimes between static and dynamic. */ +/* Test transitioning of data lifetimes between structured and dynamic. */ /* { dg-skip-if "" { *-*-* } { "-DACC_MEM_SHARED=1" } } */ @@ -69,7 +69,8 @@ f2 (void) #else #pragma acc exit data copyout(block1[0:SIZE]) #endif - /* This should stay present until the end of the static data lifetime. */ + /* This should stay present until the end of the structured data + lifetime. */ assert (acc_is_present (block1, SIZE)); } diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/static-dynamic-lifetimes-3-lib.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/structured-dynamic-lifetimes-2-lib.c index d9e76c6..365df8d 100644 --- a/libgomp/testsuite/libgomp.oacc-c-c++-common/static-dynamic-lifetimes-3-lib.c +++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/structured-dynamic-lifetimes-2-lib.c @@ -1,3 +1,3 @@ /* { dg-skip-if "" { *-*-* } { "-DACC_MEM_SHARED=1" } } */ /* { dg-additional-options "-DOPENACC_API" } */ -#include "static-dynamic-lifetimes-3.c" +#include "structured-dynamic-lifetimes-2.c" diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/static-dynamic-lifetimes-2.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/structured-dynamic-lifetimes-2.c index d3c6f51..726942c 100644 --- a/libgomp/testsuite/libgomp.oacc-c-c++-common/static-dynamic-lifetimes-2.c +++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/structured-dynamic-lifetimes-2.c @@ -1,4 +1,4 @@ -/* Test nested dynamic/static data mappings. */ +/* Test nested dynamic/structured data mappings. */ /* { dg-skip-if "" { *-*-* } { "-DACC_MEM_SHARED=1" } } */ diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/static-dynamic-lifetimes-2-lib.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/structured-dynamic-lifetimes-3-lib.c index 84f41a4..469b35b 100644 --- a/libgomp/testsuite/libgomp.oacc-c-c++-common/static-dynamic-lifetimes-2-lib.c +++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/structured-dynamic-lifetimes-3-lib.c @@ -1,3 +1,3 @@ /* { dg-skip-if "" { *-*-* } { "-DACC_MEM_SHARED=1" } } */ /* { dg-additional-options "-DOPENACC_API" } */ -#include "static-dynamic-lifetimes-2.c" +#include "structured-dynamic-lifetimes-3.c" diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/static-dynamic-lifetimes-3.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/structured-dynamic-lifetimes-3.c index 5950186..c13f3c5 100644 --- a/libgomp/testsuite/libgomp.oacc-c-c++-common/static-dynamic-lifetimes-3.c +++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/structured-dynamic-lifetimes-3.c @@ -1,4 +1,4 @@ -/* Test nested dynamic/static data mappings (multiple blocks on data +/* Test nested dynamic/structured data mappings (multiple blocks on data regions). */ /* { dg-skip-if "" { *-*-* } { "-DACC_MEM_SHARED=1" } } */ diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/static-dynamic-lifetimes-4-lib.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/structured-dynamic-lifetimes-4-lib.c index e3c1bfb..8e88b97 100644 --- a/libgomp/testsuite/libgomp.oacc-c-c++-common/static-dynamic-lifetimes-4-lib.c +++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/structured-dynamic-lifetimes-4-lib.c @@ -1,3 +1,3 @@ /* { dg-skip-if "" { *-*-* } { "-DACC_MEM_SHARED=1" } } */ /* { dg-additional-options "-DOPENACC_API" } */ -#include "static-dynamic-lifetimes-4.c" +#include "structured-dynamic-lifetimes-4.c" diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/static-dynamic-lifetimes-4.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/structured-dynamic-lifetimes-4.c index e9a6510..e9a6510 100644 --- a/libgomp/testsuite/libgomp.oacc-c-c++-common/static-dynamic-lifetimes-4.c +++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/structured-dynamic-lifetimes-4.c diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/structured-dynamic-lifetimes-5-lib.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/structured-dynamic-lifetimes-5-lib.c new file mode 100644 index 0000000..59ef562 --- /dev/null +++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/structured-dynamic-lifetimes-5-lib.c @@ -0,0 +1,3 @@ +/* { dg-skip-if "" { *-*-* } { "-DACC_MEM_SHARED=1" } } */ +/* { dg-additional-options "-DOPENACC_API" } */ +#include "structured-dynamic-lifetimes-5.c" diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/static-dynamic-lifetimes-5.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/structured-dynamic-lifetimes-5.c index 9807076..9807076 100644 --- a/libgomp/testsuite/libgomp.oacc-c-c++-common/static-dynamic-lifetimes-5.c +++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/structured-dynamic-lifetimes-5.c diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/structured-dynamic-lifetimes-6-lib.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/structured-dynamic-lifetimes-6-lib.c new file mode 100644 index 0000000..0401f73 --- /dev/null +++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/structured-dynamic-lifetimes-6-lib.c @@ -0,0 +1,3 @@ +/* { dg-skip-if "" { *-*-* } { "-DACC_MEM_SHARED=1" } } */ +/* { dg-additional-options "-DOPENACC_API" } */ +#include "structured-dynamic-lifetimes-6.c" diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/static-dynamic-lifetimes-6.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/structured-dynamic-lifetimes-6.c index 3e5c4d7..9250b4a 100644 --- a/libgomp/testsuite/libgomp.oacc-c-c++-common/static-dynamic-lifetimes-6.c +++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/structured-dynamic-lifetimes-6.c @@ -27,7 +27,8 @@ main (int argc, char *argv[]) #else #pragma acc exit data copyout(block1[0:SIZE], block2[0:SIZE]) #endif - /* These should stay present until the end of the static data lifetime. */ + /* These should stay present until the end of the structured data + lifetime. */ assert (acc_is_present (block1, SIZE)); assert (acc_is_present (block2, SIZE)); } diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/structured-dynamic-lifetimes-7-lib.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/structured-dynamic-lifetimes-7-lib.c new file mode 100644 index 0000000..07caefb --- /dev/null +++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/structured-dynamic-lifetimes-7-lib.c @@ -0,0 +1,3 @@ +/* { dg-skip-if "" { *-*-* } { "-DACC_MEM_SHARED=1" } } */ +/* { dg-additional-options "-DOPENACC_API" } */ +#include "structured-dynamic-lifetimes-7.c" diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/static-dynamic-lifetimes-7.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/structured-dynamic-lifetimes-7.c index 2735d6f..52e8d4c 100644 --- a/libgomp/testsuite/libgomp.oacc-c-c++-common/static-dynamic-lifetimes-7.c +++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/structured-dynamic-lifetimes-7.c @@ -21,13 +21,15 @@ main (int argc, char *argv[]) #pragma acc data copy(block1[0:SIZE], block2[0:SIZE]) { /* We can't attach the dynamic data mapping's (block1) target_mem_desc to the - enclosing static data region here, because that region maps block2 also. */ + enclosing structured data region here, because that region maps block2 + also. */ #ifdef OPENACC_API acc_copyout (block1, SIZE); #else #pragma acc exit data copyout(block1[0:SIZE]) #endif - /* These should stay present until the end of the static data lifetime. */ + /* These should stay present until the end of the structured data + lifetime. */ assert (acc_is_present (block1, SIZE)); assert (acc_is_present (block2, SIZE)); } diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/structured-dynamic-lifetimes-8-lib.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/structured-dynamic-lifetimes-8-lib.c new file mode 100644 index 0000000..1c2479a --- /dev/null +++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/structured-dynamic-lifetimes-8-lib.c @@ -0,0 +1,3 @@ +/* { dg-skip-if "" { *-*-* } { "-DACC_MEM_SHARED=1" } } */ +/* { dg-additional-options "-DOPENACC_API" } */ +#include "structured-dynamic-lifetimes-8.c" diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/static-dynamic-lifetimes-8.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/structured-dynamic-lifetimes-8.c index 919ee02..919ee02 100644 --- a/libgomp/testsuite/libgomp.oacc-c-c++-common/static-dynamic-lifetimes-8.c +++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/structured-dynamic-lifetimes-8.c |