[RISCV] Use `GetVTypeMinimalPredicates` instead of `GetVTypePredicates` for vrgatherei16/vslideup/vslidedown. NFC.
diff --git a/llvm/lib/Target/RISCV/RISCVInstrInfoVPseudos.td b/llvm/lib/Target/RISCV/RISCVInstrInfoVPseudos.td index 5e554d2..9c03c7c 100644 --- a/llvm/lib/Target/RISCV/RISCVInstrInfoVPseudos.td +++ b/llvm/lib/Target/RISCV/RISCVInstrInfoVPseudos.td
@@ -4916,8 +4916,8 @@ defvar emul_str = octuple_to_str<octuple_emul>.ret; defvar ivti = !cast<VTypeInfo>("VI" # eew # emul_str); defvar inst = instruction # "_VV_" # vti.LMul.MX # "_E" # vti.SEW # "_" # emul_str; - let Predicates = !listconcat(GetVTypePredicates<vti>.Predicates, - GetVTypePredicates<ivti>.Predicates) in + let Predicates = !listconcat(GetVTypeMinimalPredicates<vti>.Predicates, + GetVTypeMinimalPredicates<ivti>.Predicates) in defm : VPatBinary<intrinsic, inst, vti.Vector, vti.Vector, ivti.Vector, vti.Mask, vti.Log2SEW, vti.RegClass, @@ -5584,7 +5584,7 @@ multiclass VPatTernaryV_VX<string intrinsic, string instruction, list<VTypeInfo> vtilist> { foreach vti = vtilist in - let Predicates = GetVTypePredicates<vti>.Predicates in + let Predicates = GetVTypeMinimalPredicates<vti>.Predicates in defm : VPatTernaryWithPolicy<intrinsic, instruction, "VX", vti.Vector, vti.Vector, XLenVT, vti.Mask, vti.Log2SEW, vti.LMul, vti.RegClass, @@ -5616,7 +5616,7 @@ multiclass VPatTernaryV_VI<string intrinsic, string instruction, list<VTypeInfo> vtilist, Operand Imm_type> { foreach vti = vtilist in - let Predicates = GetVTypePredicates<vti>.Predicates in + let Predicates = GetVTypeMinimalPredicates<vti>.Predicates in defm : VPatTernaryWithPolicy<intrinsic, instruction, "VI", vti.Vector, vti.Vector, XLenVT, vti.Mask, vti.Log2SEW, vti.LMul, vti.RegClass, @@ -7414,12 +7414,8 @@ defm : VPatBinaryV_VX<"int_riscv_vslide1up", "PseudoVSLIDE1UP", AllIntegerVectors>; defm : VPatBinaryV_VX<"int_riscv_vslide1down", "PseudoVSLIDE1DOWN", AllIntegerVectors>; -defm : VPatTernaryV_VX_VI<"int_riscv_vslideup", "PseudoVSLIDEUP", AllFloatVectorsExceptFP16, uimm5>; -let Predicates = [HasVInstructionsF16Minimal] in - defm : VPatTernaryV_VX_VI<"int_riscv_vslideup", "PseudoVSLIDEUP", AllFP16Vectors, uimm5>; -defm : VPatTernaryV_VX_VI<"int_riscv_vslidedown", "PseudoVSLIDEDOWN", AllFloatVectorsExceptFP16, uimm5>; -let Predicates = [HasVInstructionsF16Minimal] in - defm : VPatTernaryV_VX_VI<"int_riscv_vslidedown", "PseudoVSLIDEDOWN", AllFP16Vectors, uimm5>; +defm : VPatTernaryV_VX_VI<"int_riscv_vslideup", "PseudoVSLIDEUP", AllFloatVectors, uimm5>; +defm : VPatTernaryV_VX_VI<"int_riscv_vslidedown", "PseudoVSLIDEDOWN", AllFloatVectors, uimm5>; defm : VPatBinaryV_VX<"int_riscv_vfslide1up", "PseudoVFSLIDE1UP", AllFloatVectors>; defm : VPatBinaryV_VX<"int_riscv_vfslide1down", "PseudoVFSLIDE1DOWN", AllFloatVectors>; @@ -7436,10 +7432,7 @@ defm : VPatBinaryV_VV_VX_VI_INT<"int_riscv_vrgather", "PseudoVRGATHER", AllBFloatVectors, uimm5>; defm : VPatBinaryV_VV_INT_EEW<"int_riscv_vrgatherei16_vv", "PseudoVRGATHEREI16", - eew=16, vtilist=AllFloatVectorsExceptFP16>; -let Predicates = [HasVInstructionsF16Minimal] in - defm : VPatBinaryV_VV_INT_EEW<"int_riscv_vrgatherei16_vv", "PseudoVRGATHEREI16", - eew=16, vtilist=AllFP16Vectors>; + eew=16, vtilist=AllFloatVectors>; //===----------------------------------------------------------------------===// // 16.5. Vector Compress Instruction //===----------------------------------------------------------------------===//