From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from esa3.mentor.iphmx.com (esa3.mentor.iphmx.com [68.232.137.180]) by sourceware.org (Postfix) with ESMTPS id 86AC73858D28; Tue, 30 Nov 2021 12:14:00 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 86AC73858D28 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=codesourcery.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=mentor.com IronPort-SDR: dcvQ5/lscnQ6dPlvmGvs3Wpj3rc8EODkc2ANntdEqg24GezxPGiOh7DXVp7XLe7K2OU9wiUUWR FQcMfx+piXwRWtliTeBax+XN/tAPlje6/cwV0ww+RZ4gMCV2AE1aDu0sTDbq/cgWrxcqYa0KOQ qlu2J4t9C86xggXEE/d+6FBxaPrFYoMMhD8PIN6vpVE4BRuo73wg4N4Q70463L4YCU8s81h2ib b6JsNLvcVJG17RuNOELeYRpkfAtGdsgOFLfIAFwVDIE6q2hs5/QCZkI0Eb5+2tTtttLk4cruRT JszkCkPxfYrt9wxrSoiBD7zN X-IronPort-AV: E=Sophos;i="5.87,275,1631606400"; d="scan'208,223";a="68938743" Received: from orw-gwy-01-in.mentorg.com ([192.94.38.165]) by esa3.mentor.iphmx.com with ESMTP; 30 Nov 2021 04:14:00 -0800 IronPort-SDR: QJS5w9mQa4lxyeuqe6YQMFGVhDdqi0I9xxIFm0KHfxNdsCOv+8WbyCv9+si6O45oa5SYCU/Rp0 H5ViIxv12UB8HDcTpyIBntPcf7r9glBENaO5l4yhk/S3VVhNz+g1PlsnHwH0z741xrMMnNxoxP 74VTrHvsdRhCOZSKH/DuD3uirq+VTSIbBf8vTd1v1Ho+f7s59/aOoQ+HafHR44GPiJANZMhn6u hAl/VOijUxZ6M0XnONLsrGbrm7mUrhx/lCUmQZb2wr7SijkI4YpmF/zenacsN08QzSjUiRyjN2 YuI= From: Thomas Schwinge To: , Subject: Re: [gomp4] Make OpenACC orphan gang reductions errors In-Reply-To: <91521931-373f-a3a6-7a3f-1752f08858a1@codesourcery.com> References: <91521931-373f-a3a6-7a3f-1752f08858a1@codesourcery.com> User-Agent: Notmuch/0.29.3+94~g74c3f1b (https://notmuchmail.org) Emacs/27.1 (x86_64-pc-linux-gnu) Date: Tue, 30 Nov 2021 13:13:52 +0100 Message-ID: <87h7btx2m7.fsf@euler.schwinge.homeip.net> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Originating-IP: [137.202.0.90] X-ClientProxiedBy: svr-ies-mbx-02.mgc.mentorg.com (139.181.222.2) To svr-ies-mbx-01.mgc.mentorg.com (139.181.222.1) X-Spam-Status: No, score=-12.1 required=5.0 tests=BAYES_00, GIT_PATCH_0, HEADER_FROM_DIFFERENT_DOMAINS, KAM_DMARC_STATUS, SPF_HELO_PASS, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: fortran@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Fortran mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 30 Nov 2021 12:14:02 -0000 --=-=-= Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Hi! On 2017-05-01T18:27:59-0700, Cesar Philippidis wro= te: > gcc/c/ > * c-typeck.c (c_finish_omp_clauses): Emit an error on orphan OpenAC= C > gang reductions. > > gcc/cp/ > * semantics.c (finish_omp_clauses): Emit an error on orphan OpenACC > gang reductions. > > gcc/fortran/ > * openmp.c (resolve_oacc_loop_blocks): Emit an error on orphan Open= ACC > gang reductions. As a follow-up, I've pushed to master branch commit 77d24d43644909852998043335b5a0e09d1e8f02 'Consolidate OpenACC "gang reduction on an orphan loop" checking', see attached. Gr=C3=BC=C3=9Fe Thomas ----------------- Siemens Electronic Design Automation GmbH; Anschrift: Arnulfstra=C3=9Fe 201= , 80634 M=C3=BCnchen; Gesellschaft mit beschr=C3=A4nkter Haftung; Gesch=C3= =A4ftsf=C3=BChrer: Thomas Heurung, Frank Th=C3=BCrauf; Sitz der Gesellschaf= t: M=C3=BCnchen; Registergericht M=C3=BCnchen, HRB 106955 --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename="0001-Consolidate-OpenACC-gang-reduction-on-an-orphan-loop.patch" >From 77d24d43644909852998043335b5a0e09d1e8f02 Mon Sep 17 00:00:00 2001 From: Thomas Schwinge Date: Fri, 26 Nov 2021 12:29:26 +0100 Subject: [PATCH] Consolidate OpenACC "gang reduction on an orphan loop" checking No need to implement separately in all front ends what we may implement in the middle end, once for all. Follow-up to preceding commit 2b7dac2c0dcb087da9e4018943c023c0678234a3 "Make OpenACC orphan gang reductions errors". gcc/ * omp-offload.c (oacc_loop_process): Implement "gang reduction on an orphan loop" checking. gcc/c/ * c-typeck.c (c_finish_omp_clauses): Remove "gang reduction on an orphan loop" checking. gcc/cp/ * semantics.c (finish_omp_clauses): Remove "gang reduction on an orphan loop" checking. gcc/fortran/ * openmp.c (resolve_oacc_loop_blocks): Remove "gang reduction on an orphan loop" checking. (oacc_is_parallel, oacc_is_kernels, oacc_is_serial) (oacc_is_compute_construct): Remove. gcc/testsuite/ * gfortran.dg/goacc/orphan-reductions-1.f90: Adjust. --- gcc/c/c-typeck.c | 8 ---- gcc/cp/semantics.c | 8 ---- gcc/fortran/openmp.c | 37 ------------------- gcc/omp-offload.c | 20 ++++++++-- .../gfortran.dg/goacc/orphan-reductions-1.f90 | 8 ++-- 5 files changed, 20 insertions(+), 61 deletions(-) diff --git a/gcc/c/c-typeck.c b/gcc/c/c-typeck.c index a025740e618..7524304f2bd 100644 --- a/gcc/c/c-typeck.c +++ b/gcc/c/c-typeck.c @@ -14135,14 +14135,6 @@ c_finish_omp_clauses (tree clauses, enum c_omp_region_type ort) goto check_dup_generic; case OMP_CLAUSE_REDUCTION: - if (ort == C_ORT_ACC && oacc_get_fn_attrib (current_function_decl) - && omp_find_clause (clauses, OMP_CLAUSE_GANG)) - { - error_at (OMP_CLAUSE_LOCATION (c), - "gang reduction on an orphan loop"); - remove = true; - break; - } if (reduction_seen == 0) reduction_seen = OMP_CLAUSE_REDUCTION_INSCAN (c) ? -1 : 1; else if (reduction_seen != -2 diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c index c84caf43251..cd1956497f8 100644 --- a/gcc/cp/semantics.c +++ b/gcc/cp/semantics.c @@ -6667,14 +6667,6 @@ finish_omp_clauses (tree clauses, enum c_omp_region_type ort) field_ok = ((ort & C_ORT_OMP_DECLARE_SIMD) == C_ORT_OMP); goto check_dup_generic; case OMP_CLAUSE_REDUCTION: - if (ort == C_ORT_ACC && oacc_get_fn_attrib (current_function_decl) - && omp_find_clause (clauses, OMP_CLAUSE_GANG)) - { - error_at (OMP_CLAUSE_LOCATION (c), - "gang reduction on an orphan loop"); - remove = true; - break; - } if (reduction_seen == 0) reduction_seen = OMP_CLAUSE_REDUCTION_INSCAN (c) ? -1 : 1; else if (reduction_seen != -2 diff --git a/gcc/fortran/openmp.c b/gcc/fortran/openmp.c index 7950c7fb43d..d120be81467 100644 --- a/gcc/fortran/openmp.c +++ b/gcc/fortran/openmp.c @@ -8322,31 +8322,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 bool -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_compute_construct (gfc_code *code) -{ - return (oacc_is_parallel (code) - || oacc_is_kernels (code) - || oacc_is_serial (code)); -} static gfc_statement omp_code_to_statement (gfc_code *code) @@ -8650,18 +8625,6 @@ resolve_oacc_loop_blocks (gfc_code *code) if (!oacc_is_loop (code)) return; - if (code->op == EXEC_OACC_LOOP - && code->ext.omp_clauses->lists[OMP_LIST_REDUCTION] - && code->ext.omp_clauses->gang) - { - fortran_omp_context *c; - for (c = omp_current_ctx; c; c = c->previous) - if (!oacc_is_loop (c->code)) - break; - if (c == NULL || !(oacc_is_compute_construct (c->code))) - gfc_error ("gang reduction on an orphan loop 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 a/gcc/omp-offload.c b/gcc/omp-offload.c index 0aec26b04e7..5110a424584 100644 --- a/gcc/omp-offload.c +++ b/gcc/omp-offload.c @@ -1380,10 +1380,10 @@ oacc_loop_xform_head_tail (gcall *from, int level) partitioning level etc. */ static void -oacc_loop_process (oacc_loop *loop) +oacc_loop_process (oacc_loop *loop, int fn_level) { if (loop->child) - oacc_loop_process (loop->child); + oacc_loop_process (loop->child, fn_level); if (loop->mask && !loop->routine) { @@ -1432,7 +1432,19 @@ oacc_loop_process (oacc_loop *loop) } if (loop->sibling) - oacc_loop_process (loop->sibling); + oacc_loop_process (loop->sibling, fn_level); + + + /* OpenACC 2.6, 2.9.11. "reduction clause" places a restriction such that + "The 'reduction' clause may not be specified on an orphaned 'loop' + construct with the 'gang' clause, or on an orphaned 'loop' construct that + will generate gang parallelism in a procedure that is compiled with the + 'routine gang' clause." */ + if (fn_level == GOMP_DIM_GANG + && (loop->mask & GOMP_DIM_MASK (GOMP_DIM_GANG)) + && (loop->flags & OLF_REDUCTION)) + error_at (loop->loc, + "gang reduction on an orphan loop"); } /* Walk the OpenACC loop heirarchy checking and assigning the @@ -2072,7 +2084,7 @@ execute_oacc_loop_designation () if (is_oacc_parallel_kernels_gang_single) gcc_checking_assert (dims[GOMP_DIM_GANG] == 1); - oacc_loop_process (loops); + oacc_loop_process (loops, fn_level); if (dump_file) { fprintf (dump_file, "OpenACC loops\n"); diff --git a/gcc/testsuite/gfortran.dg/goacc/orphan-reductions-1.f90 b/gcc/testsuite/gfortran.dg/goacc/orphan-reductions-1.f90 index c7fcc9d4ac5..464dee1260a 100644 --- a/gcc/testsuite/gfortran.dg/goacc/orphan-reductions-1.f90 +++ b/gcc/testsuite/gfortran.dg/goacc/orphan-reductions-1.f90 @@ -30,7 +30,7 @@ end subroutine s1 subroutine s2 implicit none - !$acc routine worker + !$acc routine gang integer, parameter :: n = 100 integer :: i, j, sum @@ -80,7 +80,7 @@ end function f1 integer function f2 () implicit none - !$acc routine worker + !$acc routine gang integer, parameter :: n = 100 integer :: i, j, sum @@ -132,7 +132,7 @@ contains subroutine s4 implicit none - !$acc routine worker + !$acc routine gang integer, parameter :: n = 100 integer :: i, j, sum @@ -182,7 +182,7 @@ contains integer function f4 () implicit none - !$acc routine worker + !$acc routine gang integer, parameter :: n = 100 integer :: i, j, sum -- 2.33.0 --=-=-=--