public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc/devel/omp/gcc-13] Revert "Fix 'libgomp.{c-c++-common, fortran}/target-present-*' test cases"
@ 2023-06-09 11:18 Tobias Burnus
0 siblings, 0 replies; only message in thread
From: Tobias Burnus @ 2023-06-09 11:18 UTC (permalink / raw)
To: gcc-cvs
https://gcc.gnu.org/g:ec6e81d4466c23f9b1f8158e32e752e858553471
commit ec6e81d4466c23f9b1f8158e32e752e858553471
Author: Tobias Burnus <tobias@codesourcery.com>
Date: Wed Jun 7 16:35:23 2023 +0200
Revert "Fix 'libgomp.{c-c++-common,fortran}/target-present-*' test cases"
This reverts commit f719ab9a3ac51d798b012a5ab7757af2b81b4ae2.
in order to revert
commit 6e3816fa47c openmp: Add support for the 'present' modifier
which then permits to apply the mainline patches of those more cleanly.
Diff:
---
libgomp/ChangeLog.omp | 12 ++++++++++++
libgomp/testsuite/libgomp.c-c++-common/target-present-1.c | 9 +++------
libgomp/testsuite/libgomp.c-c++-common/target-present-2.c | 11 ++++-------
libgomp/testsuite/libgomp.c-c++-common/target-present-3.c | 9 ++++-----
libgomp/testsuite/libgomp.fortran/target-present-1.f90 | 9 +++------
libgomp/testsuite/libgomp.fortran/target-present-2.f90 | 13 +++++--------
libgomp/testsuite/libgomp.fortran/target-present-3.f90 | 9 +++------
7 files changed, 34 insertions(+), 38 deletions(-)
diff --git a/libgomp/ChangeLog.omp b/libgomp/ChangeLog.omp
index 82c8690fd68..bcdca43964d 100644
--- a/libgomp/ChangeLog.omp
+++ b/libgomp/ChangeLog.omp
@@ -1,3 +1,15 @@
+2023-06-07 Tobias Burnus <tobias@codesourcery.com>
+
+ Revert:
+ 2023-02-15 Thomas Schwinge <thomas@codesourcery.com>
+
+ * testsuite/libgomp.c-c++-common/target-present-1.c: Fix.
+ * testsuite/libgomp.c-c++-common/target-present-2.c: Likewise.
+ * testsuite/libgomp.c-c++-common/target-present-3.c: Likewise.
+ * testsuite/libgomp.fortran/target-present-1.f90: Likewise.
+ * testsuite/libgomp.fortran/target-present-2.f90: Likewise.
+ * testsuite/libgomp.fortran/target-present-3.f90: Likewise.
+
2023-06-07 Tobias Burnus <tobias@codesourcery.com>
Backported from master:
diff --git a/libgomp/testsuite/libgomp.c-c++-common/target-present-1.c b/libgomp/testsuite/libgomp.c-c++-common/target-present-1.c
index 55aecd1c8d1..bbc4559b12e 100644
--- a/libgomp/testsuite/libgomp.c-c++-common/target-present-1.c
+++ b/libgomp/testsuite/libgomp.c-c++-common/target-present-1.c
@@ -1,4 +1,5 @@
-#include <stdio.h>
+/* { dg-do run { target offload_target_any } } */
+/* { dg-shouldfail "present error triggered" } */
#define N 100
@@ -17,12 +18,8 @@ int main (void)
for (int i = 0; i < N; i++)
c[i] = a[i];
- fprintf (stderr, "CheCKpOInT\n");
- /* { dg-output "CheCKpOInT(\n|\r\n|\r).*" } */
-
/* b has not been allocated, so this should result in an error. */
- /* { dg-output "libgomp: present clause: !omp_target_is_present \\\(0x\[0-9a-f\]+, \[0-9\]+\\\)" { target offload_device_nonshared_as } }
- { dg-shouldfail "present error triggered" { offload_device_nonshared_as } } */
+ /* { dg-output "libgomp: present clause: !omp_target_is_present \\\(0x\[0-9a-f\]+, \[0-9\]+\\\)" } */
#pragma omp target map (present, to: b)
for (int i = 0; i < N; i++)
c[i] += b[i];
diff --git a/libgomp/testsuite/libgomp.c-c++-common/target-present-2.c b/libgomp/testsuite/libgomp.c-c++-common/target-present-2.c
index 1ce919e62ce..6259c959c04 100644
--- a/libgomp/testsuite/libgomp.c-c++-common/target-present-2.c
+++ b/libgomp/testsuite/libgomp.c-c++-common/target-present-2.c
@@ -1,4 +1,5 @@
-#include <stdio.h>
+/* { dg-do run { target offload_target_any } } */
+/* { dg-shouldfail "present error triggered" } */
#define N 100
@@ -12,17 +13,13 @@ int main (void)
}
#pragma omp target enter data map (alloc: a, c)
- /* a, c have already been allocated, so this should be okay. */
+ /* a has already been allocated, so this should be okay. */
#pragma omp target defaultmap (present)
for (int i = 0; i < N; i++)
c[i] = a[i];
- fprintf (stderr, "CheCKpOInT\n");
- /* { dg-output "CheCKpOInT(\n|\r\n|\r).*" } */
-
/* b has not been allocated, so this should result in an error. */
- /* { dg-output "libgomp: present clause: !omp_target_is_present \\\(0x\[0-9a-f\]+, \[0-9\]+\\\)" { target offload_device_nonshared_as } }
- { dg-shouldfail "present error triggered" { offload_device_nonshared_as } } */
+ /* { dg-output "libgomp: present clause: !omp_target_is_present \\\(0x\[0-9a-f\]+, \[0-9\]+\\\)" } */
#pragma omp target defaultmap (present)
for (int i = 0; i < N; i++)
c[i] += b[i];
diff --git a/libgomp/testsuite/libgomp.c-c++-common/target-present-3.c b/libgomp/testsuite/libgomp.c-c++-common/target-present-3.c
index 886969c4c4a..89e648645b2 100644
--- a/libgomp/testsuite/libgomp.c-c++-common/target-present-3.c
+++ b/libgomp/testsuite/libgomp.c-c++-common/target-present-3.c
@@ -1,3 +1,6 @@
+/* { dg-do run { target offload_target_any } } */
+/* { dg-shouldfail "present error triggered" } */
+
#include <stdio.h>
#define N 100
@@ -16,12 +19,8 @@ int main (void)
/* This should work as a has already been allocated. */
#pragma omp target update to (present: a)
- fprintf (stderr, "CheCKpOInT\n");
- /* { dg-output "CheCKpOInT(\n|\r\n|\r).*" } */
-
/* This should fail as b has not been allocated. */
- /* { dg-output "libgomp: present clause: !omp_target_is_present \\\(0x\[0-9a-f\]+, \[0-9\]+\\\)" { target offload_device_nonshared_as } }
- { dg-shouldfail "present error triggered" { offload_device_nonshared_as } } */
+ /* { dg-output "libgomp: present clause: !omp_target_is_present \\\(0x\[0-9a-f\]+, \[0-9\]+\\\)" } */
#pragma omp target update to (present: b)
#pragma omp target exit data map (from: c)
diff --git a/libgomp/testsuite/libgomp.fortran/target-present-1.f90 b/libgomp/testsuite/libgomp.fortran/target-present-1.f90
index c56b76e0233..80046011b25 100644
--- a/libgomp/testsuite/libgomp.fortran/target-present-1.f90
+++ b/libgomp/testsuite/libgomp.fortran/target-present-1.f90
@@ -1,4 +1,5 @@
-! { dg-do run }
+! { dg-do run { target offload_target_any } }
+! { dg-shouldfail "present error triggered" }
program main
implicit none
@@ -18,12 +19,8 @@ program main
end do
!$omp end target
- print *, "CheCKpOInT"
- ! { dg-output "CheCKpOInT(\n|\r\n|\r).*" }
-
! b has not been allocated, so this should result in an error.
- ! { dg-output "libgomp: present clause: !omp_target_is_present \\\(0x\[0-9a-f\]+, \[0-9\]+\\\)" { target offload_device_nonshared_as } }
- ! { dg-shouldfail "present error triggered" { offload_device_nonshared_as } }
+ ! { dg-output "libgomp: present clause: !omp_target_is_present \\\(0x\[0-9a-f\]+, \[0-9\]+\\\)" }
!$omp target map (present, to: b)
do i = 1, N
c(i) = c(i) + b(i)
diff --git a/libgomp/testsuite/libgomp.fortran/target-present-2.f90 b/libgomp/testsuite/libgomp.fortran/target-present-2.f90
index f62e0c22468..0a38dea1e41 100644
--- a/libgomp/testsuite/libgomp.fortran/target-present-2.f90
+++ b/libgomp/testsuite/libgomp.fortran/target-present-2.f90
@@ -1,4 +1,5 @@
-! { dg-do run }
+! { dg-do run { target offload_target_any } }
+! { dg-shouldfail "present error triggered" }
program main
implicit none
@@ -10,20 +11,16 @@ program main
b(i) = i * 3 + 1
end do
- !$omp target enter data map (alloc: a, c, i)
- ! a, c, i have already been allocated, so this should be okay.
+ !$omp target enter data map (alloc: a)
+ ! a has already been allocated, so this should be okay.
!$omp target defaultmap (present)
do i = 1, N
c(i) = a(i)
end do
!$omp end target
- print *, "CheCKpOInT"
- ! { dg-output "CheCKpOInT(\n|\r\n|\r).*" }
-
! b has not been allocated, so this should result in an error.
- ! { dg-output "libgomp: present clause: !omp_target_is_present \\\(0x\[0-9a-f\]+, \[0-9\]+\\\)" { target offload_device_nonshared_as } }
- ! { dg-shouldfail "present error triggered" { offload_device_nonshared_as } }
+ ! { dg-output "libgomp: present clause: !omp_target_is_present \\\(0x\[0-9a-f\]+, \[0-9\]+\\\)" }
!$omp target defaultmap (present)
do i = 1, N
c(i) = c(i) + b(i)
diff --git a/libgomp/testsuite/libgomp.fortran/target-present-3.f90 b/libgomp/testsuite/libgomp.fortran/target-present-3.f90
index b186c1c5462..c4deb8652d1 100644
--- a/libgomp/testsuite/libgomp.fortran/target-present-3.f90
+++ b/libgomp/testsuite/libgomp.fortran/target-present-3.f90
@@ -1,4 +1,5 @@
-! { dg-do run }
+! { dg-do run { target offload_target_any } }
+! { dg-shouldfail "present error triggered" }
program main
implicit none
@@ -14,12 +15,8 @@ program main
! This should work as a has already been allocated.
!$omp target update to (present: a)
- print *, "CheCKpOInT"
- ! { dg-output "CheCKpOInT(\n|\r\n|\r).*" }
-
! This should fail as b has not been allocated.
- ! { dg-output "libgomp: present clause: !omp_target_is_present \\\(0x\[0-9a-f\]+, \[0-9\]+\\\)" { target offload_device_nonshared_as } }
- ! { dg-shouldfail "present error triggered" { offload_device_nonshared_as } }
+ ! { dg-output "libgomp: present clause: !omp_target_is_present \\\(0x\[0-9a-f\]+, \[0-9\]+\\\)" }
!$omp target update to (present: b)
!$omp target exit data map (from: c)
end program
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2023-06-09 11:18 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-06-09 11:18 [gcc/devel/omp/gcc-13] Revert "Fix 'libgomp.{c-c++-common, fortran}/target-present-*' test cases" Tobias Burnus
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).