This is an archive of the discontinued LLVM Phabricator instance.

Differential D98992

[libc++] Run ninja with --verbose
ClosedPublic

Authored by ldionne on Mar 19 2021, 4:29 PM.

Details

Reviewers
curdeius
Group Reviewers
Restricted Project
Commits
rG116b8525c944: [libc++] Run ninja with --verbose
Summary

This makes it easier to see what exact build commands are used.

Diff Detail

Event Timeline

ldionne created this revision.Mar 19 2021, 4:29 PM
Herald added subscribers: jkorous, arichardson. · View Herald TranscriptMar 19 2021, 4:29 PM
ldionne requested review of this revision.Mar 19 2021, 4:29 PM
Herald added a project: Restricted Project. · View Herald TranscriptMar 19 2021, 4:29 PM
Herald added a reviewer: Restricted Project. · View Herald Transcript
Herald added a subscriber: libcxx-commits. · View Herald Transcript
Harbormaster completed remote builds in B94810: Diff 332030.Mar 19 2021, 7:22 PM
curdeius accepted this revision as: curdeius.Mar 20 2021, 1:41 PM
curdeius added a subscriber: curdeius.

FWIW, LGTM.

ldionne accepted this revision as: Restricted Project.Mar 22 2021, 6:17 AM
This revision is now accepted and ready to land.Mar 22 2021, 6:17 AM
Closed by commit rG116b8525c944: [libc++] Run ninja with --verbose (authored by ldionne). · Explain WhyMar 22 2021, 6:18 AM
This revision was automatically updated to reflect the committed changes.
ldionne added a commit: rG116b8525c944: [libc++] Run ninja with --verbose.

Revision Contents

PathSize
libcxx/
utils/
ci/
22 lines

Diff 332267

libcxx/utils/ci/run-buildbot

Show First 20 Lines • Show All 81 Lines • ▼ Show 20 Lines cmake -S "${MONOREPO_ROOT}/llvm" \
-DLLVM_ENABLE_PROJECTS="libcxx;libunwind;libcxxabi" \ -DLLVM_ENABLE_PROJECTS="libcxx;libunwind;libcxxabi" \
-DLLVM_LIT_ARGS="-sv --show-unsupported --xunit-xml-output test-results.xml" \ -DLLVM_LIT_ARGS="-sv --show-unsupported --xunit-xml-output test-results.xml" \
-DLIBCXX_CXX_ABI=libcxxabi \ -DLIBCXX_CXX_ABI=libcxxabi \
"${@}" "${@}"
} }
function check-cxx-cxxabi() { function check-cxx-cxxabi() {
echo "+++ Running the libc++ tests" echo "+++ Running the libc++ tests"
${NINJA} -C "${BUILD_DIR}" check-cxx ${NINJA} -vC "${BUILD_DIR}" check-cxx
echo "+++ Running the libc++abi tests" echo "+++ Running the libc++abi tests"
${NINJA} -C "${BUILD_DIR}" check-cxxabi ${NINJA} -vC "${BUILD_DIR}" check-cxxabi
echo "--- Installing libc++ and libc++abi to a fake location" echo "--- Installing libc++ and libc++abi to a fake location"
${NINJA} -C "${BUILD_DIR}" install-cxx install-cxxabi ${NINJA} -vC "${BUILD_DIR}" install-cxx install-cxxabi
} }
# TODO: The goal is to test this against all configurations. We should also move # TODO: The goal is to test this against all configurations. We should also move
# this to the Lit test suite instead of being a separate CMake target. # this to the Lit test suite instead of being a separate CMake target.
function check-abi-list() { function check-abi-list() {
echo "+++ Running the libc++ ABI list test" echo "+++ Running the libc++ ABI list test"
${NINJA} -C "${BUILD_DIR}" check-cxx-abilist || ( ${NINJA} -vC "${BUILD_DIR}" check-cxx-abilist || (
echo "+++ Generating the libc++ ABI list after failed check" echo "+++ Generating the libc++ ABI list after failed check"
${NINJA} -C "${BUILD_DIR}" generate-cxx-abilist ${NINJA} -vC "${BUILD_DIR}" generate-cxx-abilist
false false
) )
} }
function check-cxx-benchmarks() { function check-cxx-benchmarks() {
echo "--- Running the benchmarks" echo "--- Running the benchmarks"
${NINJA} -C "${BUILD_DIR}" check-cxx-benchmarks ${NINJA} -vC "${BUILD_DIR}" check-cxx-benchmarks
} }
case "${BUILDER}" in case "${BUILDER}" in
check-format) check-format)
clean clean
echo "+++ Checking formatting" echo "+++ Checking formatting"
# We need to set --extensions so that clang-format checks extensionless files. # We need to set --extensions so that clang-format checks extensionless files.
mkdir -p ${BUILD_DIR} mkdir -p ${BUILD_DIR}
▲ Show 20 Lines • Show All 204 Lines • ▼ Show 20 Lines
;; ;;
documentation) documentation)
export CC=clang export CC=clang
export CXX=clang++ export CXX=clang++
clean clean
generate-cmake -DLLVM_ENABLE_SPHINX=ON generate-cmake -DLLVM_ENABLE_SPHINX=ON
echo "+++ Generating documentation" echo "+++ Generating documentation"
${NINJA} -C "${BUILD_DIR}" docs-libcxx-html ${NINJA} -vC "${BUILD_DIR}" docs-libcxx-html
;; ;;
unified-standalone) unified-standalone)
export CC=clang export CC=clang
export CXX=clang++ export CXX=clang++
clean clean
echo "--- Generating CMake" echo "--- Generating CMake"
Show All 29 Lines cmake -S "${MONOREPO_ROOT}/libcxxabi" \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DCMAKE_INSTALL_PREFIX="${INSTALL_DIR}" \ -DCMAKE_INSTALL_PREFIX="${INSTALL_DIR}" \
-DLLVM_PATH="${MONOREPO_ROOT}/llvm" \ -DLLVM_PATH="${MONOREPO_ROOT}/llvm" \
-DLIBCXXABI_LIBCXX_PATH="${MONOREPO_ROOT}/libcxx" \ -DLIBCXXABI_LIBCXX_PATH="${MONOREPO_ROOT}/libcxx" \
-DLIBCXXABI_LIBCXX_INCLUDES="${MONOREPO_ROOT}/libcxx/include" \ -DLIBCXXABI_LIBCXX_INCLUDES="${MONOREPO_ROOT}/libcxx/include" \
-DLIBCXXABI_LIBCXX_LIBRARY_PATH="${BUILD_DIR}/libcxx/lib" -DLIBCXXABI_LIBCXX_LIBRARY_PATH="${BUILD_DIR}/libcxx/lib"
echo "+++ Building libc++abi" echo "+++ Building libc++abi"
${NINJA} -C "${BUILD_DIR}/libcxxabi" cxxabi ${NINJA} -vC "${BUILD_DIR}/libcxxabi" cxxabi
echo "+++ Building libc++" echo "+++ Building libc++"
${NINJA} -C "${BUILD_DIR}/libcxx" cxx ${NINJA} -vC "${BUILD_DIR}/libcxx" cxx
echo "+++ Running the libc++ tests" echo "+++ Running the libc++ tests"
${NINJA} -C "${BUILD_DIR}/libcxx" check-cxx ${NINJA} -vC "${BUILD_DIR}/libcxx" check-cxx
echo "+++ Running the libc++abi tests" echo "+++ Running the libc++abi tests"
${NINJA} -C "${BUILD_DIR}/libcxxabi" check-cxxabi ${NINJA} -vC "${BUILD_DIR}/libcxxabi" check-cxxabi
;; ;;
aarch64) aarch64)
clean clean
generate-cmake -C "${MONOREPO_ROOT}/libcxx/cmake/caches/AArch64.cmake" generate-cmake -C "${MONOREPO_ROOT}/libcxx/cmake/caches/AArch64.cmake"
check-cxx-cxxabi check-cxx-cxxabi
;; ;;
aarch64-noexceptions) aarch64-noexceptions)
clean clean
Show All 32 Lines