Skip to content

Update buildbot/configure.py #20857

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

Draft
dyniols wants to merge 10 commits into
base: sycl
Choose a base branch
from
+9 −4
Draft

Update buildbot/configure.py #20857

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
3efcdb9
Update buildbot/configure.py
dyniols Dec 9, 2025
da74c2d
Merge remote-tracking branch 'intel/sycl' into update_buildbot_configure
dyniols Dec 11, 2025
a286cb5
fix
dyniols Dec 11, 2025
9017509
test
dyniols Dec 11, 2025
156d332
test
dyniols Dec 11, 2025
f1b2411
fix
dyniols Dec 11, 2025
55207f1
fix
dyniols Dec 11, 2025
211b6dc
test
dyniols Dec 11, 2025
8a84f49
test with LLVM_ENABLE_RUNTIMES
dyniols Dec 11, 2025
d38dad1
fix
dyniols Dec 11, 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
11 changes: 8 additions & 3 deletions buildbot/configure.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,7 @@ def do_configure(args, passthrough_args):
if not os.path.isdir(abs_obj_dir):
os.makedirs(abs_obj_dir)

llvm_external_projects = "sycl;llvm-spirv;opencl;xpti;xptifw;compiler-rt"

llvm_external_projects = "sycl;llvm-spirv;opencl;xpti;xptifw"
# libdevice build requires a working SYCL toolchain, which is not the case
# with macOS target right now.
if sys.platform != "darwin":
Expand Down Expand Up @@ -67,6 +66,9 @@ def do_configure(args, passthrough_args):
llvm_enable_zstd = "ON"
spirv_enable_dis = "OFF"

llvm_external_projects+=";compiler-rt"
llvm_enable_runtimes ="compiler-rt"

if sys.platform != "darwin":
# For more info on the enablement of level_zero_v2 refer to this document:
# https://github.com/intel/llvm/blob/sycl/unified-runtime/source/adapters/level_zero/v2/README.md
Expand Down Expand Up @@ -147,7 +149,9 @@ def do_configure(args, passthrough_args):
print("#############################################")

# For clang-format, clang-tidy and code coverage
llvm_enable_projects += ";clang-tools-extra;compiler-rt"
llvm_enable_projects += ";clang-tools-extra"
if "compiler-rt" not in llvm_enable_runtimes:
llvm_enable_runtimes += ";compiler-rt"
if sys.platform != "darwin":
# libclc is required for CI validation
libclc_enabled = True
Expand Down Expand Up @@ -195,6 +199,7 @@ def do_configure(args, passthrough_args):
"-DLLVM_EXTERNAL_LIBDEVICE_SOURCE_DIR={}".format(libdevice_dir),
"-DLLVM_EXTERNAL_SYCL_JIT_SOURCE_DIR={}".format(jit_dir),
"-DLLVM_ENABLE_PROJECTS={}".format(llvm_enable_projects),
"-DLLVM_ENABLE_RUNTIMES={}".format(llvm_enable_runtimes),
"-DSYCL_BUILD_PI_HIP_PLATFORM={}".format(sycl_build_pi_hip_platform),
"-DLLVM_BUILD_TOOLS=ON",
"-DLLVM_ENABLE_ZSTD={}".format(llvm_enable_zstd),
Expand Down
2 changes: 1 addition & 1 deletion sycl/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -612,8 +612,8 @@ add_custom_target(install-sycl-test-utilities
install-llvm-size
install-llvm-cov
install-llvm-profdata
install-compiler-rt
# This is required to perform the DeviceConfigFile consistency test, see
# sycl/test-e2e/Basic/device_config_file_consistency.cpp.
COMMAND ${CMAKE_COMMAND} --install ${CMAKE_BINARY_DIR} --component DeviceConfigFile
COMMAND ${CMAKE_COMMAND} --install ${CMAKE_BINARY_DIR} --component compiler-rt
)
Loading