[compiler-rt] 9c38a17 - [JITLink][PowerPC] Add basic TLS support for ppc64
Kai Luo via llvm-commits
llvm-commits at lists.llvm.org
Tue Aug 1 22:02:43 PDT 2023
Author: Kai Luo
Date: 2023-08-02T05:02:36Z
New Revision: 9c38a178d3a61b0d9d84c564e8b6dba0f90dad4e
URL: https://github.com/llvm/llvm-project/commit/9c38a178d3a61b0d9d84c564e8b6dba0f90dad4e
DIFF: https://github.com/llvm/llvm-project/commit/9c38a178d3a61b0d9d84c564e8b6dba0f90dad4e.diff
LOG: [JITLink][PowerPC] Add basic TLS support for ppc64
Add basic TLS support for ppc64. Only global-dynamic model is supported.
Reviewed By: lhames
Differential Revision: https://reviews.llvm.org/D155926
Added:
compiler-rt/lib/orc/elfnix_tls.ppc64.S
Modified:
compiler-rt/lib/orc/CMakeLists.txt
compiler-rt/test/orc/TestCases/Linux/ppc64/trivial-tls.S
llvm/include/llvm/ExecutionEngine/JITLink/ppc64.h
llvm/lib/ExecutionEngine/JITLink/ELF_ppc64.cpp
llvm/lib/ExecutionEngine/JITLink/ppc64.cpp
Removed:
################################################################################
diff --git a/compiler-rt/lib/orc/CMakeLists.txt b/compiler-rt/lib/orc/CMakeLists.txt
index 38dd233f5e3377..5581205701c4ef 100644
--- a/compiler-rt/lib/orc/CMakeLists.txt
+++ b/compiler-rt/lib/orc/CMakeLists.txt
@@ -24,6 +24,7 @@ set(ALL_ORC_ASM_SOURCES
macho_tlv.arm64.S
elfnix_tls.x86-64.S
elfnix_tls.aarch64.S
+ elfnix_tls.ppc64.S
)
# Common implementation headers will go here.
@@ -149,6 +150,7 @@ else() # not Apple
set(ORC_ASM_SOURCES
elfnix_tls.x86-64.S
elfnix_tls.aarch64.S
+ elfnix_tls.ppc64.S
)
endif()
diff --git a/compiler-rt/lib/orc/elfnix_tls.ppc64.S b/compiler-rt/lib/orc/elfnix_tls.ppc64.S
new file mode 100644
index 00000000000000..84854795dba1f8
--- /dev/null
+++ b/compiler-rt/lib/orc/elfnix_tls.ppc64.S
@@ -0,0 +1,33 @@
+//===-- orc_rt_elfnix_tls.ppc64.s -------------------------------*- ASM -*-===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+//
+// This file is a part of the ORC runtime support library.
+//
+//===----------------------------------------------------------------------===//
+
+// The content of this file is PowerPC64 only.
+#if defined(__powerpc64__)
+
+ .text
+ // TODO: add fast-path for repeat access.
+ // See https://github.com/llvm/llvm-project/issues/51162.
+ .global ___orc_rt_elfnix_tls_get_addr
+___orc_rt_elfnix_tls_get_addr:
+ addis 2, 12, .TOC.-___orc_rt_elfnix_tls_get_addr at ha
+ addi 2, 2, .TOC.-___orc_rt_elfnix_tls_get_addr at l
+ mflr 0
+ std 0, 16(1)
+ stdu 1, -32(1)
+ bl __orc_rt_elfnix_tls_get_addr_impl
+ nop
+ addi 1, 1, 32
+ ld 0, 16(1)
+ mtlr 0
+ blr
+
+#endif
diff --git a/compiler-rt/test/orc/TestCases/Linux/ppc64/trivial-tls.S b/compiler-rt/test/orc/TestCases/Linux/ppc64/trivial-tls.S
index 745e472d6a6b15..730fc6909c7f9e 100644
--- a/compiler-rt/test/orc/TestCases/Linux/ppc64/trivial-tls.S
+++ b/compiler-rt/test/orc/TestCases/Linux/ppc64/trivial-tls.S
@@ -1,4 +1,3 @@
-// XFAIL: target={{powerpc64.*}}
// RUN: %clang -c -o %t %s
// RUN: %llvm_jitlink %t
//
diff --git a/llvm/include/llvm/ExecutionEngine/JITLink/ppc64.h b/llvm/include/llvm/ExecutionEngine/JITLink/ppc64.h
index dafe49c9232d0f..4d08fd04c5a523 100644
--- a/llvm/include/llvm/ExecutionEngine/JITLink/ppc64.h
+++ b/llvm/include/llvm/ExecutionEngine/JITLink/ppc64.h
@@ -41,6 +41,8 @@ enum EdgeKind_ppc64 : Edge::Kind {
RequestCall,
// Request calling function without TOC.
RequestCallNoTOC,
+ RequestTLSDescInGOTAndTransformToTOCDelta16HA,
+ RequestTLSDescInGOTAndTransformToTOCDelta16LO,
};
enum PLTCallStubKind {
diff --git a/llvm/lib/ExecutionEngine/JITLink/ELF_ppc64.cpp b/llvm/lib/ExecutionEngine/JITLink/ELF_ppc64.cpp
index 9a6a019fd65690..8d1a729e405766 100644
--- a/llvm/lib/ExecutionEngine/JITLink/ELF_ppc64.cpp
+++ b/llvm/lib/ExecutionEngine/JITLink/ELF_ppc64.cpp
@@ -31,6 +31,70 @@ using namespace llvm::jitlink;
constexpr StringRef ELFTOCSymbolName = ".TOC.";
constexpr StringRef TOCSymbolAliasIdent = "__TOC__";
constexpr uint64_t ELFTOCBaseOffset = 0x8000;
+constexpr StringRef ELFTLSInfoSectionName = "$__TLSINFO";
+
+template <support::endianness Endianness>
+class TLSInfoTableManager_ELF_ppc64
+ : public TableManager<TLSInfoTableManager_ELF_ppc64<Endianness>> {
+public:
+ static const uint8_t TLSInfoEntryContent[16];
+
+ static StringRef getSectionName() { return ELFTLSInfoSectionName; }
+
+ bool visitEdge(LinkGraph &G, Block *B, Edge &E) {
+ Edge::Kind K = E.getKind();
+ if (K == ppc64::RequestTLSDescInGOTAndTransformToTOCDelta16HA) {
+ E.setKind(ppc64::TOCDelta16HA);
+ E.setTarget(this->getEntryForTarget(G, E.getTarget()));
+ return true;
+ }
+ if (K == ppc64::RequestTLSDescInGOTAndTransformToTOCDelta16LO) {
+ E.setKind(ppc64::TOCDelta16LO);
+ E.setTarget(this->getEntryForTarget(G, E.getTarget()));
+ return true;
+ }
+ return false;
+ }
+
+ Symbol &createEntry(LinkGraph &G, Symbol &Target) {
+ // The TLS Info entry's key value will be written by
+ // `fixTLVSectionsAndEdges`, so create mutable content.
+ auto &TLSInfoEntry = G.createMutableContentBlock(
+ getTLSInfoSection(G), G.allocateContent(getTLSInfoEntryContent()),
+ orc::ExecutorAddr(), 8, 0);
+ TLSInfoEntry.addEdge(ppc64::Pointer64, 8, Target, 0);
+ return G.addAnonymousSymbol(TLSInfoEntry, 0, 16, false, false);
+ }
+
+private:
+ Section &getTLSInfoSection(LinkGraph &G) {
+ if (!TLSInfoTable)
+ TLSInfoTable =
+ &G.createSection(ELFTLSInfoSectionName, orc::MemProt::Read);
+ return *TLSInfoTable;
+ }
+
+ ArrayRef<char> getTLSInfoEntryContent() const {
+ return {reinterpret_cast<const char *>(TLSInfoEntryContent),
+ sizeof(TLSInfoEntryContent)};
+ }
+
+ Section *TLSInfoTable = nullptr;
+};
+
+template <>
+const uint8_t TLSInfoTableManager_ELF_ppc64<
+ support::endianness::little>::TLSInfoEntryContent[16] = {
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /*pthread key */
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 /*data address*/
+};
+
+template <>
+const uint8_t TLSInfoTableManager_ELF_ppc64<
+ support::endianness::big>::TLSInfoEntryContent[16] = {
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /*pthread key */
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 /*data address*/
+};
template <support::endianness Endianness>
Symbol &createELFGOTHeader(LinkGraph &G,
@@ -91,8 +155,8 @@ Error buildTables_ELF_ppc64(LinkGraph &G) {
registerExistingGOTEntries(G, TOC);
ppc64::PLTTableManager<Endianness> PLT(TOC);
- visitExistingEdges(G, TOC, PLT);
- // TODO: Add TLS support.
+ TLSInfoTableManager_ELF_ppc64<Endianness> TLSInfo;
+ visitExistingEdges(G, TOC, PLT, TLSInfo);
// After visiting edges in LinkGraph, we have GOT entries built in the
// synthesized section.
@@ -164,6 +228,13 @@ class ELFLinkGraphBuilder_ppc64
if (LLVM_UNLIKELY(ELFReloc == ELF::R_PPC64_NONE))
return Error::success();
+ // TLS model markers. We only support global-dynamic model now.
+ if (ELFReloc == ELF::R_PPC64_TLSGD)
+ return Error::success();
+ if (ELFReloc == ELF::R_PPC64_TLSLD)
+ return make_error<StringError>("Local-dynamic TLS model is not supported",
+ inconvertibleErrorCode());
+
auto ObjSymbol = Base::Obj.getRelocationSymbol(Rel, Base::SymTabSec);
if (!ObjSymbol)
return ObjSymbol.takeError();
@@ -234,6 +305,12 @@ class ELFLinkGraphBuilder_ppc64
case ELF::R_PPC64_PCREL34:
Kind = ppc64::Delta34;
break;
+ case ELF::R_PPC64_GOT_TLSGD16_HA:
+ Kind = ppc64::RequestTLSDescInGOTAndTransformToTOCDelta16HA;
+ break;
+ case ELF::R_PPC64_GOT_TLSGD16_LO:
+ Kind = ppc64::RequestTLSDescInGOTAndTransformToTOCDelta16LO;
+ break;
}
Edge GE(Kind, Offset, *GraphSymbol, Addend);
diff --git a/llvm/lib/ExecutionEngine/JITLink/ppc64.cpp b/llvm/lib/ExecutionEngine/JITLink/ppc64.cpp
index 1f5a07fb013eb8..6cb850473fc5b8 100644
--- a/llvm/lib/ExecutionEngine/JITLink/ppc64.cpp
+++ b/llvm/lib/ExecutionEngine/JITLink/ppc64.cpp
@@ -94,6 +94,10 @@ const char *getEdgeKindName(Edge::Kind K) {
return "RequestCall";
case RequestCallNoTOC:
return "RequestCallNoTOC";
+ case RequestTLSDescInGOTAndTransformToTOCDelta16HA:
+ return "RequestTLSDescInGOTAndTransformToTOCDelta16HA";
+ case RequestTLSDescInGOTAndTransformToTOCDelta16LO:
+ return "RequestTLSDescInGOTAndTransformToTOCDelta16LO";
default:
return getGenericEdgeKindName(static_cast<Edge::Kind>(K));
}
More information about the llvm-commits
mailing list