6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-01-12 17:32:19 +00:00
Code Issues Projects Releases Wiki Activity

Change m_ConstantInt and m_SelectCst to take their constant integers

Browse Source 
as template arguments instead of as instance variables, exposing more
optimization opportunities to the compiler earlier.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@61776 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chris Lattner 2009-01-05 23:53:12 +00:00
parent 06ebbcc71d
commit 159c35b3ee
2 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
include/llvm/Support/PatternMatch.h
View File

@ -51,10 +51,8 @@ inline leaf_ty<Value> m_Value() { return leaf_ty<Value>(); }
/// m_ConstantInt() - Match an arbitrary ConstantInt and ignore it.
inline leaf_ty<ConstantInt> m_ConstantInt() { return leaf_ty<ConstantInt>(); }
template<int64_t Val>
struct constantint_ty {
int64_t Val;
explicit constantint_ty(int64_t val) : Val(val) {}
template<typename ITy>
bool match(ITy *V) {
if (const ConstantInt *CI = dyn_cast<ConstantInt>(V)) {
@ -72,8 +70,9 @@ struct constantint_ty {
/// m_ConstantInt(int64_t) - Match a ConstantInt with a specific value
/// and ignore it.
inline constantint_ty m_ConstantInt(int64_t Val) {
return constantint_ty(Val);
template<int64_t Val>
inline constantint_ty<Val> m_ConstantInt() {
return constantint_ty<Val>();
}
struct zero_ty {
@ -393,12 +392,12 @@ m_Select(const Cond &C, const LHS &L, const RHS &R) {
/// m_SelectCst - This matches a select of two constants, e.g.:
/// m_SelectCst(m_Value(V), -1, 0)
template<typename Cond>
inline SelectClass_match<Cond, constantint_ty, constantint_ty>
m_SelectCst(const Cond &C, int64_t L, int64_t R) {
return SelectClass_match<Cond, constantint_ty,
constantint_ty>(C, m_ConstantInt(L),
m_ConstantInt(R));
template<int64_t L, int64_t R, typename Cond>
inline SelectClass_match<Cond, constantint_ty<L>, constantint_ty<R> >
m_SelectCst(const Cond &C) {
return SelectClass_match<Cond, constantint_ty<L>,
constantint_ty<R> >(C, m_ConstantInt<L>(),
m_ConstantInt<R>());
}

18
lib/Transforms/Scalar/InstructionCombining.cpp
View File

@ -4276,18 +4276,18 @@ static Instruction *MatchSelectFromAndOr(Value *A, Value *B,
Value *C, Value *D) {
// If A is not a select of -1/0, this cannot match.
Value *Cond = 0;
if (!match(A, m_SelectCst(m_Value(Cond), -1, 0)))
if (!match(A, m_SelectCst<-1, 0>(m_Value(Cond))))
return 0;
// ((cond?-1:0)&C) | (B&(cond?0:-1)) -> cond ? C : B.
if (match(D, m_SelectCst(m_Specific(Cond), 0, -1)))
if (match(D, m_SelectCst<0, -1>(m_Specific(Cond))))
return SelectInst::Create(Cond, C, B);
if (match(D, m_Not(m_SelectCst(m_Specific(Cond), -1, 0))))
if (match(D, m_Not(m_SelectCst<-1, 0>(m_Specific(Cond)))))
return SelectInst::Create(Cond, C, B);
// ((cond?-1:0)&C) | ((cond?0:-1)&D) -> cond ? C : D.
if (match(B, m_SelectCst(m_Specific(Cond), 0, -1)))
if (match(B, m_SelectCst<0, -1>(m_Specific(Cond))))
return SelectInst::Create(Cond, C, D);
if (match(B, m_Not(m_SelectCst(m_Specific(Cond), -1, 0))))
if (match(B, m_Not(m_SelectCst<-1, 0>(m_Specific(Cond)))))
return SelectInst::Create(Cond, C, D);
return 0;
}
@ -8713,11 +8713,11 @@ Instruction *InstCombiner::visitSelectInstWithICmp(SelectInst &SI,
// (x <s 0) ? -1 : 0 -> ashr x, 31 -> all ones if signed
// (x >s -1) ? -1 : 0 -> ashr x, 31 -> all ones if not signed
CmpInst::Predicate Pred = CmpInst::BAD_ICMP_PREDICATE;
if (match(TrueVal, m_ConstantInt(-1)) &&
match(FalseVal, m_ConstantInt(0)))
if (match(TrueVal, m_ConstantInt<-1>()) &&
match(FalseVal, m_ConstantInt<0>()))
Pred = ICI->getPredicate();
else if (match(TrueVal, m_ConstantInt(0)) &&
match(FalseVal, m_ConstantInt(-1)))
else if (match(TrueVal, m_ConstantInt<0>()) &&
match(FalseVal, m_ConstantInt<-1>()))
Pred = CmpInst::getInversePredicate(ICI->getPredicate());
if (Pred != CmpInst::BAD_ICMP_PREDICATE) {