Skip to content

Commit 3e3b33a

Browse files
[CI][SYCL] Cleanup post llvm-test-suite move (#8894)
* Rename the action * Remove test_ref param * Rename check_sycl_all -> targets in parameters
1 parent f5d9891 commit 3e3b33a

File tree

5 files changed

+18
-24
lines changed

5 files changed

+18
-24
lines changed

.github/workflows/sycl_linux_build_and_test.yml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ jobs:
182182
AWS_ACCESS_KEY: ${{ secrets.AWS_ACCESS_KEY }}
183183
AWS_SECRET_KEY: ${{ secrets.AWS_SECRET_KEY }}
184184

185-
llvm_test_suite:
185+
e2e-tests:
186186
needs: [build, aws-start]
187187
# Continue if build was successful. If aws-start is not successful all
188188
# AWS tasks will fail, but all non-AWS tasks should continue.
@@ -222,13 +222,12 @@ jobs:
222222
path: llvm
223223
ref: ${{ inputs.build_ref || github.ref }}
224224
# TODO should this action be packed into container as well?
225-
- uses: ./llvm/devops/actions/llvm_test_suite
226-
name: Run LLVM Test Suite
225+
- uses: ./llvm/devops/actions/e2e-tests
226+
name: Run SYCL End-to-End tests
227227
with:
228-
test_ref: ${{ inputs.lts_ref }}
229228
sycl_artifact: sycl_linux_${{ inputs.build_artifact_suffix }}
230229
sycl_archive: llvm_sycl.tar.xz
231-
check_sycl_all: ${{ matrix.check_sycl_all }}
230+
targets: ${{ matrix.targets }}
232231
cmake_args: '${{ matrix.cmake_args }} ${{ inputs.lts_cmake_extra_args }}'
233232

234233
khronos_sycl_cts:
@@ -279,7 +278,7 @@ jobs:
279278

280279
aws-stop:
281280
name: Stop AWS
282-
needs: [ aws-start, llvm_test_suite ]
281+
needs: [ aws-start, e2e-tests ]
283282
# Always attempt to shutdown AWS instance, even if AWS start was not
284283
# successful.
285284
if: ${{ always() && inputs.lts_aws_matrix != '[]' }}

.github/workflows/sycl_post_commit.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ on:
1616
workflow_dispatch:
1717

1818
jobs:
19-
# This job generates matrix of tests for LLVM Test Suite
19+
# This job generates matrix of tests for SYCL End-to-End tests
2020
test_matrix:
2121
name: Generate Test Matrix
2222
if: github.repository == 'intel/llvm'

.github/workflows/sycl_precommit.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
- name: Run clang-format
4343
uses: ./devops/actions/clang-format
4444

45-
# This job generates matrix of tests for LLVM Test Suite
45+
# This job generates matrix of tests for SYCL End-to-End tests
4646
test_matrix:
4747
name: Generate Test Matrix
4848
uses: ./.github/workflows/sycl_gen_test_matrix.yml

devops/actions/llvm_test_suite/action.yml renamed to devops/actions/e2e-tests/action.yml

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,14 @@
1-
name: 'Run llvm-test-suite testing'
2-
description: 'Run E2E SYCL tests from llvm-test-suite'
1+
name: 'Run SYCL End-to-End testing'
2+
description: 'Run SYCL End-to-End testing'
33
inputs:
4-
test_ref:
5-
description: 'commit-ish identifier for test repo'
6-
required: true
7-
default: 'intel'
84
sycl_artifact:
95
description: 'Name of the artifact, that contains compiler toolchain'
106
required: true
117
sycl_archive:
128
description: 'Name of SYCL toolchain archive file'
139
required: false
1410
default: 'llvm_sycl.tar.xz'
15-
check_sycl_all:
11+
targets:
1612
description: 'List of SYCL backends with set of target devices per each to be tested iteratively'
1713
required: true
1814
cmake_args:
@@ -41,8 +37,7 @@ runs:
4137
run: |
4238
echo "::group::CMake configuration"
4339
export PATH=$PWD/toolchain/bin/:$PATH
44-
# TODO: Rename check_sycl_all input
45-
cmake -GNinja -B./build-e2e -S./llvm/sycl/test-e2e -DSYCL_TEST_E2E_TARGETS="${{ inputs.check_sycl_all }}" -DCMAKE_CXX_COMPILER="$PWD/toolchain/bin/clang++" -DLLVM_LIT="$PWD/llvm/llvm/utils/lit/lit.py" ${{ inputs.cmake_args }}
40+
cmake -GNinja -B./build-e2e -S./llvm/sycl/test-e2e -DSYCL_TEST_E2E_TARGETS="${{ inputs.targets }}" -DCMAKE_CXX_COMPILER="$PWD/toolchain/bin/clang++" -DLLVM_LIT="$PWD/llvm/llvm/utils/lit/lit.py" ${{ inputs.cmake_args }}
4641
echo "::endgroup::"
4742
- name: Run testing
4843
shell: bash

devops/test_configs.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
],
1010
"image": "${{ inputs.intel_drivers_image }}",
1111
"container_options": "-u 1001 --device=/dev/dri --privileged --cap-add SYS_ADMIN",
12-
"check_sycl_all": "level_zero:gpu",
12+
"targets": "level_zero:gpu",
1313
"cmake_args": ""
1414
},
1515
{
@@ -21,7 +21,7 @@
2121
],
2222
"image": "${{ inputs.intel_drivers_image }}",
2323
"container_options": "-u 1001 --device=/dev/dri --privileged --cap-add SYS_ADMIN",
24-
"check_sycl_all": "opencl:gpu",
24+
"targets": "opencl:gpu",
2525
"cmake_args": ""
2626
},
2727
{
@@ -34,7 +34,7 @@
3434
],
3535
"image": "${{ inputs.intel_drivers_image }}",
3636
"container_options": "-u 1001",
37-
"check_sycl_all": "opencl:cpu",
37+
"targets": "opencl:cpu",
3838
"cmake_args": ""
3939
},
4040
{
@@ -47,7 +47,7 @@
4747
],
4848
"image": "${{ inputs.intel_drivers_image }}",
4949
"container_options": "-u 1001",
50-
"check_sycl_all": "ext_intel_esimd_emulator:gpu",
50+
"targets": "ext_intel_esimd_emulator:gpu",
5151
"cmake_args": ""
5252
},
5353
{
@@ -59,7 +59,7 @@
5959
],
6060
"image": "${{ inputs.amdgpu_image }}",
6161
"container_options": "--device=/dev/dri --device=/dev/kfd",
62-
"check_sycl_all": "hip:gpu",
62+
"targets": "hip:gpu",
6363
"cmake_args": "-DHIP_PLATFORM=\"AMD\" -DAMD_ARCH=\"gfx1031\""
6464
},
6565
{
@@ -71,7 +71,7 @@
7171
],
7272
"image": "${{ inputs.cuda_image }}",
7373
"container_options": "--gpus all",
74-
"check_sycl_all": "cuda:gpu",
74+
"targets": "cuda:gpu",
7575
"cmake_args": ""
7676
},
7777
{
@@ -87,7 +87,7 @@
8787
"aws-spot": "false",
8888
"image": "${{ inputs.cuda_image }}",
8989
"container_options": "--gpus all",
90-
"check_sycl_all": "cuda:gpu",
90+
"targets": "cuda:gpu",
9191
"cmake_args": ""
9292
}
9393
],

0 commit comments

Comments
 (0)