diff options
| author | Evan Cheng <evan.cheng@apple.com> | 2009-10-22 06:48:32 +0000 |
|---|---|---|
| committer | Evan Cheng <evan.cheng@apple.com> | 2009-10-22 06:48:32 +0000 |
| commit | 3615b9bef3d71e602689ddeb74465069385b5fb6 (patch) | |
| tree | ba7c52a6f9272a08ac24682f5ecc4bff081d2fb5 | |
| parent | 943f4f41f2551a33fcce2cee2373ed6d178ebbdd (diff) | |
| download | bcm5719-llvm-3615b9bef3d71e602689ddeb74465069385b5fb6.tar.gz bcm5719-llvm-3615b9bef3d71e602689ddeb74465069385b5fb6.zip | |
Move if-conversion before post-regalloc scheduling so the predicated instruction get scheduled properly.
llvm-svn: 84843
| -rw-r--r-- | llvm/lib/Target/ARM/ARMTargetMachine.cpp | 8 | ||||
| -rw-r--r-- | llvm/test/CodeGen/ARM/ifcvt5.ll | 3 |
2 files changed, 5 insertions, 6 deletions
diff --git a/llvm/lib/Target/ARM/ARMTargetMachine.cpp b/llvm/lib/Target/ARM/ARMTargetMachine.cpp index c1da6ce88b9..bd2e7347d4f 100644 --- a/llvm/lib/Target/ARM/ARMTargetMachine.cpp +++ b/llvm/lib/Target/ARM/ARMTargetMachine.cpp @@ -103,18 +103,16 @@ bool ARMBaseTargetMachine::addPreRegAlloc(PassManagerBase &PM, bool ARMBaseTargetMachine::addPreSched2(PassManagerBase &PM, CodeGenOpt::Level OptLevel) { // FIXME: temporarily disabling load / store optimization pass for Thumb1. - if (OptLevel != CodeGenOpt::None && !Subtarget.isThumb1Only()) + if (OptLevel != CodeGenOpt::None && !Subtarget.isThumb1Only()) { PM.add(createARMLoadStoreOptimizationPass()); + PM.add(createIfConverterPass()); + } return true; } bool ARMBaseTargetMachine::addPreEmitPass(PassManagerBase &PM, CodeGenOpt::Level OptLevel) { - // FIXME: temporarily disabling load / store optimization pass for Thumb1. - if (OptLevel != CodeGenOpt::None && !Subtarget.isThumb1Only()) - PM.add(createIfConverterPass()); - if (Subtarget.isThumb2()) { PM.add(createThumb2ITBlockPass()); PM.add(createThumb2SizeReductionPass()); diff --git a/llvm/test/CodeGen/ARM/ifcvt5.ll b/llvm/test/CodeGen/ARM/ifcvt5.ll index e9145ac36dd..92bbe75baac 100644 --- a/llvm/test/CodeGen/ARM/ifcvt5.ll +++ b/llvm/test/CodeGen/ARM/ifcvt5.ll @@ -11,7 +11,8 @@ entry: define void @t1(i32 %a, i32 %b) { ; CHECK: t1: -; CHECK: ldmltfd sp!, {r7, pc} +; CHECK: movge +; CHECK: blge _foo entry: %tmp1 = icmp sgt i32 %a, 10 ; <i1> [#uses=1] br i1 %tmp1, label %cond_true, label %UnifiedReturnBlock |
