Reuse the patterns from Zba for XAndesPerf lea instructions

Author: tclin914

llvm/lib/Target/RISCV/RISCVISelLowering.cpp

@@ -14628,8 +14628,8 @@ static SDValue combineBinOpToReduce(SDNode *N, SelectionDAG &DAG,
 //          (SLLI (SH*ADD x, y), c0), if c1-c0 equals to [1|2|3].
 static SDValue transformAddShlImm(SDNode *N, SelectionDAG &DAG,
                                   const RISCVSubtarget &Subtarget) {
-  // Perform this optimization only in the zba extension.
-  if (!Subtarget.hasStdExtZba())
+  // Perform this optimization only in the zba/xandesperf extension.
+  if (!Subtarget.hasStdExtZba() && !Subtarget.hasVendorXAndesPerf())
     return SDValue();
 
   // Skip for vector types and larger types.
@@ -15536,8 +15536,9 @@ static SDValue expandMul(SDNode *N, SelectionDAG &DAG,
   if (VT != Subtarget.getXLenVT())
     return SDValue();
 
-  const bool HasShlAdd =
-      Subtarget.hasStdExtZba() || Subtarget.hasVendorXTHeadBa();
+  const bool HasShlAdd = Subtarget.hasStdExtZba() ||
+                         Subtarget.hasVendorXTHeadBa() ||
+                         Subtarget.hasVendorXAndesPerf();
 
   ConstantSDNode *CNode = dyn_cast<ConstantSDNode>(N->getOperand(1));
   if (!CNode)

llvm/lib/Target/RISCV/RISCVInstrInfoXAndes.td

@@ -360,24 +360,28 @@ def NDS_SDGP  : NDSRVInstSDGP<0b111, "nds.sdgp">;
 // Patterns
 
 let Predicates = [HasVendorXAndesPerf] in {
-class NDS_LEAPat<int shamt, RVInstR Inst>
-    : Pat<(add (XLenVT GPR:$rs1), (shl GPR:$rs2, (XLenVT shamt))),
-          (Inst GPR:$rs1, GPR:$rs2)>;
 
-def : NDS_LEAPat<1, NDS_LEA_H>;
-def : NDS_LEAPat<2, NDS_LEA_W>;
-def : NDS_LEAPat<3, NDS_LEA_D>;
+defm : ShxAddPat<1, NDS_LEA_H>;
+defm : ShxAddPat<2, NDS_LEA_W>;
+defm : ShxAddPat<3, NDS_LEA_D>;
+
+def : CSImm12MulBy4Pat<NDS_LEA_W>;
+def : CSImm12MulBy8Pat<NDS_LEA_D>;
 } // Predicates = [HasVendorXAndesPerf]
 
 let Predicates = [HasVendorXAndesPerf, IsRV64] in {
-def : Pat<(add (XLenVT GPR:$rs1), (zexti32 (i64 GPR:$rs2))),
-          (NDS_LEA_B_ZE GPR:$rs1, GPR:$rs2)>;
 
-class NDS_LEA_ZEPat<int shamt, RVInstR Inst>
-    : Pat<(add GPR:$rs1, (shl (zexti32 (XLenVT GPR:$rs2)), (XLenVT shamt))),
-          (Inst GPR:$rs1, GPR:$rs2)>;
+defm : ADD_UWPat<NDS_LEA_B_ZE>;
+
+defm : ShxAdd_UWPat<1, NDS_LEA_H_ZE>;
+defm : ShxAdd_UWPat<2, NDS_LEA_W_ZE>;
+defm : ShxAdd_UWPat<3, NDS_LEA_D_ZE>;
+
+defm : Sh1Add_UWPat<NDS_LEA_H_ZE>;
+defm : Sh2Add_UWPat<NDS_LEA_W_ZE>;
+defm : Sh3Add_UWPat<NDS_LEA_D_ZE>;
 
-def : NDS_LEA_ZEPat<1, NDS_LEA_H_ZE>;
-def : NDS_LEA_ZEPat<2, NDS_LEA_W_ZE>;
-def : NDS_LEA_ZEPat<3, NDS_LEA_D_ZE>;
+def : Sh1AddPat<NDS_LEA_H_ZE>;
+def : Sh2AddPat<NDS_LEA_W_ZE>;
+def : Sh3AddPat<NDS_LEA_D_ZE>;
 } // Predicates = [HasVendorXAndesPerf, IsRV64]