mirror of
https://gcc.gnu.org/git/gcc.git
synced 2024-11-27 13:54:19 +08:00
Rename 'libgomp.oacc-c-c++-common/static-dynamic-lifetimes-*' to 'libgomp.oacc-c-c++-common/structured-dynamic-lifetimes-*' [PR92843]
Fix-up for commit be9862dd96
"Test cases for
mixed structured/dynamic data lifetimes with OpenACC [PR92843]": it's
"structured", not "static" data lifetimes/reference counters.
libgomp/
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.
This commit is contained in:
parent
bf4b130127
commit
af4c92573d
@ -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>
|
2020-04-10 Julian Brown <julian@codesourcery.com>
|
||||||
Thomas Schwinge <thomas@codesourcery.com>
|
Thomas Schwinge <thomas@codesourcery.com>
|
||||||
|
|
||||||
|
@ -1,3 +0,0 @@
|
|||||||
/* { dg-skip-if "" { *-*-* } { "-DACC_MEM_SHARED=1" } } */
|
|
||||||
/* { dg-additional-options "-DOPENACC_API" } */
|
|
||||||
#include "static-dynamic-lifetimes-5.c"
|
|
@ -1,3 +0,0 @@
|
|||||||
/* { dg-skip-if "" { *-*-* } { "-DACC_MEM_SHARED=1" } } */
|
|
||||||
/* { dg-additional-options "-DOPENACC_API" } */
|
|
||||||
#include "static-dynamic-lifetimes-6.c"
|
|
@ -1,3 +0,0 @@
|
|||||||
/* { dg-skip-if "" { *-*-* } { "-DACC_MEM_SHARED=1" } } */
|
|
||||||
/* { dg-additional-options "-DOPENACC_API" } */
|
|
||||||
#include "static-dynamic-lifetimes-7.c"
|
|
@ -1,3 +0,0 @@
|
|||||||
/* { dg-skip-if "" { *-*-* } { "-DACC_MEM_SHARED=1" } } */
|
|
||||||
/* { dg-additional-options "-DOPENACC_API" } */
|
|
||||||
#include "static-dynamic-lifetimes-8.c"
|
|
@ -1,3 +1,3 @@
|
|||||||
/* { dg-skip-if "" { *-*-* } { "-DACC_MEM_SHARED=1" } } */
|
/* { dg-skip-if "" { *-*-* } { "-DACC_MEM_SHARED=1" } } */
|
||||||
/* { dg-additional-options "-DOPENACC_API" } */
|
/* { dg-additional-options "-DOPENACC_API" } */
|
||||||
#include "static-dynamic-lifetimes-1.c"
|
#include "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" } } */
|
/* { dg-skip-if "" { *-*-* } { "-DACC_MEM_SHARED=1" } } */
|
||||||
|
|
||||||
@ -69,7 +69,8 @@ f2 (void)
|
|||||||
#else
|
#else
|
||||||
#pragma acc exit data copyout(block1[0:SIZE])
|
#pragma acc exit data copyout(block1[0:SIZE])
|
||||||
#endif
|
#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));
|
assert (acc_is_present (block1, SIZE));
|
||||||
}
|
}
|
||||||
|
|
@ -1,3 +1,3 @@
|
|||||||
/* { dg-skip-if "" { *-*-* } { "-DACC_MEM_SHARED=1" } } */
|
/* { dg-skip-if "" { *-*-* } { "-DACC_MEM_SHARED=1" } } */
|
||||||
/* { dg-additional-options "-DOPENACC_API" } */
|
/* { dg-additional-options "-DOPENACC_API" } */
|
||||||
#include "static-dynamic-lifetimes-3.c"
|
#include "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" } } */
|
/* { dg-skip-if "" { *-*-* } { "-DACC_MEM_SHARED=1" } } */
|
||||||
|
|
@ -1,3 +1,3 @@
|
|||||||
/* { dg-skip-if "" { *-*-* } { "-DACC_MEM_SHARED=1" } } */
|
/* { dg-skip-if "" { *-*-* } { "-DACC_MEM_SHARED=1" } } */
|
||||||
/* { dg-additional-options "-DOPENACC_API" } */
|
/* { dg-additional-options "-DOPENACC_API" } */
|
||||||
#include "static-dynamic-lifetimes-2.c"
|
#include "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). */
|
regions). */
|
||||||
|
|
||||||
/* { dg-skip-if "" { *-*-* } { "-DACC_MEM_SHARED=1" } } */
|
/* { dg-skip-if "" { *-*-* } { "-DACC_MEM_SHARED=1" } } */
|
@ -1,3 +1,3 @@
|
|||||||
/* { dg-skip-if "" { *-*-* } { "-DACC_MEM_SHARED=1" } } */
|
/* { dg-skip-if "" { *-*-* } { "-DACC_MEM_SHARED=1" } } */
|
||||||
/* { dg-additional-options "-DOPENACC_API" } */
|
/* { dg-additional-options "-DOPENACC_API" } */
|
||||||
#include "static-dynamic-lifetimes-4.c"
|
#include "structured-dynamic-lifetimes-4.c"
|
@ -0,0 +1,3 @@
|
|||||||
|
/* { dg-skip-if "" { *-*-* } { "-DACC_MEM_SHARED=1" } } */
|
||||||
|
/* { dg-additional-options "-DOPENACC_API" } */
|
||||||
|
#include "structured-dynamic-lifetimes-5.c"
|
@ -0,0 +1,3 @@
|
|||||||
|
/* { dg-skip-if "" { *-*-* } { "-DACC_MEM_SHARED=1" } } */
|
||||||
|
/* { dg-additional-options "-DOPENACC_API" } */
|
||||||
|
#include "structured-dynamic-lifetimes-6.c"
|
@ -27,7 +27,8 @@ main (int argc, char *argv[])
|
|||||||
#else
|
#else
|
||||||
#pragma acc exit data copyout(block1[0:SIZE], block2[0:SIZE])
|
#pragma acc exit data copyout(block1[0:SIZE], block2[0:SIZE])
|
||||||
#endif
|
#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 (block1, SIZE));
|
||||||
assert (acc_is_present (block2, SIZE));
|
assert (acc_is_present (block2, SIZE));
|
||||||
}
|
}
|
@ -0,0 +1,3 @@
|
|||||||
|
/* { dg-skip-if "" { *-*-* } { "-DACC_MEM_SHARED=1" } } */
|
||||||
|
/* { dg-additional-options "-DOPENACC_API" } */
|
||||||
|
#include "structured-dynamic-lifetimes-7.c"
|
@ -21,13 +21,15 @@ main (int argc, char *argv[])
|
|||||||
#pragma acc data copy(block1[0:SIZE], block2[0:SIZE])
|
#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
|
/* 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
|
#ifdef OPENACC_API
|
||||||
acc_copyout (block1, SIZE);
|
acc_copyout (block1, SIZE);
|
||||||
#else
|
#else
|
||||||
#pragma acc exit data copyout(block1[0:SIZE])
|
#pragma acc exit data copyout(block1[0:SIZE])
|
||||||
#endif
|
#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 (block1, SIZE));
|
||||||
assert (acc_is_present (block2, SIZE));
|
assert (acc_is_present (block2, SIZE));
|
||||||
}
|
}
|
@ -0,0 +1,3 @@
|
|||||||
|
/* { dg-skip-if "" { *-*-* } { "-DACC_MEM_SHARED=1" } } */
|
||||||
|
/* { dg-additional-options "-DOPENACC_API" } */
|
||||||
|
#include "structured-dynamic-lifetimes-8.c"
|
Loading…
Reference in New Issue
Block a user