Skip to content

Commit 729973e

Browse files
authored
Merge branch 'sycl' into commonhpp_reference_calculation_change
2 parents 5278dc4 + 5dc9b12 commit 729973e

File tree

329 files changed

+8363
-5910
lines changed

Some content is hidden

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

329 files changed

+8363
-5910
lines changed

.ci/metrics/requirements.lock.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -267,9 +267,9 @@ typing-extensions==4.12.2 \
267267
--hash=sha256:04e5ca0351e0f3f85c6853954072df659d0d13fac324d0072316b67d7794700d \
268268
--hash=sha256:1a7ead55c7e559dd4dee8856e3a88b41225abfe1ce8df57b7c13915fe121ffb8
269269
# via pygithub
270-
urllib3==2.2.3 \
271-
--hash=sha256:ca899ca043dcb1bafa3e262d73aa25c465bfb49e0bd9dd5d59f1d0acba2f8fac \
272-
--hash=sha256:e7d814a81dad81e6caf2ec9fdedb284ecc9c73076b62654547cc64ccdcae26e9
270+
urllib3==2.5.0 \
271+
--hash=sha256:3fc47733c7e419d4bc3f6b3dc2b4f890bb743906a30d56ba4a5bfa4bbff92760 \
272+
--hash=sha256:e6b01673c0fa6a13e374b50871808eb3bf7046c4b125b216f6bf1cc604cff0dc
273273
# via
274274
# pygithub
275275
# requests

.github/CODEOWNERS

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -163,10 +163,8 @@ libdevice/nativecpu* @intel/dpcpp-nativecpu-reviewers
163163

164164
# SYCL-Graphs extensions
165165
sycl/include/sycl/ext/oneapi/experimental/graph.hpp @intel/sycl-graphs-reviewers
166-
sycl/source/detail/graph_impl.cpp @intel/sycl-graphs-reviewers
167-
sycl/source/detail/graph_impl.hpp @intel/sycl-graphs-reviewers
168-
sycl/source/detail/graph_memory_pool.hpp @intel/sycl-graphs-reviewers
169-
sycl/source/detail/graph_memory_pool.cpp @intel/sycl-graphs-reviewers
166+
sycl/include/sycl/ext/oneapi/experimental/graph @intel/sycl-graphs-reviewers
167+
sycl/source/detail/graph @intel/sycl-graphs-reviewers
170168
sycl/unittests/Extensions/CommandGraph/ @intel/sycl-graphs-reviewers
171169
sycl/test-e2e/Graph @intel/sycl-graphs-reviewers
172170
sycl/doc/design/CommandGraph.md @intel/sycl-graphs-reviewers

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

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,6 @@ on:
4040
required: True
4141
description: |
4242
Commit SHA or branch to checkout the intel/llvm repo.
43-
devops_ref:
44-
type: string
45-
required: False
46-
description: |
47-
Commit SHA or branch to checkout the devops directory.
4843
tests_ref:
4944
type: string
5045
required: False
@@ -217,9 +212,9 @@ jobs:
217212
steps:
218213
- uses: actions/checkout@v4
219214
with:
220-
ref: ${{ inputs.devops_ref || inputs.repo_ref }}
221215
sparse-checkout: |
222216
devops
217+
sycl/cts_exclude_filter
223218
- name: Register cleanup after job is finished
224219
uses: ./devops/actions/cleanup
225220
- name: Reset Intel GPU
@@ -326,7 +321,6 @@ jobs:
326321
timeout-minutes: 35
327322
with:
328323
ref: ${{ inputs.tests_ref || 'main' }}
329-
cts_exclude_ref: ${{ inputs.repo_ref }}
330324
extra_cmake_args: ${{ inputs.extra_cmake_args }}
331325
cts_testing_mode: ${{ inputs.cts_testing_mode }}
332326
sycl_cts_artifact: ${{ inputs.sycl_cts_artifact }}
Lines changed: 5 additions & 233 deletions
Original file line numberDiff line numberDiff line change
@@ -1,241 +1,13 @@
1+
# The actual version of this workflow can be found on the latest sycl-rel-*
2+
# branch. This file is still needed to launch the workflow on another branches.
3+
14
name: SYCL Release Branch Nightly
25

36
on:
47
workflow_dispatch:
5-
inputs:
6-
testing_branch:
7-
description: |
8-
Branch to test, e.g. sycl-rel-6_0_0.
9-
If nothing is specified, the last release branch is used.
10-
11-
schedule:
12-
- cron: '0 3 * * *'
13-
14-
permissions: read-all
158

169
jobs:
17-
# To avoid unnecessary scheduled runs this job checks if there are new commits
18-
# since the last run. More precisely, it checks if the last commit is older
19-
# than 24h. That means the previous Nightly already tested this commit.
20-
check_for_new_commits:
21-
if: github.repository == 'intel/llvm'
10+
dummy:
2211
runs-on: ubuntu-latest
23-
name: Check for new commits
24-
outputs:
25-
is_new_commit: ${{ steps.is_new_commit.outputs.is_new_commit }}
2612
steps:
27-
- uses: actions/checkout@v4
28-
with:
29-
ref: ${{ inputs.testing_branch || 'sycl-rel-6_2' }}
30-
- run: git show --quiet | tee -a $GITHUB_STEP_SUMMARY
31-
32-
- id: is_new_commit
33-
if: ${{ github.event_name == 'schedule' }}
34-
run: |
35-
if [ -z "$(git rev-list --after="24 hours" HEAD)" ]; then
36-
echo "is_new_commit=false" >> $GITHUB_OUTPUT
37-
fi
38-
39-
ubuntu2204_build:
40-
needs: [check_for_new_commits]
41-
if: ${{ github.repository == 'intel/llvm' && needs.check_for_new_commits.outputs.is_new_commit != 'false' }}
42-
uses: ./.github/workflows/sycl-linux-build.yml
43-
secrets: inherit
44-
with:
45-
build_cache_root: "/__w/"
46-
build_artifact_suffix: default
47-
build_configure_extra_args: '--disable-jit --no-assertions --add_security_flags=sanitize --hip --cuda'
48-
build_image: ghcr.io/intel/llvm/ubuntu2204_build:latest
49-
build_ref: ${{ inputs.testing_branch || 'sycl-rel-6_2' }}
50-
pack_release: 'true'
51-
52-
# We upload the build for people to download/use, override its name and
53-
# prefer widespread gzip compression.
54-
artifact_archive_name: sycl_linux.tar.gz
55-
56-
ubuntu2204_test:
57-
needs: [ubuntu2204_build]
58-
if: ${{ always() && !cancelled() && needs.ubuntu2204_build.outputs.build_conclusion == 'success' }}
59-
strategy:
60-
fail-fast: false
61-
matrix:
62-
include:
63-
- name: AMD/HIP
64-
runner: '["Linux", "amdgpu"]'
65-
image_options: -u 1001 --device=/dev/dri --device=/dev/kfd
66-
target_devices: hip:gpu
67-
68-
- name: Intel L0 Gen12 GPU
69-
runner: '["Linux", "gen12"]'
70-
image_options: -u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN
71-
target_devices: level_zero:gpu
72-
extra_lit_opts: --param gpu-intel-gen12=True
73-
74-
- name: Intel L0 Battlemage GPU
75-
runner: '["Linux", "bmg"]'
76-
image_options: -u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN
77-
target_devices: level_zero:gpu
78-
79-
- name: Intel OCL Gen12 GPU
80-
runner: '["Linux", "gen12"]'
81-
image_options: -u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN
82-
target_devices: opencl:gpu
83-
extra_lit_opts: --param gpu-intel-gen12=True
84-
85-
- name: Intel OCL CPU
86-
runner: '["Linux", "gen12"]'
87-
image_options: -u 1001 --privileged --cap-add SYS_ADMIN
88-
target_devices: opencl:cpu
89-
uses: ./.github/workflows/sycl-linux-run-tests.yml
90-
with:
91-
name: ${{ matrix.name }}
92-
runner: ${{ matrix.runner }}
93-
image_options: ${{ matrix.image_options }}
94-
target_devices: ${{ matrix.target_devices }}
95-
tests_selector: e2e
96-
extra_lit_opts: ${{ matrix.extra_lit_opts }}
97-
repo_ref: ${{ inputs.testing_branch || 'sycl-rel-6_2' }}
98-
devops_ref: sycl
99-
sycl_toolchain_artifact: sycl_linux_default
100-
sycl_toolchain_archive: ${{ needs.ubuntu2204_build.outputs.artifact_archive_name }}
101-
sycl_toolchain_decompress_command: ${{ needs.ubuntu2204_build.outputs.artifact_decompress_command }}
102-
103-
build-win:
104-
needs: [check_for_new_commits]
105-
if: ${{ github.repository == 'intel/llvm' && needs.check_for_new_commits.outputs.is_new_commit != 'false' }}
106-
uses: ./.github/workflows/sycl-windows-build.yml
107-
with:
108-
ref: ${{ inputs.testing_branch || 'sycl-rel-6_2' }}
109-
build_configure_extra_args: '--disable-jit --no-assertions --add_security_flags=sanitize'
110-
pack_release: 'true'
111-
112-
# We upload both Linux/Windows build via Github's "Releases"
113-
# functionality, make sure Linux/Windows names follow the same pattern.
114-
artifact_archive_name: sycl_windows.tar.gz
115-
116-
e2e-win:
117-
needs: build-win
118-
# Continue if build was successful.
119-
if: |
120-
always()
121-
&& !cancelled()
122-
&& needs.build-win.outputs.build_conclusion == 'success'
123-
strategy:
124-
fail-fast: false
125-
matrix:
126-
include:
127-
- name: Intel GEN12 Graphics with Level Zero
128-
runner: '["Windows","gen12"]'
129-
# 6_1_0 doesn't support the auto-detection, keep it until 6_2_0.
130-
extra_lit_opts: --param gpu-intel-gen12=True
131-
- name: Intel Battlemage Graphics with Level Zero
132-
runner: '["Windows","bmg"]'
133-
uses: ./.github/workflows/sycl-windows-run-tests.yml
134-
with:
135-
name: ${{ matrix.name }}
136-
runner: ${{ matrix.runner }}
137-
target_devices: level_zero:gpu
138-
sycl_toolchain_archive: ${{ needs.build-win.outputs.artifact_archive_name }}
139-
extra_lit_opts: ${{ matrix.extra_lit_opts }}
140-
repo_ref: ${{ inputs.testing_branch || 'sycl-rel-6_2' }}
141-
devops_ref: sycl
142-
143-
cuda-aws-start:
144-
needs: [ubuntu2204_build]
145-
if: ${{ always() && !cancelled() && needs.ubuntu2204_build.outputs.build_conclusion == 'success' }}
146-
uses: ./.github/workflows/sycl-aws.yml
147-
secrets: inherit
148-
with:
149-
mode: start
150-
ref: ${{ inputs.testing_branch || 'sycl-rel-6_2' }}
151-
152-
cuda-run-tests:
153-
needs: [ubuntu2204_build, cuda-aws-start]
154-
if: ${{ always() && !cancelled() && needs.ubuntu2204_build.outputs.build_conclusion == 'success' }}
155-
uses: ./.github/workflows/sycl-linux-run-tests.yml
156-
with:
157-
name: CUDA E2E
158-
runner: '["aws_cuda-${{ github.run_id }}-${{ github.run_attempt }}"]'
159-
image: ghcr.io/intel/llvm/ubuntu2204_build:latest
160-
image_options: -u 1001 --gpus all --cap-add SYS_ADMIN --env NVIDIA_DISABLE_REQUIRE=1
161-
target_devices: cuda:gpu
162-
repo_ref: ${{ inputs.testing_branch || 'sycl-rel-6_2' }}
163-
devops_ref: sycl
164-
165-
sycl_toolchain_artifact: sycl_linux_default
166-
sycl_toolchain_archive: ${{ needs.ubuntu2204_build.outputs.artifact_archive_name }}
167-
sycl_toolchain_decompress_command: ${{ needs.ubuntu2204_build.outputs.artifact_decompress_command }}
168-
169-
cuda-aws-stop:
170-
needs: [cuda-aws-start, cuda-run-tests]
171-
if: always() && ${{ needs.cuda-aws-start.result != 'skipped' }}
172-
uses: ./.github/workflows/sycl-aws.yml
173-
secrets: inherit
174-
with:
175-
mode: stop
176-
ref: ${{ inputs.testing_branch || 'sycl-rel-6_2' }}
177-
178-
build-sycl-cts:
179-
needs: ubuntu2204_build
180-
if: ${{ always() && !cancelled() && needs.ubuntu2204_build.outputs.build_conclusion == 'success' }}
181-
uses: ./.github/workflows/sycl-linux-run-tests.yml
182-
with:
183-
name: Build SYCL-CTS
184-
runner: '["Linux", "build"]'
185-
cts_testing_mode: 'build-only'
186-
image_options: -u 1001 --device=/dev/dri --privileged --cap-add SYS_ADMIN
187-
tests_selector: cts
188-
repo_ref: ${{ inputs.testing_branch || 'sycl-rel-6_2' }}
189-
devops_ref: sycl
190-
tests_ref: 87f8677c4b67cfe56ad6f09246036f10c306c977
191-
sycl_toolchain_artifact: sycl_linux_default
192-
sycl_toolchain_archive: ${{ needs.ubuntu2204_build.outputs.artifact_archive_name }}
193-
sycl_toolchain_decompress_command: ${{ needs.ubuntu2204_build.outputs.artifact_decompress_command }}
194-
sycl_cts_artifact: sycl_cts_bin_linux
195-
196-
run-sycl-cts:
197-
needs: [ubuntu2204_build, build-sycl-cts]
198-
if: ${{ always() && !cancelled() && needs.ubuntu2204_build.outputs.build_conclusion == 'success' }}
199-
strategy:
200-
fail-fast: false
201-
matrix:
202-
include:
203-
- name: SYCL-CTS on OCL CPU
204-
runner: '["Linux", "gen12"]'
205-
image_options: -u 1001 --device=/dev/dri --privileged --cap-add SYS_ADMIN
206-
target_devices: opencl:cpu
207-
208-
- name: SYCL-CTS on L0 gen12
209-
runner: '["Linux", "gen12"]'
210-
image_options: -u 1001 --device=/dev/dri --privileged --cap-add SYS_ADMIN
211-
target_devices: level_zero:gpu
212-
uses: ./.github/workflows/sycl-linux-run-tests.yml
213-
with:
214-
name: ${{ matrix.name }}
215-
runner: ${{ matrix.runner }}
216-
cts_testing_mode: 'run-only'
217-
image_options: ${{ matrix.image_options }}
218-
target_devices: ${{ matrix.target_devices }}
219-
tests_selector: cts
220-
repo_ref: ${{ inputs.testing_branch || 'sycl-rel-6_2' }}
221-
devops_ref: sycl
222-
sycl_toolchain_artifact: sycl_linux_default
223-
sycl_toolchain_archive: ${{ needs.ubuntu2204_build.outputs.artifact_archive_name }}
224-
sycl_toolchain_decompress_command: ${{ needs.ubuntu2204_build.outputs.artifact_decompress_command }}
225-
sycl_cts_artifact: sycl_cts_bin_linux
226-
227-
hardening-check:
228-
needs: [ubuntu2204_build, build-win]
229-
if: |
230-
always()
231-
&& !cancelled()
232-
&& needs.ubuntu2204_build.outputs.build_conclusion == 'success'
233-
&& needs.build-win.outputs.build_conclusion == 'success'
234-
uses: ./.github/workflows/sycl-hardening-check.yml
235-
with:
236-
sycl_linux_artifact: sycl_linux_release
237-
sycl_linux_archive: ${{ needs.ubuntu2204_build.outputs.artifact_archive_name }}
238-
sycl_linux_decompress_command: ${{ needs.ubuntu2204_build.outputs.artifact_decompress_command }}
239-
240-
sycl_windows_artifact: sycl_windows_release
241-
sycl_windows_archive: ${{ needs.build-win.outputs.artifact_archive_name }}
13+
- run: echo "Doing nothing"

.github/workflows/sycl-ur-perf-benchmarking.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,6 @@ jobs:
133133
benchmark_save_name: ${{ matrix.save_name }}
134134
benchmark_preset: ${{ inputs.preset }}
135135
repo_ref: ${{ matrix.ref }}
136-
devops_ref: ${{ github.ref }}
137136
sycl_toolchain_artifact: sycl_linux_prod_noassert
138137
sycl_toolchain_archive: ${{ needs.build_sycl.outputs.artifact_archive_name }}
139138
sycl_toolchain_decompress_command: ${{ needs.build_sycl.outputs.artifact_decompress_command }}

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

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,6 @@ on:
3434
required: False
3535
description: |
3636
Commit SHA or branch to checkout the intel/llvm repo.
37-
devops_ref:
38-
type: string
39-
required: False
40-
description: |
41-
Commit SHA or branch to checkout the devops directory.
4237
tests_ref:
4338
type: string
4439
required: False
@@ -111,7 +106,7 @@ jobs:
111106
with:
112107
sparse-checkout: |
113108
devops/actions
114-
ref: ${{ inputs.devops_ref|| inputs.repo_ref || github.sha }}
109+
sycl/cts_exclude_filter
115110
- uses: ilammy/msvc-dev-cmd@0b201ec74fa43914dc39ae48a89fd1d8cb592756
116111
with:
117112
arch: amd64
@@ -171,7 +166,6 @@ jobs:
171166
uses: ./devops/actions/run-tests/windows/cts
172167
with:
173168
ref: ${{ inputs.tests_ref || 'main' }}
174-
cts_exclude_ref: ${{ inputs.repo_ref }}
175169
extra_cmake_args: ${{ inputs.extra_cmake_args }}
176170
cts_testing_mode: ${{ inputs.cts_testing_mode }}
177171
sycl_cts_artifact: ${{ inputs.sycl_cts_artifact }}

clang/include/clang/Basic/DiagnosticDriverKinds.td

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ def err_drv_no_sycl_libspirv : Error<
127127
def warn_flag_no_sycl_libspirv
128128
: Warning<"'-fno-sycl-libspirv' should not be used with target '%0'; "
129129
"libspirv is required for correct behavior">,
130-
InGroup<NoLibspirvHipCuda>;
130+
InGroup<UnsafeLibspirvNotLinked>;
131131
def err_drv_mix_cuda_hip : Error<
132132
"mixed CUDA and HIP compilation is not supported">;
133133
def err_drv_bad_target_id : Error<

clang/include/clang/Basic/DiagnosticGroups.td

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1607,9 +1607,9 @@ def CudaUnknownVersion: DiagGroup<"unknown-cuda-version">;
16071607
// ignored by CUDA.
16081608
def HIPOnly : DiagGroup<"hip-only">;
16091609

1610-
// A warning generated when compiling SYCL applications for HIP or CUDA backends
1611-
// without linking LIBSPIRV.
1612-
def NoLibspirvHipCuda : DiagGroup<"no-libspirv-hip-cuda">;
1610+
// A warning generated when compiling SYCL applications without linking LIBSPIRV
1611+
// for targets that require it.
1612+
def UnsafeLibspirvNotLinked : DiagGroup<"unsafe-libspirv-not-linked">;
16131613

16141614
// Warning about mixed HIP and OpenMP compilation / target offloading.
16151615
def HIPOpenMPOffloading: DiagGroup<"hip-omp-target-directives">;

clang/include/clang/Driver/Options.td

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7091,19 +7091,22 @@ def fsycl_dead_args_optimization : Flag<["-"], "fsycl-dead-args-optimization">,
70917091
def fno_sycl_dead_args_optimization : Flag<["-"], "fno-sycl-dead-args-optimization">,
70927092
HelpText<"Disables elimination of DPC++ dead kernel arguments">;
70937093
def fsycl_device_lib_EQ : CommaJoined<["-"], "fsycl-device-lib=">,
7094-
Flags<[NoXarchOption]>,
7094+
Flags<[Deprecated]>,
70957095
Values<"libc,libm-fp32,libm-fp64,libimf-fp32,libimf-fp64,libimf-bf16,all">,
70967096
HelpText<"Control inclusion of device libraries into device binary linkage. "
70977097
"Valid arguments are libc, libm-fp32, libm-fp64, libimf-fp32, "
7098-
"libimf-fp64, libimf-bf16, all">;
7098+
"libimf-fp64, libimf-bf16, all. (deprecated)">;
70997099
def fno_sycl_device_lib_EQ : CommaJoined<["-"], "fno-sycl-device-lib=">,
7100-
Flags<[NoXarchOption]>, Values<"libc, libm-fp32, libm-fp64, all">,
7100+
Flags<[Deprecated]>,
7101+
Values<"libc, libm-fp32, libm-fp64, all">,
71017102
HelpText<"Control exclusion of device libraries from device binary linkage. "
7102-
"Valid arguments are libc, libm-fp32, libm-fp64, all">;
7103+
"Valid arguments are libc, libm-fp32, libm-fp64, all. (deprecated)">;
71037104
def fsycl_device_lib_jit_link : Flag<["-"], "fsycl-device-lib-jit-link">,
7104-
HelpText<"Enables sycl device library jit link (experimental)">;
7105+
Flags<[Deprecated]>,
7106+
HelpText<"Enables sycl device library jit link. (deprecated)">;
71057107
def fno_sycl_device_lib_jit_link : Flag<["-"], "fno-sycl-device-lib-jit-link">,
7106-
HelpText<"Disables sycl device library jit link (experimental)">;
7108+
Flags<[Deprecated]>,
7109+
HelpText<"Disables sycl device library jit link. (deprecated)">;
71077110
def fsycl_fp32_prec_sqrt : Flag<["-"], "fsycl-fp32-prec-sqrt">,
71087111
Alias<foffload_fp32_prec_sqrt>, Flags<[Deprecated]>,
71097112
Visibility<[ClangOption, CC1Option]>, HelpText<"SYCL only. Specify that "

0 commit comments

Comments
 (0)