public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc/devel/gccgo] openmp: Fix up !$omp target parallel handling
@ 2020-01-23 0:35 Ian Lance Taylor
0 siblings, 0 replies; only message in thread
From: Ian Lance Taylor @ 2020-01-23 0:35 UTC (permalink / raw)
To: gcc-cvs
https://gcc.gnu.org/g:44a9d801a7080d39658754ad603536da6cff2cd0
commit 44a9d801a7080d39658754ad603536da6cff2cd0
Author: Jakub Jelinek <jakub@redhat.com>
Date: Wed Jan 22 09:54:59 2020 +0100
openmp: Fix up !$omp target parallel handling
The PR93329 fix revealed we ICE on !$omp target parallel, this change fixes
that.
2020-01-22 Jakub Jelinek <jakub@redhat.com>
* parse.c (parse_omp_structured_block): Handle ST_OMP_TARGET_PARALLEL.
* trans-openmp.c (gfc_trans_omp_target)
<case EXEC_OMP_TARGET_PARALLEL>: Call pushlevel first.
* gfortran.dg/gomp/target-parallel1.f90: New test.
* gfortran.dg/goacc/pr93329.f90: Enable commented out target parallel
test.
Diff:
---
gcc/ChangeLog | 1 -
gcc/cp/ChangeLog | 4 ++--
gcc/fortran/ChangeLog | 4 ++++
gcc/fortran/parse.c | 3 +++
gcc/fortran/trans-openmp.c | 1 +
gcc/testsuite/ChangeLog | 4 ++++
gcc/testsuite/gfortran.dg/goacc/pr93329.f90 | 4 ++--
gcc/testsuite/gfortran.dg/gomp/target-parallel1.f90 | 4 ++++
8 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 223f52d..d338a4a 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -13,7 +13,6 @@
<case SYMBOL_SMALL_TLSGD>: Call gen_tlsgd_small_* with a ptr_mode
register. Convert that register back to dest using convert_mode.
-
2020-01-21 Jim Wilson <jimw@sifive.com>
* config/riscv/riscv-sr.c (riscv_sr_match_prologue): Use INTVAL
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 4c195c4..1609344 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,10 +1,10 @@
-2020-01-22 Jun Ma <JunMa@linux.alibaba.com>
+2020-01-22 Jun Ma <JunMa@linux.alibaba.com>
* coroutines.cc (finish_co_await_expr): Add error check on return
value of build_co_await.
(finish_co_yield_expr,): Ditto.
-2020-01-22 Jun Ma <JunMa@linux.alibaba.com>
+2020-01-22 Jun Ma <JunMa@linux.alibaba.com>
* coroutines.cc (lookup_awaitable_member): Lookup an awaitable member.
(lookup_promise_method): Emit diagnostic when get NULL_TREE back only.
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 031c75b..ceefdf8 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,5 +1,9 @@
2020-01-22 Jakub Jelinek <jakub@redhat.com>
+ * parse.c (parse_omp_structured_block): Handle ST_OMP_TARGET_PARALLEL.
+ * trans-openmp.c (gfc_trans_omp_target)
+ <case EXEC_OMP_TARGET_PARALLEL>: Call pushlevel first.
+
PR fortran/93329
* openmp.c (omp_code_to_statement): Handle remaining EXEC_OMP_*
cases.
diff --git a/gcc/fortran/parse.c b/gcc/fortran/parse.c
index 68cd58e..4bff0c8 100644
--- a/gcc/fortran/parse.c
+++ b/gcc/fortran/parse.c
@@ -5231,6 +5231,9 @@ parse_omp_structured_block (gfc_statement omp_st, bool workshare_stmts_only)
case ST_OMP_TARGET_DATA:
omp_end_st = ST_OMP_END_TARGET_DATA;
break;
+ case ST_OMP_TARGET_PARALLEL:
+ omp_end_st = ST_OMP_END_TARGET_PARALLEL;
+ break;
case ST_OMP_TARGET_TEAMS:
omp_end_st = ST_OMP_END_TARGET_TEAMS;
break;
diff --git a/gcc/fortran/trans-openmp.c b/gcc/fortran/trans-openmp.c
index 9835d2a..fd60bbb 100644
--- a/gcc/fortran/trans-openmp.c
+++ b/gcc/fortran/trans-openmp.c
@@ -5357,6 +5357,7 @@ gfc_trans_omp_target (gfc_code *code)
{
stmtblock_t iblock;
+ pushlevel ();
gfc_start_block (&iblock);
tree inner_clauses
= gfc_trans_omp_clauses (&block, &clausesa[GFC_OMP_SPLIT_PARALLEL],
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 0c04921..552270d 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,9 @@
2020-01-22 Jakub Jelinek <jakub@redhat.com>
+ * gfortran.dg/gomp/target-parallel1.f90: New test.
+ * gfortran.dg/goacc/pr93329.f90: Enable commented out target parallel
+ test.
+
PR fortran/93329
* gfortran.dg/goacc/pr93329.f90: New test.
diff --git a/gcc/testsuite/gfortran.dg/goacc/pr93329.f90 b/gcc/testsuite/gfortran.dg/goacc/pr93329.f90
index aed264a..b2d25bd 100644
--- a/gcc/testsuite/gfortran.dg/goacc/pr93329.f90
+++ b/gcc/testsuite/gfortran.dg/goacc/pr93329.f90
@@ -68,8 +68,8 @@
!$omp target exit data map(from: x) ! { dg-error "OMP TARGET EXIT DATA directive cannot be specified within" }
!$acc end kernels
!$acc kernels
-!!$omp target parallel
-!!$omp end target parallel
+!$omp target parallel ! { dg-error "OMP TARGET PARALLEL directive cannot be specified within" }
+!$omp end target parallel
!$acc end kernels
!$acc kernels
!$omp target parallel do ! { dg-error "OMP TARGET PARALLEL DO directive cannot be specified within" }
diff --git a/gcc/testsuite/gfortran.dg/gomp/target-parallel1.f90 b/gcc/testsuite/gfortran.dg/gomp/target-parallel1.f90
new file mode 100644
index 0000000..bb8561f
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/gomp/target-parallel1.f90
@@ -0,0 +1,4 @@
+!$omp target parallel
+ print *, 'Hello, world'
+!$omp end target parallel
+end
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2020-01-23 0:35 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-01-23 0:35 [gcc/devel/gccgo] openmp: Fix up !$omp target parallel handling Ian Lance Taylor
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).