[llvm-commits] [llvm] r83255 - in /llvm/trunk/lib/CodeGen: LiveInterval.cpp LiveIntervalAnalysis.cpp PreAllocSplitting.cpp SimpleRegisterCoalescing.cpp Spiller.cpp StrongPHIElimination.cpp
Lang Hames
lhames at gmail.com
Fri Oct 2 21:31:31 PDT 2009
Author: lhames
Date: Fri Oct 2 23:31:31 2009
New Revision: 83255
URL: http://llvm.org/viewvc/llvm-project?rev=83255&view=rev
Log:
Oops. Renamed remaining MachineInstrIndex references.
Modified:
llvm/trunk/lib/CodeGen/LiveInterval.cpp
llvm/trunk/lib/CodeGen/LiveIntervalAnalysis.cpp
llvm/trunk/lib/CodeGen/PreAllocSplitting.cpp
llvm/trunk/lib/CodeGen/SimpleRegisterCoalescing.cpp
llvm/trunk/lib/CodeGen/Spiller.cpp
llvm/trunk/lib/CodeGen/StrongPHIElimination.cpp
Modified: llvm/trunk/lib/CodeGen/LiveInterval.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/LiveInterval.cpp?rev=83255&r1=83254&r2=83255&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/LiveInterval.cpp (original)
+++ llvm/trunk/lib/CodeGen/LiveInterval.cpp Fri Oct 2 23:31:31 2009
@@ -131,7 +131,7 @@
/// overlaps - Return true if the live interval overlaps a range specified
/// by [Start, End).
-bool LiveInterval::overlaps(LiveIndex Start, MachineInstrIndex End) const {
+bool LiveInterval::overlaps(LiveIndex Start, LiveIndex End) const {
assert(Start < End && "Invalid range");
const_iterator I = begin();
const_iterator E = end();
@@ -268,7 +268,7 @@
/// isInOneLiveRange - Return true if the range specified is entirely in
/// a single LiveRange of the live interval.
-bool LiveInterval::isInOneLiveRange(LiveIndex Start, MachineInstrIndex End) {
+bool LiveInterval::isInOneLiveRange(LiveIndex Start, LiveIndex End) {
Ranges::iterator I = std::upper_bound(ranges.begin(), ranges.end(), Start);
if (I == ranges.begin())
return false;
@@ -279,7 +279,7 @@
/// removeRange - Remove the specified range from this interval. Note that
/// the range must be in a single LiveRange in its entirety.
-void LiveInterval::removeRange(LiveIndex Start, MachineInstrIndex End,
+void LiveInterval::removeRange(LiveIndex Start, LiveIndex End,
bool RemoveDeadValNo) {
// Find the LiveRange containing this span.
Ranges::iterator I = std::upper_bound(ranges.begin(), ranges.end(), Start);
Modified: llvm/trunk/lib/CodeGen/LiveIntervalAnalysis.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/LiveIntervalAnalysis.cpp?rev=83255&r1=83254&r2=83255&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/LiveIntervalAnalysis.cpp (original)
+++ llvm/trunk/lib/CodeGen/LiveIntervalAnalysis.cpp Fri Oct 2 23:31:31 2009
@@ -292,7 +292,7 @@
// Number MachineInstrs and MachineBasicBlocks.
// Initialize MBB indexes to a sentinal.
MBB2IdxMap.resize(mf_->getNumBlockIDs(),
- std::make_pair(LiveIndex(),MachineInstrIndex()));
+ std::make_pair(LiveIndex(),LiveIndex()));
LiveIndex MIIndex;
for (MachineFunction::iterator MBB = mf_->begin(), E = mf_->end();
@@ -406,7 +406,7 @@
(idx == index ? offset : LiveIndex::LOAD));
else
LI->end =
- LiveIndex(MachineInstrIndex::NUM * i2miMap_.size());
+ LiveIndex(LiveIndex::NUM * i2miMap_.size());
}
}
@@ -485,7 +485,7 @@
Idx2MBBMap.clear();
for (MachineFunction::iterator MBB = mf_->begin(), MBBE = mf_->end();
MBB != MBBE; ++MBB) {
- std::pair<LiveIndex, MachineInstrIndex> &mbbIndices = MBB2IdxMap[MBB->getNumber()];
+ std::pair<LiveIndex, LiveIndex> &mbbIndices = MBB2IdxMap[MBB->getNumber()];
mbbIndices.first = mbbIndices.first.scale(factor);
mbbIndices.second = mbbIndices.second.scale(factor);
Idx2MBBMap.push_back(std::make_pair(mbbIndices.first, MBB));
@@ -1283,7 +1283,7 @@
}
bool LiveIntervals::findLiveInMBBs(
- LiveIndex Start, MachineInstrIndex End,
+ LiveIndex Start, LiveIndex End,
SmallVectorImpl<MachineBasicBlock*> &MBBs) const {
std::vector<IdxMBBPair>::const_iterator I =
std::lower_bound(Idx2MBBMap.begin(), Idx2MBBMap.end(), Start);
@@ -1300,7 +1300,7 @@
}
bool LiveIntervals::findReachableMBBs(
- LiveIndex Start, MachineInstrIndex End,
+ LiveIndex Start, LiveIndex End,
SmallVectorImpl<MachineBasicBlock*> &MBBs) const {
std::vector<IdxMBBPair>::const_iterator I =
std::lower_bound(Idx2MBBMap.begin(), Idx2MBBMap.end(), Start);
@@ -1700,7 +1700,7 @@
/// for addIntervalsForSpills to rewrite uses / defs for the given live range.
bool LiveIntervals::
rewriteInstructionForSpills(const LiveInterval &li, const VNInfo *VNI,
- bool TrySplit, LiveIndex index, MachineInstrIndex end,
+ bool TrySplit, LiveIndex index, LiveIndex end,
MachineInstr *MI,
MachineInstr *ReMatOrigDefMI, MachineInstr *ReMatDefMI,
unsigned Slot, int LdSlot,
@@ -2732,12 +2732,12 @@
MachineInstr* startInst) {
LiveInterval& Interval = getOrCreateInterval(reg);
VNInfo* VN = Interval.getNextValue(
- LiveIndex(getInstructionIndex(startInst), MachineInstrIndex::DEF),
+ LiveIndex(getInstructionIndex(startInst), LiveIndex::DEF),
startInst, true, getVNInfoAllocator());
VN->setHasPHIKill(true);
VN->kills.push_back(terminatorGaps[startInst->getParent()]);
LiveRange LR(
- LiveIndex(getInstructionIndex(startInst), MachineInstrIndex::DEF),
+ LiveIndex(getInstructionIndex(startInst), LiveIndex::DEF),
getNextSlot(getMBBEndIdx(startInst->getParent())), VN);
Interval.addRange(LR);
Modified: llvm/trunk/lib/CodeGen/PreAllocSplitting.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/PreAllocSplitting.cpp?rev=83255&r1=83254&r2=83255&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/PreAllocSplitting.cpp (original)
+++ llvm/trunk/lib/CodeGen/PreAllocSplitting.cpp Fri Oct 2 23:31:31 2009
@@ -83,7 +83,7 @@
DenseMap<unsigned, int> IntervalSSMap;
// Def2SpillMap - A map from a def instruction index to spill index.
- DenseMap<LiveIndex, MachineInstrIndex> Def2SpillMap;
+ DenseMap<LiveIndex, LiveIndex> Def2SpillMap;
public:
static char ID;
@@ -142,10 +142,10 @@
int CreateSpillStackSlot(unsigned, const TargetRegisterClass *);
bool IsAvailableInStack(MachineBasicBlock*, unsigned,
- LiveIndex, MachineInstrIndex,
+ LiveIndex, LiveIndex,
LiveIndex&, int&) const;
- void UpdateSpillSlotInterval(VNInfo*, LiveIndex, MachineInstrIndex);
+ void UpdateSpillSlotInterval(VNInfo*, LiveIndex, LiveIndex);
bool SplitRegLiveInterval(LiveInterval*);
@@ -363,7 +363,7 @@
DenseMap<unsigned, int>::iterator I = IntervalSSMap.find(Reg);
if (I == IntervalSSMap.end())
return false;
- DenseMap<LiveIndex, MachineInstrIndex>::iterator
+ DenseMap<LiveIndex, LiveIndex>::iterator
II = Def2SpillMap.find(DefIndex);
if (II == Def2SpillMap.end())
return false;
Modified: llvm/trunk/lib/CodeGen/SimpleRegisterCoalescing.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SimpleRegisterCoalescing.cpp?rev=83255&r1=83254&r2=83255&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/SimpleRegisterCoalescing.cpp (original)
+++ llvm/trunk/lib/CodeGen/SimpleRegisterCoalescing.cpp Fri Oct 2 23:31:31 2009
@@ -399,7 +399,7 @@
bool BHasPHIKill = BValNo->hasPHIKill();
SmallVector<VNInfo*, 4> BDeadValNos;
VNInfo::KillSet BKills;
- std::map<LiveIndex, MachineInstrIndex> BExtend;
+ std::map<LiveIndex, LiveIndex> BExtend;
// If ALR and BLR overlaps and end of BLR extends beyond end of ALR, e.g.
// A = or A, B
@@ -494,7 +494,7 @@
AI != AE; ++AI) {
if (AI->valno != AValNo) continue;
LiveIndex End = AI->end;
- std::map<LiveIndex, MachineInstrIndex>::iterator
+ std::map<LiveIndex, LiveIndex>::iterator
EI = BExtend.find(End);
if (EI != BExtend.end())
End = EI->second;
@@ -549,7 +549,7 @@
/// from a physical register live interval as well as from the live intervals
/// of its sub-registers.
static void removeRange(LiveInterval &li,
- LiveIndex Start, MachineInstrIndex End,
+ LiveIndex Start, LiveIndex End,
LiveIntervals *li_, const TargetRegisterInfo *tri_) {
li.removeRange(Start, End, true);
if (TargetRegisterInfo::isPhysicalRegister(li.reg)) {
Modified: llvm/trunk/lib/CodeGen/Spiller.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/Spiller.cpp?rev=83255&r1=83254&r2=83255&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/Spiller.cpp (original)
+++ llvm/trunk/lib/CodeGen/Spiller.cpp Fri Oct 2 23:31:31 2009
@@ -321,7 +321,7 @@
vrm->assignVirt2StackSlot(li->reg, ss);
MachineInstr *mi = 0;
- LiveIndex storeIdx = MachineInstrIndex();
+ LiveIndex storeIdx = LiveIndex();
if (valno->isDefAccurate()) {
// If we have an accurate def we can just grab an iterator to the instr
@@ -335,7 +335,7 @@
}
MachineBasicBlock *defBlock = mi->getParent();
- LiveIndex loadIdx = MachineInstrIndex();
+ LiveIndex loadIdx = LiveIndex();
// Now we need to find the load...
MachineBasicBlock::iterator useItr(mi);
Modified: llvm/trunk/lib/CodeGen/StrongPHIElimination.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/StrongPHIElimination.cpp?rev=83255&r1=83254&r2=83255&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/StrongPHIElimination.cpp (original)
+++ llvm/trunk/lib/CodeGen/StrongPHIElimination.cpp Fri Oct 2 23:31:31 2009
@@ -748,7 +748,7 @@
LiveInterval& I = LI.getInterval(curr.second);
MachineBasicBlock::iterator term = MBB->getFirstTerminator();
- LiveIndex endIdx = MachineInstrIndex();
+ LiveIndex endIdx = LiveIndex();
if (term != MBB->end())
endIdx = LI.getInstructionIndex(term);
else
More information about the llvm-commits
mailing list