Skip to content

Commit 075fe28

Browse files
uditagarwal97uditagarwal97
authored
[CI] Drop support ext_oneapi_[level_zero|cuda|hip] in sycl_devices LIT parameter (#16508)
Instead of `ext_oneapi_[level_zero|cuda|hip]`, we should use `level_zero/cuda/hip` backend name in LIT, which is in alignment with `ONEAPI_DEVICE_SELECTOR` terminology and `sycl-ls` output.
1 parent 2ca2f20 commit 075fe28

8 files changed

+18
-20
lines changed

‎.github/workflows/sycl-linux-matrix-e2e-on-nightly.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
runner: '["Linux", "amdgpu"]'
2424
image: ghcr.io/intel/llvm/sycl_ubuntu2204_nightly:build
2525
image_options: -u 1001 --device=/dev/dri --device=/dev/kfd
26-
target_devices: ext_oneapi_hip:gpu
26+
target_devices: hip:gpu
2727

2828
- name: Intel L0 GPU
2929
runner: '["Linux", "gen12"]'
@@ -49,7 +49,7 @@ jobs:
4949
runner: '["Linux", "cuda"]'
5050
image: ghcr.io/intel/llvm/sycl_ubuntu2204_nightly:build
5151
image_options: -u 1001 --gpus all --cap-add SYS_ADMIN
52-
target_devices: ext_oneapi_cuda:gpu
52+
target_devices: cuda:gpu
5353
uses: ./.github/workflows/sycl-linux-run-tests.yml
5454
with:
5555
name: ${{ matrix.name }}
@@ -79,7 +79,7 @@ jobs:
7979
runner: '["aws-cuda_${{ github.run_id }}-${{ github.run_attempt }}"]'
8080
image: ghcr.io/intel/llvm/sycl_ubuntu2204_nightly:build
8181
image_options: -u 1001 --gpus all --cap-add SYS_ADMIN
82-
target_devices: ext_oneapi_cuda:gpu
82+
target_devices: cuda:gpu
8383
env: ${{ inputs.env }}
8484
ref: ${{ github.sha }}
8585
merge_ref: ''

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ jobs:
6868
runner: '["aws_cuda-${{ github.event.workflow_run.id }}-${{ github.event.workflow_run.run_attempt }}"]'
6969
image: ghcr.io/intel/llvm/ubuntu2204_build:latest
7070
image_options: -u 1001 --gpus all --cap-add SYS_ADMIN --env NVIDIA_DISABLE_REQUIRE=1
71-
target_devices: ext_oneapi_cuda:gpu
71+
target_devices: cuda:gpu
7272
# No idea why but that seems to work and be in sync with the main
7373
# pre-commit workflow.
7474
ref: ${{ github.event.workflow_run.referenced_workflows[0].sha }}

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

+6-6
Original file line numberDiff line numberDiff line change
@@ -130,12 +130,12 @@ jobs:
130130
runner: '["Linux", "cuda"]'
131131
image: ghcr.io/intel/llvm/ubuntu2404_build:latest
132132
image_options: -u 1001 --gpus all --cap-add SYS_ADMIN
133-
target_devices: ext_oneapi_cuda:gpu
133+
target_devices: cuda:gpu
134134
- name: AMD/HIP
135135
runner: '["Linux", "amdgpu"]'
136136
image: ghcr.io/intel/llvm/ubuntu2404_build:latest
137137
image_options: -u 1001 --device=/dev/dri --device=/dev/kfd
138-
target_devices: ext_oneapi_hip:gpu
138+
target_devices: hip:gpu
139139
reset_intel_gpu: false
140140
- name: E2E tests on Intel Arc A-Series Graphics
141141
runner: '["Linux", "arc"]'
@@ -168,12 +168,12 @@ jobs:
168168

169169
# Do not install drivers on AMD and CUDA runners.
170170
install_igc_driver: >-
171-
${{ !contains(matrix.target_devices, 'ext_oneapi_cuda') &&
172-
!contains(matrix.target_devices, 'ext_oneapi_hip') &&
171+
${{ !contains(matrix.target_devices, 'cuda') &&
172+
!contains(matrix.target_devices, 'hip') &&
173173
contains(needs.detect_changes.outputs.filters, 'drivers') }}
174174
install_dev_igc_driver: >-
175-
${{ !contains(matrix.target_devices, 'ext_oneapi_cuda') &&
176-
!contains(matrix.target_devices, 'ext_oneapi_hip') &&
175+
${{ !contains(matrix.target_devices, 'cuda') &&
176+
!contains(matrix.target_devices, 'hip') &&
177177
matrix.use_igc_dev &&
178178
(contains(needs.detect_changes.outputs.filters, 'devigccfg') || contains(needs.detect_changes.outputs.filters, 'drivers')) ||
179179
'false' }}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ on:
147147
- 'opencl:gpu'
148148
- 'opencl:fpga'
149149
- 'level_zero:gpu'
150-
- 'ext_oneapi_hip:gpu'
150+
- 'hip:gpu'
151151
tests_selector:
152152
type: choice
153153
options:

‎.github/workflows/sycl-nightly.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848
runner: '["Linux", "amdgpu"]'
4949
image: ghcr.io/intel/llvm/ubuntu2404_build:latest
5050
image_options: -u 1001 --device=/dev/dri --device=/dev/kfd
51-
target_devices: ext_oneapi_hip:gpu
51+
target_devices: hip:gpu
5252
tests_selector: e2e
5353

5454
- name: Intel L0 GPU
@@ -145,7 +145,7 @@ jobs:
145145
runner: '["aws_cuda-${{ github.run_id }}-${{ github.run_attempt }}"]'
146146
image: ghcr.io/intel/llvm/ubuntu2204_build:latest
147147
image_options: -u 1001 --gpus all --cap-add SYS_ADMIN --env NVIDIA_DISABLE_REQUIRE=1
148-
target_devices: ext_oneapi_cuda:gpu
148+
target_devices: cuda:gpu
149149
ref: ${{ github.sha }}
150150
merge_ref: ''
151151

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -58,21 +58,21 @@ jobs:
5858
runner: '["Linux", "amdgpu"]'
5959
image: ghcr.io/intel/llvm/ubuntu2404_build:latest
6060
image_options: -u 1001 --device=/dev/dri --device=/dev/kfd
61-
target_devices: ext_oneapi_hip:gpu
61+
target_devices: hip:gpu
6262
reset_intel_gpu: false
6363
- name: E2E tests on Intel Ponte Vecchio GPU
6464
runner: '["Linux", "pvc"]'
6565
env: '{"LIT_FILTER_OUT":"ESIMD/unified_memory_api/"}'
6666
image: ghcr.io/intel/llvm/ubuntu2404_intel_drivers:latest
6767
image_options: -u 1001 --device=/dev/dri --privileged --cap-add SYS_ADMIN
68-
target_devices: ext_oneapi_level_zero:gpu;opencl:gpu
68+
target_devices: level_zero:gpu;opencl:gpu
6969
extra_lit_opts: -j 50
7070
- name: E2E tests with dev igc on Intel Ponte Vecchio GPU
7171
runner: '["Linux", "pvc"]'
7272
env: '{"LIT_FILTER_OUT":"ESIMD/unified_memory_api/"}'
7373
image: ghcr.io/intel/llvm/ubuntu2404_intel_drivers:devigc
7474
image_options: -u 1001 --device=/dev/dri --privileged --cap-add SYS_ADMIN
75-
target_devices: ext_oneapi_level_zero:gpu;opencl:gpu
75+
target_devices: level_zero:gpu;opencl:gpu
7676
use_igc_dev: true
7777
extra_lit_opts: -j 50
7878
# Performance tests below. Specifics:

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
runner: '["Linux", "amdgpu"]'
5757
image: ghcr.io/intel/llvm/ubuntu2404_build:latest
5858
image_options: -u 1001 --device=/dev/dri --device=/dev/kfd
59-
target_devices: ext_oneapi_hip:gpu
59+
target_devices: hip:gpu
6060
tests_selector: e2e
6161

6262
- name: Intel L0 GPU
@@ -156,7 +156,7 @@ jobs:
156156
runner: '["aws_cuda-${{ github.run_id }}-${{ github.run_attempt }}"]'
157157
image: ghcr.io/intel/llvm/ubuntu2204_build:latest-0300ac924620a51f76c4929794637b82790f12ab
158158
image_options: -u 1001 --gpus all --cap-add SYS_ADMIN --env NVIDIA_DISABLE_REQUIRE=1
159-
target_devices: ext_oneapi_cuda:gpu
159+
target_devices: cuda:gpu
160160
ref: draft-sycl-rel-6_0_0
161161
merge_ref: ''
162162

‎sycl/test-e2e/lit.cfg.py

-2
Original file line numberDiff line numberDiff line change
@@ -473,8 +473,6 @@ def open_check_file(file_name):
473473
"Running on multiple devices, XFAIL-marked tests will be skipped on corresponding devices"
474474
)
475475

476-
config.sycl_devices = [x.replace("ext_oneapi_", "") for x in config.sycl_devices]
477-
478476
available_devices = {
479477
"opencl": ("cpu", "gpu", "fpga"),
480478
"cuda": "gpu",

0 commit comments

Comments
 (0)