Address review comments and add i64 bounds tests

Author: dtellenbach

llvm/lib/Target/AArch64/AArch64ISelDAGToDAG.cpp

@@ -508,7 +508,6 @@ class AArch64DAGToDAGISel : public SelectionDAGISel {
   bool SelectAllActivePredicate(SDValue N);
   bool SelectAnyPredicate(SDValue N);
 
-  template <int Bits>
   bool SelectCmpBranchUImm6Operand(SDNode *P, SDValue N, SDValue &Imm);
 };
 
@@ -7493,14 +7492,10 @@ bool AArch64DAGToDAGISel::SelectSMETileSlice(SDValue N, unsigned MaxSize,
   return true;
 }
 
-template <int Bits>
 bool AArch64DAGToDAGISel::SelectCmpBranchUImm6Operand(SDNode *P, SDValue N,
                                                       SDValue &Imm) {
-  ConstantSDNode *C = dyn_cast<ConstantSDNode>(P->getOperand(1));
-  if (!C)
-    return false;
-
-  AArch64CC::CondCode CC = static_cast<AArch64CC::CondCode>(C->getZExtValue());
+  AArch64CC::CondCode CC =
+      static_cast<AArch64CC::CondCode>(P->getConstantOperandVal(1));
   if (auto *CN = dyn_cast<ConstantSDNode>(N)) {
     // Check conservatively if the immediate fits the valid range [0, 64).
     // Immediate variants for GE and HS definitely need to be decremented
@@ -7538,8 +7533,7 @@ bool AArch64DAGToDAGISel::SelectCmpBranchUImm6Operand(SDNode *P, SDValue N,
     if (CN->getAPIntValue().uge(LowerBound) &&
         CN->getAPIntValue().ult(UpperBound)) {
       SDLoc DL(N);
-      Imm = CurDAG->getTargetConstant(CN->getZExtValue(), DL,
-                                      Bits == 32 ? MVT::i32 : MVT::i64);
+      Imm = CurDAG->getTargetConstant(CN->getZExtValue(), DL, N.getValueType());
       return true;
     }
   }

llvm/lib/Target/AArch64/AArch64InstrFormats.td

@@ -401,16 +401,12 @@ def uimm6_32b : Operand<i32>, ImmLeaf<i32, [{ return Imm >= 0 && Imm < 64; }]> {
 }
 
 def CmpBranchUImm6Operand_32b
-    : Operand<i32>,
-      ComplexPattern<i32, 1, "SelectCmpBranchUImm6Operand<32>"> {
-  let ParserMatchClass = UImm6Operand;
+    : ComplexPattern<i32, 1, "SelectCmpBranchUImm6Operand", [imm]> {
   let WantsParent = true;
 }
 
 def CmpBranchUImm6Operand_64b
-    : Operand<i64>,
-      ComplexPattern<i64, 1, "SelectCmpBranchUImm6Operand<64>"> {
-  let ParserMatchClass = UImm6Operand;
+    : ComplexPattern<i64, 1, "SelectCmpBranchUImm6Operand", [imm]> {
   let WantsParent = true;
 }