[mips] Correcting operand range for DINSM instruction

[abeserminji]

Summary

This patch corrects the definition of the DINSM instruction. Specification for DINSM instruction for Mips64 says that size operand should be 2 <= size <= 64, but it is defined as uimm5_inssize_plus1 which gives range of 1 .. 32.

[sdardis]

Can you add a test case along the lines of:

dinsm $4, $5, 31, 33

to test/MC/Mips/mips64r{2|6}/valid.s

I've noticed that the dext and dins family of instructions are not tested in those files.

[abeserminji]

Should I add tests for dext family of instructions to a new patch? Or is it ok to add them to this patch?

[sdardis]

Adding tests for the dext/dins family of instructions should be submitted as a separate patch. This patch just requires tests for dinsm.

[abeserminji]

Added test line for dinsm instruction to test/MC/Mips/mips64r{2|6}/valid.s

[sdardis]

LGTM with inline nit addressed.

test/MC/Mips/mips64r2/valid.s

109 ↗

(On Diff #114797)

This should be 34, as 32 is a valid operand for uimm5_inssize_plus1. 34 is not valid for uimm5_inssize_plus1 but is valid by the ISA description of the instruction.

test/MC/Mips/mips64r6/valid.s

117 ↗

(On Diff #114797)

See my previous comment.

[abeserminji]

Comment resolved.

lib/Target/Mips/Mips64InstrInfo.td

def DEXTM : ExtBase<"dextm", GPR64Opnd, uimm5, uimm5_plus33, immZExt5,
                       immZExt5Plus33, MipsExt>, EXT_FM<1>, ISA_MIPS64R2;
   def DEXTU : ExtBase<"dextu", GPR64Opnd, uimm5_plus32, uimm5_plus1,
                       immZExt5Plus32, immZExt5Plus1, MipsExt>, EXT_FM<2>,
                       ISA_MIPS64R2;
   def DINS : InsBase<"dins", GPR64Opnd, uimm6, uimm5_inssize_plus1, MipsIns>,
              EXT_FM<7>, ISA_MIPS64R2;
   def DINSU : InsBase<"dinsu", GPR64Opnd, uimm5_plus32, uimm5_inssize_plus1>,
               EXT_FM<6>, ISA_MIPS64R2;
-  def DINSM : InsBase<"dinsm", GPR64Opnd, uimm5, uimm5_inssize_plus1>,
+  def DINSM : InsBase<"dinsm", GPR64Opnd, uimm5, uimm_range_2_64>,
               EXT_FM<5>, ISA_MIPS64R2;
 }
 
 let isCodeGenOnly = 1, AdditionalPredicates = [NotInMicroMips] in {
   def DEXT64_32 : InstSE<(outs GPR64Opnd:$rt),
                          (ins GPR32Opnd:$rs, uimm5_report_uimm6:$pos,
                               uimm5_plus1:$size),
                          "dext $rt, $rs, $pos, $size", [], II_EXT, FrmR, "dext">,