Skip to content

Commit a027f1d

Browse files
DominikAdamskiDominikAdamski
committed
applied remarks
1 parent 14808d9 commit a027f1d

File tree

2 files changed

+108
-14
lines changed

2 files changed

+108
-14
lines changed

‎flang/lib/Optimizer/Analysis/AliasAnalysis.cpp‎

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -372,13 +372,6 @@ getAttrsFromVariable(fir::FortranVariableOpInterface var) {
372372
return attrs;
373373
}
374374

375-
static std::optional<omp::BlockArgOpenMPOpInterface>
376-
getOpenMPBlockArgInterface(Operation *op) {
377-
if (!op)
378-
return {};
379-
return dyn_cast<omp::BlockArgOpenMPOpInterface>(op);
380-
}
381-
382375
template <typename OMPTypeOp, typename DeclTypeOp>
383376
static Value getPrivateArg(omp::BlockArgOpenMPOpInterface &argIface,
384377
OMPTypeOp &op, DeclTypeOp &declOp) {
@@ -500,16 +493,15 @@ AliasAnalysis::Source AliasAnalysis::getSource(mlir::Value v,
500493
breakFromLoop = true;
501494
})
502495
.Case<hlfir::DeclareOp, fir::DeclareOp>([&](auto op) {
503-
auto argIface = getOpenMPBlockArgInterface(op->getParentOp());
504-
if (argIface) {
496+
if (omp::BlockArgOpenMPOpInterface argIface =
497+
dyn_cast<omp::BlockArgOpenMPOpInterface>(op->getParentOp())) {
505498
Value ompValArg;
506499
llvm::TypeSwitch<Operation *>(op->getParentOp())
507500
.template Case<omp::TargetOp>([&](auto targetOp) {
508501
// If declare operation is inside omp target region,
509502
// continue alias analysis outside the target region
510-
for (auto [opArg, blockArg] :
511-
llvm::zip_equal(targetOp.getMapVars(),
512-
(*argIface).getMapBlockArgs())) {
503+
for (auto [opArg, blockArg] : llvm::zip_equal(
504+
targetOp.getMapVars(), argIface.getMapBlockArgs())) {
513505
if (blockArg == op.getMemref()) {
514506
omp::MapInfoOp mapInfo =
515507
llvm::cast<omp::MapInfoOp>(opArg.getDefiningOp());
@@ -520,13 +512,13 @@ AliasAnalysis::Source AliasAnalysis::getSource(mlir::Value v,
520512
// If given operation does not reflect mapping item,
521513
// check private clause
522514
if (!ompValArg)
523-
ompValArg = getPrivateArg(*argIface, targetOp, op);
515+
ompValArg = getPrivateArg(argIface, targetOp, op);
524516
})
525517
.template Case<omp::DistributeOp, omp::ParallelOp,
526518
omp::SectionsOp, omp::SimdOp, omp::SingleOp,
527519
omp::TaskloopOp, omp::TaskOp, omp::WsloopOp>(
528520
[&](auto privateOp) {
529-
ompValArg = getPrivateArg(*argIface, privateOp, op);
521+
ompValArg = getPrivateArg(argIface, privateOp, op);
530522
});
531523
if (ompValArg) {
532524
v = ompValArg;

‎flang/test/Analysis/AliasAnalysis/alias-analysis-omp-teams-distribute-private-ptr.mlir‎

Lines changed: 102 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,102 @@
1+
// Use --mlir-disable-threading so that the AA queries are serialized
2+
// as well as its diagnostic output.
3+
// RUN: fir-opt %s -pass-pipeline='builtin.module(func.func(test-fir-alias-analysis))' -split-input-file --mlir-disable-threading 2>&1 | FileCheck %s
4+
5+
// Fortran code:
6+
// program main
7+
// integer, target :: arrayA(10)
8+
// integer, pointer, dimension(:) :: ptrA
9+
// integer :: i
10+
// ptrA => arrayA
11+
// !$omp teams distribute parallel do firstprivate(ptrA)
12+
// do i = 1, 10
13+
// arrayA(i) = arrayA(i) + ptrA(i);
14+
// end do
15+
// end program main
16+
17+
// CHECK-LABEL: Testing : "_QQmain"
18+
// CHECK-DAG: ptrA#0 <-> ArrayA#0: MayAlias
19+
20+
omp.private {type = private} @_QFEi_private_ref_i32 : !fir.ref<i32> alloc {
21+
^bb0(%arg0: !fir.ref<i32>):
22+
%0 = fir.alloca i32 {bindc_name = "i", pinned, uniq_name = "_QFEi"}
23+
%1:2 = hlfir.declare %0 {uniq_name = "_QFEi"} : (!fir.ref<i32>) -> (!fir.ref<i32>, !fir.ref<i32>)
24+
omp.yield(%1#0 : !fir.ref<i32>)
25+
}
26+
omp.private {type = firstprivate} @_QFEptra_firstprivate_ref_box_ptr_Uxi32 : !fir.ref<!fir.box<!fir.ptr<!fir.array<?xi32>>>> alloc {
27+
^bb0(%arg0: !fir.ref<!fir.box<!fir.ptr<!fir.array<?xi32>>>>):
28+
%0 = fir.alloca !fir.box<!fir.ptr<!fir.array<?xi32>>> {bindc_name = "ptra", pinned, uniq_name = "_QFEptra"}
29+
%1:2 = hlfir.declare %0 {fortran_attrs = #fir.var_attrs<pointer>, uniq_name = "_QFEptra"} : (!fir.ref<!fir.box<!fir.ptr<!fir.array<?xi32>>>>) -> (!fir.ref<!fir.box<!fir.ptr<!fir.array<?xi32>>>>, !fir.ref<!fir.box<!fir.ptr<!fir.array<?xi32>>>>)
30+
omp.yield(%1#0 : !fir.ref<!fir.box<!fir.ptr<!fir.array<?xi32>>>>)
31+
} copy {
32+
^bb0(%arg0: !fir.ref<!fir.box<!fir.ptr<!fir.array<?xi32>>>>, %arg1: !fir.ref<!fir.box<!fir.ptr<!fir.array<?xi32>>>>):
33+
%0 = fir.load %arg0 : !fir.ref<!fir.box<!fir.ptr<!fir.array<?xi32>>>>
34+
fir.store %0 to %arg1 : !fir.ref<!fir.box<!fir.ptr<!fir.array<?xi32>>>>
35+
omp.yield(%arg1 : !fir.ref<!fir.box<!fir.ptr<!fir.array<?xi32>>>>)
36+
}
37+
func.func @_QQmain() attributes {fir.bindc_name = "main"} {
38+
%0 = fir.address_of(@_QFEarraya) : !fir.ref<!fir.array<10xi32>>
39+
%c10 = arith.constant 10 : index
40+
%1 = fir.shape %c10 : (index) -> !fir.shape<1>
41+
%2:2 = hlfir.declare %0(%1) {fortran_attrs = #fir.var_attrs<target>, uniq_name = "_QFEarraya"} : (!fir.ref<!fir.array<10xi32>>, !fir.shape<1>) -> (!fir.ref<!fir.array<10xi32>>, !fir.ref<!fir.array<10xi32>>)
42+
%3 = fir.address_of(@_QFEarrayb) : !fir.ref<!fir.array<10xi32>>
43+
%c10_0 = arith.constant 10 : index
44+
%4 = fir.shape %c10_0 : (index) -> !fir.shape<1>
45+
%5:2 = hlfir.declare %3(%4) {uniq_name = "_QFEarrayb"} : (!fir.ref<!fir.array<10xi32>>, !fir.shape<1>) -> (!fir.ref<!fir.array<10xi32>>, !fir.ref<!fir.array<10xi32>>)
46+
%6 = fir.alloca i32 {bindc_name = "i", uniq_name = "_QFEi"}
47+
%7:2 = hlfir.declare %6 {uniq_name = "_QFEi"} : (!fir.ref<i32>) -> (!fir.ref<i32>, !fir.ref<i32>)
48+
%8 = fir.address_of(@_QFEptra) : !fir.ref<!fir.box<!fir.ptr<!fir.array<?xi32>>>>
49+
%9:2 = hlfir.declare %8 {fortran_attrs = #fir.var_attrs<pointer>, uniq_name = "_QFEptra"} : (!fir.ref<!fir.box<!fir.ptr<!fir.array<?xi32>>>>) -> (!fir.ref<!fir.box<!fir.ptr<!fir.array<?xi32>>>>, !fir.ref<!fir.box<!fir.ptr<!fir.array<?xi32>>>>)
50+
%10 = fir.shape %c10 : (index) -> !fir.shape<1>
51+
%11 = fir.embox %2#1(%10) : (!fir.ref<!fir.array<10xi32>>, !fir.shape<1>) -> !fir.box<!fir.ptr<!fir.array<?xi32>>>
52+
fir.store %11 to %9#1 : !fir.ref<!fir.box<!fir.ptr<!fir.array<?xi32>>>>
53+
omp.teams {
54+
omp.parallel private(@_QFEptra_firstprivate_ref_box_ptr_Uxi32 %9#0 -> %arg0, @_QFEi_private_ref_i32 %7#0 -> %arg1 : !fir.ref<!fir.box<!fir.ptr<!fir.array<?xi32>>>>, !fir.ref<i32>) {
55+
%12:2 = hlfir.declare %arg0 {fortran_attrs = #fir.var_attrs<pointer>, uniq_name = "_QFEptra"} : (!fir.ref<!fir.box<!fir.ptr<!fir.array<?xi32>>>>) -> (!fir.ref<!fir.box<!fir.ptr<!fir.array<?xi32>>>>, !fir.ref<!fir.box<!fir.ptr<!fir.array<?xi32>>>>)
56+
%13:2 = hlfir.declare %arg1 {uniq_name = "_QFEi"} : (!fir.ref<i32>) -> (!fir.ref<i32>, !fir.ref<i32>)
57+
%c1_i32 = arith.constant 1 : i32
58+
%c10_i32 = arith.constant 10 : i32
59+
%c1_i32_1 = arith.constant 1 : i32
60+
omp.distribute {
61+
omp.wsloop {
62+
omp.loop_nest (%arg2) : i32 = (%c1_i32) to (%c10_i32) inclusive step (%c1_i32_1) {
63+
fir.store %arg2 to %13#1 : !fir.ref<i32>
64+
%14 = fir.load %13#0 : !fir.ref<i32>
65+
%15 = fir.convert %14 : (i32) -> i64
66+
%16 = hlfir.designate %2#0 (%15) : (!fir.ref<!fir.array<10xi32>>, i64) -> !fir.ref<i32>
67+
%17 = fir.load %16 : !fir.ref<i32>
68+
%18 = fir.load %12#0 : !fir.ref<!fir.box<!fir.ptr<!fir.array<?xi32>>>>
69+
%19 = fir.load %13#0 : !fir.ref<i32>
70+
%20 = fir.convert %19 : (i32) -> i64
71+
%21 = hlfir.designate %18 (%20) {test.ptr = "ptrA" } : (!fir.box<!fir.ptr<!fir.array<?xi32>>>, i64) -> !fir.ref<i32>
72+
%22 = fir.load %21 : !fir.ref<i32>
73+
%23 = arith.addi %17, %22 : i32
74+
%24 = fir.load %13#0 : !fir.ref<i32>
75+
%25 = fir.convert %24 : (i32) -> i64
76+
%26 = hlfir.designate %2#0 (%25) {test.ptr = "ArrayA"} : (!fir.ref<!fir.array<10xi32>>, i64) -> !fir.ref<i32>
77+
hlfir.assign %23 to %26 : i32, !fir.ref<i32>
78+
omp.yield
79+
}
80+
} {omp.composite}
81+
} {omp.composite}
82+
omp.terminator
83+
} {omp.composite}
84+
omp.terminator
85+
}
86+
return
87+
}
88+
fir.global internal @_QFEarraya target : !fir.array<10xi32> {
89+
%0 = fir.zero_bits !fir.array<10xi32>
90+
fir.has_value %0 : !fir.array<10xi32>
91+
}
92+
fir.global internal @_QFEarrayb : !fir.array<10xi32> {
93+
%0 = fir.zero_bits !fir.array<10xi32>
94+
fir.has_value %0 : !fir.array<10xi32>
95+
}
96+
fir.global internal @_QFEptra : !fir.box<!fir.ptr<!fir.array<?xi32>>> {
97+
%0 = fir.zero_bits !fir.ptr<!fir.array<?xi32>>
98+
%c0 = arith.constant 0 : index
99+
%1 = fir.shape %c0 : (index) -> !fir.shape<1>
100+
%2 = fir.embox %0(%1) : (!fir.ptr<!fir.array<?xi32>>, !fir.shape<1>) -> !fir.box<!fir.ptr<!fir.array<?xi32>>>
101+
fir.has_value %2 : !fir.box<!fir.ptr<!fir.array<?xi32>>>
102+
}

0 commit comments

Comments
 (0)