maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Revert 84843. Evan, this was breaking some of the if-conversion tests. 

llvm-svn: 84868
This commit is contained in:
Bob Wilson 2009-10-22 16:52:21 +00:00
parent cb8eb225b1
commit 9d763cc3f8
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
llvm/lib/Target/ARM/ARMTargetMachine.cpp
View File

@ -103,16 +103,18 @@ bool ARMBaseTargetMachine::addPreRegAlloc(PassManagerBase &PM,
bool ARMBaseTargetMachine::addPreSched2(PassManagerBase &PM, bool ARMBaseTargetMachine::addPreSched2(PassManagerBase &PM,
CodeGenOpt::Level OptLevel) { CodeGenOpt::Level OptLevel) {
// FIXME: temporarily disabling load / store optimization pass for Thumb1. // 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(createARMLoadStoreOptimizationPass());
PM.add(createIfConverterPass());
}
return true; return true;
} }
bool ARMBaseTargetMachine::addPreEmitPass(PassManagerBase &PM, bool ARMBaseTargetMachine::addPreEmitPass(PassManagerBase &PM,
CodeGenOpt::Level OptLevel) { CodeGenOpt::Level OptLevel) {
// FIXME: temporarily disabling load / store optimization pass for Thumb1.
if (OptLevel != CodeGenOpt::None && !Subtarget.isThumb1Only())
PM.add(createIfConverterPass());
if (Subtarget.isThumb2()) { if (Subtarget.isThumb2()) {
PM.add(createThumb2ITBlockPass()); PM.add(createThumb2ITBlockPass());
PM.add(createThumb2SizeReductionPass()); PM.add(createThumb2SizeReductionPass());

3
llvm/test/CodeGen/ARM/ifcvt5.ll
View File

@ -11,8 +11,7 @@ entry:
define void @t1(i32 %a, i32 %b) { define void @t1(i32 %a, i32 %b) {
; CHECK: t1: ; CHECK: t1:
; CHECK: movge ; CHECK: ldmltfd sp!, {r7, pc}
; CHECK: blge _foo
entry: entry:
%tmp1 = icmp sgt i32 %a, 10 ; <i1> [#uses=1] %tmp1 = icmp sgt i32 %a, 10 ; <i1> [#uses=1]
br i1 %tmp1, label %cond_true, label %UnifiedReturnBlock br i1 %tmp1, label %cond_true, label %UnifiedReturnBlock