diff --git a/llvm/lib/Target/RISCV/RISCVISelLowering.cpp b/llvm/lib/Target/RISCV/RISCVISelLowering.cpp --- a/llvm/lib/Target/RISCV/RISCVISelLowering.cpp +++ b/llvm/lib/Target/RISCV/RISCVISelLowering.cpp @@ -14114,8 +14114,6 @@ // VFWCVT PseudoVFCVT_RM_CASE(PseudoVFWCVT_RM_XU_F_V, PseudoVFWCVT_XU_F_V); PseudoVFCVT_RM_CASE(PseudoVFWCVT_RM_X_F_V, PseudoVFWCVT_X_F_V); - PseudoVFCVT_RM_CASE_MF8(PseudoVFWCVT_RM_F_XU_V, PseudoVFWCVT_F_XU_V); - PseudoVFCVT_RM_CASE_MF8(PseudoVFWCVT_RM_F_X_V, PseudoVFWCVT_F_X_V); // VFNCVT PseudoVFCVT_RM_CASE_MF8(PseudoVFNCVT_RM_XU_F_W, PseudoVFNCVT_XU_F_W); diff --git a/llvm/lib/Target/RISCV/RISCVInstrInfoVPseudos.td b/llvm/lib/Target/RISCV/RISCVInstrInfoVPseudos.td --- a/llvm/lib/Target/RISCV/RISCVInstrInfoVPseudos.td +++ b/llvm/lib/Target/RISCV/RISCVInstrInfoVPseudos.td @@ -3546,18 +3546,6 @@ } } -multiclass VPseudoVWCVTF_RM_V { - defvar constraint = "@earlyclobber $rd"; - foreach m = MxListW in { - defvar mx = m.MX; - defvar WriteVFWCvtIToFV_MX = !cast("WriteVFWCvtIToFV_" # mx); - defvar ReadVFWCvtIToFV_MX = !cast("ReadVFWCvtIToFV_" # mx); - - defm _V : VPseudoConversionRM, - Sched<[WriteVFWCvtIToFV_MX, ReadVFWCvtIToFV_MX, ReadVMask]>; - } -} - multiclass VPseudoVWCVTD_V { defvar constraint = "@earlyclobber $rd"; foreach m = MxListFW in { @@ -5920,12 +5908,8 @@ defm PseudoVFWCVT_RTZ_XU_F : VPseudoVWCVTI_V; defm PseudoVFWCVT_RTZ_X_F : VPseudoVWCVTI_V; -let Uses = [FRM] in { defm PseudoVFWCVT_F_XU : VPseudoVWCVTF_V; defm PseudoVFWCVT_F_X : VPseudoVWCVTF_V; -} -defm PseudoVFWCVT_RM_F_XU : VPseudoVWCVTF_RM_V; -defm PseudoVFWCVT_RM_F_X : VPseudoVWCVTF_RM_V; defm PseudoVFWCVT_F_F : VPseudoVWCVTD_V; } // mayRaiseFPException = true diff --git a/llvm/lib/Target/RISCV/RISCVInstrInfoVVLPatterns.td b/llvm/lib/Target/RISCV/RISCVInstrInfoVVLPatterns.td --- a/llvm/lib/Target/RISCV/RISCVInstrInfoVVLPatterns.td +++ b/llvm/lib/Target/RISCV/RISCVInstrInfoVVLPatterns.td @@ -1077,21 +1077,6 @@ } } -multiclass VPatWConvertI2FP_RM_VL_V { - foreach vtiToWti = AllWidenableIntToFloatVectors in { - defvar ivti = vtiToWti.Vti; - defvar fwti = vtiToWti.Wti; - let Predicates = !listconcat(GetVTypePredicates.Predicates, - GetVTypePredicates.Predicates) in - def : Pat<(fwti.Vector (vop (ivti.Vector ivti.RegClass:$rs1), - (ivti.Mask V0), (XLenVT timm:$frm), - VLOpFrag)), - (!cast(instruction_name#"_"#ivti.LMul.MX#"_MASK") - (fwti.Vector (IMPLICIT_DEF)), ivti.RegClass:$rs1, - (ivti.Mask V0), timm:$frm, GPR:$vl, ivti.Log2SEW, TA_MA)>; - } -} - // Narrowing converting multiclass VPatNConvertFP2IVL_W; defm : VPatWConvertI2FPVL_V; -defm : VPatWConvertI2FP_RM_VL_V; -defm : VPatWConvertI2FP_RM_VL_V; - foreach fvtiToFWti = AllWidenableFloatVectors in { defvar fvti = fvtiToFWti.Vti; defvar fwti = fvtiToFWti.Wti;