File tree Expand file tree Collapse file tree 3 files changed +3
-8
lines changed Expand file tree Collapse file tree 3 files changed +3
-8
lines changed Original file line number Diff line number Diff line change @@ -256,6 +256,9 @@ jobs:
256256 cmake --build $GITHUB_WORKSPACE/build --target install-llvm-cov
257257 cmake --build $GITHUB_WORKSPACE/build --target install-llvm-profdata
258258 cmake --build $GITHUB_WORKSPACE/build --target install-compiler-rt
259+ # This is required to perform the DeviceConfigFile consistency test, see
260+ # sycl/test-e2e/Basic/device_config_file_consistency.cpp.
261+ cmake --install $GITHUB_WORKSPACE/build --component DeviceConfigFile
259262 - name : Additional Install for "--shared-libs" build
260263 if : ${{ always() && !cancelled() && steps.build.conclusion == 'success' && contains(inputs.build_configure_extra_args, '--shared-libs') }}
261264 run : |
Original file line number Diff line number Diff line change @@ -66,7 +66,6 @@ def do_configure(args, passthrough_args):
6666 xpti_enable_werror = "OFF"
6767 llvm_enable_zstd = "OFF"
6868 spirv_enable_dis = "OFF"
69- sycl_install_device_config_file = "OFF"
7069
7170 if sys .platform != "darwin" :
7271 # For more info on the enablement of level_zero_v2 refer to this document:
@@ -161,7 +160,6 @@ def do_configure(args, passthrough_args):
161160 libclc_targets_to_build += libclc_nvidia_target_names
162161 libclc_gen_remangled_variants = "ON"
163162 spirv_enable_dis = "ON"
164- sycl_install_device_config_file = "ON"
165163
166164 if args .enable_backends :
167165 sycl_enabled_backends += args .enable_backends
@@ -210,7 +208,6 @@ def do_configure(args, passthrough_args):
210208 "-DSYCL_ENABLE_EXTENSION_JIT={}" .format (sycl_enable_jit ),
211209 "-DSYCL_ENABLE_MAJOR_RELEASE_PREVIEW_LIB={}" .format (sycl_preview_lib ),
212210 "-DBUG_REPORT_URL=https://github.com/intel/llvm/issues" ,
213- "-DSYCL_INSTALL_DEVICE_CONFIG_FILE={}" .format (sycl_install_device_config_file ),
214211 ]
215212
216213 if libclc_enabled :
Original file line number Diff line number Diff line change @@ -549,11 +549,6 @@ if("hip" IN_LIST SYCL_ENABLE_BACKENDS)
549549 list (APPEND SYCL_TOOLCHAIN_DEPLOY_COMPONENTS ur_adapter_hip)
550550endif ()
551551
552- if (SYCL_INSTALL_DEVICE_CONFIG_FILE)
553- add_dependencies (sycl-toolchain DeviceConfigFile)
554- list (APPEND SYCL_TOOLCHAIN_DEPLOY_COMPONENTS DeviceConfigFile)
555- endif ()
556-
557552# Use it as fake dependency in order to force another command(s) to execute.
558553add_custom_command (OUTPUT __force_it
559554 COMMAND "${CMAKE_COMMAND} " -E echo
You can’t perform that action at this time.
0 commit comments