This is an archive of the discontinued LLVM Phabricator instance.

Differential D132478

[runtimes][NFC] Colocate handling of LLVM_ENABLE_PROJECTS and LLVM_ENABLE_RUNTIMES
ClosedPublic

Authored by ldionne on Aug 23 2022, 8:33 AM.

Details

Reviewers
phosek
jdoerfert
Ericson2314
Group Reviewers
Restricted Project
Restricted Project
Commits
rGa8cd9396c762: [runtimes][NFC] Colocate handling of LLVM_ENABLE_PROJECTS and…
Summary

This will make the following patches to migrate projects off of the
LLVM_ENABLE_PROJECTS build onto the LLVM_ENABLE_RUNTIMES build much
easier to comprehend. This patch should be a NFC since it keeps the
same set of runtimes being built by default.

Diff Detail

Event Timeline

ldionne created this revision.Aug 23 2022, 8:33 AM
Herald added a project: Restricted Project. · View Herald TranscriptAug 23 2022, 8:33 AM
Herald added a subscriber: mgorny. · View Herald Transcript
ldionne requested review of this revision.Aug 23 2022, 8:33 AM
Herald added a reviewer: jdoerfert. · View Herald TranscriptAug 23 2022, 8:33 AM
Herald added projects: Restricted Project, Restricted Project, Restricted Project. · View Herald Transcript
Herald added a reviewer: Restricted Project. · View Herald Transcript
Herald added a reviewer: Restricted Project. · View Herald Transcript
Herald added subscribers: llvm-commits, libcxx-commits, sstefan1. · View Herald Transcript
ldionne added a child revision: D132479: [runtimes] Shrink the set of runtimes included in the bootstrapping build by default.Aug 23 2022, 8:37 AM
ldionne mentioned this in D132324: [RFC] Remove support for building libc++ with `LLVM_ENABLE_PROJECTS`.Aug 23 2022, 8:41 AM
ldionne updated this revision to Diff 454862.Aug 23 2022, 8:49 AM

Make llvm/CMakeLists.txt and runtimes/CMakeLists.txt consistent, and stop lying in runtimes/CMakeLists.txt (the option documentation did not reflect what we really did).

Ericson2314 added a comment.Aug 23 2022, 1:48 PM

So this is in preparation for LLVM_DEFAULT_RUNTIMES in llvm/CMakeLists.txt doing a runtimes/ instead of llvm/runtimes/ build (among other changes)?

ldionne added a comment.Aug 23 2022, 3:40 PM
In D132478#3743644, @Ericson2314 wrote:

So this is in preparation for LLVM_DEFAULT_RUNTIMES in llvm/CMakeLists.txt doing a runtimes/ instead of llvm/runtimes/ build (among other changes)?

No, that doesn't change. We currently have two places where we define the set of things valid inside LLVM_ENABLE_RUNTIMES: <root>/runtimes/CMakeLists.txt and <root>/llvm/runtimes/CMakeLists.txt. This makes the two of them consistent, and also moves the one in <root>/llvm/runtimes/CMakeLists.txt to <root>/llvm/CMakeLists.txt so it can be close to the place where we define LLVM_ENABLE_PROJECTS, since the two are strongly related.

Ericson2314 added a comment.Aug 23 2022, 4:00 PM

Ah right, runtimes/ and llvm/runtimes are the two ways that remain per the plan.

It is generally nice to more narrowly "scope" LLVM_DEFAULT_RUNTIMES to where it is used, but I do see the concrete benefits when you are shuffling things between the lists.

Ericson2314 accepted this revision.Aug 23 2022, 4:02 PM
phosek accepted this revision.Aug 23 2022, 11:39 PM

LGTM

This revision was not accepted when it landed; it landed in state Needs Review.Aug 24 2022, 8:11 AM
This revision was landed with ongoing or failed builds.
Closed by commit rGa8cd9396c762: [runtimes][NFC] Colocate handling of LLVM_ENABLE_PROJECTS and… (authored by ldionne). · Explain Why
This revision was automatically updated to reflect the committed changes.
ldionne added a commit: rGa8cd9396c762: [runtimes][NFC] Colocate handling of LLVM_ENABLE_PROJECTS and….
Harbormaster completed remote builds in B182865: Diff 454862.Aug 24 2022, 8:42 AM

Revision Contents

PathSize
llvm/
14 lines
runtimes/
10 lines
runtimes/
6 lines

Diff 455224

llvm/CMakeLists.txt

Show First 20 Lines • Show All 137 Lines • ▼ Show 20 Lines if (NOT "mlir" IN_LIST LLVM_ENABLE_PROJECTS)
list(APPEND LLVM_ENABLE_PROJECTS "mlir") list(APPEND LLVM_ENABLE_PROJECTS "mlir")
endif() endif()
if (NOT "clang" IN_LIST LLVM_ENABLE_PROJECTS) if (NOT "clang" IN_LIST LLVM_ENABLE_PROJECTS)
message(FATAL_ERROR "Clang is not enabled, but is required for the Flang driver") message(FATAL_ERROR "Clang is not enabled, but is required for the Flang driver")
endif() endif()
endif() endif()
# Select the runtimes to build
set(LLVM_DEFAULT_RUNTIMES "compiler-rt;libc;libcxx;libcxxabi;libunwind;openmp")
set(LLVM_SUPPORTED_RUNTIMES "libc;libunwind;libcxxabi;pstl;libcxx;compiler-rt;openmp;llvm-libgcc")
set(LLVM_ENABLE_RUNTIMES "" CACHE STRING
"Semicolon-separated list of runtimes to build, or \"all\" (${LLVM_DEFAULT_RUNTIMES}). Supported runtimes are ${LLVM_SUPPORTED_RUNTIMES}.")
if(LLVM_ENABLE_RUNTIMES STREQUAL "all")
set(LLVM_ENABLE_RUNTIMES ${LLVM_DEFAULT_RUNTIMES})
endif()
foreach(proj IN LISTS LLVM_ENABLE_RUNTIMES)
if (NOT "${proj}" IN_LIST LLVM_SUPPORTED_RUNTIMES)
message(FATAL_ERROR "Runtime ${proj} is not a supported runtime. Supported runtimes are: ${LLVM_SUPPORTED_RUNTIMES}")
endif()
endforeach()
# LLVM_ENABLE_PROJECTS_USED is `ON` if the user has ever used the # LLVM_ENABLE_PROJECTS_USED is `ON` if the user has ever used the
# `LLVM_ENABLE_PROJECTS` CMake cache variable. This exists for # `LLVM_ENABLE_PROJECTS` CMake cache variable. This exists for
# several reasons: # several reasons:
# #
# * As an indicator that the `LLVM_ENABLE_PROJECTS` list is now the single # * As an indicator that the `LLVM_ENABLE_PROJECTS` list is now the single
# source of truth for which projects to build. This means we will ignore user # source of truth for which projects to build. This means we will ignore user
# supplied `LLVM_TOOL_<project>_BUILD` CMake cache variables and overwrite # supplied `LLVM_TOOL_<project>_BUILD` CMake cache variables and overwrite
# them. # them.
▲ Show 20 Lines • Show All 1,180 Lines • Show Last 20 Lines

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 clang/runtime directory which contains
# similar although simpler functionality. We should figure out how to merge # similar although simpler functionality. We should figure out how to merge
# the two files. # the two files.
# TODO: Selecting runtimes should be always performed inside the runtimes
# build, see runtimes/CMakeLists.txt, except that we currently check whether
# compiler-rt is being built to determine whether to first build builtins
# 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_ENABLE_RUNTIMES "" CACHE STRING
"Semicolon-separated list of runtimes to build (${LLVM_ALL_RUNTIMES}), or \"all\".")
if(LLVM_ENABLE_RUNTIMES STREQUAL "all" )
set(LLVM_ENABLE_RUNTIMES ${LLVM_ALL_RUNTIMES})
endif()
set(COMMON_CMAKE_ARGS "-DHAVE_LLVM_LIT=ON") set(COMMON_CMAKE_ARGS "-DHAVE_LLVM_LIT=ON")
foreach(proj ${LLVM_ENABLE_RUNTIMES}) foreach(proj ${LLVM_ENABLE_RUNTIMES})
set(proj_dir "${CMAKE_CURRENT_SOURCE_DIR}/../../${proj}") set(proj_dir "${CMAKE_CURRENT_SOURCE_DIR}/../../${proj}")
if(IS_DIRECTORY ${proj_dir} AND EXISTS ${proj_dir}/CMakeLists.txt) if(IS_DIRECTORY ${proj_dir} AND EXISTS ${proj_dir}/CMakeLists.txt)
list(APPEND runtimes ${proj_dir}) list(APPEND runtimes ${proj_dir})
else() else()
message(FATAL_ERROR "LLVM_ENABLE_RUNTIMES requests ${proj} but directory not found: ${proj_dir}") message(FATAL_ERROR "LLVM_ENABLE_RUNTIMES requests ${proj} but directory not found: ${proj_dir}")
endif() endif()
▲ Show 20 Lines • Show All 471 Lines • Show Last 20 Lines

runtimes/CMakeLists.txt

Show All 10 Lineslist(INSERT CMAKE_MODULE_PATH 0
"${LLVM_COMMON_CMAKE_UTILS}/Modules" "${LLVM_COMMON_CMAKE_UTILS}/Modules"
"${CMAKE_CURRENT_SOURCE_DIR}/../llvm/cmake" "${CMAKE_CURRENT_SOURCE_DIR}/../llvm/cmake"
"${CMAKE_CURRENT_SOURCE_DIR}/../llvm/cmake/modules" "${CMAKE_CURRENT_SOURCE_DIR}/../llvm/cmake/modules"
) )
# We order libraries to mirror roughly how they are layered, except that compiler-rt can depend # We order libraries to mirror roughly how they are layered, except that compiler-rt can depend
# on libc++, so we put it after. # on libc++, so we put it after.
set(LLVM_DEFAULT_RUNTIMES "libc;libunwind;libcxxabi;pstl;libcxx;compiler-rt;openmp") set(LLVM_DEFAULT_RUNTIMES "libc;libunwind;libcxxabi;pstl;libcxx;compiler-rt;openmp")
set(LLVM_ALL_RUNTIMES "${LLVM_DEFAULT_RUNTIMES};llvm-libgcc") set(LLVM_SUPPORTED_RUNTIMES "${LLVM_DEFAULT_RUNTIMES};llvm-libgcc")
set(LLVM_ENABLE_RUNTIMES "" CACHE STRING set(LLVM_ENABLE_RUNTIMES "" CACHE STRING
"Semicolon-separated list of runtimes to build (${LLVM_ALL_RUNTIMES}), or \"all\".") "Semicolon-separated list of runtimes to build, or \"all\" (${LLVM_DEFAULT_RUNTIMES}). Supported runtimes are ${LLVM_SUPPORTED_RUNTIMES}.")
if(LLVM_ENABLE_RUNTIMES STREQUAL "all" ) if(LLVM_ENABLE_RUNTIMES STREQUAL "all" )
set(LLVM_ENABLE_RUNTIMES ${LLVM_DEFAULT_RUNTIMES}) set(LLVM_ENABLE_RUNTIMES ${LLVM_DEFAULT_RUNTIMES})
endif() endif()
include(SortSubset) include(SortSubset)
sort_subset("${LLVM_ALL_RUNTIMES}" "${LLVM_ENABLE_RUNTIMES}" LLVM_ENABLE_RUNTIMES) sort_subset("${LLVM_SUPPORTED_RUNTIMES}" "${LLVM_ENABLE_RUNTIMES}" LLVM_ENABLE_RUNTIMES)
foreach(proj ${LLVM_ENABLE_RUNTIMES}) foreach(proj ${LLVM_ENABLE_RUNTIMES})
set(proj_dir "${CMAKE_CURRENT_SOURCE_DIR}/../${proj}") set(proj_dir "${CMAKE_CURRENT_SOURCE_DIR}/../${proj}")
if(IS_DIRECTORY ${proj_dir} AND EXISTS ${proj_dir}/CMakeLists.txt) if(IS_DIRECTORY ${proj_dir} AND EXISTS ${proj_dir}/CMakeLists.txt)
list(APPEND runtimes ${proj_dir}) list(APPEND runtimes ${proj_dir})
else() else()
message(FATAL_ERROR "LLVM_ENABLE_RUNTIMES requests ${proj} but directory not found: ${proj_dir}") message(FATAL_ERROR "LLVM_ENABLE_RUNTIMES requests ${proj} but directory not found: ${proj_dir}")
endif() endif()
▲ Show 20 Lines • Show All 252 Lines • Show Last 20 Lines