[HW] Modified mcfg instructions

Author: dcammarata01

llvm/lib/Target/RISCV/RISCVInstrInfoXTHead.td

@@ -79,31 +79,31 @@ class RVMLoadStore<bits<1> matrix, bits<3> ldst, bits<2> size, dag outs, dag ins
   let Inst{6-0} = OPC_CUSTOM_0.Value;
 }
 
-class RVMConfig<bits<3> funct3_h, dag outs, dag ins, string opcodestr, string argstr> 
+class RVMConfigK<bits<3> funct3_h, dag outs, dag ins, string opcodestr, string argstr> 
   : RVInst<outs, ins, opcodestr, argstr, [], InstFormatOther> {
     bits<5> rs1;
     bits<5> rd;
 
     let Inst{31} = 0b0;
     let Inst{30-28} = funct3_h;
-    let Inst{27-23} = 0b11100;
+    let Inst{27-22} = 0b111000;
     let Inst{19-15} = rs1;
     let Inst{14-12} = 0b000;
     let Inst{11-7}  = rd;
     let Inst{6-0} = OPC_CUSTOM_0.Value;
 }
 
-class RVMConfigK<bits<3> funct3_h, dag outs, dag ins, string opcodestr, string argstr> 
-  : RVMConfig<funct3_h, outs, ins, opcodestr, argstr> {
-    bits<3> imm3;
-    let Inst{22-20} = imm3;
+class RVMConfig<bits<3> funct3_h, dag outs, dag ins, string opcodestr, string argstr> 
+  : RVMConfigK<funct3_h, outs, ins, opcodestr, argstr> {
+    bits<2> imm2;
+    let Inst{21-20} = imm2{1-0};
 }
 
 let Predicates = [HasVendorXTHeadMatrix], DecoderNamespace = "XTHeadMatrix",hasSideEffects = 0, mayLoad = 0, mayStore = 0 in {
   let hasSideEffects = 1 in {
-    def MCFGK : RVMConfigK<0b000, (outs GPR:$rd), (ins GPR:$rs1, uimm3:$imm3), "mcfgk", "$rd, $rs1, $imm3">;
-    def MCFGM : RVMConfig<0b001, (outs GPR:$rd), (ins GPR:$rs1), "mcfgm", "$rd, $rs1">;
-    def MCFGN : RVMConfig<0b010, (outs GPR:$rd), (ins GPR:$rs1), "mcfgn", "$rd, $rs1">;
+    def MCFGK : RVMConfigK<0b000, (outs GPR:$rd), (ins GPR:$rs1             ), "mcfgk", "$rd, $rs1">;
+    def MCFGM : RVMConfig <0b001, (outs GPR:$rd), (ins GPR:$rs1, uimm2:$imm2), "mcfgm", "$rd, $rs1, $imm2">;
+    def MCFGN : RVMConfig <0b010, (outs GPR:$rd), (ins GPR:$rs1, uimm2:$imm2), "mcfgn", "$rd, $rs1, $imm2">;
   }
   def FMMACC_B : RVMArith<0b0001, 0b00000, (outs ACC:$md), (ins MR:$ms1, MR:$ms2), "fmmacc.b", "$md, $ms2, $ms1">;
   def FMMACC_H : RVMArith<0b0001, 0b01000, (outs ACC:$md), (ins MR:$ms1, MR:$ms2), "fmmacc.h", "$md, $ms2, $ms1">;