OpenACC: Improve implicit mapping for non-lexically nested offload regions: Adjust...

Adjust cherry-picked test cases per
OG14 commit b918a7e4b4bdf070bfa9ede48ef9d22f89ff7795
"OpenACC: Improve implicit mapping for non-lexically nested offload regions"
(in combination with
OG14 commit 5fb2987d33c7296543fa7b8dbeab597fc552b110
"Clarify 'OMP_CLAUSE_MAP_RUNTIME_IMPLICIT_P' in 'gcc/tree-pretty-print.cc:dump_omp_clause'"
(cherry picked from trunk commit d6e66e7b3a40315ad303344e19bccb4006c51cac)).

	libgomp/
	* testsuite/libgomp.oacc-c++/exceptions-bad_cast-3.C: Adjust.
	* testsuite/libgomp.oacc-c++/exceptions-throw-3.C: Likewise.
	* testsuite/libgomp.oacc-c++/pr119692-1-1.C: Likewise.
	* testsuite/libgomp.oacc-c++/pr119692-1-2.C: Likewise.
	* testsuite/libgomp.oacc-c++/pr119692-1-3.C: Likewise.

diff --git a/libgomp/ChangeLog.omp b/libgomp/ChangeLog.omp
index 44cc3227bbda76bf7810a665f7d07efe3a4ef339..56ddb4378fd364a40c6c3e72addb70745882a119 100644 (file)
--- a/libgomp/ChangeLog.omp
+++ b/libgomp/ChangeLog.omp
@@ -1,5 +1,11 @@
 2025-04-17  Thomas Schwinge  <tschwinge@baylibre.com>
 
+       * testsuite/libgomp.oacc-c++/exceptions-bad_cast-3.C: Adjust.
+       * testsuite/libgomp.oacc-c++/exceptions-throw-3.C: Likewise.
+       * testsuite/libgomp.oacc-c++/pr119692-1-1.C: Likewise.
+       * testsuite/libgomp.oacc-c++/pr119692-1-2.C: Likewise.
+       * testsuite/libgomp.oacc-c++/pr119692-1-3.C: Likewise.
+
        Backported from trunk:
        2025-04-16  Thomas Schwinge  <tschwinge@baylibre.com>
 

diff --git a/libgomp/testsuite/libgomp.oacc-c++/exceptions-bad_cast-3.C b/libgomp/testsuite/libgomp.oacc-c++/exceptions-bad_cast-3.C
index 4fa419f245fc4d1b19074cd7fcf20ee8883e8a54..e9372fa952736e8ffebc7f250306d5658ba644ee 100644 (file)
--- a/libgomp/testsuite/libgomp.oacc-c++/exceptions-bad_cast-3.C
+++ b/libgomp/testsuite/libgomp.oacc-c++/exceptions-bad_cast-3.C
@@ -44,6 +44,6 @@ int main()
   }
 }
 
-/* { dg-final { scan-tree-dump-not {(?n)#pragma omp target oacc_serial map\(tofrom:_ZTI2C2 \[len: [0-9]+\]\) map\(tofrom:_ZTI2C1 \[len: [0-9]+\]\) map\(tofrom:_ZTV2C1 \[len: [0-9]+\]\)$} gimple { xfail *-*-* } } } */
+/* { dg-final { scan-tree-dump-not {(?n)#pragma omp target oacc_serial map\(tofrom:_ZTI2C2 \[len: [0-9]+\] \[runtime_implicit\]\) map\(tofrom:_ZTI2C1 \[len: [0-9]+\] \[runtime_implicit\]\) map\(tofrom:_ZTV2C1 \[len: [0-9]+\] \[runtime_implicit\]\)$} gimple { xfail *-*-* } } } */
 
 /* { dg-final { scan-tree-dump-times {gimple_call <__cxa_bad_cast, } 1 optimized } } */

diff --git a/libgomp/testsuite/libgomp.oacc-c++/exceptions-throw-3.C b/libgomp/testsuite/libgomp.oacc-c++/exceptions-throw-3.C
index 74a62b3abfaccced22854ef008d54a181db16bbc..6664f800e6978d95a73cb48493615771df2f64df 100644 (file)
--- a/libgomp/testsuite/libgomp.oacc-c++/exceptions-throw-3.C
+++ b/libgomp/testsuite/libgomp.oacc-c++/exceptions-throw-3.C
@@ -37,7 +37,7 @@ int main()
   }
 }
 
-/* { dg-final { scan-tree-dump-not {(?n)#pragma omp target oacc_serial map\(tofrom:_ZTI11MyException \[len: [0-9]+\]\)$} gimple { xfail *-*-* } } } */
+/* { dg-final { scan-tree-dump-not {(?n)#pragma omp target oacc_serial map\(tofrom:_ZTI11MyException \[len: [0-9]+\] \[runtime_implicit\]\)$} gimple { xfail *-*-* } } } */
 
 /* { dg-final { scan-tree-dump-times {gimple_call <__cxa_allocate_exception, } 1 optimized } }
    { dg-final { scan-tree-dump-times {gimple_call <__cxa_throw, } 1 optimized } } */

diff --git a/libgomp/testsuite/libgomp.oacc-c++/pr119692-1-1.C b/libgomp/testsuite/libgomp.oacc-c++/pr119692-1-1.C
index 5c3e037f5911fcc15339ec729f00a1d33522e302..4a876f74f1fa360f4b07224eece87e1f9f54498a 100644 (file)
--- a/libgomp/testsuite/libgomp.oacc-c++/pr119692-1-1.C
+++ b/libgomp/testsuite/libgomp.oacc-c++/pr119692-1-1.C
@@ -39,4 +39,4 @@ int main()
   }
 }
 
-/* { dg-final { scan-tree-dump-not {(?n)#pragma omp target oacc_serial map\(tofrom:_ZTI2C2 \[len: [0-9]+\]\) map\(tofrom:_ZTI2C1 \[len: [0-9]+\]\) map\(tofrom:_ZTV2C1 \[len: [0-9]+\]\)$} gimple { xfail *-*-* } } } */
+/* { dg-final { scan-tree-dump-not {(?n)#pragma omp target oacc_serial map\(tofrom:_ZTI2C2 \[len: [0-9]+\] \[runtime_implicit\]\) map\(tofrom:_ZTI2C1 \[len: [0-9]+\] \[runtime_implicit\]\) map\(tofrom:_ZTV2C1 \[len: [0-9]+\] \[runtime_implicit\]\)$} gimple { xfail *-*-* } } } */

diff --git a/libgomp/testsuite/libgomp.oacc-c++/pr119692-1-2.C b/libgomp/testsuite/libgomp.oacc-c++/pr119692-1-2.C
index 207b183163ffc07b1f1c605c9f514756bc0c5d53..052e423ca08e4ec87dced20e77809cb31fb2d9e1 100644 (file)
--- a/libgomp/testsuite/libgomp.oacc-c++/pr119692-1-2.C
+++ b/libgomp/testsuite/libgomp.oacc-c++/pr119692-1-2.C
@@ -9,4 +9,4 @@
 
 /* { dg-bogus {using 'vector_length \(32\)', ignoring 1} {} { target openacc_nvidia_accel_selected xfail *-*-* } 0 } */
 
-/* { dg-final { scan-tree-dump-not {(?n)#pragma omp target oacc_serial default\(none\) map\(tofrom:_ZTI2C2 \[len: [0-9]+\]\) map\(tofrom:_ZTI2C1 \[len: [0-9]+\]\) map\(tofrom:_ZTV2C1 \[len: [0-9]+\]\)$} gimple { xfail *-*-* } } } */
+/* { dg-final { scan-tree-dump-not {(?n)#pragma omp target oacc_serial default\(none\) map\(tofrom:_ZTI2C2 \[len: [0-9]+\] \[runtime_implicit\]\) map\(tofrom:_ZTI2C1 \[len: [0-9]+\] \[runtime_implicit\]\) map\(tofrom:_ZTV2C1 \[len: [0-9]+\] \[runtime_implicit\]\)$} gimple { xfail *-*-* } } } */

diff --git a/libgomp/testsuite/libgomp.oacc-c++/pr119692-1-3.C b/libgomp/testsuite/libgomp.oacc-c++/pr119692-1-3.C
index e9b44de8175a7df2a608195b73afda8103ddf4b2..fd1844b3754b6981d7f1e14cdb352e063f5f06cc 100644 (file)
--- a/libgomp/testsuite/libgomp.oacc-c++/pr119692-1-3.C
+++ b/libgomp/testsuite/libgomp.oacc-c++/pr119692-1-3.C
@@ -9,4 +9,4 @@
 
 /* { dg-bogus {using 'vector_length \(32\)', ignoring 1} {} { target openacc_nvidia_accel_selected xfail *-*-* } 0 } */
 
-/* { dg-final { scan-tree-dump-not {(?n)#pragma omp target oacc_serial default\(present\) map\(force_present:_ZTI2C2 \[len: [0-9]+\]\) map\(force_present:_ZTI2C1 \[len: [0-9]+\]\) map\(force_present:_ZTV2C1 \[len: [0-9]+\]\)$} gimple { xfail *-*-* } } } */
+/* { dg-final { scan-tree-dump-not {(?n)#pragma omp target oacc_serial default\(present\) map\(force_present:_ZTI2C2 \[len: [0-9]+\] \[runtime_implicit\]\) map\(force_present:_ZTI2C1 \[len: [0-9]+\] \[runtime_implicit\]\) map\(force_present:_ZTV2C1 \[len: [0-9]+\] \[runtime_implicit\]\)$} gimple { xfail *-*-* } } } */