From: Chris Lattner Date: Thu, 8 Jan 2004 00:09:44 +0000 (+0000) Subject: Improve encapsulation in the Loop and LoopInfo classes by eliminating the X-Git-Url: http://plrg.eecs.uci.edu/git/?p=oota-llvm.git;a=commitdiff_plain;h=329c1c6c949d07e3fe9722ec633b4258217fd99d Improve encapsulation in the Loop and LoopInfo classes by eliminating the getSubLoops/getTopLevelLoops methods, replacing them with iterator-based accessors. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@10714 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/include/llvm/Analysis/LoopInfo.h b/include/llvm/Analysis/LoopInfo.h index 1458b3bd5f6..52339f44ea5 100644 --- a/include/llvm/Analysis/LoopInfo.h +++ b/include/llvm/Analysis/LoopInfo.h @@ -56,9 +56,11 @@ public: /// contains - Return true of the specified basic block is in this loop bool contains(const BasicBlock *BB) const; - /// getSubLoops - Return the loops contained entirely within this loop + /// iterator/begin/end - Return the loops contained entirely within this loop. /// - const std::vector &getSubLoops() const { return SubLoops; } + typedef std::vector::const_iterator iterator; + iterator begin() const { return SubLoops.begin(); } + iterator end() const { return SubLoops.end(); } /// getBlocks - Get a list of the basic blocks which make up this loop. /// @@ -147,7 +149,12 @@ class LoopInfo : public FunctionPass { public: ~LoopInfo() { releaseMemory(); } - const std::vector &getTopLevelLoops() const { return TopLevelLoops; } + /// iterator/begin/end - The interface to the top-level loops in the current + /// function. + /// + typedef std::vector::const_iterator iterator; + iterator begin() const { return TopLevelLoops.begin(); } + iterator end() const { return TopLevelLoops.end(); } /// getLoopFor - Return the inner most loop that BB lives in. If a basic /// block is in no loop (for example the entry node), null is returned. @@ -206,10 +213,10 @@ template <> struct GraphTraits { static NodeType *getEntryNode(const Loop *L) { return L; } static inline ChildIteratorType child_begin(NodeType *N) { - return N->getSubLoops().begin(); + return N->begin(); } static inline ChildIteratorType child_end(NodeType *N) { - return N->getSubLoops().end(); + return N->end(); } }; @@ -219,10 +226,10 @@ template <> struct GraphTraits { static NodeType *getEntryNode(Loop *L) { return L; } static inline ChildIteratorType child_begin(NodeType *N) { - return N->getSubLoops().begin(); + return N->begin(); } static inline ChildIteratorType child_end(NodeType *N) { - return N->getSubLoops().end(); + return N->end(); } }; diff --git a/lib/Analysis/LoopInfo.cpp b/lib/Analysis/LoopInfo.cpp index 68e7d2f845d..41c4b555bd1 100644 --- a/lib/Analysis/LoopInfo.cpp +++ b/lib/Analysis/LoopInfo.cpp @@ -72,8 +72,8 @@ void Loop::print(std::ostream &OS, unsigned Depth) const { OS << "\n"; - for (unsigned i = 0, e = getSubLoops().size(); i != e; ++i) - getSubLoops()[i]->print(OS, Depth+2); + for (iterator I = begin(), E = end(); I != E; ++I) + (*I)->print(OS, Depth+2); } void Loop::dump() const { diff --git a/lib/Transforms/Scalar/IndVarSimplify.cpp b/lib/Transforms/Scalar/IndVarSimplify.cpp index ed02e3a00bb..f631b69f0a0 100644 --- a/lib/Transforms/Scalar/IndVarSimplify.cpp +++ b/lib/Transforms/Scalar/IndVarSimplify.cpp @@ -43,8 +43,8 @@ namespace { Changed = false; // Induction Variables live in the header nodes of loops - for (unsigned i = 0, e = Loops->getTopLevelLoops().size(); i != e; ++i) - runOnLoop(Loops->getTopLevelLoops()[i]); + for (LoopInfo::iterator I = Loops->begin(), E = Loops->end(); I != E; ++I) + runOnLoop(*I); return Changed; } @@ -77,8 +77,8 @@ Pass *llvm::createIndVarSimplifyPass() { void IndVarSimplify::runOnLoop(Loop *Loop) { // Transform all subloops before this loop... - for (unsigned i = 0, e = Loop->getSubLoops().size(); i != e; ++i) - runOnLoop(Loop->getSubLoops()[i]); + for (LoopInfo::iterator I = Loop->begin(), E = Loop->end(); I != E; ++I) + runOnLoop(*I); // Get the header node for this loop. All of the phi nodes that could be // induction variables must live in this basic block. diff --git a/lib/Transforms/Scalar/LICM.cpp b/lib/Transforms/Scalar/LICM.cpp index c26fb6bef4f..190d4077642 100644 --- a/lib/Transforms/Scalar/LICM.cpp +++ b/lib/Transforms/Scalar/LICM.cpp @@ -113,8 +113,8 @@ namespace { /// bool inSubLoop(BasicBlock *BB) { assert(CurLoop->contains(BB) && "Only valid if BB is IN the loop"); - for (unsigned i = 0, e = CurLoop->getSubLoops().size(); i != e; ++i) - if (CurLoop->getSubLoops()[i]->contains(BB)) + for (Loop::iterator I = CurLoop->begin(), E = CurLoop->end(); I != E; ++I) + if ((*I)->contains(BB)) return true; // A subloop actually contains this block! return false; } @@ -221,9 +221,7 @@ bool LICM::runOnFunction(Function &) { DT = &getAnalysis(); // Hoist expressions out of all of the top-level loops. - const std::vector &TopLevelLoops = LI->getTopLevelLoops(); - for (std::vector::const_iterator I = TopLevelLoops.begin(), - E = TopLevelLoops.end(); I != E; ++I) { + for (LoopInfo::iterator I = LI->begin(), E = LI->end(); I != E; ++I) { AliasSetTracker AST(*AA); visitLoop(*I, AST); } @@ -235,8 +233,7 @@ bool LICM::runOnFunction(Function &) { /// void LICM::visitLoop(Loop *L, AliasSetTracker &AST) { // Recurse through all subloops before we process this loop... - for (std::vector::const_iterator I = L->getSubLoops().begin(), - E = L->getSubLoops().end(); I != E; ++I) { + for (Loop::iterator I = L->begin(), E = L->end(); I != E; ++I) { AliasSetTracker SubAST(*AA); visitLoop(*I, SubAST); diff --git a/lib/Transforms/Utils/LoopSimplify.cpp b/lib/Transforms/Utils/LoopSimplify.cpp index 9beae4fd075..45f31aa4a89 100644 --- a/lib/Transforms/Utils/LoopSimplify.cpp +++ b/lib/Transforms/Utils/LoopSimplify.cpp @@ -91,8 +91,8 @@ bool LoopSimplify::runOnFunction(Function &F) { bool Changed = false; LoopInfo &LI = getAnalysis(); - for (unsigned i = 0, e = LI.getTopLevelLoops().size(); i != e; ++i) - Changed |= ProcessLoop(LI.getTopLevelLoops()[i]); + for (LoopInfo::iterator I = LI.begin(), E = LI.end(); I != E; ++I) + Changed |= ProcessLoop(*I); return Changed; } @@ -136,9 +136,8 @@ bool LoopSimplify::ProcessLoop(Loop *L) { Changed = true; } - const std::vector &SubLoops = L->getSubLoops(); - for (unsigned i = 0, e = SubLoops.size(); i != e; ++i) - Changed |= ProcessLoop(SubLoops[i]); + for (Loop::iterator I = L->begin(), E = L->end(); I != E; ++I) + Changed |= ProcessLoop(*I); return Changed; } @@ -227,9 +226,8 @@ BasicBlock *LoopSimplify::SplitBlockPredecessors(BasicBlock *BB, static void ChangeExitBlock(Loop *L, BasicBlock *OldExit, BasicBlock *NewExit) { if (L->hasExitBlock(OldExit)) { L->changeExitBlock(OldExit, NewExit); - const std::vector &SubLoops = L->getSubLoops(); - for (unsigned i = 0, e = SubLoops.size(); i != e; ++i) - ChangeExitBlock(SubLoops[i], OldExit, NewExit); + for (Loop::iterator I = L->begin(), E = L->end(); I != E; ++I) + ChangeExitBlock(*I, OldExit, NewExit); } } @@ -266,16 +264,19 @@ void LoopSimplify::InsertPreheaderForLoop(Loop *L) { // is a sibling loop, ie, one with the same parent loop, or one if it's // children. // - const std::vector *ParentSubLoops; - if (Loop *Parent = L->getParentLoop()) - ParentSubLoops = &Parent->getSubLoops(); - else // Must check top-level loops... - ParentSubLoops = &getAnalysis().getTopLevelLoops(); + LoopInfo::iterator ParentLoops, ParentLoopsE; + if (Loop *Parent = L->getParentLoop()) { + ParentLoops = Parent->begin(); + ParentLoopsE = Parent->end(); + } else { // Must check top-level loops... + ParentLoops = getAnalysis().begin(); + ParentLoopsE = getAnalysis().end(); + } // Loop over all sibling loops, performing the substitution (recursively to // include child loops)... - for (unsigned i = 0, e = ParentSubLoops->size(); i != e; ++i) - ChangeExitBlock((*ParentSubLoops)[i], Header, NewBB); + for (; ParentLoops != ParentLoopsE; ++ParentLoops) + ChangeExitBlock(*ParentLoops, Header, NewBB); DominatorSet &DS = getAnalysis(); // Update dominator info {