[llvm] r326812 - [ValueTracking] move helpers for SelectPatterns from InstCombine to ValueTracking
Sanjay Patel via llvm-commits
llvm-commits at lists.llvm.org
Tue Mar 6 08:57:55 PST 2018
Author: spatel
Date: Tue Mar 6 08:57:55 2018
New Revision: 326812
URL: http://llvm.org/viewvc/llvm-project?rev=326812&view=rev
Log:
[ValueTracking] move helpers for SelectPatterns from InstCombine to ValueTracking
Most of the folds based on SelectPatternResult belong in InstSimplify rather than
InstCombine, so the helper code should be available to other passes/analysis.
Modified:
llvm/trunk/include/llvm/Analysis/ValueTracking.h
llvm/trunk/lib/Analysis/ValueTracking.cpp
llvm/trunk/lib/Transforms/InstCombine/InstCombineSelect.cpp
Modified: llvm/trunk/include/llvm/Analysis/ValueTracking.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Analysis/ValueTracking.h?rev=326812&r1=326811&r2=326812&view=diff
==============================================================================
--- llvm/trunk/include/llvm/Analysis/ValueTracking.h (original)
+++ llvm/trunk/include/llvm/Analysis/ValueTracking.h Tue Mar 6 08:57:55 2018
@@ -486,9 +486,9 @@ class Value;
/// fcmp; select, does the fcmp have to be
/// ordered?
- /// \brief Return true if \p SPF is a min or a max pattern.
+ /// Return true if \p SPF is a min or a max pattern.
static bool isMinOrMax(SelectPatternFlavor SPF) {
- return !(SPF == SPF_UNKNOWN || SPF == SPF_ABS || SPF == SPF_NABS);
+ return SPF != SPF_UNKNOWN && SPF != SPF_ABS && SPF != SPF_NABS;
}
};
@@ -521,6 +521,19 @@ class Value;
return Result;
}
+ /// Return the canonical comparison predicate for the specified
+ /// minimum/maximum flavor.
+ CmpInst::Predicate getMinMaxPred(SelectPatternFlavor SPF,
+ bool Ordered = false);
+
+ /// Return the inverse minimum/maximum flavor of the specified flavor.
+ /// For example, signed minimum is the inverse of signed maximum.
+ SelectPatternFlavor getInverseMinMaxFlavor(SelectPatternFlavor SPF);
+
+ /// Return the canonical inverse comparison predicate for the specified
+ /// minimum/maximum flavor.
+ CmpInst::Predicate getInverseMinMaxPred(SelectPatternFlavor SPF);
+
/// Return true if RHS is known to be implied true by LHS. Return false if
/// RHS is known to be implied false by LHS. Otherwise, return None if no
/// implication can be made.
Modified: llvm/trunk/lib/Analysis/ValueTracking.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Analysis/ValueTracking.cpp?rev=326812&r1=326811&r2=326812&view=diff
==============================================================================
--- llvm/trunk/lib/Analysis/ValueTracking.cpp (original)
+++ llvm/trunk/lib/Analysis/ValueTracking.cpp Tue Mar 6 08:57:55 2018
@@ -4661,6 +4661,30 @@ SelectPatternResult llvm::matchSelectPat
LHS, RHS, Depth);
}
+CmpInst::Predicate llvm::getMinMaxPred(SelectPatternFlavor SPF, bool Ordered) {
+ if (SPF == SPF_SMIN) return ICmpInst::ICMP_SLT;
+ if (SPF == SPF_UMIN) return ICmpInst::ICMP_ULT;
+ if (SPF == SPF_SMAX) return ICmpInst::ICMP_SGT;
+ if (SPF == SPF_UMAX) return ICmpInst::ICMP_UGT;
+ if (SPF == SPF_FMINNUM)
+ return Ordered ? FCmpInst::FCMP_OLT : FCmpInst::FCMP_ULT;
+ if (SPF == SPF_FMAXNUM)
+ return Ordered ? FCmpInst::FCMP_OGT : FCmpInst::FCMP_UGT;
+ llvm_unreachable("unhandled!");
+}
+
+SelectPatternFlavor llvm::getInverseMinMaxFlavor(SelectPatternFlavor SPF) {
+ if (SPF == SPF_SMIN) return SPF_SMAX;
+ if (SPF == SPF_UMIN) return SPF_UMAX;
+ if (SPF == SPF_SMAX) return SPF_SMIN;
+ if (SPF == SPF_UMAX) return SPF_UMIN;
+ llvm_unreachable("unhandled!");
+}
+
+CmpInst::Predicate llvm::getInverseMinMaxPred(SelectPatternFlavor SPF) {
+ return getMinMaxPred(getInverseMinMaxFlavor(SPF));
+}
+
/// Return true if "icmp Pred LHS RHS" is always true.
static bool isTruePredicate(CmpInst::Predicate Pred, const Value *LHS,
const Value *RHS, const DataLayout &DL,
Modified: llvm/trunk/lib/Transforms/InstCombine/InstCombineSelect.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/InstCombine/InstCombineSelect.cpp?rev=326812&r1=326811&r2=326812&view=diff
==============================================================================
--- llvm/trunk/lib/Transforms/InstCombine/InstCombineSelect.cpp (original)
+++ llvm/trunk/lib/Transforms/InstCombine/InstCombineSelect.cpp Tue Mar 6 08:57:55 2018
@@ -47,49 +47,10 @@ using namespace PatternMatch;
#define DEBUG_TYPE "instcombine"
-static SelectPatternFlavor
-getInverseMinMaxSelectPattern(SelectPatternFlavor SPF) {
- switch (SPF) {
- default:
- llvm_unreachable("unhandled!");
-
- case SPF_SMIN:
- return SPF_SMAX;
- case SPF_UMIN:
- return SPF_UMAX;
- case SPF_SMAX:
- return SPF_SMIN;
- case SPF_UMAX:
- return SPF_UMIN;
- }
-}
-
-static CmpInst::Predicate getCmpPredicateForMinMax(SelectPatternFlavor SPF,
- bool Ordered=false) {
- switch (SPF) {
- default:
- llvm_unreachable("unhandled!");
-
- case SPF_SMIN:
- return ICmpInst::ICMP_SLT;
- case SPF_UMIN:
- return ICmpInst::ICMP_ULT;
- case SPF_SMAX:
- return ICmpInst::ICMP_SGT;
- case SPF_UMAX:
- return ICmpInst::ICMP_UGT;
- case SPF_FMINNUM:
- return Ordered ? FCmpInst::FCMP_OLT : FCmpInst::FCMP_ULT;
- case SPF_FMAXNUM:
- return Ordered ? FCmpInst::FCMP_OGT : FCmpInst::FCMP_UGT;
- }
-}
-
-static Value *generateMinMaxSelectPattern(InstCombiner::BuilderTy &Builder,
- SelectPatternFlavor SPF, Value *A,
- Value *B) {
- CmpInst::Predicate Pred = getCmpPredicateForMinMax(SPF);
- assert(CmpInst::isIntPredicate(Pred));
+static Value *createMinMax(InstCombiner::BuilderTy &Builder,
+ SelectPatternFlavor SPF, Value *A, Value *B) {
+ CmpInst::Predicate Pred = getMinMaxPred(SPF);
+ assert(CmpInst::isIntPredicate(Pred) && "Expected integer predicate");
return Builder.CreateSelect(Builder.CreateICmp(Pred, A, B), A, B);
}
@@ -1059,10 +1020,10 @@ Instruction *InstCombiner::foldSPFofSPF(
if (!NotC)
NotC = Builder.CreateNot(C);
- Value *NewInner = generateMinMaxSelectPattern(
- Builder, getInverseMinMaxSelectPattern(SPF1), NotA, NotB);
- Value *NewOuter = Builder.CreateNot(generateMinMaxSelectPattern(
- Builder, getInverseMinMaxSelectPattern(SPF2), NewInner, NotC));
+ Value *NewInner = createMinMax(Builder, getInverseMinMaxFlavor(SPF1), NotA,
+ NotB);
+ Value *NewOuter = Builder.CreateNot(
+ createMinMax(Builder, getInverseMinMaxFlavor(SPF2), NewInner, NotC));
return replaceInstUsesWith(Outer, NewOuter);
}
@@ -1408,7 +1369,7 @@ static Instruction *factorizeMinMaxTree(
if (!MinMaxOp || !ThirdOp)
return nullptr;
- CmpInst::Predicate P = getCmpPredicateForMinMax(SPF);
+ CmpInst::Predicate P = getMinMaxPred(SPF);
Value *CmpABC = Builder.CreateICmp(P, MinMaxOp, ThirdOp);
return SelectInst::Create(CmpABC, MinMaxOp, ThirdOp);
}
@@ -1656,7 +1617,7 @@ Instruction *InstCombiner::visitSelectIn
(LHS->getType()->isFPOrFPVectorTy() &&
((CmpLHS != LHS && CmpLHS != RHS) ||
(CmpRHS != LHS && CmpRHS != RHS)))) {
- CmpInst::Predicate Pred = getCmpPredicateForMinMax(SPF, SPR.Ordered);
+ CmpInst::Predicate Pred = getMinMaxPred(SPF, SPR.Ordered);
Value *Cmp;
if (CmpInst::isIntPredicate(Pred)) {
@@ -1681,8 +1642,7 @@ Instruction *InstCombiner::visitSelectIn
Value *A, *B;
if (match(LHS, m_Not(m_Value(A))) && match(RHS, m_Not(m_Value(B))) &&
(LHS->getNumUses() <= 2 || RHS->getNumUses() <= 2)) {
- CmpInst::Predicate InvertedPred =
- getCmpPredicateForMinMax(getInverseMinMaxSelectPattern(SPF));
+ CmpInst::Predicate InvertedPred = getInverseMinMaxPred(SPF);
Value *InvertedCmp = Builder.CreateICmp(InvertedPred, A, B);
Value *NewSel = Builder.CreateSelect(InvertedCmp, A, B);
return BinaryOperator::CreateNot(NewSel);
More information about the llvm-commits
mailing list