projects
/
oota-llvm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
R600: Add support for indirect addressing of non default const buffer
[oota-llvm.git]
/
lib
/
Analysis
/
IntervalPartition.cpp
diff --git
a/lib/Analysis/IntervalPartition.cpp
b/lib/Analysis/IntervalPartition.cpp
index 9253f721ab1e0495b375baf4e04ac9377cdd1916..2e259b147b8b0efa46b29050fdd8ee0a6d345d5c 100644
(file)
--- a/
lib/Analysis/IntervalPartition.cpp
+++ b/
lib/Analysis/IntervalPartition.cpp
@@
-1,10
+1,10
@@
//===- IntervalPartition.cpp - Interval Partition module code -------------===//
//===- IntervalPartition.cpp - Interval Partition module code -------------===//
-//
+//
// The LLVM Compiler Infrastructure
//
// The LLVM Compiler Infrastructure
//
-// This file
was developed by the LLVM research group and is distributed under
-//
the University of Illinois Open Source
License. See LICENSE.TXT for details.
-//
+// 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
//===----------------------------------------------------------------------===//
//
// This file contains the definition of the IntervalPartition class, which
@@
-13,27
+13,28
@@
//===----------------------------------------------------------------------===//
#include "llvm/Analysis/IntervalIterator.h"
//===----------------------------------------------------------------------===//
#include "llvm/Analysis/IntervalIterator.h"
-#include "llvm/ADT/STLExtras.h"
-
-namespace llvm {
+using namespace llvm;
-static RegisterAnalysis<IntervalPartition>
-X("intervals", "Interval Partition Construction", true);
+char IntervalPartition::ID = 0;
+INITIALIZE_PASS(IntervalPartition, "intervals",
+ "Interval Partition Construction", true, true)
//===----------------------------------------------------------------------===//
// IntervalPartition Implementation
//===----------------------------------------------------------------------===//
//===----------------------------------------------------------------------===//
// IntervalPartition Implementation
//===----------------------------------------------------------------------===//
-// destroy - Reset state back to before function was analyzed
-void IntervalPartition::destroy() {
- for_each(Intervals.begin(), Intervals.end(), deleter<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();
IntervalMap.clear();
+ Intervals.clear();
RootInterval = 0;
}
RootInterval = 0;
}
-void IntervalPartition::print(
std::ostream &O
) const {
- std::copy(Intervals.begin(), Intervals.end(),
-
std::ostream_iterator<const Interval *>(O, "\n")
);
+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,
}
// addIntervalToPartition - Add an interval to the internal list of intervals,
@@
-56,8
+57,8
@@
void IntervalPartition::addIntervalToPartition(Interval *I) {
//
void IntervalPartition::updatePredecessors(Interval *Int) {
BasicBlock *Header = Int->getHeaderNode();
//
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);
}
getBlockInterval(*I)->Predecessors.push_back(Header);
}
@@
-73,14
+74,14
@@
bool IntervalPartition::runOnFunction(Function &F) {
++I; // After the first one...
++I; // After the first one...
- // Add the rest of the intervals to the partition.
..
- for
_each(I, intervals_end(&F),
-
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, propagate this to the
// Now that we know all of the successor information, propagate this to the
- // predecessors for each block.
..
- for
_each(Intervals.begin(), Intervals.end(),
-
bind_obj(this, &IntervalPartition::updatePredecessors)
);
+ // predecessors for each block.
+ for
(unsigned i = 0, e = Intervals.size(); i != e; ++i)
+
updatePredecessors(Intervals[i]
);
return false;
}
return false;
}
@@
-89,9
+90,9
@@
bool IntervalPartition::runOnFunction(Function &F) {
// existing interval graph. This takes an additional boolean parameter to
// distinguish it from a copy constructor. Always pass in false for now.
//
// 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);
// Pass false to intervals_begin because we take ownership of it's memory
interval_part_interval_iterator I = intervals_begin(IP, false);
@@
-101,14
+102,13
@@
IntervalPartition::IntervalPartition(IntervalPartition &IP, bool) {
++I; // After the first one...
++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, propagate this to the
// Now that we know all of the successor information, propagate this to the
- // predecessors for each block.
..
- for
_each(Intervals.begin(), Intervals.end(),
-
bind_obj(this, &IntervalPartition::updatePredecessors)
);
+ // predecessors for each block.
+ for
(unsigned i = 0, e = Intervals.size(); i != e; ++i)
+
updatePredecessors(Intervals[i]
);
}
}
-} // End llvm namespace