Fix reg mask slot test, and preserve LiveIntervals and VirtRegMap in the PBQP

allocator. Fixes PR13945.

llvm-svn: 165201
This commit is contained in:
Lang Hames 2012-10-04 04:50:53 +00:00
parent 03254cae95
commit 8ce99f296b
1 changed files with 3 additions and 1 deletions

View File

@ -231,7 +231,7 @@ std::auto_ptr<PBQPRAProblem> PBQPBuilder::build(MachineFunction *mf,
continue; continue;
// vregLI crosses a regmask operand that clobbers preg. // vregLI crosses a regmask operand that clobbers preg.
if (!regMaskOverlaps.empty() && !regMaskOverlaps.test(preg)) if (!regMaskOverlaps.empty() && regMaskOverlaps.test(preg))
continue; continue;
// vregLI overlaps fixed regunit interference. // vregLI overlaps fixed regunit interference.
@ -432,6 +432,7 @@ void RegAllocPBQP::getAnalysisUsage(AnalysisUsage &au) const {
au.addRequired<SlotIndexes>(); au.addRequired<SlotIndexes>();
au.addPreserved<SlotIndexes>(); au.addPreserved<SlotIndexes>();
au.addRequired<LiveIntervals>(); au.addRequired<LiveIntervals>();
au.addPreserved<LiveIntervals>();
//au.addRequiredID(SplitCriticalEdgesID); //au.addRequiredID(SplitCriticalEdgesID);
if (customPassID) if (customPassID)
au.addRequiredID(*customPassID); au.addRequiredID(*customPassID);
@ -443,6 +444,7 @@ void RegAllocPBQP::getAnalysisUsage(AnalysisUsage &au) const {
au.addRequired<MachineLoopInfo>(); au.addRequired<MachineLoopInfo>();
au.addPreserved<MachineLoopInfo>(); au.addPreserved<MachineLoopInfo>();
au.addRequired<VirtRegMap>(); au.addRequired<VirtRegMap>();
au.addPreserved<VirtRegMap>();
MachineFunctionPass::getAnalysisUsage(au); MachineFunctionPass::getAnalysisUsage(au);
} }