Skip to content

[CI] Install DeviceConfigFile independently #19773

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 2 commits into from
Aug 12, 2025
Merged

[CI] Install DeviceConfigFile independently #19773

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bedec37
[CI] Install DeviceConfigFile independently
KornevNikita Aug 12, 2025
0b66a95
add a comment
KornevNikita Aug 12, 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
3 changes: 3 additions & 0 deletions .github/workflows/sycl-linux-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,6 +296,9 @@ jobs:
cmake --build $GITHUB_WORKSPACE/build --target install-llvm-cov
cmake --build $GITHUB_WORKSPACE/build --target install-llvm-profdata
cmake --build $GITHUB_WORKSPACE/build --target install-compiler-rt
# This is required to perform the DeviceConfigFile consistency test, see
# sycl/test-e2e/Basic/device_config_file_consistency.cpp.
cmake --install $GITHUB_WORKSPACE/build --component DeviceConfigFile
Copy link
Contributor

Choose a reason for hiding this comment

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

basically we only install this file in CI now right?

Copy link
Contributor Author

@KornevNikita KornevNikita Aug 12, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

With this patch - yes. It's the initial intention as I understand:
https://github.com/intel/llvm/pull/16369/files#r1894476821
image

Copy link
Contributor

Choose a reason for hiding this comment

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

I think this needs a comment in the code about what the file does and why we do it here.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@aelovikov-intel does it answer the question? 0b66a95

- name: Additional Install for "--shared-libs" build
if: ${{ always() && !cancelled() && steps.build.conclusion == 'success' && contains(inputs.build_configure_extra_args, '--shared-libs') }}
run: |
Expand Down
3 changes: 0 additions & 3 deletions buildbot/configure.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@ def do_configure(args, passthrough_args):
xpti_enable_werror = "OFF"
llvm_enable_zstd = "OFF"
spirv_enable_dis = "OFF"
sycl_install_device_config_file = "OFF"

if sys.platform != "darwin":
# For more info on the enablement of level_zero_v2 refer to this document:
Expand Down Expand Up @@ -162,7 +161,6 @@ def do_configure(args, passthrough_args):
libclc_targets_to_build += libclc_nvidia_target_names
libclc_gen_remangled_variants = "ON"
spirv_enable_dis = "ON"
sycl_install_device_config_file = "ON"

if args.enable_backends:
sycl_enabled_backends += args.enable_backends
Expand Down Expand Up @@ -211,7 +209,6 @@ def do_configure(args, passthrough_args):
"-DSYCL_ENABLE_EXTENSION_JIT={}".format(sycl_enable_jit),
"-DSYCL_ENABLE_MAJOR_RELEASE_PREVIEW_LIB={}".format(sycl_preview_lib),
"-DBUG_REPORT_URL=https://github.com/intel/llvm/issues",
"-DSYCL_INSTALL_DEVICE_CONFIG_FILE={}".format(sycl_install_device_config_file),
]

if libclc_enabled:
Expand Down
5 changes: 0 additions & 5 deletions sycl/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -532,11 +532,6 @@ if("hip" IN_LIST SYCL_ENABLE_BACKENDS)
list(APPEND SYCL_TOOLCHAIN_DEPLOY_COMPONENTS ur_adapter_hip)
endif()

if(SYCL_INSTALL_DEVICE_CONFIG_FILE)
add_dependencies(sycl-toolchain DeviceConfigFile)
list(APPEND SYCL_TOOLCHAIN_DEPLOY_COMPONENTS DeviceConfigFile)
endif()

# Use it as fake dependency in order to force another command(s) to execute.
add_custom_command(OUTPUT __force_it
COMMAND "${CMAKE_COMMAND}" -E echo
Expand Down
Loading