Skip to content

Commit 3c5e0d8

Browse files
Saldivarcherfhahn
authored andcommitted
[LoopVectorize] Clear cache of LoopAccessInfoManager
LAI is cached during the LoopDistribute pass, and is later re-used during LoopVectorize. The problem is that LoopVectorize changes SCEV, and the cached LAI does not get updated. Hence, when re-using the cached LAI, it references an invalid SCEV. Fixes #59319 Reviewed By: fhahn Differential Revision: https://reviews.llvm.org/D139601
1 parent 8c9f13b commit 3c5e0d8

File tree

2 files changed

+171
-0
lines changed

2 files changed

+171
-0
lines changed

llvm/lib/Transforms/Vectorize/LoopVectorize.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10633,6 +10633,9 @@ LoopVectorizeResult LoopVectorizePass::runImpl(
1063310633
Changed |= formLCSSARecursively(*L, *DT, LI, SE);
1063410634

1063510635
Changed |= CFGChanged |= processLoop(L);
10636+
10637+
if (Changed)
10638+
LAIs->clear();
1063610639
}
1063710640

1063810641
// Process each loop nest in the function.
Lines changed: 168 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,168 @@
1+
; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
2+
; RUN: opt -passes=loop-distribute,loop-vectorize -enable-loop-distribute -force-vector-width=4 -force-vector-interleave=1 -S \
3+
; RUN: %s | FileCheck %s
4+
5+
; This test is to assure LoopAccessInfo invalidation after LoopVectorize
6+
; modifies the IR.
7+
define void @reduced(i32* %0, i32* %1, i64 %iv, i32* %2, i64 %iv76, i64 %iv93) {
8+
; CHECK-LABEL: @reduced(
9+
; CHECK-NEXT: entry:
10+
; CHECK-NEXT: [[TMP3:%.*]] = bitcast i32* [[TMP1:%.*]] to i8*
11+
; CHECK-NEXT: [[TMP4:%.*]] = add i64 [[IV:%.*]], 1
12+
; CHECK-NEXT: [[MIN_ITERS_CHECK:%.*]] = icmp ult i64 [[TMP4]], 4
13+
; CHECK-NEXT: br i1 [[MIN_ITERS_CHECK]], label [[SCALAR_PH:%.*]], label [[VECTOR_PH:%.*]]
14+
; CHECK: vector.ph:
15+
; CHECK-NEXT: [[N_MOD_VF:%.*]] = urem i64 [[TMP4]], 4
16+
; CHECK-NEXT: [[IND_END:%.*]] = sub i64 [[TMP4]], [[N_MOD_VF]]
17+
; CHECK-NEXT: br label [[VECTOR_BODY:%.*]]
18+
; CHECK: vector.body:
19+
; CHECK-NEXT: [[INDEX:%.*]] = phi i64 [ 0, [[VECTOR_PH]] ], [ [[INDEX_NEXT:%.*]], [[VECTOR_BODY]] ]
20+
; CHECK-NEXT: [[TMP5:%.*]] = add i64 [[INDEX]], 0
21+
; CHECK-NEXT: [[TMP6:%.*]] = add i64 [[INDEX]], 1
22+
; CHECK-NEXT: [[TMP7:%.*]] = add i64 [[INDEX]], 2
23+
; CHECK-NEXT: [[TMP8:%.*]] = add i64 [[INDEX]], 3
24+
; CHECK-NEXT: [[INDEX_NEXT]] = add nuw i64 [[INDEX]], 4
25+
; CHECK-NEXT: [[TMP9:%.*]] = icmp eq i64 [[INDEX_NEXT]], [[IND_END]]
26+
; CHECK-NEXT: br i1 [[TMP9]], label [[MIDDLE_BLOCK:%.*]], label [[VECTOR_BODY]], !llvm.loop [[LOOP0:![0-9]+]]
27+
; CHECK: middle.block:
28+
; CHECK-NEXT: [[CMP_N:%.*]] = icmp eq i64 [[TMP4]], [[IND_END]]
29+
; CHECK-NEXT: [[IND_ESCAPE:%.*]] = sub i64 [[IND_END]], 1
30+
; CHECK-NEXT: br i1 [[CMP_N]], label [[LOOP_2_PREHEADER:%.*]], label [[SCALAR_PH]]
31+
; CHECK: scalar.ph:
32+
; CHECK-NEXT: [[BC_RESUME_VAL:%.*]] = phi i64 [ [[IND_END]], [[MIDDLE_BLOCK]] ], [ 0, [[ENTRY:%.*]] ]
33+
; CHECK-NEXT: [[BC_RESUME_VAL1:%.*]] = phi i64 [ [[IND_END]], [[MIDDLE_BLOCK]] ], [ 0, [[ENTRY]] ]
34+
; CHECK-NEXT: br label [[LOOP_1:%.*]]
35+
; CHECK: loop.1:
36+
; CHECK-NEXT: [[IV761:%.*]] = phi i64 [ [[BC_RESUME_VAL]], [[SCALAR_PH]] ], [ [[IV_NEXT77:%.*]], [[LOOP_1]] ]
37+
; CHECK-NEXT: [[IV4:%.*]] = phi i64 [ [[BC_RESUME_VAL1]], [[SCALAR_PH]] ], [ [[IV_NEXT:%.*]], [[LOOP_1]] ]
38+
; CHECK-NEXT: [[IV_NEXT77]] = add i64 [[IV761]], 1
39+
; CHECK-NEXT: [[ARRAYIDX_I_I50:%.*]] = getelementptr i32, i32* [[TMP0:%.*]], i64 [[IV76:%.*]]
40+
; CHECK-NEXT: [[IV_NEXT]] = add i64 [[IV4]], 1
41+
; CHECK-NEXT: [[EXITCOND_NOT:%.*]] = icmp eq i64 [[IV4]], [[IV]]
42+
; CHECK-NEXT: br i1 [[EXITCOND_NOT]], label [[LOOP_2_PREHEADER]], label [[LOOP_1]], !llvm.loop [[LOOP2:![0-9]+]]
43+
; CHECK: loop.2.preheader:
44+
; CHECK-NEXT: [[IV761_LCSSA:%.*]] = phi i64 [ [[IV761]], [[LOOP_1]] ], [ [[IND_ESCAPE]], [[MIDDLE_BLOCK]] ]
45+
; CHECK-NEXT: [[MIN_ITERS_CHECK9:%.*]] = icmp ult i64 [[TMP4]], 4
46+
; CHECK-NEXT: br i1 [[MIN_ITERS_CHECK9]], label [[SCALAR_PH8:%.*]], label [[VECTOR_MEMCHECK:%.*]]
47+
; CHECK: vector.memcheck:
48+
; CHECK-NEXT: [[SCEVGEP:%.*]] = getelementptr i32, i32* [[TMP1]], i64 1
49+
; CHECK-NEXT: [[SCEVGEP2:%.*]] = bitcast i32* [[SCEVGEP]] to i8*
50+
; CHECK-NEXT: [[SCEVGEP3:%.*]] = getelementptr i32, i32* [[TMP0]], i64 [[IV761_LCSSA]]
51+
; CHECK-NEXT: [[SCEVGEP34:%.*]] = bitcast i32* [[SCEVGEP3]] to i8*
52+
; CHECK-NEXT: [[TMP10:%.*]] = add i64 [[IV761_LCSSA]], 1
53+
; CHECK-NEXT: [[SCEVGEP5:%.*]] = getelementptr i32, i32* [[TMP0]], i64 [[TMP10]]
54+
; CHECK-NEXT: [[SCEVGEP56:%.*]] = bitcast i32* [[SCEVGEP5]] to i8*
55+
; CHECK-NEXT: [[BOUND0:%.*]] = icmp ult i8* [[TMP3]], [[SCEVGEP56]]
56+
; CHECK-NEXT: [[BOUND1:%.*]] = icmp ult i8* [[SCEVGEP34]], [[SCEVGEP2]]
57+
; CHECK-NEXT: [[FOUND_CONFLICT:%.*]] = and i1 [[BOUND0]], [[BOUND1]]
58+
; CHECK-NEXT: br i1 [[FOUND_CONFLICT]], label [[SCALAR_PH8]], label [[VECTOR_PH10:%.*]]
59+
; CHECK: vector.ph10:
60+
; CHECK-NEXT: [[N_MOD_VF11:%.*]] = urem i64 [[TMP4]], 4
61+
; CHECK-NEXT: [[N_VEC:%.*]] = sub i64 [[TMP4]], [[N_MOD_VF11]]
62+
; CHECK-NEXT: br label [[VECTOR_BODY14:%.*]]
63+
; CHECK: vector.body14:
64+
; CHECK-NEXT: [[INDEX15:%.*]] = phi i64 [ 0, [[VECTOR_PH10]] ], [ [[INDEX_NEXT16:%.*]], [[VECTOR_BODY14]] ]
65+
; CHECK-NEXT: store i32 0, i32* [[TMP1]], align 4, !alias.scope !4, !noalias !7
66+
; CHECK-NEXT: [[INDEX_NEXT16]] = add nuw i64 [[INDEX15]], 4
67+
; CHECK-NEXT: [[TMP11:%.*]] = icmp eq i64 [[INDEX_NEXT16]], [[N_VEC]]
68+
; CHECK-NEXT: br i1 [[TMP11]], label [[MIDDLE_BLOCK7:%.*]], label [[VECTOR_BODY14]], !llvm.loop [[LOOP9:![0-9]+]]
69+
; CHECK: middle.block7:
70+
; CHECK-NEXT: [[CMP_N13:%.*]] = icmp eq i64 [[TMP4]], [[N_VEC]]
71+
; CHECK-NEXT: br i1 [[CMP_N13]], label [[LOOP_3_LR_PH:%.*]], label [[SCALAR_PH8]]
72+
; CHECK: scalar.ph8:
73+
; CHECK-NEXT: [[BC_RESUME_VAL12:%.*]] = phi i64 [ [[N_VEC]], [[MIDDLE_BLOCK7]] ], [ 0, [[LOOP_2_PREHEADER]] ], [ 0, [[VECTOR_MEMCHECK]] ]
74+
; CHECK-NEXT: br label [[LOOP_2:%.*]]
75+
; CHECK: loop.3.lr.ph:
76+
; CHECK-NEXT: [[IDXPROM_I_I61:%.*]] = and i64 [[IV761_LCSSA]], 1
77+
; CHECK-NEXT: [[ARRAYIDX_I_I62:%.*]] = getelementptr i32, i32* [[TMP0]], i64 [[IDXPROM_I_I61]]
78+
; CHECK-NEXT: [[ARRAYIDX_I_I6220:%.*]] = bitcast i32* [[ARRAYIDX_I_I62]] to i8*
79+
; CHECK-NEXT: [[MIN_ITERS_CHECK28:%.*]] = icmp ult i64 [[TMP4]], 4
80+
; CHECK-NEXT: br i1 [[MIN_ITERS_CHECK28]], label [[SCALAR_PH27:%.*]], label [[VECTOR_MEMCHECK17:%.*]]
81+
; CHECK: vector.memcheck17:
82+
; CHECK-NEXT: [[SCEVGEP18:%.*]] = getelementptr i32, i32* [[TMP1]], i64 1
83+
; CHECK-NEXT: [[SCEVGEP1819:%.*]] = bitcast i32* [[SCEVGEP18]] to i8*
84+
; CHECK-NEXT: [[TMP12:%.*]] = add nuw nsw i64 [[IDXPROM_I_I61]], 1
85+
; CHECK-NEXT: [[SCEVGEP21:%.*]] = getelementptr i32, i32* [[TMP0]], i64 [[TMP12]]
86+
; CHECK-NEXT: [[SCEVGEP2122:%.*]] = bitcast i32* [[SCEVGEP21]] to i8*
87+
; CHECK-NEXT: [[BOUND023:%.*]] = icmp ult i8* [[TMP3]], [[SCEVGEP2122]]
88+
; CHECK-NEXT: [[BOUND124:%.*]] = icmp ult i8* [[ARRAYIDX_I_I6220]], [[SCEVGEP1819]]
89+
; CHECK-NEXT: [[FOUND_CONFLICT25:%.*]] = and i1 [[BOUND023]], [[BOUND124]]
90+
; CHECK-NEXT: br i1 [[FOUND_CONFLICT25]], label [[SCALAR_PH27]], label [[VECTOR_PH29:%.*]]
91+
; CHECK: vector.ph29:
92+
; CHECK-NEXT: [[N_MOD_VF30:%.*]] = urem i64 [[TMP4]], 4
93+
; CHECK-NEXT: [[N_VEC31:%.*]] = sub i64 [[TMP4]], [[N_MOD_VF30]]
94+
; CHECK-NEXT: br label [[VECTOR_BODY34:%.*]]
95+
; CHECK: vector.body34:
96+
; CHECK-NEXT: [[INDEX35:%.*]] = phi i64 [ 0, [[VECTOR_PH29]] ], [ [[INDEX_NEXT36:%.*]], [[VECTOR_BODY34]] ]
97+
; CHECK-NEXT: store i32 0, i32* [[TMP1]], align 4, !alias.scope !10, !noalias !13
98+
; CHECK-NEXT: [[INDEX_NEXT36]] = add nuw i64 [[INDEX35]], 4
99+
; CHECK-NEXT: [[TMP13:%.*]] = icmp eq i64 [[INDEX_NEXT36]], [[N_VEC31]]
100+
; CHECK-NEXT: br i1 [[TMP13]], label [[MIDDLE_BLOCK26:%.*]], label [[VECTOR_BODY34]], !llvm.loop [[LOOP15:![0-9]+]]
101+
; CHECK: middle.block26:
102+
; CHECK-NEXT: [[CMP_N33:%.*]] = icmp eq i64 [[TMP4]], [[N_VEC31]]
103+
; CHECK-NEXT: br i1 [[CMP_N33]], label [[LOOP_CLEANUP:%.*]], label [[SCALAR_PH27]]
104+
; CHECK: scalar.ph27:
105+
; CHECK-NEXT: [[BC_RESUME_VAL32:%.*]] = phi i64 [ [[N_VEC31]], [[MIDDLE_BLOCK26]] ], [ 0, [[LOOP_3_LR_PH]] ], [ 0, [[VECTOR_MEMCHECK17]] ]
106+
; CHECK-NEXT: br label [[LOOP_3:%.*]]
107+
; CHECK: loop.2:
108+
; CHECK-NEXT: [[IV846:%.*]] = phi i64 [ [[IV_NEXT85:%.*]], [[LOOP_2]] ], [ [[BC_RESUME_VAL12]], [[SCALAR_PH8]] ]
109+
; CHECK-NEXT: [[IV_NEXT87:%.*]] = add i64 0, 0
110+
; CHECK-NEXT: [[ARRAYIDX_I_I56:%.*]] = getelementptr i32, i32* [[TMP0]], i64 [[IV761_LCSSA]]
111+
; CHECK-NEXT: [[TMP14:%.*]] = load i32, i32* [[ARRAYIDX_I_I56]], align 4
112+
; CHECK-NEXT: store i32 0, i32* [[TMP1]], align 4
113+
; CHECK-NEXT: [[IV_NEXT85]] = add i64 [[IV846]], 1
114+
; CHECK-NEXT: [[EXITCOND92_NOT:%.*]] = icmp eq i64 [[IV846]], [[IV]]
115+
; CHECK-NEXT: br i1 [[EXITCOND92_NOT]], label [[LOOP_3_LR_PH]], label [[LOOP_2]], !llvm.loop [[LOOP16:![0-9]+]]
116+
; CHECK: loop.3:
117+
; CHECK-NEXT: [[IV932:%.*]] = phi i64 [ [[BC_RESUME_VAL32]], [[SCALAR_PH27]] ], [ [[IV_NEXT94:%.*]], [[LOOP_3]] ]
118+
; CHECK-NEXT: [[TMP15:%.*]] = load i32, i32* [[ARRAYIDX_I_I62]], align 4
119+
; CHECK-NEXT: [[ARRAYIDX_I_I653:%.*]] = getelementptr i32, i32* [[TMP2:%.*]], i64 [[IV93:%.*]]
120+
; CHECK-NEXT: store i32 0, i32* [[TMP1]], align 4
121+
; CHECK-NEXT: [[IV_NEXT94]] = add i64 [[IV932]], 1
122+
; CHECK-NEXT: [[EXITCOND97_NOT:%.*]] = icmp eq i64 [[IV932]], [[IV]]
123+
; CHECK-NEXT: br i1 [[EXITCOND97_NOT]], label [[LOOP_CLEANUP]], label [[LOOP_3]], !llvm.loop [[LOOP17:![0-9]+]]
124+
; CHECK: loop.cleanup:
125+
; CHECK-NEXT: ret void
126+
;
127+
entry:
128+
br label %loop.1
129+
130+
loop.1: ; preds = %loop.1, %entry
131+
%iv761 = phi i64 [ 0, %entry ], [ %iv.next77, %loop.1 ]
132+
%iv4 = phi i64 [ 0, %entry ], [ %iv.next, %loop.1 ]
133+
%iv.next77 = add i64 %iv761, 1
134+
%arrayidx.i.i50 = getelementptr i32, i32* %0, i64 %iv76
135+
%iv.next = add i64 %iv4, 1
136+
%exitcond.not = icmp eq i64 %iv4, %iv
137+
br i1 %exitcond.not, label %loop.2.preheader, label %loop.1
138+
139+
loop.2.preheader: ; preds = %loop.1
140+
br label %loop.2
141+
142+
loop.3.lr.ph: ; preds = %loop.2
143+
%idxprom.i.i61 = and i64 %iv761, 1
144+
%arrayidx.i.i62 = getelementptr i32, i32* %0, i64 %idxprom.i.i61
145+
br label %loop.3
146+
147+
loop.2: ; preds = %loop.2, %loop.2.preheader
148+
%iv846 = phi i64 [ %iv.next85, %loop.2 ], [ 0, %loop.2.preheader ]
149+
%iv.next87 = add i64 0, 0
150+
%arrayidx.i.i56 = getelementptr i32, i32* %0, i64 %iv761
151+
%3 = load i32, i32* %arrayidx.i.i56, align 4
152+
store i32 0, i32* %1, align 4
153+
%iv.next85 = add i64 %iv846, 1
154+
%exitcond92.not = icmp eq i64 %iv846, %iv
155+
br i1 %exitcond92.not, label %loop.3.lr.ph, label %loop.2
156+
157+
loop.3: ; preds = %loop.3, %loop.3.lr.ph
158+
%iv932 = phi i64 [ 0, %loop.3.lr.ph ], [ %iv.next94, %loop.3 ]
159+
%4 = load i32, i32* %arrayidx.i.i62, align 4
160+
%arrayidx.i.i653 = getelementptr i32, i32* %2, i64 %iv93
161+
store i32 0, i32* %1, align 4
162+
%iv.next94 = add i64 %iv932, 1
163+
%exitcond97.not = icmp eq i64 %iv932, %iv
164+
br i1 %exitcond97.not, label %loop.cleanup, label %loop.3
165+
166+
loop.cleanup: ; preds = %loop.3
167+
ret void
168+
}

0 commit comments

Comments
 (0)