[llvm-branch-commits] [llvm-branch] r121537 - in /llvm/branches/Apple/whitney: lib/Target/X86/X86ISelLowering.cpp lib/Target/X86/X86InstrInfo.td test/CodeGen/X86/tlv-1.ll

[Daniel Dunbar]

Author: ddunbar
Date: Fri Dec 10 15:32:14 2010
New Revision: 121537

URL: http://llvm.org/viewvc/llvm-project?rev=121537&view=rev
Log:
Merge r121358:
--
Author: Eric Christopher <echristo at apple.com>
Date:   Thu Dec 9 06:25:53 2010 +0000

    Rewrite the darwin tlv support to use a chain and return to copying
    the output to the correct register. Fixes a hidden problem uncovered
    by the last patch where we'd try to DAG combine our MVT::Other node
    oddly.

Modified:
    llvm/branches/Apple/whitney/lib/Target/X86/X86ISelLowering.cpp
    llvm/branches/Apple/whitney/lib/Target/X86/X86InstrInfo.td
    llvm/branches/Apple/whitney/test/CodeGen/X86/tlv-1.ll

Modified: llvm/branches/Apple/whitney/lib/Target/X86/X86ISelLowering.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/whitney/lib/Target/X86/X86ISelLowering.cpp?rev=121537&r1=121536&r2=121537&view=diff
==============================================================================
--- llvm/branches/Apple/whitney/lib/Target/X86/X86ISelLowering.cpp (original)
+++ llvm/branches/Apple/whitney/lib/Target/X86/X86ISelLowering.cpp Fri Dec 10 15:32:14 2010
@@ -6185,7 +6185,7 @@
       OpFlag = X86II::MO_TLVP;
     DebugLoc DL = Op.getDebugLoc();
     SDValue Result = DAG.getTargetGlobalAddress(GA->getGlobal(), DL,
-                                                getPointerTy(),
+                                                GA->getValueType(0),
                                                 GA->getOffset(), OpFlag);
     SDValue Offset = DAG.getNode(WrapperKind, DL, getPointerTy(), Result);
 
@@ -6198,8 +6198,10 @@
 
     // Lowering the machine isd will make sure everything is in the right
     // location.
-    SDValue Args[] = { Offset };
-    SDValue RetVal = DAG.getNode(X86ISD::TLSCALL, DL, MVT::Other, Args, 1);
+    SDValue Chain = DAG.getEntryNode();
+    SDVTList NodeTys = DAG.getVTList(MVT::Other, MVT::Flag);
+    SDValue Args[] = { Chain, Offset };
+    Chain = DAG.getNode(X86ISD::TLSCALL, DL, NodeTys, Args, 2);
 
     // TLSCALL will be codegen'ed as call. Inform MFI that function has calls.
     MachineFrameInfo *MFI = DAG.getMachineFunction().getFrameInfo();
@@ -6207,7 +6209,8 @@
     
     // And our return value (tls address) is in the standard call return value
     // location.
-    return RetVal;
+    unsigned Reg = Subtarget->is64Bit() ? X86::RAX : X86::EAX;
+    return DAG.getCopyFromReg(Chain, DL, Reg, getPointerTy());
   }
 
   assert(false &&

Modified: llvm/branches/Apple/whitney/lib/Target/X86/X86InstrInfo.td
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/whitney/lib/Target/X86/X86InstrInfo.td?rev=121537&r1=121536&r2=121537&view=diff
==============================================================================
--- llvm/branches/Apple/whitney/lib/Target/X86/X86InstrInfo.td (original)
+++ llvm/branches/Apple/whitney/lib/Target/X86/X86InstrInfo.td Fri Dec 10 15:32:14 2010
@@ -78,7 +78,7 @@
 
 def SDT_X86TLSADDR : SDTypeProfile<0, 1, [SDTCisInt<0>]>;
 
-def SDT_X86TLSCALL : SDTypeProfile<0, 1, [SDTCisPtrTy<0>]>;
+def SDT_X86TLSCALL : SDTypeProfile<0, 1, [SDTCisInt<0>]>;
 
 def SDT_X86EHRET : SDTypeProfile<0, 1, [SDTCisInt<0>]>;
 
@@ -206,7 +206,7 @@
                           [SDNPHasChain, SDNPInFlag, SDNPOutFlag]>;
 
 def X86TLSCall : SDNode<"X86ISD::TLSCALL", SDT_X86TLSCALL,
-                        []>;
+                        [SDNPHasChain, SDNPOptInFlag, SDNPOutFlag]>;
 
 //===----------------------------------------------------------------------===//
 // X86 Operand Definitions.

Modified: llvm/branches/Apple/whitney/test/CodeGen/X86/tlv-1.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/whitney/test/CodeGen/X86/tlv-1.ll?rev=121537&r1=121536&r2=121537&view=diff
==============================================================================
--- llvm/branches/Apple/whitney/test/CodeGen/X86/tlv-1.ll (original)
+++ llvm/branches/Apple/whitney/test/CodeGen/X86/tlv-1.ll Fri Dec 10 15:32:14 2010
@@ -1,5 +1,21 @@
 ; RUN: llc < %s -mtriple x86_64-apple-darwin | FileCheck %s
 
+%struct.A = type { [48 x i8], i32, i32, i32 }
+
+ at c = external thread_local global %struct.A, align 4
+
+define void @main() nounwind ssp {
+entry:
+  call void @llvm.memset.p0i8.i64(i8* getelementptr inbounds (%struct.A* @c, i32 0, i32 0, i32 0), i8 0, i64 60, i32 1, i1 false)
+  unreachable  
+  ; CHECK: movq    _c at TLVP(%rip), %rdi
+  ; CHECK-NEXT: callq   *(%rdi)
+  ; CHECK-NEXT: movl    $0, 56(%rax)
+  ; CHECK-NEXT: movq    $0, 48(%rax)
+}
+
+declare void @llvm.memset.p0i8.i64(i8* nocapture, i8, i64, i32, i1) nounwind
+
 @a = thread_local global i32 0                    ; <i32*> [#uses=0]
 @b = thread_local global i32 0                    ; <i32*> [#uses=0]