OpenMP: Constructors and destructors for "declare target" static aggregates: Fix...

(Most of) the tests added in commit f1bfba3a9b3f31e3e06bfd1911c9f223869ea03f
"OpenMP: Constructors and destructors for "declare target" static aggregates"
had a mismatch between dump file production and its scanning; the former needs
to use 'offload_target_nvptx' (like 'offload_target_amdgcn'), not
'offload_device_nvptx'.

	libgomp/
	* testsuite/libgomp.c++/static-aggr-constructor-destructor-1.C:
	Fix effective-target keyword.
	* testsuite/libgomp.c++/static-aggr-constructor-destructor-2.C:
	Likewise.
	* testsuite/libgomp.c-c++-common/target-is-initial-host-2.c:
	Likewise.
	* testsuite/libgomp.c-c++-common/target-is-initial-host.c:
	Likewise.
	* testsuite/libgomp.fortran/target-is-initial-host-2.f90:
	Likewise.
	* testsuite/libgomp.fortran/target-is-initial-host.f: Likewise.
	* testsuite/libgomp.fortran/target-is-initial-host.f90: Likewise.

diff --git a/libgomp/testsuite/libgomp.c++/static-aggr-constructor-destructor-1.C b/libgomp/testsuite/libgomp.c++/static-aggr-constructor-destructor-1.C
index b5aafc8cabc2f0ed3fba147aeab89839b71df9e9..a704e39411dabec78373e4ea343927d4422fe4c7 100644 (file)
--- a/libgomp/testsuite/libgomp.c++/static-aggr-constructor-destructor-1.C
+++ b/libgomp/testsuite/libgomp.c++/static-aggr-constructor-destructor-1.C
@@ -1,6 +1,6 @@
 // { dg-do run }
 // { dg-additional-options "-fdump-tree-gimple -fdump-tree-optimized" }
-// { dg-additional-options -foffload-options=-fdump-tree-optimized { target { offload_device_nvptx || offload_target_amdgcn } } }
+// { dg-additional-options -foffload-options=-fdump-tree-optimized { target { offload_target_nvptx || offload_target_amdgcn } } }
 
 // { dg-final { scan-tree-dump-times "omp_is_initial_device" 1 "gimple" } }
 // { dg-final { scan-tree-dump-times "_GLOBAL__off_I_v1" 1 "gimple" } }

diff --git a/libgomp/testsuite/libgomp.c++/static-aggr-constructor-destructor-2.C b/libgomp/testsuite/libgomp.c++/static-aggr-constructor-destructor-2.C
index 9652a721bbe273ffabc9c226a56402a98f858452..de481aadd34eb15ee583b394b327460872842d33 100644 (file)
--- a/libgomp/testsuite/libgomp.c++/static-aggr-constructor-destructor-2.C
+++ b/libgomp/testsuite/libgomp.c++/static-aggr-constructor-destructor-2.C
@@ -1,6 +1,6 @@
 // { dg-do run }
 // { dg-additional-options "-fdump-tree-gimple -fdump-tree-optimized" }
-// { dg-additional-options -foffload-options=-fdump-tree-optimized { target { offload_device_nvptx || offload_target_amdgcn } } }
+// { dg-additional-options -foffload-options=-fdump-tree-optimized { target { offload_target_nvptx || offload_target_amdgcn } } }
 
 // { dg-final { scan-tree-dump-times "omp_is_initial_device" 1 "gimple" } }
 // { dg-final { scan-tree-dump-times "_GLOBAL__off_I_v1" 1 "gimple" } }

diff --git a/libgomp/testsuite/libgomp.c-c++-common/target-is-initial-host-2.c b/libgomp/testsuite/libgomp.c-c++-common/target-is-initial-host-2.c
index 313d188a871a7064a1687f6a005d256ce920ae6b..eabc394c8cf8482840b0403006af9ca401837a5a 100644 (file)
--- a/libgomp/testsuite/libgomp.c-c++-common/target-is-initial-host-2.c
+++ b/libgomp/testsuite/libgomp.c-c++-common/target-is-initial-host-2.c
@@ -4,7 +4,7 @@
 /* Check whether 'omp_is_initial_device()' is NOT compile-time optimized. */
 
 /* { dg-additional-options "-fdump-tree-gimple -fdump-tree-optimized" }  */
-/* { dg-additional-options -foffload-options=-fdump-tree-optimized { target { offload_device_nvptx || offload_target_amdgcn } } }  */
+/* { dg-additional-options -foffload-options=-fdump-tree-optimized { target { offload_target_nvptx || offload_target_amdgcn } } }  */
 
 /* { dg-final { scan-tree-dump-times "omp_is_initial_device" 1 "gimple" } }  */
 

diff --git a/libgomp/testsuite/libgomp.c-c++-common/target-is-initial-host.c b/libgomp/testsuite/libgomp.c-c++-common/target-is-initial-host.c
index 423727ce55f0c611ca0e13d6a8fb36358a056c36..3b1283a597983f51226ae0c650a13b1cd30f7203 100644 (file)
--- a/libgomp/testsuite/libgomp.c-c++-common/target-is-initial-host.c
+++ b/libgomp/testsuite/libgomp.c-c++-common/target-is-initial-host.c
@@ -3,7 +3,7 @@
 /* Check whether 'omp_is_initial_device()' is properly compile-time optimized. */
 
 /* { dg-additional-options "-fdump-tree-gimple -fdump-tree-optimized" }  */
-/* { dg-additional-options -foffload-options=-fdump-tree-optimized { target { offload_device_nvptx || offload_target_amdgcn } } }  */
+/* { dg-additional-options -foffload-options=-fdump-tree-optimized { target { offload_target_nvptx || offload_target_amdgcn } } }  */
 
 /* { dg-final { scan-tree-dump-times "omp_is_initial_device" 1 "gimple" } }  */
 

diff --git a/libgomp/testsuite/libgomp.fortran/target-is-initial-host-2.f90 b/libgomp/testsuite/libgomp.fortran/target-is-initial-host-2.f90
index e06ced2064522fde734f0469c794fdcc0d50ce59..56521044eb6b0ac437b99ad41e70f23d269940bc 100644 (file)
--- a/libgomp/testsuite/libgomp.fortran/target-is-initial-host-2.f90
+++ b/libgomp/testsuite/libgomp.fortran/target-is-initial-host-2.f90
@@ -3,7 +3,7 @@
 ! Check whether 'omp_is_initial_device()' is NOT compile-time optimized. */
 
 ! { dg-additional-options "-fdump-tree-gimple -fdump-tree-optimized" }
-! { dg-additional-options -foffload-options=-fdump-tree-optimized { target { offload_device_nvptx || offload_target_amdgcn } } }
+! { dg-additional-options -foffload-options=-fdump-tree-optimized { target { offload_target_nvptx || offload_target_amdgcn } } }
 
 ! { dg-final { scan-tree-dump-times "omp_is_initial_device" 1 "gimple" } }
 

diff --git a/libgomp/testsuite/libgomp.fortran/target-is-initial-host.f b/libgomp/testsuite/libgomp.fortran/target-is-initial-host.f
index fec4a3f1c1cebaf4b02a9916713564b23768edf3..34b327e39012149ce3ed826c69a72b8c1d0503c5 100644 (file)
--- a/libgomp/testsuite/libgomp.fortran/target-is-initial-host.f
+++ b/libgomp/testsuite/libgomp.fortran/target-is-initial-host.f
@@ -1,7 +1,7 @@
 ! Check whether 'omp_is_initial_device()' is properly compile-time optimized. */
 
 ! { dg-additional-options "-fdump-tree-gimple -fdump-tree-optimized" }
-! { dg-additional-options -foffload-options=-fdump-tree-optimized { target { offload_device_nvptx || offload_target_amdgcn } } }
+! { dg-additional-options -foffload-options=-fdump-tree-optimized { target { offload_target_nvptx || offload_target_amdgcn } } }
 
 ! { dg-final { scan-tree-dump-times "omp_is_initial_device" 1 "gimple" } }
 

diff --git a/libgomp/testsuite/libgomp.fortran/target-is-initial-host.f90 b/libgomp/testsuite/libgomp.fortran/target-is-initial-host.f90
index f8a645fc488fc166b294e256ea9c3a172c31d7c2..bed99635d428ee2654de0b4618c415ebd5734664 100644 (file)
--- a/libgomp/testsuite/libgomp.fortran/target-is-initial-host.f90
+++ b/libgomp/testsuite/libgomp.fortran/target-is-initial-host.f90
@@ -1,7 +1,7 @@
 ! Check whether 'omp_is_initial_device()' is properly compile-time optimized. */
 
 ! { dg-additional-options "-fdump-tree-gimple -fdump-tree-optimized" }
-! { dg-additional-options -foffload-options=-fdump-tree-optimized { target { offload_device_nvptx || offload_target_amdgcn } } }
+! { dg-additional-options -foffload-options=-fdump-tree-optimized { target { offload_target_nvptx || offload_target_amdgcn } } }
 
 ! { dg-final { scan-tree-dump-times "omp_is_initial_device" 1 "gimple" } }