Skip to content

Commit f3c5289

Browse files
mstorsjotru
mstorsjo
authored and
tru
committed
Revert "Recommit "[SCEV] Look through single value PHIs." (take 3)"
This reverts commit 20d798b. This commit caused crashes in some cases, see github issue llvm#58152. This is fixed on main, but backporting it requires multiple nontrivial cherrypicks. Updating llvm/test/Transforms/LoopVectorize/create-induction-resume.ll with update_test_checks.py, so this isn't an exact automatic revert, as that test case was added after the reverted commit. This fixes llvm#58152 for the release branch.
1 parent 6599b6e commit f3c5289

File tree

10 files changed

+75
-71
lines changed

10 files changed

+75
-71
lines changed

‎llvm/lib/Analysis/ScalarEvolution.cpp

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5917,8 +5917,13 @@ const SCEV *ScalarEvolution::createNodeForPHI(PHINode *PN) {
59175917
if (const SCEV *S = createNodeFromSelectLikePHI(PN))
59185918
return S;
59195919

5920+
// If the PHI has a single incoming value, follow that value, unless the
5921+
// PHI's incoming blocks are in a different loop, in which case doing so
5922+
// risks breaking LCSSA form. Instcombine would normally zap these, but
5923+
// it doesn't have DominatorTree information, so it may miss cases.
59205924
if (Value *V = simplifyInstruction(PN, {getDataLayout(), &TLI, &DT, &AC}))
5921-
return getSCEV(V);
5925+
if (LI.replacementPreservesLCSSAForm(PN, V))
5926+
return getSCEV(V);
59225927

59235928
// If it's not a loop phi, we can't handle it yet.
59245929
return getUnknown(PN);

‎llvm/test/Analysis/DependenceAnalysis/lcssa.ll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
; RUN: "-aa-pipeline=basic-aa,tbaa" 2>&1 | FileCheck %s
33

44
; CHECK: Src: %v = load i32, i32* %arrayidx1, align 4 --> Dst: store i32 %add, i32* %a.lcssa, align 4
5-
; CHECK-NEXT: da analyze - anti [*|<]!
5+
; CHECK-NEXT: da analyze - confused!
66

77
define void @f(i32 *%a, i32 %n, i64 %n2) {
88
entry:

‎llvm/test/Analysis/ScalarEvolution/cycled_phis.ll

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ define void @test_02(i32* %p, i32* %q) {
4646
; CHECK-NEXT: %inner_cond = call i1 @cond()
4747
; CHECK-NEXT: --> %inner_cond U: full-set S: full-set Exits: <<Unknown>> LoopDispositions: { %inner_loop: Variant, %outer_loop: Variant }
4848
; CHECK-NEXT: %inner_lcssa = phi i32 [ %inner_phi, %inner_loop ]
49-
; CHECK-NEXT: --> %inner_phi U: full-set S: full-set Exits: <<Unknown>> LoopDispositions: { %outer_loop: Variant, %inner_loop: Variant }
49+
; CHECK-NEXT: --> %inner_lcssa U: full-set S: full-set Exits: <<Unknown>> LoopDispositions: { %outer_loop: Variant, %inner_loop: Invariant }
5050
; CHECK-NEXT: %outer_cond = call i1 @cond()
5151
; CHECK-NEXT: --> %outer_cond U: full-set S: full-set Exits: <<Unknown>> LoopDispositions: { %outer_loop: Variant, %inner_loop: Invariant }
5252
; CHECK-NEXT: Determining loop execution counts for: @test_02
@@ -97,7 +97,7 @@ define void @test_03(i32* %p, i32* %q) {
9797
; CHECK-NEXT: %inner_cond = call i1 @cond()
9898
; CHECK-NEXT: --> %inner_cond U: full-set S: full-set Exits: <<Unknown>> LoopDispositions: { %inner_loop: Variant, %outer_loop: Variant }
9999
; CHECK-NEXT: %inner_lcssa = phi i32 [ %inner_phi_1, %inner_loop ]
100-
; CHECK-NEXT: --> %inner_phi_1 U: full-set S: full-set Exits: <<Unknown>> LoopDispositions: { %outer_loop: Variant, %inner_loop: Variant }
100+
; CHECK-NEXT: --> %inner_lcssa U: full-set S: full-set Exits: <<Unknown>> LoopDispositions: { %outer_loop: Variant, %inner_loop: Invariant }
101101
; CHECK-NEXT: %outer_cond = call i1 @cond()
102102
; CHECK-NEXT: --> %outer_cond U: full-set S: full-set Exits: <<Unknown>> LoopDispositions: { %outer_loop: Variant, %inner_loop: Invariant }
103103
; CHECK-NEXT: Determining loop execution counts for: @test_03

‎llvm/test/Analysis/ScalarEvolution/incorrect-exit-count.ll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ define dso_local i32 @f() {
5353
; CHECK-NEXT: %dec.3 = add nsw i32 %storemerge1921.3, -1
5454
; CHECK-NEXT: --> {2,+,-1}<nsw><%inner.loop> U: [2,3) S: [2,3) Exits: <<Unknown>> LoopDispositions: { %inner.loop: Computable, %outer.loop: Variant }
5555
; CHECK-NEXT: %storemerge1921.lcssa25.3 = phi i32 [ %storemerge1921.3, %for.end.3 ]
56-
; CHECK-NEXT: --> {3,+,-1}<nuw><nsw><%inner.loop> U: [3,4) S: [3,4) Exits: <<Unknown>> LoopDispositions: { %outer.loop: Variant, %for.cond6: Variant, %inner.loop: Computable }
56+
; CHECK-NEXT: --> %storemerge1921.lcssa25.3 U: [3,4) S: [3,4) Exits: <<Unknown>> LoopDispositions: { %outer.loop: Variant, %for.cond6: Invariant, %inner.loop: Invariant }
5757
; CHECK-NEXT: %dec16 = add nsw i32 %storemerge23, -1
5858
; CHECK-NEXT: --> {2,+,-1}<nsw><%outer.loop> U: [0,3) S: [0,3) Exits: <<Unknown>> LoopDispositions: { %outer.loop: Computable, %for.cond6: Invariant, %inner.loop: Invariant }
5959
; CHECK-NEXT: Determining loop execution counts for: @f

‎llvm/test/Analysis/ScalarEvolution/solve-quadratic-i1.ll

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,9 @@ define void @f1() #0 {
5959
; CHECK-NEXT: %v6 = add nuw nsw i32 %v1, 1
6060
; CHECK-NEXT: --> {4,+,1}<nuw><nsw><%b1> U: [4,7) S: [4,7) Exits: 6 LoopDispositions: { %b1: Computable }
6161
; CHECK-NEXT: %v7 = phi i32 [ %v1, %b1 ]
62-
; CHECK-NEXT: --> {3,+,1}<nuw><nsw><%b1> U: [3,6) S: [3,6) --> 5 U: [5,6) S: [5,6)
62+
; CHECK-NEXT: --> %v7 U: [3,6) S: [3,6) --> 5 U: [5,6) S: [5,6)
6363
; CHECK-NEXT: %v8 = phi i16 [ %v3, %b1 ]
64-
; CHECK-NEXT: --> {3,+,4,+,1}<%b1> U: full-set S: full-set --> 12 U: [12,13) S: [12,13)
64+
; CHECK-NEXT: --> %v8 U: full-set S: full-set --> 12 U: [12,13) S: [12,13)
6565
; CHECK-NEXT: Determining loop execution counts for: @f1
6666
; CHECK-NEXT: Loop %b3: <multiple exits> Unpredictable backedge-taken count.
6767
; CHECK-NEXT: Loop %b3: Unpredictable max backedge-taken count.

‎llvm/test/Analysis/ScalarEvolution/solve-quadratic-overflow.ll

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212
; CHECK-NEXT: %v3 = mul i16 %v2, %v2
1313
; CHECK-NEXT: --> {1,+,3,+,2}<%b1> U: full-set S: full-set Exits: 0 LoopDispositions: { %b1: Computable }
1414
; CHECK-NEXT: %v5 = phi i16 [ %v2, %b1 ]
15-
; CHECK-NEXT: --> {-1,+,-1}<%b1> U: [-256,0) S: [-256,0) --> -256 U: [-256,-255) S: [-256,-255)
15+
; CHECK-NEXT: --> %v5 U: [-256,0) S: [-256,0)
1616
; CHECK-NEXT: %v6 = phi i16 [ %v3, %b1 ]
17-
; CHECK-NEXT: --> {1,+,3,+,2}<%b1> U: full-set S: full-set --> 0 U: [0,1) S: [0,1)
17+
; CHECK-NEXT: --> %v6 U: full-set S: full-set
1818
; CHECK-NEXT: %v7 = sext i16 %v5 to i32
19-
; CHECK-NEXT: --> {-1,+,-1}<nsw><%b1> U: [-256,0) S: [-256,0) --> -256 U: [-256,-255) S: [-256,-255)
19+
; CHECK-NEXT: --> (sext i16 %v5 to i32) U: [-256,0) S: [-256,0)
2020
; CHECK-NEXT: Determining loop execution counts for: @f0
2121
; CHECK-NEXT: Loop %b1: backedge-taken count is 255
2222
; CHECK-NEXT: Loop %b1: max backedge-taken count is 255

‎llvm/test/Analysis/ScalarEvolution/trivial-phis.ll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
; CHECK-LABEL: @test1
44
; CHECK: %add.lcssa.wide = phi i64 [ %indvars.iv.next, %do.body ]
5-
; CHECK-NEXT: --> {1,+,1}<nuw><nsw><%do.body> U: [1,2147483648) S: [1,2147483648)
5+
; CHECK-NEXT: --> %add.lcssa.wide U: [1,2147483648) S: [1,2147483648)
66

77
define i64 @test1(i32 signext %n, float* %A) {
88
entry:

‎llvm/test/Transforms/LoopStrengthReduce/funclet.ll

Lines changed: 24 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -15,21 +15,23 @@ define void @f() personality i32 (...)* @_except_handler3 {
1515
; CHECK-NEXT: entry:
1616
; CHECK-NEXT: br label [[THROW:%.*]]
1717
; CHECK: throw:
18+
; CHECK-NEXT: [[TMP96:%.*]] = getelementptr inbounds i8, i8* undef, i32 1
1819
; CHECK-NEXT: invoke void @reserve()
1920
; CHECK-NEXT: to label [[THROW]] unwind label [[PAD:%.*]]
2021
; CHECK: pad:
22+
; CHECK-NEXT: [[PHI2:%.*]] = phi i8* [ [[TMP96]], [[THROW]] ]
2123
; CHECK-NEXT: [[CS:%.*]] = catchswitch within none [label %unreachable] unwind label [[BLAH2:%.*]]
2224
; CHECK: unreachable:
2325
; CHECK-NEXT: [[TMP0:%.*]] = catchpad within [[CS]] []
2426
; CHECK-NEXT: unreachable
2527
; CHECK: blah2:
2628
; CHECK-NEXT: [[CLEANUPPADI4_I_I_I:%.*]] = cleanuppad within none []
29+
; CHECK-NEXT: [[SCEVGEP:%.*]] = getelementptr i8, i8* [[PHI2]], i32 -1
2730
; CHECK-NEXT: br label [[LOOP_BODY:%.*]]
2831
; CHECK: loop_body:
29-
; CHECK-NEXT: [[LSR_IV:%.*]] = phi i32 [ [[LSR_IV_NEXT:%.*]], [[ITER:%.*]] ], [ 0, [[BLAH2]] ]
30-
; CHECK-NEXT: [[LSR_IV_NEXT]] = add nuw nsw i32 [[LSR_IV]], -1
31-
; CHECK-NEXT: [[LSR_IV_NEXT1:%.*]] = inttoptr i32 [[LSR_IV_NEXT]] to i8*
32-
; CHECK-NEXT: [[TMP100:%.*]] = icmp eq i8* [[LSR_IV_NEXT1]], null
32+
; CHECK-NEXT: [[LSR_IV:%.*]] = phi i8* [ [[SCEVGEP1:%.*]], [[ITER:%.*]] ], [ [[SCEVGEP]], [[BLAH2]] ]
33+
; CHECK-NEXT: [[SCEVGEP1]] = getelementptr i8, i8* [[LSR_IV]], i32 1
34+
; CHECK-NEXT: [[TMP100:%.*]] = icmp eq i8* [[SCEVGEP1]], undef
3335
; CHECK-NEXT: br i1 [[TMP100]], label [[UNWIND_OUT:%.*]], label [[ITER]]
3436
; CHECK: iter:
3537
; CHECK-NEXT: br i1 true, label [[UNWIND_OUT]], label [[LOOP_BODY]]
@@ -74,25 +76,27 @@ define void @g() personality i32 (...)* @_except_handler3 {
7476
; CHECK-NEXT: entry:
7577
; CHECK-NEXT: br label [[THROW:%.*]]
7678
; CHECK: throw:
79+
; CHECK-NEXT: [[TMP96:%.*]] = getelementptr inbounds i8, i8* undef, i32 1
7780
; CHECK-NEXT: invoke void @reserve()
7881
; CHECK-NEXT: to label [[THROW]] unwind label [[PAD:%.*]]
7982
; CHECK: pad:
83+
; CHECK-NEXT: [[PHI2:%.*]] = phi i8* [ [[TMP96]], [[THROW]] ]
8084
; CHECK-NEXT: [[CS:%.*]] = catchswitch within none [label [[UNREACHABLE:%.*]], label %blah] unwind to caller
8185
; CHECK: unreachable:
8286
; CHECK-NEXT: [[TMP0:%.*]] = catchpad within [[CS]] []
8387
; CHECK-NEXT: unreachable
8488
; CHECK: blah:
8589
; CHECK-NEXT: [[CATCHPAD:%.*]] = catchpad within [[CS]] []
90+
; CHECK-NEXT: [[SCEVGEP:%.*]] = getelementptr i8, i8* [[PHI2]], i32 -1
8691
; CHECK-NEXT: br label [[LOOP_BODY:%.*]]
8792
; CHECK: unwind_out:
8893
; CHECK-NEXT: catchret from [[CATCHPAD]] to label [[LEAVE:%.*]]
8994
; CHECK: leave:
9095
; CHECK-NEXT: ret void
9196
; CHECK: loop_body:
92-
; CHECK-NEXT: [[LSR_IV:%.*]] = phi i32 [ [[LSR_IV_NEXT:%.*]], [[ITER:%.*]] ], [ 0, [[BLAH:%.*]] ]
93-
; CHECK-NEXT: [[LSR_IV_NEXT]] = add nuw nsw i32 [[LSR_IV]], -1
94-
; CHECK-NEXT: [[LSR_IV_NEXT1:%.*]] = inttoptr i32 [[LSR_IV_NEXT]] to i8*
95-
; CHECK-NEXT: [[TMP100:%.*]] = icmp eq i8* [[LSR_IV_NEXT1]], null
97+
; CHECK-NEXT: [[LSR_IV:%.*]] = phi i8* [ [[SCEVGEP1:%.*]], [[ITER:%.*]] ], [ [[SCEVGEP]], [[BLAH:%.*]] ]
98+
; CHECK-NEXT: [[SCEVGEP1]] = getelementptr i8, i8* [[LSR_IV]], i32 1
99+
; CHECK-NEXT: [[TMP100:%.*]] = icmp eq i8* [[SCEVGEP1]], undef
96100
; CHECK-NEXT: br i1 [[TMP100]], label [[UNWIND_OUT:%.*]], label [[ITER]]
97101
; CHECK: iter:
98102
; CHECK-NEXT: br i1 true, label [[UNWIND_OUT]], label [[LOOP_BODY]]
@@ -138,6 +142,7 @@ define void @h() personality i32 (...)* @_except_handler3 {
138142
; CHECK-NEXT: entry:
139143
; CHECK-NEXT: br label [[THROW:%.*]]
140144
; CHECK: throw:
145+
; CHECK-NEXT: [[TMP96:%.*]] = getelementptr inbounds i8, i8* undef, i32 1
141146
; CHECK-NEXT: invoke void @reserve()
142147
; CHECK-NEXT: to label [[THROW]] unwind label [[PAD:%.*]]
143148
; CHECK: pad:
@@ -146,17 +151,18 @@ define void @h() personality i32 (...)* @_except_handler3 {
146151
; CHECK-NEXT: [[TMP0:%.*]] = catchpad within [[CS]] []
147152
; CHECK-NEXT: unreachable
148153
; CHECK: blug:
154+
; CHECK-NEXT: [[PHI2:%.*]] = phi i8* [ [[TMP96]], [[PAD]] ]
149155
; CHECK-NEXT: [[CATCHPAD:%.*]] = catchpad within [[CS]] []
156+
; CHECK-NEXT: [[SCEVGEP:%.*]] = getelementptr i8, i8* [[PHI2]], i32 -1
150157
; CHECK-NEXT: br label [[LOOP_BODY:%.*]]
151158
; CHECK: unwind_out:
152159
; CHECK-NEXT: catchret from [[CATCHPAD]] to label [[LEAVE:%.*]]
153160
; CHECK: leave:
154161
; CHECK-NEXT: ret void
155162
; CHECK: loop_body:
156-
; CHECK-NEXT: [[LSR_IV:%.*]] = phi i32 [ [[LSR_IV_NEXT:%.*]], [[ITER:%.*]] ], [ 0, [[BLUG:%.*]] ]
157-
; CHECK-NEXT: [[LSR_IV_NEXT]] = add nuw nsw i32 [[LSR_IV]], -1
158-
; CHECK-NEXT: [[LSR_IV_NEXT1:%.*]] = inttoptr i32 [[LSR_IV_NEXT]] to i8*
159-
; CHECK-NEXT: [[TMP100:%.*]] = icmp eq i8* [[LSR_IV_NEXT1]], null
163+
; CHECK-NEXT: [[LSR_IV:%.*]] = phi i8* [ [[SCEVGEP1:%.*]], [[ITER:%.*]] ], [ [[SCEVGEP]], [[BLUG:%.*]] ]
164+
; CHECK-NEXT: [[SCEVGEP1]] = getelementptr i8, i8* [[LSR_IV]], i32 1
165+
; CHECK-NEXT: [[TMP100:%.*]] = icmp eq i8* [[SCEVGEP1]], undef
160166
; CHECK-NEXT: br i1 [[TMP100]], label [[UNWIND_OUT:%.*]], label [[ITER]]
161167
; CHECK: iter:
162168
; CHECK-NEXT: br i1 true, label [[UNWIND_OUT]], label [[LOOP_BODY]]
@@ -202,9 +208,11 @@ define void @i() personality i32 (...)* @_except_handler3 {
202208
; CHECK-NEXT: entry:
203209
; CHECK-NEXT: br label [[THROW:%.*]]
204210
; CHECK: throw:
211+
; CHECK-NEXT: [[TMP96:%.*]] = getelementptr inbounds i8, i8* undef, i32 1
205212
; CHECK-NEXT: invoke void @reserve()
206213
; CHECK-NEXT: to label [[THROW]] unwind label [[CATCHPAD:%.*]]
207214
; CHECK: catchpad:
215+
; CHECK-NEXT: [[PHI2:%.*]] = phi i8* [ [[TMP96]], [[THROW]] ]
208216
; CHECK-NEXT: [[CS:%.*]] = catchswitch within none [label %cp_body] unwind label [[CLEANUPPAD:%.*]]
209217
; CHECK: cp_body:
210218
; CHECK-NEXT: [[TMP0:%.*]] = catchpad within [[CS]] []
@@ -213,12 +221,12 @@ define void @i() personality i32 (...)* @_except_handler3 {
213221
; CHECK-NEXT: [[TMP1:%.*]] = cleanuppad within none []
214222
; CHECK-NEXT: br label [[LOOP_HEAD]]
215223
; CHECK: loop_head:
224+
; CHECK-NEXT: [[SCEVGEP:%.*]] = getelementptr i8, i8* [[PHI2]], i32 -1
216225
; CHECK-NEXT: br label [[LOOP_BODY:%.*]]
217226
; CHECK: loop_body:
218-
; CHECK-NEXT: [[LSR_IV:%.*]] = phi i32 [ [[LSR_IV_NEXT:%.*]], [[ITER:%.*]] ], [ 0, [[LOOP_HEAD]] ]
219-
; CHECK-NEXT: [[LSR_IV_NEXT]] = add nuw nsw i32 [[LSR_IV]], -1
220-
; CHECK-NEXT: [[LSR_IV_NEXT1:%.*]] = inttoptr i32 [[LSR_IV_NEXT]] to i8*
221-
; CHECK-NEXT: [[TMP100:%.*]] = icmp eq i8* [[LSR_IV_NEXT1]], null
227+
; CHECK-NEXT: [[LSR_IV:%.*]] = phi i8* [ [[SCEVGEP1:%.*]], [[ITER:%.*]] ], [ [[SCEVGEP]], [[LOOP_HEAD]] ]
228+
; CHECK-NEXT: [[SCEVGEP1]] = getelementptr i8, i8* [[LSR_IV]], i32 1
229+
; CHECK-NEXT: [[TMP100:%.*]] = icmp eq i8* [[SCEVGEP1]], undef
222230
; CHECK-NEXT: br i1 [[TMP100]], label [[UNWIND_OUT:%.*]], label [[ITER]]
223231
; CHECK: iter:
224232
; CHECK-NEXT: br i1 true, label [[UNWIND_OUT]], label [[LOOP_BODY]]

‎llvm/test/Transforms/LoopVectorize/create-induction-resume.ll

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -9,29 +9,21 @@ target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16
99
define void @test(i32 %arg, i32 %L1.limit, i32 %L2.switch, i1 %c) {
1010
; CHECK-LABEL: @test(
1111
; CHECK-NEXT: L1.preheader:
12-
; CHECK-NEXT: [[TMP0:%.*]] = sub i32 -1, [[ARG:%.*]]
1312
; CHECK-NEXT: br label [[L1_HEADER:%.*]]
1413
; CHECK: L1.header:
15-
; CHECK-NEXT: [[INDUCTION_IV:%.*]] = phi i32 [ [[INDUCTION_IV_NEXT:%.*]], [[L1_BACKEDGE:%.*]] ], [ [[TMP0]], [[L1_PREHEADER:%.*]] ]
16-
; CHECK-NEXT: [[INDVAR:%.*]] = phi i32 [ [[INDVAR_NEXT:%.*]], [[L1_BACKEDGE]] ], [ 0, [[L1_PREHEADER]] ]
17-
; CHECK-NEXT: [[L1_SUM:%.*]] = phi i32 [ [[ARG]], [[L1_PREHEADER]] ], [ [[L1_SUM_NEXT:%.*]], [[L1_BACKEDGE]] ]
14+
; CHECK-NEXT: [[L1_SUM:%.*]] = phi i32 [ [[ARG:%.*]], [[L1_PREHEADER:%.*]] ], [ [[L1_SUM_NEXT:%.*]], [[L1_BACKEDGE:%.*]] ]
1815
; CHECK-NEXT: [[L1_IV:%.*]] = phi i32 [ 1, [[L1_PREHEADER]] ], [ [[L1_IV_NEXT:%.*]], [[L1_BACKEDGE]] ]
19-
; CHECK-NEXT: [[TMP1:%.*]] = mul nsw i32 [[INDVAR]], -1
20-
; CHECK-NEXT: [[TMP2:%.*]] = add i32 [[TMP1]], -2
2116
; CHECK-NEXT: br i1 [[C:%.*]], label [[L1_BACKEDGE]], label [[L1_EARLY_EXIT:%.*]]
2217
; CHECK: L1.backedge:
2318
; CHECK-NEXT: [[L1_SUM_NEXT]] = add i32 [[L1_IV]], [[L1_SUM]]
2419
; CHECK-NEXT: [[L1_IV_NEXT]] = add nuw nsw i32 [[L1_IV]], 1
2520
; CHECK-NEXT: [[L1_EXIT_COND:%.*]] = icmp ult i32 [[L1_IV_NEXT]], [[L1_LIMIT:%.*]]
26-
; CHECK-NEXT: [[INDVAR_NEXT]] = add i32 [[INDVAR]], 1
27-
; CHECK-NEXT: [[INDUCTION_IV_NEXT]] = add i32 [[INDUCTION_IV]], [[TMP2]]
2821
; CHECK-NEXT: br i1 [[L1_EXIT_COND]], label [[L1_HEADER]], label [[L1_EXIT:%.*]]
2922
; CHECK: L1.early.exit:
3023
; CHECK-NEXT: ret void
3124
; CHECK: L1.exit:
32-
; CHECK-NEXT: [[INDUCTION_IV_LCSSA3:%.*]] = phi i32 [ [[INDUCTION_IV]], [[L1_BACKEDGE]] ]
33-
; CHECK-NEXT: [[INDUCTION_IV_LCSSA1:%.*]] = phi i32 [ [[INDUCTION_IV]], [[L1_BACKEDGE]] ]
3425
; CHECK-NEXT: [[L1_EXIT_VAL:%.*]] = phi i32 [ [[L1_SUM_NEXT]], [[L1_BACKEDGE]] ]
26+
; CHECK-NEXT: [[TMP0:%.*]] = sub i32 0, [[L1_EXIT_VAL]]
3527
; CHECK-NEXT: br label [[L2_HEADER:%.*]]
3628
; CHECK: L2.header.loopexit:
3729
; CHECK-NEXT: br label [[L2_HEADER_BACKEDGE:%.*]]
@@ -45,24 +37,24 @@ define void @test(i32 %arg, i32 %L1.limit, i32 %L2.switch, i1 %c) {
4537
; CHECK: L2.Inner.header.preheader:
4638
; CHECK-NEXT: br i1 false, label [[SCALAR_PH:%.*]], label [[VECTOR_PH:%.*]]
4739
; CHECK: vector.ph:
48-
; CHECK-NEXT: [[TMP3:%.*]] = mul i32 12, [[INDUCTION_IV_LCSSA1]]
49-
; CHECK-NEXT: [[IND_END:%.*]] = add i32 1, [[TMP3]]
40+
; CHECK-NEXT: [[TMP1:%.*]] = mul i32 12, [[TMP0]]
41+
; CHECK-NEXT: [[IND_END:%.*]] = add i32 1, [[TMP1]]
5042
; CHECK-NEXT: br label [[VECTOR_BODY:%.*]]
5143
; CHECK: vector.body:
5244
; CHECK-NEXT: [[INDEX:%.*]] = phi i64 [ 0, [[VECTOR_PH]] ], [ [[INDEX_NEXT:%.*]], [[VECTOR_BODY]] ]
5345
; CHECK-NEXT: [[INDEX_NEXT]] = add nuw i64 [[INDEX]], 4
54-
; CHECK-NEXT: [[TMP4:%.*]] = icmp eq i64 [[INDEX_NEXT]], 12
55-
; CHECK-NEXT: br i1 [[TMP4]], label [[MIDDLE_BLOCK:%.*]], label [[VECTOR_BODY]], !llvm.loop [[LOOP0:![0-9]+]]
46+
; CHECK-NEXT: [[TMP2:%.*]] = icmp eq i64 [[INDEX_NEXT]], 12
47+
; CHECK-NEXT: br i1 [[TMP2]], label [[MIDDLE_BLOCK:%.*]], label [[VECTOR_BODY]], !llvm.loop [[LOOP0:![0-9]+]]
5648
; CHECK: middle.block:
5749
; CHECK-NEXT: [[CMP_N:%.*]] = icmp eq i64 12, 12
5850
; CHECK-NEXT: br i1 [[CMP_N]], label [[L2_HEADER_LOOPEXIT:%.*]], label [[SCALAR_PH]]
5951
; CHECK: scalar.ph:
6052
; CHECK-NEXT: [[BC_RESUME_VAL:%.*]] = phi i32 [ [[IND_END]], [[MIDDLE_BLOCK]] ], [ 1, [[L2_INNER_HEADER_PREHEADER]] ]
61-
; CHECK-NEXT: [[BC_RESUME_VAL2:%.*]] = phi i64 [ 13, [[MIDDLE_BLOCK]] ], [ 1, [[L2_INNER_HEADER_PREHEADER]] ]
53+
; CHECK-NEXT: [[BC_RESUME_VAL1:%.*]] = phi i64 [ 13, [[MIDDLE_BLOCK]] ], [ 1, [[L2_INNER_HEADER_PREHEADER]] ]
6254
; CHECK-NEXT: br label [[L2_INNER_HEADER:%.*]]
6355
; CHECK: L2.Inner.header:
6456
; CHECK-NEXT: [[L2_ACCUM:%.*]] = phi i32 [ [[L2_ACCUM_NEXT:%.*]], [[L2_INNER_HEADER]] ], [ [[BC_RESUME_VAL]], [[SCALAR_PH]] ]
65-
; CHECK-NEXT: [[L2_IV:%.*]] = phi i64 [ [[L2_IV_NEXT:%.*]], [[L2_INNER_HEADER]] ], [ [[BC_RESUME_VAL2]], [[SCALAR_PH]] ]
57+
; CHECK-NEXT: [[L2_IV:%.*]] = phi i64 [ [[L2_IV_NEXT:%.*]], [[L2_INNER_HEADER]] ], [ [[BC_RESUME_VAL1]], [[SCALAR_PH]] ]
6658
; CHECK-NEXT: [[L2_ACCUM_NEXT]] = sub i32 [[L2_ACCUM]], [[L1_EXIT_VAL]]
6759
; CHECK-NEXT: [[L2_DUMMY_BUT_NEED_IT:%.*]] = sext i32 [[L2_ACCUM_NEXT]] to i64
6860
; CHECK-NEXT: [[L2_IV_NEXT]] = add nuw nsw i64 [[L2_IV]], 1

0 commit comments

Comments
 (0)