[VPlan/PM] Introduce m_ConstantInt

Author: artagnon

llvm/lib/Transforms/Vectorize/VPlanPatternMatch.h

@@ -199,8 +199,26 @@ struct apint_match {
   }
 };
 
-/// Match an APInt, capturing it if we match.
-inline apint_match m_APInt(const APInt *&C) { return C; }
+struct bind_const_intval_ty {
+  uint64_t &VR;
+
+  bind_const_intval_ty(uint64_t &V) : VR(V) {}
+
+  template <typename ITy> bool match(ITy *V) const {
+    const APInt *ConstInt;
+    if (!apint_match(ConstInt).match(V))
+      return false;
+    if (auto C = ConstInt->tryZExtValue()) {
+      VR = *C;
+      return true;
+    }
+    return false;
+  }
+};
+
+/// Match a plain integer constant no wider than 64-bits, capturing it if we
+/// match.
+inline bind_const_intval_ty m_ConstantInt(uint64_t &C) { return C; }
 
 /// Matching combinators
 template <typename LTy, typename RTy> struct match_combine_or {

llvm/lib/Transforms/Vectorize/VPlanTransforms.cpp

@@ -1592,11 +1592,11 @@ static bool tryToReplaceALMWithWideALM(VPlan &Plan, ElementCount VF,
           m_ActiveLaneMask(m_VPValue(Index), m_VPValue(), m_VPValue()));
     assert(Index && "Expected index from ActiveLaneMask instruction");
 
-    const APInt *Part;
+    uint64_t Part;
     if (match(Index,
               m_VPInstruction<VPInstruction::CanonicalIVIncrementForPart>(
-                  m_VPValue(), m_APInt(Part))))
-      Phis[Part->getZExtValue()] = Phi;
+                  m_VPValue(), m_ConstantInt(Part))))
+      Phis[Part] = Phi;
     else
       // Anything other than a CanonicalIVIncrementForPart is part 0
       Phis[0] = Phi;