replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix failing test cases with joined live intervals. It turns out that 

when joining we need to check if we overlap with the second interval
or any of its aliases.

Also make joining intervals the default.

llvm-svn: 10973
This commit is contained in:
Alkis Evlogimenos 2004-01-23 13:37:51 +00:00
parent f0cc848602
commit 59e3325c26
2 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -162,6 +162,8 @@ namespace llvm {
MachineBasicBlock::iterator mi,
unsigned reg);
bool overlapsAliases(const Interval& lhs, const Interval& rhs) const;
unsigned getInstructionIndex(MachineInstr* instr) const;
void printRegName(unsigned reg) const;

27
llvm/lib/CodeGen/LiveIntervals.cpp
View File

@ -49,7 +49,7 @@ namespace {
cl::opt<bool>
join("join-liveintervals",
cl::desc("Join compatible live intervals"),
cl::init(false));
cl::init(true));
};
void LiveIntervals::getAnalysisUsage(AnalysisUsage &AU) const
@ -387,26 +387,31 @@ void LiveIntervals::joinIntervals()
Intervals::iterator srcInt = r2iSrc->second;
Intervals::iterator dstInt = r2iDst->second;
// src is a physical register
if (srcInt->reg < MRegisterInfo::FirstVirtualRegister) {
if (dstInt->reg == srcInt->reg ||
(dstInt->reg >= MRegisterInfo::FirstVirtualRegister &&
!dstInt->overlaps(*srcInt))) {
!srcInt->overlaps(*dstInt) &&
!overlapsAliases(*srcInt, *dstInt))) {
srcInt->join(*dstInt);
r2iDst->second = r2iSrc->second;
r2rMap_.insert(std::make_pair(dstInt->reg, srcInt->reg));
intervals_.erase(dstInt);
}
}
// dst is a physical register
else if (dstInt->reg < MRegisterInfo::FirstVirtualRegister) {
if (srcInt->reg == dstInt->reg ||
(srcInt->reg >= MRegisterInfo::FirstVirtualRegister &&
!srcInt->overlaps(*dstInt))) {
!dstInt->overlaps(*srcInt) &&
!overlapsAliases(*dstInt, *srcInt))) {
dstInt->join(*srcInt);
r2iSrc->second = r2iDst->second;
r2rMap_.insert(std::make_pair(srcInt->reg, dstInt->reg));
intervals_.erase(srcInt);
}
}
// neither src nor dst are physical registers
else {
const TargetRegisterClass *srcRc, *dstRc;
srcRc = mf_->getSSARegMap()->getRegClass(srcInt->reg);
@ -432,6 +437,22 @@ void LiveIntervals::joinIntervals()
}
bool LiveIntervals::overlapsAliases(const Interval& lhs,
const Interval& rhs) const
{
assert(lhs.reg < MRegisterInfo::FirstVirtualRegister &&
"first interval must describe a physical register");
for (const unsigned* as = mri_->getAliasSet(lhs.reg); *as; ++as) {
Reg2IntervalMap::const_iterator r2i = r2iMap_.find(*as);
assert(r2i != r2iMap_.end() && "alias does not have interval?");
if (rhs.overlaps(*r2i->second))
return true;
}
return false;
}
LiveIntervals::Interval::Interval(unsigned r)
: reg(r),
weight((r < MRegisterInfo::FirstVirtualRegister ?