Skip to content

Commit 9003eb1

Browse files
[Flang][Alias analysis] Fix alias analysis for omp private
Flang alias analysis crashes for omp private allocatable item. The issue is described here: #116954 The corrsponding MLIR code for omp private allocatable object contains omp.yield without any results. We should not implicitly assume that all omp.yield operations for omp.private contain results.
1 parent 0614c60 commit 9003eb1

File tree

2 files changed

+52
-0
lines changed

2 files changed

+52
-0
lines changed

flang/lib/Optimizer/Analysis/AliasAnalysis.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -517,6 +517,8 @@ static Value getPrivateArg(omp::BlockArgOpenMPOpInterface &argIface,
517517
SymbolTable::lookupNearestSymbolFrom<omp::PrivateClauseOp>(
518518
op, cast<SymbolRefAttr>(opSym));
519519
privateOp.walk([&](omp::YieldOp yieldOp) {
520+
if (!yieldOp.getResults().size())
521+
return;
520522
// TODO Extend alias analysis if omp.yield points to
521523
// block argument value
522524
if (!yieldOp.getResults()[0].getDefiningOp())
Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
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 before simplification:
6+
// SUBROUTINE mysub(ns,ne)
7+
// INTEGER :: n
8+
// REAL(KIND=8), DIMENSION(:), allocatable :: ar1
9+
// real(kind=8), dimension(20) :: ar2
10+
// REAL(KIND=8), DIMENSION(20) :: d
11+
//
12+
//!$OMP parallel PRIVATE(ar1)
13+
// d(1:1) = (/(DOT_PRODUCT(ar1(1:n), ar2(1:n)),n=1, 1)/)
14+
//!$OMP END parallel
15+
// END SUBROUTINE
16+
17+
// CHECK-LABEL: Testing : "testPrivateAllocatable"
18+
// CHECK: ar2#0 <-> ar1#0: NoAlias
19+
// CHECK: ar2#1 <-> ar1#0: NoAlias
20+
// CHECK: ar2#0 <-> ar1#1: NoAlias
21+
// CHECK: ar2#1 <-> ar1#1: NoAlias
22+
23+
omp.private {type = private} @_QFmysubEar1_private_ref_box_heap_Uxf64 : !fir.ref<!fir.box<!fir.heap<!fir.array<?xf64>>>> alloc {
24+
^bb0(%arg0: !fir.ref<!fir.box<!fir.heap<!fir.array<?xf64>>>>):
25+
%0 = fir.alloca !fir.box<!fir.heap<!fir.array<?xf64>>> {bindc_name = "ar1", pinned, uniq_name = "_QFmysubEar1"}
26+
%5:2 = hlfir.declare %0 {fortran_attrs = #fir.var_attrs<allocatable>, uniq_name = "_QFmysubEar1"} : (!fir.ref<!fir.box<!fir.heap<!fir.array<?xf64>>>>) -> (!fir.ref<!fir.box<!fir.heap<!fir.array<?xf64>>>>, !fir.ref<!fir.box<!fir.heap<!fir.array<?xf64>>>>)
27+
omp.yield(%5#0 : !fir.ref<!fir.box<!fir.heap<!fir.array<?xf64>>>>)
28+
} dealloc {
29+
^bb0(%arg0: !fir.ref<!fir.box<!fir.heap<!fir.array<?xf64>>>>):
30+
omp.yield
31+
}
32+
func.func @testPrivateAllocatable(%arg0: !fir.ref<i32> {fir.bindc_name = "ns"}, %arg1: !fir.ref<i32> {fir.bindc_name = "ne"}) {
33+
%0 = fir.dummy_scope : !fir.dscope
34+
%1 = fir.alloca !fir.box<!fir.heap<!fir.array<?xf64>>> {bindc_name = "ar1", uniq_name = "_QFmysubEar1"}
35+
%2 = fir.zero_bits !fir.heap<!fir.array<?xf64>>
36+
%c0 = arith.constant 0 : index
37+
%3 = fir.shape %c0 : (index) -> !fir.shape<1>
38+
%4 = fir.embox %2(%3) : (!fir.heap<!fir.array<?xf64>>, !fir.shape<1>) -> !fir.box<!fir.heap<!fir.array<?xf64>>>
39+
fir.store %4 to %1 : !fir.ref<!fir.box<!fir.heap<!fir.array<?xf64>>>>
40+
%5:2 = hlfir.declare %1 {fortran_attrs = #fir.var_attrs<allocatable>, uniq_name = "_QFmysubEar1"} : (!fir.ref<!fir.box<!fir.heap<!fir.array<?xf64>>>>) -> (!fir.ref<!fir.box<!fir.heap<!fir.array<?xf64>>>>, !fir.ref<!fir.box<!fir.heap<!fir.array<?xf64>>>>)
41+
%c20 = arith.constant 20 : index
42+
%6 = fir.alloca !fir.array<20xf64> {bindc_name = "ar2", uniq_name = "_QFmysubEar2"}
43+
%7 = fir.shape %c20 : (index) -> !fir.shape<1>
44+
%8:2 = hlfir.declare %6(%7) {uniq_name = "_QFmysubEar2", test.ptr="ar2" } : (!fir.ref<!fir.array<20xf64>>, !fir.shape<1>) -> (!fir.ref<!fir.array<20xf64>>, !fir.ref<!fir.array<20xf64>>)
45+
omp.parallel private(@_QFmysubEar1_private_ref_box_heap_Uxf64 %5#0 -> %arg2 : !fir.ref<!fir.box<!fir.heap<!fir.array<?xf64>>>>) {
46+
%20:2 = hlfir.declare %arg2 {fortran_attrs = #fir.var_attrs<allocatable>, uniq_name = "_QFmysubEar1", test.ptr = "ar1"} : (!fir.ref<!fir.box<!fir.heap<!fir.array<?xf64>>>>) -> (!fir.ref<!fir.box<!fir.heap<!fir.array<?xf64>>>>, !fir.ref<!fir.box<!fir.heap<!fir.array<?xf64>>>>)
47+
omp.terminator
48+
}
49+
return
50+
}

0 commit comments

Comments
 (0)