Skip to content

Commit 3b7b95f

Browse files
committed
[VPlan] Support VPWidenSelectRecipe in narrowToSingleScalar.
VPWidenSelectRecipes are single scalars if all their operands are. Add support for narrowing them to a single scalar VPReplicateRecipe. This fixes a crash after #142433 (aa24029) when due to a replicate recipe not being converted to single-scalar being hoisted to the vector preheader.
1 parent 1df3e0a commit 3b7b95f

File tree

3 files changed

+72
-1
lines changed

3 files changed

+72
-1
lines changed

llvm/lib/Transforms/Vectorize/VPlanTransforms.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1221,7 +1221,7 @@ static void narrowToSingleScalarRecipes(VPlan &Plan) {
12211221
vp_depth_first_shallow(Plan.getVectorLoopRegion()->getEntry()))) {
12221222
for (VPRecipeBase &R : make_early_inc_range(reverse(*VPBB))) {
12231223
auto *RepR = dyn_cast<VPReplicateRecipe>(&R);
1224-
if (!RepR && !isa<VPWidenRecipe>(&R))
1224+
if (!RepR && !isa<VPWidenRecipe, VPWidenSelectRecipe>(&R))
12251225
continue;
12261226
if (RepR && (RepR->isSingleScalar() || RepR->isPredicated()))
12271227
continue;

llvm/lib/Transforms/Vectorize/VPlanUtils.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,8 @@ inline bool isSingleScalar(const VPValue *VPV) {
7575
return PreservesUniformity(WidenR->getOpcode()) &&
7676
all_of(WidenR->operands(), isSingleScalar);
7777
}
78+
if (auto *WidenR = dyn_cast<VPWidenSelectRecipe>(VPV))
79+
return all_of(WidenR->operands(), isSingleScalar);
7880
if (auto *VPI = dyn_cast<VPInstruction>(VPV))
7981
return VPI->isSingleScalar() || VPI->isVectorToScalar() ||
8082
(PreservesUniformity(VPI->getOpcode()) &&
Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
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+
define void @narrow_select_to_single_scalar(i1 %invar.cond, ptr noalias %A, ptr noalias %B, ptr noalias %C) {
5+
; CHECK-LABEL: define void @narrow_select_to_single_scalar(
6+
; CHECK-SAME: i1 [[INVAR_COND:%.*]], ptr noalias [[A:%.*]], ptr noalias [[B:%.*]], ptr noalias [[C:%.*]]) {
7+
; CHECK-NEXT: [[ENTRY:.*]]:
8+
; CHECK-NEXT: br i1 false, label %[[SCALAR_PH:.*]], label %[[VECTOR_PH:.*]]
9+
; CHECK: [[VECTOR_PH]]:
10+
; CHECK-NEXT: [[TMP0:%.*]] = select i1 [[INVAR_COND]], i16 0, i16 1
11+
; CHECK-NEXT: [[TMP1:%.*]] = getelementptr i16, ptr [[C]], i16 [[TMP0]]
12+
; CHECK-NEXT: br label %[[VECTOR_BODY:.*]]
13+
; CHECK: [[VECTOR_BODY]]:
14+
; CHECK-NEXT: [[INDEX:%.*]] = phi i32 [ 0, %[[VECTOR_PH]] ], [ [[INDEX_NEXT:%.*]], %[[VECTOR_BODY]] ]
15+
; CHECK-NEXT: [[OFFSET_IDX:%.*]] = trunc i32 [[INDEX]] to i16
16+
; CHECK-NEXT: [[TMP2:%.*]] = add i16 [[OFFSET_IDX]], 0
17+
; CHECK-NEXT: [[TMP3:%.*]] = add i16 [[OFFSET_IDX]], 1
18+
; CHECK-NEXT: [[TMP4:%.*]] = add i16 [[OFFSET_IDX]], 2
19+
; CHECK-NEXT: [[TMP5:%.*]] = add i16 [[OFFSET_IDX]], 3
20+
; CHECK-NEXT: [[TMP6:%.*]] = getelementptr i8, ptr [[A]], i16 [[TMP5]]
21+
; CHECK-NEXT: [[TMP7:%.*]] = load i16, ptr [[TMP6]], align 1
22+
; CHECK-NEXT: store i16 [[TMP7]], ptr [[B]], align 1
23+
; CHECK-NEXT: store i16 0, ptr [[TMP1]], align 1
24+
; CHECK-NEXT: [[INDEX_NEXT]] = add nuw i32 [[INDEX]], 4
25+
; CHECK-NEXT: [[TMP8:%.*]] = icmp eq i32 [[INDEX_NEXT]], 1024
26+
; CHECK-NEXT: br i1 [[TMP8]], label %[[MIDDLE_BLOCK:.*]], label %[[VECTOR_BODY]], !llvm.loop [[LOOP0:![0-9]+]]
27+
; CHECK: [[MIDDLE_BLOCK]]:
28+
; CHECK-NEXT: br i1 false, label %[[EXIT:.*]], label %[[SCALAR_PH]]
29+
; CHECK: [[SCALAR_PH]]:
30+
; CHECK-NEXT: [[BC_RESUME_VAL:%.*]] = phi i16 [ 1024, %[[MIDDLE_BLOCK]] ], [ 0, %[[ENTRY]] ]
31+
; CHECK-NEXT: br label %[[LOOP_HEADER:.*]]
32+
; CHECK: [[LOOP_HEADER]]:
33+
; CHECK-NEXT: [[IV:%.*]] = phi i16 [ [[BC_RESUME_VAL]], %[[SCALAR_PH]] ], [ [[IV_NEXT:%.*]], %[[LOOP_HEADER]] ]
34+
; CHECK-NEXT: [[GEP_A:%.*]] = getelementptr i8, ptr [[A]], i16 [[IV]]
35+
; CHECK-NEXT: [[L_0:%.*]] = load i16, ptr [[GEP_A]], align 1
36+
; CHECK-NEXT: store i16 [[L_0]], ptr [[B]], align 1
37+
; CHECK-NEXT: [[INVAR_SEL:%.*]] = select i1 [[INVAR_COND]], i16 0, i16 1
38+
; CHECK-NEXT: [[GEP_C:%.*]] = getelementptr i16, ptr [[C]], i16 [[INVAR_SEL]]
39+
; CHECK-NEXT: store i16 0, ptr [[GEP_C]], align 1
40+
; CHECK-NEXT: [[IV_NEXT]] = add i16 [[IV]], 1
41+
; CHECK-NEXT: [[EC:%.*]] = icmp ne i16 [[IV]], 1024
42+
; CHECK-NEXT: br i1 [[EC]], label %[[LOOP_HEADER]], label %[[EXIT]], !llvm.loop [[LOOP3:![0-9]+]]
43+
; CHECK: [[EXIT]]:
44+
; CHECK-NEXT: ret void
45+
;
46+
entry:
47+
br label %loop.header
48+
49+
loop.header:
50+
%iv = phi i16 [ 0, %entry ], [ %iv.next, %loop.header ]
51+
%gep.A = getelementptr i8, ptr %A, i16 %iv
52+
%l.0 = load i16, ptr %gep.A, align 1
53+
store i16 %l.0, ptr %B, align 1
54+
%invar.sel = select i1 %invar.cond, i16 0, i16 1
55+
%gep.C = getelementptr i16, ptr %C, i16 %invar.sel
56+
store i16 0, ptr %gep.C, align 1
57+
%iv.next = add i16 %iv, 1
58+
%ec = icmp ne i16 %iv, 1024
59+
br i1 %ec, label %loop.header, label %exit
60+
61+
exit:
62+
ret void
63+
}
64+
;.
65+
; CHECK: [[LOOP0]] = distinct !{[[LOOP0]], [[META1:![0-9]+]], [[META2:![0-9]+]]}
66+
; CHECK: [[META1]] = !{!"llvm.loop.isvectorized", i32 1}
67+
; CHECK: [[META2]] = !{!"llvm.loop.unroll.runtime.disable"}
68+
; CHECK: [[LOOP3]] = distinct !{[[LOOP3]], [[META2]], [[META1]]}
69+
;.

0 commit comments

Comments
 (0)