Skip to content

Commit

Permalink
[CMake] Cache the compiler-rt library search results
Browse files Browse the repository at this point in the history
There's a lot of duplicated calls to find various compiler-rt libraries
from build of runtime libraries like libunwind, libc++, libc++abi and
compiler-rt. The compiler-rt helper module already implemented caching
for results avoid repeated Clang invocations.

This change moves the compiler-rt implementation into a shared location
and reuses it from other runtimes to reduce duplication and speed up
the build.

Differential Revision: https://reviews.llvm.org/D88458
  • Loading branch information
petrhosek committed Oct 28, 2021
1 parent 22bd75b commit 22acda4
Show file tree
Hide file tree
Showing 17 changed files with 128 additions and 267 deletions.
101 changes: 101 additions & 0 deletions cmake/Modules/HandleCompilerRT.cmake
@@ -0,0 +1,101 @@
# Check if compile-rt library file path exists.
# If found, cache the path in:
# COMPILER_RT_LIBRARY-<name>-<target>
# If err_flag is true OR path not found, emit a message and set:
# COMPILER_RT_LIBRARY-<name>-<target> to NOTFOUND
function(cache_compiler_rt_library err_flag name target library_file)
if(err_flag OR NOT EXISTS "${library_file}")
message(STATUS "Failed to find compiler-rt ${name} library for ${target}")
set(COMPILER_RT_LIBRARY_${name}_${target} "NOTFOUND" CACHE INTERNAL
"compiler-rt ${name} library for ${target}")
else()
message(STATUS "Found compiler-rt ${name} library: ${library_file}")
set(COMPILER_RT_LIBRARY_${name}_${target} "${library_file}" CACHE INTERNAL
"compiler-rt ${name} library for ${target}")
endif()
endfunction()

function(get_component_name name variable)
if(APPLE)
if(NOT name MATCHES "builtins.*")
set(component_name "${name}_")
endif()
# TODO: Support ios, tvos and watchos as well.
set(component_name "${component_name}osx")
else()
set(component_name "${name}")
endif()
set(${variable} "${component_name}" PARENT_SCOPE)
endfunction()

# Find the path to compiler-rt library `name` (e.g. "builtins") for the
# specified `TARGET` (e.g. "x86_64-linux-gnu") and return it in `variable`.
# This calls cache_compiler_rt_library that caches the path to speed up
# repeated invocations with the same `name` and `target`.
function(find_compiler_rt_library name variable)
cmake_parse_arguments(ARG "" "TARGET;FLAGS" "" ${ARGN})
# While we can use compiler-rt runtimes with other compilers, we need to
# query the compiler for runtime location and thus we require Clang.
if(NOT CMAKE_CXX_COMPILER_ID MATCHES Clang)
set(${variable} "NOTFOUND" PARENT_SCOPE)
return()
endif()
set(target "${ARG_TARGET}")
if(NOT target AND CMAKE_CXX_COMPILER_TARGET)
set(target "${CMAKE_CXX_COMPILER_TARGET}")
endif()
if(NOT DEFINED COMPILER_RT_LIBRARY_builtins_${target})
# If the cache variable is not defined, invoke Clang and then
# set it with cache_compiler_rt_library.
set(clang_command ${CMAKE_CXX_COMPILER} "${ARG_FLAGS}")
if(target)
list(APPEND clang_command "--target=${target}")
endif()
get_property(cxx_flags CACHE CMAKE_CXX_FLAGS PROPERTY VALUE)
string(REPLACE " " ";" cxx_flags "${cxx_flags}")
list(APPEND clang_command ${cxx_flags})
execute_process(
COMMAND ${clang_command} "--rtlib=compiler-rt" "-print-libgcc-file-name"
RESULT_VARIABLE had_error
OUTPUT_VARIABLE library_file
)
string(STRIP "${library_file}" library_file)
file(TO_CMAKE_PATH "${library_file}" library_file)
get_filename_component(dirname ${library_file} DIRECTORY)
if(APPLE)
execute_process(
COMMAND ${clang_command} "--print-resource-dir"
RESULT_VARIABLE had_error
OUTPUT_VARIABLE resource_dir
)
string(STRIP "${resource_dir}" resource_dir)
set(dirname "${resource_dir}/lib/darwin")
endif()
get_filename_component(basename ${library_file} NAME)
if(basename MATCHES "libclang_rt\.([a-z0-9_\-]+)\.a")
set(from_name ${CMAKE_MATCH_1})
get_component_name(${CMAKE_MATCH_1} to_name)
string(REPLACE "${from_name}" "${to_name}" basename "${basename}")
set(library_file "${dirname}/${basename}")
cache_compiler_rt_library(${had_error} builtins "${target}" "${library_file}")
endif()
endif()
if(NOT COMPILER_RT_LIBRARY_builtins_${target})
set(${variable} "NOTFOUND" PARENT_SCOPE)
return()
endif()
if(NOT DEFINED COMPILER_RT_LIBRARY_${name}_${target})
# Clang gives only the builtins library path. Other library paths are
# obtained by substituting "builtins" with ${name} in the builtins
# path and then checking if the resultant path exists. The result of
# this check is also cached by cache_compiler_rt_library.
set(library_file "${COMPILER_RT_LIBRARY_builtins_${target}}")
if(library_file MATCHES ".*libclang_rt\.([a-z0-9_\-]+)\.a")
set(from_name ${CMAKE_MATCH_0})
get_component_name(${name} to_name)
string(REPLACE "${from_name}" "${to_name}" library_file "${library_file}")
cache_compiler_rt_library(FALSE "${name}" "${target}" "${library_file}")
endif()
endif()
set(${variable} "${COMPILER_RT_LIBRARY_${name}_${target}}" PARENT_SCOPE)
endfunction()
2 changes: 2 additions & 0 deletions compiler-rt/CMakeLists.txt
Expand Up @@ -16,6 +16,8 @@ endif()
list(INSERT CMAKE_MODULE_PATH 0
"${CMAKE_CURRENT_SOURCE_DIR}/cmake"
"${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules"
"${CMAKE_CURRENT_SOURCE_DIR}/../cmake"
"${CMAKE_CURRENT_SOURCE_DIR}/../cmake/Modules"
)

if(CMAKE_CONFIGURATION_TYPES)
Expand Down
2 changes: 1 addition & 1 deletion compiler-rt/cmake/Modules/AddCompilerRT.cmake
Expand Up @@ -254,7 +254,7 @@ function(add_compiler_rt_runtime name type)
if(COMPILER_RT_USE_BUILTINS_LIBRARY AND NOT type STREQUAL "OBJECT" AND
NOT name STREQUAL "clang_rt.builtins")
get_compiler_rt_target(${arch} target)
find_compiler_rt_library(builtins ${target} builtins_${libname})
find_compiler_rt_library(builtins builtins_${libname} TARGET ${target})
if(builtins_${libname} STREQUAL "NOTFOUND")
message(FATAL_ERROR "Cannot find builtins library for the target architecture")
endif()
Expand Down
65 changes: 0 additions & 65 deletions compiler-rt/cmake/Modules/HandleCompilerRT.cmake

This file was deleted.

3 changes: 2 additions & 1 deletion compiler-rt/cmake/config-ix.cmake
Expand Up @@ -16,7 +16,8 @@ endfunction()
check_library_exists(c fopen "" COMPILER_RT_HAS_LIBC)
if (COMPILER_RT_USE_BUILTINS_LIBRARY)
include(HandleCompilerRT)
find_compiler_rt_library(builtins "" COMPILER_RT_BUILTINS_LIBRARY)
find_compiler_rt_library(builtins COMPILER_RT_BUILTINS_LIBRARY
FLAGS ${SANITIZER_COMMON_FLAGS})
# TODO(PR51389): We should check COMPILER_RT_BUILTINS_LIBRARY and report an
# error if the value is NOTFOUND rather than silenty continuing but we first
# need to fix find_compiler_rt_library on Darwin.
Expand Down
4 changes: 3 additions & 1 deletion compiler-rt/lib/builtins/CMakeLists.txt
Expand Up @@ -11,7 +11,9 @@ if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
set(COMPILER_RT_BUILTINS_STANDALONE_BUILD TRUE)
list(INSERT CMAKE_MODULE_PATH 0
"${CMAKE_SOURCE_DIR}/../../cmake"
"${CMAKE_SOURCE_DIR}/../../cmake/Modules")
"${CMAKE_SOURCE_DIR}/../../cmake/Modules"
"${CMAKE_SOURCE_DIR}/../../../cmake"
"${CMAKE_SOURCE_DIR}/../../../cmake/Modules")
include(base-config-ix)
include(CompilerRTUtils)

Expand Down
2 changes: 2 additions & 0 deletions libcxx/CMakeLists.txt
Expand Up @@ -14,6 +14,8 @@ cmake_minimum_required(VERSION 3.13.4)
set(CMAKE_MODULE_PATH
"${CMAKE_CURRENT_SOURCE_DIR}/cmake"
"${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules"
"${CMAKE_CURRENT_SOURCE_DIR}/../cmake"
"${CMAKE_CURRENT_SOURCE_DIR}/../cmake/Modules"
${CMAKE_MODULE_PATH}
)

Expand Down
64 changes: 0 additions & 64 deletions libcxx/cmake/Modules/HandleCompilerRT.cmake

This file was deleted.

5 changes: 3 additions & 2 deletions libcxx/cmake/config-ix.cmake
Expand Up @@ -48,8 +48,9 @@ if (LIBCXX_SUPPORTS_NOSTDLIBXX_FLAG OR LIBCXX_SUPPORTS_NODEFAULTLIBS_FLAG)
list(APPEND CMAKE_REQUIRED_LIBRARIES c)
endif ()
if (LIBCXX_USE_COMPILER_RT)
set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -rtlib=compiler-rt")
find_compiler_rt_library(builtins LIBCXX_BUILTINS_LIBRARY)
include(HandleCompilerRT)
find_compiler_rt_library(builtins LIBCXX_BUILTINS_LIBRARY
FLAGS ${LIBCXX_COMPILE_FLAGS})
list(APPEND CMAKE_REQUIRED_LIBRARIES "${LIBCXX_BUILTINS_LIBRARY}")
elseif (LIBCXX_HAS_GCC_LIB)
list(APPEND CMAKE_REQUIRED_LIBRARIES gcc)
Expand Down
3 changes: 2 additions & 1 deletion libcxx/src/CMakeLists.txt
Expand Up @@ -163,7 +163,8 @@ if (APPLE AND LLVM_USE_SANITIZER)
message(WARNING "LLVM_USE_SANITIZER=${LLVM_USE_SANITIZER} is not supported on OS X")
endif()
if (LIBFILE)
find_compiler_rt_dir(LIBDIR)
find_compiler_rt_library(builtins LIBCXX_BUILTINS_LIBRARY)
get_filename_component(LIBDIR "${LIBCXX_BUILTINS_LIBRARY}" DIRECTORY)
if (NOT IS_DIRECTORY "${LIBDIR}")
message(FATAL_ERROR "Cannot find compiler-rt directory on OS X required for LLVM_USE_SANITIZER")
endif()
Expand Down
2 changes: 2 additions & 0 deletions libcxxabi/CMakeLists.txt
Expand Up @@ -14,6 +14,8 @@ cmake_minimum_required(VERSION 3.13.4)
set(CMAKE_MODULE_PATH
"${CMAKE_CURRENT_SOURCE_DIR}/cmake"
"${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules"
"${CMAKE_CURRENT_SOURCE_DIR}/../cmake"
"${CMAKE_CURRENT_SOURCE_DIR}/../cmake/Modules"
${CMAKE_MODULE_PATH}
)

Expand Down
64 changes: 0 additions & 64 deletions libcxxabi/cmake/Modules/HandleCompilerRT.cmake

This file was deleted.

5 changes: 3 additions & 2 deletions libcxxabi/cmake/config-ix.cmake
Expand Up @@ -38,8 +38,9 @@ if (LIBCXXABI_SUPPORTS_NOSTDLIBXX_FLAG OR LIBCXXABI_SUPPORTS_NODEFAULTLIBS_FLAG)
list(APPEND CMAKE_REQUIRED_LIBRARIES c)
endif ()
if (LIBCXXABI_USE_COMPILER_RT)
set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -rtlib=compiler-rt")
find_compiler_rt_library(builtins LIBCXXABI_BUILTINS_LIBRARY)
include(HandleCompilerRT)
find_compiler_rt_library(builtins LIBCXXABI_BUILTINS_LIBRARY
FLAGS "${LIBCXXABI_COMPILE_FLAGS}")
list(APPEND CMAKE_REQUIRED_LIBRARIES "${LIBCXXABI_BUILTINS_LIBRARY}")
else ()
if (LIBCXXABI_HAS_GCC_S_LIB)
Expand Down
3 changes: 2 additions & 1 deletion libcxxabi/src/CMakeLists.txt
Expand Up @@ -136,7 +136,8 @@ if ( APPLE )
message(WARNING "LLVM_USE_SANITIZER=${LLVM_USE_SANITIZER} is not supported on OS X")
endif()
if (LIBFILE)
find_compiler_rt_dir(LIBDIR)
find_compiler_rt_library(builtins LIBCXXABI_BUILTINS_LIBRARY)
get_filename_component(LIBDIR "${LIBCXXABI_BUILTINS_LIBRARY}" DIRECTORY)
if (NOT IS_DIRECTORY "${LIBDIR}")
message(FATAL_ERROR "Cannot find compiler-rt directory on OS X required for LLVM_USE_SANITIZER")
endif()
Expand Down

0 comments on commit 22acda4

Please sign in to comment.