mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2026-04-23 22:23:00 +00:00
Refine stack slot interval weight computation.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@52040 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
@@ -515,11 +515,14 @@ static void RevertVectorIteratorsTo(RALinScan::IntervalPtrs &V, unsigned Point){
|
||||
/// addStackInterval - Create a LiveInterval for stack if the specified live
|
||||
/// interval has been spilled.
|
||||
static void addStackInterval(LiveInterval *cur, LiveStacks *ls_,
|
||||
LiveIntervals *li_, VirtRegMap &vrm_) {
|
||||
LiveIntervals *li_, float &Weight,
|
||||
VirtRegMap &vrm_) {
|
||||
int SS = vrm_.getStackSlot(cur->reg);
|
||||
if (SS == VirtRegMap::NO_STACK_SLOT)
|
||||
return;
|
||||
LiveInterval &SI = ls_->getOrCreateInterval(SS);
|
||||
SI.weight += Weight;
|
||||
|
||||
VNInfo *VNI;
|
||||
if (SI.getNumValNums())
|
||||
VNI = SI.getValNumInfo(0);
|
||||
@@ -529,7 +532,6 @@ static void addStackInterval(LiveInterval *cur, LiveStacks *ls_,
|
||||
LiveInterval &RI = li_->getInterval(cur->reg);
|
||||
// FIXME: This may be overly conservative.
|
||||
SI.MergeRangesInAsValue(RI, VNI);
|
||||
SI.weight += RI.weight;
|
||||
}
|
||||
|
||||
/// assignRegOrStackSlotAtInterval - assign a register if one is available, or
|
||||
@@ -743,9 +745,10 @@ void RALinScan::assignRegOrStackSlotAtInterval(LiveInterval* cur)
|
||||
// linearscan.
|
||||
if (cur->weight != HUGE_VALF && cur->weight <= minWeight) {
|
||||
DOUT << "\t\t\tspilling(c): " << *cur << '\n';
|
||||
float SSWeight;
|
||||
std::vector<LiveInterval*> added =
|
||||
li_->addIntervalsForSpills(*cur, loopInfo, *vrm_);
|
||||
addStackInterval(cur, ls_, li_, *vrm_);
|
||||
li_->addIntervalsForSpills(*cur, loopInfo, *vrm_, SSWeight);
|
||||
addStackInterval(cur, ls_, li_, SSWeight, *vrm_);
|
||||
if (added.empty())
|
||||
return; // Early exit if all spills were folded.
|
||||
|
||||
@@ -796,9 +799,10 @@ void RALinScan::assignRegOrStackSlotAtInterval(LiveInterval* cur)
|
||||
cur->overlapsFrom(*i->first, i->second)) {
|
||||
DOUT << "\t\t\tspilling(a): " << *i->first << '\n';
|
||||
earliestStart = std::min(earliestStart, i->first->beginNumber());
|
||||
float SSWeight;
|
||||
std::vector<LiveInterval*> newIs =
|
||||
li_->addIntervalsForSpills(*i->first, loopInfo, *vrm_);
|
||||
addStackInterval(i->first, ls_, li_, *vrm_);
|
||||
li_->addIntervalsForSpills(*i->first, loopInfo, *vrm_, SSWeight);
|
||||
addStackInterval(i->first, ls_, li_, SSWeight, *vrm_);
|
||||
std::copy(newIs.begin(), newIs.end(), std::back_inserter(added));
|
||||
spilled.insert(reg);
|
||||
}
|
||||
@@ -810,9 +814,10 @@ void RALinScan::assignRegOrStackSlotAtInterval(LiveInterval* cur)
|
||||
cur->overlapsFrom(*i->first, i->second-1)) {
|
||||
DOUT << "\t\t\tspilling(i): " << *i->first << '\n';
|
||||
earliestStart = std::min(earliestStart, i->first->beginNumber());
|
||||
float SSWeight;
|
||||
std::vector<LiveInterval*> newIs =
|
||||
li_->addIntervalsForSpills(*i->first, loopInfo, *vrm_);
|
||||
addStackInterval(i->first, ls_, li_, *vrm_);
|
||||
li_->addIntervalsForSpills(*i->first, loopInfo, *vrm_, SSWeight);
|
||||
addStackInterval(i->first, ls_, li_, SSWeight, *vrm_);
|
||||
std::copy(newIs.begin(), newIs.end(), std::back_inserter(added));
|
||||
spilled.insert(reg);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user