public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc(refs/vendors/redhat/heads/gcc-9-branch)] openmp: Handle rest of EXEC_OACC_* in oacc_code_to_statement [PR93463]
@ 2020-03-17 19:09 Jakub Jelinek
0 siblings, 0 replies; only message in thread
From: Jakub Jelinek @ 2020-03-17 19:09 UTC (permalink / raw)
To: gcc-cvs
https://gcc.gnu.org/g:244f4b8c2823531a1e479a3773272af539dda258
commit 244f4b8c2823531a1e479a3773272af539dda258
Author: Jakub Jelinek <jakub@redhat.com>
Date: Wed Jan 29 09:39:16 2020 +0100
openmp: Handle rest of EXEC_OACC_* in oacc_code_to_statement [PR93463]
As the testcase shows, some EXEC_OACC_* codes weren't handled in
oacc_code_to_statement. Fixed thusly.
2020-01-29 Jakub Jelinek <jakub@redhat.com>
PR fortran/93463
* openmp.c (oacc_code_to_statement): Handle
EXEC_OACC_{ROUTINE,UPDATE,WAIT,CACHE,{ENTER,EXIT}_DATA,DECLARE}.
* gfortran.dg/goacc/pr93463.f90: New test.
Diff:
---
gcc/fortran/ChangeLog | 9 +++++++++
gcc/fortran/openmp.c | 14 ++++++++++++++
gcc/testsuite/ChangeLog | 5 +++++
gcc/testsuite/gfortran.dg/goacc/pr93463.f90 | 15 +++++++++++++++
4 files changed, 43 insertions(+)
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 0f5b7e60a50..f31e052b10a 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,12 @@
+2020-02-13 Jakub Jelinek <jakub@redhat.com>
+
+ Backported from mainline
+ 2020-01-29 Jakub Jelinek <jakub@redhat.com>
+
+ PR fortran/93463
+ * openmp.c (oacc_code_to_statement): Handle
+ EXEC_OACC_{ROUTINE,UPDATE,WAIT,CACHE,{ENTER,EXIT}_DATA,DECLARE}.
+
2020-02-03 Tobias Burnus <tobias@codesourcery.com>
Backported from mainline
diff --git a/gcc/fortran/openmp.c b/gcc/fortran/openmp.c
index 716dd5ec3e2..83b1c4487de 100644
--- a/gcc/fortran/openmp.c
+++ b/gcc/fortran/openmp.c
@@ -5858,6 +5858,20 @@ oacc_code_to_statement (gfc_code *code)
return ST_OACC_LOOP;
case EXEC_OACC_ATOMIC:
return ST_OACC_ATOMIC;
+ case EXEC_OACC_ROUTINE:
+ return ST_OACC_ROUTINE;
+ case EXEC_OACC_UPDATE:
+ return ST_OACC_UPDATE;
+ case EXEC_OACC_WAIT:
+ return ST_OACC_WAIT;
+ case EXEC_OACC_CACHE:
+ return ST_OACC_CACHE;
+ case EXEC_OACC_ENTER_DATA:
+ return ST_OACC_ENTER_DATA;
+ case EXEC_OACC_EXIT_DATA:
+ return ST_OACC_EXIT_DATA;
+ case EXEC_OACC_DECLARE:
+ return ST_OACC_DECLARE;
default:
gcc_unreachable ();
}
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 532f8dbef6c..b5165efbc35 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,6 +1,11 @@
2020-02-13 Jakub Jelinek <jakub@redhat.com>
Backported from mainline
+ 2020-01-29 Jakub Jelinek <jakub@redhat.com>
+
+ PR fortran/93463
+ * gfortran.dg/goacc/pr93463.f90: New test.
+
2020-01-28 Jakub Jelinek <jakub@redhat.com>
PR target/93418
diff --git a/gcc/testsuite/gfortran.dg/goacc/pr93463.f90 b/gcc/testsuite/gfortran.dg/goacc/pr93463.f90
new file mode 100644
index 00000000000..920892fdcda
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/goacc/pr93463.f90
@@ -0,0 +1,15 @@
+! PR fortran/93463
+! { dg-do compile { target fopenmp } }
+! { dg-additional-options "-fopenmp" }
+
+program pr93463
+ integer :: i, x, y, z
+ !$omp parallel do
+ do i = 1, 4
+ !$acc enter data create(x) ! { dg-error "ACC ENTER DATA directive cannot be specified within" }
+ !$acc exit data copyout(x) ! { dg-error "ACC EXIT DATA directive cannot be specified within" }
+ !$acc cache(y) ! { dg-error "ACC CACHE directive cannot be specified within" }
+ !$acc wait(1) ! { dg-error "ACC WAIT directive cannot be specified within" }
+ !$acc update self(z) ! { dg-error "ACC UPDATE directive cannot be specified within" }
+ end do
+end
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2020-03-17 19:09 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-03-17 19:09 [gcc(refs/vendors/redhat/heads/gcc-9-branch)] openmp: Handle rest of EXEC_OACC_* in oacc_code_to_statement [PR93463] Jakub Jelinek
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).