From 84e58d03c910aa6ea8557d2f2f9de1f96162cae1 Mon Sep 17 00:00:00 2001 From: Jim Grosbach Date: Thu, 29 Oct 2009 02:41:21 +0000 Subject: [PATCH] To get more thorough testing from llc-beta nightly runs, do dynamic stack realignment regardless of whether it's strictly necessary. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@85476 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Target/ARM/ARMBaseRegisterInfo.cpp | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/lib/Target/ARM/ARMBaseRegisterInfo.cpp b/lib/Target/ARM/ARMBaseRegisterInfo.cpp index b2bf4f07789..3de83af8344 100644 --- a/lib/Target/ARM/ARMBaseRegisterInfo.cpp +++ b/lib/Target/ARM/ARMBaseRegisterInfo.cpp @@ -467,7 +467,11 @@ ARMBaseRegisterInfo::UpdateRegAllocHint(unsigned Reg, unsigned NewReg, } 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(), e = FFI->getObjectIndexEnd(); i != e; ++i) { @@ -500,14 +504,15 @@ needsStackRealignment(const MachineFunction &MF) const { if (!ARMDynamicStackAlign) 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 ARMFunctionInfo *AFI = MF.getInfo(); - unsigned StackAlign = MF.getTarget().getFrameInfo()->getStackAlignment(); +// unsigned StackAlign = MF.getTarget().getFrameInfo()->getStackAlignment(); return (RealignStack && !AFI->isThumb1OnlyFunction() && - (MFI->getMaxAlignment() > StackAlign) && +// (MFI->getMaxAlignment() > StackAlign) && !MFI->hasVarSizedObjects()); - } bool ARMBaseRegisterInfo::cannotEliminateFrame(const MachineFunction &MF) const {