Skip to content

[CI] Use LLVM_ENABLE_RUNTIMES for runtimes builds on Linux #142694

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 12 commits into from
Jun 8, 2025
Merged

[CI] Use LLVM_ENABLE_RUNTIMES for runtimes builds on Linux #142694

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
e12b275
[𝘀𝗽𝗿] changes to main this commit is based on
boomanaiden154 Jun 3, 2025
9e3490b
[𝘀𝗽𝗿] initial version
boomanaiden154 Jun 3, 2025
ba43ca7
[𝘀𝗽𝗿] changes introduced through rebase
boomanaiden154 Jun 5, 2025
fd8ffd7
feedback
boomanaiden154 Jun 5, 2025
5deb5fd
[𝘀𝗽𝗿] changes introduced through rebase
boomanaiden154 Jun 5, 2025
0299b29
formatting
boomanaiden154 Jun 5, 2025
5473607
[𝘀𝗽𝗿] changes introduced through rebase
boomanaiden154 Jun 7, 2025
67f3d1c
rebase
boomanaiden154 Jun 7, 2025
35dcd5a
[𝘀𝗽𝗿] changes introduced through rebase
boomanaiden154 Jun 7, 2025
af9686f
rebase
boomanaiden154 Jun 7, 2025
d1a3b15
[𝘀𝗽𝗿] changes introduced through rebase
boomanaiden154 Jun 8, 2025
b594527
rebase
boomanaiden154 Jun 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 10 additions & 36 deletions .ci/monolithic-linux.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,51 +102,25 @@ if [[ "${runtimes}" != "" ]]; then
exit 1
fi

echo "--- ninja install-clang"

ninja -C ${BUILD_DIR} install-clang install-clang-resource-headers

RUNTIMES_BUILD_DIR="${MONOREPO_ROOT}/build-runtimes"
INSTALL_DIR="${BUILD_DIR}/install"
mkdir -p ${RUNTIMES_BUILD_DIR}

echo "--- cmake runtimes C++26"

rm -rf "${RUNTIMES_BUILD_DIR}"
cmake -S "${MONOREPO_ROOT}/runtimes" -B "${RUNTIMES_BUILD_DIR}" -GNinja \
-D CMAKE_C_COMPILER="${INSTALL_DIR}/bin/clang" \
-D CMAKE_CXX_COMPILER="${INSTALL_DIR}/bin/clang++" \
-D LLVM_ENABLE_RUNTIMES="${runtimes}" \
-D LIBCXX_CXX_ABI=libcxxabi \
-D CMAKE_BUILD_TYPE=RelWithDebInfo \
-D CMAKE_INSTALL_PREFIX="${INSTALL_DIR}" \
-D LIBCXX_TEST_PARAMS="std=c++26" \
-D LIBCXXABI_TEST_PARAMS="std=c++26" \
-D LLVM_LIT_ARGS="${lit_args}"
cmake \
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think I don't quite understand what this change does. You're basically just re-generating the CMake cache and re-running ninja every time?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes. Rerunning CMake with the existing cache so we don't have to rerun all the checks just to change the test configuration. Then we run ninja which goes through the runtimes build. This is mainly to make it simpler to move compiler-rt and libc over to the runtimes build.

-D LIBCXX_TEST_PARAMS="std=c++26" \
-D LIBCXXABI_TEST_PARAMS="std=c++26" \
"${BUILD_DIR}"

echo "--- ninja runtimes C++26"

ninja -vC "${RUNTIMES_BUILD_DIR}" ${runtime_targets}
ninja -C "${BUILD_DIR}" ${runtime_targets}

echo "--- cmake runtimes clang modules"

# We don't need to do a clean build of runtimes, because LIBCXX_TEST_PARAMS
# and LIBCXXABI_TEST_PARAMS only affect lit configuration, which successfully
# propagates without a clean build. Other that those two variables, builds
# are supposed to be the same.

cmake -S "${MONOREPO_ROOT}/runtimes" -B "${RUNTIMES_BUILD_DIR}" -GNinja \
-D CMAKE_C_COMPILER="${INSTALL_DIR}/bin/clang" \
-D CMAKE_CXX_COMPILER="${INSTALL_DIR}/bin/clang++" \
-D LLVM_ENABLE_RUNTIMES="${runtimes}" \
-D LIBCXX_CXX_ABI=libcxxabi \
-D CMAKE_BUILD_TYPE=RelWithDebInfo \
-D CMAKE_INSTALL_PREFIX="${INSTALL_DIR}" \
-D LIBCXX_TEST_PARAMS="enable_modules=clang" \
-D LIBCXXABI_TEST_PARAMS="enable_modules=clang" \
-D LLVM_LIT_ARGS="${lit_args}"
cmake \
-D LIBCXX_TEST_PARAMS="enable_modules=clang" \
-D LIBCXXABI_TEST_PARAMS="enable_modules=clang" \
"${BUILD_DIR}"

echo "--- ninja runtimes clang modules"

ninja -vC "${RUNTIMES_BUILD_DIR}" ${runtime_targets}
ninja -C "${BUILD_DIR}" ${runtime_targets}
fi
1 change: 1 addition & 0 deletions libcxx/test/libcxx/containers/views/mdspan/extents/assert.conversion.pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
// (((Extents != dynamic_extent) && (OtherExtents == dynamic_extent)) || ... ) ||
// (numeric_limits<index_type>::max() < numeric_limits<OtherIndexType>::max())

#include <span> // dynamic_extent
#include <mdspan>
#include <cassert>

Expand Down
1 change: 1 addition & 0 deletions libcxx/test/libcxx/containers/views/mdspan/extents/assert.ctor_from_array.pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
// for every rank index r.
//

#include <span> // dynamic_extent
#include <mdspan>
#include <cassert>

Expand Down
1 change: 1 addition & 0 deletions libcxx/test/libcxx/containers/views/mdspan/extents/assert.ctor_from_integral.pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
// - each element of exts is nonnegative and is representable as a value of type index_type.
//

#include <span> // dynamic_extent
#include <mdspan>
#include <cassert>

Expand Down
1 change: 1 addition & 0 deletions libcxx/test/libcxx/containers/views/mdspan/extents/assert.ctor_from_span.pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
// for every rank index r.
//

#include <span> // dynamic_extent
#include <mdspan>
#include <cassert>

Expand Down
1 change: 1 addition & 0 deletions libcxx/test/libcxx/containers/views/mdspan/extents/assert.obs.pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
//
// Returns: Di.

#include <span> // dynamic_extent
#include <mdspan>
#include <cassert>

Expand Down
1 change: 1 addition & 0 deletions libcxx/test/libcxx/containers/views/mdspan/layout_left/assert.conversion.pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
//
// Preconditions: other.required_span_size() is representable as a value of type index_type.

#include <span> // dynamic_extent
#include <mdspan>
#include <cassert>

Expand Down
1 change: 1 addition & 0 deletions libcxx/test/libcxx/containers/views/mdspan/layout_left/assert.ctor.extents.pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
//
// Effects: Direct-non-list-initializes extents_ with e.

#include <span> // dynamic_extent
#include <mdspan>
#include <cassert>

Expand Down
1 change: 1 addition & 0 deletions libcxx/test/libcxx/containers/views/mdspan/layout_left/assert.ctor.layout_right.pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
//
// Preconditions: other.required_span_size() is representable as a value of type index_type

#include <span> // dynamic_extent
#include <mdspan>
#include <cassert>

Expand Down
1 change: 1 addition & 0 deletions libcxx/test/libcxx/containers/views/mdspan/layout_left/assert.ctor.layout_stride.pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
//
// Effects: Direct-non-list-initializes extents_ with other.extents().

#include <span> // dynamic_extent
#include <mdspan>
#include <cassert>

Expand Down
1 change: 1 addition & 0 deletions libcxx/test/libcxx/containers/views/mdspan/layout_right/assert.conversion.pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
//
// Preconditions: other.required_span_size() is representable as a value of type index_type.

#include <span> // dynamic_extent
#include <mdspan>
#include <cassert>

Expand Down
1 change: 1 addition & 0 deletions libcxx/test/libcxx/containers/views/mdspan/layout_right/assert.ctor.extents.pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
//
// Effects: Direct-non-list-initializes extents_ with e.

#include <span> // dynamic_extent
#include <mdspan>
#include <cassert>

Expand Down
1 change: 1 addition & 0 deletions libcxx/test/libcxx/containers/views/mdspan/layout_right/assert.ctor.layout_left.pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
//
// Preconditions: other.required_span_size() is representable as a value of type index_type

#include <span> // dynamic_extent
#include <mdspan>
#include <cassert>

Expand Down
1 change: 1 addition & 0 deletions libcxx/test/libcxx/containers/views/mdspan/layout_right/assert.ctor.layout_stride.pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
//
// Effects: Direct-non-list-initializes extents_ with other.extents().

#include <span> // dynamic_extent
#include <mdspan>
#include <cassert>

Expand Down
1 change: 1 addition & 0 deletions libcxx/test/libcxx/containers/views/mdspan/layout_stride/assert.ctor.extents_array.pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
//
// Effects: Direct-non-list-initializes extents_ with e, and for all d in the range [0, rank_), direct-non-list-initializes strides_[d] with as_const(s[d]).

#include <span> // dynamic_extent
#include <mdspan>
#include <cassert>

Expand Down
1 change: 1 addition & 0 deletions libcxx/test/libcxx/containers/views/mdspan/layout_stride/assert.ctor.extents_span.pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
//
// Effects: Direct-non-list-initializes extents_ with e, and for all d in the range [0, rank_), direct-non-list-initializes strides_[d] with as_const(s[d]).

#include <span> // dynamic_extent
#include <mdspan>
#include <cassert>

Expand Down
Loading