Skip to content

Commit 41437a6

Browse files
authored
[LoopSimplifyCFG] Fix SCEV invalidation after removing dead exit (#127536)
Fixes #127534
1 parent 6de5d1e commit 41437a6

File tree

2 files changed

+110
-1
lines changed

2 files changed

+110
-1
lines changed

llvm/lib/Transforms/Scalar/LoopSimplifyCFG.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -369,7 +369,7 @@ class ConstantTerminatorFoldingImpl {
369369
DeadInstructions.emplace_back(LandingPad);
370370

371371
for (Instruction *I : DeadInstructions) {
372-
SE.forgetBlockAndLoopDispositions(I);
372+
SE.forgetValue(I);
373373
I->replaceAllUsesWith(PoisonValue::get(I->getType()));
374374
I->eraseFromParent();
375375
}
Lines changed: 109 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,109 @@
1+
; NOTE: Assertions have been autogenerated by utils/update_test_checks.py UTC_ARGS: --version 5
2+
; RUN: opt -S -passes='print<scalar-evolution>,loop-mssa(licm,loop-simplifycfg,loop-predication)' -verify-scev < %s 2>/dev/null | FileCheck %s
3+
4+
; Make sure we don't assert due to insufficient SCEV invalidation.
5+
6+
define i64 @"main"(ptr addrspace(1) %p, i1 %check) {
7+
; CHECK-LABEL: define i64 @main(
8+
; CHECK-SAME: ptr addrspace(1) [[P:%.*]], i1 [[CHECK:%.*]]) {
9+
; CHECK-NEXT: [[ENTRY:.*:]]
10+
; CHECK-NEXT: switch i32 0, label %[[ENTRY_SPLIT:.*]] [
11+
; CHECK-NEXT: i32 1, label %[[LOOP1_PREHEADER_SPLIT_LOOP_EXIT:.*]]
12+
; CHECK-NEXT: ]
13+
; CHECK: [[ENTRY_SPLIT]]:
14+
; CHECK-NEXT: br label %[[LOOP0_PRE:.*]]
15+
; CHECK: [[LOOP0_PRE]]:
16+
; CHECK-NEXT: br i1 [[CHECK]], label %[[EXIT:.*]], label %[[LOOP0:.*]]
17+
; CHECK: [[LOOP0]]:
18+
; CHECK-NEXT: [[LENGTH:%.*]] = load atomic i32, ptr addrspace(1) [[P]] unordered, align 4
19+
; CHECK-NEXT: [[TMP0:%.*]] = icmp ugt i32 [[LENGTH]], 1
20+
; CHECK-NEXT: br i1 [[TMP0]], label %[[LOOP0_OUT:.*]], label %[[LOOP1_PREHEADER_SPLIT_LOOP_EXIT1:.*]]
21+
; CHECK: [[LOOP0_OUT]]:
22+
; CHECK-NEXT: br label %[[LOOP0_PRE]]
23+
; CHECK: [[LOOP1_PREHEADER_SPLIT_LOOP_EXIT]]:
24+
; CHECK-NEXT: [[T_LE:%.*]] = add i32 0, 1
25+
; CHECK-NEXT: br label %[[LOOP1_PREHEADER:.*]]
26+
; CHECK: [[LOOP1_PREHEADER_SPLIT_LOOP_EXIT1]]:
27+
; CHECK-NEXT: [[LENGTH_LCSSA_PH2:%.*]] = phi i32 [ [[LENGTH]], %[[LOOP0]] ]
28+
; CHECK-NEXT: [[LOCAL_PH3:%.*]] = phi i32 [ 0, %[[LOOP0]] ]
29+
; CHECK-NEXT: br label %[[LOOP1_PREHEADER]]
30+
; CHECK: [[LOOP1_PREHEADER]]:
31+
; CHECK-NEXT: [[LENGTH_LCSSA:%.*]] = phi i32 [ poison, %[[LOOP1_PREHEADER_SPLIT_LOOP_EXIT]] ], [ [[LENGTH_LCSSA_PH2]], %[[LOOP1_PREHEADER_SPLIT_LOOP_EXIT1]] ]
32+
; CHECK-NEXT: [[LOCAL:%.*]] = phi i32 [ [[T_LE]], %[[LOOP1_PREHEADER_SPLIT_LOOP_EXIT]] ], [ [[LOCAL_PH3]], %[[LOOP1_PREHEADER_SPLIT_LOOP_EXIT1]] ]
33+
; CHECK-NEXT: [[TMP1:%.*]] = add i32 [[LENGTH_LCSSA]], -1
34+
; CHECK-NEXT: [[TMP2:%.*]] = icmp ult i32 310, [[TMP1]]
35+
; CHECK-NEXT: [[TMP3:%.*]] = icmp ult i32 4, [[LENGTH_LCSSA]]
36+
; CHECK-NEXT: [[TMP4:%.*]] = and i1 [[TMP3]], [[TMP2]]
37+
; CHECK-NEXT: [[TMP5:%.*]] = freeze i1 [[TMP4]]
38+
; CHECK-NEXT: br label %[[LOOP1:.*]]
39+
; CHECK: [[LOOP1]]:
40+
; CHECK-NEXT: [[IV1:%.*]] = phi i32 [ 4, %[[LOOP1_PREHEADER]] ], [ [[IV1_NEXT:%.*]], %[[LOOP1_GUARDED:.*]] ]
41+
; CHECK-NEXT: [[TMP6:%.*]] = icmp ult i32 [[IV1]], [[LENGTH_LCSSA]]
42+
; CHECK-NEXT: [[WC:%.*]] = call i1 @llvm.experimental.widenable.condition()
43+
; CHECK-NEXT: [[TMP7:%.*]] = and i1 [[TMP5]], [[WC]]
44+
; CHECK-NEXT: br i1 [[TMP7]], label %[[LOOP1_GUARDED]], label %[[DEOPT_EXIT:.*]]
45+
; CHECK: [[LOOP1_GUARDED]]:
46+
; CHECK-NEXT: call void @llvm.assume(i1 [[TMP6]])
47+
; CHECK-NEXT: [[IV1_NEXT]] = add nuw nsw i32 [[IV1]], 1
48+
; CHECK-NEXT: [[CHK:%.*]] = icmp ugt i32 [[IV1]], 310
49+
; CHECK-NEXT: br i1 [[CHK]], label %[[LOOP1_EXIT:.*]], label %[[LOOP1]]
50+
; CHECK: [[DEOPT_EXIT]]:
51+
; CHECK-NEXT: [[TMP8:%.*]] = call i64 (...) @llvm.experimental.deoptimize.i64(i32 13) [ "deopt"() ]
52+
; CHECK-NEXT: ret i64 [[TMP8]]
53+
; CHECK: [[LOOP1_EXIT]]:
54+
; CHECK-NEXT: ret i64 0
55+
; CHECK: [[EXIT]]:
56+
; CHECK-NEXT: ret i64 0
57+
;
58+
entry:
59+
br label %loop0.pre
60+
61+
loop0.pre:
62+
br i1 %check, label %exit, label %loop0
63+
64+
loop0:
65+
%length = load atomic i32, ptr addrspace(1) %p unordered, align 4
66+
%28 = icmp ugt i32 %length, 1
67+
br i1 %28, label %loop0.out, label %loop1.preheader
68+
69+
loop0.out:
70+
%t = add i32 0, 1
71+
br i1 false, label %loop1.preheader, label %mid
72+
73+
loop1.preheader:
74+
%length.lcssa = phi i32 [ %length, %loop0.out ], [ %length, %loop0 ]
75+
%local = phi i32 [ 0, %loop0 ], [ %t, %loop0.out ]
76+
br label %loop1
77+
78+
loop1:
79+
%iv1 = phi i32 [ 4, %loop1.preheader ], [ %iv1.next, %loop1.guarded ]
80+
%82 = icmp ult i32 %iv1, %length.lcssa
81+
%wc = call i1 @llvm.experimental.widenable.condition()
82+
%guard.chk = and i1 %82, %wc
83+
br i1 %guard.chk, label %loop1.guarded, label %deopt-exit
84+
85+
loop1.guarded:
86+
%iv1.next = add nuw nsw i32 %iv1, 1
87+
%chk = icmp ugt i32 %iv1, 310
88+
br i1 %chk, label %loop1.exit, label %loop1
89+
90+
deopt-exit:
91+
%100 = call i64 (...) @llvm.experimental.deoptimize.i64(i32 13) [ "deopt"() ]
92+
ret i64 %100
93+
94+
loop1.exit:
95+
ret i64 0
96+
97+
mid:
98+
br label %loop0.pre
99+
100+
exit:
101+
ret i64 0
102+
}
103+
104+
declare i64 @foo()
105+
106+
declare i64 @llvm.experimental.deoptimize.i64(...)
107+
108+
; Function Attrs: nocallback nofree nosync nounwind speculatable willreturn memory(inaccessiblemem: readwrite)
109+
declare noundef i1 @llvm.experimental.widenable.condition()

0 commit comments

Comments
 (0)