From: Duncan Sands Date: Mon, 7 Feb 2011 09:36:32 +0000 (+0000) Subject: Add an m_Div pattern for matching either a udiv or an sdiv and use it X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=163a84bbce69947aa314760e6068c704fc0df7a0;p=oota-llvm.git Add an m_Div pattern for matching either a udiv or an sdiv and use it to simplify the "(X/Y)*Y->X when the division is exact" transform. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@125004 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/include/llvm/Support/PatternMatch.h b/include/llvm/Support/PatternMatch.h index cb94fe5f6ec..2d5ca8e3cf0 100644 --- a/include/llvm/Support/PatternMatch.h +++ b/include/llvm/Support/PatternMatch.h @@ -346,6 +346,40 @@ inline Shr_match m_Shr(const LHS &L, const RHS &R) { return Shr_match(L, R); } +//===----------------------------------------------------------------------===// +// Matchers for either SDiv or UDiv .. for convenience +// +template +struct Div_match { + LHS_t L; + RHS_t R; + + Div_match(const LHS_t &LHS, const RHS_t &RHS) : L(LHS), R(RHS) {} + + template + bool match(OpTy *V) { + if (V->getValueID() == Value::InstructionVal + Instruction::SDiv || + V->getValueID() == Value::InstructionVal + Instruction::UDiv) { + ConcreteTy *I = cast(V); + return (I->getOpcode() == Instruction::UDiv || + I->getOpcode() == Instruction::SDiv) && + L.match(I->getOperand(0)) && + R.match(I->getOperand(1)); + } + if (ConstantExpr *CE = dyn_cast(V)) + return (CE->getOpcode() == Instruction::SDiv || + CE->getOpcode() == Instruction::UDiv) && + L.match(CE->getOperand(0)) && + R.match(CE->getOperand(1)); + return false; + } +}; + +template +inline Div_match m_Div(const LHS &L, const RHS &R) { + return Div_match(L, R); +} + //===----------------------------------------------------------------------===// // Matchers for binary classes // diff --git a/lib/Analysis/InstructionSimplify.cpp b/lib/Analysis/InstructionSimplify.cpp index 7bb8f699928..2b217e14468 100644 --- a/lib/Analysis/InstructionSimplify.cpp +++ b/lib/Analysis/InstructionSimplify.cpp @@ -734,10 +734,8 @@ static Value *SimplifyMulInst(Value *Op0, Value *Op1, const TargetData *TD, // (X / Y) * Y -> X if the division is exact. Value *X = 0, *Y = 0; - if ((match(Op0, m_SDiv(m_Value(X), m_Value(Y))) && Y == Op1) || // (X / Y) * Y - (match(Op0, m_UDiv(m_Value(X), m_Value(Y))) && Y == Op1) || - (match(Op1, m_SDiv(m_Value(X), m_Value(Y))) && Y == Op0) || // Y * (X / Y) - (match(Op1, m_UDiv(m_Value(X), m_Value(Y))) && Y == Op0)) { + if ((match(Op0, m_Div(m_Value(X), m_Value(Y))) && Y == Op1) || // (X / Y) * Y + (match(Op1, m_Div(m_Value(X), m_Value(Y))) && Y == Op0)) { // Y * (X / Y) BinaryOperator *Div = cast(Y == Op1 ? Op0 : Op1); if (Div->isExact()) return X;