Skip to content

Commit cc4dee4

Browse files
ayylolayylol
authored
[CI][SYCL][E2E] Split gen12 pre-commit testing into build and run stages (#16321)
This patch enables E2E build and run splitting on pre-commit CI. Currently one of the main bottlenecks in pre-commit CI is the Linux Gen12 testing which takes between 30 ~ 40 minutes to complete. By instead building these tests on our fast build systems, and then transferring the binaries to the Gen12 machine we can cut down on this time by roughly half. Sadly, the Windows Gen12 testing will still be the main bottleneck so total time for pre-commit won't improve with this PR, but we will at least get faster feedback for gen12 on Linux.
1 parent ae0b835 commit cc4dee4

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+161
-30
lines changed

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

Lines changed: 47 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,53 @@ jobs:
7272
else
7373
echo 'arc_tests="Matrix/"' >> "$GITHUB_OUTPUT"
7474
fi
75+
76+
build_e2e_tests:
77+
needs: [build]
78+
if: ${{ always() && !cancelled() && needs.build.outputs.build_conclusion == 'success' }}
79+
uses: ./.github/workflows/sycl-linux-run-tests.yml
80+
with:
81+
name: Build e2e tests
82+
runner: '["Linux", "build"]'
83+
image: ghcr.io/intel/llvm/ubuntu2404_intel_drivers:latest
84+
image_options: -u 1001
85+
ref: ${{ github.sha }}
86+
merge_ref: ''
87+
sycl_toolchain_artifact: sycl_linux_default
88+
sycl_toolchain_archive: ${{ needs.build.outputs.artifact_archive_name }}
89+
sycl_toolchain_decompress_command: ${{ needs.build.outputs.artifact_decompress_command }}
90+
e2e_testing_mode: 'build-only'
91+
run_prebuilt_e2e_tests:
92+
needs: [build, build_e2e_tests]
93+
if: ${{ always() && !cancelled() && needs.build.outputs.build_conclusion == 'success' }}
94+
strategy:
95+
fail-fast: false
96+
matrix:
97+
include:
98+
- name: Intel
99+
runner: '["Linux", "gen12"]'
100+
image: ghcr.io/intel/llvm/ubuntu2404_intel_drivers:latest
101+
image_options: -u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN
102+
target_devices: level_zero:gpu;opencl:gpu;opencl:cpu
103+
reset_intel_gpu: true
104+
extra_lit_opts: --param gpu-intel-gen12=True
105+
uses: ./.github/workflows/sycl-linux-run-tests.yml
106+
with:
107+
name: ${{ matrix.name }}
108+
runner: ${{ matrix.runner }}
109+
image: ${{ matrix.image }}
110+
image_options: ${{ matrix.image_options }}
111+
target_devices: ${{ matrix.target_devices }}
112+
extra_lit_opts: --param fallback-to-build-if-requires-build-and-run=True ${{ matrix.extra_lit_opts }}
113+
reset_intel_gpu: ${{ matrix.reset_intel_gpu }}
114+
ref: ${{ github.sha }}
115+
merge_ref: ''
116+
sycl_toolchain_artifact: sycl_linux_default
117+
sycl_toolchain_archive: ${{ needs.build.outputs.artifact_archive_name }}
118+
sycl_toolchain_decompress_command: ${{ needs.build.outputs.artifact_decompress_command }}
119+
e2e_binaries_artifact: sycl_e2e_bin_default
120+
e2e_testing_mode: 'run-only'
121+
75122
test:
76123
needs: [build, detect_changes, determine_arc_tests]
77124
if: ${{ always() && !cancelled() && needs.build.outputs.build_conclusion == 'success' }}
@@ -90,13 +137,6 @@ jobs:
90137
image_options: -u 1001 --device=/dev/dri --device=/dev/kfd
91138
target_devices: ext_oneapi_hip:gpu
92139
reset_intel_gpu: false
93-
- name: Intel
94-
runner: '["Linux", "gen12"]'
95-
image: ghcr.io/intel/llvm/ubuntu2404_intel_drivers:latest
96-
image_options: -u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN
97-
target_devices: level_zero:gpu;opencl:gpu;opencl:cpu
98-
reset_intel_gpu: true
99-
extra_lit_opts: --param gpu-intel-gen12=True
100140
- name: E2E tests on Intel Arc A-Series Graphics
101141
runner: '["Linux", "arc"]'
102142
image: ghcr.io/intel/llvm/ubuntu2404_intel_drivers:latest

‎.github/workflows/sycl-linux-run-tests.yml‎

Lines changed: 56 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ on:
1919

2020
target_devices:
2121
type: string
22-
required: True
22+
required: False
2323
extra_cmake_args:
2424
type: string
2525
required: False
@@ -59,6 +59,30 @@ on:
5959
default: ''
6060
required: False
6161

62+
e2e_binaries_artifact:
63+
description: |
64+
By setting this the E2E binaries folder will not be created, rather it
65+
will be downloaded and extracted from the specified artifact. When
66+
running tests in `run-only` mode this must be provided.
67+
type: string
68+
default: ''
69+
required: False
70+
e2e_testing_mode:
71+
description: |
72+
Testing mode to run E2E tests in, can be either `full`, `build-only`
73+
or `run-only`. In `build-only` mode an artifact of the E2E binaries
74+
will be uploaded.
75+
type: string
76+
default: 'full'
77+
artifact_suffix:
78+
description: 'Suffix for E2E binaries artifact that is output when in `build-only`.'
79+
type: string
80+
default: 'default'
81+
retention-days:
82+
description: 'E2E binaries artifact retention period.'
83+
type: string
84+
default: 1
85+
6286
reset_intel_gpu:
6387
type: string
6488
required: False
@@ -87,6 +111,7 @@ on:
87111
- '["amdgpu"]'
88112
- '["Linux", "arc"]'
89113
- '["cts-cpu"]'
114+
- '["Linux", "build"]'
90115
image:
91116
description: |
92117
Use option ending with ":build" for AMDGPU, ":latest" for the rest.
@@ -142,6 +167,11 @@ on:
142167
options:
143168
- false
144169
- true
170+
e2e_testing_mode:
171+
type: choice
172+
options:
173+
- "full"
174+
- "build-only"
145175

146176
permissions:
147177
contents: read
@@ -270,8 +300,19 @@ jobs:
270300
cat /usr/local/lib/igc/IGCTAG.txt
271301
fi
272302
303+
- name: Download E2E Binaries
304+
if: inputs.e2e_binaries_artifact != ''
305+
uses: actions/download-artifact@v4
306+
with:
307+
name: ${{ inputs.e2e_binaries_artifact }}
308+
- name: Extract E2E Binaries
309+
if: inputs.e2e_binaries_artifact != ''
310+
run: |
311+
mkdir build-e2e
312+
tar -I 'zstd' -xf e2e_binaries.tar.zst -C build-e2e
313+
273314
- name: Deduce E2E CMake options
274-
if: inputs.tests_selector == 'e2e'
315+
if: inputs.tests_selector == 'e2e' && inputs.e2e_binaries_artifact == ''
275316
id: cmake_opts
276317
shell: bash
277318
env:
@@ -281,14 +322,14 @@ jobs:
281322
echo "opts=$CMAKE_EXTRA_ARGS" >> $GITHUB_OUTPUT
282323
fi
283324
- name: Configure E2E tests
284-
if: inputs.tests_selector == 'e2e'
325+
if: inputs.tests_selector == 'e2e' && inputs.e2e_binaries_artifact == ''
285326
run: |
286-
cmake -GNinja -B./build-e2e -S./llvm/sycl/test-e2e -DSYCL_TEST_E2E_TARGETS="${{ inputs.target_devices }}" -DCMAKE_CXX_COMPILER="$(which clang++)" -DLLVM_LIT="$PWD/llvm/llvm/utils/lit/lit.py" ${{ steps.cmake_opts.outputs.opts }}
327+
cmake -GNinja -B./build-e2e -S./llvm/sycl/test-e2e -DCMAKE_CXX_COMPILER="$(which clang++)" -DLLVM_LIT="$PWD/llvm/llvm/utils/lit/lit.py" ${{ steps.cmake_opts.outputs.opts }}
287328
- name: SYCL End-to-end tests
288329
shell: bash {0}
289330
if: inputs.tests_selector == 'e2e'
290331
env:
291-
LIT_OPTS: -v --no-progress-bar --show-unsupported --show-pass --show-xfail --max-time 3600 --time-tests ${{ inputs.extra_lit_opts }}
332+
LIT_OPTS: -v --no-progress-bar --show-unsupported --show-pass --show-xfail --max-time 3600 --time-tests --param test-mode=${{ inputs.e2e_testing_mode }} --param sycl_devices=${{ inputs.target_devices }} ${{ inputs.extra_lit_opts }}
292333
run: |
293334
ninja -C build-e2e check-sycl-e2e > e2e.log 2>&1
294335
exit_code=$?
@@ -375,3 +416,13 @@ jobs:
375416
grep 'exit code: [^0]' -r logs >> $GITHUB_STEP_SUMMARY
376417
377418
exit $ret
419+
- name: Pack E2E binaries
420+
if: ${{ always() && !cancelled() && inputs.e2e_testing_mode == 'build-only'}}
421+
run: tar -I 'zstd -9' -cf e2e_binaries.tar.zst -C ./build-e2e .
422+
- name: Upload E2E binaries
423+
if: ${{ always() && !cancelled() && inputs.e2e_testing_mode == 'build-only'}}
424+
uses: actions/upload-artifact@v4
425+
with:
426+
name: sycl_e2e_bin_${{ inputs.artifact_suffix }}
427+
path: e2e_binaries.tar.zst
428+
retention-days: ${{ inputs.retention-days }}

‎sycl/test-e2e/AOT/cpu.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
//===---------------------------------------------------------------------===//
88

99
// REQUIRES: opencl-aot, cpu
10+
// REQUIRES: build-and-run-mode
1011

1112
// RUN: %clangxx -fsycl -fsycl-targets=spir64_x86_64 %S/Inputs/aot.cpp -o %t.out
1213
// RUN: %{run} %t.out

‎sycl/test-e2e/AOT/double.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
// using fp64 can be compiled AOT.
33

44
// REQUIRES: ocloc, opencl-aot, any-device-is-cpu
5+
// REQUIRES: build-and-run-mode
56
// RUN: %clangxx -fsycl -fsycl-targets=intel_gpu_tgllp -o %t.tgllp.out %s
67
// RUN: %clangxx -fsycl -fsycl-targets=spir64_x86_64 -o %t.x86.out %s
78
// RUN: %if cpu %{ %{run} %t.x86.out %}

‎sycl/test-e2e/AOT/half.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
// using fp16 can be compiled AOT.
33

44
// REQUIRES: ocloc, opencl-aot, any-device-is-cpu
5+
// REQUIRES: build-and-run-mode
56
// RUN: %clangxx -fsycl -fsycl-targets=intel_gpu_tgllp -o %t.tgllp.out %s
67
// RUN: %clangxx -fsycl -fsycl-targets=spir64_x86_64 -o %t.x86.out %s
78
// RUN: %if cpu %{ %{run} %t.x86.out %}

‎sycl/test-e2e/Adapters/sycl-ls-gpu-default-any.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
// REQUIRES: gpu
2+
// REQUIRES: build-and-run-mode
23

34
// TODO: Remove unsetting SYCL_DEVICE_FILTER when feature is dropped
45
// RUN: env --unset=SYCL_DEVICE_FILTER --unset=ONEAPI_DEVICE_SELECTOR sycl-ls --verbose >%t.default.out

‎sycl/test-e2e/Adapters/sycl-ls-gpu-default-level-zero.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
// REQUIRES: gpu, level-zero
2+
// REQUIRES: build-and-run-mode
23

34
// TODO: Remove unsetting SYCL_DEVICE_FILTER when feature is dropped
45
// RUN: env --unset=SYCL_DEVICE_FILTER --unset=ONEAPI_DEVICE_SELECTOR sycl-ls --verbose >%t.default.out

‎sycl/test-e2e/Adapters/sycl-ls-gpu-level-zero.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
// REQUIRES: gpu, level_zero
2+
// REQUIRES: build-and-run-mode
23

34
// RUN: sycl-ls --verbose >%t.default.out
45
// RUN: FileCheck %s --check-prefixes=CHECK-GPU-BUILTIN,CHECK-GPU-CUSTOM --input-file %t.default.out

‎sycl/test-e2e/Adapters/sycl-ls-gpu-opencl.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
// REQUIRES: gpu, opencl
2+
// REQUIRES: build-and-run-mode
23

34
// RUN: env ONEAPI_DEVICE_SELECTOR="opencl:*" sycl-ls --verbose >%t.opencl.out
45
// RUN: FileCheck %s --check-prefixes=CHECK-GPU-BUILTIN,CHECK-GPU-CUSTOM --input-file %t.opencl.out

‎sycl/test-e2e/Adapters/sycl-ls-uuid-subdevs.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
/* Test to check that sycl-ls is outputting UUID and number of sub and sub-sub
2+
// REQUIRES: build-and-run-mode
23
* devices. */
34
// REQUIRES: gpu, level_zero
45

0 commit comments

Comments
 (0)