diff --git a/flang/lib/Optimizer/Analysis/AliasAnalysis.cpp b/flang/lib/Optimizer/Analysis/AliasAnalysis.cpp index 8b7918744017c..993d41633a079 100644 --- a/flang/lib/Optimizer/Analysis/AliasAnalysis.cpp +++ b/flang/lib/Optimizer/Analysis/AliasAnalysis.cpp @@ -372,6 +372,29 @@ getAttrsFromVariable(fir::FortranVariableOpInterface var) { return attrs; } +template +static Value getPrivateArg(omp::BlockArgOpenMPOpInterface &argIface, + OMPTypeOp &op, DeclTypeOp &declOp) { + Value privateArg; + if (!op.getPrivateSyms().has_value()) + return privateArg; + for (auto [opSym, blockArg] : + llvm::zip_equal(*op.getPrivateSyms(), argIface.getPrivateBlockArgs())) { + if (blockArg == declOp.getMemref()) { + omp::PrivateClauseOp privateOp = + SymbolTable::lookupNearestSymbolFrom( + op, cast(opSym)); + privateOp.walk([&](omp::YieldOp yieldOp) { + llvm::TypeSwitch(yieldOp.getResults()[0].getDefiningOp()) + .template Case( + [&](auto declOp) { privateArg = declOp.getMemref(); }); + }); + return privateArg; + } + } + return privateArg; +} + AliasAnalysis::Source AliasAnalysis::getSource(mlir::Value v, bool getInstantiationPoint) { auto *defOp = v.getDefiningOp(); @@ -470,20 +493,37 @@ AliasAnalysis::Source AliasAnalysis::getSource(mlir::Value v, breakFromLoop = true; }) .Case([&](auto op) { - // If declare operation is inside omp target region, - // continue alias analysis outside the target region - if (auto targetOp = - llvm::dyn_cast(op->getParentOp())) { - auto argIface = cast(*targetOp); - for (auto [opArg, blockArg] : llvm::zip_equal( - targetOp.getMapVars(), argIface.getMapBlockArgs())) { - if (blockArg == op.getMemref()) { - omp::MapInfoOp mapInfo = - llvm::cast(opArg.getDefiningOp()); - v = mapInfo.getVarPtr(); - defOp = v.getDefiningOp(); - return; - } + if (omp::BlockArgOpenMPOpInterface argIface = + dyn_cast(op->getParentOp())) { + Value ompValArg; + llvm::TypeSwitch(op->getParentOp()) + .template Case([&](auto targetOp) { + // If declare operation is inside omp target region, + // continue alias analysis outside the target region + for (auto [opArg, blockArg] : llvm::zip_equal( + targetOp.getMapVars(), argIface.getMapBlockArgs())) { + if (blockArg == op.getMemref()) { + omp::MapInfoOp mapInfo = + llvm::cast(opArg.getDefiningOp()); + ompValArg = mapInfo.getVarPtr(); + break; + } + } + // If given operation does not reflect mapping item, + // check private clause + if (!ompValArg) + ompValArg = getPrivateArg(argIface, targetOp, op); + }) + .template Case( + [&](auto privateOp) { + ompValArg = getPrivateArg(argIface, privateOp, op); + }); + if (ompValArg) { + v = ompValArg; + defOp = ompValArg.getDefiningOp(); + return; } } auto varIf = llvm::cast(defOp); diff --git a/flang/test/Analysis/AliasAnalysis/alias-analysis-omp-teams-distribute-private-ptr.mlir b/flang/test/Analysis/AliasAnalysis/alias-analysis-omp-teams-distribute-private-ptr.mlir new file mode 100644 index 0000000000000..78207d21c45bf --- /dev/null +++ b/flang/test/Analysis/AliasAnalysis/alias-analysis-omp-teams-distribute-private-ptr.mlir @@ -0,0 +1,102 @@ +// Use --mlir-disable-threading so that the AA queries are serialized +// as well as its diagnostic output. +// RUN: fir-opt %s -pass-pipeline='builtin.module(func.func(test-fir-alias-analysis))' -split-input-file --mlir-disable-threading 2>&1 | FileCheck %s + +// Fortran code: +// program main +// integer, target :: arrayA(10) +// integer, pointer, dimension(:) :: ptrA +// integer :: i +// ptrA => arrayA +// !$omp teams distribute parallel do firstprivate(ptrA) +// do i = 1, 10 +// arrayA(i) = arrayA(i) + ptrA(i); +// end do +// end program main + +// CHECK-LABEL: Testing : "_QQmain" +// CHECK-DAG: ptrA#0 <-> ArrayA#0: MayAlias + +omp.private {type = private} @_QFEi_private_ref_i32 : !fir.ref alloc { +^bb0(%arg0: !fir.ref): + %0 = fir.alloca i32 {bindc_name = "i", pinned, uniq_name = "_QFEi"} + %1:2 = hlfir.declare %0 {uniq_name = "_QFEi"} : (!fir.ref) -> (!fir.ref, !fir.ref) + omp.yield(%1#0 : !fir.ref) +} +omp.private {type = firstprivate} @_QFEptra_firstprivate_ref_box_ptr_Uxi32 : !fir.ref>>> alloc { +^bb0(%arg0: !fir.ref>>>): + %0 = fir.alloca !fir.box>> {bindc_name = "ptra", pinned, uniq_name = "_QFEptra"} + %1:2 = hlfir.declare %0 {fortran_attrs = #fir.var_attrs, uniq_name = "_QFEptra"} : (!fir.ref>>>) -> (!fir.ref>>>, !fir.ref>>>) + omp.yield(%1#0 : !fir.ref>>>) +} copy { +^bb0(%arg0: !fir.ref>>>, %arg1: !fir.ref>>>): + %0 = fir.load %arg0 : !fir.ref>>> + fir.store %0 to %arg1 : !fir.ref>>> + omp.yield(%arg1 : !fir.ref>>>) +} +func.func @_QQmain() attributes {fir.bindc_name = "main"} { + %0 = fir.address_of(@_QFEarraya) : !fir.ref> + %c10 = arith.constant 10 : index + %1 = fir.shape %c10 : (index) -> !fir.shape<1> + %2:2 = hlfir.declare %0(%1) {fortran_attrs = #fir.var_attrs, uniq_name = "_QFEarraya"} : (!fir.ref>, !fir.shape<1>) -> (!fir.ref>, !fir.ref>) + %3 = fir.address_of(@_QFEarrayb) : !fir.ref> + %c10_0 = arith.constant 10 : index + %4 = fir.shape %c10_0 : (index) -> !fir.shape<1> + %5:2 = hlfir.declare %3(%4) {uniq_name = "_QFEarrayb"} : (!fir.ref>, !fir.shape<1>) -> (!fir.ref>, !fir.ref>) + %6 = fir.alloca i32 {bindc_name = "i", uniq_name = "_QFEi"} + %7:2 = hlfir.declare %6 {uniq_name = "_QFEi"} : (!fir.ref) -> (!fir.ref, !fir.ref) + %8 = fir.address_of(@_QFEptra) : !fir.ref>>> + %9:2 = hlfir.declare %8 {fortran_attrs = #fir.var_attrs, uniq_name = "_QFEptra"} : (!fir.ref>>>) -> (!fir.ref>>>, !fir.ref>>>) + %10 = fir.shape %c10 : (index) -> !fir.shape<1> + %11 = fir.embox %2#1(%10) : (!fir.ref>, !fir.shape<1>) -> !fir.box>> + fir.store %11 to %9#1 : !fir.ref>>> + omp.teams { + omp.parallel private(@_QFEptra_firstprivate_ref_box_ptr_Uxi32 %9#0 -> %arg0, @_QFEi_private_ref_i32 %7#0 -> %arg1 : !fir.ref>>>, !fir.ref) { + %12:2 = hlfir.declare %arg0 {fortran_attrs = #fir.var_attrs, uniq_name = "_QFEptra"} : (!fir.ref>>>) -> (!fir.ref>>>, !fir.ref>>>) + %13:2 = hlfir.declare %arg1 {uniq_name = "_QFEi"} : (!fir.ref) -> (!fir.ref, !fir.ref) + %c1_i32 = arith.constant 1 : i32 + %c10_i32 = arith.constant 10 : i32 + %c1_i32_1 = arith.constant 1 : i32 + omp.distribute { + omp.wsloop { + omp.loop_nest (%arg2) : i32 = (%c1_i32) to (%c10_i32) inclusive step (%c1_i32_1) { + fir.store %arg2 to %13#1 : !fir.ref + %14 = fir.load %13#0 : !fir.ref + %15 = fir.convert %14 : (i32) -> i64 + %16 = hlfir.designate %2#0 (%15) : (!fir.ref>, i64) -> !fir.ref + %17 = fir.load %16 : !fir.ref + %18 = fir.load %12#0 : !fir.ref>>> + %19 = fir.load %13#0 : !fir.ref + %20 = fir.convert %19 : (i32) -> i64 + %21 = hlfir.designate %18 (%20) {test.ptr = "ptrA" } : (!fir.box>>, i64) -> !fir.ref + %22 = fir.load %21 : !fir.ref + %23 = arith.addi %17, %22 : i32 + %24 = fir.load %13#0 : !fir.ref + %25 = fir.convert %24 : (i32) -> i64 + %26 = hlfir.designate %2#0 (%25) {test.ptr = "ArrayA"} : (!fir.ref>, i64) -> !fir.ref + hlfir.assign %23 to %26 : i32, !fir.ref + omp.yield + } + } {omp.composite} + } {omp.composite} + omp.terminator + } {omp.composite} + omp.terminator + } + return +} +fir.global internal @_QFEarraya target : !fir.array<10xi32> { + %0 = fir.zero_bits !fir.array<10xi32> + fir.has_value %0 : !fir.array<10xi32> +} +fir.global internal @_QFEarrayb : !fir.array<10xi32> { + %0 = fir.zero_bits !fir.array<10xi32> + fir.has_value %0 : !fir.array<10xi32> +} +fir.global internal @_QFEptra : !fir.box>> { + %0 = fir.zero_bits !fir.ptr> + %c0 = arith.constant 0 : index + %1 = fir.shape %c0 : (index) -> !fir.shape<1> + %2 = fir.embox %0(%1) : (!fir.ptr>, !fir.shape<1>) -> !fir.box>> + fir.has_value %2 : !fir.box>> +} diff --git a/flang/test/Analysis/AliasAnalysis/alias-analysis-omp-teams-distribute-private.mlir b/flang/test/Analysis/AliasAnalysis/alias-analysis-omp-teams-distribute-private.mlir new file mode 100644 index 0000000000000..4668b2c215c8c --- /dev/null +++ b/flang/test/Analysis/AliasAnalysis/alias-analysis-omp-teams-distribute-private.mlir @@ -0,0 +1,121 @@ +// Use --mlir-disable-threading so that the AA queries are serialized +// as well as its diagnostic output. +// RUN: fir-opt %s -pass-pipeline='builtin.module(func.func(test-fir-alias-analysis))' -split-input-file --mlir-disable-threading 2>&1 | FileCheck %s + +// Fortran code: +// +// program main +// integer :: arrayA(10,10) +// integer :: tmp(2) +// integer :: i,j +// !$omp teams distribute parallel do private(tmp) +// do j = 1, 10 +// do i = 1,10 +// tmp = [i,j] +// arrayA = tmp(1) +// end do +// end do +// end program main + +// CHECK-LABEL: Testing : "_QQmain" +// CHECK-DAG: tmp_private_array#0 <-> unnamed_array#0: NoAlias +// CHECK-DAG: tmp_private_array#1 <-> unnamed_array#0: NoAlias + +omp.private {type = private} @_QFEi_private_ref_i32 : !fir.ref alloc { +^bb0(%arg0: !fir.ref): + %0 = fir.alloca i32 {bindc_name = "i", pinned, uniq_name = "_QFEi"} + %1:2 = hlfir.declare %0 {uniq_name = "_QFEi"} : (!fir.ref) -> (!fir.ref, !fir.ref) + omp.yield(%1#0 : !fir.ref) +} +omp.private {type = private} @_QFEj_private_ref_i32 : !fir.ref alloc { +^bb0(%arg0: !fir.ref): + %0 = fir.alloca i32 {bindc_name = "j", pinned, uniq_name = "_QFEj"} + %1:2 = hlfir.declare %0 {uniq_name = "_QFEj"} : (!fir.ref) -> (!fir.ref, !fir.ref) + omp.yield(%1#0 : !fir.ref) +} +omp.private {type = private} @_QFEtmp_private_ref_2xi32 : !fir.ref> alloc { +^bb0(%arg0: !fir.ref>): + %c2 = arith.constant 2 : index + %0 = fir.alloca !fir.array<2xi32> {bindc_name = "tmp", pinned, uniq_name = "_QFEtmp"} + %1 = fir.shape %c2 : (index) -> !fir.shape<1> + %2:2 = hlfir.declare %0(%1) {uniq_name = "_QFEtmp"} : (!fir.ref>, !fir.shape<1>) -> (!fir.ref>, !fir.ref>) + omp.yield(%2#0 : !fir.ref>) +} +func.func @_QQmain() attributes {fir.bindc_name = "main"} { + %0 = fir.address_of(@_QFEarraya) : !fir.ref> + %c10 = arith.constant 10 : index + %c10_0 = arith.constant 10 : index + %1 = fir.shape %c10, %c10_0 : (index, index) -> !fir.shape<2> + %2:2 = hlfir.declare %0(%1) {uniq_name = "_QFEarraya"} : (!fir.ref>, !fir.shape<2>) -> (!fir.ref>, !fir.ref>) + %3 = fir.alloca i32 {bindc_name = "i", uniq_name = "_QFEi"} + %4:2 = hlfir.declare %3 {uniq_name = "_QFEi"} : (!fir.ref) -> (!fir.ref, !fir.ref) + %5 = fir.alloca i32 {bindc_name = "j", uniq_name = "_QFEj"} + %6:2 = hlfir.declare %5 {uniq_name = "_QFEj"} : (!fir.ref) -> (!fir.ref, !fir.ref) + %c2 = arith.constant 2 : index + %7 = fir.alloca !fir.array<2xi32> {bindc_name = "tmp", uniq_name = "_QFEtmp"} + %8 = fir.shape %c2 : (index) -> !fir.shape<1> + %9:2 = hlfir.declare %7(%8) {uniq_name = "_QFEtmp"} : (!fir.ref>, !fir.shape<1>) -> (!fir.ref>, !fir.ref>) + omp.teams { + omp.parallel private(@_QFEtmp_private_ref_2xi32 %9#0 -> %arg0, @_QFEj_private_ref_i32 %6#0 -> %arg1, @_QFEi_private_ref_i32 %4#0 -> %arg2 : !fir.ref>, !fir.ref, !fir.ref) { + %c2_1 = arith.constant 2 : index + %10 = fir.shape %c2_1 : (index) -> !fir.shape<1> + %11:2 = hlfir.declare %arg0(%10) {uniq_name = "_QFEtmp", test.ptr = "tmp_private_array"} : (!fir.ref>, !fir.shape<1>) -> (!fir.ref>, !fir.ref>) + %12:2 = hlfir.declare %arg1 {uniq_name = "_QFEj"} : (!fir.ref) -> (!fir.ref, !fir.ref) + %13:2 = hlfir.declare %arg2 {uniq_name = "_QFEi"} : (!fir.ref) -> (!fir.ref, !fir.ref) + %c1_i32 = arith.constant 1 : i32 + %c10_i32 = arith.constant 10 : i32 + %c1_i32_2 = arith.constant 1 : i32 + omp.distribute { + omp.wsloop { + omp.loop_nest (%arg3) : i32 = (%c1_i32) to (%c10_i32) inclusive step (%c1_i32_2) { + fir.store %arg3 to %12#1 : !fir.ref + %c1_i32_3 = arith.constant 1 : i32 + %14 = fir.convert %c1_i32_3 : (i32) -> index + %c10_i32_4 = arith.constant 10 : i32 + %15 = fir.convert %c10_i32_4 : (i32) -> index + %c1 = arith.constant 1 : index + %16 = fir.convert %14 : (index) -> i32 + %17:2 = fir.do_loop %arg4 = %14 to %15 step %c1 iter_args(%arg5 = %16) -> (index, i32) { + fir.store %arg5 to %13#1 : !fir.ref + %c2_5 = arith.constant 2 : index + %c1_6 = arith.constant 1 : index + %c1_7 = arith.constant 1 : index + %18 = fir.allocmem !fir.array<2xi32> {bindc_name = ".tmp.arrayctor", uniq_name = ""} + %19 = fir.shape %c2_5 : (index) -> !fir.shape<1> + %20:2 = hlfir.declare %18(%19) {uniq_name = ".tmp.arrayctor"} : (!fir.heap>, !fir.shape<1>) -> (!fir.heap>, !fir.heap>) + %21 = fir.load %13#0 : !fir.ref + %22 = arith.addi %c1_6, %c1_7 : index + %23 = hlfir.designate %20#0 (%c1_6) : (!fir.heap>, index) -> !fir.ref + hlfir.assign %21 to %23 : i32, !fir.ref + %24 = fir.load %12#0 : !fir.ref + %25 = hlfir.designate %20#0 (%22) : (!fir.heap>, index) -> !fir.ref + hlfir.assign %24 to %25 : i32, !fir.ref + %true = arith.constant true + %26 = hlfir.as_expr %20#0 move %true {test.ptr = "unnamed_array"} : (!fir.heap>, i1) -> !hlfir.expr<2xi32> + hlfir.assign %26 to %11#0 : !hlfir.expr<2xi32>, !fir.ref> + hlfir.destroy %26 : !hlfir.expr<2xi32> + %c1_8 = arith.constant 1 : index + %27 = hlfir.designate %11#0 (%c1_8) : (!fir.ref>, index) -> !fir.ref + %28 = fir.load %27 : !fir.ref + hlfir.assign %28 to %2#0 : i32, !fir.ref> + %29 = arith.addi %arg4, %c1 : index + %30 = fir.convert %c1 : (index) -> i32 + %31 = fir.load %13#1 : !fir.ref + %32 = arith.addi %31, %30 : i32 + fir.result %29, %32 : index, i32 + } + fir.store %17#1 to %13#1 : !fir.ref + omp.yield + } + } {omp.composite} + } {omp.composite} + omp.terminator + } {omp.composite} + omp.terminator + } + return +} +fir.global internal @_QFEarraya : !fir.array<10x10xi32> { + %0 = fir.zero_bits !fir.array<10x10xi32> + fir.has_value %0 : !fir.array<10x10xi32> +}