[SVE][IR] Fix Binary op matching in PatternMatch::m_VScale

[sdesmalen]

I'm surprised how we've never hit this until now. Mostly looks good to me, just a few nits.

llvm/include/llvm/IR/PatternMatch.h

2435

nit: can you make this: GEP->getNumIndices() == 1?

2438

nit: please move this condition earlier, so that a simple condition that's likely to evaluate to false, is evaluated first.

llvm/unittests/IR/PatternMatch.cpp

1640

nit: unnecessary newline

1645

You can write VecTy->getPointerTo() and remove VecPtrTy.

1651

Same comment as above, you can write VecTy2->getPointerTo()

[DylanFleming-arm]

Restructured if statment

Cleaned up code:
Removed unneeded newline
Changed PointerType::get() to ->getPointerType()

[sdesmalen]

llvm/unittests/IR/PatternMatch.cpp

1649

nit: Can you add a comment saying that this used to cause an assertion-failure before this patch?

llvm/include/llvm/IR/PatternMatch.h

inline InsertValue_match<Ind, Val_t, Elt_t> m_InsertValue(const Val_t &Val,
   return InsertValue_match<Ind, Val_t, Elt_t>(Val, Elt);
 }
 
 /// Matches patterns for `vscale`. This can either be a call to `llvm.vscale` or
 /// the constant expression
 ///  `ptrtoint(gep <vscale x 1 x i8>, <vscale x 1 x i8>* null, i32 1>`
 /// under the right conditions determined by DataLayout.
 struct VScaleVal_match {
-private:
-  template <typename Base, typename Offset>
-  inline BinaryOp_match<Base, Offset, Instruction::GetElementPtr>
-  m_OffsetGep(const Base &B, const Offset &O) {
-    return BinaryOp_match<Base, Offset, Instruction::GetElementPtr>(B, O);
-  }
-
-public:
   const DataLayout &DL;
   VScaleVal_match(const DataLayout &DL) : DL(DL) {}
 
   template <typename ITy> bool match(ITy *V) {
     if (m_Intrinsic<Intrinsic::vscale>().match(V))
       return true;
 
-    if (m_PtrToInt(m_OffsetGep(m_Zero(), m_SpecificInt(1))).match(V)) {
-      auto *GEP = cast<GEPOperator>(cast<Operator>(V)->getOperand(0));
+    Value *Ptr;
+    if (m_PtrToInt(m_Value(Ptr)).match(V)) {
+      if (auto *GEP = dyn_cast<GEPOperator>(Ptr)) {
         auto *DerefTy = GEP->getSourceElementType();
-      if (isa<ScalableVectorType>(DerefTy) &&
+        if (GEP->getNumOperands() == 2 &&
+            m_Zero().match(GEP->getPointerOperand()) &&
+            m_SpecificInt(1).match(GEP->idx_begin()->get()) &&
+            isa<ScalableVectorType>(DerefTy) &&
             DL.getTypeAllocSizeInBits(DerefTy).getKnownMinSize() == 8)
           return true;
       }
+    }
 
     return false;
   }
 };
 
 inline VScaleVal_match m_VScale(const DataLayout &DL) {
   return VScaleVal_match(DL);
 }

llvm/unittests/IR/PatternMatch.cpp

TEST_F(PatternMatchTest, InsertValue) {
   EXPECT_FALSE(match(Ins0, m_InsertValue<0>(m_Undef(), m_SpecificInt(0))));
 
   EXPECT_TRUE(
       match(Ins1, m_InsertValue<1>(m_InsertValue<0>(m_Value(), m_Value()),
                                    m_SpecificInt(90))));
   EXPECT_FALSE(match(IRB.getInt64(99), m_InsertValue<0>(m_Value(), m_Value())));
 }
 
+TEST_F(PatternMatchTest, VScale) {
+
+  DataLayout DL = M->getDataLayout();
+
+  Type *VecTy = ScalableVectorType::get(IRB.getInt8Ty(), 1);
+  Type *VecPtrTy = PointerType::get(VecTy, 0);
+  Value *NullPtrVec = Constant::getNullValue(VecPtrTy);
+  Value *GEP = IRB.CreateGEP(VecTy, NullPtrVec, IRB.getInt64(1));
+  Value *PtrToInt = IRB.CreatePtrToInt(GEP, DL.getIntPtrType(GEP->getType()));
+  EXPECT_TRUE(match(PtrToInt, m_VScale(DL)));
+
+  Type *VecTy2 = ScalableVectorType::get(IRB.getInt8Ty(), 2);
+  Type *VecPtrTy2 = PointerType::get(VecTy2, 0);
+  Value *NullPtrVec2 = Constant::getNullValue(VecPtrTy2);
+  Value *BitCast = IRB.CreateBitCast(NullPtrVec2, VecPtrTy);
+  Value *GEP2 = IRB.CreateGEP(VecTy, BitCast, IRB.getInt64(1));
+  Value *PtrToInt2 =
+      IRB.CreatePtrToInt(GEP2, DL.getIntPtrType(GEP2->getType()));
+  EXPECT_FALSE(match(PtrToInt2, m_VScale(DL)));
+}
+
 template <typename T> struct MutableConstTest : PatternMatchTest { };
 
 typedef ::testing::Types<std::tuple<Value*, Instruction*>,
                          std::tuple<const Value*, const Instruction *>>
     MutableConstTestTypes;
 TYPED_TEST_SUITE(MutableConstTest, MutableConstTestTypes, );
 
 TYPED_TEST(MutableConstTest, ICmp) {