Skip to content

Commit 6347c9c

Browse files
committed
Merge remote-tracking branch 'origin/sycl' into run-barriers-with-o0
2 parents 71bdb3f + c8ec91f commit 6347c9c

File tree

214 files changed

+3026
-2588
lines changed

Some content is hidden

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

214 files changed

+3026
-2588
lines changed

.github/CODEOWNERS

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -178,12 +178,6 @@ sycl/doc/design/CommandGraph.md @intel/sycl-graphs-reviewers
178178
sycl/doc/extensions/**/sycl_ext_oneapi_graph.asciidoc @intel/sycl-graphs-reviewers
179179
sycl/doc/syclgraph/ @intel/sycl-graphs-reviewers
180180

181-
# syclcompat library
182-
sycl/**/syclcompat/ @intel/syclcompat-lib-reviewers
183-
sycl/cmake/modules/AddSYCLLibraryUnitTest.cmake @intel/syclcompat-lib-reviewers
184-
sycl/include/syclcompat.hpp @intel/syclcompat-lib-reviewers
185-
sycl/test-e2e/syclcompat/ @intel/syclcompat-lib-reviewers
186-
187181
# bindless images
188182
sycl/doc/extensions/experimental/sycl_ext_oneapi_bindless_images.asciidoc @intel/bindless-images-reviewers
189183
sycl/include/sycl/ext/oneapi/bindless* @intel/bindless-images-reviewers

.github/workflows/sycl-docs.yml

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,24 @@ on:
1010
- '.github/workflows/sycl-docs.yml'
1111
- 'clang/docs/**'
1212
- 'sycl/doc/**'
13+
- 'devops/benchmarks/scripts/html/**'
1314
push:
1415
branches:
1516
- sycl
1617
paths:
1718
- '.github/workflows/sycl-docs.yml'
1819
- 'clang/docs/**'
1920
- 'sycl/doc/**'
21+
- 'devops/benchmarks/scripts/html/**'
22+
workflow_dispatch:
23+
inputs:
24+
update_gh_pages:
25+
type: choice
26+
description: Update Github Pages
27+
options:
28+
- true
29+
- false
30+
default: true
2031

2132
permissions:
2233
contents: read
@@ -62,5 +73,5 @@ jobs:
6273
with:
6374
path: ./install_docs
6475
- name: Deploy to GitHub Pages
65-
if: ${{ github.event_name == 'push' }}
76+
if: ${{ github.event_name == 'push' || inputs.update_gh_pages == 'true' }}
6677
uses: actions/deploy-pages@v4

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -100,14 +100,14 @@ jobs:
100100
echo FILTER_6_2="$(grep -v '^#\|^\W*$' devops/compat_ci_exclude.sycl-rel-6_2 | paste -sd '|')" >> $GITHUB_OUTPUT
101101
echo FILTER_6_3="$(grep -v '^#\|^\W*$' devops/compat_ci_exclude.sycl-rel-6_3 | paste -sd '|')" >> $GITHUB_OUTPUT
102102
103-
run_prebuilt_e2e_tests:
103+
E2E:
104104
needs: [build, detect_changes, compat_read_exclude]
105105
if: ${{ always() && !cancelled() && needs.build.outputs.build_conclusion == 'success' }}
106106
strategy:
107107
fail-fast: false
108108
matrix:
109109
include:
110-
- name: GEN 12 Integrated
110+
- name: Intel / GEN 12 Integrated
111111
runner: '["Linux", "gen12"]'
112112
target_devices: level_zero:gpu;opencl:gpu;opencl:cpu
113113
- name: NVIDIA/CUDA
@@ -119,39 +119,39 @@ jobs:
119119
image_options: -u 1001 --device=/dev/dri --device=/dev/kfd
120120
target_devices: hip:gpu
121121
extra_lit_opts: -j 1
122-
- name: Intel Arc A-Series Graphics
122+
- name: Intel / Arc A-Series Graphics
123123
runner: '["Linux", "arc"]'
124124
target_devices: level_zero:gpu;opencl:gpu;level_zero_v2:gpu
125-
- name: Dev IGC / Intel Arc A-Series Graphics
125+
- name: Intel Dev IGC / Arc A-Series Graphics
126126
runner: '["Linux", "arc"]'
127127
image: ghcr.io/intel/llvm/ubuntu2404_intel_drivers:devigc
128128
target_devices: level_zero:gpu
129129
use_igc_dev: true
130130
env: '{"LIT_FILTER":"Matrix/"}'
131-
- name: Intel Ponte Vecchio GPU
131+
- name: Intel / Ponte Vecchio GPU
132132
runner: '["Linux", "pvc"]'
133133
target_devices: level_zero:gpu;opencl:gpu;level_zero_v2:gpu
134-
- name: Dev IGC / Intel Ponte Vecchio GPU
134+
- name: Intel Dev IGC / Ponte Vecchio GPU
135135
runner: '["Linux", "pvc"]'
136136
image: ghcr.io/intel/llvm/ubuntu2404_intel_drivers:devigc
137137
target_devices: level_zero:gpu
138138
use_igc_dev: true
139139
env: '{"LIT_FILTER":"Matrix/"}'
140-
- name: Intel Battlemage Graphics
140+
- name: Intel / Battlemage Graphics
141141
runner: '["Linux", "bmg"]'
142142
target_devices: level_zero_v1:gpu;level_zero_v2:gpu
143143
- name: Preview Mode
144144
runner: '["Linux", "gen12"]'
145145
target_devices: level_zero:gpu;opencl:gpu;opencl:cpu
146146
extra_lit_opts: --param test-preview-mode=True
147147
e2e_binaries_artifact: e2e_bin_preview
148-
- name: ABI compatibility against sycl-rel-6_2
148+
- name: ABI compatibility / sycl-rel-6_2
149149
runner: '["Linux", "pvc"]'
150150
image: ghcr.io/intel/llvm/sycl_prebuilt_tests:sycl-rel-6_2
151151
target_devices: level_zero:gpu
152152
extra_lit_opts: '--param test-preview-mode=False --filter-out "${{ needs.compat_read_exclude.outputs.FILTER_6_2 }}"'
153153
e2e_binaries_artifact: 'in-container'
154-
- name: ABI compatibility against sycl-rel-6_3
154+
- name: ABI compatibility / sycl-rel-6_3
155155
runner: '["Linux", "pvc"]'
156156
image: ghcr.io/intel/llvm/sycl_prebuilt_tests:sycl-rel-6_3
157157
target_devices: level_zero:gpu

.github/workflows/sycl-nightly.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -332,20 +332,30 @@ jobs:
332332
toolchain_artifact_filename: ${{ needs.build-win.outputs.toolchain_artifact_filename }}
333333
sycl_cts_artifact: sycl_cts_bin_win
334334

335+
# Verification example:
336+
# cosign-windows-amd64.exe verify-blob sycl_linux.tar.gz \
337+
# --bundle sycl_linux.tar.gz.sigstore.json \
338+
# --certificate-oidc-issuer https://token.actions.githubusercontent.com \
339+
# --certificate-identity https://github.com/intel/llvm/.github/workflows/sycl-nightly.yml@refs/heads/sycl
335340
nightly_build_upload:
336341
name: Nightly Build Upload
337342
if: ${{ github.ref_name == 'sycl' }}
338343
needs: [ubuntu2204_build, build-win]
339344
runs-on: ubuntu-latest
340345
permissions:
341346
contents: write
347+
id-token: write
342348
steps:
343349
- uses: actions/download-artifact@v4
344350
with:
345351
name: sycl_linux_default
346352
- uses: actions/download-artifact@v4
347353
with:
348354
name: sycl_windows_default
355+
- name: Sign with sigstore/cosign
356+
uses: sigstore/[email protected]
357+
with:
358+
inputs: sycl_linux.tar.gz sycl_windows.tar.gz
349359
- name: Compute tag
350360
id: tag
351361
run: |
@@ -361,6 +371,8 @@ jobs:
361371
files: |
362372
sycl_linux.tar.gz
363373
sycl_windows.tar.gz
374+
sycl_linux.tar.gz.sigstore.json
375+
sycl_windows.tar.gz.sigstore.json
364376
tag_name: nightly-${{ steps.tag.outputs.TAG }}
365377
name: DPC++ daily ${{ steps.tag.outputs.TAG }}
366378
prerelease: true

clang/lib/Driver/ToolChains/Clang.cpp

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11387,6 +11387,23 @@ void LinkerWrapper::ConstructJob(Compilation &C, const JobAction &JA,
1138711387
CmdArgs.push_back(
1138811388
Args.MakeArgString("--sycl-post-link-options=" + PostLinkOptString));
1138911389

11390+
if (Args.hasArg(options::OPT_fsycl_remove_unused_external_funcs))
11391+
CmdArgs.push_back(
11392+
Args.MakeArgString("-sycl-remove-unused-external-funcs"));
11393+
if (Args.hasArg(options::OPT_fno_sycl_remove_unused_external_funcs))
11394+
CmdArgs.push_back(
11395+
Args.MakeArgString("-no-sycl-remove-unused-external-funcs"));
11396+
if (Args.hasArg(options::OPT_fsycl_device_code_split_esimd))
11397+
CmdArgs.push_back(Args.MakeArgString("-sycl-device-code-split-esimd"));
11398+
if (Args.hasArg(options::OPT_fno_sycl_device_code_split_esimd))
11399+
CmdArgs.push_back(Args.MakeArgString("-no-sycl-device-code-split-esimd"));
11400+
if (Args.hasArg(options::OPT_fsycl_add_default_spec_consts_image))
11401+
CmdArgs.push_back(
11402+
Args.MakeArgString("-sycl-add-default-spec-consts-image"));
11403+
if (Args.hasArg(options::OPT_fno_sycl_add_default_spec_consts_image))
11404+
CmdArgs.push_back(
11405+
Args.MakeArgString("-no-sycl-add-default-spec-consts-image"));
11406+
1139011407
// --llvm-spirv-options="options" provides a string of options to be passed
1139111408
// along to the llvm-spirv (translation) step during device link.
1139211409
SmallString<128> OptString;

clang/test/Driver/sycl-add-default-spec-consts-image-old-model.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
// RUN: %clang -### -fsycl --no-offload-new-driver -fsycl-add-default-spec-consts-image -fsycl-targets=spir64_gen 2>&1 %s | FileCheck %s -check-prefix=CHECK-AOT
1414
// RUN: %clang -### -fsycl --no-offload-new-driver -fsycl-add-default-spec-consts-image -fsycl-targets=spir64_x86_64 2>&1 %s | FileCheck %s -check-prefix=CHECK-AOT
1515
// RUN: %clang -### -fsycl --no-offload-new-driver -fsycl-add-default-spec-consts-image -fsycl-targets=intel_gpu_pvc 2>&1 %s | FileCheck %s -check-prefix=CHECK-AOT
16-
// RUN: %clang -### -fsycl --no-offload-new-driver -fsycl-add-default-spec-consts-image -fsycl-targets=nvidia_gpu_sm_90 -nocudalib 2>&1 %s | FileCheck %s -check-prefix=CHECK-AOT
16+
// RUN: %clang -### -fsycl --no-offload-new-driver -fsycl-add-default-spec-consts-image -fsycl-targets=nvidia_gpu_sm_90 -fno-sycl-libspirv -nocudalib 2>&1 %s | FileCheck %s -check-prefix=CHECK-AOT
1717
// RUN: %clang -### -fsycl --no-offload-new-driver -fsycl-add-default-spec-consts-image -fsycl-targets=amd_gpu_gfx1034 -fno-sycl-libspirv -nogpulib 2>&1 %s | FileCheck %s -check-prefix=CHECK-AOT
1818
// CHECK-AOT-NOT: warning: -fsycl-add-default-spec-consts-image flag has an effect only in Ahead of Time Compilation mode (AOT)
1919
// CHECK-AOT: {{.*}}sycl-post-link{{.*}} "-generate-device-image-default-spec-consts"

0 commit comments

Comments
 (0)