https://gcc.gnu.org/g:8b55d116b8f4c19696e534fb3a850a9beac396c4
commit 8b55d116b8f4c19696e534fb3a850a9beac396c4
Author: Thomas Schwinge <tschwi...@baylibre.com>
Date: Fri Aug 9 11:23:15 2024 +0200
OpenMP: Constructors and destructors for "declare target" static
aggregates: Fix effective-target keyword in test cases
(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.
(cherry picked from commit 9f5d22e3e2b8e4532896a4f3837cb86006d5930c)
Diff:
---
libgomp/ChangeLog.omp | 16 ++++++++++++++++
.../libgomp.c++/static-aggr-constructor-destructor-1.C | 2 +-
.../libgomp.c++/static-aggr-constructor-destructor-2.C | 2 +-
.../libgomp.c-c++-common/target-is-initial-host-2.c | 2 +-
.../libgomp.c-c++-common/target-is-initial-host.c | 2 +-
.../libgomp.fortran/target-is-initial-host-2.f90 | 2 +-
.../testsuite/libgomp.fortran/target-is-initial-host.f | 2 +-
.../testsuite/libgomp.fortran/target-is-initial-host.f90 | 2 +-
8 files changed, 23 insertions(+), 7 deletions(-)
diff --git a/libgomp/ChangeLog.omp b/libgomp/ChangeLog.omp
index 09cc7278e191..94dcb8e1a36d 100644
--- a/libgomp/ChangeLog.omp
+++ b/libgomp/ChangeLog.omp
@@ -1,5 +1,21 @@
2025-04-25 Thomas Schwinge <tschwi...@baylibre.com>
+ Backported from trunk:
+ 2024-08-09 Thomas Schwinge <tschwi...@baylibre.com>
+
+ * 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.
+
Backported from trunk:
2024-08-08 Tobias Burnus <tbur...@baylibre.com>
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 b5aafc8cabc2..a704e39411da 100644
--- 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 9652a721bbe2..de481aadd34e 100644
--- 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 313d188a871a..eabc394c8cf8 100644
--- 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 423727ce55f0..3b1283a59798 100644
--- 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 e06ced206452..56521044eb6b 100644
--- 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 fec4a3f1c1ce..34b327e39012 100644
--- 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 f8a645fc488f..bed99635d428 100644
--- 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" } }
