[gcc/devel/omp/gcc-12] OpenAcc: Correction of reduction enhancement

[gcc/devel/omp/gcc-12] OpenAcc: Correction of reduction enhancement

[Marcel Vollweiler]

https://gcc.gnu.org/g:4226421e6d6d4f94706ed92082581661cedf8071

commit 4226421e6d6d4f94706ed92082581661cedf8071
Author: Marcel Vollweiler <marcel@codesourcery.com>
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  <marcel@codesourcery.com>
+
+	* omp-offload.cc (oacc_loop_auto_partitions): Removed OLF reduction
+	handling.
+
 2022-10-24  Andrew Stubbs  <ams@codesourcery.com>
 
 	* 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;