Update for asbent dim

Author: clementval

flang/include/flang/Optimizer/Builder/IntrinsicCall.h

@@ -328,6 +328,8 @@ struct IntrinsicLibrary {
   void genRandomNumber(llvm::ArrayRef<fir::ExtendedValue>);
   void genRandomSeed(llvm::ArrayRef<fir::ExtendedValue>);
   fir::ExtendedValue genReduce(mlir::Type, llvm::ArrayRef<fir::ExtendedValue>);
+  fir::ExtendedValue genReduceDim(mlir::Type,
+                                  llvm::ArrayRef<fir::ExtendedValue>);
   fir::ExtendedValue genRepeat(mlir::Type, llvm::ArrayRef<fir::ExtendedValue>);
   fir::ExtendedValue genReshape(mlir::Type, llvm::ArrayRef<fir::ExtendedValue>);
   mlir::Value genRRSpacing(mlir::Type resultType,

flang/include/flang/Optimizer/Builder/Runtime/Reduction.h

@@ -228,9 +228,8 @@ void genIParityDim(fir::FirOpBuilder &builder, mlir::Location loc,
 /// that does not take a dim argument.
 mlir::Value genReduce(fir::FirOpBuilder &builder, mlir::Location loc,
                       mlir::Value arrayBox, mlir::Value operation,
-                      mlir::Value dim, mlir::Value maskBox,
-                      mlir::Value identity, mlir::Value ordered,
-                      mlir::Value resultBox);
+                      mlir::Value maskBox, mlir::Value identity,
+                      mlir::Value ordered, mlir::Value resultBox);
 
 } // namespace fir::runtime
 

flang/lib/Optimizer/Builder/IntrinsicCall.cpp

@@ -5749,9 +5749,7 @@ IntrinsicLibrary::genReduce(mlir::Type resultType,
   mlir::Type eleTy = mlir::cast<fir::SequenceType>(arrTy).getEleTy();
 
   // Handle optional mask argument
-  auto dim = isStaticallyAbsent(args[3])
-                 ? builder.createIntegerConstant(loc, builder.getI32Type(), 1)
-                 : fir::getBase(args[2]);
+  bool absentDim = isStaticallyAbsent(args[1]);
 
   auto mask = isStaticallyAbsent(args[3])
                   ? builder.create<fir::AbsentOp>(
@@ -5769,11 +5767,11 @@ IntrinsicLibrary::genReduce(mlir::Type resultType,
 
   // We call the type specific versions because the result is scalar
   // in the case below.
-  if (rank == 1) {
+  if (absentDim || rank == 1) {
     if (fir::isa_complex(eleTy) || fir::isa_derived(eleTy)) {
       mlir::Value result = builder.createTemporary(loc, eleTy);
-      fir::runtime::genReduce(builder, loc, array, operation, dim, mask,
-                              identity, ordered, result);
+      fir::runtime::genReduce(builder, loc, array, operation, mask, identity,
+                              ordered, result);
       if (fir::isa_derived(eleTy))
         return result;
       return builder.create<fir::LoadOp>(loc, result);
@@ -5784,18 +5782,17 @@ IntrinsicLibrary::genReduce(mlir::Type resultType,
           fir::factory::createTempMutableBox(builder, loc, eleTy);
       mlir::Value resultIrBox =
           fir::factory::getMutableIRBox(builder, loc, resultMutableBox);
-      fir::runtime::genReduce(builder, loc, array, operation, dim, mask,
-                              identity, ordered, resultIrBox);
+      fir::runtime::genReduce(builder, loc, array, operation, mask, identity,
+                              ordered, resultIrBox);
       // Handle cleanup of allocatable result descriptor and return
       return readAndAddCleanUp(resultMutableBox, resultType, "REDUCE");
     }
     auto resultBox = builder.create<fir::AbsentOp>(
         loc, fir::BoxType::get(builder.getI1Type()));
-    return fir::runtime::genReduce(builder, loc, array, operation, dim, mask,
+    return fir::runtime::genReduce(builder, loc, array, operation, mask,
                                    identity, ordered, resultBox);
   }
-
-  TODO(loc, "intrinsic: reduce with non scalar result");
+  TODO(loc, "reduce with array result");
 }
 
 // REPEAT

flang/lib/Optimizer/Builder/Runtime/Reduction.cpp

@@ -1322,14 +1322,14 @@ GEN_IALL_IANY_IPARITY(IParity)
 /// that does have a scalar result.
 mlir::Value fir::runtime::genReduce(fir::FirOpBuilder &builder,
                                     mlir::Location loc, mlir::Value arrayBox,
-                                    mlir::Value operation, mlir::Value dim,
-                                    mlir::Value maskBox, mlir::Value identity,
-                                    mlir::Value ordered,
+                                    mlir::Value operation, mlir::Value maskBox,
+                                    mlir::Value identity, mlir::Value ordered,
                                     mlir::Value resultBox) {
   mlir::func::FuncOp func;
   auto ty = arrayBox.getType();
   auto arrTy = fir::dyn_cast_ptrOrBoxEleTy(ty);
   auto eleTy = mlir::cast<fir::SequenceType>(arrTy).getEleTy();
+  auto dim = builder.createIntegerConstant(loc, builder.getI32Type(), 1);
 
   mlir::MLIRContext *ctx = builder.getContext();
   fir::factory::CharacterExprHelper charHelper{builder, loc};

flang/test/Lower/Intrinsics/reduce.f90

@@ -20,11 +20,11 @@ subroutine integer1(a, id)
 
   res = reduce(a, red_int1)
 
-  res = reduce(a, red_int1, 1, identity=id)
+  res = reduce(a, red_int1, identity=id)
 
-  res = reduce(a, red_int1, 1, identity=id, ordered = .false.)
+  res = reduce(a, red_int1, identity=id, ordered = .false.)
 
-  res = reduce(a, red_int1, 1, [.true., .true., .false.])
+  res = reduce(a, red_int1, [.true., .true., .false.])
 end subroutine
 
 ! CHECK-LABEL: func.func @_QMreduce_modPinteger1(
@@ -65,7 +65,7 @@ pure function red_int2(a,b)
 subroutine integer2(a)
   integer(2), intent(in) :: a(:)
   integer(2) :: res
-  res = reduce(a, red_int2, 1)
+  res = reduce(a, red_int2)
 end subroutine
 
 ! CHECK: fir.call @_FortranAReduceInteger2
@@ -79,7 +79,7 @@ pure function red_int4(a,b)
 subroutine integer4(a)
   integer(4), intent(in) :: a(:)
   integer(4) :: res
-  res = reduce(a, red_int4, 1)
+  res = reduce(a, red_int4)
 end subroutine
 
 ! CHECK: fir.call @_FortranAReduceInteger4
@@ -93,7 +93,7 @@ pure function red_int8(a,b)
 subroutine integer8(a)
   integer(8), intent(in) :: a(:)
   integer(8) :: res
-  res = reduce(a, red_int8, 1)
+  res = reduce(a, red_int8)
 end subroutine
 
 ! CHECK: fir.call @_FortranAReduceInteger8
@@ -107,7 +107,7 @@ pure function red_int16(a,b)
 subroutine integer16(a)
   integer(16), intent(in) :: a(:)
   integer(16) :: res
-  res = reduce(a, red_int16, 1)
+  res = reduce(a, red_int16)
 end subroutine
 
 ! CHECK: fir.call @_FortranAReduceInteger16
@@ -121,7 +121,7 @@ pure function red_real2(a,b)
 subroutine real2(a)
   real(2), intent(in) :: a(:)
   real(2) :: res
-  res = reduce(a, red_real2, 1)
+  res = reduce(a, red_real2)
 end subroutine
 
 ! CHECK: fir.call @_FortranAReduceReal2
@@ -135,7 +135,7 @@ pure function red_real3(a,b)
 subroutine real3(a)
   real(3), intent(in) :: a(:)
   real(3) :: res
-  res = reduce(a, red_real3, 1)
+  res = reduce(a, red_real3)
 end subroutine
 
 ! CHECK: fir.call @_FortranAReduceReal3
@@ -149,7 +149,7 @@ pure function red_real4(a,b)
 subroutine real4(a)
   real(4), intent(in) :: a(:)
   real(4) :: res
-  res = reduce(a, red_real4, 1)
+  res = reduce(a, red_real4)
 end subroutine
 
 ! CHECK: fir.call @_FortranAReduceReal4
@@ -163,7 +163,7 @@ pure function red_real8(a,b)
 subroutine real8(a)
   real(8), intent(in) :: a(:)
   real(8) :: res
-  res = reduce(a, red_real8, 1)
+  res = reduce(a, red_real8)
 end subroutine
 
 ! CHECK: fir.call @_FortranAReduceReal8
@@ -177,7 +177,7 @@ pure function red_real10(a,b)
 subroutine real10(a)
   real(10), intent(in) :: a(:)
   real(10) :: res
-  res = reduce(a, red_real10, 1)
+  res = reduce(a, red_real10)
 end subroutine
 
 ! CHECK: fir.call @_FortranAReduceReal10
@@ -191,7 +191,7 @@ pure function red_real16(a,b)
 subroutine real16(a)
   real(16), intent(in) :: a(:)
   real(16) :: res
-  res = reduce(a, red_real16, 1)
+  res = reduce(a, red_real16)
 end subroutine
 
 ! CHECK: fir.call @_FortranAReduceReal16
@@ -205,7 +205,7 @@ pure function red_complex2(a,b)
 subroutine complex2(a)
   complex(2), intent(in) :: a(:)
   complex(2) :: res
-  res = reduce(a, red_complex2, 1)
+  res = reduce(a, red_complex2)
 end subroutine
 
 ! CHECK: fir.call @_FortranACppReduceComplex2
@@ -219,7 +219,7 @@ pure function red_complex3(a,b)
 subroutine complex3(a)
   complex(3), intent(in) :: a(:)
   complex(3) :: res
-  res = reduce(a, red_complex3, 1)
+  res = reduce(a, red_complex3)
 end subroutine
 
 ! CHECK: fir.call @_FortranACppReduceComplex3
@@ -233,7 +233,7 @@ pure function red_complex4(a,b)
 subroutine complex4(a)
   complex(4), intent(in) :: a(:)
   complex(4) :: res
-  res = reduce(a, red_complex4, 1)
+  res = reduce(a, red_complex4)
 end subroutine
 
 ! CHECK: fir.call @_FortranACppReduceComplex4
@@ -247,7 +247,7 @@ pure function red_complex8(a,b)
 subroutine complex8(a)
   complex(8), intent(in) :: a(:)
   complex(8) :: res
-  res = reduce(a, red_complex8, 1)
+  res = reduce(a, red_complex8)
 end subroutine
 
 ! CHECK: fir.call @_FortranACppReduceComplex8
@@ -261,7 +261,7 @@ pure function red_complex10(a,b)
 subroutine complex10(a)
   complex(10), intent(in) :: a(:)
   complex(10) :: res
-!  res = reduce(a, red_complex10, 1)
+!  res = reduce(a, red_complex10)
 end subroutine
 
 pure function red_log1(a,b)
@@ -273,7 +273,7 @@ pure function red_log1(a,b)
 subroutine log1(a)
   logical(1), intent(in) :: a(:)
   logical(1) :: res
-  res = reduce(a, red_log1, 1)
+  res = reduce(a, red_log1)
 end subroutine
 
 ! CHECK: fir.call @_FortranAReduceLogical1
@@ -287,7 +287,7 @@ pure function red_log2(a,b)
 subroutine log2(a)
   logical(2), intent(in) :: a(:)
   logical(2) :: res
-  res = reduce(a, red_log2, 1)
+  res = reduce(a, red_log2)
 end subroutine
 
 ! CHECK: fir.call @_FortranAReduceLogical2
@@ -301,7 +301,7 @@ pure function red_log4(a,b)
 subroutine log4(a)
   logical(4), intent(in) :: a(:)
   logical(4) :: res
-  res = reduce(a, red_log4, 1)
+  res = reduce(a, red_log4)
 end subroutine
 
 ! CHECK: fir.call @_FortranAReduceLogical4
@@ -315,7 +315,7 @@ pure function red_log8(a,b)
 subroutine log8(a)
   logical(8), intent(in) :: a(:)
   logical(8) :: res
-  res = reduce(a, red_log8, 1)
+  res = reduce(a, red_log8)
 end subroutine
 
 ! CHECK: fir.call @_FortranAReduceLogical8
@@ -329,7 +329,7 @@ pure function red_char1(a,b)
 subroutine char1(a)
   character(1), intent(in) :: a(:)
   character(1) :: res
-  res = reduce(a, red_char1, 1)
+  res = reduce(a, red_char1)
 end subroutine
 
 ! CHECK: fir.call @_FortranAReduceChar1
@@ -343,7 +343,7 @@ pure function red_char2(a,b)
 subroutine char2(a)
   character(kind=2), intent(in) :: a(:)
   character(kind=2) :: res
-  res = reduce(a, red_char2, 1)
+  res = reduce(a, red_char2)
 end subroutine
 
 ! CHECK: fir.call @_FortranAReduceChar2
@@ -357,7 +357,7 @@ pure function red_char4(a,b)
 subroutine char4(a)
   character(kind=4), intent(in) :: a(:)
   character(kind=4) :: res
-  res = reduce(a, red_char4, 1)
+  res = reduce(a, red_char4)
 end subroutine
 
 ! CHECK: fir.call @_FortranAReduceChar4
@@ -371,7 +371,7 @@ pure function red_type(a,b)
 subroutine testtype(a)
   type(t1), intent(in) :: a(:)
   type(t1) :: res
-  res = reduce(a, red_type, 1)
+  res = reduce(a, red_type)
 end subroutine
 
 ! CHECK: fir.call @_FortranAReduceDerivedType