Skip to content

Commit f875efe

Browse files
committed
[RISCV] Use GetVTypeMinimalPredicates instead of GetVTypePredicates for vrgatherei16/vslideup/vslidedown. NFC.
1 parent 7efc861 commit f875efe

File tree

1 file changed

+7
-14
lines changed

1 file changed

+7
-14
lines changed

llvm/lib/Target/RISCV/RISCVInstrInfoVPseudos.td

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4916,8 +4916,8 @@ multiclass VPatBinaryV_VV_INT_EEW<string intrinsic, string instruction,
49164916
defvar emul_str = octuple_to_str<octuple_emul>.ret;
49174917
defvar ivti = !cast<VTypeInfo>("VI" # eew # emul_str);
49184918
defvar inst = instruction # "_VV_" # vti.LMul.MX # "_E" # vti.SEW # "_" # emul_str;
4919-
let Predicates = !listconcat(GetVTypePredicates<vti>.Predicates,
4920-
GetVTypePredicates<ivti>.Predicates) in
4919+
let Predicates = !listconcat(GetVTypeMinimalPredicates<vti>.Predicates,
4920+
GetVTypeMinimalPredicates<ivti>.Predicates) in
49214921
defm : VPatBinary<intrinsic, inst,
49224922
vti.Vector, vti.Vector, ivti.Vector, vti.Mask,
49234923
vti.Log2SEW, vti.RegClass,
@@ -5584,7 +5584,7 @@ multiclass VPatTernaryV_VV_AAXA_RM<string intrinsic, string instruction,
55845584
multiclass VPatTernaryV_VX<string intrinsic, string instruction,
55855585
list<VTypeInfo> vtilist> {
55865586
foreach vti = vtilist in
5587-
let Predicates = GetVTypePredicates<vti>.Predicates in
5587+
let Predicates = GetVTypeMinimalPredicates<vti>.Predicates in
55885588
defm : VPatTernaryWithPolicy<intrinsic, instruction, "VX",
55895589
vti.Vector, vti.Vector, XLenVT, vti.Mask,
55905590
vti.Log2SEW, vti.LMul, vti.RegClass,
@@ -5616,7 +5616,7 @@ multiclass VPatTernaryV_VX_AAXA_RM<string intrinsic, string instruction,
56165616
multiclass VPatTernaryV_VI<string intrinsic, string instruction,
56175617
list<VTypeInfo> vtilist, Operand Imm_type> {
56185618
foreach vti = vtilist in
5619-
let Predicates = GetVTypePredicates<vti>.Predicates in
5619+
let Predicates = GetVTypeMinimalPredicates<vti>.Predicates in
56205620
defm : VPatTernaryWithPolicy<intrinsic, instruction, "VI",
56215621
vti.Vector, vti.Vector, XLenVT, vti.Mask,
56225622
vti.Log2SEW, vti.LMul, vti.RegClass,
@@ -7414,12 +7414,8 @@ defm : VPatTernaryV_VX_VI<"int_riscv_vslidedown", "PseudoVSLIDEDOWN", AllInteger
74147414
defm : VPatBinaryV_VX<"int_riscv_vslide1up", "PseudoVSLIDE1UP", AllIntegerVectors>;
74157415
defm : VPatBinaryV_VX<"int_riscv_vslide1down", "PseudoVSLIDE1DOWN", AllIntegerVectors>;
74167416

7417-
defm : VPatTernaryV_VX_VI<"int_riscv_vslideup", "PseudoVSLIDEUP", AllFloatVectorsExceptFP16, uimm5>;
7418-
let Predicates = [HasVInstructionsF16Minimal] in
7419-
defm : VPatTernaryV_VX_VI<"int_riscv_vslideup", "PseudoVSLIDEUP", AllFP16Vectors, uimm5>;
7420-
defm : VPatTernaryV_VX_VI<"int_riscv_vslidedown", "PseudoVSLIDEDOWN", AllFloatVectorsExceptFP16, uimm5>;
7421-
let Predicates = [HasVInstructionsF16Minimal] in
7422-
defm : VPatTernaryV_VX_VI<"int_riscv_vslidedown", "PseudoVSLIDEDOWN", AllFP16Vectors, uimm5>;
7417+
defm : VPatTernaryV_VX_VI<"int_riscv_vslideup", "PseudoVSLIDEUP", AllFloatVectors, uimm5>;
7418+
defm : VPatTernaryV_VX_VI<"int_riscv_vslidedown", "PseudoVSLIDEDOWN", AllFloatVectors, uimm5>;
74237419
defm : VPatBinaryV_VX<"int_riscv_vfslide1up", "PseudoVFSLIDE1UP", AllFloatVectors>;
74247420
defm : VPatBinaryV_VX<"int_riscv_vfslide1down", "PseudoVFSLIDE1DOWN", AllFloatVectors>;
74257421

@@ -7436,10 +7432,7 @@ defm : VPatBinaryV_VV_VX_VI_INT<"int_riscv_vrgather", "PseudoVRGATHER",
74367432
defm : VPatBinaryV_VV_VX_VI_INT<"int_riscv_vrgather", "PseudoVRGATHER",
74377433
AllBFloatVectors, uimm5>;
74387434
defm : VPatBinaryV_VV_INT_EEW<"int_riscv_vrgatherei16_vv", "PseudoVRGATHEREI16",
7439-
eew=16, vtilist=AllFloatVectorsExceptFP16>;
7440-
let Predicates = [HasVInstructionsF16Minimal] in
7441-
defm : VPatBinaryV_VV_INT_EEW<"int_riscv_vrgatherei16_vv", "PseudoVRGATHEREI16",
7442-
eew=16, vtilist=AllFP16Vectors>;
7435+
eew=16, vtilist=AllFloatVectors>;
74437436
//===----------------------------------------------------------------------===//
74447437
// 16.5. Vector Compress Instruction
74457438
//===----------------------------------------------------------------------===//

0 commit comments

Comments
 (0)