maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[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
This commit is contained in:
Valentin Clement 2022-04-08 21:16:08 +02:00
parent 8aa1490513
commit ab8e1e6e5a
No known key found for this signature in database
GPG Key ID: 086D54783C928776
2 changed files with 51 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
flang/lib/Optimizer/Dialect/FIROps.cpp
View File

@ -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();
}

46
flang/test/Fir/boxaddr-folding.fir Normal file
View File

@ -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
}