6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-02-08 21:32:39 +00:00
Code Issues Projects Releases Wiki Activity

Use IRBuilder instead of ConstantInt methods.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@183360 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Jakub Staszak 2013-06-06 00:37:23 +00:00
parent 384ceb8446
commit f2d03d74ff
1 changed files with 17 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
lib/Transforms/InstCombine/InstCombineAndOrXor.cpp
View File

@ -209,8 +209,7 @@ Instruction *InstCombiner::OptAndOp(Instruction *Op,
uint32_t BitWidth = AndRHS->getType()->getBitWidth(); uint32_t BitWidth = AndRHS->getType()->getBitWidth();
uint32_t OpRHSVal = OpRHS->getLimitedValue(BitWidth); uint32_t OpRHSVal = OpRHS->getLimitedValue(BitWidth);
APInt ShlMask(APInt::getHighBitsSet(BitWidth, BitWidth-OpRHSVal)); APInt ShlMask(APInt::getHighBitsSet(BitWidth, BitWidth-OpRHSVal));
ConstantInt *CI = ConstantInt::get(AndRHS->getContext(), ConstantInt *CI = Builder->getInt(AndRHS->getValue() & ShlMask);
AndRHS->getValue() & ShlMask);
if (CI->getValue() == ShlMask) if (CI->getValue() == ShlMask)
// Masking out bits that the shift already masks. // Masking out bits that the shift already masks.
@ -230,8 +229,7 @@ Instruction *InstCombiner::OptAndOp(Instruction *Op,
uint32_t BitWidth = AndRHS->getType()->getBitWidth(); uint32_t BitWidth = AndRHS->getType()->getBitWidth();
uint32_t OpRHSVal = OpRHS->getLimitedValue(BitWidth); uint32_t OpRHSVal = OpRHS->getLimitedValue(BitWidth);
APInt ShrMask(APInt::getLowBitsSet(BitWidth, BitWidth - OpRHSVal)); APInt ShrMask(APInt::getLowBitsSet(BitWidth, BitWidth - OpRHSVal));
ConstantInt *CI = ConstantInt::get(Op->getContext(), ConstantInt *CI = Builder->getInt(AndRHS->getValue() & ShrMask);
AndRHS->getValue() & ShrMask);
if (CI->getValue() == ShrMask) if (CI->getValue() == ShrMask)
// Masking out bits that the shift already masks. // Masking out bits that the shift already masks.
@ -251,8 +249,7 @@ Instruction *InstCombiner::OptAndOp(Instruction *Op,
uint32_t BitWidth = AndRHS->getType()->getBitWidth(); uint32_t BitWidth = AndRHS->getType()->getBitWidth();
uint32_t OpRHSVal = OpRHS->getLimitedValue(BitWidth); uint32_t OpRHSVal = OpRHS->getLimitedValue(BitWidth);
APInt ShrMask(APInt::getLowBitsSet(BitWidth, BitWidth - OpRHSVal)); APInt ShrMask(APInt::getLowBitsSet(BitWidth, BitWidth - OpRHSVal));
Constant *C = ConstantInt::get(Op->getContext(), Constant *C = Builder->getInt(AndRHS->getValue() & ShrMask);
AndRHS->getValue() & ShrMask);
if (C == AndRHS) { // Masking out bits shifted in. if (C == AndRHS) { // Masking out bits shifted in.
// (Val ashr C1) & C2 -> (Val lshr C1) & C2 // (Val ashr C1) & C2 -> (Val lshr C1) & C2
// Make the argument unsigned. // Make the argument unsigned.
@ -279,7 +276,7 @@ Value *InstCombiner::InsertRangeTest(Value *V, Constant *Lo, Constant *Hi,
if (Inside) { if (Inside) {
if (Lo == Hi) // Trivially false. if (Lo == Hi) // Trivially false.
return ConstantInt::getFalse(V->getContext()); return Builder->getFalse();
// V >= Min && V < Hi --> V < Hi // V >= Min && V < Hi --> V < Hi
if (cast<ConstantInt>(Lo)->isMinValue(isSigned)) { if (cast<ConstantInt>(Lo)->isMinValue(isSigned)) {
@ -296,7 +293,7 @@ Value *InstCombiner::InsertRangeTest(Value *V, Constant *Lo, Constant *Hi,
} }
if (Lo == Hi) // Trivially true. if (Lo == Hi) // Trivially true.
return ConstantInt::getTrue(V->getContext()); return Builder->getTrue();
// V < Min || V >= Hi -> V > Hi-1 // V < Min || V >= Hi -> V > Hi-1
Hi = SubOne(cast<ConstantInt>(Hi)); Hi = SubOne(cast<ConstantInt>(Hi));
@ -943,7 +940,7 @@ Value *InstCombiner::FoldAndOfFCmps(FCmpInst *LHS, FCmpInst *RHS) {
// If either of the constants are nans, then the whole thing returns // If either of the constants are nans, then the whole thing returns
// false. // false.
if (LHSC->getValueAPF().isNaN() || RHSC->getValueAPF().isNaN()) if (LHSC->getValueAPF().isNaN() || RHSC->getValueAPF().isNaN())
return ConstantInt::getFalse(LHS->getContext()); return Builder->getFalse();
return Builder->CreateFCmpORD(LHS->getOperand(0), RHS->getOperand(0)); return Builder->CreateFCmpORD(LHS->getOperand(0), RHS->getOperand(0));
} }
@ -1588,7 +1585,7 @@ Value *InstCombiner::FoldOrOfICmps(ICmpInst *LHS, ICmpInst *RHS) {
case ICmpInst::ICMP_NE: // (X != 13 | X != 15) -> true case ICmpInst::ICMP_NE: // (X != 13 | X != 15) -> true
case ICmpInst::ICMP_ULT: // (X != 13 | X u< 15) -> true case ICmpInst::ICMP_ULT: // (X != 13 | X u< 15) -> true
case ICmpInst::ICMP_SLT: // (X != 13 | X s< 15) -> true case ICmpInst::ICMP_SLT: // (X != 13 | X s< 15) -> true
return ConstantInt::getTrue(LHS->getContext()); return Builder->getTrue();
} }
case ICmpInst::ICMP_ULT: case ICmpInst::ICMP_ULT:
switch (RHSCC) { switch (RHSCC) {
@ -1640,7 +1637,7 @@ Value *InstCombiner::FoldOrOfICmps(ICmpInst *LHS, ICmpInst *RHS) {
break; break;
case ICmpInst::ICMP_NE: // (X u> 13 | X != 15) -> true case ICmpInst::ICMP_NE: // (X u> 13 | X != 15) -> true
case ICmpInst::ICMP_ULT: // (X u> 13 | X u< 15) -> true case ICmpInst::ICMP_ULT: // (X u> 13 | X u< 15) -> true
return ConstantInt::getTrue(LHS->getContext()); return Builder->getTrue();
case ICmpInst::ICMP_SLT: // (X u> 13 | X s< 15) -> no change case ICmpInst::ICMP_SLT: // (X u> 13 | X s< 15) -> no change
break; break;
} }
@ -1655,7 +1652,7 @@ Value *InstCombiner::FoldOrOfICmps(ICmpInst *LHS, ICmpInst *RHS) {
break; break;
case ICmpInst::ICMP_NE: // (X s> 13 | X != 15) -> true case ICmpInst::ICMP_NE: // (X s> 13 | X != 15) -> true
case ICmpInst::ICMP_SLT: // (X s> 13 | X s< 15) -> true case ICmpInst::ICMP_SLT: // (X s> 13 | X s< 15) -> true
return ConstantInt::getTrue(LHS->getContext()); return Builder->getTrue();
case ICmpInst::ICMP_ULT: // (X s> 13 | X u< 15) -> no change case ICmpInst::ICMP_ULT: // (X s> 13 | X u< 15) -> no change
break; break;
} }
@ -1676,7 +1673,7 @@ Value *InstCombiner::FoldOrOfFCmps(FCmpInst *LHS, FCmpInst *RHS) {
// If either of the constants are nans, then the whole thing returns // If either of the constants are nans, then the whole thing returns
// true. // true.
if (LHSC->getValueAPF().isNaN() || RHSC->getValueAPF().isNaN()) if (LHSC->getValueAPF().isNaN() || RHSC->getValueAPF().isNaN())
return ConstantInt::getTrue(LHS->getContext()); return Builder->getTrue();
// Otherwise, no need to compare the two constants, compare the // Otherwise, no need to compare the two constants, compare the
// rest. // rest.
@ -1779,8 +1776,7 @@ Instruction *InstCombiner::visitOr(BinaryOperator &I) {
Value *Or = Builder->CreateOr(X, RHS); Value *Or = Builder->CreateOr(X, RHS);
Or->takeName(Op0); Or->takeName(Op0);
return BinaryOperator::CreateAnd(Or, return BinaryOperator::CreateAnd(Or,
ConstantInt::get(I.getContext(), Builder->getInt(RHS->getValue() | C1->getValue()));
RHS->getValue() | C1->getValue()));
} }
// (X ^ C1) | C2 --> (X | C2) ^ (C1&~C2) // (X ^ C1) | C2 --> (X | C2) ^ (C1&~C2)
@ -1789,8 +1785,7 @@ Instruction *InstCombiner::visitOr(BinaryOperator &I) {
Value *Or = Builder->CreateOr(X, RHS); Value *Or = Builder->CreateOr(X, RHS);
Or->takeName(Op0); Or->takeName(Op0);
return BinaryOperator::CreateXor(Or, return BinaryOperator::CreateXor(Or,
ConstantInt::get(I.getContext(), Builder->getInt(C1->getValue() & ~RHS->getValue()));
C1->getValue() & ~RHS->getValue()));
} }
// Try to fold constant and into select arguments. // Try to fold constant and into select arguments.
@ -1872,15 +1867,13 @@ Instruction *InstCombiner::visitOr(BinaryOperator &I) {
((V1 == B && MaskedValueIsZero(V2, ~C1->getValue())) || // (V|N) ((V1 == B && MaskedValueIsZero(V2, ~C1->getValue())) || // (V|N)
(V2 == B && MaskedValueIsZero(V1, ~C1->getValue())))) // (N|V) (V2 == B && MaskedValueIsZero(V1, ~C1->getValue())))) // (N|V)
return BinaryOperator::CreateAnd(A, return BinaryOperator::CreateAnd(A,
ConstantInt::get(A->getContext(), Builder->getInt(C1->getValue()|C2->getValue()));
C1->getValue()|C2->getValue()));
// Or commutes, try both ways. // Or commutes, try both ways.
if (match(B, m_Or(m_Value(V1), m_Value(V2))) && if (match(B, m_Or(m_Value(V1), m_Value(V2))) &&
((V1 == A && MaskedValueIsZero(V2, ~C2->getValue())) || // (V|N) ((V1 == A && MaskedValueIsZero(V2, ~C2->getValue())) || // (V|N)
(V2 == A && MaskedValueIsZero(V1, ~C2->getValue())))) // (N|V) (V2 == A && MaskedValueIsZero(V1, ~C2->getValue())))) // (N|V)
return BinaryOperator::CreateAnd(B, return BinaryOperator::CreateAnd(B,
ConstantInt::get(B->getContext(), Builder->getInt(C1->getValue()|C2->getValue()));
C1->getValue()|C2->getValue()));
// ((V|C3)&C1) | ((V|C4)&C2) --> (V|C3|C4)&(C1|C2) // ((V|C3)&C1) | ((V|C4)&C2) --> (V|C3|C4)&(C1|C2)
// iff (C1&C2) == 0 and (C3&~C1) == 0 and (C4&~C2) == 0. // iff (C1&C2) == 0 and (C3&~C1) == 0 and (C4&~C2) == 0.
@ -1891,8 +1884,7 @@ Instruction *InstCombiner::visitOr(BinaryOperator &I) {
(C4->getValue() & ~C2->getValue()) == 0) { (C4->getValue() & ~C2->getValue()) == 0) {
V2 = Builder->CreateOr(V1, ConstantExpr::getOr(C3, C4), "bitfield"); V2 = Builder->CreateOr(V1, ConstantExpr::getOr(C3, C4), "bitfield");
return BinaryOperator::CreateAnd(V2, return BinaryOperator::CreateAnd(V2,
ConstantInt::get(B->getContext(), Builder->getInt(C1->getValue()|C2->getValue()));
C1->getValue()|C2->getValue()));
} }
} }
} }
@ -2160,8 +2152,7 @@ Instruction *InstCombiner::visitXor(BinaryOperator &I) {
if (CI->hasOneUse() && Op0C->hasOneUse()) { if (CI->hasOneUse() && Op0C->hasOneUse()) {
Instruction::CastOps Opcode = Op0C->getOpcode(); Instruction::CastOps Opcode = Op0C->getOpcode();
if ((Opcode == Instruction::ZExt || Opcode == Instruction::SExt) && if ((Opcode == Instruction::ZExt || Opcode == Instruction::SExt) &&
(RHS == ConstantExpr::getCast(Opcode, (RHS == ConstantExpr::getCast(Opcode, Builder->getTrue(),
ConstantInt::getTrue(I.getContext()),
Op0C->getDestTy()))) { Op0C->getDestTy()))) {
CI->setPredicate(CI->getInversePredicate()); CI->setPredicate(CI->getInversePredicate());
return CastInst::Create(Opcode, CI, Op0C->getType()); return CastInst::Create(Opcode, CI, Op0C->getType());
@ -2191,8 +2182,7 @@ Instruction *InstCombiner::visitXor(BinaryOperator &I) {
Op0I->getOperand(0)); Op0I->getOperand(0));
} else if (RHS->getValue().isSignBit()) { } else if (RHS->getValue().isSignBit()) {
// (X + C) ^ signbit -> (X + C + signbit) // (X + C) ^ signbit -> (X + C + signbit)
Constant *C = ConstantInt::get(I.getContext(), Constant *C = Builder->getInt(RHS->getValue() + Op0CI->getValue());
RHS->getValue() + Op0CI->getValue());
return BinaryOperator::CreateAdd(Op0I->getOperand(0), C); return BinaryOperator::CreateAdd(Op0I->getOperand(0), C);
} }