diff --git a/llvm/lib/Target/RISCV/RISCVInstrFormats.td b/llvm/lib/Target/RISCV/RISCVInstrFormats.td --- a/llvm/lib/Target/RISCV/RISCVInstrFormats.td +++ b/llvm/lib/Target/RISCV/RISCVInstrFormats.td @@ -64,22 +64,21 @@ // register is being written with a mask value (e.g., comparisons) or the // scalar result of a reduction. // -// * Widening: The destination vector register group cannot overlap a source -// vector register group of a different EEW +// * Widening: The destination EEW is greater than the source EEW, the source +// EMUL is at least 1. The destination vector register group cannot overlap +// with the source vector register groups besides the highest-numbered part of +// the destination register group. // -// * Narrowing: The destination vector register group cannot overlap the -// first source vector register group +// * Narrowing: The destination EEW is smaller than the source EEW. The +// destination vector register group cannot overlap with the source vector +// register groups besides the lowest-numbered part of the source register +// group. // -// * For vadc and vsbc, an illegal instruction exception is raised if the -// destination vector register is v0. +// * vmsbf.m/vmsif.m/vmsof.m: The destination register cannot overlap the +// source register and, if masked, cannot overlap the mask register ('v0'). // -// * For vmadc and vmsbc, an illegal instruction exception is raised if the -// destination vector register overlaps a source vector register group. -// -// * viota: An illegal instruction exception is raised if the destination -// vector register group overlaps the source vector mask register. If the -// instruction is masked, an illegal instruction exception is issued if the -// destination vector register group overlaps v0. +// * viota: The destination register cannot overlap the source register and, +// if masked, cannot overlap the mask register ('v0'). // // * v[f]slide[1]up: The destination vector register group for vslideup cannot // overlap the source vector register group. @@ -96,12 +95,6 @@ VMConstraint.Value)>; def WidenCvt : RISCVVConstraint; -def Narrow : RISCVVConstraint; -def NarrowCvt : RISCVVConstraint; -def Vmadc : RISCVVConstraint; def Iota : RISCVVConstraint; def SlideUp : RISCVVConstraint; -let Constraints = "@earlyclobber $vd", RVVConstraint = Vmadc in { +let Constraints = "@earlyclobber $vd", RVVConstraint = NoConstraint in { defm VMADC_V : VALUm_IV_V_X_I<"vmadc", 0b010001>; defm VMADC_V : VALUNoVm_IV_V_X_I<"vmadc", 0b010001>; -} // Constraints = "@earlyclobber $vd", RVVConstraint = Vmadc +} // Constraints = "@earlyclobber $vd", RVVConstraint = NoConstraint defm VSBC_V : VALUm_IV_V_X<"vsbc", 0b010010>; -let Constraints = "@earlyclobber $vd", RVVConstraint = Vmadc in { +let Constraints = "@earlyclobber $vd", RVVConstraint = NoConstraint in { defm VMSBC_V : VALUm_IV_V_X<"vmsbc", 0b010011>; defm VMSBC_V : VALUNoVm_IV_V_X<"vmsbc", 0b010011>; -} // Constraints = "@earlyclobber $vd", RVVConstraint = Vmadc +} // Constraints = "@earlyclobber $vd", RVVConstraint = NoConstraint // Vector Bitwise Logical Instructions defm VAND_V : VALU_IV_V_X_I<"vand", 0b001001>; @@ -598,10 +598,10 @@ // The destination vector register group cannot overlap the first source // vector register group (specified by vs2). The destination vector register // group cannot overlap the mask register if used, unless LMUL=1. -let Constraints = "@earlyclobber $vd", RVVConstraint = Narrow in { +let Constraints = "@earlyclobber $vd" in { defm VNSRL_W : VALU_IV_V_X_I<"vnsrl", 0b101100, uimm5, "w">; defm VNSRA_W : VALU_IV_V_X_I<"vnsra", 0b101101, uimm5, "w">; -} // Constraints = "@earlyclobber $vd", RVVConstraint = Narrow +} // Constraints = "@earlyclobber $vd" def : InstAlias<"vncvt.x.x.w $vd, $vs$vm", (VNSRL_WX VR:$vd, VR:$vs, X0, VMaskOp:$vm)>; @@ -748,10 +748,10 @@ defm VSSRA_V : VALU_IV_V_X_I<"vssra", 0b101011, uimm5>; // Vector Narrowing Fixed-Point Clip Instructions -let Constraints = "@earlyclobber $vd", RVVConstraint = Narrow in { +let Constraints = "@earlyclobber $vd" in { defm VNCLIPU_W : VALU_IV_V_X_I<"vnclipu", 0b101110, uimm5, "w">; defm VNCLIP_W : VALU_IV_V_X_I<"vnclip", 0b101111, uimm5, "w">; -} // Constraints = "@earlyclobber $vd", RVVConstraint = Narrow +} // Constraints = "@earlyclobber $vd" } // Predicates = [HasStdExtV] let Predicates = [HasStdExtV, HasStdExtF] in { @@ -876,7 +876,7 @@ } // Constraints = "@earlyclobber $vd", RVVConstraint = WidenCvt // Narrowing Floating-Point/Integer Type-Convert Instructions -let Constraints = "@earlyclobber $vd", RVVConstraint = NarrowCvt in { +let Constraints = "@earlyclobber $vd" in { defm VFNCVT_XU_F_W : VALU_FV_VS2<"vfncvt.xu.f.w", 0b010010, 0b10000>; defm VFNCVT_X_F_W : VALU_FV_VS2<"vfncvt.x.f.w", 0b010010, 0b10001>; defm VFNCVT_RTZ_XU_F_W : VALU_FV_VS2<"vfncvt.rtz.xu.f.w", 0b010010, 0b10110>; @@ -885,7 +885,7 @@ defm VFNCVT_F_X_W : VALU_FV_VS2<"vfncvt.f.x.w", 0b010010, 0b10011>; defm VFNCVT_F_F_W : VALU_FV_VS2<"vfncvt.f.f.w", 0b010010, 0b10100>; defm VFNCVT_ROD_F_F_W : VALU_FV_VS2<"vfncvt.rod.f.f.w", 0b010010, 0b10101>; -} // Constraints = "@earlyclobber $vd", RVVConstraint = NarrowCvt +} // Constraints = "@earlyclobber $vd" } // Predicates = [HasStdExtV, HasStdExtF] let Predicates = [HasStdExtV] in { @@ -967,17 +967,14 @@ "vfirst.m", "$vd, $vs2$vm">; } // hasSideEffects = 0, mayLoad = 0, mayStore = 0 +let Constraints = "@earlyclobber $vd", RVVConstraint = Iota in { // vmsbf.m set-before-first mask bit defm VMSBF_M : VALU_MV_VS2<"vmsbf.m", 0b010100, 0b00001>; - // vmsif.m set-including-first mask bit defm VMSIF_M : VALU_MV_VS2<"vmsif.m", 0b010100, 0b00011>; - // vmsof.m set-only-first mask bit defm VMSOF_M : VALU_MV_VS2<"vmsof.m", 0b010100, 0b00010>; - // Vector Iota Instruction -let Constraints = "@earlyclobber $vd", RVVConstraint = Iota in { defm VIOTA_M : VALU_MV_VS2<"viota.m", 0b010100, 0b10000>; } // Constraints = "@earlyclobber $vd", RVVConstraint = Iota @@ -1017,12 +1014,9 @@ // Vector Slide Instructions let Constraints = "@earlyclobber $vd", RVVConstraint = SlideUp in { defm VSLIDEUP_V : VALU_IV_X_I<"vslideup", 0b001110, uimm5>; -} // Constraints = "@earlyclobber $vd", RVVConstraint = SlideUp -defm VSLIDEDOWN_V : VALU_IV_X_I<"vslidedown", 0b001111, uimm5>; - -let Constraints = "@earlyclobber $vd", RVVConstraint = SlideUp in { defm VSLIDE1UP_V : VALU_MV_X<"vslide1up", 0b001110>; } // Constraints = "@earlyclobber $vd", RVVConstraint = SlideUp +defm VSLIDEDOWN_V : VALU_IV_X_I<"vslidedown", 0b001111, uimm5>; defm VSLIDE1DOWN_V : VALU_MV_X<"vslide1down", 0b001111>; } // Predicates = [HasStdExtV] diff --git a/llvm/test/MC/RISCV/rvv/add.s b/llvm/test/MC/RISCV/rvv/add.s --- a/llvm/test/MC/RISCV/rvv/add.s +++ b/llvm/test/MC/RISCV/rvv/add.s @@ -146,6 +146,18 @@ # CHECK-ERROR: instruction requires the following: 'V' (Vector Instructions) # CHECK-UNKNOWN: 57 04 4a 40 +vadc.vvm v4, v4, v20, v0 +# CHECK-INST: vadc.vvm v4, v4, v20, v0 +# CHECK-ENCODING: [0x57,0x02,0x4a,0x40] +# CHECK-ERROR: instruction requires the following: 'V' (Vector Instructions) +# CHECK-UNKNOWN: 57 02 4a 40 + +vadc.vvm v8, v4, v8, v0 +# CHECK-INST: vadc.vvm v8, v4, v8, v0 +# CHECK-ENCODING: [0x57,0x04,0x44,0x40] +# CHECK-ERROR: instruction requires the following: 'V' (Vector Instructions) +# CHECK-UNKNOWN: 57 04 44 40 + vadc.vxm v8, v4, a0, v0 # CHECK-INST: vadc.vxm v8, v4, a0, v0 # CHECK-ENCODING: [0x57,0x44,0x45,0x40] @@ -164,6 +176,18 @@ # CHECK-ERROR: instruction requires the following: 'V' (Vector Instructions) # CHECK-UNKNOWN: 57 04 4a 44 +vmadc.vvm v4, v4, v20, v0 +# CHECK-INST: vmadc.vvm v4, v4, v20, v0 +# CHECK-ENCODING: [0x57,0x02,0x4a,0x44] +# CHECK-ERROR: instruction requires the following: 'V' (Vector Instructions) +# CHECK-UNKNOWN: 57 02 4a 44 + +vmadc.vvm v8, v4, v8, v0 +# CHECK-INST: vmadc.vvm v8, v4, v8, v0 +# CHECK-ENCODING: [0x57,0x04,0x44,0x44] +# CHECK-ERROR: instruction requires the following: 'V' (Vector Instructions) +# CHECK-UNKNOWN: 57 04 44 44 + vmadc.vxm v8, v4, a0, v0 # CHECK-INST: vmadc.vxm v8, v4, a0, v0 # CHECK-ENCODING: [0x57,0x44,0x45,0x44] diff --git a/llvm/test/MC/RISCV/rvv/convert.s b/llvm/test/MC/RISCV/rvv/convert.s --- a/llvm/test/MC/RISCV/rvv/convert.s +++ b/llvm/test/MC/RISCV/rvv/convert.s @@ -173,6 +173,12 @@ # CHECK-ERROR: instruction requires the following: 'F'{{.*}}'V' # CHECK-UNKNOWN: 57 14 48 48 +vfncvt.xu.f.w v4, v4, v0.t +# CHECK-INST: vfncvt.xu.f.w v4, v4, v0.t +# CHECK-ENCODING: [0x57,0x12,0x48,0x48] +# CHECK-ERROR: instruction requires the following: 'F'{{.*}}'V' +# CHECK-UNKNOWN: 57 12 48 48 + vfncvt.xu.f.w v8, v4 # CHECK-INST: vfncvt.xu.f.w v8, v4 # CHECK-ENCODING: [0x57,0x14,0x48,0x4a] diff --git a/llvm/test/MC/RISCV/rvv/invalid.s b/llvm/test/MC/RISCV/rvv/invalid.s --- a/llvm/test/MC/RISCV/rvv/invalid.s +++ b/llvm/test/MC/RISCV/rvv/invalid.s @@ -133,78 +133,6 @@ # CHECK-ERROR: The destination vector register group cannot overlap the source vector register group. # CHECK-ERROR-LABEL: vslide1up.vx v2, v2, a0 -vnsrl.wv v2, v2, v4 -# CHECK-ERROR: The destination vector register group cannot overlap the source vector register group. -# CHECK-ERROR-LABEL: vnsrl.wv v2, v2, v4 - -vnsrl.wx v2, v2, a0 -# CHECK-ERROR: The destination vector register group cannot overlap the source vector register group. -# CHECK-ERROR-LABEL: vnsrl.wx v2, v2, a0 - -vnsrl.wi v2, v2, 31 -# CHECK-ERROR: The destination vector register group cannot overlap the source vector register group. -# CHECK-ERROR-LABEL: vnsrl.wi v2, v2, 31 - -vnsra.wv v2, v2, v4 -# CHECK-ERROR: The destination vector register group cannot overlap the source vector register group. -# CHECK-ERROR-LABEL: vnsra.wv v2, v2, v4 - -vnsra.wx v2, v2, a0 -# CHECK-ERROR: The destination vector register group cannot overlap the source vector register group. -# CHECK-ERROR-LABEL: vnsra.wx v2, v2, a0 - -vnsra.wi v2, v2, 31 -# CHECK-ERROR: The destination vector register group cannot overlap the source vector register group. -# CHECK-ERROR-LABEL: vnsra.wi v2, v2, 31 - -vnclipu.wv v2, v2, v4 -# CHECK-ERROR: The destination vector register group cannot overlap the source vector register group. -# CHECK-ERROR-LABEL: vnclipu.wv v2, v2, v4 - -vnclipu.wx v2, v2, a0 -# CHECK-ERROR: The destination vector register group cannot overlap the source vector register group. -# CHECK-ERROR-LABEL: vnclipu.wx v2, v2, a0 - -vnclipu.wi v2, v2, 31 -# CHECK-ERROR: The destination vector register group cannot overlap the source vector register group. -# CHECK-ERROR-LABEL: vnclipu.wi v2, v2, 31 - -vnclip.wv v2, v2, v4 -# CHECK-ERROR: The destination vector register group cannot overlap the source vector register group. -# CHECK-ERROR-LABEL: vnclip.wv v2, v2, v4 - -vnclip.wx v2, v2, a0 -# CHECK-ERROR: The destination vector register group cannot overlap the source vector register group. -# CHECK-ERROR-LABEL: vnclip.wx v2, v2, a0 - -vnclip.wi v2, v2, 31 -# CHECK-ERROR: The destination vector register group cannot overlap the source vector register group. -# CHECK-ERROR-LABEL: vnclip.wi v2, v2, 31 - -vfncvt.xu.f.w v2, v2 -# CHECK-ERROR: The destination vector register group cannot overlap the source vector register group. -# CHECK-ERROR-LABEL: vfncvt.xu.f.w v2, v2 - -vfncvt.x.f.w v2, v2 -# CHECK-ERROR: The destination vector register group cannot overlap the source vector register group. -# CHECK-ERROR-LABEL: vfncvt.x.f.w v2, v2 - -vfncvt.f.xu.w v2, v2 -# CHECK-ERROR: The destination vector register group cannot overlap the source vector register group. -# CHECK-ERROR-LABEL: vfncvt.f.xu.w v2, v2 - -vfncvt.f.x.w v2, v2 -# CHECK-ERROR: The destination vector register group cannot overlap the source vector register group. -# CHECK-ERROR-LABEL: vfncvt.f.x.w v2, v2 - -vfncvt.f.f.w v2, v2 -# CHECK-ERROR: The destination vector register group cannot overlap the source vector register group. -# CHECK-ERROR-LABEL: vfncvt.f.f.w v2, v2 - -vfncvt.rod.f.f.w v2, v2 -# CHECK-ERROR: The destination vector register group cannot overlap the source vector register group. -# CHECK-ERROR-LABEL: vfncvt.rod.f.f.w v2, v2 - vrgather.vv v0, v2, v4, v0.t # CHECK-ERROR: The destination vector register group cannot overlap the mask register. # CHECK-ERROR-LABEL: vrgather.vv v0, v2, v4, v0.t @@ -589,14 +517,6 @@ # CHECK-ERROR: The destination vector register group cannot be V0. # CHECK-ERROR-LABEL: vadc.vvm v0, v2, v4, v0 -vmadc.vvm v2, v2, v4, v0 -# CHECK-ERROR: The destination vector register group cannot overlap the source vector register group. -# CHECK-ERROR-LABEL: vmadc.vvm v2, v2, v4, v0 - -vmadc.vvm v4, v2, v4, v0 -# CHECK-ERROR: The destination vector register group cannot overlap the source vector register group. -# CHECK-ERROR-LABEL: vmadc.vvm v4, v2, v4, v0 - vadd.vv v0, v2, v4, v0.t # CHECK-ERROR: The destination vector register group cannot overlap the mask register. # CHECK-ERROR-LABEL: vadd.vv v0, v2, v4, v0.t @@ -652,3 +572,11 @@ vid.v v0, v0.t # CHECK-ERROR: The destination vector register group cannot overlap the mask register. # CHECK-ERROR-LABEL: vid.v v0, v0.t + +vnsrl.wv v0, v4, v20, v0.t +# CHECK-ERROR: The destination vector register group cannot overlap the mask register. +# CHECK-ERROR-LABEL: vnsrl.wv v0, v4, v20, v0.t + +vfncvt.xu.f.w v0, v4, v0.t +# CHECK-ERROR: The destination vector register group cannot overlap the mask register. +# CHECK-ERROR-LABEL: vfncvt.xu.f.w v0, v4, v0.t diff --git a/llvm/test/MC/RISCV/rvv/shift.s b/llvm/test/MC/RISCV/rvv/shift.s --- a/llvm/test/MC/RISCV/rvv/shift.s +++ b/llvm/test/MC/RISCV/rvv/shift.s @@ -122,6 +122,12 @@ # CHECK-ERROR: instruction requires the following: 'V' (Vector Instructions) # CHECK-UNKNOWN: 57 04 4a b0 +vnsrl.wv v4, v4, v20, v0.t +# CHECK-INST: vnsrl.wv v4, v4, v20, v0.t +# CHECK-ENCODING: [0x57,0x02,0x4a,0xb0] +# CHECK-ERROR: instruction requires the following: 'V' (Vector Instructions) +# CHECK-UNKNOWN: 57 02 4a b0 + vnsrl.wv v8, v4, v20 # CHECK-INST: vnsrl.wv v8, v4, v20 # CHECK-ENCODING: [0x57,0x04,0x4a,0xb2] diff --git a/llvm/test/MC/RISCV/rvv/sub.s b/llvm/test/MC/RISCV/rvv/sub.s --- a/llvm/test/MC/RISCV/rvv/sub.s +++ b/llvm/test/MC/RISCV/rvv/sub.s @@ -158,6 +158,18 @@ # CHECK-ERROR: instruction requires the following: 'V' (Vector Instructions) # CHECK-UNKNOWN: 57 04 4a 48 +vsbc.vvm v4, v4, v20, v0 +# CHECK-INST: vsbc.vvm v4, v4, v20, v0 +# CHECK-ENCODING: [0x57,0x02,0x4a,0x48] +# CHECK-ERROR: instruction requires the following: 'V' (Vector Instructions) +# CHECK-UNKNOWN: 57 02 4a 48 + +vsbc.vvm v8, v4, v8, v0 +# CHECK-INST: vsbc.vvm v8, v4, v8, v0 +# CHECK-ENCODING: [0x57,0x04,0x44,0x48] +# CHECK-ERROR: instruction requires the following: 'V' (Vector Instructions) +# CHECK-UNKNOWN: 57 04 44 48 + vsbc.vxm v8, v4, a0, v0 # CHECK-INST: vsbc.vxm v8, v4, a0, v0 # CHECK-ENCODING: [0x57,0x44,0x45,0x48] @@ -170,6 +182,18 @@ # CHECK-ERROR: instruction requires the following: 'V' (Vector Instructions) # CHECK-UNKNOWN: 57 04 4a 4c +vmsbc.vvm v4, v4, v20, v0 +# CHECK-INST: vmsbc.vvm v4, v4, v20, v0 +# CHECK-ENCODING: [0x57,0x02,0x4a,0x4c] +# CHECK-ERROR: instruction requires the following: 'V' (Vector Instructions) +# CHECK-UNKNOWN: 57 02 4a 4c + +vmsbc.vvm v8, v4, v8, v0 +# CHECK-INST: vmsbc.vvm v8, v4, v8, v0 +# CHECK-ENCODING: [0x57,0x04,0x44,0x4c] +# CHECK-ERROR: instruction requires the following: 'V' (Vector Instructions) +# CHECK-UNKNOWN: 57 04 44 4c + vmsbc.vxm v8, v4, a0, v0 # CHECK-INST: vmsbc.vxm v8, v4, a0, v0 # CHECK-ENCODING: [0x57,0x44,0x45,0x4c]