From 03fd1b168d64e7929540c90407fee4bd18ec713b Mon Sep 17 00:00:00 2001 From: Sergey V Maslov Date: Wed, 26 Apr 2023 12:01:11 -0700 Subject: [PATCH 1/4] [SYCL] Do not install L0 loader Signed-off-by: Sergey V Maslov --- sycl/plugins/level_zero/CMakeLists.txt | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/sycl/plugins/level_zero/CMakeLists.txt b/sycl/plugins/level_zero/CMakeLists.txt index aabbb4e5daa88..db61b6a65f643 100755 --- a/sycl/plugins/level_zero/CMakeLists.txt +++ b/sycl/plugins/level_zero/CMakeLists.txt @@ -140,15 +140,10 @@ add_sycl_plugin(level_zero ${XPTI_LIBS} ) -#FIXME: We should stop shipping level zero loader and headers as part of the +#FIXME: We should stop shipping level zero headers as part of the # toolchain installation. Instead these should be avaialble in the system. # We keep shipping it until all environments are updated. if (TARGET ze_loader) - install(TARGETS ze_loader - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT level-zero-sycl-dev - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT level-zero-sycl-dev - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT level-zero-sycl-dev - ) file(GLOB LEVEL_ZERO_API_HEADERS "${LEVEL_ZERO_INCLUDE_DIR}/*.h") install(FILES ${LEVEL_ZERO_API_HEADERS} DESTINATION ${CMAKE_INSTALL_PREFIX}/include/sycl/level_zero/ From b0f7b8bdf0403f3c0171f4eb26bdc6adc611e0e0 Mon Sep 17 00:00:00 2001 From: smaslov Date: Tue, 9 May 2023 18:40:49 -0700 Subject: [PATCH 2/4] [SYCL][CI] Add path to L0 loader for Windows CI Signed-off-by: smaslov --- devops/actions/e2e-tests-win/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devops/actions/e2e-tests-win/action.yml b/devops/actions/e2e-tests-win/action.yml index a1988744d5182..c289bcc641173 100644 --- a/devops/actions/e2e-tests-win/action.yml +++ b/devops/actions/e2e-tests-win/action.yml @@ -30,7 +30,7 @@ runs: run: | mkdir build-e2e set PATH=%GITHUB_WORKSPACE%\install\bin;%PATH% - cmake -GNinja -B build-e2e -S.\llvm\sycl\test-e2e -DSYCL_TEST_E2E_TARGETS="${{ inputs.targets }}" -DCMAKE_CXX_COMPILER="clang++" -DLLVM_LIT="..\llvm\llvm\utils\lit\lit.py" ${{ inputs.cmake_args }} + cmake -GNinja -B build-e2e -S.\llvm\sycl\test-e2e -DSYCL_TEST_E2E_TARGETS="${{ inputs.targets }}" -DCMAKE_CXX_COMPILER="clang++" -DLEVEL_ZERO_LIBS_DIR="D:\github\level-zero_win-sdk\lib" -DLLVM_LIT="..\llvm\llvm\utils\lit\lit.py" ${{ inputs.cmake_args }} - name: Run testing shell: bash run: | From cbec8fed4c75f4ede3ccb12daed30d4983f60aa3 Mon Sep 17 00:00:00 2001 From: smaslov-intel Date: Tue, 9 May 2023 23:36:26 -0700 Subject: [PATCH 3/4] Update devops/actions/e2e-tests-win/action.yml --- devops/actions/e2e-tests-win/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devops/actions/e2e-tests-win/action.yml b/devops/actions/e2e-tests-win/action.yml index c289bcc641173..878c650e39225 100644 --- a/devops/actions/e2e-tests-win/action.yml +++ b/devops/actions/e2e-tests-win/action.yml @@ -30,7 +30,7 @@ runs: run: | mkdir build-e2e set PATH=%GITHUB_WORKSPACE%\install\bin;%PATH% - cmake -GNinja -B build-e2e -S.\llvm\sycl\test-e2e -DSYCL_TEST_E2E_TARGETS="${{ inputs.targets }}" -DCMAKE_CXX_COMPILER="clang++" -DLEVEL_ZERO_LIBS_DIR="D:\github\level-zero_win-sdk\lib" -DLLVM_LIT="..\llvm\llvm\utils\lit\lit.py" ${{ inputs.cmake_args }} + cmake -GNinja -B build-e2e -S.\llvm\sycl\test-e2e -DSYCL_TEST_E2E_TARGETS="${{ inputs.targets }}" -DCMAKE_CXX_COMPILER="clang++" -DLEVEL_ZERO_LIBS_DIR="D:\github\level-zero_win-sdk\lib.fake" -DLLVM_LIT="..\llvm\llvm\utils\lit\lit.py" ${{ inputs.cmake_args }} - name: Run testing shell: bash run: | From 6638c662f9a1e39f707b661f85ca863777405889 Mon Sep 17 00:00:00 2001 From: smaslov-intel Date: Wed, 10 May 2023 12:05:44 -0700 Subject: [PATCH 4/4] Update devops/actions/e2e-tests-win/action.yml --- devops/actions/e2e-tests-win/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devops/actions/e2e-tests-win/action.yml b/devops/actions/e2e-tests-win/action.yml index 878c650e39225..c289bcc641173 100644 --- a/devops/actions/e2e-tests-win/action.yml +++ b/devops/actions/e2e-tests-win/action.yml @@ -30,7 +30,7 @@ runs: run: | mkdir build-e2e set PATH=%GITHUB_WORKSPACE%\install\bin;%PATH% - cmake -GNinja -B build-e2e -S.\llvm\sycl\test-e2e -DSYCL_TEST_E2E_TARGETS="${{ inputs.targets }}" -DCMAKE_CXX_COMPILER="clang++" -DLEVEL_ZERO_LIBS_DIR="D:\github\level-zero_win-sdk\lib.fake" -DLLVM_LIT="..\llvm\llvm\utils\lit\lit.py" ${{ inputs.cmake_args }} + cmake -GNinja -B build-e2e -S.\llvm\sycl\test-e2e -DSYCL_TEST_E2E_TARGETS="${{ inputs.targets }}" -DCMAKE_CXX_COMPILER="clang++" -DLEVEL_ZERO_LIBS_DIR="D:\github\level-zero_win-sdk\lib" -DLLVM_LIT="..\llvm\llvm\utils\lit\lit.py" ${{ inputs.cmake_args }} - name: Run testing shell: bash run: |