diff options
| author | James Molloy <james.molloy@arm.com> | 2014-06-16 16:42:53 +0000 |
|---|---|---|
| committer | James Molloy <james.molloy@arm.com> | 2014-06-16 16:42:53 +0000 |
| commit | 408519765b1c8e8a09e4a6028839f323119fbd86 (patch) | |
| tree | 5f3a887e5486fcfe1963366ee03cec1da55df45c /lib | |
| parent | 7f2f94faeb04e0f97990d9d941745a630aaa5a54 (diff) | |
| download | llvm-408519765b1c8e8a09e4a6028839f323119fbd86.tar.gz llvm-408519765b1c8e8a09e4a6028839f323119fbd86.tar.bz2 llvm-408519765b1c8e8a09e4a6028839f323119fbd86.tar.xz | |
Refactor the disabling of Thumb-1 LDM/STM generation
Originally I switched the LD/ST optimizer off in TargetMachine as it was previously, but Eric has suggested he'd prefer that it be short-circuited in the pass itself.
No functionality change.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@211037 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Target/ARM/ARMLoadStoreOptimizer.cpp | 4 | ||||
| -rw-r--r-- | lib/Target/ARM/ARMTargetMachine.cpp | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/lib/Target/ARM/ARMLoadStoreOptimizer.cpp b/lib/Target/ARM/ARMLoadStoreOptimizer.cpp index 62fd059656..a91bb972fb 100644 --- a/lib/Target/ARM/ARMLoadStoreOptimizer.cpp +++ b/lib/Target/ARM/ARMLoadStoreOptimizer.cpp @@ -1734,6 +1734,10 @@ bool ARMLoadStoreOpt::runOnMachineFunction(MachineFunction &Fn) { isThumb2 = AFI->isThumb2Function(); isThumb1 = AFI->isThumbFunction() && !isThumb2; + // FIXME: Temporarily disabling for Thumb-1 due to miscompiles + if (isThumb1) + return false; + bool Modified = false; for (MachineFunction::iterator MFI = Fn.begin(), E = Fn.end(); MFI != E; ++MFI) { diff --git a/lib/Target/ARM/ARMTargetMachine.cpp b/lib/Target/ARM/ARMTargetMachine.cpp index d1e7b4fcf5..a93824230d 100644 --- a/lib/Target/ARM/ARMTargetMachine.cpp +++ b/lib/Target/ARM/ARMTargetMachine.cpp @@ -203,8 +203,7 @@ bool ARMPassConfig::addInstSelector() { } bool ARMPassConfig::addPreRegAlloc() { - // FIXME: Temporarily disabling Thumb-1 pre-RA Load/Store optimization pass - if (getOptLevel() != CodeGenOpt::None && !getARMSubtarget().isThumb1Only()) + if (getOptLevel() != CodeGenOpt::None) addPass(createARMLoadStoreOptimizationPass(true)); if (getOptLevel() != CodeGenOpt::None && getARMSubtarget().isCortexA9()) addPass(createMLxExpansionPass()); @@ -219,11 +218,8 @@ bool ARMPassConfig::addPreRegAlloc() { bool ARMPassConfig::addPreSched2() { if (getOptLevel() != CodeGenOpt::None) { - // FIXME: Temporarily disabling Thumb-1 post-RA Load/Store optimization pass - if (!getARMSubtarget().isThumb1Only()) { - addPass(createARMLoadStoreOptimizationPass()); - printAndVerify("After ARM load / store optimizer"); - } + addPass(createARMLoadStoreOptimizationPass()); + printAndVerify("After ARM load / store optimizer"); if (getARMSubtarget().hasNEON()) addPass(createExecutionDependencyFixPass(&ARM::DPRRegClass)); |