From a0c312ec54152378639e89d3b068bb3312def0e3 Mon Sep 17 00:00:00 2001 From: Andrei Elovikov Date: Thu, 7 Aug 2025 09:19:57 -0700 Subject: [PATCH 1/3] [CI] Cleanup precommit E2E matrix code * Add default value for `image_options` * Drop unused `matrix-xmx8` * Don't set `gpu-intel-gen12`, rely on auto-detection in https://github.com/intel/llvm/blob/dc8068fe687b24a0f8018ea6c43fc4f9183f9bb7/sycl/test-e2e/lit.cfg.py#L240-L256 --- .github/workflows/sycl-linux-precommit.yml | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/.github/workflows/sycl-linux-precommit.yml b/.github/workflows/sycl-linux-precommit.yml index 37c79b2640add..a303a02dffb29 100644 --- a/.github/workflows/sycl-linux-precommit.yml +++ b/.github/workflows/sycl-linux-precommit.yml @@ -88,9 +88,7 @@ jobs: include: - name: GEN 12 Integrated runner: '["Linux", "gen12"]' - 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 - extra_lit_opts: --param gpu-intel-gen12=True - name: NVIDIA/CUDA runner: '["Linux", "cuda"]' image_options: -u 1001 --gpus all --cap-add SYS_ADMIN @@ -102,35 +100,27 @@ jobs: extra_lit_opts: -j 1 - name: Intel Arc A-Series Graphics runner: '["Linux", "arc"]' - 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;level_zero_v2:gpu - extra_lit_opts: --param matrix-xmx8=True - name: E2E tests with dev igc on Intel Arc A-Series Graphics runner: '["Linux", "arc"]' image: ghcr.io/intel/llvm/ubuntu2404_intel_drivers:devigc - 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 - extra_lit_opts: --param matrix-xmx8=True use_igc_dev: true env: '{"LIT_FILTER":"Matrix/"}' - name: E2E tests on Intel Ponte Vecchio GPU runner: '["Linux", "pvc"]' - 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;level_zero_v2:gpu - name: Dev IGC on Intel Ponte Vecchio GPU runner: '["Linux", "pvc"]' image: ghcr.io/intel/llvm/ubuntu2404_intel_drivers:devigc - 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 use_igc_dev: true env: '{"LIT_FILTER":"Matrix/"}' - name: Intel Battlemage Graphics runner: '["Linux", "bmg"]' - 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_v1:gpu;level_zero_v2:gpu - name: Preview Mode runner: '["Linux", "gen12"]' - 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 extra_lit_opts: --param test-preview-mode=True e2e_binaries_artifact: e2e_bin_preview @@ -140,7 +130,7 @@ jobs: name: ${{ matrix.name }} runner: ${{ matrix.runner }} image: ${{ matrix.image }} - image_options: ${{ matrix.image_options }} + 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 }} extra_lit_opts: ${{ matrix.extra_lit_opts }} repo_ref: ${{ github.sha }} From 56ca7898fc424e3f66afd456ca4aedbaa0663de7 Mon Sep 17 00:00:00 2001 From: Andrei Elovikov Date: Thu, 7 Aug 2025 09:30:19 -0700 Subject: [PATCH 2/3] Also update post/nightly --- .github/workflows/sycl-nightly.yml | 8 +------- .github/workflows/sycl-post-commit.yml | 1 - 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/.github/workflows/sycl-nightly.yml b/.github/workflows/sycl-nightly.yml index 85df1e65c2aa4..f45d8d48d3e90 100644 --- a/.github/workflows/sycl-nightly.yml +++ b/.github/workflows/sycl-nightly.yml @@ -84,27 +84,22 @@ jobs: - name: Intel L0 Gen12 GPU runner: '["Linux", "gen12"]' - 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 - name: Intel L0 Ponte Vecchio GPU runner: '["Linux", "pvc"]' - 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 - name: Intel L0 Battlemage GPU runner: '["Linux", "bmg"]' - 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 - name: Intel L0 Arc A-Series GPU runner: '["Linux", "arc"]' - 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 - name: Intel OCL Gen12 GPU runner: '["Linux", "gen12"]' - 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 - name: OCL CPU (AMD) @@ -124,7 +119,6 @@ jobs: - name: Preview mode on SPR/PVC runner: '["Linux", "pvc"]' - 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 extra_lit_opts: --param test-preview-mode=True @@ -132,7 +126,7 @@ jobs: with: name: ${{ matrix.name }} runner: ${{ matrix.runner }} - image_options: ${{ matrix.image_options }} + 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 }} tests_selector: e2e extra_lit_opts: "--param 'cxx_flags=-D_GLIBCXX_USE_CXX11_ABI=0' ${{ matrix.extra_lit_opts }}" diff --git a/.github/workflows/sycl-post-commit.yml b/.github/workflows/sycl-post-commit.yml index 334fc0d06de42..ce0afb273860f 100644 --- a/.github/workflows/sycl-post-commit.yml +++ b/.github/workflows/sycl-post-commit.yml @@ -57,7 +57,6 @@ jobs: target_devices: level_zero:gpu - name: Intel Arc A-Series Graphics with Level Zero runner: '["Linux", "arc"]' - extra_lit_opts: --param matrix-xmx8=True # Performance tests below. Specifics: # - only run performance tests (use LIT_FILTER env) # - ask llvm-lit to show all the output, even for PASS (-a) From 58f9a398e28067e912d155fe07c607760c658fba Mon Sep 17 00:00:00 2001 From: Andrei Elovikov Date: Thu, 7 Aug 2025 09:43:13 -0700 Subject: [PATCH 3/3] Clean up some names too --- .github/workflows/sycl-linux-precommit.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/sycl-linux-precommit.yml b/.github/workflows/sycl-linux-precommit.yml index a303a02dffb29..6f625bcf5cec4 100644 --- a/.github/workflows/sycl-linux-precommit.yml +++ b/.github/workflows/sycl-linux-precommit.yml @@ -101,16 +101,16 @@ jobs: - name: Intel Arc A-Series Graphics runner: '["Linux", "arc"]' target_devices: level_zero:gpu;opencl:gpu;level_zero_v2:gpu - - name: E2E tests with dev igc on Intel Arc A-Series Graphics + - name: Dev IGC / Intel Arc A-Series Graphics runner: '["Linux", "arc"]' image: ghcr.io/intel/llvm/ubuntu2404_intel_drivers:devigc target_devices: level_zero:gpu use_igc_dev: true env: '{"LIT_FILTER":"Matrix/"}' - - name: E2E tests on Intel Ponte Vecchio GPU + - name: Intel Ponte Vecchio GPU runner: '["Linux", "pvc"]' target_devices: level_zero:gpu;opencl:gpu;level_zero_v2:gpu - - name: Dev IGC on Intel Ponte Vecchio GPU + - name: Dev IGC / Intel Ponte Vecchio GPU runner: '["Linux", "pvc"]' image: ghcr.io/intel/llvm/ubuntu2404_intel_drivers:devigc target_devices: level_zero:gpu