[llvm-branch-commits] [llvm-branch] r89579 - in /llvm/branches/Apple/Zoidberg: lib/Target/ARM/ARMBaseRegisterInfo.cpp test/CodeGen/ARM/hello.ll test/CodeGen/ARM/ifcvt5.ll test/CodeGen/ARM/insn-sched1.ll test/CodeGen/Thumb2/thumb2-ifcvt1.ll test/CodeGen/Thumb2/thumb2-ifcvt2.ll

[Bob Wilson]

Author: bwilson
Date: Sat Nov 21 21:40:46 2009
New Revision: 89579

URL: http://llvm.org/viewvc/llvm-project?rev=89579&view=rev
Log:
--- Merging r89568 into '.':
U    test/CodeGen/ARM/ifcvt5.ll
U    test/CodeGen/ARM/insn-sched1.ll
U    test/CodeGen/ARM/hello.ll
U    test/CodeGen/Thumb2/thumb2-ifcvt2.ll
U    test/CodeGen/Thumb2/thumb2-ifcvt1.ll
U    lib/Target/ARM/ARMBaseRegisterInfo.cpp

Modified:
    llvm/branches/Apple/Zoidberg/lib/Target/ARM/ARMBaseRegisterInfo.cpp
    llvm/branches/Apple/Zoidberg/test/CodeGen/ARM/hello.ll
    llvm/branches/Apple/Zoidberg/test/CodeGen/ARM/ifcvt5.ll
    llvm/branches/Apple/Zoidberg/test/CodeGen/ARM/insn-sched1.ll
    llvm/branches/Apple/Zoidberg/test/CodeGen/Thumb2/thumb2-ifcvt1.ll
    llvm/branches/Apple/Zoidberg/test/CodeGen/Thumb2/thumb2-ifcvt2.ll

Modified: llvm/branches/Apple/Zoidberg/lib/Target/ARM/ARMBaseRegisterInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Zoidberg/lib/Target/ARM/ARMBaseRegisterInfo.cpp?rev=89579&r1=89578&r2=89579&view=diff

==============================================================================
--- llvm/branches/Apple/Zoidberg/lib/Target/ARM/ARMBaseRegisterInfo.cpp (original)
+++ llvm/branches/Apple/Zoidberg/lib/Target/ARM/ARMBaseRegisterInfo.cpp Sat Nov 21 21:40:46 2009
@@ -222,7 +222,6 @@
   BitVector Reserved(getNumRegs());
   Reserved.set(ARM::SP);
   Reserved.set(ARM::PC);
-  // FP is reserved on Darwin even if we're not using it in this function.
   if (STI.isTargetDarwin() || hasFP(MF))
     Reserved.set(FramePtr);
   // Some targets reserve R9.
@@ -240,7 +239,6 @@
     return true;
   case ARM::R7:
   case ARM::R11:
-    // FP is reserved on Darwin even if we're not using it in this function.
     if (FramePtr == Reg && (STI.isTargetDarwin() || hasFP(MF)))
       return true;
     break;
@@ -494,8 +492,7 @@
 ///
 bool ARMBaseRegisterInfo::hasFP(const MachineFunction &MF) const {
   const MachineFrameInfo *MFI = MF.getFrameInfo();
-  return ((STI.isTargetDarwin() && MFI->hasCalls()) ||
-          NoFramePointerElim ||
+  return (NoFramePointerElim ||
           needsStackRealignment(MF) ||
           MFI->hasVarSizedObjects() ||
           MFI->isFrameAddressTaken());

Modified: llvm/branches/Apple/Zoidberg/test/CodeGen/ARM/hello.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Zoidberg/test/CodeGen/ARM/hello.ll?rev=89579&r1=89578&r2=89579&view=diff

==============================================================================
--- llvm/branches/Apple/Zoidberg/test/CodeGen/ARM/hello.ll (original)
+++ llvm/branches/Apple/Zoidberg/test/CodeGen/ARM/hello.ll Sat Nov 21 21:40:46 2009
@@ -2,7 +2,7 @@
 ; RUN: llc < %s -mtriple=arm-linux-gnueabi | grep mov | count 1
 ; RUN: llc < %s -mtriple=arm-linux-gnu --disable-fp-elim | \
 ; RUN:   grep mov | count 3
-; RUN: llc < %s -mtriple=arm-apple-darwin | grep mov | count 3
+; RUN: llc < %s -mtriple=arm-apple-darwin | grep mov | count 2
 
 @str = internal constant [12 x i8] c"Hello World\00"
 

Modified: llvm/branches/Apple/Zoidberg/test/CodeGen/ARM/ifcvt5.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Zoidberg/test/CodeGen/ARM/ifcvt5.ll?rev=89579&r1=89578&r2=89579&view=diff

==============================================================================
--- llvm/branches/Apple/Zoidberg/test/CodeGen/ARM/ifcvt5.ll (original)
+++ llvm/branches/Apple/Zoidberg/test/CodeGen/ARM/ifcvt5.ll Sat Nov 21 21:40:46 2009
@@ -1,7 +1,5 @@
 ; RUN: llc < %s -mtriple=armv7-apple-darwin | FileCheck %s
 
-; XFAIL: *
-
 @x = external global i32*		; <i32**> [#uses=1]
 
 define void @foo(i32 %a) {

Modified: llvm/branches/Apple/Zoidberg/test/CodeGen/ARM/insn-sched1.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Zoidberg/test/CodeGen/ARM/insn-sched1.ll?rev=89579&r1=89578&r2=89579&view=diff

==============================================================================
--- llvm/branches/Apple/Zoidberg/test/CodeGen/ARM/insn-sched1.ll (original)
+++ llvm/branches/Apple/Zoidberg/test/CodeGen/ARM/insn-sched1.ll Sat Nov 21 21:40:46 2009
@@ -1,6 +1,6 @@
 ; RUN: llc < %s -march=arm -mattr=+v6
 ; RUN: llc < %s -mtriple=arm-apple-darwin -mattr=+v6 |\
-; RUN:   grep mov | count 4
+; RUN:   grep mov | count 3
 
 define i32 @test(i32 %x) {
         %tmp = trunc i32 %x to i16              ; <i16> [#uses=1]

Modified: llvm/branches/Apple/Zoidberg/test/CodeGen/Thumb2/thumb2-ifcvt1.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Zoidberg/test/CodeGen/Thumb2/thumb2-ifcvt1.ll?rev=89579&r1=89578&r2=89579&view=diff

==============================================================================
--- llvm/branches/Apple/Zoidberg/test/CodeGen/Thumb2/thumb2-ifcvt1.ll (original)
+++ llvm/branches/Apple/Zoidberg/test/CodeGen/Thumb2/thumb2-ifcvt1.ll Sat Nov 21 21:40:46 2009
@@ -1,5 +1,4 @@
 ; RUN: llc < %s -mtriple=thumbv7-apple-darwin | FileCheck %s
-; XFAIL: *
 
 define i32 @t1(i32 %a, i32 %b, i32 %c, i32 %d) {
 ; CHECK: t1:

Modified: llvm/branches/Apple/Zoidberg/test/CodeGen/Thumb2/thumb2-ifcvt2.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Zoidberg/test/CodeGen/Thumb2/thumb2-ifcvt2.ll?rev=89579&r1=89578&r2=89579&view=diff

==============================================================================
--- llvm/branches/Apple/Zoidberg/test/CodeGen/Thumb2/thumb2-ifcvt2.ll (original)
+++ llvm/branches/Apple/Zoidberg/test/CodeGen/Thumb2/thumb2-ifcvt2.ll Sat Nov 21 21:40:46 2009
@@ -1,5 +1,4 @@
 ; RUN: llc < %s -mtriple=thumbv7-apple-darwin | FileCheck %s
-; XFAIL: *
 
 define void @foo(i32 %X, i32 %Y) {
 entry: