Skip to content
Merged
Show file tree
Hide file tree
Changes from 11 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/sycl-linux-precommit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -92,14 +92,14 @@ jobs:
reset_intel_gpu: false
- name: Intel
runner: '["Linux", "gen12"]'
image: ghcr.io/intel/llvm/ubuntu2204_intel_drivers:latest
image: ghcr.io/intel/llvm/ubuntu2404_intel_drivers:latest
image_options: -u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN
target_devices: level_zero:gpu;opencl:gpu;opencl:cpu
reset_intel_gpu: true
extra_lit_opts: --param gpu-intel-gen12=True
- name: E2E tests on Intel Arc A-Series Graphics
runner: '["Linux", "arc"]'
image: ghcr.io/intel/llvm/ubuntu2204_intel_drivers:latest
image: ghcr.io/intel/llvm/ubuntu2404_intel_drivers:latest
image_options: -u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN
target_devices: level_zero:gpu;opencl:gpu
reset_intel_gpu: true
Expand Down Expand Up @@ -161,12 +161,12 @@ jobs:
include:
- name: Intel GEN12 Graphics system
runner: '["Linux", "gen12"]'
image: ghcr.io/intel/llvm/ubuntu2204_intel_drivers:latest
image: ghcr.io/intel/llvm/ubuntu2404_intel_drivers:latest
image_extra_opts: --device=/dev/dri
reset_intel_gpu: true
- name: Intel Arc A-Series Graphics system
runner: '["Linux", "arc"]'
image: ghcr.io/intel/llvm/ubuntu2204_intel_drivers:latest
image: ghcr.io/intel/llvm/ubuntu2404_intel_drivers:latest
image_extra_opts: --device=/dev/dri
reset_intel_gpu: true
- name: AMD system
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/sycl-nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ jobs:

- name: Intel L0 GPU
runner: '["Linux", "gen12"]'
image: ghcr.io/intel/llvm/ubuntu2204_intel_drivers:latest
image: ghcr.io/intel/llvm/ubuntu2404_intel_drivers:latest
image_options: -u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN
target_devices: level_zero:gpu
reset_intel_gpu: true
Expand All @@ -61,7 +61,7 @@ jobs:

- name: Intel OCL GPU
runner: '["Linux", "gen12"]'
image: ghcr.io/intel/llvm/ubuntu2204_intel_drivers:latest
image: ghcr.io/intel/llvm/ubuntu2404_intel_drivers:latest
image_options: -u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN
target_devices: opencl:gpu
reset_intel_gpu: true
Expand All @@ -70,35 +70,35 @@ jobs:

- name: OCL CPU (AMD)
runner: '["Linux", "amdgpu"]'
image: ghcr.io/intel/llvm/ubuntu2204_intel_drivers:latest
image: ghcr.io/intel/llvm/ubuntu2404_intel_drivers:latest
image_options: -u 1001
target_devices: opencl:cpu
tests_selector: e2e

- name: OCL CPU (Intel/GEN12)
runner: '["Linux", "gen12"]'
image: ghcr.io/intel/llvm/ubuntu2204_intel_drivers:latest
image: ghcr.io/intel/llvm/ubuntu2404_intel_drivers:latest
image_options: -u 1001 --privileged --cap-add SYS_ADMIN
target_devices: opencl:cpu
tests_selector: e2e

- name: OCL CPU (Intel/Arc)
runner: '["Linux", "arc"]'
image: ghcr.io/intel/llvm/ubuntu2204_intel_drivers:latest
image: ghcr.io/intel/llvm/ubuntu2404_intel_drivers:latest
image_options: -u 1001
target_devices: opencl:cpu
tests_selector: e2e

- name: SYCL-CTS on OCL CPU
runner: '["Linux", "gen12"]'
image: ghcr.io/intel/llvm/ubuntu2204_intel_drivers:latest
image: ghcr.io/intel/llvm/ubuntu2404_intel_drivers:latest
image_options: -u 1001 --device=/dev/dri --privileged --cap-add SYS_ADMIN
target_devices: opencl:cpu
tests_selector: cts

- name: SYCL-CTS on L0 gen12
runner: '["Linux", "gen12"]'
image: ghcr.io/intel/llvm/ubuntu2204_intel_drivers:latest
image: ghcr.io/intel/llvm/ubuntu2404_intel_drivers:latest
image_options: -u 1001 --device=/dev/dri --privileged --cap-add SYS_ADMIN
target_devices: level_zero:gpu
tests_selector: cts
Expand Down Expand Up @@ -229,7 +229,7 @@ jobs:
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}
build-args: |
base_image=ghcr.io/intel/llvm/ubuntu2204_intel_drivers
base_image=ghcr.io/intel/llvm/ubuntu2404_intel_drivers
base_tag=latest
tags: |
ghcr.io/${{ github.repository }}/sycl_ubuntu2204_nightly:${{ github.sha }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/sycl-post-commit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ jobs:
with:
name: ${{ matrix.name }}
runner: ${{ matrix. runner }}
image: ${{ matrix.image || 'ghcr.io/intel/llvm/ubuntu2204_intel_drivers:latest' }}
image: ${{ matrix.image || 'ghcr.io/intel/llvm/ubuntu2404_intel_drivers:latest' }}
image_options: ${{ matrix.image_options || '-u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN' }}
target_devices: ${{ matrix.target_devices || 'level_zero:gpu' }}
reset_intel_gpu: ${{ matrix.reset_intel_gpu }}
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/sycl-rel-nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,14 +54,14 @@ jobs:
include:
- name: AMD/HIP
runner: '["Linux", "amdgpu"]'
image: ghcr.io/intel/llvm/ubuntu2204_build:latest
image: ghcr.io/intel/llvm/ubuntu2404_build:latest
image_options: -u 1001 --device=/dev/dri --device=/dev/kfd
target_devices: ext_oneapi_hip:gpu
tests_selector: e2e

- name: Intel L0 GPU
runner: '["Linux", "gen12"]'
image: ghcr.io/intel/llvm/ubuntu2204_intel_drivers:latest
image: ghcr.io/intel/llvm/ubuntu2404_intel_drivers:latest
image_options: -u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN
target_devices: level_zero:gpu
reset_intel_gpu: true
Expand All @@ -70,7 +70,7 @@ jobs:

- name: Intel OCL GPU
runner: '["Linux", "gen12"]'
image: ghcr.io/intel/llvm/ubuntu2204_intel_drivers:latest
image: ghcr.io/intel/llvm/ubuntu2404_intel_drivers:latest
image_options: -u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN
target_devices: opencl:gpu
reset_intel_gpu: true
Expand All @@ -79,21 +79,21 @@ jobs:

- name: Intel OCL CPU
runner: '["Linux", "gen12"]'
image: ghcr.io/intel/llvm/ubuntu2204_intel_drivers:latest
image: ghcr.io/intel/llvm/ubuntu2404_intel_drivers:latest
image_options: -u 1001 --privileged --cap-add SYS_ADMIN
target_devices: opencl:cpu
tests_selector: e2e

- name: SYCL-CTS on OCL CPU
runner: '["Linux", "gen12"]'
image: ghcr.io/intel/llvm/ubuntu2204_intel_drivers:latest
image: ghcr.io/intel/llvm/ubuntu2404_intel_drivers:latest
image_options: -u 1001 --device=/dev/dri --privileged --cap-add SYS_ADMIN
target_devices: opencl:cpu
tests_selector: cts

- name: SYCL-CTS on L0 gen12
runner: '["Linux", "gen12"]'
image: ghcr.io/intel/llvm/ubuntu2204_intel_drivers:latest
image: ghcr.io/intel/llvm/ubuntu2404_intel_drivers:latest
image_options: -u 1001 --device=/dev/dri --privileged --cap-add SYS_ADMIN
target_devices: level_zero:gpu
tests_selector: cts
Expand Down
18 changes: 9 additions & 9 deletions devops/dependencies.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"linux": {
"compute_runtime": {
"github_tag": "24.39.31294.12",
"version": "24.39.31294.12",
"url": "https://github.com/intel/compute-runtime/releases/tag/24.39.31294.12",
"github_tag": "24.45.31740.9",
"version": "24.45.31740.9",
"url": "https://github.com/intel/compute-runtime/releases/tag/24.45.31740.9",
"root": "{DEPS_ROOT}/opencl/runtime/linux/oclgpu"
},
"igc": {
"github_tag": "igc-1.0.17791.9",
"version": "1.0.17791.9",
"url": "https://github.com/intel/intel-graphics-compiler/releases/tag/igc-1.0.17791.9",
"github_tag": "v2.1.12",
"version": "2.1.12",
"url": "https://github.com/intel/intel-graphics-compiler/releases/tag/v2.1.12",
"root": "{DEPS_ROOT}/opencl/runtime/linux/oclgpu"
},
"cm": {
Expand All @@ -19,9 +19,9 @@
"root": "{DEPS_ROOT}/opencl/runtime/linux/oclgpu"
},
"level_zero": {
"github_tag": "v1.18.5",
"version": "v1.18.5",
"url": "https://github.com/oneapi-src/level-zero/releases/tag/v1.18.5",
"github_tag": "v1.19.2",
"version": "v1.19.2",
"url": "https://github.com/oneapi-src/level-zero/releases/tag/v1.19.2",
"root": "{DEPS_ROOT}/opencl/runtime/linux/oclgpu"
},
"tbb": {
Expand Down
7 changes: 2 additions & 5 deletions devops/scripts/install_drivers.sh
Original file line number Diff line number Diff line change
Expand Up @@ -120,10 +120,7 @@ InstallIGFX () {
#
# Of course, this also installed the libopencl-clang so that we can copy and use later as a temporariy workaround.
IS_IGC_DEV=$(CheckIGCdevTag $IGCTAG)
UBUNTU_VER="u22\.04"
if [ "$IS_IGC_DEV" == "Yes" ] || [ "$L0_TAG" == "latest" ]; then
UBUNTU_VER="u24\.04"
fi
UBUNTU_VER="u24\.04"
get_release intel/intel-graphics-compiler $IGC_TAG \
| grep ".*deb" \
| wget -qi -
Expand All @@ -143,7 +140,7 @@ InstallIGFX () {
get_release oneapi-src/level-zero $L0_TAG \
| grep ".*$UBUNTU_VER.*deb" \
| wget -qi -
dpkg -i *.deb && rm *.deb *.sum
dpkg -i --force-overwrite *.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
Expand Down
2 changes: 2 additions & 0 deletions sycl/test-e2e/AddressSanitizer/common/kernel-filter.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
// REQUIRES: linux
// XFAIL: any-device-is-opencl && gpu-intel-dg2
// XFAIL-TRACKER: https://github.com/intel/llvm/issues/16405
// RUN: %{build} %device_asan_flags -O2 -fsanitize-ignorelist=%p/ignorelist.txt -o %t
// RUN: %{run} %t 2>&1 | FileCheck %s
// RUN: %{build} %device_asan_flags %if cpu %{ -fsycl-targets=spir64_x86_64 %} %if gpu %{ -fsycl-targets=spir64_gen -Xsycl-target-backend=spir64_gen %gpu_aot_target_opts %} -O2 -fsanitize-ignorelist=%p/ignorelist.txt -o %t2
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
//
//===----------------------------------------------------------------------===//
// XFAIL: igc-dev
// XFAIL: gpu-intel-dg2
// XFAIL-TRACKER: https://github.com/intel/llvm/issues/16388
// REQUIRES: gpu-intel-dg2 && level_zero
// UNSUPPORTED: windows
Expand Down
3 changes: 2 additions & 1 deletion sycl/test-e2e/OnlineCompiler/online_compiler_L0.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
// REQUIRES: level_zero, level_zero_dev_kit, cm-compiler

// 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

Expand Down
3 changes: 2 additions & 1 deletion sycl/test-e2e/OnlineCompiler/online_compiler_OpenCL.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
// REQUIRES: opencl, opencl_icd, cm-compiler

// XFAIL: gpu
// 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

Expand Down