Changes in directory llvm/lib/Transforms/Scalar:
LoopUnswitch.cpp updated: 1.8 -> 1.9 --- Log message: Simplify control flow a bit, note that unswitch preserves canonical loop form --- Diffs of the changes: (+12 -10) LoopUnswitch.cpp | 22 ++++++++++++---------- 1 files changed, 12 insertions(+), 10 deletions(-) Index: llvm/lib/Transforms/Scalar/LoopUnswitch.cpp diff -u llvm/lib/Transforms/Scalar/LoopUnswitch.cpp:1.8 llvm/lib/Transforms/Scalar/LoopUnswitch.cpp:1.9 --- llvm/lib/Transforms/Scalar/LoopUnswitch.cpp:1.8 Thu Feb 9 14:15:48 2006 +++ llvm/lib/Transforms/Scalar/LoopUnswitch.cpp Thu Feb 9 16:15:42 2006 @@ -59,12 +59,13 @@ /// virtual void getAnalysisUsage(AnalysisUsage &AU) const { AU.addRequiredID(LoopSimplifyID); + AU.addPreservedID(LoopSimplifyID); AU.addRequired<LoopInfo>(); AU.addPreserved<LoopInfo>(); } private: - void VersionLoop(Value *LIC, Loop *L); + void VersionLoop(Value *LIC, Loop *L, Loop *&Out1, Loop *&Out2); BasicBlock *SplitBlock(BasicBlock *BB, bool SplitAtTop); void RewriteLoopBodyWithConditionConstant(Loop *L, Value *LIC, bool Val); }; @@ -172,11 +173,13 @@ } //std::cerr << "BEFORE:\n"; LI->dump(); - VersionLoop(BI->getCondition(), L); + Loop *First = 0, *Second = 0; + VersionLoop(BI->getCondition(), L, First, Second); //std::cerr << "AFTER:\n"; LI->dump(); - // FIXME: Why return here? What if we have: - // "for () { if (iv1) { if (iv2) { } } }" ? + // Try to unswitch each of our new loops now! + if (First) visitLoop(First); + if (Second) visitLoop(Second); return true; } @@ -247,8 +250,9 @@ /// VersionLoop - We determined that the loop is profitable to unswitch and /// contains a branch on a loop invariant condition. Split it into loop -/// versions and test the condition outside of either loop. -void LoopUnswitch::VersionLoop(Value *LIC, Loop *L) { +/// versions and test the condition outside of either loop. Return the loops +/// created as Out1/Out2. +void LoopUnswitch::VersionLoop(Value *LIC, Loop *L, Loop *&Out1, Loop *&Out2) { Function *F = L->getHeader()->getParent(); DEBUG(std::cerr << "loop-unswitch: Unswitching loop %" @@ -324,10 +328,8 @@ RewriteLoopBodyWithConditionConstant(L, LIC, true); RewriteLoopBodyWithConditionConstant(NewLoop, LIC, false); ++NumUnswitched; - - // Try to unswitch each of our new loops now! - visitLoop(L); - visitLoop(NewLoop); + Out1 = L; + Out2 = NewLoop; } // RewriteLoopBodyWithConditionConstant - We know that the boolean value LIC has _______________________________________________ llvm-commits mailing list llvm-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits