mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2025-07-25 13:24:46 +00:00
Re-apply the infamous r108614, with a fix pointed out by Dirk Steinke.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@110036 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
@@ -472,6 +472,22 @@ Value *InstCombiner::FoldAndOfICmps(ICmpInst *LHS, ICmpInst *RHS) {
|
||||
Value *NewOr = Builder->CreateOr(Val, Val2);
|
||||
return Builder->CreateICmp(LHSCC, NewOr, LHSCst);
|
||||
}
|
||||
|
||||
// (icmp ne (A & C1), 0) & (icmp ne (A & C2), 0) -->
|
||||
// (icmp eq (A & (C1|C2)), (C1|C2)) where C1 and C2 are non-zero POT
|
||||
if (LHSCC == ICmpInst::ICMP_NE && LHSCst->isZero()) {
|
||||
Value *Op1 = 0, *Op2 = 0;
|
||||
ConstantInt *CI1 = 0, *CI2 = 0;
|
||||
if (match(LHS->getOperand(0), m_And(m_Value(Op1), m_ConstantInt(CI1))) &&
|
||||
match(RHS->getOperand(0), m_And(m_Value(Op2), m_ConstantInt(CI2)))) {
|
||||
if (Op1 == Op2 && !CI1->isZero() && !CI2->isZero() &&
|
||||
CI1->getValue().isPowerOf2() && CI2->getValue().isPowerOf2()) {
|
||||
Constant *ConstOr = ConstantExpr::getOr(CI1, CI2);
|
||||
Value *NewAnd = Builder->CreateAnd(Op1, ConstOr);
|
||||
return Builder->CreateICmp(ICmpInst::ICMP_EQ, NewAnd, ConstOr);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// From here on, we only handle:
|
||||
@@ -1151,11 +1167,28 @@ Value *InstCombiner::FoldOrOfICmps(ICmpInst *LHS, ICmpInst *RHS) {
|
||||
ConstantInt *RHSCst = dyn_cast<ConstantInt>(RHS->getOperand(1));
|
||||
if (LHSCst == 0 || RHSCst == 0) return 0;
|
||||
|
||||
// (icmp ne A, 0) | (icmp ne B, 0) --> (icmp ne (A|B), 0)
|
||||
if (LHSCst == RHSCst && LHSCC == RHSCC &&
|
||||
LHSCC == ICmpInst::ICMP_NE && LHSCst->isZero()) {
|
||||
Value *NewOr = Builder->CreateOr(Val, Val2);
|
||||
return Builder->CreateICmp(LHSCC, NewOr, LHSCst);
|
||||
if (LHSCst == RHSCst && LHSCC == RHSCC) {
|
||||
// (icmp ne A, 0) | (icmp ne B, 0) --> (icmp ne (A|B), 0)
|
||||
if (LHSCC == ICmpInst::ICMP_NE && LHSCst->isZero()) {
|
||||
Value *NewOr = Builder->CreateOr(Val, Val2);
|
||||
return Builder->CreateICmp(LHSCC, NewOr, LHSCst);
|
||||
}
|
||||
|
||||
// (icmp eq (A & C1), 0) | (icmp eq (A & C2), 0) -->
|
||||
// (icmp ne (A & (C1|C2)), (C1|C2)) where C1 and C2 are non-zero POT
|
||||
if (LHSCC == ICmpInst::ICMP_EQ && LHSCst->isZero()) {
|
||||
Value *Op1 = 0, *Op2 = 0;
|
||||
ConstantInt *CI1 = 0, *CI2 = 0;
|
||||
if (match(LHS->getOperand(0), m_And(m_Value(Op1), m_ConstantInt(CI1))) &&
|
||||
match(RHS->getOperand(0), m_And(m_Value(Op2), m_ConstantInt(CI2)))) {
|
||||
if (Op1 == Op2 && !CI1->isZero() && !CI2->isZero() &&
|
||||
CI1->getValue().isPowerOf2() && CI2->getValue().isPowerOf2()) {
|
||||
Constant *ConstOr = ConstantExpr::getOr(CI1, CI2);
|
||||
Value *NewAnd = Builder->CreateAnd(Op1, ConstOr);
|
||||
return Builder->CreateICmp(ICmpInst::ICMP_NE, NewAnd, ConstOr);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// From here on, we only handle:
|
||||
|
Reference in New Issue
Block a user