Skip to content

[flang] Allow VariableAssignBufferization to handle hlfir::ExprType #115136

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 12, 2024
Merged

[flang] Allow VariableAssignBufferization to handle hlfir::ExprType #115136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions flang/lib/Optimizer/HLFIR/Transforms/OptimizedBufferization.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -598,11 +598,14 @@ llvm::LogicalResult VariableAssignBufferization::matchAndRewrite(
return rewriter.notifyMatchFailure(assign, "AssignOp may imply allocation");

hlfir::Entity rhs{assign.getRhs()};
// TODO: ExprType check is here to avoid conflicts with
// ElementalAssignBufferization pattern. We need to combine
// these matchers into a single one that applies to AssignOp.
if (mlir::isa<hlfir::ExprType>(rhs.getType()))
return rewriter.notifyMatchFailure(assign, "RHS is not in memory");

// To avoid conflicts with ElementalAssignBufferization pattern, we avoid
// matching RHS when it is an `ExprType` defined by an `ElementalOp`; which is
// among the main criteria matched by ElementalAssignBufferization.
if (mlir::isa<hlfir::ExprType>(rhs.getType()) &&
mlir::isa<hlfir::ElementalOp>(rhs.getDefiningOp()))
return rewriter.notifyMatchFailure(
assign, "RHS is an ExprType defined by ElementalOp");

if (!rhs.isArray())
return rewriter.notifyMatchFailure(assign,
Expand Down
42 changes: 42 additions & 0 deletions flang/test/HLFIR/opt-bufferization.fir
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -796,3 +796,45 @@ func.func @_QPddx(%arg0: !fir.box<!fir.array<?x?xf64>> {fir.bindc_name = "array"
// CHECK: %[[VAL_61:.*]] = fir.load %[[VAL_26]]#1 : !fir.ref<!fir.array<?x?xf64>>
// CHECK: return %[[VAL_61]] : !fir.array<?x?xf64>
// CHECK: }

// `hlfir.expr` bufferization (when the expresion is not the result of
// `hlfir.elemental`)
func.func @_QPfoo() {
%c1 = arith.constant 1 : index
%0 = fir.alloca !fir.array<1xi32> {bindc_name = "iavs", uniq_name = "_QFfooEiavs"}
%1 = fir.shape %c1 : (index) -> !fir.shape<1>
%2:2 = hlfir.declare %0(%1) {uniq_name = "_QFfooEiavs"} : (!fir.ref<!fir.array<1xi32>>, !fir.shape<1>) -> (!fir.ref<!fir.array<1xi32>>, !fir.ref<!fir.array<1xi32>>)
%3 = fir.alloca i32 {bindc_name = "iv", uniq_name = "_QFfooEiv"}
%4:2 = hlfir.declare %3 {uniq_name = "_QFfooEiv"} : (!fir.ref<i32>) -> (!fir.ref<i32>, !fir.ref<i32>)
%c10_i32 = arith.constant 10 : i32
%6 = fir.convert %c10_i32 : (i32) -> index
%7 = fir.convert %c1 : (index) -> i32
%8:2 = fir.do_loop %arg0 = %c1 to %6 step %c1 iter_args(%arg1 = %7) -> (index, i32) {
fir.store %arg1 to %4#1 : !fir.ref<i32>
%9 = fir.allocmem !fir.array<1xi32> {bindc_name = ".tmp.arrayctor", uniq_name = ""}
%10 = fir.shape %c1 : (index) -> !fir.shape<1>
%11:2 = hlfir.declare %9(%10) {uniq_name = ".tmp.arrayctor"} : (!fir.heap<!fir.array<1xi32>>, !fir.shape<1>) -> (!fir.heap<!fir.array<1xi32>>, !fir.heap<!fir.array<1xi32>>)
%12 = fir.load %4#0 : !fir.ref<i32>
%13 = hlfir.designate %11#0 (%c1) : (!fir.heap<!fir.array<1xi32>>, index) -> !fir.ref<i32>
hlfir.assign %12 to %13 : i32, !fir.ref<i32>
%true = arith.constant true
%14 = hlfir.as_expr %11#0 move %true : (!fir.heap<!fir.array<1xi32>>, i1) -> !hlfir.expr<1xi32>
hlfir.assign %14 to %2#0 : !hlfir.expr<1xi32>, !fir.ref<!fir.array<1xi32>>
hlfir.destroy %14 : !hlfir.expr<1xi32>
%15 = arith.addi %arg0, %c1 : index
%16 = fir.convert %c1 : (index) -> i32
%17 = fir.load %4#1 : !fir.ref<i32>
%18 = arith.addi %17, %16 : i32
fir.result %15, %18 : index, i32
}
fir.store %8#1 to %4#1 : !fir.ref<i32>
return
}

// CHECK-LABEL: func.func @_QPfoo
// CHECK: %[[C1:.*]] = arith.constant 1 : index
// CHECK: fir.do_loop {{.*}} {
// CHECK-NOT: hlfir.assign %{{.*}} to %{{.*}}#0 : !hlfir.expr<1xi32>, !fir.ref<!fir.array<1xi32>>
// CHECK: fir.do_loop %{{.*}} = %[[C1]] to %[[C1]] step %[[C1]] unordered {
// CHECK: }
// CHECK: }
Loading