From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1643) id CBD093857406; Tue, 30 Nov 2021 12:00:12 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org CBD093857406 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Thomas Schwinge To: gcc-cvs@gcc.gnu.org Subject: [gcc r12-5619] [OpenACC] Allow gang reductions inside serial constructs X-Act-Checkin: gcc X-Git-Author: Kwok Cheung Yeung X-Git-Refname: refs/heads/master X-Git-Oldrev: 2b7dac2c0dcb087da9e4018943c023c0678234a3 X-Git-Newrev: f1a58ab0db20c0862e8b5039bd448fc8c9799cac Message-Id: <20211130120012.CBD093857406@sourceware.org> Date: Tue, 30 Nov 2021 12:00:12 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 30 Nov 2021 12:00:12 -0000 https://gcc.gnu.org/g:f1a58ab0db20c0862e8b5039bd448fc8c9799cac commit r12-5619-gf1a58ab0db20c0862e8b5039bd448fc8c9799cac Author: Kwok Cheung Yeung Date: Fri Mar 13 11:13:49 2020 -0700 [OpenACC] Allow gang reductions inside serial constructs ... fixing a regression introduced in the preceding commit 2b7dac2c0dcb087da9e4018943c023c0678234a3 "Make OpenACC orphan gang reductions errors". gcc/fortran/ * openmp.c (oacc_is_serial, oacc_is_parallel_or_serial): New. (resolve_oacc_loop_blocks): Use oacc_is_parallel_or_serial instead of oacc_is_parallel. libgomp/ * testsuite/libgomp.oacc-fortran/parallel-dims.f90: Remove temporary skip. Co-Authored-By: Thomas Schwinge Diff: --- gcc/fortran/openmp.c | 14 +++++++++++++- libgomp/testsuite/libgomp.oacc-fortran/parallel-dims.f90 | 1 - 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/gcc/fortran/openmp.c b/gcc/fortran/openmp.c index 4fa38691c01..b4100577e51 100644 --- a/gcc/fortran/openmp.c +++ b/gcc/fortran/openmp.c @@ -8334,6 +8334,18 @@ oacc_is_kernels (gfc_code *code) return code->op == EXEC_OACC_KERNELS || code->op == EXEC_OACC_KERNELS_LOOP; } +static bool +oacc_is_serial (gfc_code *code) +{ + return code->op == EXEC_OACC_SERIAL || code->op == EXEC_OACC_SERIAL_LOOP; +} + +static bool +oacc_is_parallel_or_serial (gfc_code *code) +{ + return oacc_is_parallel (code) || oacc_is_serial (code); +} + static gfc_statement omp_code_to_statement (gfc_code *code) { @@ -8644,7 +8656,7 @@ resolve_oacc_loop_blocks (gfc_code *code) for (c = omp_current_ctx; c; c = c->previous) if (!oacc_is_loop (c->code)) break; - if (c == NULL || !(oacc_is_parallel (c->code) + if (c == NULL || !(oacc_is_parallel_or_serial (c->code) || oacc_is_kernels (c->code))) gfc_error ("gang reduction on an orphan loop at %L", &code->loc); } diff --git a/libgomp/testsuite/libgomp.oacc-fortran/parallel-dims.f90 b/libgomp/testsuite/libgomp.oacc-fortran/parallel-dims.f90 index 80d64030414..fad3d9d6a80 100644 --- a/libgomp/testsuite/libgomp.oacc-fortran/parallel-dims.f90 +++ b/libgomp/testsuite/libgomp.oacc-fortran/parallel-dims.f90 @@ -3,7 +3,6 @@ ! { dg-additional-sources parallel-dims-aux.c } ! { dg-do run } - ! { dg-skip-if TODO { *-*-* } } ! { dg-prune-output "command-line option '-fintrinsic-modules-path=.*' is valid for Fortran but not for C" } ! { dg-additional-options "-fopt-info-note-omp" }