Skip to content

Commit 1346c62

Browse files
committed
Merge remote-tracking branch 'origin/sycl' into khr-default-context
2 parents 384cb69 + e4d65e0 commit 1346c62

File tree

1,244 files changed

+276204
-5209
lines changed

Some content is hidden

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

1,244 files changed

+276204
-5209
lines changed

.github/workflows/coverity.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ permissions: read-all
88

99
jobs:
1010
coverity:
11+
if: github.repository == 'intel/llvm'
1112
name: Coverity
1213
runs-on: [Linux, build]
1314
container:
@@ -52,7 +53,7 @@ jobs:
5253
run: $GITHUB_WORKSPACE/cov-analysis-linux64-*/bin/cov-build --dir cov-int cmake --build $GITHUB_WORKSPACE/build
5354

5455
- name: Compress results
55-
run: tar -czf intel_llvm.tgz cov-int
56+
run: tar -I pigz -cf intel_llvm.tgz cov-int
5657

5758
- name: Submit build
5859
run: |

.github/workflows/sycl-detect-changes.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,8 @@ jobs:
7272
- 'sycl/include/sycl/ext/oneapi/experimental/invoke_simd.hpp'
7373
- 'sycl/include/sycl/ext/oneapi/experimental/detail/invoke_simd_types.hpp'
7474
- 'sycl/test-e2e/(ESIMD|InvokeSimd)/**'
75+
ur:
76+
- 'unified-runtime/**'
7577
7678
- name: Set output
7779
id: result
@@ -84,7 +86,7 @@ jobs:
8486
return '${{ steps.changes.outputs.changes }}';
8587
}
8688
// Treat everything as changed for huge PRs.
87-
return ["llvm", "llvm_spirv", "clang", "sycl_jit", "xptifw", "libclc", "sycl", "ci", "esimd"];
89+
return ["llvm", "llvm_spirv", "clang", "sycl_jit", "xptifw", "libclc", "sycl", "ci", "esimd", "ur"];
8890
8991
- run: echo '${{ steps.result.outputs.result }}'
9092

.github/workflows/sycl-linux-build.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -279,6 +279,7 @@ jobs:
279279
target_devices: all
280280
binaries_artifact: ${{ inputs.e2e_binaries_artifact }}
281281
cxx_compiler: $GITHUB_WORKSPACE/toolchain/bin/clang++
282+
extra_lit_opts: --param sycl_build_targets="spir;nvidia;amd"
282283

283284
- name: Remove E2E tests before spirv-backend run
284285
if: ${{ inputs.e2e_binaries_artifact && always() && !cancelled() && steps.build.conclusion == 'success' }}

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

Lines changed: 23 additions & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -51,30 +51,8 @@ jobs:
5151
changes: ${{ needs.detect_changes.outputs.filters }}
5252
e2e_binaries_artifact: sycl_e2e_bin_default
5353

54-
determine_arc_tests:
55-
name: Decide which Arc tests to run
56-
needs: [build, detect_changes]
57-
if: ${{ always() && !cancelled() && needs.build.outputs.build_conclusion == 'success' }}
58-
runs-on: [Linux, aux-tasks]
59-
timeout-minutes: 3
60-
outputs:
61-
arc_tests: ${{ steps.arc_tests.outputs.arc_tests }}
62-
steps:
63-
- name: Determine Arc tests
64-
id: arc_tests
65-
run: |
66-
if [ "${{ contains(needs.detect_changes.outputs.filters, 'devigccfg') }}" == "true" ]; then
67-
echo 'arc_tests="(ESIMD|InvokeSimd|Matrix)/"' >> "$GITHUB_OUTPUT"
68-
elif [ "${{ contains(needs.detect_changes.outputs.filters, 'drivers') }}" == "true" ]; then
69-
echo 'arc_tests=""' >> "$GITHUB_OUTPUT"
70-
elif [ "${{ contains(needs.detect_changes.outputs.filters, 'esimd') }}" == "true" ]; then
71-
echo 'arc_tests="(ESIMD|InvokeSimd|Matrix)/"' >> "$GITHUB_OUTPUT"
72-
else
73-
echo 'arc_tests="Matrix/"' >> "$GITHUB_OUTPUT"
74-
fi
75-
7654
run_prebuilt_e2e_tests:
77-
needs: [build, detect_changes, determine_arc_tests]
55+
needs: [build, detect_changes]
7856
if: ${{ always() && !cancelled() && needs.build.outputs.build_conclusion == 'success' }}
7957
strategy:
8058
fail-fast: false
@@ -86,13 +64,34 @@ jobs:
8664
target_devices: level_zero:gpu;opencl:gpu;opencl:cpu
8765
reset_intel_gpu: true
8866
extra_lit_opts: --param gpu-intel-gen12=True
67+
- name: NVIDIA/CUDA
68+
runner: '["Linux", "cuda"]'
69+
image_options: -u 1001 --gpus all --cap-add SYS_ADMIN
70+
target_devices: cuda:gpu
71+
- name: AMD/HIP
72+
runner: '["Linux", "amdgpu"]'
73+
image_options: -u 1001 --device=/dev/dri --device=/dev/kfd
74+
target_devices: hip:gpu
75+
reset_intel_gpu: false
8976
- name: Intel Arc A-Series Graphics
9077
runner: '["Linux", "arc"]'
9178
image_options: -u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN
9279
target_devices: level_zero:gpu;opencl:gpu
9380
reset_intel_gpu: true
9481
extra_lit_opts: --param matrix-xmx8=True
95-
env: '{"LIT_FILTER":${{ needs.determine_arc_tests.outputs.arc_tests }} }'
82+
- name: E2E tests with dev igc on Intel Arc A-Series Graphics
83+
runner: '["Linux", "arc"]'
84+
image: ghcr.io/intel/llvm/ubuntu2404_intel_drivers:devigc
85+
image_options: -u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN
86+
target_devices: level_zero:gpu;opencl:gpu
87+
reset_intel_gpu: true
88+
extra_lit_opts: --param matrix-xmx8=True
89+
use_igc_dev: true
90+
- name: E2E tests on Intel Ponte Vecchio GPU
91+
runner: '["Linux", "pvc"]'
92+
image_options: -u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN
93+
target_devices: level_zero:gpu;opencl:gpu
94+
extra_lit_opts: -j 50
9695
- name: Dev IGC on Intel Ponte Vecchio GPU
9796
runner: '["Linux", "pvc"]'
9897
image: ghcr.io/intel/llvm/ubuntu2404_intel_drivers:devigc
@@ -136,69 +135,6 @@ jobs:
136135
# Run only if the PR does not have the 'ci-no-devigc' label.
137136
skip_run: ${{matrix.use_igc_dev && contains(github.event.pull_request.labels.*.name, 'ci-no-devigc') || 'false'}}
138137

139-
test:
140-
needs: [build, detect_changes, determine_arc_tests]
141-
if: ${{ always() && !cancelled() && needs.build.outputs.build_conclusion == 'success' }}
142-
strategy:
143-
fail-fast: false
144-
matrix:
145-
include:
146-
- name: NVIDIA/CUDA
147-
runner: '["Linux", "cuda"]'
148-
image_options: -u 1001 --gpus all --cap-add SYS_ADMIN
149-
target_devices: cuda:gpu
150-
- name: AMD/HIP
151-
runner: '["Linux", "amdgpu"]'
152-
image_options: -u 1001 --device=/dev/dri --device=/dev/kfd
153-
target_devices: hip:gpu
154-
reset_intel_gpu: false
155-
- name: E2E tests with dev igc on Intel Arc A-Series Graphics
156-
runner: '["Linux", "arc"]'
157-
image: ghcr.io/intel/llvm/ubuntu2404_intel_drivers:devigc
158-
image_options: -u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN
159-
target_devices: level_zero:gpu;opencl:gpu
160-
reset_intel_gpu: true
161-
extra_lit_opts: --param matrix-xmx8=True
162-
env: '{"LIT_FILTER":${{ needs.determine_arc_tests.outputs.arc_tests }} }'
163-
use_igc_dev: true
164-
- name: E2E tests on Intel Ponte Vecchio GPU
165-
runner: '["Linux", "pvc"]'
166-
image_options: -u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN
167-
target_devices: level_zero:gpu;opencl:gpu
168-
extra_lit_opts: -j 50
169-
170-
uses: ./.github/workflows/sycl-linux-run-tests.yml
171-
with:
172-
name: ${{ matrix.name }}
173-
runner: ${{ matrix. runner }}
174-
image: ${{ matrix.image }}
175-
image_options: ${{ matrix.image_options }}
176-
target_devices: ${{ matrix.target_devices }}
177-
reset_intel_gpu: ${{ matrix.reset_intel_gpu }}
178-
extra_lit_opts: ${{ matrix.extra_lit_opts }}
179-
env: ${{ matrix.env || '{}' }}
180-
181-
# Do not install drivers on AMD and CUDA runners.
182-
install_igc_driver: >-
183-
${{ !contains(matrix.target_devices, 'cuda') &&
184-
!contains(matrix.target_devices, 'hip') &&
185-
contains(needs.detect_changes.outputs.filters, 'drivers') }}
186-
install_dev_igc_driver: >-
187-
${{ !contains(matrix.target_devices, 'cuda') &&
188-
!contains(matrix.target_devices, 'hip') &&
189-
matrix.use_igc_dev &&
190-
(contains(needs.detect_changes.outputs.filters, 'devigccfg') || contains(needs.detect_changes.outputs.filters, 'drivers')) ||
191-
'false' }}
192-
# Run only if the PR does not have the 'ci-no-devigc' label.
193-
skip_run: ${{matrix.use_igc_dev && contains(github.event.pull_request.labels.*.name, 'ci-no-devigc') || 'false'}}
194-
195-
ref: ${{ github.sha }}
196-
197-
sycl_toolchain_artifact: sycl_linux_default
198-
sycl_toolchain_archive: ${{ needs.build.outputs.artifact_archive_name }}
199-
sycl_toolchain_decompress_command: ${{ needs.build.outputs.artifact_decompress_command }}
200-
201-
202138
test-perf:
203139
needs: [build, detect_changes]
204140
if: |

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

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,16 @@ on:
3838
ref:
3939
type: string
4040
required: True
41+
devops_ref:
42+
type: string
43+
required: False
44+
description: |
45+
By default we checkout the devops directory from "inputs.ref" branch.
46+
devops_ref may be specified to checkout the devops dir from different
47+
branch.
48+
Note: it doesn't affect ./devops/actions/run-tests/* as these actions
49+
call checkout again and therefore override the devops directory, so
50+
configs/dependecies from input.ref are used.
4151
4252
sycl_toolchain_artifact:
4353
type: string
@@ -197,7 +207,7 @@ jobs:
197207
sudo bash -c 'echo 1 > /sys/kernel/debug/dri/0/i915_wedged'
198208
- uses: actions/checkout@v4
199209
with:
200-
ref: ${{ inputs.ref }}
210+
ref: ${{ inputs.devops_ref || inputs.ref }}
201211
sparse-checkout: |
202212
devops
203213
- name: Register cleanup after job is finished

.github/workflows/sycl-nightly.yml

Lines changed: 32 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -60,46 +60,68 @@ jobs:
6060
runner: '["Linux", "amdgpu"]'
6161
image_options: -u 1001 --device=/dev/dri --device=/dev/kfd
6262
target_devices: hip:gpu
63-
tests_selector: e2e
6463

65-
- name: Intel L0 GPU
64+
- name: NVIDIA/CUDA
65+
runner: '["Linux", "cuda"]'
66+
image_options: -u 1001 --gpus all --cap-add SYS_ADMIN
67+
target_devices: cuda:gpu
68+
69+
- name: Intel L0 Gen12 GPU
6670
runner: '["Linux", "gen12"]'
6771
image_options: -u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN
6872
target_devices: level_zero:gpu
6973
reset_intel_gpu: true
70-
tests_selector: e2e
7174

72-
- name: Intel OCL GPU
75+
- name: Intel L0 Ponte Vecchio GPU
76+
runner: '["Linux", "pvc"]'
77+
image_options: -u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN
78+
target_devices: level_zero:gpu
79+
80+
- name: Intel L0 Battlemage GPU
81+
runner: '["Linux", "bmg"]'
82+
image_options: -u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN
83+
target_devices: level_zero:gpu
84+
85+
- name: Intel L0 Arc A-Series GPU
86+
runner: '["Linux", "arc"]'
87+
image_options: -u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN
88+
target_devices: level_zero:gpu
89+
reset_intel_gpu: true
90+
91+
- name: Intel OCL Gen12 GPU
7392
runner: '["Linux", "gen12"]'
7493
image_options: -u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN
7594
target_devices: opencl:gpu
7695
reset_intel_gpu: true
77-
tests_selector: e2e
7896

7997
- name: OCL CPU (AMD)
80-
runner: '["Linux", "amdgpu"]'
98+
runner: '["Linux", "amdcpu"]'
8199
image_options: -u 1001
82100
target_devices: opencl:cpu
83-
tests_selector: e2e
84101

85102
- name: OCL CPU (Intel/GEN12)
86103
runner: '["Linux", "gen12"]'
87104
image_options: -u 1001 --privileged --cap-add SYS_ADMIN
88105
target_devices: opencl:cpu
89-
tests_selector: e2e
90106

91107
- name: OCL CPU (Intel/Arc)
92108
runner: '["Linux", "arc"]'
93109
image_options: -u 1001
94110
target_devices: opencl:cpu
95-
tests_selector: e2e
111+
112+
- name: Preview mode on SPR/PVC
113+
runner: '["Linux", "pvc"]'
114+
image_options: -u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN
115+
target_devices: level_zero:gpu
116+
extra_lit_opts: --param test-preview-mode=True
117+
96118
uses: ./.github/workflows/sycl-linux-run-tests.yml
97119
with:
98120
name: ${{ matrix.name }}
99121
runner: ${{ matrix.runner }}
100122
image_options: ${{ matrix.image_options }}
101123
target_devices: ${{ matrix.target_devices }}
102-
tests_selector: ${{ matrix.tests_selector }}
124+
tests_selector: e2e
103125
extra_lit_opts: "--param 'cxx_flags=-D_GLIBCXX_USE_CXX11_ABI=0' ${{ matrix.extra_lit_opts }}"
104126
reset_intel_gpu: ${{ matrix.reset_intel_gpu }}
105127
ref: ${{ github.sha }}

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

Lines changed: 51 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ jobs:
1212
# since the last run. More precisely, it checks if the last commit is older
1313
# than 24h. That means the previous Nightly already tested this commit.
1414
check_for_new_commits:
15+
if: github.repository == 'intel/llvm'
1516
runs-on: ubuntu-latest
1617
name: Check for new commits
1718
outputs:
@@ -79,18 +80,6 @@ jobs:
7980
image_options: -u 1001 --privileged --cap-add SYS_ADMIN
8081
target_devices: opencl:cpu
8182
tests_selector: e2e
82-
83-
- name: SYCL-CTS on OCL CPU
84-
runner: '["Linux", "gen12"]'
85-
image_options: -u 1001 --device=/dev/dri --privileged --cap-add SYS_ADMIN
86-
target_devices: opencl:cpu
87-
tests_selector: cts
88-
89-
- name: SYCL-CTS on L0 gen12
90-
runner: '["Linux", "gen12"]'
91-
image_options: -u 1001 --device=/dev/dri --privileged --cap-add SYS_ADMIN
92-
target_devices: level_zero:gpu
93-
tests_selector: cts
9483
uses: ./.github/workflows/sycl-linux-run-tests.yml
9584
with:
9685
name: ${{ matrix.name }}
@@ -101,6 +90,7 @@ jobs:
10190
extra_lit_opts: ${{ matrix.extra_lit_opts }}
10291
reset_intel_gpu: ${{ matrix.reset_intel_gpu }}
10392
ref: sycl-rel-6_0_0
93+
devops_ref: sycl
10494
sycl_toolchain_artifact: sycl_linux_default
10595
sycl_toolchain_archive: ${{ needs.ubuntu2204_build.outputs.artifact_archive_name }}
10696
sycl_toolchain_decompress_command: ${{ needs.ubuntu2204_build.outputs.artifact_decompress_command }}
@@ -130,6 +120,7 @@ jobs:
130120
sycl_toolchain_archive: ${{ needs.build-win.outputs.artifact_archive_name }}
131121
extra_lit_opts: --param gpu-intel-gen12=True
132122
ref: sycl-rel-6_0_0
123+
devops_ref: sycl
133124

134125
cuda-aws-start:
135126
needs: [ubuntu2204_build]
@@ -151,6 +142,7 @@ jobs:
151142
image_options: -u 1001 --gpus all --cap-add SYS_ADMIN --env NVIDIA_DISABLE_REQUIRE=1
152143
target_devices: cuda:gpu
153144
ref: sycl-rel-6_0_0
145+
devops_ref: sycl
154146

155147
sycl_toolchain_artifact: sycl_linux_default
156148
sycl_toolchain_archive: ${{ needs.ubuntu2204_build.outputs.artifact_archive_name }}
@@ -164,3 +156,50 @@ jobs:
164156
with:
165157
mode: stop
166158
ref: sycl-rel-6_0_0
159+
160+
build-sycl-cts:
161+
needs: ubuntu2204_build
162+
if: ${{ always() && !cancelled() && needs.ubuntu2204_build.outputs.build_conclusion == 'success' }}
163+
uses: ./.github/workflows/sycl-linux-run-tests.yml
164+
with:
165+
name: Build SYCL-CTS
166+
runner: '["Linux", "build"]'
167+
cts_testing_mode: 'build-only'
168+
image_options: -u 1001 --device=/dev/dri --privileged --cap-add SYS_ADMIN
169+
tests_selector: cts
170+
ref: sycl-rel-6_0_0
171+
devops_ref: sycl
172+
sycl_toolchain_artifact: sycl_linux_default
173+
sycl_toolchain_archive: ${{ needs.ubuntu2204_build.outputs.artifact_archive_name }}
174+
sycl_toolchain_decompress_command: ${{ needs.ubuntu2204_build.outputs.artifact_decompress_command }}
175+
176+
run-sycl-cts:
177+
needs: [ubuntu2204_build, build-sycl-cts]
178+
if: ${{ always() && !cancelled() && needs.ubuntu2204_build.outputs.build_conclusion == 'success' }}
179+
strategy:
180+
fail-fast: false
181+
matrix:
182+
include:
183+
- name: SYCL-CTS on OCL CPU
184+
runner: '["Linux", "gen12"]'
185+
image_options: -u 1001 --device=/dev/dri --privileged --cap-add SYS_ADMIN
186+
target_devices: opencl:cpu
187+
188+
- name: SYCL-CTS on L0 gen12
189+
runner: '["Linux", "gen12"]'
190+
image_options: -u 1001 --device=/dev/dri --privileged --cap-add SYS_ADMIN
191+
target_devices: level_zero:gpu
192+
uses: ./.github/workflows/sycl-linux-run-tests.yml
193+
with:
194+
name: ${{ matrix.name }}
195+
runner: ${{ matrix.runner }}
196+
cts_testing_mode: 'run-only'
197+
image_options: ${{ matrix.image_options }}
198+
target_devices: ${{ matrix.target_devices }}
199+
tests_selector: cts
200+
ref: ${{ github.sha }}
201+
devops_ref: sycl
202+
sycl_toolchain_artifact: sycl_linux_default
203+
sycl_toolchain_archive: ${{ needs.ubuntu2204_build.outputs.artifact_archive_name }}
204+
sycl_toolchain_decompress_command: ${{ needs.ubuntu2204_build.outputs.artifact_decompress_command }}
205+
sycl_cts_artifact: sycl_cts_bin

.github/workflows/sycl-windows-build.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,6 @@ jobs:
9090
with:
9191
sparse-checkout: |
9292
devops/actions
93-
ref: ${{ inputs.ref || github.sha }}
9493
- uses: ilammy/msvc-dev-cmd@0b201ec74fa43914dc39ae48a89fd1d8cb592756
9594
with:
9695
arch: amd64

0 commit comments

Comments
 (0)