[LLVM][XTHeadVector] Add new pseudoinstructions from T-Head upstream (l…

…lvm#47) * [LLVM][XTHeadVector] Add 5 assembly pseudoinstructions for XTheadVector extension. Reference: XUANTIE-RV/thead-extension-spec@2420d05 * [LLVM][XTHeadVector] Test 5 assembly pseudoinstructions for XTheadVector extension.
revyos · Apr 3, 2024 · 56a0f16 · 56a0f16
1 parent 08c566b
commit 56a0f16
Show file tree

Hide file tree

Showing 2 changed files with 52 additions and 2 deletions.
diff --git a/llvm/lib/Target/RISCV/RISCVInstrInfoXTHeadV.td b/llvm/lib/Target/RISCV/RISCVInstrInfoXTHeadV.td
@@ -465,8 +465,8 @@ defm TH_VSRA_V : VSHT_IV_V_X_I<"th.vsra", 0b101001>;
 // 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" in {
-defm TH_VNSRL_W : TH_VNSHT_IV_V_X_I<"th.vnsrl", 0b101100>;
-defm TH_VNSRA_W : TH_VNSHT_IV_V_X_I<"th.vnsra", 0b101101>;
+defm TH_VNSRL_V : TH_VNSHT_IV_V_X_I<"th.vnsrl", 0b101100>;
+defm TH_VNSRA_V : TH_VNSHT_IV_V_X_I<"th.vnsra", 0b101101>;
 } // Constraints = "@earlyclobber $vd"
 
 // Vector Integer Comparison Instructions
@@ -970,6 +970,30 @@ def : InstAlias<"th.vmset.m $vd",
 def : InstAlias<"th.vmnot.m $vd, $vs",
                 (TH_VMNAND_MM VR:$vd, VR:$vs, VR:$vs)>;
 
+// TODO: Pseudo or InstAlias?
+// From XTHeadVector spec:
+// https://github.com/T-head-Semi/thead-extension-spec/blob/master/xtheadvector.adoc
+// Beyond the instructions and pseudo instructions in the referenced specification,
+// the following additional pseudo instructions are defined in order to improve compatibility with RVV 1.0:
+//   th.vmmv.m vd,v          => th.vmand.mm vd,vs,vs
+//   th.vneg.v vd,vs         => th.vrsub.vx vd,vs,x0
+//   th.vncvt.x.x.v vd,vs,vm => th.vnsrl.vx vd,vs,x0,vm
+//   th.vfneg.v vd,vs        => th.vfsgnjn.vv vd,vs,vs
+//   th.vfabs.v vd,vs        => th.vfsgnjx.vv vd,vs,vs
+
+// Note: DO NOT "Emit" `th.vmmv.m` (the 0 for the third argument) in printed assembly.
+// As `th.vmcpy.m` also expands to `th.vmand.mm`, we need clarification from T-Head.
+def : InstAlias<"th.vmmv.m $vd, $vs",
+                (TH_VMAND_MM VR:$vd, VR:$vs, VR:$vs), 0>;
+def : InstAlias<"th.vneg.v $vd, $vs",
+                (TH_VRSUB_VX VR:$vd, VR:$vs, X0, zero_reg)>;
+def : InstAlias<"th.vncvt.x.x.v $vd, $vs$vm",
+                (TH_VNSRL_VX VR:$vd, VR:$vs, X0, VMaskOp:$vm)>;
+def : InstAlias<"th.vfneg.v $vd, $vs",
+                (TH_VFSGNJN_VV VR:$vd, VR:$vs, VR:$vs, zero_reg)>;
+def : InstAlias<"th.vfabs.v $vd, $vs",
+                (TH_VFSGNJX_VV VR:$vd, VR:$vs, VR:$vs, zero_reg)>;
+
 } // Predicates = [HasVendorXTHeadV]
 
 include "RISCVInstrInfoXTHeadVPseudos.td"
diff --git a/llvm/test/MC/RISCV/rvv0p71/xtheadvector-pseudos.s b/llvm/test/MC/RISCV/rvv0p71/xtheadvector-pseudos.s
@@ -0,0 +1,26 @@
+# RUN: llvm-mc -triple=riscv64 -show-encoding --mattr=+f,+a,+xtheadvector,+xtheadzvamo %s \
+# RUN:        | FileCheck %s --check-prefixes=CHECK-ENCODING,CHECK-INST
+
+th.vmmv.m v4, v8
+# CHECK-INST: th.vmcpy.m v4, v8
+# CHECK-ENCODING: [0x57,0x22,0x84,0x66]
+
+th.vneg.v v4, v8
+# CHECK-INST: th.vneg.v v4, v8
+# CHECK-ENCODING: [0x57,0x42,0x80,0x0e]
+
+th.vncvt.x.x.v v4, v8
+# CHECK-INST: th.vnsrl.vx v4, v8, zero
+# CHECK-ENCODING: [0x57,0x42,0x80,0xb2]
+
+th.vncvt.x.x.v v4, v8, v0.t
+# CHECK-INST: th.vncvt.x.x.v v4, v8, v0.t
+# CHECK-ENCODING: [0x57,0x42,0x80,0xb0]
+
+th.vfneg.v v4, v8
+# CHECK-INST: th.vfneg.v v4, v8
+# CHECK-ENCODING: [0x57,0x12,0x84,0x26]
+
+th.vfabs.v v4, v8
+# CHECK-INST: th.vfabs.v v4, v8
+# CHECK-ENCODING: [0x57,0x12,0x84,0x2a]