Skip to content

Commit 4ca817d

Browse files
authored
[GlobalISel] Add bail outs for scalable vectors to some combines. (#106496)
These combines call getNumElements() which isn't valid for scalable vectors.
1 parent 593526f commit 4ca817d

File tree

2 files changed

+44
-0
lines changed

2 files changed

+44
-0
lines changed

llvm/lib/CodeGen/GlobalISel/CombinerHelper.cpp

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2678,6 +2678,9 @@ bool CombinerHelper::matchInsertExtractVecEltOutOfBounds(MachineInstr &MI) {
26782678
MI.getOpcode() == TargetOpcode::G_EXTRACT_VECTOR_ELT) &&
26792679
"Expected an insert/extract element op");
26802680
LLT VecTy = MRI.getType(MI.getOperand(1).getReg());
2681+
if (VecTy.isScalableVector())
2682+
return false;
2683+
26812684
unsigned IdxIdx =
26822685
MI.getOpcode() == TargetOpcode::G_EXTRACT_VECTOR_ELT ? 2 : 3;
26832686
auto Idx = getIConstantVRegVal(MI.getOperand(IdxIdx).getReg(), MRI);
@@ -2961,6 +2964,10 @@ bool CombinerHelper::matchCombineInsertVecElts(
29612964
Register DstReg = MI.getOperand(0).getReg();
29622965
LLT DstTy = MRI.getType(DstReg);
29632966
assert(DstTy.isVector() && "Invalid G_INSERT_VECTOR_ELT?");
2967+
2968+
if (DstTy.isScalableVector())
2969+
return false;
2970+
29642971
unsigned NumElts = DstTy.getNumElements();
29652972
// If this MI is part of a sequence of insert_vec_elts, then
29662973
// don't do the combine in the middle of the sequence.
@@ -4046,6 +4053,8 @@ bool CombinerHelper::matchExtractVecEltBuildVec(MachineInstr &MI,
40464053
// and find the source register that the index maps to.
40474054
Register SrcVec = MI.getOperand(1).getReg();
40484055
LLT SrcTy = MRI.getType(SrcVec);
4056+
if (SrcTy.isScalableVector())
4057+
return false;
40494058

40504059
auto Cst = getIConstantVRegValWithLookThrough(MI.getOperand(2).getReg(), MRI);
40514060
if (!Cst || Cst->Value.getZExtValue() >= SrcTy.getNumElements())
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
; NOTE: Assertions have been autogenerated by utils/update_mir_test_checks.py UTC_ARGS: --version 5
2+
; RUN: llc < %s -mtriple=riscv64 -mattr=+v -global-isel -stop-after=riscv-prelegalizer-combiner | FileCheck %s
3+
4+
; Make sure we don't crash in the prelegalizer combiner for scalable vector
5+
; insert and extracts.
6+
7+
define <vscale x 1 x i1> @insertelement_nxv1i1_0(<vscale x 1 x i1> %x) {
8+
; CHECK-LABEL: name: insertelement_nxv1i1_0
9+
; CHECK: bb.1 (%ir-block.0):
10+
; CHECK-NEXT: liveins: $v0
11+
; CHECK-NEXT: {{ $}}
12+
; CHECK-NEXT: [[COPY:%[0-9]+]]:_(<vscale x 1 x s1>) = COPY $v0
13+
; CHECK-NEXT: [[C:%[0-9]+]]:_(s1) = G_CONSTANT i1 false
14+
; CHECK-NEXT: [[C1:%[0-9]+]]:_(s64) = G_CONSTANT i64 0
15+
; CHECK-NEXT: [[IVEC:%[0-9]+]]:_(<vscale x 1 x s1>) = G_INSERT_VECTOR_ELT [[COPY]], [[C]](s1), [[C1]](s64)
16+
; CHECK-NEXT: $v0 = COPY [[IVEC]](<vscale x 1 x s1>)
17+
; CHECK-NEXT: PseudoRET implicit $v0
18+
%a = insertelement <vscale x 1 x i1> %x, i1 0, i32 0
19+
ret <vscale x 1 x i1> %a
20+
}
21+
22+
define <vscale x 1 x i1> @shufflevector_nxv1i1_0(<vscale x 1 x i1> %x) {
23+
; CHECK-LABEL: name: shufflevector_nxv1i1_0
24+
; CHECK: bb.1 (%ir-block.0):
25+
; CHECK-NEXT: liveins: $v0
26+
; CHECK-NEXT: {{ $}}
27+
; CHECK-NEXT: [[COPY:%[0-9]+]]:_(<vscale x 1 x s1>) = COPY $v0
28+
; CHECK-NEXT: [[C:%[0-9]+]]:_(s64) = G_CONSTANT i64 0
29+
; CHECK-NEXT: [[EVEC:%[0-9]+]]:_(s1) = G_EXTRACT_VECTOR_ELT [[COPY]](<vscale x 1 x s1>), [[C]](s64)
30+
; CHECK-NEXT: [[SPLAT_VECTOR:%[0-9]+]]:_(<vscale x 1 x s1>) = G_SPLAT_VECTOR [[EVEC]](s1)
31+
; CHECK-NEXT: $v0 = COPY [[SPLAT_VECTOR]](<vscale x 1 x s1>)
32+
; CHECK-NEXT: PseudoRET implicit $v0
33+
%a = shufflevector <vscale x 1 x i1> %x, <vscale x 1 x i1> poison, <vscale x 1 x i32> poison
34+
ret <vscale x 1 x i1> %a
35+
}

0 commit comments

Comments
 (0)