X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=lib%2FAnalysis%2FIntervalPartition.cpp;h=a0583e86d185e02b428f2f89016b236bfa5c6474;hb=282b80d0eb0e8923fe17eec9928204b179567f3e;hp=197bed26d79dbb44da83313ed72ce2e3880d5b37;hpb=2fbfdcffd3e0cf41422aaa6c526c37cb02b81341;p=oota-llvm.git

diff --git a/lib/Analysis/IntervalPartition.cpp b/lib/Analysis/IntervalPartition.cpp
index 197bed26d79..a0583e86d18 100644
--- a/lib/Analysis/IntervalPartition.cpp
+++ b/lib/Analysis/IntervalPartition.cpp
@@ -1,27 +1,40 @@
-//===- IntervalPartition.cpp - Interval Partition module code ----*- C++ -*--=//
+//===- IntervalPartition.cpp - Interval Partition module code -------------===//
 //
-// This file contains the definition of the cfg::IntervalPartition class, which
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+//
+// This file contains the definition of the IntervalPartition class, which
 // calculates and represent the interval partition of a function.
 //
 //===----------------------------------------------------------------------===//
 
 #include "llvm/Analysis/IntervalIterator.h"
-#include "Support/STLExtras.h"
-
-using namespace cfg;
-using std::make_pair;
+using namespace llvm;
 
-AnalysisID IntervalPartition::ID(AnalysisID::create<IntervalPartition>());
+char IntervalPartition::ID = 0;
+INITIALIZE_PASS(IntervalPartition, "intervals",
+                "Interval Partition Construction", true, true)
 
 //===----------------------------------------------------------------------===//
 // IntervalPartition Implementation
 //===----------------------------------------------------------------------===//
 
-// destroy - Reset state back to before function was analyzed
-void IntervalPartition::destroy() {
-  for_each(begin(), end(), deleter<cfg::Interval>);
+// releaseMemory - Reset state back to before function was analyzed
+void IntervalPartition::releaseMemory() {
+  for (unsigned i = 0, e = Intervals.size(); i != e; ++i)
+    delete Intervals[i];
   IntervalMap.clear();
-  RootInterval = 0;
+  Intervals.clear();
+  RootInterval = nullptr;
+}
+
+void IntervalPartition::print(raw_ostream &O, const Module*) const {
+  for(unsigned i = 0, e = Intervals.size(); i != e; ++i)
+    Intervals[i]->print(O);
 }
 
 // addIntervalToPartition - Add an interval to the internal list of intervals,
@@ -29,48 +42,46 @@ void IntervalPartition::destroy() {
 // interval itself (in the IntervalMap).
 //
 void IntervalPartition::addIntervalToPartition(Interval *I) {
-  push_back(I);
+  Intervals.push_back(I);
 
   // Add mappings for all of the basic blocks in I to the IntervalPartition
   for (Interval::node_iterator It = I->Nodes.begin(), End = I->Nodes.end();
        It != End; ++It)
-    IntervalMap.insert(make_pair(*It, I));
+    IntervalMap.insert(std::make_pair(*It, I));
 }
 
 // updatePredecessors - Interval generation only sets the successor fields of
 // the interval data structures.  After interval generation is complete,
-// run through all of the intervals and propogate successor info as
+// run through all of the intervals and propagate successor info as
 // predecessor info.
 //
-void IntervalPartition::updatePredecessors(cfg::Interval *Int) {
+void IntervalPartition::updatePredecessors(Interval *Int) {
   BasicBlock *Header = Int->getHeaderNode();
-  for (Interval::succ_iterator I = Int->Successors.begin(), 
-	                       E = Int->Successors.end(); I != E; ++I)
+  for (Interval::succ_iterator I = Int->Successors.begin(),
+         E = Int->Successors.end(); I != E; ++I)
     getBlockInterval(*I)->Predecessors.push_back(Header);
 }
 
 // IntervalPartition ctor - Build the first level interval partition for the
 // specified function...
 //
-bool IntervalPartition::runOnMethod(Function *M) {
-  assert(M->front() && "Cannot operate on prototypes!");
-
+bool IntervalPartition::runOnFunction(Function &F) {
   // Pass false to intervals_begin because we take ownership of it's memory
-  function_interval_iterator I = intervals_begin(M, false);
-  assert(I != intervals_end(M) && "No intervals in function!?!?!");
+  function_interval_iterator I = intervals_begin(&F, false);
+  assert(I != intervals_end(&F) && "No intervals in function!?!?!");
 
   addIntervalToPartition(RootInterval = *I);
 
   ++I;  // After the first one...
 
-  // Add the rest of the intervals to the partition...
-  for_each(I, intervals_end(M),
-	   bind_obj(this, &IntervalPartition::addIntervalToPartition));
+  // Add the rest of the intervals to the partition.
+  for (function_interval_iterator E = intervals_end(&F); I != E; ++I)
+    addIntervalToPartition(*I);
 
-  // Now that we know all of the successor information, propogate this to the
-  // predecessors for each block...
-  for_each(begin(), end(), 
-	   bind_obj(this, &IntervalPartition::updatePredecessors));
+  // Now that we know all of the successor information, propagate this to the
+  // predecessors for each block.
+  for (unsigned i = 0, e = Intervals.size(); i != e; ++i)
+    updatePredecessors(Intervals[i]);
   return false;
 }
 
@@ -79,9 +90,9 @@ bool IntervalPartition::runOnMethod(Function *M) {
 // existing interval graph.  This takes an additional boolean parameter to
 // distinguish it from a copy constructor.  Always pass in false for now.
 //
-IntervalPartition::IntervalPartition(IntervalPartition &IP, bool) {
-  Interval *FunctionStart = IP.getRootInterval();
-  assert(FunctionStart && "Cannot operate on empty IntervalPartitions!");
+IntervalPartition::IntervalPartition(IntervalPartition &IP, bool)
+  : FunctionPass(ID) {
+  assert(IP.getRootInterval() && "Cannot operate on empty IntervalPartitions!");
 
   // Pass false to intervals_begin because we take ownership of it's memory
   interval_part_interval_iterator I = intervals_begin(IP, false);
@@ -91,12 +102,13 @@ IntervalPartition::IntervalPartition(IntervalPartition &IP, bool) {
 
   ++I;  // After the first one...
 
-  // Add the rest of the intervals to the partition...
-  for_each(I, intervals_end(IP),
-	   bind_obj(this, &IntervalPartition::addIntervalToPartition));
+  // Add the rest of the intervals to the partition.
+  for (interval_part_interval_iterator E = intervals_end(IP); I != E; ++I)
+    addIntervalToPartition(*I);
 
-  // Now that we know all of the successor information, propogate this to the
-  // predecessors for each block...
-  for_each(begin(), end(), 
-	   bind_obj(this, &IntervalPartition::updatePredecessors));
+  // Now that we know all of the successor information, propagate this to the
+  // predecessors for each block.
+  for (unsigned i = 0, e = Intervals.size(); i != e; ++i)
+    updatePredecessors(Intervals[i]);
 }
+