[flang-commits] [flang] ab8e1e6 - [flang] Do not fold fir.box_addr when it has a slice

[Valentin Clement via flang-commits]

Author: Valentin Clement
Date: 2022-04-08T21:16:55+02:00
New Revision: ab8e1e6e5ace6ba9b7c44caa2409bf8e33cdee96

URL: https://github.com/llvm/llvm-project/commit/ab8e1e6e5ace6ba9b7c44caa2409bf8e33cdee96
DIFF: https://github.com/llvm/llvm-project/commit/ab8e1e6e5ace6ba9b7c44caa2409bf8e33cdee96.diff

LOG: [flang] Do not fold fir.box_addr when it has a slice

This patch avoids to fold `fir.box_addr` when the defining `fir.embox` op
has a slice. If the op is folded the slice information are lost.

This kind of problem occurred with code like:

```
call check(y(half+1:))
```

where `y` is an array.

Reviewed By: jeanPerier

Differential Revision: https://reviews.llvm.org/D123392

Added: 
    flang/test/Fir/boxaddr-folding.fir

Modified: 
    flang/lib/Optimizer/Dialect/FIROps.cpp

Removed: 
    


################################################################################
diff  --git a/flang/lib/Optimizer/Dialect/FIROps.cpp b/flang/lib/Optimizer/Dialect/FIROps.cpp
index 1b48a56adbcaf..515cb863d3f4f 100644
--- a/flang/lib/Optimizer/Dialect/FIROps.cpp
+++ b/flang/lib/Optimizer/Dialect/FIROps.cpp
@@ -566,9 +566,11 @@ mlir::LogicalResult ArrayModifyOp::verify() {
 //===----------------------------------------------------------------------===//
 
 mlir::OpFoldResult fir::BoxAddrOp::fold(llvm::ArrayRef<mlir::Attribute> opnds) {
-  if (auto v = getVal().getDefiningOp()) {
-    if (auto box = dyn_cast<fir::EmboxOp>(v))
-      return box.getMemref();
+  if (auto *v = getVal().getDefiningOp()) {
+    if (auto box = dyn_cast<fir::EmboxOp>(v)) {
+      if (!box.getSlice()) // Fold only if not sliced
+        return box.getMemref();
+    }
     if (auto box = dyn_cast<fir::EmboxCharOp>(v))
       return box.getMemref();
   }

diff  --git a/flang/test/Fir/boxaddr-folding.fir b/flang/test/Fir/boxaddr-folding.fir
new file mode 100644
index 0000000000000..0402d658c6615
--- /dev/null
+++ b/flang/test/Fir/boxaddr-folding.fir
@@ -0,0 +1,46 @@
+// RUN: fir-opt --canonicalize %s -split-input-file | FileCheck %s
+
+// CHECK-LABEL: func @check_no_folding
+func @check_no_folding(%arg0 : !fir.ref<!fir.array<?xi32>>) {
+  %0 = fir.alloca i32 {adapt.valuebyref}
+  %c1_i32 = arith.constant 1 : i32
+  %1 = fir.load %0 : !fir.ref<i32>
+  %2 = arith.addi %1, %c1_i32 : i32
+  %3 = fir.convert %2 : (i32) -> index
+  %c1 = arith.constant 1 : index
+  %5 = arith.subi %3, %c1 : index
+  %6 = fir.shape %3 : (index) -> !fir.shape<1>
+  %7 = fir.slice %3, %5, %3 : (index, index, index) -> !fir.slice<1>
+  %8 = fir.embox %arg0(%6) [%7] : (!fir.ref<!fir.array<?xi32>>, !fir.shape<1>, !fir.slice<1>) -> !fir.box<!fir.array<?xi32>>
+  %9 = fir.box_addr %8 : (!fir.box<!fir.array<?xi32>>) -> !fir.ref<!fir.array<?xi32>>
+  // CHECK: %[[BOX_ADDR:.*]] = fir.box_addr
+  // CHECK: fir.call @check(%[[BOX_ADDR]])
+  fir.call @check(%9) : (!fir.ref<!fir.array<?xi32>>) -> ()
+  return
+}
+
+func @check(%arg0: !fir.ref<!fir.array<?xi32>>) {
+  return
+}
+
+// -----
+
+// CHECK-LABEL: func @check_folding
+func @check_folding(%arg0 : !fir.ref<!fir.array<?xi32>>) {
+  %0 = fir.alloca i32 {adapt.valuebyref}
+  %c1_i32 = arith.constant 1 : i32
+  %1 = fir.load %0 : !fir.ref<i32>
+  %2 = arith.addi %1, %c1_i32 : i32
+  %3 = fir.convert %2 : (i32) -> index
+  %c1 = arith.constant 1 : index
+  %6 = fir.shape %3 : (index) -> !fir.shape<1>
+  %7 = fir.embox %arg0(%6) : (!fir.ref<!fir.array<?xi32>>, !fir.shape<1>) -> !fir.box<!fir.array<?xi32>>
+  %8 = fir.box_addr %7 : (!fir.box<!fir.array<?xi32>>) -> !fir.ref<!fir.array<?xi32>>
+  // CHECK-NOT: fir.box_addr
+  fir.call @check(%8) : (!fir.ref<!fir.array<?xi32>>) -> ()
+  return
+}
+
+func @check(%arg0: !fir.ref<!fir.array<?xi32>>) {
+  return
+}