[llvm-branch-commits] [llvm-branch] r127443 - in /llvm/branches/release_29: ./ lib/Target/X86/X86ISelLowering.cpp test/CodeGen/X86/2006-05-01-SchedCausingSpills.ll test/CodeGen/X86/2008-08-31-EH_RETURN32.ll test/CodeGen/X86/fold-pcmpeqd-0.ll test/CodeGen/X86/pr1505b.ll test/CodeGen/X86/v-binop-widen.ll

[Eric Christopher]

Author: echristo
Date: Thu Mar 10 19:10:05 2011
New Revision: 127443

URL: http://llvm.org/viewvc/llvm-project?rev=127443&view=rev
Log:
Merge r127441 from mainline.

Modified:
    llvm/branches/release_29/   (props changed)
    llvm/branches/release_29/lib/Target/X86/X86ISelLowering.cpp
    llvm/branches/release_29/test/CodeGen/X86/2006-05-01-SchedCausingSpills.ll
    llvm/branches/release_29/test/CodeGen/X86/2008-08-31-EH_RETURN32.ll
    llvm/branches/release_29/test/CodeGen/X86/fold-pcmpeqd-0.ll
    llvm/branches/release_29/test/CodeGen/X86/pr1505b.ll
    llvm/branches/release_29/test/CodeGen/X86/v-binop-widen.ll

Propchange: llvm/branches/release_29/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 10 19:10:05 2011
@@ -1,2 +1,2 @@
 /llvm/branches/Apple/Pertwee:110850,110961
-/llvm/trunk:127263-127264,127298,127350-127351
+/llvm/trunk:127263-127264,127298,127350-127351,127441

Modified: llvm/branches/release_29/lib/Target/X86/X86ISelLowering.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_29/lib/Target/X86/X86ISelLowering.cpp?rev=127443&r1=127442&r2=127443&view=diff
==============================================================================
--- llvm/branches/release_29/lib/Target/X86/X86ISelLowering.cpp (original)
+++ llvm/branches/release_29/lib/Target/X86/X86ISelLowering.cpp Thu Mar 10 19:10:05 2011
@@ -221,7 +221,13 @@
 
   // X86 is weird, it always uses i8 for shift amounts and setcc results.
   setBooleanContents(ZeroOrOneBooleanContent);
-  setSchedulingPreference(Sched::ILP);
+    
+  // For 64-bit since we have so many registers use the ILP scheduler, for
+  // 32-bit code use the register pressure specific scheduling.
+  if (Subtarget->is64Bit())
+    setSchedulingPreference(Sched::ILP);
+  else
+    setSchedulingPreference(Sched::RegPressure);
   setStackPointerRegisterToSaveRestore(X86StackPtr);
 
   if (Subtarget->isTargetWindows() && !Subtarget->isTargetCygMing()) {

Modified: llvm/branches/release_29/test/CodeGen/X86/2006-05-01-SchedCausingSpills.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_29/test/CodeGen/X86/2006-05-01-SchedCausingSpills.ll?rev=127443&r1=127442&r2=127443&view=diff
==============================================================================
--- llvm/branches/release_29/test/CodeGen/X86/2006-05-01-SchedCausingSpills.ll (original)
+++ llvm/branches/release_29/test/CodeGen/X86/2006-05-01-SchedCausingSpills.ll Thu Mar 10 19:10:05 2011
@@ -1,4 +1,3 @@
-; XFAIL: *
 ; RUN: llc < %s -march=x86 -mcpu=yonah -stats |& \
 ; RUN:   not grep {Number of register spills}
 ; END.

Modified: llvm/branches/release_29/test/CodeGen/X86/2008-08-31-EH_RETURN32.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_29/test/CodeGen/X86/2008-08-31-EH_RETURN32.ll?rev=127443&r1=127442&r2=127443&view=diff
==============================================================================
--- llvm/branches/release_29/test/CodeGen/X86/2008-08-31-EH_RETURN32.ll (original)
+++ llvm/branches/release_29/test/CodeGen/X86/2008-08-31-EH_RETURN32.ll Thu Mar 10 19:10:05 2011
@@ -1,6 +1,6 @@
 ; Check that eh_return & unwind_init were properly lowered
 ; RUN: llc < %s | grep %ebp | count 7
-; RUN: llc < %s | grep %edx | count 5
+; RUN: llc < %s | grep %ecx | count 5
 
 target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64"
 target triple = "i386-pc-linux"

Modified: llvm/branches/release_29/test/CodeGen/X86/fold-pcmpeqd-0.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_29/test/CodeGen/X86/fold-pcmpeqd-0.ll?rev=127443&r1=127442&r2=127443&view=diff
==============================================================================
--- llvm/branches/release_29/test/CodeGen/X86/fold-pcmpeqd-0.ll (original)
+++ llvm/branches/release_29/test/CodeGen/X86/fold-pcmpeqd-0.ll Thu Mar 10 19:10:05 2011
@@ -1,4 +1,5 @@
-; RUN: llc < %s -mtriple=i386-apple-darwin -mcpu=yonah | grep pcmpeqd | count 1
+; RUN: llc < %s -mtriple=i386-apple-darwin -mcpu=yonah  | not grep pcmpeqd
+; RUN: llc < %s -mtriple=i386-apple-darwin -mcpu=yonah  | grep orps | grep CPI0_2  | count 2
 ; RUN: llc < %s -mtriple=x86_64-apple-darwin | grep pcmpeqd | count 1
 
 ; This testcase shouldn't need to spill the -1 value,

Modified: llvm/branches/release_29/test/CodeGen/X86/pr1505b.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_29/test/CodeGen/X86/pr1505b.ll?rev=127443&r1=127442&r2=127443&view=diff
==============================================================================
--- llvm/branches/release_29/test/CodeGen/X86/pr1505b.ll (original)
+++ llvm/branches/release_29/test/CodeGen/X86/pr1505b.ll Thu Mar 10 19:10:05 2011
@@ -1,4 +1,3 @@
-; XFAIL: *
 ; RUN: llc < %s -mcpu=i486 | grep fstpl | count 5
 ; RUN: llc < %s -mcpu=i486 | grep fstps | count 2
 ; PR1505

Modified: llvm/branches/release_29/test/CodeGen/X86/v-binop-widen.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_29/test/CodeGen/X86/v-binop-widen.ll?rev=127443&r1=127442&r2=127443&view=diff
==============================================================================
--- llvm/branches/release_29/test/CodeGen/X86/v-binop-widen.ll (original)
+++ llvm/branches/release_29/test/CodeGen/X86/v-binop-widen.ll Thu Mar 10 19:10:05 2011
@@ -1,7 +1,7 @@
 ; RUN: llc -march=x86 -mattr=+sse < %s | FileCheck %s
-; CHECK: divps
 ; CHECK: divss
 ; CHECK: divps
+; CHECK: divps
 
 %vec = type <9 x float>
 define %vec @vecdiv( %vec %p1, %vec %p2)