6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-08-09 11:25:55 +00:00
Code Issues Projects Releases Wiki Activity

revert 131605 to fix PR9946.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@131620 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Rafael Espindola
2011-05-19 02:26:30 +00:00
parent 21803721d5
commit 216dde91d1
1 changed files with 31 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
lib/Transforms/Utils/SimplifyCFG.cpp
View File

@@ -835,7 +835,7 @@ static bool isSafeToHoistInvoke(BasicBlock *BB1, BasicBlock *BB2,
/// HoistThenElseCodeToIf - Given a conditional branch that goes to BB1 and /// HoistThenElseCodeToIf - Given a conditional branch that goes to BB1 and
/// BB2, hoist any common code in the two blocks up into the branch block. The /// BB2, hoist any common code in the two blocks up into the branch block. The
/// caller of this function guarantees that BI's block dominates BB1 and BB2. /// caller of this function guarantees that BI's block dominates BB1 and BB2.
static bool HoistThenElseCodeToIf(BranchInst *BI, IRBuilder<> &Builder) { static bool HoistThenElseCodeToIf(BranchInst *BI) {
// This does very trivial matching, with limited scanning, to find identical // This does very trivial matching, with limited scanning, to find identical
// instructions in the two blocks. In particular, we don't want to get into // instructions in the two blocks. In particular, we don't want to get into
// O(M*N) situations here where M and N are the sizes of BB1 and BB2. As // O(M*N) situations here where M and N are the sizes of BB1 and BB2. As
@@ -908,7 +908,6 @@ HoistTerminator:
NT->takeName(I1); NT->takeName(I1);
} }
Builder.SetInsertPoint(NT);
// Hoisting one of the terminators from our successor is a great thing. // Hoisting one of the terminators from our successor is a great thing.
// Unfortunately, the successors of the if/else blocks may have PHI nodes in // Unfortunately, the successors of the if/else blocks may have PHI nodes in
// them. If they do, all PHI entries for BB1/BB2 must agree for all PHI // them. If they do, all PHI entries for BB1/BB2 must agree for all PHI
@@ -925,11 +924,11 @@ HoistTerminator:
// These values do not agree. Insert a select instruction before NT // These values do not agree. Insert a select instruction before NT
// that determines the right value. // that determines the right value.
SelectInst *&SI = InsertedSelects[std::make_pair(BB1V, BB2V)]; SelectInst *&SI = InsertedSelects[std::make_pair(BB1V, BB2V)];
if (SI == 0) if (SI == 0) {
SI = cast<SelectInst> SI = SelectInst::Create(BI->getCondition(), BB1V, BB2V,
(Builder.CreateSelect(BI->getCondition(), BB1V, BB2V, BB1V->getName()+"."+BB2V->getName(), NT);
BB1V->getName()+"."+BB2V->getName())); SI->setDebugLoc(BI->getDebugLoc());
}
// Make the PHI node use the select for all incoming values for BB1/BB2 // Make the PHI node use the select for all incoming values for BB1/BB2
for (unsigned i = 0, e = PN->getNumIncomingValues(); i != e; ++i) for (unsigned i = 0, e = PN->getNumIncomingValues(); i != e; ++i)
if (PN->getIncomingBlock(i) == BB1 || PN->getIncomingBlock(i) == BB2) if (PN->getIncomingBlock(i) == BB1 || PN->getIncomingBlock(i) == BB2)
@@ -949,8 +948,7 @@ HoistTerminator:
/// and an BB2 and the only successor of BB1 is BB2, hoist simple code /// and an BB2 and the only successor of BB1 is BB2, hoist simple code
/// (for now, restricted to a single instruction that's side effect free) from /// (for now, restricted to a single instruction that's side effect free) from
/// the BB1 into the branch block to speculatively execute it. /// the BB1 into the branch block to speculatively execute it.
static bool SpeculativelyExecuteBB(BranchInst *BI, BasicBlock *BB1, static bool SpeculativelyExecuteBB(BranchInst *BI, BasicBlock *BB1) {
IRBuilder<> &Builder) {
// Only speculatively execution a single instruction (not counting the // Only speculatively execution a single instruction (not counting the
// terminator) for now. // terminator) for now.
Instruction *HInst = NULL; Instruction *HInst = NULL;
@@ -1088,16 +1086,14 @@ static bool SpeculativelyExecuteBB(BranchInst *BI, BasicBlock *BB1,
// Create a select whose true value is the speculatively executed value and // Create a select whose true value is the speculatively executed value and
// false value is the previously determined FalseV. // false value is the previously determined FalseV.
Builder.SetInsertPoint(BI);
SelectInst *SI; SelectInst *SI;
if (Invert) if (Invert)
SI = cast<SelectInst> SI = SelectInst::Create(BrCond, FalseV, HInst,
(Builder.CreateSelect(BrCond, FalseV, HInst, FalseV->getName() + "." + HInst->getName(), BI);
FalseV->getName() + "." + HInst->getName()));
else else
SI = cast<SelectInst> SI = SelectInst::Create(BrCond, HInst, FalseV,
(Builder.CreateSelect(BrCond, HInst, FalseV, HInst->getName() + "." + FalseV->getName(), BI);
HInst->getName() + "." + FalseV->getName())); SI->setDebugLoc(BI->getDebugLoc());
// Make the PHI node use the select for all incoming values for "then" and // Make the PHI node use the select for all incoming values for "then" and
// "if" blocks. // "if" blocks.
@@ -1464,7 +1460,6 @@ static bool SimplifyCondBranchToTwoReturns(BranchInst *BI,
/// the predecessor and use logical operations to pick the right destination. /// the predecessor and use logical operations to pick the right destination.
bool llvm::FoldBranchToCommonDest(BranchInst *BI) { bool llvm::FoldBranchToCommonDest(BranchInst *BI) {
BasicBlock *BB = BI->getParent(); BasicBlock *BB = BI->getParent();
Instruction *Cond = dyn_cast<Instruction>(BI->getCondition()); Instruction *Cond = dyn_cast<Instruction>(BI->getCondition());
if (Cond == 0 || (!isa<CmpInst>(Cond) && !isa<BinaryOperator>(Cond)) || if (Cond == 0 || (!isa<CmpInst>(Cond) && !isa<BinaryOperator>(Cond)) ||
Cond->getParent() != BB || !Cond->hasOneUse()) Cond->getParent() != BB || !Cond->hasOneUse())
@@ -1585,8 +1580,7 @@ bool llvm::FoldBranchToCommonDest(BranchInst *BI) {
} }
DEBUG(dbgs() << "FOLDING BRANCH TO COMMON DEST:\n" << *PBI << *BB); DEBUG(dbgs() << "FOLDING BRANCH TO COMMON DEST:\n" << *PBI << *BB);
IRBuilder<> Builder(PBI);
// If we need to invert the condition in the pred block to match, do so now. // If we need to invert the condition in the pred block to match, do so now.
if (InvertPredCond) { if (InvertPredCond) {
Value *NewCond = PBI->getCondition(); Value *NewCond = PBI->getCondition();
@@ -1595,8 +1589,8 @@ bool llvm::FoldBranchToCommonDest(BranchInst *BI) {
CmpInst *CI = cast<CmpInst>(NewCond); CmpInst *CI = cast<CmpInst>(NewCond);
CI->setPredicate(CI->getInversePredicate()); CI->setPredicate(CI->getInversePredicate());
} else { } else {
NewCond = Builder.CreateNot(NewCond, NewCond = BinaryOperator::CreateNot(NewCond,
PBI->getCondition()->getName()+".not"); PBI->getCondition()->getName()+".not", PBI);
} }
PBI->setCondition(NewCond); PBI->setCondition(NewCond);
@@ -1623,9 +1617,9 @@ bool llvm::FoldBranchToCommonDest(BranchInst *BI) {
New->takeName(Cond); New->takeName(Cond);
Cond->setName(New->getName()+".old"); Cond->setName(New->getName()+".old");
Instruction *NewCond = Instruction *NewCond = BinaryOperator::Create(Opc, PBI->getCondition(),
cast<Instruction>(Builder.CreateBinOp(Opc, PBI->getCondition(), New, "or.cond", PBI);
New, "or.cond")); NewCond->setDebugLoc(PBI->getDebugLoc());
PBI->setCondition(NewCond); PBI->setCondition(NewCond);
if (PBI->getSuccessor(0) == BB) { if (PBI->getSuccessor(0) == BB) {
AddPredecessorToBlock(TrueDest, PredBlock, BB); AddPredecessorToBlock(TrueDest, PredBlock, BB);
@@ -1768,22 +1762,23 @@ static bool SimplifyCondBranchToCondBranch(BranchInst *PBI, BranchInst *BI) {
} }
DEBUG(dbgs() << *PBI->getParent()->getParent()); DEBUG(dbgs() << *PBI->getParent()->getParent());
// BI may have other predecessors. Because of this, we leave // BI may have other predecessors. Because of this, we leave
// it alone, but modify PBI. // it alone, but modify PBI.
// Make sure we get to CommonDest on True&True directions. // Make sure we get to CommonDest on True&True directions.
Value *PBICond = PBI->getCondition(); Value *PBICond = PBI->getCondition();
IRBuilder<> Builder(PBI);
if (PBIOp) if (PBIOp)
PBICond = Builder.CreateNot(PBICond, PBICond->getName()+".not"); PBICond = BinaryOperator::CreateNot(PBICond,
PBICond->getName()+".not",
PBI);
Value *BICond = BI->getCondition(); Value *BICond = BI->getCondition();
if (BIOp) if (BIOp)
BICond = Builder.CreateNot(BICond, BICond->getName()+".not"); BICond = BinaryOperator::CreateNot(BICond,
BICond->getName()+".not",
PBI);
// Merge the conditions. // Merge the conditions.
Value *Cond = Builder.CreateOr(PBICond, BICond, "brmerge"); Value *Cond = BinaryOperator::CreateOr(PBICond, BICond, "brmerge", PBI);
// Modify PBI to branch on the new condition to the new dests. // Modify PBI to branch on the new condition to the new dests.
PBI->setCondition(Cond); PBI->setCondition(Cond);
@@ -1806,8 +1801,8 @@ static bool SimplifyCondBranchToCondBranch(BranchInst *PBI, BranchInst *BI) {
Value *PBIV = PN->getIncomingValue(PBBIdx); Value *PBIV = PN->getIncomingValue(PBBIdx);
if (BIV != PBIV) { if (BIV != PBIV) {
// Insert a select in PBI to pick the right value. // Insert a select in PBI to pick the right value.
Value *NV = cast<SelectInst> Value *NV = SelectInst::Create(PBICond, PBIV, BIV,
(Builder.CreateSelect(PBICond, PBIV, BIV, PBIV->getName()+".mux")); PBIV->getName()+".mux", PBI);
PN->setIncomingValue(PBBIdx, NV); PN->setIncomingValue(PBBIdx, NV);
} }
} }
@@ -2590,7 +2585,7 @@ bool SimplifyCFGOpt::SimplifyCondBranch(BranchInst *BI, IRBuilder<> &Builder) {
// can hoist it up to the branching block. // can hoist it up to the branching block.
if (BI->getSuccessor(0)->getSinglePredecessor() != 0) { if (BI->getSuccessor(0)->getSinglePredecessor() != 0) {
if (BI->getSuccessor(1)->getSinglePredecessor() != 0) { if (BI->getSuccessor(1)->getSinglePredecessor() != 0) {
if (HoistThenElseCodeToIf(BI, Builder)) if (HoistThenElseCodeToIf(BI))
return SimplifyCFG(BB) | true; return SimplifyCFG(BB) | true;
} else { } else {
// If Successor #1 has multiple preds, we may be able to conditionally // If Successor #1 has multiple preds, we may be able to conditionally
@@ -2598,7 +2593,7 @@ bool SimplifyCFGOpt::SimplifyCondBranch(BranchInst *BI, IRBuilder<> &Builder) {
TerminatorInst *Succ0TI = BI->getSuccessor(0)->getTerminator(); TerminatorInst *Succ0TI = BI->getSuccessor(0)->getTerminator();
if (Succ0TI->getNumSuccessors() == 1 && if (Succ0TI->getNumSuccessors() == 1 &&
Succ0TI->getSuccessor(0) == BI->getSuccessor(1)) Succ0TI->getSuccessor(0) == BI->getSuccessor(1))
if (SpeculativelyExecuteBB(BI, BI->getSuccessor(0), Builder)) if (SpeculativelyExecuteBB(BI, BI->getSuccessor(0)))
return SimplifyCFG(BB) | true; return SimplifyCFG(BB) | true;
} }
} else if (BI->getSuccessor(1)->getSinglePredecessor() != 0) { } else if (BI->getSuccessor(1)->getSinglePredecessor() != 0) {
@@ -2607,7 +2602,7 @@ bool SimplifyCFGOpt::SimplifyCondBranch(BranchInst *BI, IRBuilder<> &Builder) {
TerminatorInst *Succ1TI = BI->getSuccessor(1)->getTerminator(); TerminatorInst *Succ1TI = BI->getSuccessor(1)->getTerminator();
if (Succ1TI->getNumSuccessors() == 1 && if (Succ1TI->getNumSuccessors() == 1 &&
Succ1TI->getSuccessor(0) == BI->getSuccessor(0)) Succ1TI->getSuccessor(0) == BI->getSuccessor(0))
if (SpeculativelyExecuteBB(BI, BI->getSuccessor(1), Builder)) if (SpeculativelyExecuteBB(BI, BI->getSuccessor(1)))
return SimplifyCFG(BB) | true; return SimplifyCFG(BB) | true;
} }