Now that the memory leak from McCat/08-main has been fixed (86056), re-enable

aggressive testing of dynamic stack alignment.
Note that this is off by default, and enabled for LLCBETA nightly results.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@86064 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Jim Grosbach 2009-11-04 23:11:07 +00:00
parent 6db06a0866
commit db1751a922

View File

@ -476,7 +476,11 @@ ARMBaseRegisterInfo::UpdateRegAllocHint(unsigned Reg, unsigned NewReg,
} }
static unsigned calculateMaxStackAlignment(const MachineFrameInfo *FFI) { static unsigned calculateMaxStackAlignment(const MachineFrameInfo *FFI) {
unsigned MaxAlign = 0; // FIXME: For now, force at least 128-bit alignment. This will push the
// nightly tester harder for making sure things work correctly. When
// we're ready to enable this for real, this goes back to starting at zero.
unsigned MaxAlign = 16;
// unsigned MaxAlign = 0;
for (int i = FFI->getObjectIndexBegin(), for (int i = FFI->getObjectIndexBegin(),
e = FFI->getObjectIndexEnd(); i != e; ++i) { e = FFI->getObjectIndexEnd(); i != e; ++i) {
@ -509,13 +513,15 @@ needsStackRealignment(const MachineFunction &MF) const {
if (!ARMDynamicStackAlign) if (!ARMDynamicStackAlign)
return false; return false;
// FIXME: To force more brutal testing, realign whether we need to or not.
// Change this to be more selective when we turn it on for real, of course.
const MachineFrameInfo *MFI = MF.getFrameInfo(); const MachineFrameInfo *MFI = MF.getFrameInfo();
const ARMFunctionInfo *AFI = MF.getInfo<ARMFunctionInfo>(); const ARMFunctionInfo *AFI = MF.getInfo<ARMFunctionInfo>();
unsigned StackAlign = MF.getTarget().getFrameInfo()->getStackAlignment(); // unsigned StackAlign = MF.getTarget().getFrameInfo()->getStackAlignment();
return (RealignStack && return (RealignStack &&
!AFI->isThumb1OnlyFunction() && !AFI->isThumb1OnlyFunction() &&
AFI->hasStackFrame() && AFI->hasStackFrame() &&
(MFI->getMaxAlignment() > StackAlign) && // (MFI->getMaxAlignment() > StackAlign) &&
!MFI->hasVarSizedObjects()); !MFI->hasVarSizedObjects());
} }