Skip to content

Commit 43f6fd3

Browse files
committed
Merge branch 'sycl' into llvmspirv_pulldown
2 parents 616728e + 44c34c1 commit 43f6fd3

File tree

392 files changed

+9107
-4465
lines changed

Some content is hidden

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

392 files changed

+9107
-4465
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,14 @@ jobs:
3030
image: ghcr.io/intel/llvm/sycl_ubuntu2204_nightly:latest
3131
image_options: -u 1001 --device=/dev/dri --privileged --cap-add SYS_ADMIN
3232
target_devices: level_zero:gpu
33-
reset_gpu: true
33+
reset_intel_gpu: true
3434

3535
- name: Intel OCL GPU
3636
runner: '["Linux", "gen12"]'
3737
image: ghcr.io/intel/llvm/sycl_ubuntu2204_nightly:latest
3838
image_options: -u 1001 --device=/dev/dri --privileged --cap-add SYS_ADMIN
3939
target_devices: opencl:gpu
40-
reset_gpu: true
40+
reset_intel_gpu: true
4141

4242
- name: OCL CPU
4343
runner: '["Linux", "x86-cpu"]'
@@ -57,7 +57,7 @@ jobs:
5757
image: ${{ matrix.image }}
5858
image_options: ${{ matrix.image_options }}
5959
target_devices: ${{ matrix.target_devices }}
60-
reset_gpu: ${{ matrix.reset_gpu }}
60+
reset_intel_gpu: ${{ matrix.reset_intel_gpu }}
6161
env: ${{ inputs.env }}
6262
ref: ${{ github.sha }}
6363
merge_ref: ''

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -86,15 +86,15 @@ jobs:
8686
image: ghcr.io/intel/llvm/ubuntu2204_intel_drivers:latest
8787
image_options: -u 1001 --device=/dev/dri --privileged --cap-add SYS_ADMIN
8888
target_devices: level_zero:gpu;opencl:gpu;opencl:cpu
89-
reset_gpu: true
89+
reset_intel_gpu: true
9090
install_drivers: ${{ contains(needs.detect_changes.outputs.filters, 'drivers') }}
9191
extra_lit_opts: --param gpu-intel-gen12=True
9292
- name: E2E tests on Intel Arc A-Series Graphics
9393
runner: '["Linux", "arc"]'
9494
image: ghcr.io/intel/llvm/ubuntu2204_intel_drivers:latest
9595
image_options: -u 1001 --device=/dev/dri --privileged --cap-add SYS_ADMIN
9696
target_devices: level_zero:gpu;opencl:gpu
97-
reset_gpu: true
97+
reset_intel_gpu: true
9898
install_drivers: ${{ contains(needs.detect_changes.outputs.filters, 'drivers') }}
9999
extra_lit_opts: --param matrix-xmx8=True --param gpu-intel-dg2=True
100100
env: '{"LIT_FILTER":${{ needs.determine_arc_tests.outputs.arc_tests }} }'
@@ -103,7 +103,7 @@ jobs:
103103
image: ghcr.io/intel/llvm/ubuntu2204_intel_drivers:${{ contains(github.event.pull_request.labels.*.name, 'ci-no-devigc') && 'latest' || 'devigc' }}
104104
image_options: -u 1001 --device=/dev/dri --privileged --cap-add SYS_ADMIN
105105
target_devices: level_zero:gpu;opencl:gpu
106-
reset_gpu: true
106+
reset_intel_gpu: true
107107
install_drivers: >-
108108
${{ contains(needs.detect_changes.outputs.filters, 'drivers') ||
109109
contains(needs.detect_changes.outputs.filters, 'devigccfg') }}
@@ -118,7 +118,7 @@ jobs:
118118
image: ${{ matrix.image }}
119119
image_options: ${{ matrix.image_options }}
120120
target_devices: ${{ matrix.target_devices }}
121-
reset_gpu: ${{ matrix.reset_gpu }}
121+
reset_intel_gpu: ${{ matrix.reset_intel_gpu }}
122122
install_drivers: ${{ matrix.install_drivers }}
123123
use_dev_igc: ${{ matrix.use_dev_igc }}
124124
extra_lit_opts: ${{ matrix.extra_lit_opts }}
@@ -147,12 +147,12 @@ jobs:
147147
runner: '["Linux", "gen12"]'
148148
image: ghcr.io/intel/llvm/ubuntu2204_intel_drivers:latest
149149
image_extra_opts: --device=/dev/dri
150-
reset_gpu: true
150+
reset_intel_gpu: true
151151
- name: Intel Arc A-Series Graphics system
152152
runner: '["Linux", "arc"]'
153153
image: ghcr.io/intel/llvm/ubuntu2204_intel_drivers:latest
154154
image_extra_opts: --device=/dev/dri
155-
reset_gpu: true
155+
reset_intel_gpu: true
156156
- name: AMD system
157157
runner: '["Linux", "amdgpu"]'
158158
image: ghcr.io/intel/llvm/ubuntu2204_build:latest
@@ -169,7 +169,7 @@ jobs:
169169
image: ${{ matrix.image }}
170170
image_options: -u 1001 --privileged --cap-add SYS_ADMIN ${{ matrix.image_extra_opts }}
171171
target_devices: all
172-
reset_gpu: ${{ matrix.reset_gpu }}
172+
reset_intel_gpu: ${{ matrix.reset_intel_gpu }}
173173

174174
env: '{"LIT_FILTER":"PerformanceTests/"}'
175175
extra_lit_opts: -a -j 1 --param enable-perf-tests=True

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

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ on:
6262
default: ''
6363
required: False
6464

65-
reset_gpu:
65+
reset_intel_gpu:
6666
type: string
6767
required: False
6868
install_drivers:
@@ -153,8 +153,8 @@ jobs:
153153
options: ${{ inputs.image_options }}
154154
env: ${{ fromJSON(inputs.env) }}
155155
steps:
156-
- name: Reset GPU
157-
if: inputs.reset_gpu == 'true'
156+
- name: Reset Intel GPU
157+
if: inputs.reset_intel_gpu == 'true'
158158
run: |
159159
sudo mount -t debugfs none /sys/kernel/debug
160160
sudo bash -c 'echo 1 > /sys/kernel/debug/dri/0/i915_wedged'
@@ -300,36 +300,32 @@ jobs:
300300
awk '/^Failed Tests|Unexpectedly Passed Tests|Unresolved tests|Testing Time/{flag=1}/FAILED: CMakeFiles/{flag=0}flag' e2e.log >> $GITHUB_STEP_SUMMARY
301301
fi
302302
exit $exit_code
303-
- name: List excluded SYCL CTS categories
304-
if: inputs.tests_selector == 'cts' && env.CTS_TESTS_TO_BUILD == ''
305-
run: |
306-
if [ "${{ contains(inputs.target_devices, 'opencl:cpu') }}" = "true" ]; then
307-
cat $PWD/devops/cts_exclude_filter_OCL_CPU
308-
fi
309-
if [ "${{ contains(inputs.target_devices, 'level_zero:gpu') }}" = "true" ]; then
310-
cat $PWD/devops/cts_exclude_filter_L0_GPU
311-
fi
312303
- name: Build SYCL CTS tests
313304
if: inputs.tests_selector == 'cts'
314305
env:
315306
CMAKE_EXTRA_ARGS: ${{ inputs.extra_cmake_args }}
316307
run: |
317-
# Do not exclude any category if passing the CTS_TESTS_TO_BUILD variable.
318308
cts_exclude_filter=""
309+
# If CTS_TESTS_TO_BUILD is null - use filter
319310
if [ -z "$CTS_TESTS_TO_BUILD" ]; then
320311
if [ "${{ contains(inputs.target_devices, 'opencl:cpu') }}" = "true" ]; then
321312
cts_exclude_filter=$PWD/devops/cts_exclude_filter_OCL_CPU
322-
fi
323-
if [ "${{ contains(inputs.target_devices, 'level_zero:gpu') }}" = "true" ]; then
313+
elif [ "${{ contains(inputs.target_devices, 'level_zero:gpu') }}" = "true" ]; then
324314
cts_exclude_filter=$PWD/devops/cts_exclude_filter_L0_GPU
325315
fi
316+
317+
# List excluded SYCL CTS categories:
318+
# SYCL_CTS_EXCLUDE_TEST_CATEGORIES - Optional file specifying a list
319+
# of test categories to be excluded from the build.
320+
echo "::group::Excluded test categories"
321+
cat $cts_exclude_filter
322+
echo "::endgroup::"
326323
fi
327324
328325
cmake -GNinja -B./build-cts -S./khronos_sycl_cts -DCMAKE_CXX_COMPILER=$(which clang++) \
329326
-DSYCL_IMPLEMENTATION=DPCPP \
330327
-DSYCL_CTS_EXCLUDE_TEST_CATEGORIES="$cts_exclude_filter" \
331328
-DSYCL_CTS_ENABLE_OPENCL_INTEROP_TESTS=OFF \
332-
-DSYCL_CTS_MEASURE_BUILD_TIMES=ON \
333329
-DDPCPP_INSTALL_DIR="$(dirname $(which clang++))/.." \
334330
$CMAKE_EXTRA_ARGS
335331
# Ignore errors so that if one category build fails others still have a

.github/workflows/sycl-nightly.yml

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,19 @@ jobs:
2323
# prefer widespread gzip compression.
2424
artifact_archive_name: sycl_linux.tar.gz
2525

26+
ubuntu2204_shared_build:
27+
if: github.repository == 'intel/llvm'
28+
uses: ./.github/workflows/sycl-linux-build.yml
29+
secrets: inherit
30+
with:
31+
build_cache_root: "/__w/"
32+
build_cache_suffix: sprod_shared
33+
build_artifact_suffix: sprod_shared
34+
build_configure_extra_args: '--shared-libs --hip --cuda --native_cpu'
35+
merge_ref: ''
36+
37+
artifact_archive_name: sycl_linux_shared.tar.zst
38+
2639
ubuntu2204_test:
2740
needs: [ubuntu2204_build]
2841
if: ${{ always() && !cancelled() && needs.ubuntu2204_build.outputs.build_conclusion == 'success' }}
@@ -42,7 +55,7 @@ jobs:
4255
image: ghcr.io/intel/llvm/ubuntu2204_intel_drivers:latest
4356
image_options: -u 1001 --device=/dev/dri --privileged --cap-add SYS_ADMIN
4457
target_devices: level_zero:gpu
45-
reset_gpu: true
58+
reset_intel_gpu: true
4659
tests_selector: e2e
4760
extra_lit_opts: --param gpu-intel-gen12=True
4861

@@ -51,7 +64,7 @@ jobs:
5164
image: ghcr.io/intel/llvm/ubuntu2204_intel_drivers:latest
5265
image_options: -u 1001 --device=/dev/dri --privileged --cap-add SYS_ADMIN
5366
target_devices: opencl:gpu
54-
reset_gpu: true
67+
reset_intel_gpu: true
5568
tests_selector: e2e
5669
extra_lit_opts: --param gpu-intel-gen12=True
5770

@@ -98,7 +111,7 @@ jobs:
98111
target_devices: ${{ matrix.target_devices }}
99112
tests_selector: ${{ matrix.tests_selector }}
100113
extra_lit_opts: ${{ matrix.extra_lit_opts }}
101-
reset_gpu: ${{ matrix.reset_gpu }}
114+
reset_intel_gpu: ${{ matrix.reset_intel_gpu }}
102115
ref: ${{ github.sha }}
103116
merge_ref: ''
104117
sycl_toolchain_artifact: sycl_linux_default
@@ -120,7 +133,7 @@ jobs:
120133
if: |
121134
always()
122135
&& !cancelled()
123-
&& needs.build.outputs.build_conclusion == 'success'
136+
&& needs.build-win.outputs.build_conclusion == 'success'
124137
uses: ./.github/workflows/sycl-windows-run-tests.yml
125138
with:
126139
name: Intel GEN12 Graphics with Level Zero

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

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,14 @@ permissions: read-all
2828

2929
jobs:
3030
build-lin:
31-
name: Linux (Self build + shared libraries + no-assertions)
31+
name: Linux (Self build + no-assertions)
3232
if: github.repository == 'intel/llvm'
3333
uses: ./.github/workflows/sycl-linux-build.yml
3434
with:
3535
build_cache_root: "/__w/llvm"
36-
build_cache_suffix: sprod_shared
37-
build_artifact_suffix: sprod_shared
38-
build_configure_extra_args: --shared-libs --no-assertions --hip --cuda --native_cpu --cmake-opt="-DSYCL_ENABLE_STACK_PRINTING=ON" --cmake-opt="-DSYCL_LIB_WITH_DEBUG_SYMBOL=ON"
36+
build_cache_suffix: default
37+
build_artifact_suffix: default
38+
build_configure_extra_args: --no-assertions --hip --cuda --native_cpu --cmake-opt="-DSYCL_ENABLE_STACK_PRINTING=ON" --cmake-opt="-DSYCL_LIB_WITH_DEBUG_SYMBOL=ON"
3939
# Docker image has last nightly pre-installed and added to the PATH
4040
build_image: "ghcr.io/intel/llvm/sycl_ubuntu2204_nightly:build"
4141
cc: clang
@@ -53,14 +53,17 @@ jobs:
5353
runner: '["Linux", "gen12"]'
5454
extra_lit_opts: --param gpu-intel-gen12=True
5555
target_devices: level_zero:gpu;opencl:fpga
56+
reset_intel_gpu: true
5657
- name: Intel Arc A-Series Graphics with Level Zero
5758
runner: '["Linux", "arc"]'
5859
extra_lit_opts: --param matrix-xmx8=True --param gpu-intel-dg2=True
60+
reset_intel_gpu: true
5961
- name: AMD/HIP
6062
runner: '["Linux", "amdgpu"]'
6163
image: ghcr.io/intel/llvm/ubuntu2204_build:latest-0300ac924620a51f76c4929794637b82790f12ab
6264
image_options: -u 1001 --device=/dev/dri --device=/dev/kfd
6365
target_devices: ext_oneapi_hip:gpu
66+
reset_intel_gpu: false
6467
# Performance tests below. Specifics:
6568
# - only run performance tests (use LIT_FILTER env)
6669
# - ask llvm-lit to show all the output, even for PASS (-a)
@@ -72,27 +75,29 @@ jobs:
7275
env: '{"LIT_FILTER":"PerformanceTests/"}'
7376
extra_lit_opts: -a -j 1 --param enable-perf-tests=True --param gpu-intel-gen12=True
7477
target_devices: all
78+
reset_intel_gpu: true
7579
- name: Perf tests on Intel Arc A-Series Graphics system
7680
runner: '["Linux", "arc"]'
7781
env: '{"LIT_FILTER":"PerformanceTests/"}'
7882
extra_lit_opts: -a -j 1 --param enable-perf-tests=True
7983
target_devices: all
84+
reset_intel_gpu: true
8085
uses: ./.github/workflows/sycl-linux-run-tests.yml
8186
with:
8287
name: ${{ matrix.name }}
8388
runner: ${{ matrix. runner }}
84-
image: ghcr.io/intel/llvm/ubuntu2204_intel_drivers:latest
85-
image_options: -u 1001 --device=/dev/dri --privileged --cap-add SYS_ADMIN
89+
image: ${{ matrix.image || 'ghcr.io/intel/llvm/ubuntu2204_intel_drivers:latest' }}
90+
image_options: ${{ matrix.image_options || '-u 1001 --device=/dev/dri --privileged --cap-add SYS_ADMIN' }}
8691
target_devices: ${{ matrix.target_devices || 'level_zero:gpu' }}
87-
reset_gpu: true
92+
reset_intel_gpu: ${{ matrix.reset_intel_gpu }}
8893

8994
extra_lit_opts: ${{ matrix.extra_lit_opts }}
9095
env: ${{ matrix.env || '{}' }}
9196

9297
ref: ${{ github.sha }}
9398
merge_ref: ''
9499

95-
sycl_toolchain_artifact: sycl_linux_sprod_shared
100+
sycl_toolchain_artifact: sycl_linux_default
96101
sycl_toolchain_archive: ${{ needs.build-lin.outputs.artifact_archive_name }}
97102
sycl_toolchain_decompress_command: ${{ needs.build-lin.outputs.artifact_decompress_command }}
98103

buildbot/configure.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -59,14 +59,14 @@ def do_configure(args):
5959
llvm_enable_sphinx = "OFF"
6060
llvm_build_shared_libs = "OFF"
6161
llvm_enable_lld = "OFF"
62-
sycl_enabled_plugins = ["opencl"]
62+
sycl_enabled_backends = ["opencl"]
6363
sycl_preview_lib = "ON"
6464

6565
sycl_enable_xpti_tracing = "ON"
6666
xpti_enable_werror = "OFF"
6767

6868
if sys.platform != "darwin":
69-
sycl_enabled_plugins.append("level_zero")
69+
sycl_enabled_backends.append("level_zero")
7070

7171
# lld is needed on Windows or for the HIP plugin on AMD
7272
if platform.system() == "Windows" or (args.hip and args.hip_platform == "AMD"):
@@ -80,7 +80,7 @@ def do_configure(args):
8080
llvm_targets_to_build += ";NVPTX"
8181
libclc_targets_to_build = libclc_nvidia_target_names
8282
libclc_gen_remangled_variants = "ON"
83-
sycl_enabled_plugins.append("cuda")
83+
sycl_enabled_backends.append("cuda")
8484

8585
if args.hip:
8686
if args.hip_platform == "AMD":
@@ -93,15 +93,15 @@ def do_configure(args):
9393
libclc_gen_remangled_variants = "ON"
9494

9595
sycl_build_pi_hip_platform = args.hip_platform
96-
sycl_enabled_plugins.append("hip")
96+
sycl_enabled_backends.append("hip")
9797

9898
if args.native_cpu:
9999
if args.native_cpu_libclc_targets:
100100
libclc_targets_to_build += ";" + args.native_cpu_libclc_targets
101101
else:
102102
libclc_build_native = "ON"
103103
libclc_gen_remangled_variants = "ON"
104-
sycl_enabled_plugins.append("native_cpu")
104+
sycl_enabled_backends.append("native_cpu")
105105

106106
# all llvm compiler targets don't require 3rd party dependencies, so can be
107107
# built/tested even if specific runtimes are not available
@@ -153,7 +153,7 @@ def do_configure(args):
153153
libclc_gen_remangled_variants = "ON"
154154

155155
if args.enable_plugin:
156-
sycl_enabled_plugins += args.enable_plugin
156+
sycl_enabled_backends += args.enable_plugin
157157

158158
if args.disable_preview_lib:
159159
sycl_preview_lib = "OFF"
@@ -188,7 +188,7 @@ def do_configure(args):
188188
"-DLLVM_ENABLE_LLD={}".format(llvm_enable_lld),
189189
"-DXPTI_ENABLE_WERROR={}".format(xpti_enable_werror),
190190
"-DSYCL_CLANG_EXTRA_FLAGS={}".format(sycl_clang_extra_flags),
191-
"-DSYCL_ENABLE_PLUGINS={}".format(";".join(set(sycl_enabled_plugins))),
191+
"-DSYCL_ENABLE_BACKENDS={}".format(";".join(set(sycl_enabled_backends))),
192192
"-DSYCL_ENABLE_EXTENSION_JIT={}".format(sycl_enable_jit),
193193
"-DSYCL_ENABLE_MAJOR_RELEASE_PREVIEW_LIB={}".format(sycl_preview_lib),
194194
"-DBUG_REPORT_URL=https://github.com/intel/llvm/issues",

clang/include/clang/Basic/DiagnosticGroups.td

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1379,9 +1379,8 @@ def OpenMP : DiagGroup<"openmp", [
13791379
]>;
13801380

13811381
// SYCL warnings
1382-
def Sycl2017Compat : DiagGroup<"sycl-2017-compat">;
13831382
def Sycl2020Compat : DiagGroup<"sycl-2020-compat">;
1384-
def SyclStrict : DiagGroup<"sycl-strict", [ Sycl2017Compat, Sycl2020Compat]>;
1383+
def SyclStrict : DiagGroup<"sycl-strict", [ Sycl2020Compat]>;
13851384
def SyclTarget : DiagGroup<"sycl-target">;
13861385
def SyclFPGAMismatch : DiagGroup<"sycl-fpga-mismatch">;
13871386
def SyclAspectMismatch : DiagGroup<"sycl-aspect-mismatch">;

clang/include/clang/Basic/DiagnosticSemaKinds.td

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12427,7 +12427,6 @@ def err_sycl_restrict : Error<
1242712427
"|call through a function pointer"
1242812428
"|allocate storage"
1242912429
"|use inline assembly"
12430-
"|call a dllimport function"
1243112430
"|call a variadic function"
1243212431
"|call an undefined function without SYCL_EXTERNAL attribute"
1243312432
"|use a const static or global variable that is neither zero-initialized "
@@ -12499,14 +12498,6 @@ def err_sycl_invalid_aspect_argument : Error<
1249912498
def warn_sycl_pass_by_value_deprecated
1250012499
: Warning<"passing kernel functions by value is deprecated in SYCL 2020">,
1250112500
InGroup<Sycl2020Compat>, ShowInSystemHeader;
12502-
def warn_sycl_pass_by_reference_future
12503-
: Warning<"passing of kernel functions by reference is a SYCL 2020 extension">,
12504-
InGroup<Sycl2017Compat>, ShowInSystemHeader;
12505-
def warn_sycl_implicit_decl
12506-
: Warning<"SYCL 1.2.1 specification requires an explicit forward "
12507-
"declaration for a kernel type name; your program may not "
12508-
"be portable">,
12509-
InGroup<SyclStrict>, ShowInSystemHeader, DefaultIgnore;
1251012501
def warn_sycl_potentially_invalid_as_cast : Warning<
1251112502
"explicit cast from %0 to %1 potentially leads to an invalid address space"
1251212503
" cast in the resulting code">, InGroup<SyclStrict>,
@@ -12542,9 +12533,6 @@ def err_sycl_mismatch_group_size
1254212533
def note_sycl_kernel_declared_here : Note<"kernel declared here">;
1254312534
def err_sycl_expected_finalize_method : Error<
1254412535
"expected a 'finalize' method for the 'stream' class">;
12545-
def ext_sycl_2020_attr_spelling : ExtWarn<
12546-
"use of attribute %0 is a SYCL 2020 extension">,
12547-
InGroup<Sycl2017Compat>;
1254812536
def err_sycl_esimd_not_supported_for_type : Error<
1254912537
"type %0 is not supported in ESIMD context">;
1255012538
def err_sycl_taking_address_of_wrong_function : Error<

0 commit comments

Comments
 (0)