From 0b28ba20d393aa438f46a9f58300e287a26ceada Mon Sep 17 00:00:00 2001 From: Nick Sarnie Date: Wed, 15 Jan 2025 04:06:23 +0900 Subject: [PATCH] [CI] Manually update igc-dev (#16496) The IGC Dev CI is busted, so our auto-update scripts don't work. Manually update the driver and fix the driver install script. The two `online_compiler` tests are now also failing on pvc igc-dev. --------- Signed-off-by: Sarnie, Nick --- devops/dependencies-igc-dev.json | 8 ++++---- devops/scripts/install_drivers.sh | 10 +++++----- sycl/test-e2e/OnlineCompiler/online_compiler_L0.cpp | 2 +- .../test-e2e/OnlineCompiler/online_compiler_OpenCL.cpp | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/devops/dependencies-igc-dev.json b/devops/dependencies-igc-dev.json index 28cc58e1c7947..20d3c7c9aa08b 100644 --- a/devops/dependencies-igc-dev.json +++ b/devops/dependencies-igc-dev.json @@ -1,10 +1,10 @@ { "linux": { "igc_dev": { - "github_tag": "igc-dev-e0d826a", - "version": "e0d826a", - "updated_at": "2024-12-17T21:18:30Z", - "url": "https://api.github.com/repos/intel/intel-graphics-compiler/actions/artifacts/2327583926/zip", + "github_tag": "igc-dev-97b3d8f", + "version": "97b3d8f", + "updated_at": "2025-01-08T17:43:30Z", + "url": "https://api.github.com/repos/intel/intel-graphics-compiler/actions/artifacts/2403247641/zip", "root": "{DEPS_ROOT}/opencl/runtime/linux/oclgpu" } } diff --git a/devops/scripts/install_drivers.sh b/devops/scripts/install_drivers.sh index 570f78091d9f2..01c2dde54d6d0 100755 --- a/devops/scripts/install_drivers.sh +++ b/devops/scripts/install_drivers.sh @@ -140,7 +140,7 @@ InstallIGFX () { get_release oneapi-src/level-zero $L0_TAG \ | grep ".*$UBUNTU_VER.*deb" \ | wget -qi - - dpkg -i --force-overwrite *.deb && rm *.deb *.sum + dpkg -i --force-all *.deb && rm *.deb *.sum mkdir -p /usr/local/lib/igc/ echo "$IGC_TAG" > /usr/local/lib/igc/IGCTAG.txt if [ "$IS_IGC_DEV" == "Yes" ]; then @@ -149,21 +149,21 @@ InstallIGFX () { # Backup and install it from release igc as a temporarily workaround # while we working to resolve the issue. echo "Backup libopencl-clang" - cp -d /usr/local/lib/libopencl-clang.so.14* . + cp -d /usr/local/lib/libopencl-clang2.so.14* . echo "Download IGC dev git hash $IGC_DEV_VER" get_pre_release_igfx $IGC_DEV_URL $IGC_DEV_VER echo "Install IGC dev git hash $IGC_DEV_VER" # New dev IGC packaged iga64 conflicting with iga64 from intel-igc-media # force overwrite to workaround it first. - dpkg -i --force-overwrite *.deb + dpkg -i --force-all *.deb echo "Install libopencl-clang" # Workaround only, will download deb and install with dpkg once fixed. - cp -d libopencl-clang.so.14* /usr/local/lib/ + cp -d libopencl-clang2.so.14* /usr/local/lib/ rm /usr/local/lib/libigc.so /usr/local/lib/libigc.so.1* && \ ln -s /usr/local/lib/libigc.so.2 /usr/local/lib/libigc.so && \ ln -s /usr/local/lib/libigc.so.2 /usr/local/lib/libigc.so.1 echo "Clean up" - rm *.deb libopencl-clang.so.14* + rm *.deb libopencl-clang2.so.14* echo "$IGC_DEV_TAG" > /usr/local/lib/igc/IGCTAG.txt fi } diff --git a/sycl/test-e2e/OnlineCompiler/online_compiler_L0.cpp b/sycl/test-e2e/OnlineCompiler/online_compiler_L0.cpp index 0d80e37e7d9fc..4de91a66941aa 100644 --- a/sycl/test-e2e/OnlineCompiler/online_compiler_L0.cpp +++ b/sycl/test-e2e/OnlineCompiler/online_compiler_L0.cpp @@ -1,5 +1,5 @@ // REQUIRES: level_zero, level_zero_dev_kit, cm-compiler -// XFAIL: gpu && !(arch-intel_gpu_pvc && igc-dev) +// XFAIL: gpu // XFAIL-TRACKER: https://github.com/intel/llvm/issues/16406 // RUN: %{build} -Wno-error=deprecated-declarations -DRUN_KERNELS %level_zero_options -o %t.out // RUN: %{run} %t.out diff --git a/sycl/test-e2e/OnlineCompiler/online_compiler_OpenCL.cpp b/sycl/test-e2e/OnlineCompiler/online_compiler_OpenCL.cpp index 360592289a969..b0023426f0631 100644 --- a/sycl/test-e2e/OnlineCompiler/online_compiler_OpenCL.cpp +++ b/sycl/test-e2e/OnlineCompiler/online_compiler_OpenCL.cpp @@ -1,5 +1,5 @@ // REQUIRES: opencl, opencl_icd, cm-compiler -// XFAIL: (gpu && !(arch-intel_gpu_pvc && igc-dev)) || cpu || accelerator +// XFAIL: gpu || cpu || accelerator // XFAIL-TRACKER: https://github.com/intel/llvm/issues/16406 // RUN: %{build} -Wno-error=deprecated-declarations -DRUN_KERNELS %opencl_lib -o %t.out // RUN: %{run} %t.out