maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Fix PR1333 

Testcases :
http://lists.cs.uiuc.edu/pipermail/llvm-commits/Week-of-Mon-20070507/049451.html
http://lists.cs.uiuc.edu/pipermail/llvm-commits/Week-of-Mon-20070507/049452.html

llvm-svn: 36955
This commit is contained in:
Devang Patel 2007-05-09 08:24:12 +00:00
parent 00a08d129e
commit 9557247412
1 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
llvm/lib/Transforms/Scalar/LoopUnswitch.cpp
View File

@ -396,7 +396,7 @@ BasicBlock *LoopUnswitch::SplitBlock(BasicBlock *Old, Instruction *SplitPt) {
// The new block lives in whichever loop the old one did. // The new block lives in whichever loop the old one did.
if (Loop *L = LI->getLoopFor(Old)) if (Loop *L = LI->getLoopFor(Old))
L->addBasicBlockToLoop(New, *LI); L->addBasicBlockToLoop(New, *LI);
return New; return New;
} }
@ -413,8 +413,30 @@ BasicBlock *LoopUnswitch::SplitEdge(BasicBlock *BB, BasicBlock *Succ) {
} }
// If this is a critical edge, let SplitCriticalEdge do it. // If this is a critical edge, let SplitCriticalEdge do it.
if (SplitCriticalEdge(BB->getTerminator(), SuccNum, this)) Loop *OrigDestBBL = LI->getLoopFor(BB->getTerminator()->getSuccessor(SuccNum));
return LatchTerm->getSuccessor(SuccNum); if (SplitCriticalEdge(BB->getTerminator(), SuccNum)) {
BasicBlock *NewBB = LatchTerm->getSuccessor(SuccNum);
Loop *BBL = LI->getLoopFor(BB);
if (!BBL || !OrigDestBBL)
return NewBB;
// If edge is inside a loop then NewBB is part of same loop.
if (BBL == OrigDestBBL)
BBL->addBasicBlockToLoop(NewBB, *LI);
// If edge is entering loop then NewBB is part of outer loop.
else if (BBL->contains(OrigDestBBL->getHeader()))
BBL->addBasicBlockToLoop(NewBB, *LI);
// If edge is from an inner loop to outer loop then NewBB is part
// of outer loop.
else if (OrigDestBBL->contains(BBL->getHeader()))
OrigDestBBL->addBasicBlockToLoop(NewBB, *LI);
// Else edge is connecting two loops and NewBB is part of their parent loop
else if (Loop *PL = OrigDestBBL->getParentLoop())
PL->addBasicBlockToLoop(NewBB, *LI);
return NewBB;
}
// If the edge isn't critical, then BB has a single successor or Succ has a // If the edge isn't critical, then BB has a single successor or Succ has a
// single pred. Split the block. // single pred. Split the block.
@ -571,8 +593,6 @@ void LoopUnswitch::UnswitchNontrivialCondition(Value *LIC, Constant *Val,
std::vector<BasicBlock*> Preds(pred_begin(ExitBlock), pred_end(ExitBlock)); std::vector<BasicBlock*> Preds(pred_begin(ExitBlock), pred_end(ExitBlock));
for (unsigned j = 0, e = Preds.size(); j != e; ++j) { for (unsigned j = 0, e = Preds.size(); j != e; ++j) {
assert(L->contains(Preds[j]) &&
"All preds of loop exit blocks must be the same loop!");
BasicBlock* MiddleBlock = SplitEdge(Preds[j], ExitBlock); BasicBlock* MiddleBlock = SplitEdge(Preds[j], ExitBlock);
BasicBlock* StartBlock = Preds[j]; BasicBlock* StartBlock = Preds[j];
BasicBlock* EndBlock; BasicBlock* EndBlock;