Skip to content

Commit 8fdac7c

Browse files
committed
Revert D71539 "Recommit "[SCEV] Look through single value PHIs.""
This reverts commit 11dccf8. A bootstrapped clang crashes (due to ArrayRef::front called on an empty ArrayRef) when compiling some files. Very strangely, this only reproduces with modules. ``` 13 0x0000564d3349e968 llvm::ArrayRef<llvm::BasicBlock*>::front() const /proc/self/cwd/llvm/include/llvm/ADT/ArrayRef.h:160:7 14 0x0000564d3349e896 llvm::LoopBase<llvm::BasicBlock, llvm::Loop>::getHeader() const /proc/self/cwd/llvm/include/llvm/Analysis/LoopInfo.h:104:50 15 0x0000564d3349fd9d llvm::LoopBase<llvm::BasicBlock, llvm::Loop>::getLoopLatch() const /proc/self/cwd/llvm/include/llvm/Analysis/LoopInfoImpl.h:210:11 16 0x0000564d33593c8a llvm::ScalarEvolution::computeBackedgeTakenCount(llvm::Loop const*, bool) /proc/self/cwd/llvm/lib/Analysis/ScalarEvolution.cpp:6933:15 17 0x0000564d33592ebc llvm::ScalarEvolution::getBackedgeTakenInfo(llvm::Loop const*) /proc/self/cwd/llvm/lib/Analysis/ScalarEvolution.cpp:0:30 18 0x0000564d33593a54 llvm::ScalarEvolution::getBackedgeTakenCount(llvm::Loop const*, llvm::ScalarEvolution::ExitCountKind) /proc/self/cwd/llvm/lib/Analysis/ScalarEvolution.cpp:6487:36 19 0x0000564d32be2402 llvm::ScalarEvolution::getConstantMaxBackedgeTakenCount(llvm::Loop const*) /proc/self/cwd/llvm/include/llvm/Analysis/ScalarEvolution.h:768:5 20 0x0000564d33590807 llvm::ScalarEvolution::getRangeRef(llvm::SCEV const*, llvm::ScalarEvolution::RangeSignHint) /proc/self/cwd/llvm/lib/Analysis/ScalarEvolution.cpp:5495:19 21 0x0000564d320abab7 llvm::ScalarEvolution::getSignedRange(llvm::SCEV const*) /proc/self/cwd/llvm/include/llvm/Analysis/ScalarEvolution.h:840:12 22 0x0000564d335a03aa llvm::ScalarEvolution::isKnownPredicateViaConstantRanges(llvm::CmpInst::Predicate, llvm::SCEV const*, llvm::SCEV const*) /proc/self/cwd/llvm/lib/Analysis/ScalarEvolution.cpp:9239:60 23 0x0000564d33586a80 llvm::ScalarEvolution::isKnownViaNonRecursiveReasoning(llvm::CmpInst::Predicate, llvm::SCEV const*, llvm::SCEV const*) /proc/self/cwd/llvm/lib/Analysis/ScalarEvolution.cpp:10284:60 ```
1 parent bb09ef9 commit 8fdac7c

File tree

4 files changed

+43
-22
lines changed

4 files changed

+43
-22
lines changed

llvm/lib/Analysis/ScalarEvolution.cpp

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

5117+
// If the PHI has a single incoming value, follow that value, unless the
5118+
// PHI's incoming blocks are in a different loop, in which case doing so
5119+
// risks breaking LCSSA form. Instcombine would normally zap these, but
5120+
// it doesn't have DominatorTree information, so it may miss cases.
51175121
if (Value *V = SimplifyInstruction(PN, {getDataLayout(), &TLI, &DT, &AC}))
5118-
return getSCEV(V);
5122+
if (LI.replacementPreservesLCSSAForm(PN, V))
5123+
return getSCEV(V);
51195124

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

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,9 @@ b2: ; preds = %b1
5858
; CHECK-NEXT: %v6 = add nuw nsw i32 %v1, 1
5959
; CHECK-NEXT: --> {4,+,1}<nuw><nsw><%b1> U: [4,7) S: [4,7) Exits: 6 LoopDispositions: { %b1: Computable }
6060
; CHECK-NEXT: %v7 = phi i32 [ %v1, %b1 ]
61-
; CHECK-NEXT: --> {3,+,1}<nuw><nsw><%b1> U: [3,6) S: [3,6) --> 5 U: [5,6) S: [5,6)
61+
; CHECK-NEXT: --> %v7 U: [3,6) S: [3,6)
6262
; CHECK-NEXT: %v8 = phi i16 [ %v3, %b1 ]
63-
; CHECK-NEXT: --> {3,+,4,+,1}<%b1> U: full-set S: full-set --> 12 U: [12,13) S: [12,13)
63+
; CHECK-NEXT: --> %v8 U: full-set S: full-set
6464
; CHECK-NEXT: Determining loop execution counts for: @f1
6565
; CHECK-NEXT: Loop %b3: <multiple exits> Unpredictable backedge-taken count.
6666
; 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
@@ -13,11 +13,11 @@
1313
; CHECK-NEXT: %v3 = mul i16 %v2, %v2
1414
; CHECK-NEXT: --> {1,+,3,+,2}<%b1> U: full-set S: full-set Exits: 0 LoopDispositions: { %b1: Computable }
1515
; CHECK-NEXT: %v5 = phi i16 [ %v2, %b1 ]
16-
; CHECK-NEXT: --> {-1,+,-1}<%b1> U: [-256,0) S: [-256,0) --> -256 U: [-256,-255) S: [-256,-255)
16+
; CHECK-NEXT: --> %v5 U: [-256,0) S: [-256,0)
1717
; CHECK-NEXT: %v6 = phi i16 [ %v3, %b1 ]
18-
; CHECK-NEXT: --> {1,+,3,+,2}<%b1> U: full-set S: full-set --> 0 U: [0,1) S: [0,1)
18+
; CHECK-NEXT: --> %v6 U: full-set S: full-set
1919
; CHECK-NEXT: %v7 = sext i16 %v5 to i32
20-
; CHECK-NEXT: --> {-1,+,-1}<nsw><%b1> U: [-256,0) S: [-256,0) --> -256 U: [-256,-255) S: [-256,-255)
20+
; CHECK-NEXT: --> (sext i16 %v5 to i32) U: [-256,0) S: [-256,0)
2121
; CHECK-NEXT: Determining loop execution counts for: @f0
2222
; CHECK-NEXT: Loop %b1: backedge-taken count is 255
2323
; CHECK-NEXT: Loop %b1: max backedge-taken count is 255

llvm/test/Transforms/LoopStrengthReduce/funclet.ll

Lines changed: 32 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -15,21 +15,25 @@ 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: [[PHI21:%.*]] = ptrtoint i8* [[PHI2]] to i32
30+
; CHECK-NEXT: [[TMP1:%.*]] = sub i32 1, [[PHI21]]
31+
; CHECK-NEXT: [[SCEVGEP:%.*]] = getelementptr i8, i8* undef, i32 [[TMP1]]
2732
; CHECK-NEXT: br label [[LOOP_BODY:%.*]]
2833
; 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
34+
; CHECK-NEXT: [[LSR_IV:%.*]] = phi i8* [ [[SCEVGEP2:%.*]], [[ITER:%.*]] ], [ [[SCEVGEP]], [[BLAH2]] ]
35+
; CHECK-NEXT: [[SCEVGEP2]] = getelementptr i8, i8* [[LSR_IV]], i32 -1
36+
; CHECK-NEXT: [[TMP100:%.*]] = icmp eq i8* [[SCEVGEP2]], null
3337
; CHECK-NEXT: br i1 [[TMP100]], label [[UNWIND_OUT:%.*]], label [[ITER]]
3438
; CHECK: iter:
3539
; CHECK-NEXT: br i1 true, label [[UNWIND_OUT]], label [[LOOP_BODY]]
@@ -74,25 +78,29 @@ define void @g() personality i32 (...)* @_except_handler3 {
7478
; CHECK-NEXT: entry:
7579
; CHECK-NEXT: br label [[THROW:%.*]]
7680
; CHECK: throw:
81+
; CHECK-NEXT: [[TMP96:%.*]] = getelementptr inbounds i8, i8* undef, i32 1
7782
; CHECK-NEXT: invoke void @reserve()
7883
; CHECK-NEXT: to label [[THROW]] unwind label [[PAD:%.*]]
7984
; CHECK: pad:
85+
; CHECK-NEXT: [[PHI2:%.*]] = phi i8* [ [[TMP96]], [[THROW]] ]
8086
; CHECK-NEXT: [[CS:%.*]] = catchswitch within none [label [[UNREACHABLE:%.*]], label %blah] unwind to caller
8187
; CHECK: unreachable:
8288
; CHECK-NEXT: [[TMP0:%.*]] = catchpad within [[CS]] []
8389
; CHECK-NEXT: unreachable
8490
; CHECK: blah:
8591
; CHECK-NEXT: [[CATCHPAD:%.*]] = catchpad within [[CS]] []
92+
; CHECK-NEXT: [[PHI21:%.*]] = ptrtoint i8* [[PHI2]] to i32
93+
; CHECK-NEXT: [[TMP1:%.*]] = sub i32 1, [[PHI21]]
94+
; CHECK-NEXT: [[SCEVGEP:%.*]] = getelementptr i8, i8* undef, i32 [[TMP1]]
8695
; CHECK-NEXT: br label [[LOOP_BODY:%.*]]
8796
; CHECK: unwind_out:
8897
; CHECK-NEXT: catchret from [[CATCHPAD]] to label [[LEAVE:%.*]]
8998
; CHECK: leave:
9099
; CHECK-NEXT: ret void
91100
; 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
101+
; CHECK-NEXT: [[LSR_IV:%.*]] = phi i8* [ [[SCEVGEP2:%.*]], [[ITER:%.*]] ], [ [[SCEVGEP]], [[BLAH:%.*]] ]
102+
; CHECK-NEXT: [[SCEVGEP2]] = getelementptr i8, i8* [[LSR_IV]], i32 -1
103+
; CHECK-NEXT: [[TMP100:%.*]] = icmp eq i8* [[SCEVGEP2]], null
96104
; CHECK-NEXT: br i1 [[TMP100]], label [[UNWIND_OUT:%.*]], label [[ITER]]
97105
; CHECK: iter:
98106
; CHECK-NEXT: br i1 true, label [[UNWIND_OUT]], label [[LOOP_BODY]]
@@ -138,6 +146,7 @@ define void @h() personality i32 (...)* @_except_handler3 {
138146
; CHECK-NEXT: entry:
139147
; CHECK-NEXT: br label [[THROW:%.*]]
140148
; CHECK: throw:
149+
; CHECK-NEXT: [[TMP96:%.*]] = getelementptr inbounds i8, i8* undef, i32 1
141150
; CHECK-NEXT: invoke void @reserve()
142151
; CHECK-NEXT: to label [[THROW]] unwind label [[PAD:%.*]]
143152
; CHECK: pad:
@@ -146,17 +155,20 @@ define void @h() personality i32 (...)* @_except_handler3 {
146155
; CHECK-NEXT: [[TMP0:%.*]] = catchpad within [[CS]] []
147156
; CHECK-NEXT: unreachable
148157
; CHECK: blug:
158+
; CHECK-NEXT: [[PHI2:%.*]] = phi i8* [ [[TMP96]], [[PAD]] ]
149159
; CHECK-NEXT: [[CATCHPAD:%.*]] = catchpad within [[CS]] []
160+
; CHECK-NEXT: [[PHI21:%.*]] = ptrtoint i8* [[PHI2]] to i32
161+
; CHECK-NEXT: [[TMP1:%.*]] = sub i32 1, [[PHI21]]
162+
; CHECK-NEXT: [[SCEVGEP:%.*]] = getelementptr i8, i8* undef, i32 [[TMP1]]
150163
; CHECK-NEXT: br label [[LOOP_BODY:%.*]]
151164
; CHECK: unwind_out:
152165
; CHECK-NEXT: catchret from [[CATCHPAD]] to label [[LEAVE:%.*]]
153166
; CHECK: leave:
154167
; CHECK-NEXT: ret void
155168
; 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
169+
; CHECK-NEXT: [[LSR_IV:%.*]] = phi i8* [ [[SCEVGEP2:%.*]], [[ITER:%.*]] ], [ [[SCEVGEP]], [[BLUG:%.*]] ]
170+
; CHECK-NEXT: [[SCEVGEP2]] = getelementptr i8, i8* [[LSR_IV]], i32 -1
171+
; CHECK-NEXT: [[TMP100:%.*]] = icmp eq i8* [[SCEVGEP2]], null
160172
; CHECK-NEXT: br i1 [[TMP100]], label [[UNWIND_OUT:%.*]], label [[ITER]]
161173
; CHECK: iter:
162174
; CHECK-NEXT: br i1 true, label [[UNWIND_OUT]], label [[LOOP_BODY]]
@@ -202,9 +214,11 @@ define void @i() personality i32 (...)* @_except_handler3 {
202214
; CHECK-NEXT: entry:
203215
; CHECK-NEXT: br label [[THROW:%.*]]
204216
; CHECK: throw:
217+
; CHECK-NEXT: [[TMP96:%.*]] = getelementptr inbounds i8, i8* undef, i32 1
205218
; CHECK-NEXT: invoke void @reserve()
206219
; CHECK-NEXT: to label [[THROW]] unwind label [[CATCHPAD:%.*]]
207220
; CHECK: catchpad:
221+
; CHECK-NEXT: [[PHI2:%.*]] = phi i8* [ [[TMP96]], [[THROW]] ]
208222
; CHECK-NEXT: [[CS:%.*]] = catchswitch within none [label %cp_body] unwind label [[CLEANUPPAD:%.*]]
209223
; CHECK: cp_body:
210224
; CHECK-NEXT: [[TMP0:%.*]] = catchpad within [[CS]] []
@@ -213,12 +227,14 @@ define void @i() personality i32 (...)* @_except_handler3 {
213227
; CHECK-NEXT: [[TMP1:%.*]] = cleanuppad within none []
214228
; CHECK-NEXT: br label [[LOOP_HEAD]]
215229
; CHECK: loop_head:
230+
; CHECK-NEXT: [[PHI21:%.*]] = ptrtoint i8* [[PHI2]] to i32
231+
; CHECK-NEXT: [[TMP2:%.*]] = sub i32 1, [[PHI21]]
232+
; CHECK-NEXT: [[SCEVGEP:%.*]] = getelementptr i8, i8* undef, i32 [[TMP2]]
216233
; CHECK-NEXT: br label [[LOOP_BODY:%.*]]
217234
; 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
235+
; CHECK-NEXT: [[LSR_IV:%.*]] = phi i8* [ [[SCEVGEP2:%.*]], [[ITER:%.*]] ], [ [[SCEVGEP]], [[LOOP_HEAD]] ]
236+
; CHECK-NEXT: [[SCEVGEP2]] = getelementptr i8, i8* [[LSR_IV]], i32 -1
237+
; CHECK-NEXT: [[TMP100:%.*]] = icmp eq i8* [[SCEVGEP2]], null
222238
; CHECK-NEXT: br i1 [[TMP100]], label [[UNWIND_OUT:%.*]], label [[ITER]]
223239
; CHECK: iter:
224240
; CHECK-NEXT: br i1 true, label [[UNWIND_OUT]], label [[LOOP_BODY]]

0 commit comments

Comments
 (0)