Skip to content

Commit 603305d

Browse files
committed
[CI] Re-enable ABI-compatibility testing in pre-commit
Added UR_FORCE_FETCH_LEVEL_ZERO and corresponding SYCL_UR_FORCE_FETCH_LEVEL_ZERO CMake options that force Level Zero loader fetching even if a preinstalled one is found on the platform.
1 parent 168f459 commit 603305d

File tree

5 files changed

+8
-4
lines changed

5 files changed

+8
-4
lines changed

.github/workflows/sycl-linux-build.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,8 @@ jobs:
204204
--ci-defaults --use-zstd ${{ inputs.build_configure_extra_args }} \
205205
-DCMAKE_C_COMPILER_LAUNCHER=ccache \
206206
-DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
207-
-DLLVM_INSTALL_UTILS=ON
207+
-DLLVM_INSTALL_UTILS=ON \
208+
-DSYCL_UR_FORCE_FETCH_LEVEL_ZERO=ON
208209
- name: Compile
209210
id: build
210211
# Emulate default value for manual dispatch as we've run out of available arguments.

.github/workflows/sycl-linux-precommit.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -197,14 +197,12 @@ jobs:
197197
target_devices: level_zero:gpu
198198
extra_lit_opts: '--param test-preview-mode=False --filter-out "${{ needs.compat_read_exclude.outputs.FILTER_6_2 }}"'
199199
binaries_artifact: 'in-container'
200-
skip_run: true
201200
- name: ABI compatibility / sycl-rel-6_3
202201
runner: '["Linux", "pvc"]'
203202
image: ghcr.io/intel/llvm/sycl_prebuilt_tests:sycl-rel-6_3
204203
target_devices: level_zero:gpu
205204
extra_lit_opts: '--param test-preview-mode=False --filter-out "${{ needs.compat_read_exclude.outputs.FILTER_6_3 }}"'
206205
binaries_artifact: 'in-container'
207-
skip_run: true
208206

209207
uses: ./.github/workflows/sycl-linux-run-tests.yml
210208
with:

sycl/cmake/modules/BuildUnifiedRuntime.cmake

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,10 @@ set(UR_ENABLE_TRACING ON CACHE BOOL "")
2727
set(UR_EXTERNAL_DEPENDENCIES "sycl-headers" CACHE STRING
2828
"List of external CMake targets for executables/libraries to depend on" FORCE)
2929

30+
# Force fetch Level Zero loader and headers from github.com
31+
option(SYCL_UR_FORCE_FETCH_LEVEL_ZERO "Force fetching Level Zero even if preinstalled loader is found" OFF)
32+
set(UR_FORCE_FETCH_LEVEL_ZERO "${SYCL_UR_FORCE_FETCH_LEVEL_ZERO}" CACHE BOOL "" FORCE)
33+
3034
if("level_zero" IN_LIST SYCL_ENABLE_BACKENDS)
3135
set(UR_BUILD_ADAPTER_L0 ON)
3236
endif()

unified-runtime/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ option(UR_BUILD_XPTI_LIBS "Build the XPTI libraries when tracing is enabled" ON)
5656
option(UR_STATIC_LOADER "Build loader as a static library" OFF)
5757
option(UR_FORCE_LIBSTDCXX "Force use of libstdc++ in a build using libc++ on Linux" OFF)
5858
option(UR_ENABLE_LATENCY_HISTOGRAM "Enable latncy histogram" OFF)
59+
option(UR_FORCE_FETCH_LEVEL_ZERO "Force fetching Level Zero even if preinstalled loader is found" OFF)
5960
set(UR_EXTERNAL_DEPENDENCIES "" CACHE STRING
6061
"List of external CMake targets for executables/libraries to depend on")
6162
set(UR_DPCXX "" CACHE FILEPATH "Path of the DPC++ compiler executable")

unified-runtime/cmake/FetchLevelZero.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ else()
3232
endif()
3333
endif()
3434

35-
if(NOT LEVEL_ZERO_LIB_NAME AND NOT LEVEL_ZERO_LIBRARY)
35+
if((NOT LEVEL_ZERO_LIB_NAME AND NOT LEVEL_ZERO_LIBRARY) OR UR_FORCE_FETCH_LEVEL_ZERO)
3636
message(STATUS "Level Zero Adapter: Download Level Zero loader and headers from github.com")
3737

3838
# Workaround warnings/errors for Level Zero build

0 commit comments

Comments
 (0)