diff --git a/llvm/lib/Transforms/Scalar/LICM.cpp b/llvm/lib/Transforms/Scalar/LICM.cpp index 1ed490d294db..0e0c8771875e 100644 --- a/llvm/lib/Transforms/Scalar/LICM.cpp +++ b/llvm/lib/Transforms/Scalar/LICM.cpp @@ -72,6 +72,7 @@ namespace { AU.setPreservesCFG(); AU.addRequiredID(LoopSimplifyID); AU.addRequired(); + AU.addRequired(); AU.addRequired(); AU.addRequired(); // For scalar promotion (mem2reg) AU.addRequired(); @@ -86,7 +87,8 @@ namespace { // Various analyses that we use... AliasAnalysis *AA; // Current AliasAnalysis information LoopInfo *LI; // Current LoopInfo - ETForest *ET; // ETForest for the current Loop... + ETForest *ET; // ETForest for the current loop.. + DominatorTree *DT; // Dominator Tree for the current Loop... DominanceFrontier *DF; // Current Dominance Frontier // State that is updated as we process loops @@ -98,19 +100,19 @@ namespace { /// SinkRegion - Walk the specified region of the CFG (defined by all blocks /// dominated by the specified block, and that are in the current loop) in - /// reverse depth first order w.r.t the ETForest. This allows us to + /// reverse depth first order w.r.t the DominatorTree. This allows us to /// visit uses before definitions, allowing us to sink a loop body in one /// pass without iteration. /// - void SinkRegion(BasicBlock *BB); + void SinkRegion(DominatorTree::Node *N); /// HoistRegion - Walk the specified region of the CFG (defined by all /// blocks dominated by the specified block, and that are in the current - /// loop) in depth first order w.r.t the ETForest. This allows us to + /// loop) in depth first order w.r.t the DominatorTree. This allows us to /// visit definitions before uses, allowing us to hoist a loop body in one /// pass without iteration. /// - void HoistRegion(BasicBlock *BB); + void HoistRegion(DominatorTree::Node *N); /// inSubLoop - Little predicate that returns true if the specified basic /// block is in a subloop of the current one, not the current one itself. @@ -135,20 +137,21 @@ namespace { if (BlockInLoop == LoopHeader) return true; - BasicBlock *IDom = ExitBlock; + DominatorTree::Node *BlockInLoopNode = DT->getNode(BlockInLoop); + DominatorTree::Node *IDom = DT->getNode(ExitBlock); // Because the exit block is not in the loop, we know we have to get _at // least_ its immediate dominator. do { // Get next Immediate Dominator. - IDom = ET->getIDom(IDom); + IDom = IDom->getIDom(); // If we have got to the header of the loop, then the instructions block // did not dominate the exit node, so we can't hoist it. - if (IDom == LoopHeader) + if (IDom->getBlock() == LoopHeader) return false; - } while (IDom != BlockInLoop); + } while (IDom != BlockInLoopNode); return true; } @@ -212,6 +215,7 @@ bool LICM::runOnLoop(Loop *L, LPPassManager &LPM) { LI = &getAnalysis(); AA = &getAnalysis(); DF = &getAnalysis(); + DT = &getAnalysis(); ET = &getAnalysis(); CurAST = new AliasSetTracker(*AA); @@ -251,8 +255,8 @@ bool LICM::runOnLoop(Loop *L, LPPassManager &LPM) { // us to sink instructions in one pass, without iteration. AFter sinking // instructions, we perform another pass to hoist them out of the loop. // - SinkRegion(L->getHeader()); - HoistRegion(L->getHeader()); + SinkRegion(DT->getNode(L->getHeader())); + HoistRegion(DT->getNode(L->getHeader())); // Now that all loop invariants have been removed from the loop, promote any // memory references to scalars that we can... @@ -269,19 +273,19 @@ bool LICM::runOnLoop(Loop *L, LPPassManager &LPM) { /// SinkRegion - Walk the specified region of the CFG (defined by all blocks /// dominated by the specified block, and that are in the current loop) in -/// reverse depth first order w.r.t the ETForest. This allows us to visit +/// reverse depth first order w.r.t the DominatorTree. This allows us to visit /// uses before definitions, allowing us to sink a loop body in one pass without /// iteration. /// -void LICM::SinkRegion(BasicBlock *BB) { - assert(BB != 0 && "Null sink block?"); +void LICM::SinkRegion(DominatorTree::Node *N) { + assert(N != 0 && "Null dominator tree node?"); + BasicBlock *BB = N->getBlock(); // If this subregion is not in the top level loop at all, exit. if (!CurLoop->contains(BB)) return; // We are processing blocks in reverse dfo, so process children first... - std::vector Children; - ET->getChildren(BB, Children); + const std::vector &Children = N->getChildren(); for (unsigned i = 0, e = Children.size(); i != e; ++i) SinkRegion(Children[i]); @@ -307,11 +311,12 @@ void LICM::SinkRegion(BasicBlock *BB) { /// HoistRegion - Walk the specified region of the CFG (defined by all blocks /// dominated by the specified block, and that are in the current loop) in depth -/// first order w.r.t the ETForest. This allows us to visit definitions +/// first order w.r.t the DominatorTree. This allows us to visit definitions /// before uses, allowing us to hoist a loop body in one pass without iteration. /// -void LICM::HoistRegion(BasicBlock *BB) { - assert(BB != 0 && "Null hoist block?"); +void LICM::HoistRegion(DominatorTree::Node *N) { + assert(N != 0 && "Null dominator tree node?"); + BasicBlock *BB = N->getBlock(); // If this subregion is not in the top level loop at all, exit. if (!CurLoop->contains(BB)) return; @@ -331,8 +336,7 @@ void LICM::HoistRegion(BasicBlock *BB) { hoist(I); } - std::vector Children; - ET->getChildren(BB, Children); + const std::vector &Children = N->getChildren(); for (unsigned i = 0, e = Children.size(); i != e; ++i) HoistRegion(Children[i]); } @@ -603,7 +607,7 @@ bool LICM::isSafeToExecuteUnconditionally(Instruction &Inst) { std::vector ExitBlocks; CurLoop->getExitBlocks(ExitBlocks); - // For each exit block, walk up the ET until the + // For each exit block, get the DT node and walk up the DT until the // instruction's basic block is found or we exit the loop. for (unsigned i = 0, e = ExitBlocks.size(); i != e; ++i) if (!isExitBlockDominatedByBlockInLoop(ExitBlocks[i], Inst.getParent()))