rename RVPUnaryImm9 to RVPUnaryImm10 and fix simm10 encoding, fix REV_RV64 encoding, remove unnecessary addd test change,

Author: realqhc

llvm/lib/Target/RISCV/RISCVInstrInfo.td

@@ -2254,13 +2254,6 @@ include "RISCVInstrInfoZvqdotq.td"
 // Packed SIMD
 include "RISCVInstrInfoP.td"
 
-// Integer
-include "RISCVInstrInfoZimop.td"
-include "RISCVInstrInfoZicbo.td"
-include "RISCVInstrInfoZicond.td"
-include "RISCVInstrInfoZicfiss.td"
-include "RISCVInstrInfoZilsd.td"
-
 // Compressed
 include "RISCVInstrInfoC.td"
 include "RISCVInstrInfoZc.td"

llvm/lib/Target/RISCV/RISCVInstrInfoP.td

@@ -25,13 +25,14 @@ def simm10 : RISCVSImmLeafOp<10>;
 //===----------------------------------------------------------------------===//
 
 let hasSideEffects = 0, mayLoad = 0, mayStore = 0 in
-class RVPUnaryImm9<bits<7> funct7, string opcodestr>
+class RVPUnaryImm10<bits<7> funct7, string opcodestr>
     : RVInstIBase<0b010, OPC_OP_IMM_32, (outs GPR:$rd), (ins simm10:$simm10),
                   opcodestr, "$rd, $simm10"> {
   bits<10> simm10;
 
   let Inst{31-25} = funct7;
-  let Inst{24-15} = simm10;
+  let Inst{24-16} = simm10{8-0};
+  let Inst{15}    = simm10{9};
 }
 
 let hasSideEffects = 0, mayLoad = 0, mayStore = 0 in
@@ -103,7 +104,7 @@ def REV_RV32  : Unary_r<0b011010011111, 0b101, "rev">;
 
 let Predicates = [HasStdExtP, IsRV64] in {
 def REV16      : Unary_r<0b011010110000, 0b101, "rev16">;
-def REV_RV64   : Unary_r<0b011110111111, 0b101, "rev">;
+def REV_RV64   : Unary_r<0b011010111111, 0b101, "rev">;
 
 def CLSW  : UnaryW_r<0b011000000011, 0b001, "clsw">;
 def ABSW  : UnaryW_r<0b011000000111, 0b001, "absw">;
@@ -123,9 +124,9 @@ def PSSLAI_W : RVPUnaryImm5<0b101, "psslai.w">;
 } // Predicates = [HasStdExtP, IsRV64]
 
 let Predicates = [HasStdExtP] in
-def PLI_H : RVPUnaryImm9<0b1011000, "pli.h">;
+def PLI_H : RVPUnaryImm10<0b1011000, "pli.h">;
 let Predicates = [HasStdExtP, IsRV64] in
-def PLI_W : RVPUnaryImm9<0b1011001, "pli.w">;
+def PLI_W : RVPUnaryImm10<0b1011001, "pli.w">;
 let Predicates = [HasStdExtP] in
 def PLI_B : RVPUnaryImm8<0b10110100, "pli.b">;
 
@@ -140,6 +141,6 @@ def PSEXT_W_H      : RVPUnaryWUF<0b01, 0b00101, "psext.w.h">;
 } // Predicates = [HasStdExtP, IsRV64]
 
 let Predicates = [HasStdExtP] in
-def PLUI_H : RVPUnaryImm9<0b1111000, "plui.h">;
+def PLUI_H : RVPUnaryImm10<0b1111000, "plui.h">;
 let Predicates = [HasStdExtP, IsRV64] in
-def PLUI_W : RVPUnaryImm9<0b1111001, "plui.w">;
+def PLUI_W : RVPUnaryImm10<0b1111001, "plui.w">;

llvm/test/MC/RISCV/invalid-instruction-spellcheck.s

@@ -22,10 +22,10 @@ fl ft0, 0(sp)
 # CHECK-RV64IF: did you mean: flw, la, lb, ld, lh, li, lw
 # CHECK-NEXT: fl ft0, 0(sp)
 
-addc x1, x1, x1
+addd x1, x1, x1
 # CHECK-RV32: did you mean: add, addi
 # CHECK-RV64: did you mean: add, addi, addw
-# CHECK-NEXT: addc x1, x1, x1
+# CHECK-NEXT: addd x1, x1, x1
 
 vm x0, x0
 # CHECK: did you mean: mv

llvm/test/MC/RISCV/rv32p-valid.s

@@ -56,7 +56,7 @@ psslai.h t0, t1, 2
 # CHECK-ASM: encoding: [0x1b,0xa7,0x37,0xd2]
 sslai a4, a5, 3
 # CHECK-ASM-AND-OBJ: pli.h a5, 16
-# CHECK-ASM: encoding: [0x9b,0x27,0x08,0xb0]
+# CHECK-ASM: encoding: [0x9b,0x27,0x10,0xb0]
 pli.h a5, 16
 # CHECK-ASM-AND-OBJ: pli.b a6, 16
 # CHECK-ASM: encoding: [0x1b,0x28,0x10,0xb4]
@@ -71,5 +71,5 @@ psabs.h a1, a2
 # CHECK-ASM: encoding: [0x9b,0x22,0x73,0xe4]
 psabs.b t0, t1
 # CHECK-ASM-AND-OBJ: plui.h gp, 32
-# CHECK-ASM: encoding: [0x9b,0x21,0x10,0xf0]
+# CHECK-ASM: encoding: [0x9b,0x21,0x20,0xf0]
 plui.h gp, 32

llvm/test/MC/RISCV/rv64p-valid.s

@@ -26,7 +26,7 @@ rev16 s0, s1
 # CHECK-ASM: encoding: [0x13,0xd4,0x84,0x6b]
 rev8 s0, s1
 # CHECK-ASM-AND-OBJ: rev s2, s3
-# CHECK-ASM: encoding: [0x13,0xd9,0xf9,0x7b]
+# CHECK-ASM: encoding: [0x13,0xd9,0xf9,0x6b]
 rev s2, s3
 # CHECK-ASM-AND-OBJ: clzw s0, s1
 # CHECK-ASM: encoding: [0x1b,0x94,0x04,0x60]
@@ -71,10 +71,10 @@ psslai.h t0, t1, 3
 # CHECK-ASM: encoding: [0x1b,0xa7,0x47,0xd2]
 psslai.w a4, a5, 4
 # CHECK-ASM-AND-OBJ: pli.h a5, 5
-# CHECK-ASM: encoding: [0x9b,0xa7,0x02,0xb0]
+# CHECK-ASM: encoding: [0x9b,0x27,0x05,0xb0]
 pli.h a5, 5
 # CHECK-ASM-AND-OBJ: pli.w a5, 5
-# CHECK-ASM: encoding: [0x9b,0xa7,0x02,0xb2]
+# CHECK-ASM: encoding: [0x9b,0x27,0x05,0xb2]
 pli.w a5, 5
 # CHECK-ASM-AND-OBJ: pli.b a6, 6
 # CHECK-ASM: encoding: [0x1b,0x28,0x06,0xb4]
@@ -95,8 +95,8 @@ psabs.h t1, t5
 # CHECK-ASM: encoding: [0x1b,0x25,0x79,0xe4]
 psabs.b a0, s2
 # CHECK-ASM-AND-OBJ: plui.h s2, 4
-# CHECK-ASM: encoding: [0x1b,0x29,0x02,0xf0]
+# CHECK-ASM: encoding: [0x1b,0x29,0x04,0xf0]
 plui.h s2, 4
 # CHECK-ASM-AND-OBJ: plui.w a2, 1
-# CHECK-ASM: encoding: [0x1b,0xa6,0x00,0xf2]
+# CHECK-ASM: encoding: [0x1b,0x26,0x01,0xf2]
 plui.w a2, 1