* Use existing middle end checking for Fortran OpenACC loop clauses
@ 2018-12-09 12:59 Thomas Schwinge
2020-11-06 13:16 ` Thomas Schwinge
0 siblings, 1 reply; 2+ messages in thread
From: Thomas Schwinge @ 2018-12-09 12:59 UTC (permalink / raw)
To: gcc-patches, fortran
Hi!
Committed to trunk in r266922:
commit fd1f371dd476ba3e76fb62eb76f1c1e23bd77b33
Author: tschwinge <tschwinge@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Sun Dec 9 12:47:58 2018 +0000
Use existing middle end checking for Fortran OpenACC loop clauses
Don't duplicate in the Fortran front end what's generically being checked in
the middle end.
gcc/fortran/
* openmp.c (resolve_oacc_loop_blocks): Remove checking of OpenACC
loop clauses.
gcc/testsuite/
* gfortran.dg/goacc/loop-2-kernels.f95: Update.
* gfortran.dg/goacc/loop-2-parallel.f95: Likewise.
* gfortran.dg/goacc/nested-parallelism.f90: Likewise.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@266922 138bc75d-0d04-0410-961f-82ee72b054a4
---
gcc/fortran/ChangeLog | 3 +
gcc/fortran/openmp.c | 70 ----------------------
gcc/testsuite/ChangeLog | 4 ++
gcc/testsuite/gfortran.dg/goacc/loop-2-kernels.f95 | 40 ++++++-------
.../gfortran.dg/goacc/loop-2-parallel.f95 | 40 ++++++-------
.../gfortran.dg/goacc/nested-parallelism.f90 | 12 ++--
6 files changed, 53 insertions(+), 116 deletions(-)
diff --git gcc/fortran/ChangeLog gcc/fortran/ChangeLog
index ae1871ec7f8d..c6eb05174f69 100644
--- gcc/fortran/ChangeLog
+++ gcc/fortran/ChangeLog
@@ -1,5 +1,8 @@
2018-12-09 Thomas Schwinge <thomas@codesourcery.com>
+ * openmp.c (resolve_oacc_loop_blocks): Remove checking of OpenACC
+ loop clauses.
+
PR fortran/88420
* openmp.c (resolve_oacc_loop_blocks): Remove "Clause SEQ
conflicts with INDEPENDENT" diagnostic.
diff --git gcc/fortran/openmp.c gcc/fortran/openmp.c
index d97b8bfbb142..261a54a6015e 100644
--- gcc/fortran/openmp.c
+++ gcc/fortran/openmp.c
@@ -5659,12 +5659,6 @@ oacc_is_parallel (gfc_code *code)
return code->op == EXEC_OACC_PARALLEL || code->op == EXEC_OACC_PARALLEL_LOOP;
}
-static bool
-oacc_is_kernels (gfc_code *code)
-{
- return code->op == EXEC_OACC_KERNELS || code->op == EXEC_OACC_KERNELS_LOOP;
-}
-
static gfc_statement
omp_code_to_statement (gfc_code *code)
{
@@ -5846,73 +5840,9 @@ resolve_oacc_params_in_parallel (gfc_code *code, const char *clause,
static void
resolve_oacc_loop_blocks (gfc_code *code)
{
- fortran_omp_context *c;
-
if (!oacc_is_loop (code))
return;
- if (code->op == EXEC_OACC_LOOP)
- for (c = omp_current_ctx; c; c = c->previous)
- {
- if (oacc_is_loop (c->code))
- {
- if (code->ext.omp_clauses->gang)
- {
- if (c->code->ext.omp_clauses->gang)
- gfc_error ("Loop parallelized across gangs is not allowed "
- "inside another loop parallelized across gangs at %L",
- &code->loc);
- if (c->code->ext.omp_clauses->worker)
- gfc_error ("Loop parallelized across gangs is not allowed "
- "inside loop parallelized across workers at %L",
- &code->loc);
- if (c->code->ext.omp_clauses->vector)
- gfc_error ("Loop parallelized across gangs is not allowed "
- "inside loop parallelized across vectors at %L",
- &code->loc);
- }
- if (code->ext.omp_clauses->worker)
- {
- if (c->code->ext.omp_clauses->worker)
- gfc_error ("Loop parallelized across workers is not allowed "
- "inside another loop parallelized across workers at %L",
- &code->loc);
- if (c->code->ext.omp_clauses->vector)
- gfc_error ("Loop parallelized across workers is not allowed "
- "inside another loop parallelized across vectors at %L",
- &code->loc);
- }
- if (code->ext.omp_clauses->vector)
- if (c->code->ext.omp_clauses->vector)
- gfc_error ("Loop parallelized across vectors is not allowed "
- "inside another loop parallelized across vectors at %L",
- &code->loc);
- }
-
- if (oacc_is_parallel (c->code) || oacc_is_kernels (c->code))
- break;
- }
-
- if (code->ext.omp_clauses->seq)
- {
- if (code->ext.omp_clauses->gang)
- gfc_error ("Clause SEQ conflicts with GANG at %L", &code->loc);
- if (code->ext.omp_clauses->worker)
- gfc_error ("Clause SEQ conflicts with WORKER at %L", &code->loc);
- if (code->ext.omp_clauses->vector)
- gfc_error ("Clause SEQ conflicts with VECTOR at %L", &code->loc);
- if (code->ext.omp_clauses->par_auto)
- gfc_error ("Clause SEQ conflicts with AUTO at %L", &code->loc);
- }
- if (code->ext.omp_clauses->par_auto)
- {
- if (code->ext.omp_clauses->gang)
- gfc_error ("Clause AUTO conflicts with GANG at %L", &code->loc);
- if (code->ext.omp_clauses->worker)
- gfc_error ("Clause AUTO conflicts with WORKER at %L", &code->loc);
- if (code->ext.omp_clauses->vector)
- gfc_error ("Clause AUTO conflicts with VECTOR at %L", &code->loc);
- }
if (code->ext.omp_clauses->tile_list && code->ext.omp_clauses->gang
&& code->ext.omp_clauses->worker && code->ext.omp_clauses->vector)
gfc_error ("Tiled loop cannot be parallelized across gangs, workers and "
diff --git gcc/testsuite/ChangeLog gcc/testsuite/ChangeLog
index 7bee068aabf3..192a29ee971c 100644
--- gcc/testsuite/ChangeLog
+++ gcc/testsuite/ChangeLog
@@ -1,5 +1,9 @@
2018-12-09 Thomas Schwinge <thomas@codesourcery.com>
+ * gfortran.dg/goacc/loop-2-kernels.f95: Update.
+ * gfortran.dg/goacc/loop-2-parallel.f95: Likewise.
+ * gfortran.dg/goacc/nested-parallelism.f90: Likewise.
+
* gfortran.dg/goacc/loop-2.f95: Split into...
* gfortran.dg/goacc/loop-2-kernels-nested.f95: ... this new
file...
diff --git gcc/testsuite/gfortran.dg/goacc/loop-2-kernels.f95 gcc/testsuite/gfortran.dg/goacc/loop-2-kernels.f95
index 25a6be162fdd..874c62d42786 100644
--- gcc/testsuite/gfortran.dg/goacc/loop-2-kernels.f95
+++ gcc/testsuite/gfortran.dg/goacc/loop-2-kernels.f95
@@ -31,11 +31,11 @@ program test
!$acc loop worker
DO j = 1,10
ENDDO
- !$acc loop gang ! { dg-error "not allowed" }
+ !$acc loop gang ! { dg-error "inner loop uses same OpenACC parallelism as containing loop" }
DO j = 1,10
ENDDO
ENDDO
- !$acc loop seq gang ! { dg-error "conflicts with" }
+ !$acc loop seq gang ! { dg-error "'seq' overrides other OpenACC loop specifiers" }
DO i = 1,10
ENDDO
@@ -53,14 +53,14 @@ program test
!$acc loop vector
DO j = 1,10
ENDDO
- !$acc loop worker ! { dg-error "not allowed" }
+ !$acc loop worker ! { dg-error "inner loop uses same OpenACC parallelism as containing loop" }
DO j = 1,10
ENDDO
- !$acc loop gang ! { dg-error "not allowed" }
+ !$acc loop gang ! { dg-error "" "TODO" { xfail *-*-* } }
DO j = 1,10
ENDDO
ENDDO
- !$acc loop seq worker ! { dg-error "conflicts with" }
+ !$acc loop seq worker ! { dg-error "'seq' overrides other OpenACC loop specifiers" }
DO i = 1,10
ENDDO
!$acc loop gang worker
@@ -78,17 +78,17 @@ program test
ENDDO
!$acc loop vector
DO i = 1,10
- !$acc loop vector ! { dg-error "not allowed" }
+ !$acc loop vector ! { dg-error "inner loop uses same OpenACC parallelism as containing loop" }
DO j = 1,10
ENDDO
- !$acc loop worker ! { dg-error "not allowed" }
+ !$acc loop worker ! { dg-error "" "TODO" { xfail *-*-* } }
DO j = 1,10
ENDDO
- !$acc loop gang ! { dg-error "not allowed" }
+ !$acc loop gang ! { dg-error "" "TODO" { xfail *-*-* } }
DO j = 1,10
ENDDO
ENDDO
- !$acc loop seq vector ! { dg-error "conflicts with" }
+ !$acc loop seq vector ! { dg-error "'seq' overrides other OpenACC loop specifiers" }
DO i = 1,10
ENDDO
!$acc loop gang vector
@@ -101,16 +101,16 @@ program test
!$acc loop auto
DO i = 1,10
ENDDO
- !$acc loop seq auto ! { dg-error "conflicts with" }
+ !$acc loop seq auto ! { dg-error "'seq' overrides other OpenACC loop specifiers" }
DO i = 1,10
ENDDO
- !$acc loop gang auto ! { dg-error "conflicts with" }
+ !$acc loop gang auto ! { dg-error "'auto' conflicts with other OpenACC loop specifiers" }
DO i = 1,10
ENDDO
- !$acc loop worker auto ! { dg-error "conflicts with" }
+ !$acc loop worker auto ! { dg-error "'auto' conflicts with other OpenACC loop specifiers" }
DO i = 1,10
ENDDO
- !$acc loop vector auto ! { dg-error "conflicts with" }
+ !$acc loop vector auto ! { dg-error "'auto' conflicts with other OpenACC loop specifiers" }
DO i = 1,10
ENDDO
!$acc end kernels
@@ -133,7 +133,7 @@ program test
!$acc kernels loop gang(static:*)
DO i = 1,10
ENDDO
- !$acc kernels loop seq gang ! { dg-error "conflicts with" }
+ !$acc kernels loop seq gang ! { dg-error "'seq' overrides other OpenACC loop specifiers" }
DO i = 1,10
ENDDO
@@ -146,7 +146,7 @@ program test
!$acc kernels loop worker(num:5)
DO i = 1,10
ENDDO
- !$acc kernels loop seq worker ! { dg-error "conflicts with" }
+ !$acc kernels loop seq worker ! { dg-error "'seq' overrides other OpenACC loop specifiers" }
DO i = 1,10
ENDDO
!$acc kernels loop gang worker
@@ -162,7 +162,7 @@ program test
!$acc kernels loop vector(length:5)
DO i = 1,10
ENDDO
- !$acc kernels loop seq vector ! { dg-error "conflicts with" }
+ !$acc kernels loop seq vector ! { dg-error "'seq' overrides other OpenACC loop specifiers" }
DO i = 1,10
ENDDO
!$acc kernels loop gang vector
@@ -175,16 +175,16 @@ program test
!$acc kernels loop auto
DO i = 1,10
ENDDO
- !$acc kernels loop seq auto ! { dg-error "conflicts with" }
+ !$acc kernels loop seq auto ! { dg-error "'seq' overrides other OpenACC loop specifiers" }
DO i = 1,10
ENDDO
- !$acc kernels loop gang auto ! { dg-error "conflicts with" }
+ !$acc kernels loop gang auto ! { dg-error "'auto' conflicts with other OpenACC loop specifiers" }
DO i = 1,10
ENDDO
- !$acc kernels loop worker auto ! { dg-error "conflicts with" }
+ !$acc kernels loop worker auto ! { dg-error "'auto' conflicts with other OpenACC loop specifiers" }
DO i = 1,10
ENDDO
- !$acc kernels loop vector auto ! { dg-error "conflicts with" }
+ !$acc kernels loop vector auto ! { dg-error "'auto' conflicts with other OpenACC loop specifiers" }
DO i = 1,10
ENDDO
end
diff --git gcc/testsuite/gfortran.dg/goacc/loop-2-parallel.f95 gcc/testsuite/gfortran.dg/goacc/loop-2-parallel.f95
index 6338f10fc617..db8187e5903c 100644
--- gcc/testsuite/gfortran.dg/goacc/loop-2-parallel.f95
+++ gcc/testsuite/gfortran.dg/goacc/loop-2-parallel.f95
@@ -25,11 +25,11 @@ program test
!$acc loop worker
DO j = 1,10
ENDDO
- !$acc loop gang ! { dg-error "not allowed" }
+ !$acc loop gang ! { dg-error "inner loop uses same OpenACC parallelism as containing loop" }
DO j = 1,10
ENDDO
ENDDO
- !$acc loop seq gang ! { dg-error "conflicts with" }
+ !$acc loop seq gang ! { dg-error "'seq' overrides other OpenACC loop specifiers" }
DO i = 1,10
ENDDO
@@ -41,14 +41,14 @@ program test
!$acc loop vector
DO j = 1,10
ENDDO
- !$acc loop worker ! { dg-error "not allowed" }
+ !$acc loop worker ! { dg-error "inner loop uses same OpenACC parallelism as containing loop" }
DO j = 1,10
ENDDO
- !$acc loop gang ! { dg-error "not allowed" }
+ !$acc loop gang ! { dg-error "incorrectly nested OpenACC loop parallelism" }
DO j = 1,10
ENDDO
ENDDO
- !$acc loop seq worker ! { dg-error "conflicts with" }
+ !$acc loop seq worker ! { dg-error "'seq' overrides other OpenACC loop specifiers" }
DO i = 1,10
ENDDO
!$acc loop gang worker
@@ -60,17 +60,17 @@ program test
ENDDO
!$acc loop vector
DO i = 1,10
- !$acc loop vector ! { dg-error "not allowed" }
+ !$acc loop vector ! { dg-error "inner loop uses same OpenACC parallelism as containing loop" }
DO j = 1,10
ENDDO
- !$acc loop worker ! { dg-error "not allowed" }
+ !$acc loop worker ! { dg-error "incorrectly nested OpenACC loop parallelism" }
DO j = 1,10
ENDDO
- !$acc loop gang ! { dg-error "not allowed" }
+ !$acc loop gang ! { dg-error "incorrectly nested OpenACC loop parallelism" }
DO j = 1,10
ENDDO
ENDDO
- !$acc loop seq vector ! { dg-error "conflicts with" }
+ !$acc loop seq vector ! { dg-error "'seq' overrides other OpenACC loop specifiers" }
DO i = 1,10
ENDDO
!$acc loop gang vector
@@ -83,16 +83,16 @@ program test
!$acc loop auto
DO i = 1,10
ENDDO
- !$acc loop seq auto ! { dg-error "conflicts with" }
+ !$acc loop seq auto ! { dg-error "'seq' overrides other OpenACC loop specifiers" }
DO i = 1,10
ENDDO
- !$acc loop gang auto ! { dg-error "conflicts with" }
+ !$acc loop gang auto ! { dg-error "'auto' conflicts with other OpenACC loop specifiers" }
DO i = 1,10
ENDDO
- !$acc loop worker auto ! { dg-error "conflicts with" }
+ !$acc loop worker auto ! { dg-error "'auto' conflicts with other OpenACC loop specifiers" }
DO i = 1,10
ENDDO
- !$acc loop vector auto ! { dg-error "conflicts with" }
+ !$acc loop vector auto ! { dg-error "'auto' conflicts with other OpenACC loop specifiers" }
DO i = 1,10
ENDDO
!$acc end parallel
@@ -109,14 +109,14 @@ program test
!$acc parallel loop gang(static:*)
DO i = 1,10
ENDDO
- !$acc parallel loop seq gang ! { dg-error "conflicts with" }
+ !$acc parallel loop seq gang ! { dg-error "'seq' overrides other OpenACC loop specifiers" }
DO i = 1,10
ENDDO
!$acc parallel loop worker
DO i = 1,10
ENDDO
- !$acc parallel loop seq worker ! { dg-error "conflicts with" }
+ !$acc parallel loop seq worker ! { dg-error "'seq' overrides other OpenACC loop specifiers" }
DO i = 1,10
ENDDO
!$acc parallel loop gang worker
@@ -126,7 +126,7 @@ program test
!$acc parallel loop vector
DO i = 1,10
ENDDO
- !$acc parallel loop seq vector ! { dg-error "conflicts with" }
+ !$acc parallel loop seq vector ! { dg-error "'seq' overrides other OpenACC loop specifiers" }
DO i = 1,10
ENDDO
!$acc parallel loop gang vector
@@ -139,16 +139,16 @@ program test
!$acc parallel loop auto
DO i = 1,10
ENDDO
- !$acc parallel loop seq auto ! { dg-error "conflicts with" }
+ !$acc parallel loop seq auto ! { dg-error "'seq' overrides other OpenACC loop specifiers" }
DO i = 1,10
ENDDO
- !$acc parallel loop gang auto ! { dg-error "conflicts with" }
+ !$acc parallel loop gang auto ! { dg-error "'auto' conflicts with other OpenACC loop specifiers" }
DO i = 1,10
ENDDO
- !$acc parallel loop worker auto ! { dg-error "conflicts with" }
+ !$acc parallel loop worker auto ! { dg-error "'auto' conflicts with other OpenACC loop specifiers" }
DO i = 1,10
ENDDO
- !$acc parallel loop vector auto ! { dg-error "conflicts with" }
+ !$acc parallel loop vector auto ! { dg-error "'auto' conflicts with other OpenACC loop specifiers" }
DO i = 1,10
ENDDO
end
diff --git gcc/testsuite/gfortran.dg/goacc/nested-parallelism.f90 gcc/testsuite/gfortran.dg/goacc/nested-parallelism.f90
index 6ebef6a4547a..1c192892c160 100644
--- gcc/testsuite/gfortran.dg/goacc/nested-parallelism.f90
+++ gcc/testsuite/gfortran.dg/goacc/nested-parallelism.f90
@@ -6,7 +6,7 @@ program np
!$acc parallel loop gang
do i = 1, n
- !$acc loop gang ! { dg-error "gangs is not allowed inside another loop parallelized across gangs" }
+ !$acc loop gang ! { dg-error "inner loop uses same OpenACC parallelism as containing loop" }
do j = 1, n
end do
@@ -21,11 +21,11 @@ program np
!$acc parallel loop worker
do i = 1, n
- !$acc loop gang ! { dg-error "gangs is not allowed inside loop parallelized across workers" }
+ !$acc loop gang ! { dg-error "incorrectly nested OpenACC loop parallelism" }
do j = 1, n
end do
- !$acc loop worker ! { dg-error "workers is not allowed inside another loop parallelized across workers" }
+ !$acc loop worker ! { dg-error "inner loop uses same OpenACC parallelism as containing loop" }
do j = 1, n
end do
@@ -36,15 +36,15 @@ program np
!$acc parallel loop vector
do i = 1, n
- !$acc loop gang ! { dg-error "gangs is not allowed inside loop parallelized across vectors" }
+ !$acc loop gang ! { dg-error "incorrectly nested OpenACC loop parallelism" }
do j = 1, n
end do
- !$acc loop worker ! { dg-error "workers is not allowed inside another loop parallelized across vectors" }
+ !$acc loop worker ! { dg-error "incorrectly nested OpenACC loop parallelism" }
do j = 1, n
end do
- !$acc loop vector ! { dg-error "vectors is not allowed inside another loop parallelized across vectors" }
+ !$acc loop vector ! { dg-error "inner loop uses same OpenACC parallelism as containing loop" }
do j = 1, n
end do
end do
Grüße
Thomas
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: Use existing middle end checking for Fortran OpenACC loop clauses
2018-12-09 12:59 Use existing middle end checking for Fortran OpenACC loop clauses Thomas Schwinge
@ 2020-11-06 13:16 ` Thomas Schwinge
0 siblings, 0 replies; 2+ messages in thread
From: Thomas Schwinge @ 2020-11-06 13:16 UTC (permalink / raw)
To: gcc-patches, fortran
[-- Attachment #1: Type: text/plain, Size: 1275 bytes --]
Hi!
On 2018-12-09T13:58:51+0100, I wrote:
> Committed to trunk in r266922:
> Use existing middle end checking for Fortran OpenACC loop clauses
>
> Don't duplicate in the Fortran front end what's generically being checked in
> the middle end.
>
> gcc/fortran/
> * openmp.c (resolve_oacc_loop_blocks): Remove checking of OpenACC
> loop clauses.
> gcc/testsuite/
> * gfortran.dg/goacc/loop-2-kernels.f95: Update.
> * gfortran.dg/goacc/loop-2-parallel.f95: Likewise.
> * gfortran.dg/goacc/nested-parallelism.f90: Likewise.
Similar to that, I've noticed inconsistent diagnostics in C/C++ vs.
Fortran for OpenACC 'loop' clauses with arguments only allowed inside
OpenACC 'kernels' regions, so I pushed "[Fortran] Remove OpenACC 'loop'
inside 'parallel' special-case code" to master branch in commit
4c27f900950ed0ecb2897a8931c5cc348b1980be, and backported to
releases/gcc-10 in commit f41ca73aa11f28ad7d847ac5bf7e07f8bc763721, see
attached.
Grüße
Thomas
-----------------
Mentor Graphics (Deutschland) GmbH, Arnulfstraße 201, 80634 München / Germany
Registergericht München HRB 106955, Geschäftsführer: Thomas Heurung, Alexander Walter
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-Fortran-Remove-OpenACC-loop-inside-parallel-special-.patch --]
[-- Type: text/x-diff, Size: 5015 bytes --]
From 4c27f900950ed0ecb2897a8931c5cc348b1980be Mon Sep 17 00:00:00 2001
From: Thomas Schwinge <thomas@codesourcery.com>
Date: Tue, 27 Oct 2020 10:43:27 +0100
Subject: [PATCH] [Fortran] Remove OpenACC 'loop' inside 'parallel'
special-case code
Instead, use the generic middle-end code, like already used for Fortran OpenACC
'loop' inside other compute constructs, orphaned 'loop' constructs, and C, C++
generally.
gcc/fortran/
* openmp.c (oacc_is_parallel, resolve_oacc_params_in_parallel):
Remove.
(resolve_oacc_loop_blocks): Don't call the former.
gcc/testsuite/
* gfortran.dg/goacc/loop-2-parallel-3.f95: Adjust.
---
gcc/fortran/openmp.c | 37 -------------------
.../gfortran.dg/goacc/loop-2-parallel-3.f95 | 24 ++++++------
2 files changed, 12 insertions(+), 49 deletions(-)
diff --git a/gcc/fortran/openmp.c b/gcc/fortran/openmp.c
index 1891ac5591b..2270c858f39 100644
--- a/gcc/fortran/openmp.c
+++ b/gcc/fortran/openmp.c
@@ -6403,11 +6403,6 @@ resolve_omp_do (gfc_code *code)
}
}
-static bool
-oacc_is_parallel (gfc_code *code)
-{
- return code->op == EXEC_OACC_PARALLEL || code->op == EXEC_OACC_PARALLEL_LOOP;
-}
static gfc_statement
omp_code_to_statement (gfc_code *code)
@@ -6666,26 +6661,6 @@ resolve_oacc_nested_loops (gfc_code *code, gfc_code* do_code, int collapse,
}
-static void
-resolve_oacc_params_in_parallel (gfc_code *code, const char *clause,
- const char *arg)
-{
- fortran_omp_context *c;
-
- if (oacc_is_parallel (code))
- gfc_error ("!$ACC LOOP %s in PARALLEL region doesn't allow "
- "%s arguments at %L", clause, arg, &code->loc);
- for (c = omp_current_ctx; c; c = c->previous)
- {
- if (oacc_is_loop (c->code))
- break;
- if (oacc_is_parallel (c->code))
- gfc_error ("!$ACC LOOP %s in PARALLEL region doesn't allow "
- "%s arguments at %L", clause, arg, &code->loc);
- }
-}
-
-
static void
resolve_oacc_loop_blocks (gfc_code *code)
{
@@ -6697,18 +6672,6 @@ resolve_oacc_loop_blocks (gfc_code *code)
gfc_error ("Tiled loop cannot be parallelized across gangs, workers and "
"vectors at the same time at %L", &code->loc);
- if (code->ext.omp_clauses->gang
- && code->ext.omp_clauses->gang_num_expr)
- resolve_oacc_params_in_parallel (code, "GANG", "num");
-
- if (code->ext.omp_clauses->worker
- && code->ext.omp_clauses->worker_expr)
- resolve_oacc_params_in_parallel (code, "WORKER", "num");
-
- if (code->ext.omp_clauses->vector
- && code->ext.omp_clauses->vector_expr)
- resolve_oacc_params_in_parallel (code, "VECTOR", "length");
-
if (code->ext.omp_clauses->tile_list)
{
gfc_expr_list *el;
diff --git a/gcc/testsuite/gfortran.dg/goacc/loop-2-parallel-3.f95 b/gcc/testsuite/gfortran.dg/goacc/loop-2-parallel-3.f95
index 03cae74c022..5379fba16ed 100644
--- a/gcc/testsuite/gfortran.dg/goacc/loop-2-parallel-3.f95
+++ b/gcc/testsuite/gfortran.dg/goacc/loop-2-parallel-3.f95
@@ -5,52 +5,52 @@ program test
integer :: i
!$acc parallel
- !$acc loop gang(5) ! { dg-error "num arguments" }
+ !$acc loop gang(5) ! { dg-error "argument not permitted" }
DO i = 1,10
ENDDO
- !$acc loop gang(num:5) ! { dg-error "num arguments" }
+ !$acc loop gang(num:5) ! { dg-error "argument not permitted" }
DO i = 1,10
ENDDO
- !$acc loop worker(5) ! { dg-error "num arguments" }
+ !$acc loop worker(5) ! { dg-error "argument not permitted" }
DO i = 1,10
ENDDO
- !$acc loop worker(num:5) ! { dg-error "num arguments" }
+ !$acc loop worker(num:5) ! { dg-error "argument not permitted" }
DO i = 1,10
ENDDO
- !$acc loop vector(5) ! { dg-error "length arguments" }
+ !$acc loop vector(5) ! { dg-error "argument not permitted" }
DO i = 1,10
ENDDO
- !$acc loop vector(length:5) ! { dg-error "length arguments" }
+ !$acc loop vector(length:5) ! { dg-error "argument not permitted" }
DO i = 1,10
ENDDO
!$acc end parallel
- !$acc parallel loop gang(5) ! { dg-error "num arguments" }
+ !$acc parallel loop gang(5) ! { dg-error "argument not permitted" }
DO i = 1,10
ENDDO
- !$acc parallel loop gang(num:5) ! { dg-error "num arguments" }
+ !$acc parallel loop gang(num:5) ! { dg-error "argument not permitted" }
DO i = 1,10
ENDDO
- !$acc parallel loop worker(5) ! { dg-error "num arguments" }
+ !$acc parallel loop worker(5) ! { dg-error "argument not permitted" }
DO i = 1,10
ENDDO
- !$acc parallel loop worker(num:5) ! { dg-error "num arguments" }
+ !$acc parallel loop worker(num:5) ! { dg-error "argument not permitted" }
DO i = 1,10
ENDDO
- !$acc parallel loop vector(5) ! { dg-error "length arguments" }
+ !$acc parallel loop vector(5) ! { dg-error "argument not permitted" }
DO i = 1,10
ENDDO
- !$acc parallel loop vector(length:5) ! { dg-error "length arguments" }
+ !$acc parallel loop vector(length:5) ! { dg-error "argument not permitted" }
DO i = 1,10
ENDDO
end
--
2.17.1
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #3: 0001-Fortran-Remove-OpenACC-loop-inside-parallel-spec.g10.patch --]
[-- Type: text/x-diff, Size: 5085 bytes --]
From f41ca73aa11f28ad7d847ac5bf7e07f8bc763721 Mon Sep 17 00:00:00 2001
From: Thomas Schwinge <thomas@codesourcery.com>
Date: Tue, 27 Oct 2020 10:43:27 +0100
Subject: [PATCH] [Fortran] Remove OpenACC 'loop' inside 'parallel'
special-case code
Instead, use the generic middle-end code, like already used for Fortran OpenACC
'loop' inside other compute constructs, orphaned 'loop' constructs, and C, C++
generally.
gcc/fortran/
* openmp.c (oacc_is_parallel, resolve_oacc_params_in_parallel):
Remove.
(resolve_oacc_loop_blocks): Don't call the former.
gcc/testsuite/
* gfortran.dg/goacc/loop-2-parallel-3.f95: Adjust.
(cherry picked from commit 4c27f900950ed0ecb2897a8931c5cc348b1980be)
---
gcc/fortran/openmp.c | 37 -------------------
.../gfortran.dg/goacc/loop-2-parallel-3.f95 | 24 ++++++------
2 files changed, 12 insertions(+), 49 deletions(-)
diff --git a/gcc/fortran/openmp.c b/gcc/fortran/openmp.c
index 4f472dbc936..3175999dd4a 100644
--- a/gcc/fortran/openmp.c
+++ b/gcc/fortran/openmp.c
@@ -5895,11 +5895,6 @@ resolve_omp_do (gfc_code *code)
}
}
-static bool
-oacc_is_parallel (gfc_code *code)
-{
- return code->op == EXEC_OACC_PARALLEL || code->op == EXEC_OACC_PARALLEL_LOOP;
-}
static gfc_statement
omp_code_to_statement (gfc_code *code)
@@ -6158,26 +6153,6 @@ resolve_oacc_nested_loops (gfc_code *code, gfc_code* do_code, int collapse,
}
-static void
-resolve_oacc_params_in_parallel (gfc_code *code, const char *clause,
- const char *arg)
-{
- fortran_omp_context *c;
-
- if (oacc_is_parallel (code))
- gfc_error ("!$ACC LOOP %s in PARALLEL region doesn't allow "
- "%s arguments at %L", clause, arg, &code->loc);
- for (c = omp_current_ctx; c; c = c->previous)
- {
- if (oacc_is_loop (c->code))
- break;
- if (oacc_is_parallel (c->code))
- gfc_error ("!$ACC LOOP %s in PARALLEL region doesn't allow "
- "%s arguments at %L", clause, arg, &code->loc);
- }
-}
-
-
static void
resolve_oacc_loop_blocks (gfc_code *code)
{
@@ -6189,18 +6164,6 @@ resolve_oacc_loop_blocks (gfc_code *code)
gfc_error ("Tiled loop cannot be parallelized across gangs, workers and "
"vectors at the same time at %L", &code->loc);
- if (code->ext.omp_clauses->gang
- && code->ext.omp_clauses->gang_num_expr)
- resolve_oacc_params_in_parallel (code, "GANG", "num");
-
- if (code->ext.omp_clauses->worker
- && code->ext.omp_clauses->worker_expr)
- resolve_oacc_params_in_parallel (code, "WORKER", "num");
-
- if (code->ext.omp_clauses->vector
- && code->ext.omp_clauses->vector_expr)
- resolve_oacc_params_in_parallel (code, "VECTOR", "length");
-
if (code->ext.omp_clauses->tile_list)
{
gfc_expr_list *el;
diff --git a/gcc/testsuite/gfortran.dg/goacc/loop-2-parallel-3.f95 b/gcc/testsuite/gfortran.dg/goacc/loop-2-parallel-3.f95
index 03cae74c022..5379fba16ed 100644
--- a/gcc/testsuite/gfortran.dg/goacc/loop-2-parallel-3.f95
+++ b/gcc/testsuite/gfortran.dg/goacc/loop-2-parallel-3.f95
@@ -5,52 +5,52 @@ program test
integer :: i
!$acc parallel
- !$acc loop gang(5) ! { dg-error "num arguments" }
+ !$acc loop gang(5) ! { dg-error "argument not permitted" }
DO i = 1,10
ENDDO
- !$acc loop gang(num:5) ! { dg-error "num arguments" }
+ !$acc loop gang(num:5) ! { dg-error "argument not permitted" }
DO i = 1,10
ENDDO
- !$acc loop worker(5) ! { dg-error "num arguments" }
+ !$acc loop worker(5) ! { dg-error "argument not permitted" }
DO i = 1,10
ENDDO
- !$acc loop worker(num:5) ! { dg-error "num arguments" }
+ !$acc loop worker(num:5) ! { dg-error "argument not permitted" }
DO i = 1,10
ENDDO
- !$acc loop vector(5) ! { dg-error "length arguments" }
+ !$acc loop vector(5) ! { dg-error "argument not permitted" }
DO i = 1,10
ENDDO
- !$acc loop vector(length:5) ! { dg-error "length arguments" }
+ !$acc loop vector(length:5) ! { dg-error "argument not permitted" }
DO i = 1,10
ENDDO
!$acc end parallel
- !$acc parallel loop gang(5) ! { dg-error "num arguments" }
+ !$acc parallel loop gang(5) ! { dg-error "argument not permitted" }
DO i = 1,10
ENDDO
- !$acc parallel loop gang(num:5) ! { dg-error "num arguments" }
+ !$acc parallel loop gang(num:5) ! { dg-error "argument not permitted" }
DO i = 1,10
ENDDO
- !$acc parallel loop worker(5) ! { dg-error "num arguments" }
+ !$acc parallel loop worker(5) ! { dg-error "argument not permitted" }
DO i = 1,10
ENDDO
- !$acc parallel loop worker(num:5) ! { dg-error "num arguments" }
+ !$acc parallel loop worker(num:5) ! { dg-error "argument not permitted" }
DO i = 1,10
ENDDO
- !$acc parallel loop vector(5) ! { dg-error "length arguments" }
+ !$acc parallel loop vector(5) ! { dg-error "argument not permitted" }
DO i = 1,10
ENDDO
- !$acc parallel loop vector(length:5) ! { dg-error "length arguments" }
+ !$acc parallel loop vector(length:5) ! { dg-error "argument not permitted" }
DO i = 1,10
ENDDO
end
--
2.17.1
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-11-06 13:16 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-12-09 12:59 Use existing middle end checking for Fortran OpenACC loop clauses Thomas Schwinge
2020-11-06 13:16 ` Thomas Schwinge
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).