[X86] Handle localdynamic TLS model in x32 mode

[hvdijk]

Summary

D92346 added TLS_(base_)addrX32 to handle TLS in x32 mode, but missed the different TLS models. This diff fixes the logic for the local dynamic model where RAX was used when EAX should be, and extends the tests to cover all four TLS models.

Fixes https://bugs.llvm.org/show_bug.cgi?id=26472.

[pengfei]

llvm/test/CodeGen/X86/pic.ll

322

What're this and test11 testing for? It seems you only changed for LocalDynamic model in this patch.

[hvdijk]

llvm/test/CodeGen/X86/pic.ll

322

That is correct, I did not update anything for the InitialExec and LocalExec TLS models. I added these tests not because this diff fixes bugs in them, but because like LocalDynamic, these models were also not covered by existing tests. Despite the title (I wrote the title and description afterwards), the goal of this diff was not specifically to make sure that the LocalDynamic TLS model is working, but that all TLS models are working. For this, I first made sure that all TLS models are tested, and then fixed the code generation where needed, which turned out to only be that of the LocalDynamic model.

[pengfei]

llvm/test/CodeGen/X86/pic.ll

322

Thanks Harald, I just saw you had mentioned it in the summary. Sorry for the noise.

[RKSimon]

llvm/lib/Target/X86/X86ISelLowering.cpp

19145

(style) Fix the case of the variables: Is64Bit Is64BitLP64

[hvdijk]

Renamed is* parameters to Is*.

[RKSimon]

LGTM - cheers

llvm/lib/Target/X86/X86ISelLowering.cpp

 static SDValue
 LowerToTLSGeneralDynamicModelX32(GlobalAddressSDNode *GA, SelectionDAG &DAG,
                                  const EVT PtrVT) {
   return GetTLSADDR(DAG, DAG.getEntryNode(), GA, nullptr, PtrVT,
                     X86::EAX, X86II::MO_TLSGD);
 }
 
 static SDValue LowerToTLSLocalDynamicModel(GlobalAddressSDNode *GA,
-                                           SelectionDAG &DAG,
-                                           const EVT PtrVT,
-                                           bool is64Bit) {
+                                           SelectionDAG &DAG, const EVT PtrVT,
+                                           bool Is64Bit, bool Is64BitLP64) {
   SDLoc dl(GA);
 
   // Get the start address of the TLS block for this module.
   X86MachineFunctionInfo *MFI = DAG.getMachineFunction()
       .getInfo<X86MachineFunctionInfo>();
   MFI->incNumLocalDynamicTLSAccesses();
 
   SDValue Base;
-  if (is64Bit) {
-    Base = GetTLSADDR(DAG, DAG.getEntryNode(), GA, nullptr, PtrVT, X86::RAX,
+  if (Is64Bit) {
+    unsigned ReturnReg = Is64BitLP64 ? X86::RAX : X86::EAX;
+    Base = GetTLSADDR(DAG, DAG.getEntryNode(), GA, nullptr, PtrVT, ReturnReg,
                       X86II::MO_TLSLD, /*LocalDynamic=*/true);
   } else {
     SDValue InFlag;
     SDValue Chain = DAG.getCopyToReg(DAG.getEntryNode(), dl, X86::EBX,
         DAG.getNode(X86ISD::GlobalBaseReg, SDLoc(), PtrVT), InFlag);
     InFlag = Chain.getValue(1);
     Base = GetTLSADDR(DAG, Chain, GA, &InFlag, PtrVT, X86::EAX,
                       X86II::MO_TLSLDM, /*LocalDynamic=*/true);
switch (model) {
       case TLSModel::GeneralDynamic:
         if (Subtarget.is64Bit()) {
           if (Subtarget.isTarget64BitLP64())
             return LowerToTLSGeneralDynamicModel64(GA, DAG, PtrVT);
           return LowerToTLSGeneralDynamicModelX32(GA, DAG, PtrVT);
         }
         return LowerToTLSGeneralDynamicModel32(GA, DAG, PtrVT);
       case TLSModel::LocalDynamic:
-        return LowerToTLSLocalDynamicModel(GA, DAG, PtrVT,
-                                           Subtarget.is64Bit());
+        return LowerToTLSLocalDynamicModel(GA, DAG, PtrVT, Subtarget.is64Bit(),
+                                           Subtarget.isTarget64BitLP64());
       case TLSModel::InitialExec:
       case TLSModel::LocalExec:
         return LowerToTLSExecModel(GA, DAG, PtrVT, model, Subtarget.is64Bit(),
                                    PositionIndependent);
     }
     llvm_unreachable("Unknown TLS model.");
   }
 

llvm/test/CodeGen/X86/pic.ll

 declare void @foo1(...)
 declare void @foo2(...)
 declare void @foo6(...)
 declare void @foo3(...)
 declare void @foo4(...)
 declare void @foo5(...)
 
 ;; Check TLS references
-@tlsptr = external thread_local global i32*
-@tlsdst = external thread_local global i32
-@tlssrc = external thread_local global i32
+@tlsptrgd = thread_local global i32* null
+@tlsdstgd = thread_local global i32 0
+@tlssrcgd = thread_local global i32 0
+@tlsptrld = thread_local(localdynamic) global i32* null
+@tlsdstld = thread_local(localdynamic) global i32 0
+@tlssrcld = thread_local(localdynamic) global i32 0
+@tlsptrie = thread_local(initialexec) global i32* null
+@tlsdstie = thread_local(initialexec) global i32 0
+@tlssrcie = thread_local(initialexec) global i32 0
+@tlsptrle = thread_local(localexec) global i32* null
+@tlsdstle = thread_local(localexec) global i32 0
+@tlssrcle = thread_local(localexec) global i32 0
 
 define void @test8() nounwind {
 entry:
-    store i32* @tlsdst, i32** @tlsptr
-    %tmp.s = load i32, i32* @tlssrc
-    store i32 %tmp.s, i32* @tlsdst
+    store i32* @tlsdstgd, i32** @tlsptrgd
+    %tmp.s = load i32, i32* @tlssrcgd
+    store i32 %tmp.s, i32* @tlsdstgd
     ret void
 
 ; CHECK-LABEL:  test8:
 ; CHECK-I686: calll .L8$pb
 ; CHECK-I686-NEXT:  .L8$pb:
 ; CHECK-I686-NEXT:  popl
 ; CHECK-I686: addl  $_GLOBAL_OFFSET_TABLE_+(.L{{.*}}-.L8$pb), %ebx
-; CHECK-I686-DAG: leal  tlsdst@TLSGD(,%ebx), %eax
+; CHECK-I686-DAG: leal  tlsdstgd@TLSGD(,%ebx), %eax
 ; CHECK-I686-DAG: calll ___tls_get_addr@PLT
-; CHECK-I686-DAG: leal  tlsptr@TLSGD(,%ebx), %eax
+; CHECK-I686-DAG: leal  tlsptrgd@TLSGD(,%ebx), %eax
 ; CHECK-I686-DAG: calll ___tls_get_addr@PLT
-; CHECK-I686-DAG: leal  tlssrc@TLSGD(,%ebx), %eax
+; CHECK-I686-DAG: leal  tlssrcgd@TLSGD(,%ebx), %eax
 ; CHECK-I686-DAG: calll ___tls_get_addr@PLT
-; CHECK-X32-DAG:  leaq  tlsdst@TLSGD(%rip), %rdi
+; CHECK-X32-DAG:  leaq  tlsdstgd@TLSGD(%rip), %rdi
 ; CHECK-X32-DAG:  callq __tls_get_addr@PLT
-; CHECK-X32-DAG:  leaq  tlsptr@TLSGD(%rip), %rdi
+; CHECK-X32-DAG:  leaq  tlsptrgd@TLSGD(%rip), %rdi
 ; CHECK-X32-DAG:  callq __tls_get_addr@PLT
-; CHECK-X32-DAG:  leaq  tlssrc@TLSGD(%rip), %rdi
+; CHECK-X32-DAG:  leaq  tlssrcgd@TLSGD(%rip), %rdi
 ; CHECK-X32-DAG:  callq __tls_get_addr@PLT
 ; CHECK-I686: ret
 ; CHECK-X32:  retq
 }
+
+define void @test9() nounwind {
+entry:
+    store i32* @tlsdstld, i32** @tlsptrld
+    %tmp.s = load i32, i32* @tlssrcld
+    store i32 %tmp.s, i32* @tlsdstld
+    ret void
+
+; CHECK-LABEL:  test9:
+; CHECK-I686: calll .L9$pb
+; CHECK-I686-NEXT:  .L9$pb:
+; CHECK-I686-NEXT:  popl
+; CHECK-I686: addl  $_GLOBAL_OFFSET_TABLE_+(.L{{.*}}-.L9$pb), %ebx
+; CHECK-I686: leal  tlsdstld@TLSLDM(%ebx), %eax
+; CHECK-X32:  leaq  tlsdstld@TLSLD(%rip), %rdi
+; CHECK-I686: calll ___tls_get_addr@PLT
+; CHECK-X32:  callq __tls_get_addr@PLT
+; CHECK:  leal  tlsdstld@DTPOFF(
+; CHECK:  movl  {{%.*}}, tlsptrld@DTPOFF(
+; CHECK:  movl  tlssrcld@DTPOFF(
+; CHECK:  movl  {{%.*}}, tlsdstld@DTPOFF(
+; CHECK-I686: ret
+; CHECK-X32:  retq
+}
+
+define void @test10() nounwind {
+entry:
+    store i32* @tlsdstie, i32** @tlsptrie
+    %tmp.s = load i32, i32* @tlssrcie
+    store i32 %tmp.s, i32* @tlsdstie
+    ret void
+
+; CHECK-LABEL:  test10:
+; CHECK-I686: calll .L10$pb
+; CHECK-I686-NEXT:  .L10$pb:
+; CHECK-I686-NEXT:  popl
+; CHECK-I686: addl  $_GLOBAL_OFFSET_TABLE_+(.L{{.*}}-.L10$pb),
+; CHECK-I686-DAG: movl  tlsdstie@GOTNTPOFF(
+; CHECK-I686-DAG: movl  %gs:0,
+; CHECK-X32-DAG:  movl  tlsdstie@GOTTPOFF(%rip),
+; CHECK-X32-DAG:  movl  %fs:0,
+; CHECK:  addl
+; CHECK-I686: movl  tlsptrie@GOTNTPOFF(
+; CHECK-X32:  movl  tlsptrie@GOTTPOFF(%rip),
+; CHECK-I686: movl  {{%.*}}, %gs:(
+; CHECK-X32:  movl  {{%.*}}, %fs:(
+; CHECK-I686: movl  tlssrcie@GOTNTPOFF(
+; CHECK-X32:  movl  tlssrcie@GOTTPOFF(%rip),
+; CHECK-I686: movl  %gs:(
+; CHECK-X32:  movl  %fs:(
+; CHECK-I686: movl  {{%.*}}, %gs:(
+; CHECK-X32:  movl  {{%.*}}, %fs:(
+; CHECK-I686: ret
+; CHECK-X32:  retq
+}
+
+define void @test11() nounwind {
+entry:
+    store i32* @tlsdstle, i32** @tlsptrle
+    %tmp.s = load i32, i32* @tlssrcle
+    store i32 %tmp.s, i32* @tlsdstle
+    ret void
+
+; CHECK-LABEL:  test11:
+; CHECK-I686: movl  %gs:0,
+; CHECK-X32:  movl  %fs:0,
+; CHECK-I686: leal  tlsdstle@NTPOFF(
+; CHECK-X32:  leal  tlsdstle@TPOFF(
+; CHECK-I686: movl  {{%.*}}, %gs:tlsptrle@NTPOFF
+; CHECK-X32:  movl  {{%.*}}, %fs:tlsptrle@TPOFF
+; CHECK-I686: movl  %gs:tlssrcle@NTPOFF,
+; CHECK-X32:  movl  %fs:tlssrcle@TPOFF,
+; CHECK-I686: movl  {{%.*}}, %gs:tlsdstle@NTPOFF
+; CHECK-X32:  movl  {{%.*}}, %fs:tlsdstle@TPOFF
+; CHECK-I686: ret
+; CHECK-X32:  retq
+}