diff --git a/.github/workflows/sycl-containers-igc-dev.yaml b/.github/workflows/sycl-containers-igc-dev.yaml index 40809017e8be8..8a8f73285ae15 100644 --- a/.github/workflows/sycl-containers-igc-dev.yaml +++ b/.github/workflows/sycl-containers-igc-dev.yaml @@ -6,11 +6,13 @@ on: - sycl paths: - 'devops/actions/build_container/**' + - 'devops/scripts/**' - 'devops/dependencies-igc-dev.json' - '.github/workflows/sycl-containers-igc-dev.yaml' pull_request: paths: - 'devops/actions/build_container/**' + - 'devops/scripts/**' - 'devops/dependencies-igc-dev.json' - '.github/workflows/sycl-containers-igc-dev.yaml' diff --git a/.github/workflows/sycl-linux-precommit.yml b/.github/workflows/sycl-linux-precommit.yml index 04665c383cbb6..cf1a488c87c81 100644 --- a/.github/workflows/sycl-linux-precommit.yml +++ b/.github/workflows/sycl-linux-precommit.yml @@ -134,7 +134,8 @@ jobs: install_dev_igc_driver: >- ${{ !contains(matrix.target_devices, 'ext_oneapi_cuda') && !contains(matrix.target_devices, 'ext_oneapi_hip') && - matrix.use_igc_dev && contains(needs.detect_changes.outputs.filters, 'devigccfg') || + matrix.use_igc_dev && + (contains(needs.detect_changes.outputs.filters, 'devigccfg') || contains(needs.detect_changes.outputs.filters, 'drivers')) || 'false' }} # Run only if the PR does not have the 'ci-no-devigc' label. skip_run: ${{matrix.use_igc_dev && contains(github.event.pull_request.labels.*.name, 'ci-no-devigc') || 'false'}} diff --git a/devops/scripts/install_drivers.sh b/devops/scripts/install_drivers.sh index 9607051d4f861..e790691462d94 100755 --- a/devops/scripts/install_drivers.sh +++ b/devops/scripts/install_drivers.sh @@ -162,6 +162,9 @@ InstallIGFX () { echo "Install libopencl-clang" # Workaround only, will download deb and install with dpkg once fixed. cp -d libopencl-clang.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* echo "$IGC_DEV_TAG" > /usr/local/lib/igc/IGCTAG.txt diff --git a/sycl/test-e2e/Matrix/joint_matrix_bf16_fill_k_cache_arg_dim.cpp b/sycl/test-e2e/Matrix/joint_matrix_bf16_fill_k_cache_arg_dim.cpp index ddd3627f46132..06c5fca548127 100644 --- a/sycl/test-e2e/Matrix/joint_matrix_bf16_fill_k_cache_arg_dim.cpp +++ b/sycl/test-e2e/Matrix/joint_matrix_bf16_fill_k_cache_arg_dim.cpp @@ -14,7 +14,7 @@ // Waiting for the commit in IGC to be pulled into the driver to resolve the // test. -// XFAIL: gpu +// XFAIL: !igc-dev // XFAIL-TRACKER: CMPLRLLVM-63710 #include "common.hpp" diff --git a/sycl/test-e2e/Matrix/joint_matrix_bf16_fill_k_cache_runtime_dim.cpp b/sycl/test-e2e/Matrix/joint_matrix_bf16_fill_k_cache_runtime_dim.cpp index 632f6732da7f8..fe5eca8ec0a90 100644 --- a/sycl/test-e2e/Matrix/joint_matrix_bf16_fill_k_cache_runtime_dim.cpp +++ b/sycl/test-e2e/Matrix/joint_matrix_bf16_fill_k_cache_runtime_dim.cpp @@ -14,7 +14,7 @@ // Waiting for the commit in IGC to be pulled into the driver to resolve the // test. -// XFAIL: gpu +// XFAIL: !igc-dev // XFAIL-TRACKER: CMPLRLLVM-63710 #include "common.hpp"