X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=lib%2FAnalysis%2FLoopInfo.cpp;h=275331b03a58f952f0298d7dde3fc7ec54fb4559;hb=b169426272b85ce28a9a56d13154e61b158fc47a;hp=d99f0f70d92a7a8ef7ca5b00ba1801baeb47c834;hpb=07a228d1f7342c2fbe7dd7a307ee43b6bc026fc7;p=oota-llvm.git

diff --git a/lib/Analysis/LoopInfo.cpp b/lib/Analysis/LoopInfo.cpp
index d99f0f70d92..275331b03a5 100644
--- a/lib/Analysis/LoopInfo.cpp
+++ b/lib/Analysis/LoopInfo.cpp
@@ -1,4 +1,11 @@
-//===- LoopInfo.cpp - Natural Loop Calculator -------------------------------=//
+//===- LoopInfo.cpp - Natural Loop Calculator -----------------------------===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
 //
 // This file defines the LoopInfo class that is used to identify natural loops
 // and determine the loop depth of various nodes of the CFG.  Note that the
@@ -8,103 +15,36 @@
 //===----------------------------------------------------------------------===//
 
 #include "llvm/Analysis/LoopInfo.h"
+#include "llvm/Constants.h"
+#include "llvm/Instructions.h"
 #include "llvm/Analysis/Dominators.h"
+#include "llvm/Assembly/Writer.h"
 #include "llvm/Support/CFG.h"
-#include "Support/DepthFirstIterator.h"
+#include "llvm/Support/Streams.h"
+#include "llvm/ADT/DepthFirstIterator.h"
+#include "llvm/ADT/SmallPtrSet.h"
 #include <algorithm>
+#include <ostream>
+using namespace llvm;
 
-AnalysisID LoopInfo::ID(AnalysisID::create<LoopInfo>(), true);
+char LoopInfo::ID = 0;
+static RegisterPass<LoopInfo>
+X("loops", "Natural Loop Construction", true, true);
 
 //===----------------------------------------------------------------------===//
 // Loop implementation
 //
-bool Loop::contains(BasicBlock *BB) const {
-  return find(Blocks.begin(), Blocks.end(), BB) != Blocks.end();
-}
-
-void LoopInfo::releaseMemory() {
-  for (std::vector<Loop*>::iterator I = TopLevelLoops.begin(),
-         E = TopLevelLoops.end(); I != E; ++I)
-    delete *I;   // Delete all of the loops...
-
-  BBMap.clear();                             // Reset internal state of analysis
-  TopLevelLoops.clear();
-}
-
 
 //===----------------------------------------------------------------------===//
 // LoopInfo implementation
 //
-bool LoopInfo::runOnFunction(Function *F) {
+bool LoopInfo::runOnFunction(Function &) {
   releaseMemory();
-  Calculate(getAnalysis<DominatorSet>());    // Update
+  LI->Calculate(getAnalysis<DominatorTree>().getBase());    // Update
   return false;
 }
 
-void LoopInfo::Calculate(const DominatorSet &DS) {
-  BasicBlock *RootNode = DS.getRoot();
-
-  for (df_iterator<BasicBlock*> NI = df_begin(RootNode),
-	 NE = df_end(RootNode); NI != NE; ++NI)
-    if (Loop *L = ConsiderForLoop(*NI, DS))
-      TopLevelLoops.push_back(L);
-
-  for (unsigned i = 0; i < TopLevelLoops.size(); ++i)
-    TopLevelLoops[i]->setLoopDepth(1);
-}
-
 void LoopInfo::getAnalysisUsage(AnalysisUsage &AU) const {
   AU.setPreservesAll();
-  AU.addRequired(DominatorSet::ID);
-  AU.addProvided(ID);
-}
-
-
-Loop *LoopInfo::ConsiderForLoop(BasicBlock *BB, const DominatorSet &DS) {
-  if (BBMap.find(BB) != BBMap.end()) return 0;   // Havn't processed this node?
-
-  std::vector<BasicBlock *> TodoStack;
-
-  // Scan the predecessors of BB, checking to see if BB dominates any of
-  // them.
-  for (pred_iterator I = pred_begin(BB), E = pred_end(BB); I != E; ++I)
-    if (DS.dominates(BB, *I))   // If BB dominates it's predecessor...
-      TodoStack.push_back(*I);
-
-  if (TodoStack.empty()) return 0;  // Doesn't dominate any predecessors...
-
-  // Create a new loop to represent this basic block...
-  Loop *L = new Loop(BB);
-  BBMap[BB] = L;
-
-  while (!TodoStack.empty()) {  // Process all the nodes in the loop
-    BasicBlock *X = TodoStack.back();
-    TodoStack.pop_back();
-
-    if (!L->contains(X)) {                  // As of yet unprocessed??
-      L->Blocks.push_back(X);
-
-      // Add all of the predecessors of X to the end of the work stack...
-      TodoStack.insert(TodoStack.end(), pred_begin(X), pred_end(X));
-    }
-  }
-
-  // Add the basic blocks that comprise this loop to the BBMap so that this
-  // loop can be found for them.  Also check subsidary basic blocks to see if
-  // they start subloops of their own.
-  //
-  for (std::vector<BasicBlock*>::reverse_iterator I = L->Blocks.rbegin(),
-	 E = L->Blocks.rend(); I != E; ++I) {
-
-    // Check to see if this block starts a new loop
-    if (Loop *NewLoop = ConsiderForLoop(*I, DS)) {
-      L->SubLoops.push_back(NewLoop);
-      NewLoop->ParentLoop = L;
-    }
-  
-    if (BBMap.find(*I) == BBMap.end())
-      BBMap.insert(std::make_pair(*I, L));
-  }
-
-  return L;
+  AU.addRequired<DominatorTree>();
 }