Skip to content

Commit 955e800

Browse files
aelovikov-intelaelovikov-intel
committed
[CI] Simplify CI by using alldeps image whenever possible
First step on unifying our "base" image into a single "fat" container similarly to what's been done with nightly images at #16680.
1 parent deb3c1c commit 955e800

File tree

9 files changed

+13
-41
lines changed

9 files changed

+13
-41
lines changed

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

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,6 @@ jobs:
8282
include:
8383
- name: Intel
8484
runner: '["Linux", "gen12"]'
85-
image: ghcr.io/intel/llvm/ubuntu2404_intel_drivers:latest
8685
image_options: -u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN
8786
target_devices: level_zero:gpu;opencl:gpu;opencl:cpu
8887
reset_intel_gpu: true
@@ -91,7 +90,6 @@ jobs:
9190
with:
9291
name: ${{ matrix.name }}
9392
runner: ${{ matrix.runner }}
94-
image: ${{ matrix.image }}
9593
image_options: ${{ matrix.image_options }}
9694
target_devices: ${{ matrix.target_devices }}
9795
extra_lit_opts: --param fallback-to-build-if-requires-build-and-run=True ${{ matrix.extra_lit_opts }}
@@ -112,18 +110,15 @@ jobs:
112110
include:
113111
- name: NVIDIA/CUDA
114112
runner: '["Linux", "cuda"]'
115-
image: ghcr.io/intel/llvm/ubuntu2404_build:latest
116113
image_options: -u 1001 --gpus all --cap-add SYS_ADMIN
117114
target_devices: cuda:gpu
118115
- name: AMD/HIP
119116
runner: '["Linux", "amdgpu"]'
120-
image: ghcr.io/intel/llvm/ubuntu2404_build:latest
121117
image_options: -u 1001 --device=/dev/dri --device=/dev/kfd
122118
target_devices: hip:gpu
123119
reset_intel_gpu: false
124120
- name: E2E tests on Intel Arc A-Series Graphics
125121
runner: '["Linux", "arc"]'
126-
image: ghcr.io/intel/llvm/ubuntu2404_intel_drivers:latest
127122
image_options: -u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN
128123
target_devices: level_zero:gpu;opencl:gpu
129124
reset_intel_gpu: true
@@ -140,7 +135,6 @@ jobs:
140135
use_igc_dev: true
141136
- name: E2E tests on Intel Ponte Vecchio GPU
142137
runner: '["Linux", "pvc"]'
143-
image: ghcr.io/intel/llvm/ubuntu2404_intel_drivers:latest
144138
image_options: -u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN
145139
target_devices: level_zero:gpu;opencl:gpu
146140
extra_lit_opts: -j 50
@@ -197,27 +191,22 @@ jobs:
197191
include:
198192
- name: Intel GEN12 Graphics system
199193
runner: '["Linux", "gen12"]'
200-
image: ghcr.io/intel/llvm/ubuntu2404_intel_drivers:latest
201194
image_extra_opts: --device=/dev/dri
202195
reset_intel_gpu: true
203196
- name: Intel Arc A-Series Graphics system
204197
runner: '["Linux", "arc"]'
205-
image: ghcr.io/intel/llvm/ubuntu2404_intel_drivers:latest
206198
image_extra_opts: --device=/dev/dri
207199
reset_intel_gpu: true
208200
- name: AMD system
209201
runner: '["Linux", "amdgpu"]'
210-
image: ghcr.io/intel/llvm/ubuntu2404_build:latest
211202
image_extra_opts: --device=/dev/dri --device=/dev/kfd
212203
- name: CUDA system
213204
runner: '["Linux", "cuda"]'
214-
image: ghcr.io/intel/llvm/ubuntu2404_build:latest
215205
image_extra_opts: --gpus all
216206
uses: ./.github/workflows/sycl-linux-run-tests.yml
217207
with:
218208
name: Perf tests on ${{ matrix.name }}
219209
runner: ${{ matrix. runner }}
220-
image: ${{ matrix.image }}
221210
image_options: -u 1001 --privileged --cap-add SYS_ADMIN ${{ matrix.image_extra_opts }}
222211
target_devices: all
223212
reset_intel_gpu: ${{ matrix.reset_intel_gpu }}

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

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ on:
1212
required: True
1313
image:
1414
type: string
15-
required: True
15+
default: 'ghcr.io/intel/llvm/ubuntu2404_intel_drivers:alldeps'
16+
required: False
1617
image_options:
1718
type: string
1819
required: True
@@ -114,25 +115,29 @@ on:
114115
- '["Linux", "pvc"]'
115116
- '["cts-cpu"]'
116117
- '["Linux", "build"]'
118+
- '["cuda"]'
117119
image:
118120
type: choice
119121
options:
120122
- 'ghcr.io/intel/llvm/sycl_ubuntu2404_nightly:latest'
123+
- 'ghcr.io/intel/llvm/ubuntu2404_intel_drivers:alldeps'
121124
image_options:
122125
description: |
123126
Use option with "--device=/dev/kfd" for AMDGPU, without it for the rest.
124127
type: choice
125128
options:
126-
- '-u 1001 --device=/dev/dri --privileged --cap-add SYS_ADMIN'
127129
- '-u 1001 --device=/dev/dri --device=/dev/kfd --privileged --cap-add SYS_ADMIN'
130+
- '-u 1001 --device=/dev/dri --privileged --cap-add SYS_ADMIN'
131+
- '-u 1001 --gpus all --cap-add SYS_ADMIN'
128132
target_devices:
129133
type: choice
130134
options:
135+
- 'level_zero:gpu'
131136
- 'opencl:cpu'
132137
- 'opencl:gpu'
133138
- 'opencl:fpga'
134-
- 'level_zero:gpu'
135139
- 'hip:gpu'
140+
- 'cuda:gpu'
136141
tests_selector:
137142
type: choice
138143
options:

‎.github/workflows/sycl-nightly.yml

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -58,52 +58,45 @@ jobs:
5858
include:
5959
- name: AMD/HIP
6060
runner: '["Linux", "amdgpu"]'
61-
image: ghcr.io/intel/llvm/ubuntu2404_build:latest
6261
image_options: -u 1001 --device=/dev/dri --device=/dev/kfd
6362
target_devices: hip:gpu
6463
tests_selector: e2e
6564

6665
- name: Intel L0 GPU
6766
runner: '["Linux", "gen12"]'
68-
image: ghcr.io/intel/llvm/ubuntu2404_intel_drivers:latest
6967
image_options: -u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN
7068
target_devices: level_zero:gpu
7169
reset_intel_gpu: true
7270
tests_selector: e2e
7371

7472
- name: Intel OCL GPU
7573
runner: '["Linux", "gen12"]'
76-
image: ghcr.io/intel/llvm/ubuntu2404_intel_drivers:latest
7774
image_options: -u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN
7875
target_devices: opencl:gpu
7976
reset_intel_gpu: true
8077
tests_selector: e2e
8178

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

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

9691
- name: OCL CPU (Intel/Arc)
9792
runner: '["Linux", "arc"]'
98-
image: ghcr.io/intel/llvm/ubuntu2404_intel_drivers:latest
9993
image_options: -u 1001
10094
target_devices: opencl:cpu
10195
tests_selector: e2e
10296
uses: ./.github/workflows/sycl-linux-run-tests.yml
10397
with:
10498
name: ${{ matrix.name }}
10599
runner: ${{ matrix.runner }}
106-
image: ${{ matrix.image }}
107100
image_options: ${{ matrix.image_options }}
108101
target_devices: ${{ matrix.target_devices }}
109102
tests_selector: ${{ matrix.tests_selector }}
@@ -123,7 +116,6 @@ jobs:
123116
runner: '["Linux", "pvc"]'
124117
target_devices: level_zero:gpu
125118
extra_lit_opts: -j 50
126-
image: ghcr.io/intel/llvm/ubuntu2404_intel_drivers:latest
127119
image_options: -u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN
128120
ref: ${{ github.sha }}
129121
sycl_toolchain_artifact: sycl_linux_oneapi
@@ -167,7 +159,6 @@ jobs:
167159
with:
168160
name: CUDA E2E
169161
runner: '["aws_cuda-${{ github.run_id }}-${{ github.run_attempt }}"]'
170-
image: ghcr.io/intel/llvm/ubuntu2204_build:latest
171162
image_options: -u 1001 --gpus all --cap-add SYS_ADMIN --env NVIDIA_DISABLE_REQUIRE=1
172163
target_devices: cuda:gpu
173164
ref: ${{ github.sha }}
@@ -192,7 +183,6 @@ jobs:
192183
name: Build SYCL-CTS
193184
runner: '["Linux", "build"]'
194185
cts_testing_mode: 'build-only'
195-
image: ghcr.io/intel/llvm/ubuntu2404_intel_drivers:latest
196186
image_options: -u 1001 --device=/dev/dri --privileged --cap-add SYS_ADMIN
197187
tests_selector: cts
198188
ref: ${{ github.sha }}
@@ -209,21 +199,18 @@ jobs:
209199
include:
210200
- name: SYCL-CTS on OCL CPU
211201
runner: '["Linux", "gen12"]'
212-
image: ghcr.io/intel/llvm/ubuntu2404_intel_drivers:latest
213202
image_options: -u 1001 --device=/dev/dri --privileged --cap-add SYS_ADMIN
214203
target_devices: opencl:cpu
215204

216205
- name: SYCL-CTS on L0 gen12
217206
runner: '["Linux", "gen12"]'
218-
image: ghcr.io/intel/llvm/ubuntu2404_intel_drivers:latest
219207
image_options: -u 1001 --device=/dev/dri --privileged --cap-add SYS_ADMIN
220208
target_devices: level_zero:gpu
221209
uses: ./.github/workflows/sycl-linux-run-tests.yml
222210
with:
223211
name: ${{ matrix.name }}
224212
runner: ${{ matrix.runner }}
225213
cts_testing_mode: 'run-only'
226-
image: ${{ matrix.image }}
227214
image_options: ${{ matrix.image_options }}
228215
target_devices: ${{ matrix.target_devices }}
229216
tests_selector: cts

‎.github/workflows/sycl-post-commit.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ jobs:
5454
reset_intel_gpu: true
5555
- name: AMD/HIP
5656
runner: '["Linux", "amdgpu"]'
57-
image: ghcr.io/intel/llvm/ubuntu2404_build:latest
5857
image_options: -u 1001 --device=/dev/dri --device=/dev/kfd
5958
target_devices: hip:gpu
6059
reset_intel_gpu: false
@@ -80,7 +79,6 @@ jobs:
8079
with:
8180
name: ${{ matrix.name }}
8281
runner: ${{ matrix. runner }}
83-
image: ${{ matrix.image || 'ghcr.io/intel/llvm/ubuntu2404_intel_drivers:latest' }}
8482
image_options: ${{ matrix.image_options || '-u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN' }}
8583
target_devices: ${{ matrix.target_devices || 'level_zero:gpu' }}
8684
reset_intel_gpu: ${{ matrix.reset_intel_gpu }}

‎.github/workflows/sycl-rel-nightly.yml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -54,14 +54,12 @@ jobs:
5454
include:
5555
- name: AMD/HIP
5656
runner: '["Linux", "amdgpu"]'
57-
image: ghcr.io/intel/llvm/ubuntu2404_build:latest
5857
image_options: -u 1001 --device=/dev/dri --device=/dev/kfd
5958
target_devices: hip:gpu
6059
tests_selector: e2e
6160

6261
- name: Intel L0 GPU
6362
runner: '["Linux", "gen12"]'
64-
image: ghcr.io/intel/llvm/ubuntu2404_intel_drivers:latest
6563
image_options: -u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN
6664
target_devices: level_zero:gpu
6765
reset_intel_gpu: true
@@ -70,7 +68,6 @@ jobs:
7068

7169
- name: Intel OCL GPU
7270
runner: '["Linux", "gen12"]'
73-
image: ghcr.io/intel/llvm/ubuntu2404_intel_drivers:latest
7471
image_options: -u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN
7572
target_devices: opencl:gpu
7673
reset_intel_gpu: true
@@ -79,29 +76,25 @@ jobs:
7976

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

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

9489
- name: SYCL-CTS on L0 gen12
9590
runner: '["Linux", "gen12"]'
96-
image: ghcr.io/intel/llvm/ubuntu2404_intel_drivers:latest
9791
image_options: -u 1001 --device=/dev/dri --privileged --cap-add SYS_ADMIN
9892
target_devices: level_zero:gpu
9993
tests_selector: cts
10094
uses: ./.github/workflows/sycl-linux-run-tests.yml
10195
with:
10296
name: ${{ matrix.name }}
10397
runner: ${{ matrix.runner }}
104-
image: ${{ matrix.image }}
10598
image_options: ${{ matrix.image_options }}
10699
target_devices: ${{ matrix.target_devices }}
107100
tests_selector: ${{ matrix.tests_selector }}

‎.github/workflows/sycl-weekly.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,21 +46,18 @@ jobs:
4646
include:
4747
- name: SYCL-CTS on OCL CPU PVC w/ LLVM SPIR-V Backend
4848
runner: '["Linux", "pvc"]'
49-
image: ghcr.io/intel/llvm/ubuntu2404_intel_drivers:latest
5049
image_options: -u 1001 --device=/dev/dri --privileged --cap-add SYS_ADMIN
5150
target_devices: opencl:cpu
5251

5352
- name: SYCL-CTS on L0 GPU PVC w/ LLVM SPIR-V Backend
5453
runner: '["Linux", "pvc"]'
55-
image: ghcr.io/intel/llvm/ubuntu2404_intel_drivers:latest
5654
image_options: -u 1001 --device=/dev/dri --privileged --cap-add SYS_ADMIN
5755
target_devices: level_zero:gpu
5856
uses: ./.github/workflows/sycl-linux-run-tests.yml
5957
with:
6058
name: ${{ matrix.name }}
6159
runner: ${{ matrix.runner }}
6260
cts_testing_mode: 'run-only'
63-
image: ${{ matrix.image }}
6461
image_options: ${{ matrix.image_options }}
6562
target_devices: ${{ matrix.target_devices }}
6663
tests_selector: cts

‎sycl/test-e2e/DeprecatedFeatures/opencl_interop.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// REQUIRES: opencl, opencl_icd
1+
// REQUIRES: opencl, opencl_icd, target-spir
22

33
// RUN: %{build} -D__SYCL_INTERNAL_API -o %t.out %opencl_lib
44
// RUN: %{run} %t.out

‎sycl/test-e2e/KernelCompiler/kernel_compiler_spirv.cpp

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

9-
// REQUIRES: ocloc
9+
// REQUIRES: ocloc, target-spir
1010

1111
// RUN: %{build} -o %t.out
1212
// RUN: %{run} %t.out %S/Kernels/kernels.spv %S/Kernels/kernels_fp16.spv %S/Kernels/kernels_fp64.spv

‎sycl/test-e2e/Regression/device_num.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
// UNSUPPORTED: any-device-is-hip
2+
// UNSUPPORTED-TRACKER: https://github.com/intel/llvm/issues/16805
3+
14
// RUN: %{build} -o %t.out
25
// RUN: env PRINT_FULL_DEVICE_INFO=1 %{run-unfiltered-devices} %t.out > %t1.conf
36
// RUN: env ONEAPI_DEVICE_SELECTOR="*:0" env TEST_DEV_CONFIG_FILE_NAME=%t1.conf %{run-unfiltered-devices} %t.out

0 commit comments

Comments
 (0)