RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-24 03:33:20 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
Reviewed By: sdesmalen

Differential Revision: https://reviews.llvm.org/D105978
This commit is contained in:
Dylan Fleming 2021-07-23 10:51:54 +01:00
parent 1d7a6567dd
commit 8a94b4239a
2 changed files with 30 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
include/llvm/IR/PatternMatch.h
View File

@ -2421,14 +2421,6 @@ inline InsertValue_match<Ind, Val_t, Elt_t> m_InsertValue(const Val_t &Val,
/// `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) {}
@ -2436,12 +2428,16 @@ public:
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));
auto *DerefTy = GEP->getSourceElementType();
if (isa<ScalableVectorType>(DerefTy) &&
DL.getTypeAllocSizeInBits(DerefTy).getKnownMinSize() == 8)
return true;
Value *Ptr;
if (m_PtrToInt(m_Value(Ptr)).match(V)) {
if (auto *GEP = dyn_cast<GEPOperator>(Ptr)) {
auto *DerefTy = GEP->getSourceElementType();
if (GEP->getNumIndices() == 1 && isa<ScalableVectorType>(DerefTy) &&
m_Zero().match(GEP->getPointerOperand()) &&
m_SpecificInt(1).match(GEP->idx_begin()->get()) &&
DL.getTypeAllocSizeInBits(DerefTy).getKnownMinSize() == 8)
return true;
}
}
return false;

20
unittests/IR/PatternMatch.cpp
View File

@ -1636,6 +1636,26 @@ TEST_F(PatternMatchTest, InsertValue) {
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 = VecTy->getPointerTo();
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)));
// Prior to this patch, this case would cause assertion failures when attempting to match m_VScale
Type *VecTy2 = ScalableVectorType::get(IRB.getInt8Ty(), 2);
Value *NullPtrVec2 = Constant::getNullValue(VecTy2->getPointerTo());
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*>,