Skip to content

Commit da16cd5

Browse files
authored
[CI] Fix igc-dev Docker container and bump version (#16271)
igc-dev is using `libigc.so.2` and released igc is using `libigc.so.1`, and there's no symlink to `libigc.so` in the dev-igc packages, so we need to do it ourselves. Also, fix the workflow so it runs on changes to the driver install script and XFAIL failing tests. And manually update the igc-dev version since the one we are using here is too old and the artifacts are expired so we can't build the image. The new version also contains an important fix for the joint matrix team. Closes: #16088 Closes: #16251 Signed-off-by: Sarnie, Nick <nick.sarnie@intel.com>
1 parent 4435532 commit da16cd5

12 files changed

+23
-10
lines changed

.github/workflows/sycl-containers-igc-dev.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,13 @@ on:
66
- sycl
77
paths:
88
- 'devops/actions/build_container/**'
9+
- 'devops/scripts/**'
910
- 'devops/dependencies-igc-dev.json'
1011
- '.github/workflows/sycl-containers-igc-dev.yaml'
1112
pull_request:
1213
paths:
1314
- 'devops/actions/build_container/**'
15+
- 'devops/scripts/**'
1416
- 'devops/dependencies-igc-dev.json'
1517
- '.github/workflows/sycl-containers-igc-dev.yaml'
1618

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,8 @@ jobs:
134134
install_dev_igc_driver: >-
135135
${{ !contains(matrix.target_devices, 'ext_oneapi_cuda') &&
136136
!contains(matrix.target_devices, 'ext_oneapi_hip') &&
137-
matrix.use_igc_dev && contains(needs.detect_changes.outputs.filters, 'devigccfg') ||
137+
matrix.use_igc_dev &&
138+
(contains(needs.detect_changes.outputs.filters, 'devigccfg') || contains(needs.detect_changes.outputs.filters, 'drivers')) ||
138139
'false' }}
139140
# Run only if the PR does not have the 'ci-no-devigc' label.
140141
skip_run: ${{matrix.use_igc_dev && contains(github.event.pull_request.labels.*.name, 'ci-no-devigc') || 'false'}}

devops/dependencies-igc-dev.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"linux": {
33
"igc_dev": {
4-
"github_tag": "igc-dev-3db59df",
5-
"version": "3db59df",
6-
"updated_at": "2024-12-03T20:43:00Z",
7-
"url": "https://api.github.com/repos/intel/intel-graphics-compiler/actions/artifacts/2248119261/zip",
4+
"github_tag": "igc-dev-e0d826a",
5+
"version": "e0d826a",
6+
"updated_at": "2024-12-17T21:18:30Z",
7+
"url": "https://api.github.com/repos/intel/intel-graphics-compiler/actions/artifacts/2327583926/zip",
88
"root": "{DEPS_ROOT}/opencl/runtime/linux/oclgpu"
99
}
1010
}

devops/scripts/install_drivers.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,9 @@ InstallIGFX () {
162162
echo "Install libopencl-clang"
163163
# Workaround only, will download deb and install with dpkg once fixed.
164164
cp -d libopencl-clang.so.14* /usr/local/lib/
165+
rm /usr/local/lib/libigc.so /usr/local/lib/libigc.so.1* && \
166+
ln -s /usr/local/lib/libigc.so.2 /usr/local/lib/libigc.so && \
167+
ln -s /usr/local/lib/libigc.so.2 /usr/local/lib/libigc.so.1
165168
echo "Clean up"
166169
rm *.deb libopencl-clang.so.14*
167170
echo "$IGC_DEV_TAG" > /usr/local/lib/igc/IGCTAG.txt

sycl/test-e2e/ESIMD/PerformanceTests/invoke_simd_smoke.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
66
//
77
//===----------------------------------------------------------------------===//
8+
// XFAIL: igc-dev
9+
// XFAIL-TRACKER: https://github.com/intel/llvm/issues/16388
810
// REQUIRES: gpu-intel-dg2 && level_zero
911
// UNSUPPORTED: windows
1012

sycl/test-e2e/ESIMD/PerformanceTests/matrix_transpose.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
66
//
77
//===----------------------------------------------------------------------===//
8-
// XFAIL: igc-dev
9-
// XFAIL-TRACKER: https://github.com/intel/llvm/issues/16088
108
// REQUIRES: gpu-intel-dg2 && level_zero
119
// UNSUPPORTED: windows
1210

sycl/test-e2e/ESIMD/accessor_local.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
// REQUIRES-INTEL-DRIVER: lin: 27202, win: 101.4677
2+
// XFAIL: igc-dev
3+
// XFAIL-TRACKER: https://github.com/intel/llvm/issues/16388
24
// RUN: %{build} -o %t.out
35
// RUN: %{run} %t.out
46
// This test verifies usage of local_accessor methods operator[]

sycl/test-e2e/ESIMD/local_accessor_block_load_store.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
//
77
//===----------------------------------------------------------------------===//
88
// REQUIRES-INTEL-DRIVER: lin: 27202, win: 101.4677
9+
// XFAIL: igc-dev
10+
// XFAIL-TRACKER: https://github.com/intel/llvm/issues/16388
911
// RUN: %{build} -o %t.out
1012
// RUN: %{run} %t.out
1113
// This test verifies usage of block_load/block_store for local_accessor.

sycl/test-e2e/ESIMD/local_accessor_copy_to_from.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
//
77
//===----------------------------------------------------------------------===//
88
// REQUIRES-INTEL-DRIVER: lin: 27202, win: 101.4677
9-
//
9+
// XFAIL: igc-dev
10+
// XFAIL-TRACKER: https://github.com/intel/llvm/issues/16388
1011
// RUN: %{build} -o %t.out
1112
// RUN: %{run} %t.out
1213
//

sycl/test-e2e/ESIMD/lsc/lsc_local_accessor_block_load_store.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
//===----------------------------------------------------------------------===//
88
// REQUIRES: arch-intel_gpu_pvc || gpu-intel-dg2
99
// REQUIRES-INTEL-DRIVER: lin: 26690, win: 101.4576
10+
// XFAIL: igc-dev
11+
// XFAIL-TRACKER: https://github.com/intel/llvm/issues/16388
1012
// RUN: %{build} -o %t.out
1113
// RUN: %{run} %t.out
1214
//

0 commit comments

Comments
 (0)