This is an archive of the discontinued LLVM Phabricator instance.

Differential D99755

Remove `clang/runtime`
AbandonedPublic

Authored by Ericson2314 on Apr 1 2021, 11:22 AM.

Details

Reviewers
beanz
phosek
Summary

This patch removes clang/runtime, after COMPILER_RT_INSTALL_PATH is
removed in order to simplify things for D99484.

As @phosek said in https://reviews.llvm.org/D99484#2662806

I'm not sure if we still need COMPILER_RT_INSTALL_PATH. That
variable is only used by clang/runtime/CMakeLists.txt which
predates runtimes/CMakeLists.txt and was AFAIK only ever used by
Apple. I think we should consider removing
COMPILER_RT_INSTALL_PATH. We'll need to check if
clang/runtime/CMakeLists.txt is still being used or not.

It turns out COMPILER_RT_INSTALL_PATH isn't only used by that, but we
might (hopefully!) be able to remove it annyways. If so, clang/runtime
can still be removed, which is a simplification we might as well do if
@phosek is right that it is no longer in use.

Diff Detail

Event Timeline

Ericson2314 created this revision.Apr 1 2021, 11:22 AM
Herald added a subscriber: mgorny. · View Herald TranscriptApr 1 2021, 11:22 AM
Ericson2314 requested review of this revision.Apr 1 2021, 11:22 AM
Herald added projects: Restricted Project, Restricted Project. · View Herald TranscriptApr 1 2021, 11:22 AM
Herald added subscribers: Restricted Project, cfe-commits. · View Herald Transcript
Ericson2314 added inline comments.Apr 1 2021, 11:23 AM
compiler-rt/cmake/base-config-ix.cmake
95 ↗(On Diff #334775)

I'm a bit confused we'd ever want too install libs directly in ${CMAKE_INSTALL_PREFIX}, but that is technically the existing behavior, with the default value for COMPILER_RT_INSTALL_PATH, so I kept it.

Ericson2314 mentioned this in D99484: [clang-tools-extra][cmake] Use `GNUInstallDirs` to support custom installation dirs..Apr 1 2021, 11:24 AM
Ericson2314 updated this revision to Diff 334780.Apr 1 2021, 11:28 AM

Also remove clang/runtime from a TODO comment elsewhere in the tree

I put runtimes in there as it's evidentially its spiritual successor.

Herald added a project: Restricted Project. · View Herald TranscriptApr 1 2021, 11:28 AM
Herald added a subscriber: llvm-commits. · View Herald Transcript
Harbormaster completed remote builds in B96774: Diff 334775.Apr 1 2021, 11:32 AM
Harbormaster completed remote builds in B96776: Diff 334780.Apr 1 2021, 11:34 AM
phosek added reviewers: beanz, phosek.Apr 1 2021, 2:00 PM

@beanz do you know if clang/runtime is still being used?

Ericson2314 updated this revision to Diff 334955.Apr 2 2021, 7:42 AM

Remove add_subdirectory(runtime) for deleted dir

Ericson2314 added a comment.Apr 2 2021, 7:47 AM

So unfortunately it seems the clang/runtime's use was triggered by LLVM_BUILD_EXTERNAL_COMPILER_RT, which is in use in a few places still? (And not just Apple ones.)

On the other hand, since this is doing an *external* CMake for compiler-rt, I fail to see why COMPILER_RT_INSTALL_PATH is needed; why not just pass a different CMAKE_INSTALL_PREFIX?

Harbormaster completed remote builds in B96899: Diff 334955.Apr 2 2021, 8:24 AM
Ericson2314 updated this revision to Diff 335149.Apr 4 2021, 9:33 AM

Remove stray COMPILER_RT_INSTALL_PATH

I am uncertain about is the redefining of CMAKE_INSTALL_PREIX in
compiler-rt/cmake/base-config-ix.cmake. This occurs under
LLVM_TREE_AVAILABLE. If this is just for separate compiler-rt builds
(separate invocation of CMake, that is), this is fine. But if on the other hand
this is for combination builds in a single CMake run, then this sort of
redefinition is no good as it will effect more than compiler-rt.

Ericson2314 added a comment.Apr 4 2021, 9:39 AM

See also D99860. We may still want to remove clang/runtime, but I don't think it's necessary. I will turn this revision into one on top of that just for for removing clang/runtime.

Ericson2314 updated this revision to Diff 335154.Apr 4 2021, 9:43 AM

Put on top of D99860

Harbormaster completed remote builds in B97048: Diff 335154.Apr 4 2021, 9:43 AM
Ericson2314 retitled this revision from Remove clang/runtime and `COMPILER_RT_INSTALL_PATH` to Remove `COMPILER_RT_INSTALL_PATH`.Apr 4 2021, 9:47 AM
Ericson2314 edited the summary of this revision. (Show Details)
Ericson2314 edited the summary of this revision. (Show Details)
Harbormaster completed remote builds in B97045: Diff 335149.Apr 4 2021, 10:12 AM
Ericson2314 retitled this revision from Remove `COMPILER_RT_INSTALL_PATH` to Remove `clang/runtime`.Apr 4 2021, 10:38 AM
Ericson2314 added a comment.May 4 2021, 7:42 PM

D101497 is more safe/conservative and gets the job done to prepare for`GnuInstallDirs`. Closing in favor of that.

Ericson2314 abandoned this revision.May 4 2021, 7:43 PM

Revision Contents

PathSize
clang/
1 line
runtime/
compiler-rt/
llvm/
runtimes/
4 lines

Diff 335154

clang/CMakeLists.txt

Show First 20 Lines • Show All 511 Lines • ▼ Show 20 Lines
# header-wise on it as they ship all headers from the umbrella folders. Building # header-wise on it as they ship all headers from the umbrella folders. Building
# an entire module might include header, which depends on intrinsics_gen. # an entire module might include header, which depends on intrinsics_gen.
if(LLVM_ENABLE_MODULES) if(LLVM_ENABLE_MODULES)
list(APPEND LLVM_COMMON_DEPENDS intrinsics_gen) list(APPEND LLVM_COMMON_DEPENDS intrinsics_gen)
endif() endif()
add_subdirectory(lib) add_subdirectory(lib)
add_subdirectory(tools) add_subdirectory(tools)
add_subdirectory(runtime)
option(CLANG_BUILD_EXAMPLES "Build CLANG example programs by default." OFF) option(CLANG_BUILD_EXAMPLES "Build CLANG example programs by default." OFF)
add_subdirectory(examples) add_subdirectory(examples)
if(APPLE) if(APPLE)
# this line is needed as a cleanup to ensure that any CMakeCaches with the old # this line is needed as a cleanup to ensure that any CMakeCaches with the old
# default value get updated to the new default. # default value get updated to the new default.
if(CLANG_ORDER_FILE STREQUAL "") if(CLANG_ORDER_FILE STREQUAL "")
▲ Show 20 Lines • Show All 381 Lines • Show Last 20 Lines

clang/runtime/CMakeLists.txt

  • This file was deleted.
# TODO: Set the install directory.
include(ExternalProject)
set(known_subdirs
"libcxx"
)
foreach (dir ${known_subdirs})
if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${dir}/CMakeLists.txt)
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/${dir})
endif()
endforeach()
function(get_ext_project_build_command out_var target)
if (CMAKE_GENERATOR MATCHES "Make")
# Use special command for Makefiles to support parallelism.
set(${out_var} "$(MAKE)" "${target}" PARENT_SCOPE)
else()
set(${out_var} ${CMAKE_COMMAND} --build . --target ${target}
--config $<CONFIG> PARENT_SCOPE)
endif()
endfunction()
set(COMPILER_RT_SRC_ROOT ${LLVM_MAIN_SRC_DIR}/projects/compiler-rt)
# Fallback to the external path, if the other one isn't available.
# This is the same behavior (try "internal", then check the LLVM_EXTERNAL_...
# variable) as in add_llvm_external_project
if(NOT EXISTS ${COMPILER_RT_SRC_ROOT})
# We don't want to set it if LLVM_EXTERNAL_COMPILER_RT_SOURCE_DIR is ""
if(LLVM_EXTERNAL_COMPILER_RT_SOURCE_DIR)
set(COMPILER_RT_SRC_ROOT ${LLVM_EXTERNAL_COMPILER_RT_SOURCE_DIR})
endif()
endif()
if(LLVM_BUILD_EXTERNAL_COMPILER_RT AND EXISTS ${COMPILER_RT_SRC_ROOT}/)
# Add compiler-rt as an external project.
set(COMPILER_RT_PREFIX ${CMAKE_BINARY_DIR}/projects/compiler-rt)
set(STAMP_DIR ${CMAKE_CURRENT_BINARY_DIR}/compiler-rt-stamps/)
set(BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/compiler-rt-bins/)
add_custom_target(compiler-rt-clear
COMMAND ${CMAKE_COMMAND} -E remove_directory ${BINARY_DIR}
COMMAND ${CMAKE_COMMAND} -E remove_directory ${STAMP_DIR}
COMMENT "Clobberring compiler-rt build and stamp directories"
)
# Find all variables that start with COMPILER_RT and populate a variable with
# them.
get_cmake_property(variableNames VARIABLES)
foreach(variableName ${variableNames})
if(variableName MATCHES "^COMPILER_RT")
string(REPLACE ";" "\;" value "${${variableName}}")
list(APPEND COMPILER_RT_PASSTHROUGH_VARIABLES
-D${variableName}=${value})
endif()
endforeach()
set(compiler_rt_configure_deps)
if(TARGET cxx-headers)
list(APPEND compiler_rt_configure_deps "cxx-headers")
endif()
if(LLVM_INCLUDE_TESTS)
list(APPEND compiler_rt_configure_deps LLVMTestingSupport)
endif()
ExternalProject_Add(compiler-rt
DEPENDS llvm-config clang ${compiler_rt_configure_deps}
PREFIX ${COMPILER_RT_PREFIX}
SOURCE_DIR ${COMPILER_RT_SRC_ROOT}
STAMP_DIR ${STAMP_DIR}
BINARY_DIR ${BINARY_DIR}
CMAKE_ARGS ${CLANG_COMPILER_RT_CMAKE_ARGS}
-DCMAKE_C_COMPILER=${LLVM_RUNTIME_OUTPUT_INTDIR}/clang
-DCMAKE_CXX_COMPILER=${LLVM_RUNTIME_OUTPUT_INTDIR}/clang++
-DCMAKE_ASM_COMPILER=${LLVM_RUNTIME_OUTPUT_INTDIR}/clang
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
-DCMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM}
-DLLVM_CONFIG_PATH=${LLVM_RUNTIME_OUTPUT_INTDIR}/llvm-config
-DLLVM_LIT_ARGS=${LLVM_LIT_ARGS}
-DCOMPILER_RT_OUTPUT_DIR=${LLVM_LIBRARY_OUTPUT_INTDIR}/clang/${CLANG_VERSION}
-DCOMPILER_RT_EXEC_OUTPUT_DIR=${LLVM_RUNTIME_OUTPUT_INTDIR}
-DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}/lib${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}
-DCOMPILER_RT_INCLUDE_TESTS=${LLVM_INCLUDE_TESTS}
-DLLVM_LIBDIR_SUFFIX=${LLVM_LIBDIR_SUFFIX}
-DLLVM_RUNTIME_OUTPUT_INTDIR=${LLVM_RUNTIME_OUTPUT_INTDIR}
-DCMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET}
-DCMAKE_OSX_SYSROOT:PATH=${CMAKE_OSX_SYSROOT}
${COMPILER_RT_PASSTHROUGH_VARIABLES}
INSTALL_COMMAND ""
STEP_TARGETS configure build
USES_TERMINAL_CONFIGURE 1
USES_TERMINAL_BUILD 1
USES_TERMINAL_INSTALL 1
# Always run the build command so that incremental builds are correct.
BUILD_ALWAYS 1
)
get_ext_project_build_command(run_clean_compiler_rt clean)
ExternalProject_Add_Step(compiler-rt clean
COMMAND ${run_clean_compiler_rt}
COMMENT "Cleaning compiler-rt..."
DEPENDEES configure
DEPENDERS build
DEPENDS clang
WORKING_DIRECTORY ${BINARY_DIR}
)
install(CODE "execute_process\(COMMAND \${CMAKE_COMMAND} -DCMAKE_INSTALL_PREFIX=\${CMAKE_INSTALL_PREFIX} -P ${BINARY_DIR}/cmake_install.cmake \)"
COMPONENT compiler-rt)
add_llvm_install_targets(install-compiler-rt
DEPENDS compiler-rt
COMPONENT compiler-rt)
# Add top-level targets that build specific compiler-rt runtimes.
set(COMPILER_RT_RUNTIMES fuzzer asan builtins dfsan lsan msan profile tsan ubsan ubsan-minimal)
foreach(runtime ${COMPILER_RT_RUNTIMES})
get_ext_project_build_command(build_runtime_cmd ${runtime})
add_custom_target(${runtime}
COMMAND ${build_runtime_cmd}
DEPENDS compiler-rt-configure
WORKING_DIRECTORY ${BINARY_DIR}
VERBATIM USES_TERMINAL)
endforeach()
if(LLVM_INCLUDE_TESTS)
# Add binaries that compiler-rt tests depend on.
set(COMPILER_RT_TEST_DEPENDENCIES
FileCheck count not llvm-nm llvm-objdump llvm-symbolizer)
# Add top-level targets for various compiler-rt test suites.
set(COMPILER_RT_TEST_SUITES check-fuzzer check-asan check-hwasan check-asan-dynamic check-dfsan
check-lsan check-msan check-sanitizer check-tsan check-ubsan check-ubsan-minimal
check-profile check-cfi check-cfi-and-supported check-safestack check-gwp_asan)
foreach(test_suite ${COMPILER_RT_TEST_SUITES})
get_ext_project_build_command(run_test_suite ${test_suite})
add_custom_target(${test_suite}
COMMAND ${run_test_suite}
DEPENDS compiler-rt-build ${COMPILER_RT_TEST_DEPENDENCIES}
WORKING_DIRECTORY ${BINARY_DIR}
VERBATIM
USES_TERMINAL
)
endforeach()
# Add special target to run all compiler-rt test suites.
get_ext_project_build_command(run_check_compiler_rt check-all)
add_custom_target(check-compiler-rt
COMMAND ${run_check_compiler_rt}
DEPENDS compiler-rt-build ${COMPILER_RT_TEST_DEPENDENCIES}
WORKING_DIRECTORY ${BINARY_DIR}
VERBATIM USES_TERMINAL)
# Add special target to run all compiler-rt test suites.
get_ext_project_build_command(run_check_compiler_rt compiler-rt-test-depends)
add_custom_target(compiler-rt-test-depends
COMMAND ${run_check_compiler_rt}
DEPENDS compiler-rt-build ${COMPILER_RT_TEST_DEPENDENCIES}
WORKING_DIRECTORY ${BINARY_DIR}
VERBATIM USES_TERMINAL)
set_property(GLOBAL APPEND PROPERTY LLVM_ADDITIONAL_TEST_DEPENDS compiler-rt-test-depends)
set_property(GLOBAL APPEND PROPERTY LLVM_ADDITIONAL_TEST_TARGETS check-compiler-rt)
endif()
endif()

clang/runtime/compiler-rt/clang_linux_test_input.c

  • This file was deleted.
// This file is used to check if we can produce working executables
// for i386 and x86_64 archs on Linux.
#include <stdlib.h>
int main(){}

llvm/runtimes/CMakeLists.txt

# TODO: This file assumes the Clang toolchain so it'd be better if it lived in # TODO: This file assumes the Clang toolchain so it'd be better if it lived in
# Clang, except there already is clang/runtime directory which contains # Clang, except there already is runtimes directory which contains
# similar although simpler functionality. We should figure out how to merge # similar functionality. We should figure out how to merge
# the two files. # the two files.
# TODO: Selecting runtimes should be always performed inside the runtimes # TODO: Selecting runtimes should be always performed inside the runtimes
# build, see runtimes/CMakeLists.txt, except that we currently check whether # build, see runtimes/CMakeLists.txt, except that we currently check whether
# compiler-rt is being built to determine whether to first build builtins # compiler-rt is being built to determine whether to first build builtins
# or not so we need that information in this file as well. # or not so we need that information in this file as well.
set(LLVM_ALL_RUNTIMES "compiler-rt;libc;libcxx;libcxxabi;libunwind;openmp") set(LLVM_ALL_RUNTIMES "compiler-rt;libc;libcxx;libcxxabi;libunwind;openmp")
set(LLVM_ENABLE_RUNTIMES "" CACHE STRING set(LLVM_ENABLE_RUNTIMES "" CACHE STRING
▲ Show 20 Lines • Show All 447 Lines • Show Last 20 Lines
clang/runtime/CMakeLists.txt