//===- IntervalPartition.cpp - Interval Partition module code ----*- C++ -*--=//
//
-// This file contains the definition of the cfg::IntervalPartition class, which
+// 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;
-AnalysisID IntervalPartition::ID(AnalysisID::create<IntervalPartition>());
+static RegisterAnalysis<IntervalPartition>
+X("intervals", "Interval Partition Construction", true);
//===----------------------------------------------------------------------===//
// IntervalPartition Implementation
// destroy - Reset state back to before function was analyzed
void IntervalPartition::destroy() {
- for_each(begin(), end(), deleter<cfg::Interval>);
+ for_each(Intervals.begin(), Intervals.end(), deleter<Interval>);
IntervalMap.clear();
RootInterval = 0;
}
+void IntervalPartition::print(std::ostream &O) const {
+ std::copy(Intervals.begin(), Intervals.end(),
+ std::ostream_iterator<const Interval *>(O, "\n"));
+}
+
// addIntervalToPartition - Add an interval to the internal list of intervals,
// and then add mappings from all of the basic blocks in the interval to the
// 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();
// 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)
// 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),
+ for_each(I, intervals_end(&F),
bind_obj(this, &IntervalPartition::addIntervalToPartition));
- // Now that we know all of the successor information, propogate this to the
+ // Now that we know all of the successor information, propagate this to the
// predecessors for each block...
- for_each(begin(), end(),
+ for_each(Intervals.begin(), Intervals.end(),
bind_obj(this, &IntervalPartition::updatePredecessors));
return false;
}
for_each(I, intervals_end(IP),
bind_obj(this, &IntervalPartition::addIntervalToPartition));
- // Now that we know all of the successor information, propogate this to the
+ // Now that we know all of the successor information, propagate this to the
// predecessors for each block...
- for_each(begin(), end(),
+ for_each(Intervals.begin(), Intervals.end(),
bind_obj(this, &IntervalPartition::updatePredecessors));
}