From c5d1a4ffd96528b49a9e34e06706f1499cd0fe80 Mon Sep 17 00:00:00 2001 From: Evan Cheng Date: Thu, 5 Feb 2009 08:46:33 +0000 Subject: [PATCH] Turn on machine LICM in non-fast mode. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@63855 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/CodeGen/LLVMTargetMachine.cpp | 6 +----- test/CodeGen/ARM/remat.ll | 2 +- test/CodeGen/X86/pre-split2.ll | 6 +++--- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/lib/CodeGen/LLVMTargetMachine.cpp b/lib/CodeGen/LLVMTargetMachine.cpp index c9ff15d4947..7def8fa61d2 100644 --- a/lib/CodeGen/LLVMTargetMachine.cpp +++ b/lib/CodeGen/LLVMTargetMachine.cpp @@ -42,10 +42,6 @@ static cl::opt PrintGCInfo("print-gc", cl::Hidden, static cl::opt EnableSinking("enable-sinking", cl::init(false), cl::Hidden, cl::desc("Perform sinking on machine code")); -static cl::opt -EnableLICM("machine-licm", - cl::init(false), cl::Hidden, - cl::desc("Perform loop-invariant code motion on machine code")); // When this works it will be on by default. static cl::opt @@ -187,7 +183,7 @@ bool LLVMTargetMachine::addCommonCodeGenPasses(PassManagerBase &PM, bool Fast) { if (PrintMachineCode) PM.add(createMachineFunctionPrinterPass(cerr)); - if (EnableLICM) + if (!Fast) PM.add(createMachineLICMPass()); if (EnableSinking) diff --git a/test/CodeGen/ARM/remat.ll b/test/CodeGen/ARM/remat.ll index 30b1d29e29e..454d36b46f2 100644 --- a/test/CodeGen/ARM/remat.ll +++ b/test/CodeGen/ARM/remat.ll @@ -1,5 +1,5 @@ ; RUN: llvm-as < %s | llc -mtriple=arm-apple-darwin -; RUN: llvm-as < %s | llc -mtriple=arm-apple-darwin -stats -info-output-file - | grep "Number of re-materialization" | grep 3 +; RUN: llvm-as < %s | llc -mtriple=arm-apple-darwin -stats -info-output-file - | grep "Number of re-materialization" | grep 2 %struct.CONTENTBOX = type { i32, i32, i32, i32, i32 } %struct.LOCBOX = type { i32, i32, i32, i32 } diff --git a/test/CodeGen/X86/pre-split2.ll b/test/CodeGen/X86/pre-split2.ll index fcb3f05a838..2009ad8b66d 100644 --- a/test/CodeGen/X86/pre-split2.ll +++ b/test/CodeGen/X86/pre-split2.ll @@ -1,7 +1,7 @@ ; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 -pre-alloc-split -stats |& \ -; RUN: grep {pre-alloc-split} | count 3 +; RUN: grep {pre-alloc-split} | count 2 -define i32 @t() { +define i32 @t(i32 %arg) { entry: br label %bb6 @@ -12,7 +12,7 @@ entry: br label %bb6 bb6: ; preds = %.noexc6, %entry - %1 = uitofp i32 0 to double ; [#uses=1] + %1 = uitofp i32 %arg to double ; [#uses=1] %2 = sub i32 0, 0 ; [#uses=1] %3 = invoke i8* @_Znwm(i32 0) to label %.noexc6 unwind label %lpad32 ; [#uses=1]