diff options
| author | Eric Christopher <echristo@apple.com> | 2011-03-11 01:10:05 +0000 |
|---|---|---|
| committer | Eric Christopher <echristo@apple.com> | 2011-03-11 01:10:05 +0000 |
| commit | acc448ebfececd35a424d24f10dba95654a50f7e (patch) | |
| tree | 830bb722aed64bf84e254ba8b0bb7c4a0b8aaff1 | |
| parent | 5705843fd151b9d701f9cf81edf0497a25aee53a (diff) | |
Merge r127441 from mainline.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/branches/release_29@127443 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/Target/X86/X86ISelLowering.cpp | 8 | ||||
| -rw-r--r-- | test/CodeGen/X86/2006-05-01-SchedCausingSpills.ll | 1 | ||||
| -rw-r--r-- | test/CodeGen/X86/2008-08-31-EH_RETURN32.ll | 2 | ||||
| -rw-r--r-- | test/CodeGen/X86/fold-pcmpeqd-0.ll | 3 | ||||
| -rw-r--r-- | test/CodeGen/X86/pr1505b.ll | 1 | ||||
| -rw-r--r-- | test/CodeGen/X86/v-binop-widen.ll | 2 |
6 files changed, 11 insertions, 6 deletions
diff --git a/lib/Target/X86/X86ISelLowering.cpp b/lib/Target/X86/X86ISelLowering.cpp index 511cd31c64..4f8132d06b 100644 --- a/lib/Target/X86/X86ISelLowering.cpp +++ b/lib/Target/X86/X86ISelLowering.cpp @@ -221,7 +221,13 @@ X86TargetLowering::X86TargetLowering(X86TargetMachine &TM) // 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()) { diff --git a/test/CodeGen/X86/2006-05-01-SchedCausingSpills.ll b/test/CodeGen/X86/2006-05-01-SchedCausingSpills.ll index da93dc21cf..b045329966 100644 --- a/test/CodeGen/X86/2006-05-01-SchedCausingSpills.ll +++ b/test/CodeGen/X86/2006-05-01-SchedCausingSpills.ll @@ -1,4 +1,3 @@ -; XFAIL: * ; RUN: llc < %s -march=x86 -mcpu=yonah -stats |& \ ; RUN: not grep {Number of register spills} ; END. diff --git a/test/CodeGen/X86/2008-08-31-EH_RETURN32.ll b/test/CodeGen/X86/2008-08-31-EH_RETURN32.ll index b106d7f802..b92c789a30 100644 --- a/test/CodeGen/X86/2008-08-31-EH_RETURN32.ll +++ b/test/CodeGen/X86/2008-08-31-EH_RETURN32.ll @@ -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" diff --git a/test/CodeGen/X86/fold-pcmpeqd-0.ll b/test/CodeGen/X86/fold-pcmpeqd-0.ll index d6b974d793..e5be58e1aa 100644 --- a/test/CodeGen/X86/fold-pcmpeqd-0.ll +++ b/test/CodeGen/X86/fold-pcmpeqd-0.ll @@ -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, diff --git a/test/CodeGen/X86/pr1505b.ll b/test/CodeGen/X86/pr1505b.ll index 91533e2be6..6a08dae51f 100644 --- a/test/CodeGen/X86/pr1505b.ll +++ b/test/CodeGen/X86/pr1505b.ll @@ -1,4 +1,3 @@ -; XFAIL: * ; RUN: llc < %s -mcpu=i486 | grep fstpl | count 5 ; RUN: llc < %s -mcpu=i486 | grep fstps | count 2 ; PR1505 diff --git a/test/CodeGen/X86/v-binop-widen.ll b/test/CodeGen/X86/v-binop-widen.ll index 4c3bc3b770..3bee700774 100644 --- a/test/CodeGen/X86/v-binop-widen.ll +++ b/test/CodeGen/X86/v-binop-widen.ll @@ -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) |