Index: llvm/trunk/include/llvm/CodeGen/RegisterPressure.h =================================================================== --- llvm/trunk/include/llvm/CodeGen/RegisterPressure.h +++ llvm/trunk/include/llvm/CodeGen/RegisterPressure.h @@ -31,10 +31,6 @@ /// Map of max reg pressure indexed by pressure set ID, not class ID. std::vector MaxSetPressure; - /// List of live in virtual registers or physical register units. - SmallVector LiveInRegs; - SmallVector LiveOutRegs; - void dump(const TargetRegisterInfo *TRI) const; }; @@ -267,6 +263,10 @@ /// Set of vreg defs that start a live range. SparseSet UntiedDefs; + /// List of live in virtual registers or physical register units. + SmallVector LiveInRegs; + /// List of live out virtual registers or physical register units. + SmallVector LiveOutRegs; /// Live-through pressure. std::vector LiveThruPressure; @@ -323,6 +323,8 @@ LiveThruPressure.assign(PressureSet.begin(), PressureSet.end()); } + ArrayRef getLiveIn() const { return LiveInRegs; } + ArrayRef getLiveOut() const { return LiveOutRegs; } ArrayRef getLiveThru() const { return LiveThruPressure; } /// Get the resulting register pressure over the traversed region. Index: llvm/trunk/lib/CodeGen/MachineScheduler.cpp =================================================================== --- llvm/trunk/lib/CodeGen/MachineScheduler.cpp +++ llvm/trunk/lib/CodeGen/MachineScheduler.cpp @@ -878,8 +878,8 @@ DEBUG(RPTracker.dump()); // Initialize the live ins and live outs. - TopRPTracker.addLiveRegs(RPTracker.getPressure().LiveInRegs); - BotRPTracker.addLiveRegs(RPTracker.getPressure().LiveOutRegs); + TopRPTracker.addLiveRegs(RPTracker.getLiveIn()); + BotRPTracker.addLiveRegs(RPTracker.getLiveOut()); // Close one end of the tracker so we can call // getMaxUpward/DownwardPressureDelta before advancing across any @@ -896,7 +896,7 @@ // For each live out vreg reduce the pressure change associated with other // uses of the same vreg below the live-out reaching def. - updatePressureDiffs(RPTracker.getPressure().LiveOutRegs); + updatePressureDiffs(RPTracker.getLiveOut()); // Account for liveness generated by the region boundary. if (LiveRegionEnd != RegionEnd) { @@ -1135,7 +1135,7 @@ unsigned MaxCyclicLatency = 0; // Visit each live out vreg def to find def/use pairs that cross iterations. - ArrayRef LiveOuts = RPTracker.getPressure().LiveOutRegs; + ArrayRef LiveOuts = RPTracker.getLiveOut(); for (ArrayRef::iterator RI = LiveOuts.begin(), RE = LiveOuts.end(); RI != RE; ++RI) { unsigned Reg = *RI; Index: llvm/trunk/lib/CodeGen/RegisterPressure.cpp =================================================================== --- llvm/trunk/lib/CodeGen/RegisterPressure.cpp +++ llvm/trunk/lib/CodeGen/RegisterPressure.cpp @@ -58,14 +58,6 @@ void RegisterPressure::dump(const TargetRegisterInfo *TRI) const { dbgs() << "Max Pressure: "; dumpRegSetPressure(MaxSetPressure, TRI); - dbgs() << "Live In: "; - for (unsigned i = 0, e = LiveInRegs.size(); i < e; ++i) - dbgs() << PrintVRegOrUnit(LiveInRegs[i], TRI) << " "; - dbgs() << '\n'; - dbgs() << "Live Out: "; - for (unsigned i = 0, e = LiveOutRegs.size(); i < e; ++i) - dbgs() << PrintVRegOrUnit(LiveOutRegs[i], TRI) << " "; - dbgs() << '\n'; } LLVM_DUMP_METHOD @@ -75,6 +67,14 @@ dumpRegSetPressure(CurrSetPressure, TRI); } P.dump(TRI); + dbgs() << "Live In: "; + for (unsigned i = 0, e = LiveInRegs.size(); i < e; ++i) + dbgs() << PrintVRegOrUnit(LiveInRegs[i], TRI) << " "; + dbgs() << '\n'; + dbgs() << "Live Out: "; + for (unsigned i = 0, e = LiveOutRegs.size(); i < e; ++i) + dbgs() << PrintVRegOrUnit(LiveOutRegs[i], TRI) << " "; + dbgs() << '\n'; } void PressureDiff::dump(const TargetRegisterInfo &TRI) const { @@ -112,16 +112,12 @@ void IntervalPressure::reset() { TopIdx = BottomIdx = SlotIndex(); MaxSetPressure.clear(); - LiveInRegs.clear(); - LiveOutRegs.clear(); } /// Clear the result so it can be used for another round of pressure tracking. void RegionPressure::reset() { TopPos = BottomPos = MachineBasicBlock::const_iterator(); MaxSetPressure.clear(); - LiveInRegs.clear(); - LiveOutRegs.clear(); } /// If the current top is not less than or equal to the next index, open it. @@ -130,7 +126,6 @@ if (TopIdx <= NextTop) return; TopIdx = SlotIndex(); - LiveInRegs.clear(); } /// If the current top is the previous instruction (before receding), open it. @@ -138,7 +133,6 @@ if (TopPos != PrevTop) return; TopPos = MachineBasicBlock::const_iterator(); - LiveInRegs.clear(); } /// If the current bottom is not greater than the previous index, open it. @@ -146,7 +140,6 @@ if (BottomIdx > PrevBottom) return; BottomIdx = SlotIndex(); - LiveInRegs.clear(); } /// If the current bottom is the previous instr (before advancing), open it. @@ -154,7 +147,6 @@ if (BottomPos != PrevBottom) return; BottomPos = MachineBasicBlock::const_iterator(); - LiveInRegs.clear(); } const LiveRange *RegPressureTracker::getLiveRange(unsigned Reg) const { @@ -175,6 +167,8 @@ static_cast(P).reset(); else static_cast(P).reset(); + LiveInRegs.clear(); + LiveOutRegs.clear(); LiveRegs.PhysRegs.clear(); LiveRegs.VirtRegs.clear(); @@ -249,10 +243,10 @@ else static_cast(P).TopPos = CurrPos; - assert(P.LiveInRegs.empty() && "inconsistent max pressure result"); - P.LiveInRegs.reserve(LiveRegs.PhysRegs.size() + LiveRegs.VirtRegs.size()); - P.LiveInRegs.append(LiveRegs.PhysRegs.begin(), LiveRegs.PhysRegs.end()); - P.LiveInRegs.append(LiveRegs.VirtRegs.begin(), LiveRegs.VirtRegs.end()); + assert(LiveInRegs.empty() && "inconsistent max pressure result"); + LiveInRegs.reserve(LiveRegs.PhysRegs.size() + LiveRegs.VirtRegs.size()); + LiveInRegs.append(LiveRegs.PhysRegs.begin(), LiveRegs.PhysRegs.end()); + LiveInRegs.append(LiveRegs.VirtRegs.begin(), LiveRegs.VirtRegs.end()); } /// Set the boundary for the bottom of the region and summarize live outs. @@ -262,10 +256,10 @@ else static_cast(P).BottomPos = CurrPos; - assert(P.LiveOutRegs.empty() && "inconsistent max pressure result"); - P.LiveOutRegs.reserve(LiveRegs.PhysRegs.size() + LiveRegs.VirtRegs.size()); - P.LiveOutRegs.append(LiveRegs.PhysRegs.begin(), LiveRegs.PhysRegs.end()); - P.LiveOutRegs.append(LiveRegs.VirtRegs.begin(), LiveRegs.VirtRegs.end()); + assert(LiveOutRegs.empty() && "inconsistent max pressure result"); + LiveOutRegs.reserve(LiveRegs.PhysRegs.size() + LiveRegs.VirtRegs.size()); + LiveOutRegs.append(LiveRegs.PhysRegs.begin(), LiveRegs.PhysRegs.end()); + LiveOutRegs.append(LiveRegs.VirtRegs.begin(), LiveRegs.VirtRegs.end()); } /// Finalize the region boundaries and record live ins and live outs. @@ -289,8 +283,8 @@ void RegPressureTracker::initLiveThru(const RegPressureTracker &RPTracker) { LiveThruPressure.assign(TRI->getNumRegPressureSets(), 0); assert(isBottomClosed() && "need bottom-up tracking to intialize."); - for (unsigned i = 0, e = P.LiveOutRegs.size(); i < e; ++i) { - unsigned Reg = P.LiveOutRegs[i]; + for (unsigned i = 0, e = LiveOutRegs.size(); i < e; ++i) { + unsigned Reg = LiveOutRegs[i]; if (TargetRegisterInfo::isVirtualRegister(Reg) && !RPTracker.hasUntiedDef(Reg)) { increaseSetPressure(LiveThruPressure, MRI->getPressureSets(Reg)); @@ -431,22 +425,22 @@ /// Add Reg to the live in set and increase max pressure. void RegPressureTracker::discoverLiveIn(unsigned Reg) { assert(!LiveRegs.contains(Reg) && "avoid bumping max pressure twice"); - if (containsReg(P.LiveInRegs, Reg)) + if (containsReg(LiveInRegs, Reg)) return; // At live in discovery, unconditionally increase the high water mark. - P.LiveInRegs.push_back(Reg); + LiveInRegs.push_back(Reg); increaseSetPressure(P.MaxSetPressure, MRI->getPressureSets(Reg)); } /// Add Reg to the live out set and increase max pressure. void RegPressureTracker::discoverLiveOut(unsigned Reg) { assert(!LiveRegs.contains(Reg) && "avoid bumping max pressure twice"); - if (containsReg(P.LiveOutRegs, Reg)) + if (containsReg(LiveOutRegs, Reg)) return; // At live out discovery, unconditionally increase the high water mark. - P.LiveOutRegs.push_back(Reg); + LiveOutRegs.push_back(Reg); increaseSetPressure(P.MaxSetPressure, MRI->getPressureSets(Reg)); } @@ -483,8 +477,11 @@ SlotIdx = LIS->getInstructionIndex(CurrPos).getRegSlot(); // Open the top of the region using slot indexes. - if (RequireIntervals && isTopClosed()) - static_cast(P).openTop(SlotIdx); + if (isTopClosed()) { + if (RequireIntervals) + static_cast(P).openTop(SlotIdx); + LiveInRegs.clear(); + } RegisterOperands RegOpers(TRI, MRI); collectOperands(CurrPos, RegOpers); @@ -573,6 +570,7 @@ static_cast(P).openBottom(SlotIdx); else static_cast(P).openBottom(CurrPos); + LiveOutRegs.clear(); } RegisterOperands RegOpers(TRI, MRI);