Disable fancy splitting during spilling unless -extra-spiller-splits is given.

This way, InlineSpiller does the same amount of splitting as the standard
spiller. Splitting should really be guided by the register allocator, and
doesn't belong in the spiller at all.

llvm-svn: 118216
This commit is contained in:
Jakob Stoklund Olesen 2010-11-04 00:32:32 +00:00
parent cc10cbfbc7
commit a2e098df12
1 changed files with 18 additions and 8 deletions

View File

@ -35,6 +35,10 @@ using namespace llvm;
static cl::opt<bool>
VerifySpills("verify-spills", cl::desc("Verify after each spill/split"));
static cl::opt<bool>
ExtraSpillerSplits("extra-spiller-splits",
cl::desc("Enable additional splitting during splitting"));
namespace {
class InlineSpiller : public Spiller {
MachineFunctionPass &pass_;
@ -116,10 +120,13 @@ bool InlineSpiller::split() {
splitAnalysis_.analyze(&edit_->getParent());
// Try splitting around loops.
if (const MachineLoop *loop = splitAnalysis_.getBestSplitLoop()) {
SplitEditor(splitAnalysis_, lis_, vrm_, mdt_, *edit_)
.splitAroundLoop(loop);
return true;
if (ExtraSpillerSplits) {
const MachineLoop *loop = splitAnalysis_.getBestSplitLoop();
if (loop) {
SplitEditor(splitAnalysis_, lis_, vrm_, mdt_, *edit_)
.splitAroundLoop(loop);
return true;
}
}
// Try splitting into single block intervals.
@ -131,10 +138,13 @@ bool InlineSpiller::split() {
}
// Try splitting inside a basic block.
if (const MachineBasicBlock *MBB = splitAnalysis_.getBlockForInsideSplit()) {
SplitEditor(splitAnalysis_, lis_, vrm_, mdt_, *edit_)
.splitInsideBlock(MBB);
return true;
if (ExtraSpillerSplits) {
const MachineBasicBlock *MBB = splitAnalysis_.getBlockForInsideSplit();
if (MBB){
SplitEditor(splitAnalysis_, lis_, vrm_, mdt_, *edit_)
.splitInsideBlock(MBB);
return true;
}
}
return false;