OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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:
Thomas Schwinge 2020-04-13 08:56:03 +02:00
parent bf4b130127
commit af4c92573d
21 changed files with 95 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
libgomp/ChangeLog
View File

@ -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>

3
libgomp/testsuite/libgomp.oacc-c-c++-common/static-dynamic-lifetimes-5-lib.c
View File

@ -1,3 +0,0 @@
/* { dg-skip-if "" { *-*-* } { "-DACC_MEM_SHARED=1" } } */
/* { dg-additional-options "-DOPENACC_API" } */
#include "static-dynamic-lifetimes-5.c"

3
libgomp/testsuite/libgomp.oacc-c-c++-common/static-dynamic-lifetimes-6-lib.c
View File

@ -1,3 +0,0 @@
/* { dg-skip-if "" { *-*-* } { "-DACC_MEM_SHARED=1" } } */
/* { dg-additional-options "-DOPENACC_API" } */
#include "static-dynamic-lifetimes-6.c"

3
libgomp/testsuite/libgomp.oacc-c-c++-common/static-dynamic-lifetimes-7-lib.c
View File

@ -1,3 +0,0 @@
/* { dg-skip-if "" { *-*-* } { "-DACC_MEM_SHARED=1" } } */
/* { dg-additional-options "-DOPENACC_API" } */
#include "static-dynamic-lifetimes-7.c"

3
libgomp/testsuite/libgomp.oacc-c-c++-common/static-dynamic-lifetimes-8-lib.c
View File

@ -1,3 +0,0 @@
/* { dg-skip-if "" { *-*-* } { "-DACC_MEM_SHARED=1" } } */
/* { dg-additional-options "-DOPENACC_API" } */
#include "static-dynamic-lifetimes-8.c"

2
libgomp/testsuite/libgomp.oacc-c-c++-common/static-dynamic-lifetimes-1-lib.c → libgomp/testsuite/libgomp.oacc-c-c++-common/structured-dynamic-lifetimes-1-lib.c
View File

@ -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"

5
libgomp/testsuite/libgomp.oacc-c-c++-common/static-dynamic-lifetimes-1.c → libgomp/testsuite/libgomp.oacc-c-c++-common/structured-dynamic-lifetimes-1.c
View File

@ -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));
}

2
libgomp/testsuite/libgomp.oacc-c-c++-common/static-dynamic-lifetimes-3-lib.c → libgomp/testsuite/libgomp.oacc-c-c++-common/structured-dynamic-lifetimes-2-lib.c
View File

@ -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"

2
libgomp/testsuite/libgomp.oacc-c-c++-common/static-dynamic-lifetimes-2.c → libgomp/testsuite/libgomp.oacc-c-c++-common/structured-dynamic-lifetimes-2.c
View File

@ -1,4 +1,4 @@
/* Test nested dynamic/static data mappings. */
/* Test nested dynamic/structured data mappings. */
/* { dg-skip-if "" { *-*-* } { "-DACC_MEM_SHARED=1" } } */

2
libgomp/testsuite/libgomp.oacc-c-c++-common/static-dynamic-lifetimes-2-lib.c → libgomp/testsuite/libgomp.oacc-c-c++-common/structured-dynamic-lifetimes-3-lib.c
View File

@ -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"

2
libgomp/testsuite/libgomp.oacc-c-c++-common/static-dynamic-lifetimes-3.c → libgomp/testsuite/libgomp.oacc-c-c++-common/structured-dynamic-lifetimes-3.c
View File

@ -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" } } */

2
libgomp/testsuite/libgomp.oacc-c-c++-common/static-dynamic-lifetimes-4-lib.c → libgomp/testsuite/libgomp.oacc-c-c++-common/structured-dynamic-lifetimes-4-lib.c
View File

@ -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"

0
libgomp/testsuite/libgomp.oacc-c-c++-common/static-dynamic-lifetimes-4.c → libgomp/testsuite/libgomp.oacc-c-c++-common/structured-dynamic-lifetimes-4.c
View File

3
libgomp/testsuite/libgomp.oacc-c-c++-common/structured-dynamic-lifetimes-5-lib.c Normal file
View File

@ -0,0 +1,3 @@
/* { dg-skip-if "" { *-*-* } { "-DACC_MEM_SHARED=1" } } */
/* { dg-additional-options "-DOPENACC_API" } */
#include "structured-dynamic-lifetimes-5.c"

0
libgomp/testsuite/libgomp.oacc-c-c++-common/static-dynamic-lifetimes-5.c → libgomp/testsuite/libgomp.oacc-c-c++-common/structured-dynamic-lifetimes-5.c
View File

3
libgomp/testsuite/libgomp.oacc-c-c++-common/structured-dynamic-lifetimes-6-lib.c Normal file
View File

@ -0,0 +1,3 @@
/* { dg-skip-if "" { *-*-* } { "-DACC_MEM_SHARED=1" } } */
/* { dg-additional-options "-DOPENACC_API" } */
#include "structured-dynamic-lifetimes-6.c"

3
libgomp/testsuite/libgomp.oacc-c-c++-common/static-dynamic-lifetimes-6.c → libgomp/testsuite/libgomp.oacc-c-c++-common/structured-dynamic-lifetimes-6.c
View File

@ -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));
}

3
libgomp/testsuite/libgomp.oacc-c-c++-common/structured-dynamic-lifetimes-7-lib.c Normal file
View File

@ -0,0 +1,3 @@
/* { dg-skip-if "" { *-*-* } { "-DACC_MEM_SHARED=1" } } */
/* { dg-additional-options "-DOPENACC_API" } */
#include "structured-dynamic-lifetimes-7.c"

6
libgomp/testsuite/libgomp.oacc-c-c++-common/static-dynamic-lifetimes-7.c → libgomp/testsuite/libgomp.oacc-c-c++-common/structured-dynamic-lifetimes-7.c
View File

@ -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));
}

3
libgomp/testsuite/libgomp.oacc-c-c++-common/structured-dynamic-lifetimes-8-lib.c Normal file
View File

@ -0,0 +1,3 @@
/* { dg-skip-if "" { *-*-* } { "-DACC_MEM_SHARED=1" } } */
/* { dg-additional-options "-DOPENACC_API" } */
#include "structured-dynamic-lifetimes-8.c"

0
libgomp/testsuite/libgomp.oacc-c-c++-common/static-dynamic-lifetimes-8.c → libgomp/testsuite/libgomp.oacc-c-c++-common/structured-dynamic-lifetimes-8.c
View File