From 34d80461ff77269d6342768a5801ec655da7cea7 Mon Sep 17 00:00:00 2001 From: Steven Wu Date: Mon, 16 Sep 2019 18:49:54 +0000 Subject: [PATCH] [LTO][Legacy] Add new C inferface to query libcall functions Summary: This is needed to implemented the same approach as lld (implemented in r338434) for how to handling symbols that can be generated by LTO code generator but not present in the symbol table for linker that uses legacy C APIs. libLTO is in charge of providing the list of symbols. Linker is in charge of implementing the eager loading from static libraries using the list of symbols. rdar://problem/52853974 Reviewers: tejohnson, bd1976llvm, deadalnix, espindola Reviewed By: tejohnson Subscribers: emaste, arichardson, hiraditya, MaskRay, dang, kledzik, mehdi_amini, inglorion, jkorous, dexonsmith, ributzka, llvm-commits Tags: #llvm Differential Revision: https://reviews.llvm.org/D67568 llvm-svn: 372021 --- llvm/include/llvm-c/lto.h | 10 +++++++++- llvm/include/llvm/LTO/LTO.h | 4 ++++ llvm/lib/LTO/LTO.cpp | 10 ++++++++++ llvm/tools/lto/lto.cpp | 6 ++++++ llvm/tools/lto/lto.exports | 1 + 5 files changed, 30 insertions(+), 1 deletion(-) diff --git a/llvm/include/llvm-c/lto.h b/llvm/include/llvm-c/lto.h index 0ec490fcd5a9..41e6067cf44f 100644 --- a/llvm/include/llvm-c/lto.h +++ b/llvm/include/llvm-c/lto.h @@ -44,7 +44,7 @@ typedef bool lto_bool_t; * @{ */ -#define LTO_API_VERSION 24 +#define LTO_API_VERSION 25 /** * \since prior to LTO_API_VERSION=3 @@ -592,6 +592,14 @@ extern const char * lto_input_get_dependent_library(lto_input_t input, size_t index, size_t *size); +/** + * Returns the list of libcall symbols that can be generated by LTO + * that might not be visible from the symbol table of bitcode files. + * + * \since prior to LTO_API_VERSION=25 + */ +extern const char *const *lto_runtime_lib_symbols_list(size_t *size); + /** * @} // endgoup LLVMCLTO * @defgroup LLVMCTLTO ThinLTO diff --git a/llvm/include/llvm/LTO/LTO.h b/llvm/include/llvm/LTO/LTO.h index 4bf93c5ee445..407af5e8de5d 100644 --- a/llvm/include/llvm/LTO/LTO.h +++ b/llvm/include/llvm/LTO/LTO.h @@ -298,6 +298,10 @@ public: /// Cache) for each task identifier. Error run(AddStreamFn AddStream, NativeObjectCache Cache = nullptr); + /// Static method that returns a list of libcall symbols that can be generated + /// by LTO but might not be visible from bitcode symbol table. + static ArrayRef getRuntimeLibcallSymbols(); + private: Config Conf; diff --git a/llvm/lib/LTO/LTO.cpp b/llvm/lib/LTO/LTO.cpp index 4696265a2320..9e16cba44fde 100644 --- a/llvm/lib/LTO/LTO.cpp +++ b/llvm/lib/LTO/LTO.cpp @@ -1011,6 +1011,16 @@ Error LTO::runRegularLTO(AddStreamFn AddStream) { std::move(RegularLTO.CombinedModule), ThinLTO.CombinedIndex); } +static const char *libcallRoutineNames[] = { +#define HANDLE_LIBCALL(code, name) name, +#include "llvm/IR/RuntimeLibcalls.def" +#undef HANDLE_LIBCALL +}; + +ArrayRef LTO::getRuntimeLibcallSymbols() { + return makeArrayRef(libcallRoutineNames); +} + /// This class defines the interface to the ThinLTO backend. class lto::ThinBackendProc { protected: diff --git a/llvm/tools/lto/lto.cpp b/llvm/tools/lto/lto.cpp index ce670c22c7fb..9ff16e85db4c 100644 --- a/llvm/tools/lto/lto.cpp +++ b/llvm/tools/lto/lto.cpp @@ -652,3 +652,9 @@ extern const char *lto_input_get_dependent_library(lto_input_t input, size_t *size) { return LTOModule::getDependentLibrary(unwrap(input), index, size); } + +extern const char *const *lto_runtime_lib_symbols_list(size_t *size) { + auto symbols = lto::LTO::getRuntimeLibcallSymbols(); + *size = symbols.size(); + return symbols.data(); +} diff --git a/llvm/tools/lto/lto.exports b/llvm/tools/lto/lto.exports index 6913e0e70dc3..d24809fe762f 100644 --- a/llvm/tools/lto/lto.exports +++ b/llvm/tools/lto/lto.exports @@ -76,3 +76,4 @@ lto_input_create lto_input_dispose lto_input_get_num_dependent_libraries lto_input_get_dependent_library +lto_runtime_lib_symbols_list