Skip to content

Use LLVM_ENABLE_RUNTIMES for building compiler-rt in Green Dragon #673

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

Open
ndrewh wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Use LLVM_ENABLE_RUNTIMES for building compiler-rt in Green Dragon #673

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion test/jenkins/test_build.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@
# CHECK-SIMPLE: '/usr/local/bin/cmake' '-G' 'Ninja' '-C'
# CHECK-SIMPLE: '-DLLVM_ENABLE_ASSERTIONS:BOOL=FALSE'
# CHECK-SIMPLE: '-DCMAKE_BUILD_TYPE=RelWithDebInfo'
# CHECK-SIMPLE: '-DLLVM_ENABLE_PROJECTS=clang;clang-tools-extra;compiler-rt'
# CHECK-SIMPLE: '-DLLVM_ENABLE_PROJECTS=clang;clang-tools-extra'
# CHECK-SIMPLE: '-DLLVM_ENABLE_RUNTIMES=compiler-rt'
# CHECK-SIMPLE: '-DCMAKE_MAKE_PROGRAM=/usr/local/bin/ninja'
# CHECK-SIMPLE: '-DLLVM_VERSION_PATCH=99'
# CHECK-SIMPLE: '-DLLVM_VERSION_SUFFIX=""'
Expand Down
6 changes: 4 additions & 2 deletions zorg/buildbot/builders/sanitizers/buildbot_qemu.sh
View file
Open in desktop
Copy link
Contributor

@azharudd azharudd Dec 10, 2025

Choose a reason for hiding this comment

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

Please skip the changes to this file from this PR. Only the files in jenkins directories are applicable to Green Dragon.

Copy link
Contributor

@DavidSpickett DavidSpickett Dec 10, 2025

Choose a reason for hiding this comment

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

Also add to the title "in Green Dragon". (as there are some Buildbot bots that are not using runtimes yet)

Copy link
Contributor

@DavidSpickett DavidSpickett Dec 10, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

I think this script was added by @asb so I assume they will change it when they're ready.

Actually I'm thinking of the other qemu script, sorry for the unnecessary ping.

Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@ readonly STAGE2_DIR=llvm_build2_host

cmake \
${CMAKE_COMMON_OPTIONS} \
-DLLVM_ENABLE_PROJECTS="clang;compiler-rt;lld" \
-DLLVM_ENABLE_PROJECTS="clang;lld" \
-DLLVM_ENABLE_RUNTIMES="compiler-rt" \
-DCMAKE_C_COMPILER=${COMPILER_BIN_DIR}/clang \
-DCMAKE_CXX_COMPILER=${COMPILER_BIN_DIR}/clang++ \
-DCMAKE_BUILD_WITH_INSTALL_RPATH=ON \
Expand Down Expand Up @@ -256,7 +257,8 @@ function configure_hwasan_lam {
# STAGE1_DIR is build once, so we can use CCACHE.
cmake \
${CMAKE_COMMON_OPTIONS} \
-DLLVM_ENABLE_PROJECTS="clang;compiler-rt;lld" \
-DLLVM_ENABLE_PROJECTS="clang;lld" \
-DLLVM_ENABLE_RUNTIMES="compiler-rt" \
-DCMAKE_C_COMPILER="${COMPILER_BIN_DIR}/clang" \
-DCMAKE_CXX_COMPILER="${COMPILER_BIN_DIR}/clang++" \
-DCMAKE_BUILD_WITH_INSTALL_RPATH=ON \
Expand Down
4 changes: 2 additions & 2 deletions zorg/jenkins/build.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1076,10 +1076,10 @@ def parse_args():
action='store_true', help="Turn on the experimental"
" GlobalISel CMake flag.")
parser.add_argument('--projects', dest='llvm_enable_projects',
default="clang;clang-tools-extra;compiler-rt",
default="clang;clang-tools-extra",
help="Semicolon seperated list of projects to enable.")
parser.add_argument('--runtimes', dest='llvm_enable_runtimes',
default="",
default="compiler-rt",
help="Semicolon seperated list of runtimes to enable.")
parser.add_argument('--timeout', dest='timeout', type=int, default='600',
help='Individual test timeout in seconds.')
Expand Down
5 changes: 3 additions & 2 deletions zorg/jenkins/jobs/jobs/clang-san-iossim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,8 @@ pipeline {

python llvm-zorg/zorg/jenkins/monorepo_build.py cmake build \
--assertions --cmake-type=RelWithDebInfo \
--projects="clang;clang-tools-extra;compiler-rt"
--projects="clang;clang-tools-extra" \
--runtimes="compiler-rt"
'''
}
}
Expand All @@ -75,7 +76,7 @@ pipeline {
environment {
PATH="$PATH:/usr/bin:/usr/local/bin"
SANITIZER_IOSSIM_TEST_DEVICE_IDENTIFIER='iPhone 15'
COMPILER_RT_TEST_DIR="${WORKSPACE}/clang-build/tools/clang/runtime/compiler-rt-bins/test"
COMPILER_RT_TEST_DIR="${WORKSPACE}/clang-build/runtimes/runtimes-bins/compiler-rt/test"
}
steps {
timeout(90) {
Expand Down
3 changes: 2 additions & 1 deletion zorg/jenkins/jobs/jobs/clang-stage1-RA
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,8 @@ pipeline {
rm -rf clang-build clang-install *.tar.gz
python llvm-zorg/zorg/jenkins/monorepo_build.py cmake build \
--assertions --cmake-type=RelWithDebInfo \
--projects="clang;clang-tools-extra;compiler-rt" \
--projects="clang;clang-tools-extra" \
--runtimes="compiler-rt" \
--cmake-flag="-DPython3_EXECUTABLE=$(which python)"
'''
}
Expand Down
3 changes: 2 additions & 1 deletion zorg/jenkins/jobs/jobs/clang-stage1-RA-as
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,8 @@ pipeline {
rm -rf clang-build clang-install *.tar.gz
python llvm-zorg/zorg/jenkins/monorepo_build.py cmake build \
--assertions --cmake-type=RelWithDebInfo \
--projects="clang;clang-tools-extra;compiler-rt" \
--projects="clang;clang-tools-extra" \
--runtimes="compiler-rt" \
--cmake-flag="-DPython3_EXECUTABLE=$(which python)" \
--cmake-flag="-DLLVM_TARGETS_TO_BUILD=AArch64"
'''
Expand Down
2 changes: 1 addition & 1 deletion zorg/jenkins/jobs/jobs/clang-stage2-Rthinlto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ pipeline {
echo "ARTIFACT=$JOB_NAME/clang-d$GIT_DISTANCE-g$GIT_SHA-t$BUILD_ID-b$BUILD_NUMBER.tar.gz" > build.properties

python llvm-zorg/zorg/jenkins/monorepo_build.py clang build \
--thinlto --projects="clang;compiler-rt" \
--thinlto --projects="clang" --runtimes="compiler-rt" \
--cmake-flag="-DCMAKE_DSYMUTIL=$WORKSPACE/host-compiler/bin/dsymutil" \
--runtimes="libunwind" \
--cmake-flag="-DPython3_EXECUTABLE=$(which python)"
Expand Down
4 changes: 2 additions & 2 deletions zorg/jenkins/jobs/jobs/clang-stage2-cmake-RgTSan
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,8 @@ pipeline {

python llvm-zorg/zorg/jenkins/monorepo_build.py cmake build \
--cmake-type=RelWithDebInfo \
--projects="clang;clang-tools-extra;compiler-rt" \
--runtimes="libcxx;libcxxabi" \
--projects="clang;clang-tools-extra" \
--runtimes="libcxx;libcxxabi;compiler-rt" \
--cmake-flag='-DLLVM_USE_SANITIZER=Thread' \
--cmake-flag='-DLLVM_ENABLE_LTO=Thin' \
--cmake-flag='-DLLVM_BUILD_RUNTIME=OFF' \
Expand Down