[FLANG]Remove experimental flag from SUM simplification

[Leporacanthicus]

Summary

The SUM function does appear to be safe to use, so remove the
experimental flag for the SUM operation.

[vzakhari]

LGTM

flang/test/Transforms/simplifyintrinsics.fir

1

nit: we may keep it here, if we are going to add tests for future experimental implementations in this file.

[awarzynski]

flang/test/Transforms/simplifyintrinsics.fir

1

No harm in having a separate file with "experimental" simplifications, This way it will be easier to distinguish the two.

[Leporacanthicus]

flang/lib/Optimizer/Transforms/SimplifyIntrinsics.cpp

446–447

This should of course be removed. New patch coming soon! :)

[clementval]

flang/lib/Optimizer/Transforms/SimplifyIntrinsics.cpp

447

You should use RTNAME(Sum) instead of hardcoded function name.

[Leporacanthicus]

Remove comment that was no longer valid

Add trivial test for experimental flag

[Leporacanthicus]

I think my patch is messed up, however. It seems to have included my refactoring as well, which should be a separate patch.

I'll try to fix tomorrow.

flang/lib/Optimizer/Transforms/SimplifyIntrinsics.cpp

447

Ah, very good point. I will make a separate patch, as this applies to more than the bits touched in this patch.

[Leporacanthicus]

Trying again, patch seems to have got messed up.

flang/lib/Optimizer/Transforms/SimplifyIntrinsics.cpp

if (auto call = mlir::dyn_cast<fir::CallOp>(op)) {
         // Replace call to runtime function for SUM when it has single
         // argument (no dim or mask argument) for 1D arrays with either
         // Integer4 or Real8 types. Other forms are ignored.
         // The new function is added to the module.
         //
         // Prototype for runtime call (from sum.cpp):
         // RTNAME(Sum<T>)(const Descriptor &x, const char *source, int line,
         //                int dim, const Descriptor *mask)
         //
-        // Disable SUM inlining by default, because it fatally fails on some
-        // FIR yet.
-        if (enableExperimental && funcName.startswith("_FortranASum")) {
+        if (funcName.startswith("_FortranASum")) {
           mlir::Operation::operand_range args = call.getArgs();
           // args[1] and args[2] are source filename and line number, ignored.
           const mlir::Value &dim = args[3];
           const mlir::Value &mask = args[4];
           // dim is zero when it is absent, which is an implementation
           // detail in the runtime library.
           bool dimAndMaskAbsent = isZero(dim) && isOperandAbsent(mask);
           unsigned rank = getDimCount(args[0]);

flang/test/Transforms/experimental.fir

+// RUN: fir-opt --split-input-file --simplify-intrinsics='enable-experimental=true' %s | FileCheck %s
+
+// check that a simple function compiled with experimental enabled
+module attributes {fir.defaultkind = "a1c4d8i4l4r4", fir.kindmap = "", llvm.target_triple = "native"} {
+  func.func @experimental_1(%arg0: !fir.ref<i32> {fir.bindc_name = "a"}) -> i32 {
+    %c10 = arith.constant 10 : i32
+    return %c10 : i32
+  }
+}
+
+// CHECK-LABEL:   func.func @experimental_1(
+// CHECK:           return %{{.*}} : i32
+// CHECK:         }

flang/test/Transforms/simplifyintrinsics.fir

-// RUN: fir-opt --split-input-file --simplify-intrinsics='enable-experimental=true' %s | FileCheck %s
+// RUN: fir-opt --split-input-file --simplify-intrinsics %s | FileCheck %s
 
 // Call to SUM with 1D I32 array is replaced.
 module attributes {fir.defaultkind = "a1c4d8i4l4r4", fir.kindmap = "", llvm.target_triple = "native"} {
   func.func @sum_1d_array_int(%arg0: !fir.ref<!fir.array<10xi32>> {fir.bindc_name = "a"}) -> i32 {
     %c10 = arith.constant 10 : index
     %0 = fir.alloca i32 {bindc_name = "test_sum_2", uniq_name = "_QFtest_sum_2Etest_sum_2"}
     %1 = fir.shape %c10 : (index) -> !fir.shape<1>
     %2 = fir.embox %arg0(%1) : (!fir.ref<!fir.array<10xi32>>, !fir.shape<1>) -> !fir.box<!fir.array<10xi32>>