[InstCombine] matchBSwapOrBitReverse - remove pattern matching early-out. NFCI.

recognizeBSwapOrBitReverseIdiom + collectBitParts have pattern matching to bail out early if a bswap/bitreverse pattern isn't possible - we should be able to rely on this instead without any notable change in compile time.

This is part of a cleanup towards letting matchBSwapOrBitReverse /recognizeBSwapOrBitReverseIdiom use 'root' instructions that aren't ORs (FSHL/FSHRs in particular which can be prematurely created).

Differential Revision: https://reviews.llvm.org/D97056
This commit is contained in:
Simon Pilgrim 2021-02-20 12:25:58 +00:00
parent 84dbcdd5ff
commit 609d0c9772
2 changed files with 4 additions and 38 deletions

View File

@ -1990,45 +1990,11 @@ Instruction *InstCombinerImpl::visitAnd(BinaryOperator &I) {
return nullptr;
}
Instruction *InstCombinerImpl::matchBSwapOrBitReverse(BinaryOperator &Or,
Instruction *InstCombinerImpl::matchBSwapOrBitReverse(Instruction &I,
bool MatchBSwaps,
bool MatchBitReversals) {
assert(Or.getOpcode() == Instruction::Or && "bswap requires an 'or'");
Value *Op0 = Or.getOperand(0), *Op1 = Or.getOperand(1);
// Look through zero extends.
if (Instruction *Ext = dyn_cast<ZExtInst>(Op0))
Op0 = Ext->getOperand(0);
if (Instruction *Ext = dyn_cast<ZExtInst>(Op1))
Op1 = Ext->getOperand(0);
// (A | B) | C and A | (B | C) -> bswap if possible.
bool OrWithOrs = match(Op0, m_Or(m_Value(), m_Value())) ||
match(Op1, m_Or(m_Value(), m_Value()));
// (A >> B) | C and (A << B) | C -> bswap if possible.
bool OrWithShifts = match(Op0, m_LogicalShift(m_Value(), m_Value())) ||
match(Op1, m_LogicalShift(m_Value(), m_Value()));
// (A & B) | C and A | (B & C) -> bswap if possible.
bool OrWithAnds = match(Op0, m_And(m_Value(), m_Value())) ||
match(Op1, m_And(m_Value(), m_Value()));
// fshl(A,B,C) | D and A | fshl(B,C,D) -> bswap if possible.
// fshr(A,B,C) | D and A | fshr(B,C,D) -> bswap if possible.
bool OrWithFunnels = match(Op0, m_FShl(m_Value(), m_Value(), m_Value())) ||
match(Op0, m_FShr(m_Value(), m_Value(), m_Value())) ||
match(Op0, m_FShl(m_Value(), m_Value(), m_Value())) ||
match(Op0, m_FShr(m_Value(), m_Value(), m_Value()));
// TODO: Do we need all these filtering checks or should we just rely on
// recognizeBSwapOrBitReverseIdiom + collectBitParts to reject them quickly?
if (!OrWithOrs && !OrWithShifts && !OrWithAnds && !OrWithFunnels)
return nullptr;
SmallVector<Instruction *, 4> Insts;
if (!recognizeBSwapOrBitReverseIdiom(&Or, MatchBSwaps, MatchBitReversals,
if (!recognizeBSwapOrBitReverseIdiom(&I, MatchBSwaps, MatchBitReversals,
Insts))
return nullptr;
Instruction *LastInst = Insts.pop_back_val();

View File

@ -715,10 +715,10 @@ public:
Instruction *PromoteCastOfAllocation(BitCastInst &CI, AllocaInst &AI);
bool mergeStoreIntoSuccessor(StoreInst &SI);
/// Given an 'or' instruction, check to see if it is part of a
/// Given an initial instruction, check to see if it is the root of a
/// bswap/bitreverse idiom. If so, return the equivalent bswap/bitreverse
/// intrinsic.
Instruction *matchBSwapOrBitReverse(BinaryOperator &Or, bool MatchBSwaps,
Instruction *matchBSwapOrBitReverse(Instruction &I, bool MatchBSwaps,
bool MatchBitReversals);
Instruction *SimplifyAnyMemTransfer(AnyMemTransferInst *MI);