Skip to content

Commit 5c75c29

Browse files
fhahntstellar
fhahn
authored and
tstellar
committed
[LV] Forget LCSSA phi with new pred before other SCEV invalidation. (llvm#119897)
`forgetLcssaPhiWithNewPredecessor` performs additional invalidation if there is an existing SCEV for the phi, but earlier `forgetBlockAndLoopDispositions` or `forgetLoop` may already invalidate the SCEV for the phi. Change the order to first call `forgetLcssaPhiWithNewPredecessor` to ensure it runs before its SCEV gets invalidated too eagerly. Fixes llvm#119665. PR: llvm#119897 (cherry picked from commit 3706dfe)
1 parent c7f18ba commit 5c75c29

File tree

2 files changed

+122
-4
lines changed

2 files changed

+122
-4
lines changed

‎llvm/lib/Transforms/Vectorize/LoopVectorize.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2888,10 +2888,6 @@ void InnerLoopVectorizer::fixVectorizedLoop(VPTransformState &State) {
28882888
if (EnableVPlanNativePath)
28892889
fixNonInductionPHIs(State);
28902890

2891-
// Forget the original basic block.
2892-
PSE.getSE()->forgetLoop(OrigLoop);
2893-
PSE.getSE()->forgetBlockAndLoopDispositions();
2894-
28952891
// After vectorization, the exit blocks of the original loop will have
28962892
// additional predecessors. Invalidate SCEVs for the exit phis in case SE
28972893
// looked through single-entry phis.
@@ -2901,6 +2897,10 @@ void InnerLoopVectorizer::fixVectorizedLoop(VPTransformState &State) {
29012897
for (PHINode &PN : Exit->phis())
29022898
PSE.getSE()->forgetLcssaPhiWithNewPredecessor(OrigLoop, &PN);
29032899

2900+
// Forget the original basic block.
2901+
PSE.getSE()->forgetLoop(OrigLoop);
2902+
PSE.getSE()->forgetBlockAndLoopDispositions();
2903+
29042904
// Don't apply optimizations below when no vector region remains, as they all
29052905
// require a vector loop at the moment.
29062906
if (!State.Plan->getVectorLoopRegion())

‎llvm/test/Transforms/LoopVectorize/invalidate-scev-at-scope-after-vectorization.ll

Lines changed: 118 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,118 @@
1+
; NOTE: Assertions have been autogenerated by utils/update_test_checks.py UTC_ARGS: --version 5
2+
; RUN: opt -passes='print<scalar-evolution>,loop-vectorize' -force-vector-width=4 -scalar-evolution-classify-expressions=false -S %s | FileCheck %s
3+
4+
; Test case for https://github.com/llvm/llvm-project/issues/119665.
5+
6+
; %loop.2's backedge-taken-count depends on %add.1 from %loop.1 via its
7+
; corresponding SCEV at the scope of %loop.2. After vectorizing %loop.1, %add.1
8+
; isn't available at the entry of %loop.2 anymore and %add.1 at %loop.2's scope
9+
; must be invalidated, as well as %loop.2's backedge-taken count.
10+
define void @test_invalidate_scevs_at_scope(ptr %p) {
11+
; CHECK-LABEL: define void @test_invalidate_scevs_at_scope(
12+
; CHECK-SAME: ptr [[P:%.*]]) {
13+
; CHECK-NEXT: [[ENTRY:.*]]:
14+
; CHECK-NEXT: br i1 false, label %[[SCALAR_PH:.*]], label %[[VECTOR_PH:.*]]
15+
; CHECK: [[VECTOR_PH]]:
16+
; CHECK-NEXT: br label %[[VECTOR_BODY:.*]]
17+
; CHECK: [[VECTOR_BODY]]:
18+
; CHECK-NEXT: [[INDEX:%.*]] = phi i32 [ 0, %[[VECTOR_PH]] ], [ [[INDEX_NEXT:%.*]], %[[VECTOR_BODY]] ]
19+
; CHECK-NEXT: [[VEC_IND:%.*]] = phi <4 x i32> [ <i32 0, i32 1, i32 2, i32 3>, %[[VECTOR_PH]] ], [ [[VEC_IND_NEXT:%.*]], %[[VECTOR_BODY]] ]
20+
; CHECK-NEXT: [[TMP0:%.*]] = load i32, ptr [[P]], align 4
21+
; CHECK-NEXT: [[BROADCAST_SPLATINSERT:%.*]] = insertelement <4 x i32> poison, i32 [[TMP0]], i64 0
22+
; CHECK-NEXT: [[BROADCAST_SPLAT:%.*]] = shufflevector <4 x i32> [[BROADCAST_SPLATINSERT]], <4 x i32> poison, <4 x i32> zeroinitializer
23+
; CHECK-NEXT: [[TMP1:%.*]] = add <4 x i32> [[BROADCAST_SPLAT]], [[VEC_IND]]
24+
; CHECK-NEXT: [[INDEX_NEXT]] = add nuw i32 [[INDEX]], 4
25+
; CHECK-NEXT: [[VEC_IND_NEXT]] = add <4 x i32> [[VEC_IND]], splat (i32 4)
26+
; CHECK-NEXT: [[TMP2:%.*]] = icmp eq i32 [[INDEX_NEXT]], 100
27+
; CHECK-NEXT: br i1 [[TMP2]], label %[[MIDDLE_BLOCK:.*]], label %[[VECTOR_BODY]], !llvm.loop [[LOOP0:![0-9]+]]
28+
; CHECK: [[MIDDLE_BLOCK]]:
29+
; CHECK-NEXT: [[TMP3:%.*]] = extractelement <4 x i32> [[TMP1]], i32 3
30+
; CHECK-NEXT: br i1 false, label %[[EXIT_1:.*]], label %[[SCALAR_PH]]
31+
; CHECK: [[SCALAR_PH]]:
32+
; CHECK-NEXT: [[BC_RESUME_VAL:%.*]] = phi i32 [ 100, %[[MIDDLE_BLOCK]] ], [ 0, %[[ENTRY]] ]
33+
; CHECK-NEXT: br label %[[LOOP_1:.*]]
34+
; CHECK: [[LOOP_1]]:
35+
; CHECK-NEXT: [[IV_1:%.*]] = phi i32 [ [[BC_RESUME_VAL]], %[[SCALAR_PH]] ], [ [[IV_1_NEXT:%.*]], %[[LOOP_1]] ]
36+
; CHECK-NEXT: [[TMP4:%.*]] = load i32, ptr [[P]], align 4
37+
; CHECK-NEXT: [[ADD_1:%.*]] = add i32 [[TMP4]], [[IV_1]]
38+
; CHECK-NEXT: [[IV_1_NEXT]] = add i32 [[IV_1]], 1
39+
; CHECK-NEXT: [[C_1:%.*]] = icmp eq i32 [[IV_1]], 100
40+
; CHECK-NEXT: br i1 [[C_1]], label %[[EXIT_1]], label %[[LOOP_1]], !llvm.loop [[LOOP3:![0-9]+]]
41+
; CHECK: [[EXIT_1]]:
42+
; CHECK-NEXT: [[ADD_LCSSA:%.*]] = phi i32 [ [[ADD_1]], %[[LOOP_1]] ], [ [[TMP3]], %[[MIDDLE_BLOCK]] ]
43+
; CHECK-NEXT: [[SMAX:%.*]] = call i32 @llvm.smax.i32(i32 [[ADD_LCSSA]], i32 100)
44+
; CHECK-NEXT: [[TMP5:%.*]] = sub i32 [[SMAX]], [[ADD_LCSSA]]
45+
; CHECK-NEXT: [[TMP6:%.*]] = zext i32 [[TMP5]] to i64
46+
; CHECK-NEXT: [[TMP7:%.*]] = add nuw nsw i64 [[TMP6]], 1
47+
; CHECK-NEXT: [[MIN_ITERS_CHECK:%.*]] = icmp ult i64 [[TMP7]], 4
48+
; CHECK-NEXT: br i1 [[MIN_ITERS_CHECK]], label %[[SCALAR_PH2:.*]], label %[[VECTOR_PH3:.*]]
49+
; CHECK: [[VECTOR_PH3]]:
50+
; CHECK-NEXT: [[N_MOD_VF:%.*]] = urem i64 [[TMP7]], 4
51+
; CHECK-NEXT: [[N_VEC:%.*]] = sub i64 [[TMP7]], [[N_MOD_VF]]
52+
; CHECK-NEXT: br label %[[VECTOR_BODY4:.*]]
53+
; CHECK: [[VECTOR_BODY4]]:
54+
; CHECK-NEXT: [[INDEX5:%.*]] = phi i64 [ 0, %[[VECTOR_PH3]] ], [ [[INDEX_NEXT8:%.*]], %[[VECTOR_BODY4]] ]
55+
; CHECK-NEXT: [[VEC_IND6:%.*]] = phi <4 x i64> [ <i64 0, i64 1, i64 2, i64 3>, %[[VECTOR_PH3]] ], [ [[VEC_IND_NEXT7:%.*]], %[[VECTOR_BODY4]] ]
56+
; CHECK-NEXT: [[TMP8:%.*]] = add i64 [[INDEX5]], 0
57+
; CHECK-NEXT: [[TMP9:%.*]] = getelementptr inbounds i64, ptr [[P]], i64 [[TMP8]]
58+
; CHECK-NEXT: [[TMP10:%.*]] = getelementptr inbounds i64, ptr [[TMP9]], i32 0
59+
; CHECK-NEXT: store <4 x i64> [[VEC_IND6]], ptr [[TMP10]], align 4
60+
; CHECK-NEXT: [[INDEX_NEXT8]] = add nuw i64 [[INDEX5]], 4
61+
; CHECK-NEXT: [[VEC_IND_NEXT7]] = add <4 x i64> [[VEC_IND6]], splat (i64 4)
62+
; CHECK-NEXT: [[TMP11:%.*]] = icmp eq i64 [[INDEX_NEXT8]], [[N_VEC]]
63+
; CHECK-NEXT: br i1 [[TMP11]], label %[[MIDDLE_BLOCK1:.*]], label %[[VECTOR_BODY4]], !llvm.loop [[LOOP4:![0-9]+]]
64+
; CHECK: [[MIDDLE_BLOCK1]]:
65+
; CHECK-NEXT: [[CMP_N:%.*]] = icmp eq i64 [[TMP7]], [[N_VEC]]
66+
; CHECK-NEXT: br i1 [[CMP_N]], label %[[EXIT_2:.*]], label %[[SCALAR_PH2]]
67+
; CHECK: [[SCALAR_PH2]]:
68+
; CHECK-NEXT: [[BC_RESUME_VAL9:%.*]] = phi i64 [ [[N_VEC]], %[[MIDDLE_BLOCK1]] ], [ 0, %[[EXIT_1]] ]
69+
; CHECK-NEXT: br label %[[LOOP_2:.*]]
70+
; CHECK: [[LOOP_2]]:
71+
; CHECK-NEXT: [[IV_2:%.*]] = phi i64 [ [[BC_RESUME_VAL9]], %[[SCALAR_PH2]] ], [ [[IV_2_NEXT:%.*]], %[[LOOP_2]] ]
72+
; CHECK-NEXT: [[IV_2_TRUNC:%.*]] = trunc i64 [[IV_2]] to i32
73+
; CHECK-NEXT: [[IV_2_NEXT]] = add i64 [[IV_2]], 1
74+
; CHECK-NEXT: [[GEP:%.*]] = getelementptr inbounds i64, ptr [[P]], i64 [[IV_2]]
75+
; CHECK-NEXT: store i64 [[IV_2]], ptr [[GEP]], align 4
76+
; CHECK-NEXT: [[ADD_2:%.*]] = add i32 [[ADD_LCSSA]], [[IV_2_TRUNC]]
77+
; CHECK-NEXT: [[C_2:%.*]] = icmp slt i32 [[ADD_2]], 100
78+
; CHECK-NEXT: br i1 [[C_2]], label %[[LOOP_2]], label %[[EXIT_2]], !llvm.loop [[LOOP5:![0-9]+]]
79+
; CHECK: [[EXIT_2]]:
80+
; CHECK-NEXT: ret void
81+
;
82+
entry:
83+
br label %loop.1
84+
85+
loop.1:
86+
%iv.1 = phi i32 [ 0, %entry ], [ %iv.1.next, %loop.1 ]
87+
%1 = load i32, ptr %p, align 4
88+
%add.1 = add i32 %1, %iv.1
89+
%iv.1.next = add i32 %iv.1, 1
90+
%c.1 = icmp eq i32 %iv.1, 100
91+
br i1 %c.1, label %exit.1, label %loop.1
92+
93+
exit.1:
94+
%add.lcssa = phi i32 [ %add.1, %loop.1 ]
95+
br label %loop.2
96+
97+
loop.2:
98+
%iv.2 = phi i64 [ 0, %exit.1 ], [ %iv.2.next, %loop.2 ]
99+
%iv.2.trunc = trunc i64 %iv.2 to i32
100+
%iv.2.next = add i64 %iv.2, 1
101+
%gep = getelementptr inbounds i64, ptr %p, i64 %iv.2
102+
store i64 %iv.2, ptr %gep
103+
%add.2 = add i32 %add.lcssa, %iv.2.trunc
104+
%c.2 = icmp slt i32 %add.2, 100
105+
br i1 %c.2, label %loop.2, label %exit.2
106+
107+
exit.2:
108+
ret void
109+
}
110+
111+
;.
112+
; CHECK: [[LOOP0]] = distinct !{[[LOOP0]], [[META1:![0-9]+]], [[META2:![0-9]+]]}
113+
; CHECK: [[META1]] = !{!"llvm.loop.isvectorized", i32 1}
114+
; CHECK: [[META2]] = !{!"llvm.loop.unroll.runtime.disable"}
115+
; CHECK: [[LOOP3]] = distinct !{[[LOOP3]], [[META2]], [[META1]]}
116+
; CHECK: [[LOOP4]] = distinct !{[[LOOP4]], [[META1]], [[META2]]}
117+
; CHECK: [[LOOP5]] = distinct !{[[LOOP5]], [[META2]], [[META1]]}
118+
;.

0 commit comments

Comments
 (0)