Skip to content

Commit 2a7d2de

Browse files
committed
[SCEV] Add SCEVs for scopes as users of origin SCEV.
When the original SCEV gets invalidate, any SCEV computed at a different scope may also become invalid. Add SCEVs created for scopes as users of the original value to ensure proper invalidation. Fixes #119665.
1 parent 027aa70 commit 2a7d2de

File tree

2 files changed

+119
-3
lines changed

2 files changed

+119
-3
lines changed

llvm/lib/Analysis/ScalarEvolution.cpp

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8441,7 +8441,7 @@ ScalarEvolution::getBackedgeTakenInfo(const Loop *L) {
84418441
// recusive call to getBackedgeTakenInfo (on a different
84428442
// loop), which would invalidate the iterator computed
84438443
// earlier.
8444-
return BackedgeTakenCounts.find(L)->second = std::move(Result);
8444+
return BackedgeTakenCounts[L] = std::move(Result);
84458445
}
84468446

84478447
void ScalarEvolution::forgetAllLoops() {
@@ -9866,8 +9866,10 @@ const SCEV *ScalarEvolution::getSCEVAtScope(const SCEV *V, const Loop *L) {
98669866
for (auto &LS : reverse(ValuesAtScopes[V]))
98679867
if (LS.first == L) {
98689868
LS.second = C;
9869-
if (!isa<SCEVConstant>(C))
9869+
if (!isa<SCEVConstant>(C)) {
98709870
ValuesAtScopesUsers[C].push_back({L, V});
9871+
SCEVUsers[V].insert(C);
9872+
}
98719873
break;
98729874
}
98739875
return C;
@@ -14200,7 +14202,8 @@ void ScalarEvolution::forgetBackedgeTakenCounts(const Loop *L,
1420014202
for (const SCEV *S : {ENT.ExactNotTaken, ENT.SymbolicMaxNotTaken}) {
1420114203
if (!isa<SCEVConstant>(S)) {
1420214204
auto UserIt = BECountUsers.find(S);
14203-
assert(UserIt != BECountUsers.end());
14205+
if (UserIt == BECountUsers.end())
14206+
continue;
1420414207
UserIt->second.erase({L, Predicated});
1420514208
}
1420614209
}
Lines changed: 113 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,113 @@
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+
define void @test_invalidate_scevs_at_scope(ptr %p) {
6+
; CHECK-LABEL: define void @test_invalidate_scevs_at_scope(
7+
; CHECK-SAME: ptr [[P:%.*]]) {
8+
; CHECK-NEXT: [[ENTRY:.*]]:
9+
; CHECK-NEXT: br i1 false, label %[[SCALAR_PH:.*]], label %[[VECTOR_PH:.*]]
10+
; CHECK: [[VECTOR_PH]]:
11+
; CHECK-NEXT: br label %[[VECTOR_BODY:.*]]
12+
; CHECK: [[VECTOR_BODY]]:
13+
; CHECK-NEXT: [[INDEX:%.*]] = phi i32 [ 0, %[[VECTOR_PH]] ], [ [[INDEX_NEXT:%.*]], %[[VECTOR_BODY]] ]
14+
; CHECK-NEXT: [[VEC_IND:%.*]] = phi <4 x i32> [ <i32 0, i32 1, i32 2, i32 3>, %[[VECTOR_PH]] ], [ [[VEC_IND_NEXT:%.*]], %[[VECTOR_BODY]] ]
15+
; CHECK-NEXT: [[TMP0:%.*]] = load i32, ptr [[P]], align 4
16+
; CHECK-NEXT: [[BROADCAST_SPLATINSERT:%.*]] = insertelement <4 x i32> poison, i32 [[TMP0]], i64 0
17+
; CHECK-NEXT: [[BROADCAST_SPLAT:%.*]] = shufflevector <4 x i32> [[BROADCAST_SPLATINSERT]], <4 x i32> poison, <4 x i32> zeroinitializer
18+
; CHECK-NEXT: [[TMP1:%.*]] = add <4 x i32> [[BROADCAST_SPLAT]], [[VEC_IND]]
19+
; CHECK-NEXT: [[INDEX_NEXT]] = add nuw i32 [[INDEX]], 4
20+
; CHECK-NEXT: [[VEC_IND_NEXT]] = add <4 x i32> [[VEC_IND]], splat (i32 4)
21+
; CHECK-NEXT: [[TMP2:%.*]] = icmp eq i32 [[INDEX_NEXT]], 100
22+
; CHECK-NEXT: br i1 [[TMP2]], label %[[MIDDLE_BLOCK:.*]], label %[[VECTOR_BODY]], !llvm.loop [[LOOP0:![0-9]+]]
23+
; CHECK: [[MIDDLE_BLOCK]]:
24+
; CHECK-NEXT: [[TMP3:%.*]] = extractelement <4 x i32> [[TMP1]], i32 3
25+
; CHECK-NEXT: br i1 false, label %[[EXIT_1:.*]], label %[[SCALAR_PH]]
26+
; CHECK: [[SCALAR_PH]]:
27+
; CHECK-NEXT: [[BC_RESUME_VAL:%.*]] = phi i32 [ 100, %[[MIDDLE_BLOCK]] ], [ 0, %[[ENTRY]] ]
28+
; CHECK-NEXT: br label %[[LOOP_1:.*]]
29+
; CHECK: [[LOOP_1]]:
30+
; CHECK-NEXT: [[IV_1:%.*]] = phi i32 [ [[BC_RESUME_VAL]], %[[SCALAR_PH]] ], [ [[IV_1_NEXT:%.*]], %[[LOOP_1]] ]
31+
; CHECK-NEXT: [[TMP4:%.*]] = load i32, ptr [[P]], align 4
32+
; CHECK-NEXT: [[ADD_1:%.*]] = add i32 [[TMP4]], [[IV_1]]
33+
; CHECK-NEXT: [[IV_1_NEXT]] = add i32 [[IV_1]], 1
34+
; CHECK-NEXT: [[C_1:%.*]] = icmp eq i32 [[IV_1]], 100
35+
; CHECK-NEXT: br i1 [[C_1]], label %[[EXIT_1]], label %[[LOOP_1]], !llvm.loop [[LOOP3:![0-9]+]]
36+
; CHECK: [[EXIT_1]]:
37+
; CHECK-NEXT: [[ADD_LCSSA:%.*]] = phi i32 [ [[ADD_1]], %[[LOOP_1]] ], [ [[TMP3]], %[[MIDDLE_BLOCK]] ]
38+
; CHECK-NEXT: [[SMAX:%.*]] = call i32 @llvm.smax.i32(i32 [[ADD_LCSSA]], i32 100)
39+
; CHECK-NEXT: [[TMP5:%.*]] = sub i32 [[SMAX]], [[ADD_LCSSA]]
40+
; CHECK-NEXT: [[TMP6:%.*]] = zext i32 [[TMP5]] to i64
41+
; CHECK-NEXT: [[TMP7:%.*]] = add nuw nsw i64 [[TMP6]], 1
42+
; CHECK-NEXT: [[MIN_ITERS_CHECK:%.*]] = icmp ult i64 [[TMP7]], 4
43+
; CHECK-NEXT: br i1 [[MIN_ITERS_CHECK]], label %[[SCALAR_PH2:.*]], label %[[VECTOR_PH3:.*]]
44+
; CHECK: [[VECTOR_PH3]]:
45+
; CHECK-NEXT: [[N_MOD_VF:%.*]] = urem i64 [[TMP7]], 4
46+
; CHECK-NEXT: [[N_VEC:%.*]] = sub i64 [[TMP7]], [[N_MOD_VF]]
47+
; CHECK-NEXT: br label %[[VECTOR_BODY4:.*]]
48+
; CHECK: [[VECTOR_BODY4]]:
49+
; CHECK-NEXT: [[INDEX5:%.*]] = phi i64 [ 0, %[[VECTOR_PH3]] ], [ [[INDEX_NEXT8:%.*]], %[[VECTOR_BODY4]] ]
50+
; CHECK-NEXT: [[VEC_IND6:%.*]] = phi <4 x i64> [ <i64 0, i64 1, i64 2, i64 3>, %[[VECTOR_PH3]] ], [ [[VEC_IND_NEXT7:%.*]], %[[VECTOR_BODY4]] ]
51+
; CHECK-NEXT: [[TMP8:%.*]] = add i64 [[INDEX5]], 0
52+
; CHECK-NEXT: [[TMP9:%.*]] = getelementptr inbounds i64, ptr [[P]], i64 [[TMP8]]
53+
; CHECK-NEXT: [[TMP10:%.*]] = getelementptr inbounds i64, ptr [[TMP9]], i32 0
54+
; CHECK-NEXT: store <4 x i64> [[VEC_IND6]], ptr [[TMP10]], align 4
55+
; CHECK-NEXT: [[INDEX_NEXT8]] = add nuw i64 [[INDEX5]], 4
56+
; CHECK-NEXT: [[VEC_IND_NEXT7]] = add <4 x i64> [[VEC_IND6]], splat (i64 4)
57+
; CHECK-NEXT: [[TMP11:%.*]] = icmp eq i64 [[INDEX_NEXT8]], [[N_VEC]]
58+
; CHECK-NEXT: br i1 [[TMP11]], label %[[MIDDLE_BLOCK1:.*]], label %[[VECTOR_BODY4]], !llvm.loop [[LOOP4:![0-9]+]]
59+
; CHECK: [[MIDDLE_BLOCK1]]:
60+
; CHECK-NEXT: [[CMP_N:%.*]] = icmp eq i64 [[TMP7]], [[N_VEC]]
61+
; CHECK-NEXT: br i1 [[CMP_N]], label %[[EXIT_2:.*]], label %[[SCALAR_PH2]]
62+
; CHECK: [[SCALAR_PH2]]:
63+
; CHECK-NEXT: [[BC_RESUME_VAL9:%.*]] = phi i64 [ [[N_VEC]], %[[MIDDLE_BLOCK1]] ], [ 0, %[[EXIT_1]] ]
64+
; CHECK-NEXT: br label %[[LOOP_2:.*]]
65+
; CHECK: [[LOOP_2]]:
66+
; CHECK-NEXT: [[IV_2:%.*]] = phi i64 [ [[BC_RESUME_VAL9]], %[[SCALAR_PH2]] ], [ [[IV_2_NEXT:%.*]], %[[LOOP_2]] ]
67+
; CHECK-NEXT: [[IV_2_TRUNC:%.*]] = trunc i64 [[IV_2]] to i32
68+
; CHECK-NEXT: [[IV_2_NEXT]] = add i64 [[IV_2]], 1
69+
; CHECK-NEXT: [[GEP:%.*]] = getelementptr inbounds i64, ptr [[P]], i64 [[IV_2]]
70+
; CHECK-NEXT: store i64 [[IV_2]], ptr [[GEP]], align 4
71+
; CHECK-NEXT: [[ADD_2:%.*]] = add i32 [[ADD_LCSSA]], [[IV_2_TRUNC]]
72+
; CHECK-NEXT: [[C_2:%.*]] = icmp slt i32 [[ADD_2]], 100
73+
; CHECK-NEXT: br i1 [[C_2]], label %[[LOOP_2]], label %[[EXIT_2]], !llvm.loop [[LOOP5:![0-9]+]]
74+
; CHECK: [[EXIT_2]]:
75+
; CHECK-NEXT: ret void
76+
;
77+
entry:
78+
br label %loop.1
79+
80+
loop.1:
81+
%iv.1 = phi i32 [ 0, %entry ], [ %iv.1.next, %loop.1 ]
82+
%1 = load i32, ptr %p, align 4
83+
%add.1 = add i32 %1, %iv.1
84+
%iv.1.next = add i32 %iv.1, 1
85+
%c.1 = icmp eq i32 %iv.1, 100
86+
br i1 %c.1, label %exit.1, label %loop.1
87+
88+
exit.1:
89+
%add.lcssa = phi i32 [ %add.1, %loop.1 ]
90+
br label %loop.2
91+
92+
loop.2:
93+
%iv.2 = phi i64 [ 0, %exit.1 ], [ %iv.2.next, %loop.2 ]
94+
%iv.2.trunc = trunc i64 %iv.2 to i32
95+
%iv.2.next = add i64 %iv.2, 1
96+
%gep = getelementptr inbounds i64, ptr %p, i64 %iv.2
97+
store i64 %iv.2, ptr %gep
98+
%add.2 = add i32 %add.lcssa, %iv.2.trunc
99+
%c.2 = icmp slt i32 %add.2, 100
100+
br i1 %c.2, label %loop.2, label %exit.2
101+
102+
exit.2:
103+
ret void
104+
}
105+
106+
;.
107+
; CHECK: [[LOOP0]] = distinct !{[[LOOP0]], [[META1:![0-9]+]], [[META2:![0-9]+]]}
108+
; CHECK: [[META1]] = !{!"llvm.loop.isvectorized", i32 1}
109+
; CHECK: [[META2]] = !{!"llvm.loop.unroll.runtime.disable"}
110+
; CHECK: [[LOOP3]] = distinct !{[[LOOP3]], [[META2]], [[META1]]}
111+
; CHECK: [[LOOP4]] = distinct !{[[LOOP4]], [[META1]], [[META2]]}
112+
; CHECK: [[LOOP5]] = distinct !{[[LOOP5]], [[META2]], [[META1]]}
113+
;.

0 commit comments

Comments
 (0)