Skip to content

Commit e21dc4b

Browse files
nikictru
authored andcommitted
[SimpleLoopUnswitch] Fix LCSSA phi node invalidation
Fixes #117537. (cherry picked from commit fc5c899)
1 parent 657e03f commit e21dc4b

File tree

2 files changed

+95
-2
lines changed

2 files changed

+95
-2
lines changed

llvm/lib/Transforms/Scalar/SimpleLoopUnswitch.cpp

+3-2
Original file line numberDiff line numberDiff line change
@@ -1249,8 +1249,9 @@ static BasicBlock *buildClonedLoopBlocks(
12491249
assert(VMap.lookup(&I) == &ClonedI && "Mismatch in the value map!");
12501250

12511251
// Forget SCEVs based on exit phis in case SCEV looked through the phi.
1252-
if (SE && isa<PHINode>(I))
1253-
SE->forgetValue(&I);
1252+
if (SE)
1253+
if (auto *PN = dyn_cast<PHINode>(&I))
1254+
SE->forgetLcssaPhiWithNewPredecessor(&L, PN);
12541255

12551256
BasicBlock::iterator InsertPt = MergeBB->getFirstInsertionPt();
12561257

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,92 @@
1+
; NOTE: Assertions have been autogenerated by utils/update_test_checks.py UTC_ARGS: --version 5
2+
; RUN: opt -S -passes='print<scalar-evolution>,simple-loop-unswitch<nontrivial>,print<scalar-evolution>' -verify-scev < %s 2>/dev/null | FileCheck %s
3+
4+
; Make sure we don't assert due to insufficient SCEV invalidation.
5+
6+
define void @test(ptr %p) {
7+
; CHECK-LABEL: define void @test(
8+
; CHECK-SAME: ptr [[P:%.*]]) {
9+
; CHECK-NEXT: [[ENTRY:.*:]]
10+
; CHECK-NEXT: [[CHECK:%.*]] = icmp eq ptr [[P]], null
11+
; CHECK-NEXT: br i1 [[CHECK]], label %[[ENTRY_SPLIT_US:.*]], label %[[ENTRY_SPLIT:.*]]
12+
; CHECK: [[ENTRY_SPLIT_US]]:
13+
; CHECK-NEXT: br label %[[BB0_US:.*]]
14+
; CHECK: [[BB0_US]]:
15+
; CHECK-NEXT: br label %[[LOOP0_US:.*]]
16+
; CHECK: [[LOOP0_US]]:
17+
; CHECK-NEXT: [[V_US:%.*]] = load atomic i32, ptr [[P]] unordered, align 8
18+
; CHECK-NEXT: [[ADD_US:%.*]] = add i32 [[V_US]], 3
19+
; CHECK-NEXT: br i1 true, label %[[PREHEADER_SPLIT_US:.*]], label %[[BB0_US]]
20+
; CHECK: [[PREHEADER_SPLIT_US]]:
21+
; CHECK-NEXT: [[ADD_LCSSA_US:%.*]] = phi i32 [ [[ADD_US]], %[[LOOP0_US]] ]
22+
; CHECK-NEXT: br label %[[PREHEADER:.*]]
23+
; CHECK: [[ENTRY_SPLIT]]:
24+
; CHECK-NEXT: br label %[[BB0:.*]]
25+
; CHECK: [[BB0]]:
26+
; CHECK-NEXT: br label %[[LATCH:.*]]
27+
; CHECK: [[LATCH]]:
28+
; CHECK-NEXT: br i1 false, label %[[EXIT0:.*]], label %[[LOOP0:.*]]
29+
; CHECK: [[EXIT0]]:
30+
; CHECK-NEXT: ret void
31+
; CHECK: [[LOOP0]]:
32+
; CHECK-NEXT: [[V:%.*]] = load atomic i32, ptr [[P]] unordered, align 8
33+
; CHECK-NEXT: [[ADD:%.*]] = add i32 [[V]], 3
34+
; CHECK-NEXT: br i1 true, label %[[PREHEADER_SPLIT:.*]], label %[[BB0]]
35+
; CHECK: [[PREHEADER_SPLIT]]:
36+
; CHECK-NEXT: [[ADD_LCSSA:%.*]] = phi i32 [ [[ADD]], %[[LOOP0]] ]
37+
; CHECK-NEXT: br label %[[PREHEADER]]
38+
; CHECK: [[PREHEADER]]:
39+
; CHECK-NEXT: [[DOTUS_PHI:%.*]] = phi i32 [ [[ADD_LCSSA]], %[[PREHEADER_SPLIT]] ], [ [[ADD_LCSSA_US]], %[[PREHEADER_SPLIT_US]] ]
40+
; CHECK-NEXT: br label %[[LOOP1:.*]]
41+
; CHECK: [[LOOP1]]:
42+
; CHECK-NEXT: [[IV1:%.*]] = phi i32 [ [[DOTUS_PHI]], %[[PREHEADER]] ], [ [[IV1_NEXT:%.*]], %[[BACKEDGE:.*]] ]
43+
; CHECK-NEXT: [[IV1_NEXT]] = add i32 [[IV1]], -33
44+
; CHECK-NEXT: br label %[[LOOP2:.*]]
45+
; CHECK: [[BACKEDGE]]:
46+
; CHECK-NEXT: br i1 true, label %[[EXIT1:.*]], label %[[LOOP1]]
47+
; CHECK: [[LOOP2]]:
48+
; CHECK-NEXT: [[IV0:%.*]] = phi i32 [ [[IV1]], %[[LOOP1]] ], [ [[IV0_NEXT:%.*]], %[[LOOP2]] ]
49+
; CHECK-NEXT: [[IV0_NEXT]] = add nsw i32 [[IV0]], 1
50+
; CHECK-NEXT: [[CMP:%.*]] = icmp sgt i32 [[IV0_NEXT]], 0
51+
; CHECK-NEXT: br i1 [[CMP]], label %[[BACKEDGE]], label %[[LOOP2]]
52+
; CHECK: [[EXIT1]]:
53+
; CHECK-NEXT: ret void
54+
;
55+
entry:
56+
%check = icmp eq ptr %p, null
57+
br label %bb0
58+
59+
bb0: ; preds = %loop0, %entry
60+
br i1 %check, label %loop0, label %latch
61+
62+
latch: ; preds = %bb0
63+
br i1 %check, label %exit0, label %loop0
64+
65+
exit0: ; preds = %latch
66+
ret void
67+
68+
loop0: ; preds = %latch, %bb0
69+
%v = load atomic i32, ptr %p unordered, align 8
70+
%add = add i32 %v, 3
71+
br i1 true, label %preheader, label %bb0
72+
73+
preheader: ; preds = %loop0
74+
br label %loop1
75+
76+
loop1: ; preds = %backedge, %preheader
77+
%iv1 = phi i32 [ %add, %preheader ], [ %iv1.next, %backedge ]
78+
%iv1.next = add i32 %iv1, -33
79+
br label %loop2
80+
81+
backedge: ; preds = %loop2
82+
br i1 true, label %exit1, label %loop1
83+
84+
loop2: ; preds = %loop2, %loop1
85+
%iv0 = phi i32 [ %iv1, %loop1 ], [ %iv0.next, %loop2 ]
86+
%iv0.next = add nsw i32 %iv0, 1
87+
%cmp = icmp sgt i32 %iv0.next, 0
88+
br i1 %cmp, label %backedge, label %loop2
89+
90+
exit1: ; preds = %backedge
91+
ret void
92+
}

0 commit comments

Comments
 (0)