6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-12-14 11:32:34 +00:00
Code Issues Projects Releases Wiki Activity

Abstract merging of ranges away from number of slots per instruction.

Browse Source 
Also make it less aggressive as the current implementation breaks in
some cases.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@11696 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Alkis Evlogimenos 2004-02-22 04:05:13 +00:00
parent 0ad9170327
commit 7200c6b82a
4 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/llvm/CodeGen/LiveIntervalAnalysis.h
View File

@ -126,7 +126,10 @@ namespace llvm {
};
static unsigned getBaseIndex(unsigned index) {
return index - (index % 4);
return index - (index % InstrSlots::NUM);
}
static unsigned getBoundaryIndex(unsigned index) {
return getBaseIndex(index + InstrSlots::NUM - 1);
}
static unsigned getLoadIndex(unsigned index) {
return getBaseIndex(index) + InstrSlots::LOAD;

5
include/llvm/CodeGen/LiveIntervals.h
View File

@ -126,7 +126,10 @@ namespace llvm {
};
static unsigned getBaseIndex(unsigned index) {
return index - (index % 4);
return index - (index % InstrSlots::NUM);
}
static unsigned getBoundaryIndex(unsigned index) {
return getBaseIndex(index + InstrSlots::NUM - 1);
}
static unsigned getLoadIndex(unsigned index) {
return getBaseIndex(index) + InstrSlots::LOAD;

10
lib/CodeGen/LiveIntervalAnalysis.cpp
View File

@ -227,6 +227,7 @@ void LiveIntervals::updateSpilledInterval(Interval& li, int slot)
// the new spill weight is now infinity as it cannot be spilled again
li.weight = std::numeric_limits<float>::infinity();
DEBUG(std::cerr << '\n');
DEBUG(std::cerr << "\t\t\t\tupdated interval: " << li << '\n');
}
void LiveIntervals::printRegName(unsigned reg) const
@ -652,8 +653,10 @@ void LiveIntervals::Interval::join(const LiveIntervals::Interval& other)
LiveIntervals::Interval::Ranges::iterator
LiveIntervals::Interval::mergeRangesForward(Ranges::iterator it)
{
for (Ranges::iterator n = next(it);
n != ranges.end() && ((it->second & 1) + it->second) >= n->first; ) {
Ranges::iterator n;
while ((n = next(it)) != ranges.end()) {
if (n->first > it->second)
break;
it->second = std::max(it->second, n->second);
n = ranges.erase(n);
}
@ -665,7 +668,8 @@ LiveIntervals::Interval::mergeRangesBackward(Ranges::iterator it)
{
while (it != ranges.begin()) {
Ranges::iterator p = prior(it);
if (it->first > ((p->second & 1) + p->second)) break;
if (it->first > p->second)
break;
it->first = std::min(it->first, p->first);
it->second = std::max(it->second, p->second);

5
lib/CodeGen/LiveIntervalAnalysis.h
View File

@ -126,7 +126,10 @@ namespace llvm {
};
static unsigned getBaseIndex(unsigned index) {
return index - (index % 4);
return index - (index % InstrSlots::NUM);
}
static unsigned getBoundaryIndex(unsigned index) {
return getBaseIndex(index + InstrSlots::NUM - 1);
}
static unsigned getLoadIndex(unsigned index) {
return getBaseIndex(index) + InstrSlots::LOAD;