Skip to content

Commit 59d6fbb

Browse files
authored
[flang][fir] Provide allocation block for fir.local when required (#144521)
Extends `fir::FirOpBuilder::getAllocaBlock()` to support `fir.local`. This allows us to retrieve an allocation block when needed for `fir.local`.
1 parent ca29c63 commit 59d6fbb

File tree

2 files changed

+37
-0
lines changed

2 files changed

+37
-0
lines changed

flang/lib/Optimizer/Builder/FIRBuilder.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -283,6 +283,9 @@ mlir::Block *fir::FirOpBuilder::getAllocaBlock() {
283283
if (auto doConcurentOp = getRegion().getParentOfType<fir::DoConcurrentOp>())
284284
return doConcurentOp.getBody();
285285

286+
if (auto firLocalOp = getRegion().getParentOfType<fir::LocalitySpecifierOp>())
287+
return &getRegion().front();
288+
286289
return getEntryBlock();
287290
}
288291

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
// Tests that `fir.local` ops are able to provide an alloca block when required.
2+
3+
// RUN: fir-opt %s -convert-hlfir-to-fir | FileCheck %s
4+
5+
fir.local {type = local_init} @localizer : !fir.box<!fir.array<1xi32>> copy {
6+
^bb0(%arg0: !fir.ref<!fir.box<!fir.array<1xi32>>>, %arg1: !fir.ref<!fir.box<!fir.array<1xi32>>>):
7+
%0 = fir.load %arg0 : !fir.ref<!fir.box<!fir.array<1xi32>>>
8+
hlfir.assign %0 to %arg1 : !fir.box<!fir.array<1xi32>>, !fir.ref<!fir.box<!fir.array<1xi32>>>
9+
fir.yield(%arg1 : !fir.ref<!fir.box<!fir.array<1xi32>>>)
10+
}
11+
12+
func.func @foo() {
13+
%c1 = arith.constant 1 : index
14+
%0 = fir.alloca !fir.box<!fir.array<1xi32>>
15+
fir.do_concurrent {
16+
fir.do_concurrent.loop (%arg0) = (%c1) to (%c1) step (%c1) local(@localizer %0 -> %arg1 : !fir.ref<!fir.box<!fir.array<1xi32>>>) {
17+
}
18+
}
19+
return
20+
}
21+
22+
// CHECK: fir.local {type = local_init} @localizer : ![[TYPE:fir.box<!fir.array<1xi32>>]] copy {
23+
// CHECK: ^bb0(%[[VAL_0:.*]]: !fir.ref<![[TYPE]]>, %[[VAL_1:.*]]: !fir.ref<![[TYPE]]>):
24+
// CHECK: %[[VAL_2:.*]] = fir.alloca ![[TYPE]]
25+
// CHECK: %[[VAL_3:.*]] = fir.load %[[VAL_0]] : !fir.ref<![[TYPE]]>
26+
// CHECK: %[[VAL_4:.*]] = arith.constant 0 : index
27+
// CHECK: %[[VAL_5:.*]]:3 = fir.box_dims %[[VAL_3]], %[[VAL_4]] : (![[TYPE]], index) -> (index, index, index)
28+
// CHECK: %[[VAL_6:.*]] = fir.load %[[VAL_1]] : !fir.ref<![[TYPE]]>
29+
// CHECK: fir.store %[[VAL_6]] to %[[VAL_2]] : !fir.ref<![[TYPE]]>
30+
// CHECK: %[[VAL_10:.*]] = fir.convert %[[VAL_2]] : (!fir.ref<![[TYPE]]>) -> !fir.ref<!fir.box<none>>
31+
// CHECK: %[[VAL_11:.*]] = fir.convert %[[VAL_3]] : (![[TYPE]]) -> !fir.box<none>
32+
// CHECK: fir.call @_FortranAAssign(%[[VAL_10]], %[[VAL_11]], %{{.*}}, %{{.*}})
33+
// CHECK: fir.yield(%[[VAL_1]] : !fir.ref<![[TYPE]]>)
34+
// CHECK: }

0 commit comments

Comments
 (0)