Skip to content

Commit 4b84288

Browse files
committed
[VPlan] Pass live-ins used as exit values straight to live-out.
Live-ins that are used as exit values don't need to be extracted, they can be passed through directly. This fixes a crash when trying to extract from a live-in. Fixes llvm#106257.
1 parent a4989cd commit 4b84288

File tree

2 files changed

+113
-0
lines changed

2 files changed

+113
-0
lines changed

llvm/lib/Transforms/Vectorize/LoopVectorize.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8648,6 +8648,11 @@ addUsersInExitBlock(VPlan &Plan,
86488648

86498649
// Introduce VPUsers modeling the exit values.
86508650
for (const auto &[ExitPhi, V] : ExitingValuesToFix) {
8651+
// Pass live-in values used by exit phis directly through to the live-out.
8652+
if (V->isLiveIn()) {
8653+
Plan.addLiveOut(ExitPhi, V);
8654+
continue;
8655+
}
86518656
VPValue *Ext = B.createNaryOp(
86528657
VPInstruction::ExtractFromEnd,
86538658
{V, Plan.getOrAddLiveIn(ConstantInt::get(
Lines changed: 108 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,108 @@
1+
; NOTE: Assertions have been autogenerated by utils/update_test_checks.py UTC_ARGS: --version 5
2+
; RUN: opt -p loop-vectorize -force-vector-width=4 -S %s | FileCheck %s
3+
4+
target datalayout = "e-m:e-p:64:64-i64:64-i128:128-n32:64-S128"
5+
6+
define i64 @exit_value_scalar_live_in(ptr %dst, i64 %in) {
7+
; CHECK-LABEL: define i64 @exit_value_scalar_live_in(
8+
; CHECK-SAME: ptr [[DST:%.*]], i64 [[IN:%.*]]) {
9+
; CHECK-NEXT: [[ENTRY:.*]]:
10+
; CHECK-NEXT: br i1 false, label %[[SCALAR_PH:.*]], label %[[VECTOR_PH:.*]]
11+
; CHECK: [[VECTOR_PH]]:
12+
; CHECK-NEXT: br label %[[VECTOR_BODY:.*]]
13+
; CHECK: [[VECTOR_BODY]]:
14+
; CHECK-NEXT: [[INDEX:%.*]] = phi i64 [ 0, %[[VECTOR_PH]] ], [ [[INDEX_NEXT:%.*]], %[[VECTOR_BODY]] ]
15+
; CHECK-NEXT: [[TMP0:%.*]] = add i64 [[INDEX]], 0
16+
; CHECK-NEXT: [[TMP1:%.*]] = getelementptr i16, ptr [[DST]], i64 [[TMP0]]
17+
; CHECK-NEXT: [[TMP2:%.*]] = getelementptr i16, ptr [[TMP1]], i32 0
18+
; CHECK-NEXT: store <4 x i16> zeroinitializer, ptr [[TMP2]], align 2
19+
; CHECK-NEXT: [[INDEX_NEXT]] = add nuw i64 [[INDEX]], 4
20+
; CHECK-NEXT: [[TMP3:%.*]] = icmp eq i64 [[INDEX_NEXT]], 1000
21+
; CHECK-NEXT: br i1 [[TMP3]], label %[[MIDDLE_BLOCK:.*]], label %[[VECTOR_BODY]], !llvm.loop [[LOOP0:![0-9]+]]
22+
; CHECK: [[MIDDLE_BLOCK]]:
23+
; CHECK-NEXT: br i1 false, label %[[EXIT:.*]], label %[[SCALAR_PH]]
24+
; CHECK: [[SCALAR_PH]]:
25+
; CHECK-NEXT: [[BC_RESUME_VAL:%.*]] = phi i64 [ 1000, %[[MIDDLE_BLOCK]] ], [ 0, %[[ENTRY]] ]
26+
; CHECK-NEXT: br label %[[LOOP:.*]]
27+
; CHECK: [[LOOP]]:
28+
; CHECK-NEXT: [[IV:%.*]] = phi i64 [ [[BC_RESUME_VAL]], %[[SCALAR_PH]] ], [ [[IV_NEXT_1:%.*]], %[[LOOP]] ]
29+
; CHECK-NEXT: [[GEP:%.*]] = getelementptr i16, ptr [[DST]], i64 [[IV]]
30+
; CHECK-NEXT: store i16 0, ptr [[GEP]], align 2
31+
; CHECK-NEXT: [[IV_NEXT_1]] = add i64 [[IV]], 1
32+
; CHECK-NEXT: [[EC:%.*]] = icmp ult i64 [[IV]], 1000
33+
; CHECK-NEXT: br i1 [[EC]], label %[[LOOP]], label %[[EXIT]], !llvm.loop [[LOOP3:![0-9]+]]
34+
; CHECK: [[EXIT]]:
35+
; CHECK-NEXT: [[RES:%.*]] = phi i64 [ [[IN]], %[[LOOP]] ], [ [[IN]], %[[MIDDLE_BLOCK]] ]
36+
; CHECK-NEXT: ret i64 [[RES]]
37+
;
38+
entry:
39+
br label %loop
40+
41+
loop:
42+
%iv = phi i64 [ 0, %entry ], [ %iv.next.1, %loop ]
43+
%gep = getelementptr i16, ptr %dst, i64 %iv
44+
store i16 0, ptr %gep, align 2
45+
%iv.next.1 = add i64 %iv, 1
46+
%ec = icmp ult i64 %iv, 1000
47+
br i1 %ec, label %loop, label %exit
48+
49+
exit:
50+
%res = phi i64 [ %in, %loop ]
51+
ret i64 %res
52+
}
53+
54+
define <2 x i64> @exit_value_vector_live_in(ptr %dst) {
55+
; CHECK-LABEL: define <2 x i64> @exit_value_vector_live_in(
56+
; CHECK-SAME: ptr [[DST:%.*]]) {
57+
; CHECK-NEXT: [[ENTRY:.*]]:
58+
; CHECK-NEXT: br i1 false, label %[[SCALAR_PH:.*]], label %[[VECTOR_PH:.*]]
59+
; CHECK: [[VECTOR_PH]]:
60+
; CHECK-NEXT: br label %[[VECTOR_BODY:.*]]
61+
; CHECK: [[VECTOR_BODY]]:
62+
; CHECK-NEXT: [[INDEX:%.*]] = phi i64 [ 0, %[[VECTOR_PH]] ], [ [[INDEX_NEXT:%.*]], %[[VECTOR_BODY]] ]
63+
; CHECK-NEXT: [[TMP0:%.*]] = add i64 [[INDEX]], 0
64+
; CHECK-NEXT: [[TMP1:%.*]] = getelementptr i16, ptr [[DST]], i64 [[TMP0]]
65+
; CHECK-NEXT: [[TMP2:%.*]] = getelementptr i16, ptr [[TMP1]], i32 0
66+
; CHECK-NEXT: store <4 x i16> zeroinitializer, ptr [[TMP2]], align 2
67+
; CHECK-NEXT: [[INDEX_NEXT]] = add nuw i64 [[INDEX]], 4
68+
; CHECK-NEXT: [[TMP3:%.*]] = icmp eq i64 [[INDEX_NEXT]], 1000
69+
; CHECK-NEXT: br i1 [[TMP3]], label %[[MIDDLE_BLOCK:.*]], label %[[VECTOR_BODY]], !llvm.loop [[LOOP4:![0-9]+]]
70+
; CHECK: [[MIDDLE_BLOCK]]:
71+
; CHECK-NEXT: br i1 false, label %[[EXIT:.*]], label %[[SCALAR_PH]]
72+
; CHECK: [[SCALAR_PH]]:
73+
; CHECK-NEXT: [[BC_RESUME_VAL:%.*]] = phi i64 [ 1000, %[[MIDDLE_BLOCK]] ], [ 0, %[[ENTRY]] ]
74+
; CHECK-NEXT: br label %[[LOOP:.*]]
75+
; CHECK: [[LOOP]]:
76+
; CHECK-NEXT: [[IV:%.*]] = phi i64 [ [[BC_RESUME_VAL]], %[[SCALAR_PH]] ], [ [[IV_NEXT_1:%.*]], %[[LOOP]] ]
77+
; CHECK-NEXT: [[GEP:%.*]] = getelementptr i16, ptr [[DST]], i64 [[IV]]
78+
; CHECK-NEXT: store i16 0, ptr [[GEP]], align 2
79+
; CHECK-NEXT: [[IV_NEXT_1]] = add i64 [[IV]], 1
80+
; CHECK-NEXT: [[EC:%.*]] = icmp ult i64 [[IV]], 1000
81+
; CHECK-NEXT: br i1 [[EC]], label %[[LOOP]], label %[[EXIT]], !llvm.loop [[LOOP5:![0-9]+]]
82+
; CHECK: [[EXIT]]:
83+
; CHECK-NEXT: [[RES:%.*]] = phi <2 x i64> [ zeroinitializer, %[[LOOP]] ], [ zeroinitializer, %[[MIDDLE_BLOCK]] ]
84+
; CHECK-NEXT: ret <2 x i64> [[RES]]
85+
;
86+
entry:
87+
br label %loop
88+
89+
loop:
90+
%iv = phi i64 [ 0, %entry ], [ %iv.next.1, %loop ]
91+
%gep = getelementptr i16, ptr %dst, i64 %iv
92+
store i16 0, ptr %gep, align 2
93+
%iv.next.1 = add i64 %iv, 1
94+
%ec = icmp ult i64 %iv, 1000
95+
br i1 %ec, label %loop, label %exit
96+
97+
exit:
98+
%res = phi <2 x i64> [ zeroinitializer, %loop ]
99+
ret <2 x i64> %res
100+
}
101+
;.
102+
; CHECK: [[LOOP0]] = distinct !{[[LOOP0]], [[META1:![0-9]+]], [[META2:![0-9]+]]}
103+
; CHECK: [[META1]] = !{!"llvm.loop.isvectorized", i32 1}
104+
; CHECK: [[META2]] = !{!"llvm.loop.unroll.runtime.disable"}
105+
; CHECK: [[LOOP3]] = distinct !{[[LOOP3]], [[META2]], [[META1]]}
106+
; CHECK: [[LOOP4]] = distinct !{[[LOOP4]], [[META1]], [[META2]]}
107+
; CHECK: [[LOOP5]] = distinct !{[[LOOP5]], [[META2]], [[META1]]}
108+
;.

0 commit comments

Comments
 (0)