[llvm-commits] [llvm] r64135 - in /llvm/branches/Apple/Dib: lib/CodeGen/LLVMTargetMachine.cpp test/CodeGen/ARM/lsr-code-insertion.ll test/CodeGen/X86/2006-05-11-InstrSched.ll test/CodeGen/X86/2009-02-07-CoalescerBug.ll

Bill Wendling isanbard at gmail.com
Mon Feb 9 02:56:41 PST 2009


Author: void
Date: Mon Feb  9 04:56:40 2009
New Revision: 64135

URL: http://llvm.org/viewvc/llvm-project?rev=64135&view=rev
Log:
Pull r64126 into Dib:

Re-enable machine sinking pass now that the coalescer bugs and the AnalyzeBrnach
bug are fixed.

Modified:
    llvm/branches/Apple/Dib/lib/CodeGen/LLVMTargetMachine.cpp
    llvm/branches/Apple/Dib/test/CodeGen/ARM/lsr-code-insertion.ll
    llvm/branches/Apple/Dib/test/CodeGen/X86/2006-05-11-InstrSched.ll
    llvm/branches/Apple/Dib/test/CodeGen/X86/2009-02-07-CoalescerBug.ll

Modified: llvm/branches/Apple/Dib/lib/CodeGen/LLVMTargetMachine.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Dib/lib/CodeGen/LLVMTargetMachine.cpp?rev=64135&r1=64134&r2=64135&view=diff

==============================================================================
--- llvm/branches/Apple/Dib/lib/CodeGen/LLVMTargetMachine.cpp (original)
+++ llvm/branches/Apple/Dib/lib/CodeGen/LLVMTargetMachine.cpp Mon Feb  9 04:56:40 2009
@@ -38,11 +38,6 @@
 static cl::opt<bool> PrintGCInfo("print-gc", cl::Hidden,
     cl::desc("Dump garbage collector data"));
 
-// Hidden options to help debugging
-static cl::opt<bool>
-EnableSinking("enable-sinking", cl::init(false), cl::Hidden,
-              cl::desc("Perform sinking on machine code"));
-
 // When this works it will be on by default.
 static cl::opt<bool>
 DisablePostRAScheduler("disable-post-RA-scheduler",
@@ -183,11 +178,10 @@
   if (PrintMachineCode)
     PM.add(createMachineFunctionPrinterPass(cerr));
 
-  if (!Fast)
+  if (!Fast) {
     PM.add(createMachineLICMPass());
-
-  if (EnableSinking)
     PM.add(createMachineSinkingPass());
+  }
 
   // Run pre-ra passes.
   if (addPreRegAlloc(PM, Fast) && PrintMachineCode)

Modified: llvm/branches/Apple/Dib/test/CodeGen/ARM/lsr-code-insertion.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Dib/test/CodeGen/ARM/lsr-code-insertion.ll?rev=64135&r1=64134&r2=64135&view=diff

==============================================================================
--- llvm/branches/Apple/Dib/test/CodeGen/ARM/lsr-code-insertion.ll (original)
+++ llvm/branches/Apple/Dib/test/CodeGen/ARM/lsr-code-insertion.ll Mon Feb  9 04:56:40 2009
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -stats |& grep {39.*Number of machine instrs printed}
+; RUN: llvm-as < %s | llc -stats |& grep {40.*Number of machine instrs printed}
 ; RUN: llvm-as < %s | llc -stats |& grep {.*Number of re-materialization}
 ; This test really wants to check that the resultant "cond_true" block only 
 ; has a single store in it, and that cond_true55 only has code to materialize 

Modified: llvm/branches/Apple/Dib/test/CodeGen/X86/2006-05-11-InstrSched.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Dib/test/CodeGen/X86/2006-05-11-InstrSched.ll?rev=64135&r1=64134&r2=64135&view=diff

==============================================================================
--- llvm/branches/Apple/Dib/test/CodeGen/X86/2006-05-11-InstrSched.ll (original)
+++ llvm/branches/Apple/Dib/test/CodeGen/X86/2006-05-11-InstrSched.ll Mon Feb  9 04:56:40 2009
@@ -1,5 +1,5 @@
 ; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 -stats -realign-stack=0 |&\
-; RUN:     grep {asm-printer} | grep 32
+; RUN:     grep {asm-printer} | grep 31
 
 target datalayout = "e-p:32:32"
 define void @foo(i32* %mc, i32* %bp, i32* %ms, i32* %xmb, i32* %mpp, i32* %tpmm, i32* %ip, i32* %tpim, i32* %dpp, i32* %tpdm, i32* %bpi, i32 %M) nounwind {

Modified: llvm/branches/Apple/Dib/test/CodeGen/X86/2009-02-07-CoalescerBug.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Dib/test/CodeGen/X86/2009-02-07-CoalescerBug.ll?rev=64135&r1=64134&r2=64135&view=diff

==============================================================================
--- llvm/branches/Apple/Dib/test/CodeGen/X86/2009-02-07-CoalescerBug.ll (original)
+++ llvm/branches/Apple/Dib/test/CodeGen/X86/2009-02-07-CoalescerBug.ll Mon Feb  9 04:56:40 2009
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=x86 -enable-sinking -relocation-model=pic -stats |& grep {Number of valno def marked dead} | grep 1
+; RUN: llvm-as < %s | llc -march=x86 -relocation-model=pic -stats |& grep {Number of valno def marked dead} | grep 1
 ; rdar://6566708
 
 target triple = "i386-apple-darwin9.6"





More information about the llvm-commits mailing list