Skip to content

Commit 7858e14

Browse files
authored
[LV] Amend check for IV increments in collectUsersInEntryBlock (#108020)
The check for IV increments in collectUsersInEntryBlock currently triggers for exit-block PHIs which use the IV start value, resulting in us failing to add the input value for the middle block to these PHIs. Fix this by amending the check for IV increments to only include incoming values that are instructions inside the loop. Fixes #108004
1 parent 512ceca commit 7858e14

File tree

2 files changed

+75
-0
lines changed

2 files changed

+75
-0
lines changed

llvm/lib/Transforms/Vectorize/LoopVectorize.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8663,6 +8663,7 @@ static MapVector<PHINode *, VPValue *> collectUsersInExitBlock(
86638663
!cast<VPWidenIntOrFpInductionRecipe>(V)->getTruncInst()) ||
86648664
isa<VPWidenPointerInductionRecipe>(V) ||
86658665
(isa<Instruction>(IncomingValue) &&
8666+
OrigLoop->contains(cast<Instruction>(IncomingValue)) &&
86668667
any_of(IncomingValue->users(), [&Inductions](User *U) {
86678668
auto *P = dyn_cast<PHINode>(U);
86688669
return P && Inductions.contains(P);
Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
; NOTE: Assertions have been autogenerated by utils/update_test_checks.py UTC_ARGS: --version 5
2+
; RUN: opt < %s -passes=loop-vectorize -force-vector-width=4 -force-vector-interleave=1 -S | FileCheck %s
3+
4+
; Check that we correctly handle the use of %start2 in the exit block, and do
5+
; not crash.
6+
7+
define i64 @foo(ptr %p1, ptr %p2, i64 %start, i64 %end) {
8+
; CHECK-LABEL: define i64 @foo(
9+
; CHECK-SAME: ptr [[P1:%.*]], ptr [[P2:%.*]], i64 [[START:%.*]], i64 [[END:%.*]]) {
10+
; CHECK-NEXT: [[ENTRY:.*]]:
11+
; CHECK-NEXT: [[START2:%.*]] = and i64 [[START]], 12345
12+
; CHECK-NEXT: [[TMP0:%.*]] = sub i64 [[END]], [[START2]]
13+
; CHECK-NEXT: [[MIN_ITERS_CHECK:%.*]] = icmp ult i64 [[TMP0]], 4
14+
; CHECK-NEXT: br i1 [[MIN_ITERS_CHECK]], label %[[SCALAR_PH:.*]], label %[[VECTOR_PH:.*]]
15+
; CHECK: [[VECTOR_PH]]:
16+
; CHECK-NEXT: [[N_MOD_VF:%.*]] = urem i64 [[TMP0]], 4
17+
; CHECK-NEXT: [[N_VEC:%.*]] = sub i64 [[TMP0]], [[N_MOD_VF]]
18+
; CHECK-NEXT: [[IND_END:%.*]] = add i64 [[START2]], [[N_VEC]]
19+
; CHECK-NEXT: br label %[[VECTOR_BODY:.*]]
20+
; CHECK: [[VECTOR_BODY]]:
21+
; CHECK-NEXT: [[INDEX:%.*]] = phi i64 [ 0, %[[VECTOR_PH]] ], [ [[INDEX_NEXT:%.*]], %[[VECTOR_BODY]] ]
22+
; CHECK-NEXT: [[OFFSET_IDX:%.*]] = add i64 [[START2]], [[INDEX]]
23+
; CHECK-NEXT: [[IND:%.*]] = add i64 [[OFFSET_IDX]], 0
24+
; CHECK-NEXT: [[ARRAYIDX1:%.*]] = getelementptr inbounds i32, ptr [[P1]], i64 [[IND]]
25+
; CHECK-NEXT: [[TMP3:%.*]] = getelementptr inbounds i32, ptr [[ARRAYIDX1]], i32 0
26+
; CHECK-NEXT: [[TMP4:%.*]] = getelementptr inbounds i32, ptr [[P2]], i64 [[IND]]
27+
; CHECK-NEXT: [[TMP5:%.*]] = getelementptr inbounds i32, ptr [[TMP4]], i32 0
28+
; CHECK-NEXT: [[INDEX_NEXT]] = add nuw i64 [[INDEX]], 4
29+
; CHECK-NEXT: [[TMP6:%.*]] = icmp eq i64 [[INDEX_NEXT]], [[N_VEC]]
30+
; CHECK-NEXT: br i1 [[TMP6]], label %[[MIDDLE_BLOCK:.*]], label %[[VECTOR_BODY]], !llvm.loop [[LOOP0:![0-9]+]]
31+
; CHECK: [[MIDDLE_BLOCK]]:
32+
; CHECK-NEXT: [[CMP_N:%.*]] = icmp eq i64 [[TMP0]], [[N_VEC]]
33+
; CHECK-NEXT: br i1 [[CMP_N]], label %[[EXIT:.*]], label %[[SCALAR_PH]]
34+
; CHECK: [[SCALAR_PH]]:
35+
; CHECK-NEXT: [[BC_RESUME_VAL:%.*]] = phi i64 [ [[IND_END]], %[[MIDDLE_BLOCK]] ], [ [[START2]], %[[ENTRY]] ]
36+
; CHECK-NEXT: br label %[[FOR_BODY:.*]]
37+
; CHECK: [[FOR_BODY]]:
38+
; CHECK-NEXT: [[IND1:%.*]] = phi i64 [ [[BC_RESUME_VAL]], %[[SCALAR_PH]] ], [ [[IND_NEXT1:%.*]], %[[FOR_BODY]] ]
39+
; CHECK-NEXT: [[ARRAYIDX3:%.*]] = getelementptr inbounds i32, ptr [[P1]], i64 [[IND1]]
40+
; CHECK-NEXT: [[TMP7:%.*]] = load i32, ptr [[ARRAYIDX3]], align 4
41+
; CHECK-NEXT: [[ARRAYIDX2:%.*]] = getelementptr inbounds i32, ptr [[P2]], i64 [[IND1]]
42+
; CHECK-NEXT: [[TMP8:%.*]] = load i32, ptr [[ARRAYIDX2]], align 4
43+
; CHECK-NEXT: [[IND_NEXT1]] = add i64 [[IND1]], 1
44+
; CHECK-NEXT: [[CMP:%.*]] = icmp ne i64 [[IND_NEXT1]], [[END]]
45+
; CHECK-NEXT: br i1 [[CMP]], label %[[FOR_BODY]], label %[[EXIT]], !llvm.loop [[LOOP3:![0-9]+]]
46+
; CHECK: [[EXIT]]:
47+
; CHECK-NEXT: [[USE:%.*]] = phi i64 [ [[START2]], %[[FOR_BODY]] ], [ [[START2]], %[[MIDDLE_BLOCK]] ]
48+
; CHECK-NEXT: ret i64 [[USE]]
49+
;
50+
entry:
51+
%start2 = and i64 %start, 12345
52+
br label %for.body
53+
54+
for.body:
55+
%ind = phi i64 [ %start2, %entry ], [ %ind.next, %for.body ]
56+
%arrayidx1 = getelementptr inbounds i32, ptr %p1, i64 %ind
57+
%0 = load i32, ptr %arrayidx1, align 4
58+
%arrayidx2 = getelementptr inbounds i32, ptr %p2, i64 %ind
59+
%1 = load i32, ptr %arrayidx2, align 4
60+
%ind.next = add i64 %ind, 1
61+
%cmp = icmp ne i64 %ind.next, %end
62+
br i1 %cmp, label %for.body, label %exit
63+
64+
exit:
65+
%use = phi i64 [ %start2, %for.body ]
66+
ret i64 %use
67+
}
68+
69+
;.
70+
; CHECK: [[LOOP0]] = distinct !{[[LOOP0]], [[META1:![0-9]+]], [[META2:![0-9]+]]}
71+
; CHECK: [[META1]] = !{!"llvm.loop.isvectorized", i32 1}
72+
; CHECK: [[META2]] = !{!"llvm.loop.unroll.runtime.disable"}
73+
; CHECK: [[LOOP3]] = distinct !{[[LOOP3]], [[META2]], [[META1]]}
74+
;.

0 commit comments

Comments
 (0)