From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 7845) id 6F743385AC29; Tue, 25 Oct 2022 15:15:05 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 6F743385AC29 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1666710905; bh=CmU+SiLmwXkoYvW6Z3jYX3iVdvQulF/F/b5gBMc7448=; h=From:To:Subject:Date:From; b=PBHOtG37IYy1isSWc72tkUqQ+YIV+n3rGMKGQFPcuZjCwKzmHgPoAiVUF7PgEx1mx c7KKgInkVUKcdPmyKrsjJvGuC3oxbnh2pFKx4lMSJWMGpBpOcfvMIyk1Z5eL6h4Nvb BuJCVQ34pXkOwRoorXUvvOjtW0Wfye/cb6196kfw= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Marcel Vollweiler To: gcc-cvs@gcc.gnu.org Subject: [gcc/devel/omp/gcc-12] OpenAcc: Correction of reduction enhancement X-Act-Checkin: gcc X-Git-Author: Marcel Vollweiler X-Git-Refname: refs/heads/devel/omp/gcc-12 X-Git-Oldrev: e0322c67969405001d39cf5bb40ddf545b630779 X-Git-Newrev: 4226421e6d6d4f94706ed92082581661cedf8071 Message-Id: <20221025151505.6F743385AC29@sourceware.org> Date: Tue, 25 Oct 2022 15:15:05 +0000 (GMT) List-Id: https://gcc.gnu.org/g:4226421e6d6d4f94706ed92082581661cedf8071 commit 4226421e6d6d4f94706ed92082581661cedf8071 Author: Marcel Vollweiler Date: Tue Oct 25 08:12:42 2022 -0700 OpenAcc: Correction of reduction enhancement Commit bce2c92cfec2ae1eb9d79e36dff5a220b688bfa1 "Various OpenACC reduction enhancements - ME and nvptx changes" introduced several regressions: gcc/testsuite/c-c++-common/goacc/nested-reductions-1-routine.c gcc/testsuite/c-c++-common/goacc/nested-reductions-2-routine.c gcc/testsuite/c-c++-common/goacc/orphan-reductions-2.c gcc/testsuite/gfortran.dg/goacc/nested-reductions-1-routine.f90 gcc/testsuite/gfortran.dg/goacc/nested-reductions-2-routine.f90 gcc/testsuite/gfortran.dg/goacc/orphan-reductions-2.f90 This fixes above regressions. gcc/ChangeLog: * omp-offload.cc (oacc_loop_auto_partitions): Removed OLF reduction handling. Diff: --- gcc/ChangeLog.omp | 5 +++++ gcc/omp-offload.cc | 7 ------- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/gcc/ChangeLog.omp b/gcc/ChangeLog.omp index 68d5eea01a7..9b2a2007ac1 100644 --- a/gcc/ChangeLog.omp +++ b/gcc/ChangeLog.omp @@ -1,3 +1,8 @@ +2022-10-25 Marcel Vollweiler + + * omp-offload.cc (oacc_loop_auto_partitions): Removed OLF reduction + handling. + 2022-10-24 Andrew Stubbs * tree-vect-data-refs.cc (vect_analyze_data_refs): Workaround an diff --git a/gcc/omp-offload.cc b/gcc/omp-offload.cc index 979bc0badb2..b18f28f86b9 100644 --- a/gcc/omp-offload.cc +++ b/gcc/omp-offload.cc @@ -2265,13 +2265,6 @@ oacc_loop_auto_partitions (oacc_loop *loop, unsigned outer_mask, non-innermost available level. */ unsigned this_mask = GOMP_DIM_MASK (GOMP_DIM_GANG); - /* Orphan reductions cannot have gang partitioning. */ - if ((loop->flags & OLF_REDUCTION) - && oacc_get_fn_attrib (current_function_decl) - && !lookup_attribute ("omp target entrypoint", - DECL_ATTRIBUTES (current_function_decl))) - this_mask = GOMP_DIM_MASK (GOMP_DIM_WORKER); - /* Find the first outermost available partition. */ while (this_mask <= outer_mask) this_mask <<= 1;