This is an archive of the discontinued LLVM Phabricator instance.

Differential D90043

[libc++] Build the benchmarks as part of the build bots
ClosedPublic

Authored by ldionne on Oct 23 2020, 7:02 AM.

Details

Reviewers
None
Group Reviewers
Restricted Project
Restricted Project
Commits
rG2f8dd2687fa0: [libc++] Refactor the run-buildbot script to make it more modular, and run the…

Diff Detail

Event Timeline

ldionne created this revision.Oct 23 2020, 7:02 AM
Herald added a project: Restricted Project. · View Herald TranscriptOct 23 2020, 7:02 AM
Herald added a reviewer: Restricted Project. · View Herald Transcript
Herald added subscribers: libcxx-commits, jkorous, arichardson. · View Herald Transcript
ldionne requested review of this revision.Oct 23 2020, 7:02 AM
Harbormaster completed remote builds in B76190: Diff 300279.Oct 23 2020, 8:01 AM
ldionne updated this revision to Diff 300302.Oct 23 2020, 8:11 AM

Fix the benchmarks on macOS

Herald added a project: Restricted Project. · View Herald TranscriptOct 23 2020, 8:11 AM
Herald added a reviewer: Restricted Project. · View Herald Transcript
Herald added a subscriber: mgorny. · View Herald Transcript
Harbormaster completed remote builds in B76204: Diff 300302.Oct 23 2020, 9:01 AM
ldionne updated this revision to Diff 300336.Oct 23 2020, 10:01 AM

Refactor the script to add benchmarks only in one job

Harbormaster completed remote builds in B76214: Diff 300336.Oct 23 2020, 10:47 AM
ldionne updated this revision to Diff 300349.Oct 23 2020, 11:01 AM

Workaround failures caused (I think) by how we set the compiler

ldionne updated this revision to Diff 300353.Oct 23 2020, 11:11 AM

Add a CI job

Harbormaster completed remote builds in B76225: Diff 300353.Oct 23 2020, 11:54 AM
This revision was not accepted when it landed; it landed in state Needs Review.Oct 23 2020, 12:12 PM
This revision was landed with ongoing or failed builds.
Closed by commit rG2f8dd2687fa0: [libc++] Refactor the run-buildbot script to make it more modular, and run the… (authored by ldionne). · Explain Why
This revision was automatically updated to reflect the committed changes.
ldionne added a commit: rG2f8dd2687fa0: [libc++] Refactor the run-buildbot script to make it more modular, and run the….

Revision Contents

PathSize
libcxx/
src/
2 lines
utils/
ci/
204 lines
libcxxabi/
src/
4 lines

Diff 300336

libcxx/src/CMakeLists.txt

Show First 20 Lines • Show All 216 Lines • ▼ Show 20 Linesif (LIBCXX_ENABLE_SHARED)
endif() endif()
if (LIBCXX_OSX_REEXPORT_LIBCXXABI_SYMBOLS) if (LIBCXX_OSX_REEXPORT_LIBCXXABI_SYMBOLS)
target_link_libraries(cxx_shared PRIVATE target_link_libraries(cxx_shared PRIVATE
"-Wl,-unexported_symbols_list,${CMAKE_CURRENT_SOURCE_DIR}/../lib/libc++unexp.exp" "-Wl,-unexported_symbols_list,${CMAKE_CURRENT_SOURCE_DIR}/../lib/libc++unexp.exp"
"-Wl,-reexported_symbols_list,${CMAKE_CURRENT_SOURCE_DIR}/../lib/libc++abi.v${LIBCXX_LIBCPPABI_VERSION}.exp" "-Wl,-reexported_symbols_list,${CMAKE_CURRENT_SOURCE_DIR}/../lib/libc++abi.v${LIBCXX_LIBCPPABI_VERSION}.exp"
"-Wl,-force_symbols_not_weak_list,${CMAKE_CURRENT_SOURCE_DIR}/../lib/notweak.exp" "-Wl,-force_symbols_not_weak_list,${CMAKE_CURRENT_SOURCE_DIR}/../lib/notweak.exp"
"-Wl,-force_symbols_weak_list,${CMAKE_CURRENT_SOURCE_DIR}/../lib/weak.exp") "-Wl,-force_symbols_weak_list,${CMAKE_CURRENT_SOURCE_DIR}/../lib/weak.exp")
target_link_libraries(cxx_shared PRIVATE cxxabi-reexports)
endif() endif()
# Generate a linker script in place of a libc++.so symlink. # Generate a linker script in place of a libc++.so symlink.
if (LIBCXX_ENABLE_ABI_LINKER_SCRIPT) if (LIBCXX_ENABLE_ABI_LINKER_SCRIPT)
include(DefineLinkerScript) include(DefineLinkerScript)
define_linker_script(cxx_shared) define_linker_script(cxx_shared)
endif() endif()
▲ Show 20 Lines • Show All 172 Lines • Show Last 20 Lines

libcxx/utils/ci/run-buildbot.sh

#!/usr/bin/env bash #!/usr/bin/env bash
#===----------------------------------------------------------------------===## #===----------------------------------------------------------------------===##
# #
# Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. # Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
# See https://llvm.org/LICENSE.txt for license information. # See https://llvm.org/LICENSE.txt for license information.
# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
# #
#===----------------------------------------------------------------------===## #===----------------------------------------------------------------------===##
set -ex set -ex
BUILDER="${1}" BUILDER="${1}"
MONOREPO_ROOT="$(git rev-parse --show-toplevel)" MONOREPO_ROOT="$(git rev-parse --show-toplevel)"
BUILD_DIR="${MONOREPO_ROOT}/build/${BUILDER}" BUILD_DIR="${MONOREPO_ROOT}/build/${BUILDER}"
INSTALL_DIR="${MONOREPO_ROOT}/build/${BUILDER}/install" INSTALL_DIR="${MONOREPO_ROOT}/build/${BUILDER}/install"
args=() function generate-cmake() {
args+=("-DLLVM_ENABLE_PROJECTS=libcxx;libunwind;libcxxabi") echo "--- Generating CMake"
args+=("-DCMAKE_INSTALL_PREFIX=${INSTALL_DIR}") rm -rf "${BUILD_DIR}"
args+=("-DLIBCXX_CXX_ABI=libcxxabi") cmake -S "${MONOREPO_ROOT}/llvm" \
-B "${BUILD_DIR}" \
-GNinja \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DCMAKE_INSTALL_PREFIX="${INSTALL_DIR}" \
-DLLVM_ENABLE_PROJECTS="libcxx;libunwind;libcxxabi" \
-DLLVM_LIT_ARGS="-sv --show-unsupported --xunit-xml-output test-results.xml" \
-DLIBCXX_CXX_ABI=libcxxabi \
${@}
}
function check-cxx-cxxabi() {
echo "+++ Running the libc++ tests"
ninja -C "${BUILD_DIR}" check-cxx
echo "+++ Running the libc++abi tests"
ninja -C "${BUILD_DIR}" check-cxxabi
echo "--- Installing libc++ and libc++abi to a fake location"
ninja -C "${BUILD_DIR}" install-cxx install-cxxabi
}
function check-cxx-benchmarks() {
echo "--- Running the benchmarks"
ninja -C "${BUILD_DIR}" check-cxx-benchmarks
}
case "${BUILDER}" in case "${BUILDER}" in
benchmarks)
generate-cmake -DCMAKE_CCOMPILER=clang \
-DCMAKE_CXX_COMPILER=clang++
check-cxx-benchmarks
;;
generic-cxx03) generic-cxx03)
export CC=clang generate-cmake -DCMAKE_CCOMPILER=clang \
export CXX=clang++ -DCMAKE_CXX_COMPILER=clang++ \
args+=("-DLLVM_LIT_ARGS=-sv --show-unsupported --xunit-xml-output test-results.xml") -C "${MONOREPO_ROOT}/libcxx/cmake/caches/Generic-cxx03.cmake"
args+=("-C${MONOREPO_ROOT}/libcxx/cmake/caches/Generic-cxx03.cmake") check-cxx-cxxabi
;; ;;
generic-cxx11) generic-cxx11)
export CC=clang generate-cmake -DCMAKE_CCOMPILER=clang \
export CXX=clang++ -DCMAKE_CXX_COMPILER=clang++ \
args+=("-DLLVM_LIT_ARGS=-sv --show-unsupported --xunit-xml-output test-results.xml") -C "${MONOREPO_ROOT}/libcxx/cmake/caches/Generic-cxx11.cmake"
args+=("-C${MONOREPO_ROOT}/libcxx/cmake/caches/Generic-cxx11.cmake") check-cxx-cxxabi
;; ;;
generic-cxx14) generic-cxx14)
export CC=clang generate-cmake -DCMAKE_CCOMPILER=clang \
export CXX=clang++ -DCMAKE_CXX_COMPILER=clang++ \
args+=("-DLLVM_LIT_ARGS=-sv --show-unsupported --xunit-xml-output test-results.xml") -C "${MONOREPO_ROOT}/libcxx/cmake/caches/Generic-cxx14.cmake"
args+=("-C${MONOREPO_ROOT}/libcxx/cmake/caches/Generic-cxx14.cmake") check-cxx-cxxabi
;; ;;
generic-cxx17) generic-cxx17)
export CC=clang generate-cmake -DCMAKE_CCOMPILER=clang \
export CXX=clang++ -DCMAKE_CXX_COMPILER=clang++ \
args+=("-DLLVM_LIT_ARGS=-sv --show-unsupported --xunit-xml-output test-results.xml") -C "${MONOREPO_ROOT}/libcxx/cmake/caches/Generic-cxx17.cmake"
args+=("-C${MONOREPO_ROOT}/libcxx/cmake/caches/Generic-cxx17.cmake") check-cxx-cxxabi
;; ;;
generic-cxx2a) generic-cxx2a)
export CC=clang generate-cmake -DCMAKE_CCOMPILER=clang \
export CXX=clang++ -DCMAKE_CXX_COMPILER=clang++ \
args+=("-DLLVM_LIT_ARGS=-sv --show-unsupported --xunit-xml-output test-results.xml") -C "${MONOREPO_ROOT}/libcxx/cmake/caches/Generic-cxx2a.cmake"
args+=("-C${MONOREPO_ROOT}/libcxx/cmake/caches/Generic-cxx2a.cmake") check-cxx-cxxabi
;; ;;
generic-noexceptions) generic-noexceptions)
export CC=clang generate-cmake -DCMAKE_CCOMPILER=clang \
export CXX=clang++ -DCMAKE_CXX_COMPILER=clang++ \
args+=("-DLLVM_LIT_ARGS=-sv --show-unsupported --xunit-xml-output test-results.xml") -C "${MONOREPO_ROOT}/libcxx/cmake/caches/Generic-noexceptions.cmake"
args+=("-C${MONOREPO_ROOT}/libcxx/cmake/caches/Generic-noexceptions.cmake") check-cxx-cxxabi
;; ;;
generic-32bit) generic-32bit)
export CC=clang generate-cmake -DCMAKE_CCOMPILER=clang \
export CXX=clang++ -DCMAKE_CXX_COMPILER=clang++ \
args+=("-DLLVM_LIT_ARGS=-sv --show-unsupported --xunit-xml-output test-results.xml") -C "${MONOREPO_ROOT}/libcxx/cmake/caches/Generic-32bits.cmake"
args+=("-C${MONOREPO_ROOT}/libcxx/cmake/caches/Generic-32bits.cmake") check-cxx-cxxabi
;; ;;
generic-gcc) generic-gcc)
export CC=gcc
export CXX=g++
# FIXME: Re-enable experimental testing on GCC. GCC cares about the order # FIXME: Re-enable experimental testing on GCC. GCC cares about the order
# in which we link -lc++experimental, which causes issues. # in which we link -lc++experimental, which causes issues.
args+=("-DLLVM_LIT_ARGS=-sv --show-unsupported --param enable_experimental=False --xunit-xml-output test-results.xml") generate-cmake -DCMAKE_CCOMPILER=gcc \
-DCMAKE_CXX_COMPILER=g++ \
-DLIBCXX_ENABLE_EXPERIMENTAL_LIBRARY=OFF
check-cxx-cxxabi
;; ;;
generic-asan) generic-asan)
export CC=clang generate-cmake -DCMAKE_CCOMPILER=clang \
export CXX=clang++ -DCMAKE_CXX_COMPILER=clang++ \
args+=("-DLLVM_LIT_ARGS=-sv --show-unsupported --xunit-xml-output test-results.xml") -C "${MONOREPO_ROOT}/libcxx/cmake/caches/Generic-asan.cmake"
args+=("-C${MONOREPO_ROOT}/libcxx/cmake/caches/Generic-asan.cmake") check-cxx-cxxabi
;; ;;
generic-msan) generic-msan)
export CC=clang generate-cmake -DCMAKE_CCOMPILER=clang \
export CXX=clang++ -DCMAKE_CXX_COMPILER=clang++ \
args+=("-DLLVM_LIT_ARGS=-sv --show-unsupported --xunit-xml-output test-results.xml") -C "${MONOREPO_ROOT}/libcxx/cmake/caches/Generic-msan.cmake"
args+=("-C${MONOREPO_ROOT}/libcxx/cmake/caches/Generic-msan.cmake") check-cxx-cxxabi
;; ;;
generic-tsan) generic-tsan)
export CC=clang generate-cmake -DCMAKE_CCOMPILER=clang \
export CXX=clang++ -DCMAKE_CXX_COMPILER=clang++ \
args+=("-DLLVM_LIT_ARGS=-sv --show-unsupported --xunit-xml-output test-results.xml") -C "${MONOREPO_ROOT}/libcxx/cmake/caches/Generic-tsan.cmake"
args+=("-C${MONOREPO_ROOT}/libcxx/cmake/caches/Generic-tsan.cmake") check-cxx-cxxabi
;; ;;
generic-ubsan) generic-ubsan)
export CC=clang generate-cmake -DCMAKE_CCOMPILER=clang \
export CXX=clang++ -DCMAKE_CXX_COMPILER=clang++ \
args+=("-DLLVM_LIT_ARGS=-sv --show-unsupported --xunit-xml-output test-results.xml") -C "${MONOREPO_ROOT}/libcxx/cmake/caches/Generic-ubsan.cmake"
args+=("-C${MONOREPO_ROOT}/libcxx/cmake/caches/Generic-ubsan.cmake") check-cxx-cxxabi
;; ;;
generic-with_llvm_unwinder) generic-with_llvm_unwinder)
export CC=clang generate-cmake -DCMAKE_CCOMPILER=clang \
export CXX=clang++ -DCMAKE_CXX_COMPILER=clang++ \
args+=("-DLLVM_LIT_ARGS=-sv --show-unsupported --xunit-xml-output test-results.xml") -DLIBCXXABI_USE_LLVM_UNWINDER=ON
args+=("-DLIBCXXABI_USE_LLVM_UNWINDER=ON") check-cxx-cxxabi
;; ;;
generic-singlethreaded) generic-singlethreaded)
export CC=clang generate-cmake -DCMAKE_CCOMPILER=clang \
export CXX=clang++ -DCMAKE_CXX_COMPILER=clang++ \
args+=("-DLLVM_LIT_ARGS=-sv --show-unsupported --xunit-xml-output test-results.xml") -C "${MONOREPO_ROOT}/libcxx/cmake/caches/Generic-singlethreaded.cmake"
args+=("-C${MONOREPO_ROOT}/libcxx/cmake/caches/Generic-singlethreaded.cmake") check-cxx-cxxabi
;; ;;
generic-nodebug) generic-nodebug)
export CC=clang generate-cmake -DCMAKE_CCOMPILER=clang \
export CXX=clang++ -DCMAKE_CXX_COMPILER=clang++ \
args+=("-DLLVM_LIT_ARGS=-sv --show-unsupported --xunit-xml-output test-results.xml") -C "${MONOREPO_ROOT}/libcxx/cmake/caches/Generic-nodebug.cmake"
args+=("-C${MONOREPO_ROOT}/libcxx/cmake/caches/Generic-nodebug.cmake") check-cxx-cxxabi
;; ;;
generic-no-random_device) generic-no-random_device)
export CC=clang generate-cmake -DCMAKE_CCOMPILER=clang \
export CXX=clang++ -DCMAKE_CXX_COMPILER=clang++ \
args+=("-DLLVM_LIT_ARGS=-sv --show-unsupported --xunit-xml-output test-results.xml") -C "${MONOREPO_ROOT}/libcxx/cmake/caches/Generic-no-random_device.cmake"
args+=("-C${MONOREPO_ROOT}/libcxx/cmake/caches/Generic-no-random_device.cmake") check-cxx-cxxabi
;; ;;
x86_64-apple-system) x86_64-apple-system)
export CC=clang generate-cmake -DCMAKE_CCOMPILER=clang \
export CXX=clang++ -DCMAKE_CXX_COMPILER=clang++ \
args+=("-DLLVM_LIT_ARGS=-sv --show-unsupported --xunit-xml-output test-results.xml") -C "${MONOREPO_ROOT}/libcxx/cmake/caches/Apple.cmake"
args+=("-C${MONOREPO_ROOT}/libcxx/cmake/caches/Apple.cmake") check-cxx-cxxabi
;; ;;
x86_64-apple-system-noexceptions) x86_64-apple-system-noexceptions)
export CC=clang generate-cmake -DCMAKE_CCOMPILER=clang \
export CXX=clang++ -DCMAKE_CXX_COMPILER=clang++ \
args+=("-DLLVM_LIT_ARGS=-sv --show-unsupported --xunit-xml-output test-results.xml") -C "${MONOREPO_ROOT}/libcxx/cmake/caches/Apple.cmake" \
args+=("-C${MONOREPO_ROOT}/libcxx/cmake/caches/Apple.cmake") -DLIBCXX_ENABLE_EXCEPTIONS=OFF \
args+=("-DLIBCXX_ENABLE_EXCEPTIONS=OFF") -DLIBCXXABI_ENABLE_EXCEPTIONS=OFF
args+=("-DLIBCXXABI_ENABLE_EXCEPTIONS=OFF") check-cxx-cxxabi
;; ;;
*) *)
echo "${BUILDER} is not a known configuration" echo "${BUILDER} is not a known configuration"
exit 1 exit 1
;; ;;
esac esac
echo "--- Generating CMake"
rm -rf "${BUILD_DIR}"
cmake -S "${MONOREPO_ROOT}/llvm" -B "${BUILD_DIR}" -GNinja -DCMAKE_BUILD_TYPE=RelWithDebInfo "${args[@]}"
echo "--- Building libc++ and libc++abi"
ninja -C "${BUILD_DIR}" check-cxx-deps cxxabi
echo "+++ Running the libc++ tests"
ninja -C "${BUILD_DIR}" check-cxx
echo "+++ Running the libc++abi tests"
ninja -C "${BUILD_DIR}" check-cxxabi
echo "+++ Installing libc++ and libc++abi to a fake location"
ninja -C "${BUILD_DIR}" install-cxx install-cxxabi
# echo "+++ Running the libc++ benchmarks"
# ninja -C "${BUILD_DIR}" check-cxx-benchmarks

libcxxabi/src/CMakeLists.txt

Show First 20 Lines • Show All 196 Lines • ▼ Show 20 Lines if(LIBCXXABI_ENABLE_PIC)
set_target_properties(cxxabi_shared PROPERTIES POSITION_INDEPENDENT_CODE ON) set_target_properties(cxxabi_shared PROPERTIES POSITION_INDEPENDENT_CODE ON)
endif() endif()
list(APPEND LIBCXXABI_BUILD_TARGETS "cxxabi_shared") list(APPEND LIBCXXABI_BUILD_TARGETS "cxxabi_shared")
if (LIBCXXABI_INSTALL_SHARED_LIBRARY) if (LIBCXXABI_INSTALL_SHARED_LIBRARY)
list(APPEND LIBCXXABI_INSTALL_TARGETS "cxxabi_shared") list(APPEND LIBCXXABI_INSTALL_TARGETS "cxxabi_shared")
endif() endif()
add_library(cxxabi-reexports INTERFACE)
# -exported_symbols_list is only available on Apple platforms # -exported_symbols_list is only available on Apple platforms
if (APPLE) if (APPLE)
function(export_symbols file) function(export_symbols file)
target_link_libraries(cxxabi_shared PRIVATE "-Wl,-exported_symbols_list,${file}") target_link_libraries(cxxabi_shared PRIVATE "-Wl,-exported_symbols_list,${file}")
endfunction() endfunction()
function(reexport_symbols file) function(reexport_symbols file)
export_symbols("${file}") export_symbols("${file}")
target_link_libraries(cxxabi_shared INTERFACE "-Wl,-reexported_symbols_list,${file}") target_link_libraries(cxxabi-reexports INTERFACE "-Wl,-reexported_symbols_list,${file}")
endfunction() endfunction()
export_symbols("${CMAKE_CURRENT_SOURCE_DIR}/../lib/itanium-base.exp") export_symbols("${CMAKE_CURRENT_SOURCE_DIR}/../lib/itanium-base.exp")
if (LIBCXXABI_ENABLE_NEW_DELETE_DEFINITIONS) if (LIBCXXABI_ENABLE_NEW_DELETE_DEFINITIONS)
reexport_symbols("${CMAKE_CURRENT_SOURCE_DIR}/../lib/new-delete.exp") reexport_symbols("${CMAKE_CURRENT_SOURCE_DIR}/../lib/new-delete.exp")
endif() endif()
▲ Show 20 Lines • Show All 100 Lines • Show Last 20 Lines