diff options
| author | Eric Christopher <echristo@apple.com> | 2010-11-11 20:50:14 +0000 |
|---|---|---|
| committer | Eric Christopher <echristo@apple.com> | 2010-11-11 20:50:14 +0000 |
| commit | 7ae11c69624b8bf1efb8b73ba9b3b29bde054365 (patch) | |
| tree | 56ef2cadfb861a64d318810306567f19812ab4b3 /llvm/lib/Target/ARM/ARMTargetMachine.cpp | |
| parent | ad3832e213ddd80aaec3653289977eca2f3d2e06 (diff) | |
| download | bcm5719-llvm-7ae11c69624b8bf1efb8b73ba9b3b29bde054365.tar.gz bcm5719-llvm-7ae11c69624b8bf1efb8b73ba9b3b29bde054365.zip | |
Revert the accidental commit I made reverting the previous commit.
llvm-svn: 118835
Diffstat (limited to 'llvm/lib/Target/ARM/ARMTargetMachine.cpp')
| -rw-r--r-- | llvm/lib/Target/ARM/ARMTargetMachine.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/llvm/lib/Target/ARM/ARMTargetMachine.cpp b/llvm/lib/Target/ARM/ARMTargetMachine.cpp index d15963986c7..81279d257c0 100644 --- a/llvm/lib/Target/ARM/ARMTargetMachine.cpp +++ b/llvm/lib/Target/ARM/ARMTargetMachine.cpp @@ -148,7 +148,7 @@ bool ARMBaseTargetMachine::addInstSelector(PassManagerBase &PM, bool ARMBaseTargetMachine::addPreRegAlloc(PassManagerBase &PM, CodeGenOpt::Level OptLevel) { // FIXME: temporarily disabling load / store optimization pass for Thumb1. - if (!Subtarget.isThumb1Only()) + if (OptLevel != CodeGenOpt::None && !Subtarget.isThumb1Only()) PM.add(createARMLoadStoreOptimizationPass(true)); return true; @@ -157,11 +157,12 @@ bool ARMBaseTargetMachine::addPreRegAlloc(PassManagerBase &PM, bool ARMBaseTargetMachine::addPreSched2(PassManagerBase &PM, CodeGenOpt::Level OptLevel) { // FIXME: temporarily disabling load / store optimization pass for Thumb1. - if (!Subtarget.isThumb1Only()) - PM.add(createARMLoadStoreOptimizationPass()); - - if (OptLevel != CodeGenOpt::None && Subtarget.hasNEON()) - PM.add(createNEONMoveFixPass()); + if (OptLevel != CodeGenOpt::None) { + if (!Subtarget.isThumb1Only()) + PM.add(createARMLoadStoreOptimizationPass()); + if (Subtarget.hasNEON()) + PM.add(createNEONMoveFixPass()); + } // Expand some pseudo instructions into multiple instructions to allow // proper scheduling. |
