address comments

Author: realqhc

llvm/lib/Target/RISCV/RISCVInstrInfoXCV.td

@@ -675,49 +675,15 @@ def CV_HI5: SDNodeXForm<imm, [{
                                    N->getValueType(0));
 }]>;
 
-def between : PatFrags<(ops node:$lowerBound, node:$upperBound, node:$value),
-                       [(smin (smax node:$value, node:$lowerBound), node:$upperBound),
-                        (smax (smin node:$value, node:$upperBound), node:$lowerBound)]>;
-
-def betweenu : PatFrags<(ops node:$upperBound, node:$value),
-                        [(smin (smax node:$value, 0), node:$upperBound),
-                         (smax (smin node:$value, node:$upperBound), 0)]>;
 def powerOf2 : ImmLeaf<XLenVT, [{ return isPowerOf2_32(Imm); }]>;
 def powerOf2Minus1 : ImmLeaf<XLenVT, [{ return isPowerOf2_32(Imm+1); }]>;
 def negativePowerOf2 : ImmLeaf<XLenVT, [{ return isPowerOf2_32(-Imm); }]>;
-def roundBit : PatFrag<(ops node:$shiftAmount),
-                       (srl (shl 1, node:$shiftAmount), (XLenVT 1))>;
 def trailing1sPlus1 : SDNodeXForm<imm, [{
   return CurDAG->getTargetConstant(
                           llvm::countr_one(N->getZExtValue()) + 1,
                           SDLoc(N), N->getValueType(0));
 }]>;
 
-def shiftRound : PatFrag<(ops node:$value, node:$shiftAmount),
-                         (sra (add node:$value, powerOf2), node:$shiftAmount), [{
-  if (auto powerOf2 = dyn_cast<ConstantSDNode>(N->getOperand(0)->getOperand(1)))
-    return (powerOf2->getZExtValue() << 1) == (1U << N->getConstantOperandVal(1));
-  return false;
-}]>;
-
-def ushiftRound : PatFrag<(ops node:$value, node:$shiftAmount),
-                          (srl (add node:$value, powerOf2), node:$shiftAmount), [{
-  if (auto powerOf2 = dyn_cast<ConstantSDNode>(N->getOperand(0)->getOperand(1)))
-    return (powerOf2->getZExtValue() << 1) == (1U << N->getConstantOperandVal(1));
-  return false;
-}]>;
-
-def clip : PatFrag<(ops node:$upperBound, node:$value),
-                   (between negativePowerOf2, node:$upperBound, node:$value), [{
-  // Checking lower & upper bound for the clip instruction
-  if (auto bound1 = dyn_cast<ConstantSDNode>(N->getOperand(0)->getOperand(1))) {
-    if (auto bound2 = dyn_cast<ConstantSDNode>(N->getOperand(1))) {
-      return (bound1->getSExtValue() == ~bound2->getSExtValue());
-    }
-  }
-  return false;
-}]>;
-
 multiclass PatCoreVBitManip<Intrinsic intr> {
   def : PatGprGpr<intr, !cast<RVInst>("CV_" # NAME # "R")>;
   def : Pat<(intr GPR:$rs1, cv_uimm10:$imm),
@@ -750,29 +716,28 @@ let Predicates = [HasVendorXCVbitmanip, IsRV32] in {
   def : Pat<(bitreverse (XLenVT GPR:$rs)), (CV_BITREV GPR:$rs, 0, 0)>;
 }
 
-class PatCoreVAluGpr <string intr, string asm> :
+class PatCoreVAluGpr<string intr, string asm> :
   PatGpr<!cast<Intrinsic>("int_riscv_cv_alu_" # intr),
             !cast<RVInst>("CV_" # asm)>;
 class PatCoreVAluGprGpr <string intr, string asm> :
   PatGprGpr<!cast<Intrinsic>("int_riscv_cv_alu_" # intr),
                !cast<RVInst>("CV_" # asm)>;
 
-multiclass PatCoreVAluGprImm <Intrinsic intr> {
+multiclass PatCoreVAluGprImm<Intrinsic intr> {
   def : PatGprGpr<intr, !cast<RVInst>("CV_" # NAME # "R")>;
   def : Pat<(intr (XLenVT GPR:$rs1), powerOf2Minus1:$upperBound),
             (!cast<RVInst>("CV_" # NAME) GPR:$rs1,
             (trailing1sPlus1 imm:$upperBound))>;
 }
 
-multiclass PatCoreVAluGprGprImm <Intrinsic intr> {
+multiclass PatCoreVAluGprGprImm<Intrinsic intr> {
   def : Pat<(intr GPR:$rs1, GPR:$rs2, GPR:$rs3),
             (!cast<RVInst>("CV_" # NAME # "R") GPR:$rs1, GPR:$rs2, GPR:$rs3)>;
   def : Pat<(intr GPR:$rs1, GPR:$rs2, uimm5:$imm),
             (!cast<RVInst>("CV_" # NAME) GPR:$rs1, GPR:$rs2, uimm5:$imm)>;
 }
 
 let Predicates = [HasVendorXCValu, IsRV32], AddedComplexity = 1 in {
-  def : PatGpr<abs, CV_ABS>;
   def : PatGprGpr<setle, CV_SLET>;
   def : PatGprGpr<setule, CV_SLETU>;
   def : PatGprGpr<smin, CV_MIN>;
@@ -783,9 +748,6 @@ let Predicates = [HasVendorXCValu, IsRV32], AddedComplexity = 1 in {
   def : Pat<(sext_inreg (XLenVT GPR:$rs1), i16), (CV_EXTHS GPR:$rs1)>;
   def : Pat<(sext_inreg (XLenVT GPR:$rs1), i8), (CV_EXTBS GPR:$rs1)>;
 
-  def : Pat<(and (XLenVT GPR:$rs1), 0xffff), (CV_EXTHZ GPR:$rs1)>;
-  def : Pat<(and (XLenVT GPR:$rs1), 0xff),   (CV_EXTBZ GPR:$rs1)>;
-
   defm CLIP   : PatCoreVAluGprImm<int_riscv_cv_alu_clip>;
   defm CLIPU  : PatCoreVAluGprImm<int_riscv_cv_alu_clipu>;
   defm ADDN   : PatCoreVAluGprGprImm<int_riscv_cv_alu_addn>;