Skip to content

Commit 1a0af48

Browse files
Merge branch 'sycl' into host_task_user_events_way_forced
2 parents c67ce60 + 42ee42e commit 1a0af48

File tree

355 files changed

+10788
-6070
lines changed

Some content is hidden

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

355 files changed

+10788
-6070
lines changed

.github/CODEOWNERS

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,8 @@ sycl/doc/extensions/ @intel/dpcpp-specification-reviewers
3636

3737
# Unified Runtime
3838
unified-runtime/ @intel/unified-runtime-reviewers
39-
# TODO: Use specific UR Level Zero adapter team
40-
unified-runtime/*/adapters/level_zero/ @intel/unified-runtime-reviewers
41-
# TODO: Use specific UR OpenCL adapter team
42-
unified-runtime/*/adapters/opencl/ @intel/unified-runtime-reviewers
39+
unified-runtime/*/adapters/level_zero/ @intel/unified-runtime-reviewers-level-zero
40+
unified-runtime/*/adapters/opencl/ @intel/unified-runtime-reviewers-opencl
4341
unified-runtime/*/adapters/cuda/ @intel/llvm-reviewers-cuda
4442
unified-runtime/*/adapters/hip/ @intel/llvm-reviewers-cuda
4543
unified-runtime/*/adapters/native_cpu/ @intel/dpcpp-nativecpu-reviewers
@@ -75,6 +73,7 @@ llvm/include/llvm/SYCLLowerIR/SYCLCreateNVVMAnnotations.h @intel/llvm-reviewers-
7573
llvm/lib/SYCLLowerIR/SYCLCreateNVVMAnnotations.cpp @intel/llvm-reviewers-cuda
7674
llvm/lib/Target/NVPTX @intel/llvm-reviewers-cuda
7775
llvm/lib/Target/AMDGPU @intel/llvm-reviewers-cuda
76+
unified-runtime/source/common/cuda-hip @intel/llvm-reviewers-cuda
7877

7978
# XPTI instrumentation utilities
8079
xpti/ @intel/llvm-reviewers-runtime

.github/workflows/docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ jobs:
102102
with:
103103
fetch-depth: 1
104104
- name: Setup Python env
105-
uses: actions/setup-python@v5.4.0
105+
uses: actions/setup-python@v5.5.0
106106
with:
107107
python-version: '3.11'
108108
cache: 'pip'

.github/workflows/llvm-project-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ jobs:
8282
# lldb. Using this setup-python action to make 3.10 the default
8383
# python fixes this.
8484
- name: Setup Python
85-
uses: actions/setup-python@v5.4.0
85+
uses: actions/setup-python@v5.5.0
8686
with:
8787
python-version: ${{ inputs.python_version }}
8888
- name: Install Ninja

.github/workflows/pr-code-format.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ jobs:
6565
clangformat: 19.1.6
6666

6767
- name: Setup Python env
68-
uses: actions/setup-python@v5.4.0
68+
uses: actions/setup-python@v5.5.0
6969
with:
7070
python-version: '3.11'
7171
cache: 'pip'

.github/workflows/release-binaries.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ jobs:
6767
steps:
6868
# It's good practice to use setup-python, but this is also required on macos-14
6969
# due to https://github.com/actions/runner-images/issues/10385
70-
- uses: actions/setup-python@6ca8e8598faa206f7140a65ba31b899bebe16f58
70+
- uses: actions/setup-python@8d9ed9ac5c53483de85588cdf95a591a75ab9f55
7171
with:
7272
python-version: '3.12'
7373

@@ -297,7 +297,7 @@ jobs:
297297

298298
- name: Attest Build Provenance
299299
id: provenance
300-
uses: actions/attest-build-provenance@bd77c077858b8d561b7a36cbe48ef4cc642ca39d # v2.2.2
300+
uses: actions/attest-build-provenance@c074443f1aee8d4aeeae555aebba3282517141b2 # v2.2.3
301301
with:
302302
subject-path: ${{ needs.prepare.outputs.release-binary-filename }}
303303

.github/workflows/release-documentation.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
3838

3939
- name: Setup Python env
40-
uses: actions/setup-python@v5.4.0
40+
uses: actions/setup-python@v5.5.0
4141
with:
4242
cache: 'pip'
4343
cache-dependency-path: './llvm/docs/requirements.txt'

.github/workflows/release-doxygen.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
4444

4545
- name: Setup Python env
46-
uses: actions/setup-python@v5.4.0
46+
uses: actions/setup-python@v5.5.0
4747
with:
4848
cache: 'pip'
4949
cache-dependency-path: './llvm/docs/requirements.txt'

.github/workflows/release-sources.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ jobs:
9292
- name: Attest Build Provenance
9393
if: github.event_name != 'pull_request'
9494
id: provenance
95-
uses: actions/attest-build-provenance@bd77c077858b8d561b7a36cbe48ef4cc642ca39d # v2.2.2
95+
uses: actions/attest-build-provenance@c074443f1aee8d4aeeae555aebba3282517141b2 # v2.2.3
9696
with:
9797
subject-path: "*.xz"
9898
- if: github.event_name != 'pull_request'

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

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,15 @@ jobs:
1717
outputs:
1818
filters: ${{ steps.result.outputs.result }}
1919
steps:
20+
- name: Set changed_files
21+
id: changed_files
22+
shell: bash
23+
run: |
24+
echo "changed_file_cnt=${{ github.event.pull_request.changed_files }}" >> $GITHUB_OUTPUT
25+
2026
- name: Check file changes
2127
uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36
28+
if: steps.changed_files.outputs.changed_file_cnt < 500
2229
id: changes
2330
with:
2431
filters: |
@@ -75,19 +82,19 @@ jobs:
7582
ur:
7683
- 'unified-runtime/**'
7784
- .github/workflows/ur-*
85+
ur_cuda_adapter:
86+
- 'unified-runtime/source/adapters/cuda/**'
7887
7988
- name: Set output
8089
id: result
8190
uses: actions/github-script@v7
8291
with:
8392
script: |
84-
console.log("Number of files changed:");
85-
console.log(context.payload.pull_request.changed_files);
86-
if (context.payload.pull_request.changed_files < 500) {
93+
if (${{steps.changed_files.outputs.changed_file_cnt}} < 500) {
8794
return '${{ steps.changes.outputs.changes }}';
8895
}
8996
// Treat everything as changed for huge PRs.
90-
return ["llvm", "llvm_spirv", "clang", "sycl_jit", "xptifw", "libclc", "sycl", "ci", "esimd", "ur"];
97+
return ["llvm", "llvm_spirv", "clang", "sycl_jit", "xptifw", "libclc", "sycl", "ci", "esimd", "ur", "ur_cuda_adapter"];
9198
9299
- run: echo '${{ steps.result.outputs.result }}'
93100

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

Lines changed: 22 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,14 @@ on:
2222
- '.github/workflows/sycl-macos-*.yml'
2323
- '.github/workflows/sycl-nightly.yml'
2424
- '.github/workflows/sycl-rel-nightly.yml'
25+
- '.github/workflows/trivy.yml'
2526
- 'devops/containers/**'
2627
- 'devops/actions/build_container/**'
28+
- 'unified-runtime/examples/**'
29+
- 'unified-runtime/scripts/**'
30+
- 'unified-runtime/test/**'
31+
- 'unified-runtime/third_party/**'
32+
- 'unified-runtime/tools/**'
2733

2834
concurrency:
2935
# Cancel a currently running workflow from the same PR, branch or tag.
@@ -52,6 +58,22 @@ jobs:
5258
changes: ${{ needs.detect_changes.outputs.filters }}
5359
e2e_binaries_artifact: sycl_e2e_bin_default
5460

61+
# If a PR changes CUDA adapter, run the build on Ubuntu 22.04 as well.
62+
# Ubuntu 22.04 container has CUDA 12.1 installed while Ubuntu 24.0 image
63+
# has CUDA 12.6.1 installed.
64+
# The idea is to ensure that the code works with both CUDA versions.
65+
build_ubuntu2204:
66+
needs: [detect_changes]
67+
if: always() && !cancelled() && contains(needs.detect_changes.outputs.filters, 'ur_cuda_adapter')
68+
uses: ./.github/workflows/sycl-linux-build.yml
69+
with:
70+
build_ref: ${{ github.sha }}
71+
build_cache_root: "/__w/"
72+
build_artifact_suffix: "default"
73+
build_cache_suffix: "default"
74+
build_image: "ghcr.io/intel/llvm/ubuntu2204_build:latest"
75+
changes: ${{ needs.detect_changes.outputs.filters }}
76+
5577
run_prebuilt_e2e_tests:
5678
needs: [build, detect_changes]
5779
if: ${{ always() && !cancelled() && needs.build.outputs.build_conclusion == 'success' }}
@@ -63,7 +85,6 @@ jobs:
6385
runner: '["Linux", "gen12"]'
6486
image_options: -u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN
6587
target_devices: level_zero:gpu;opencl:gpu;opencl:cpu
66-
reset_intel_gpu: true
6788
extra_lit_opts: --param gpu-intel-gen12=True
6889
- name: NVIDIA/CUDA
6990
runner: '["Linux", "cuda"]'
@@ -73,46 +94,39 @@ jobs:
7394
runner: '["Linux", "amdgpu"]'
7495
image_options: -u 1001 --device=/dev/dri --device=/dev/kfd
7596
target_devices: hip:gpu
76-
reset_intel_gpu: false
7797
extra_lit_opts: -j 1
7898
- name: Intel Arc A-Series Graphics
7999
runner: '["Linux", "arc"]'
80100
image_options: -u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN
81101
target_devices: level_zero:gpu;opencl:gpu;level_zero_v2:gpu
82-
reset_intel_gpu: true
83102
extra_lit_opts: --param matrix-xmx8=True
84103
- name: E2E tests with dev igc on Intel Arc A-Series Graphics
85104
runner: '["Linux", "arc"]'
86105
image: ghcr.io/intel/llvm/ubuntu2404_intel_drivers:devigc
87106
image_options: -u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN
88107
target_devices: level_zero:gpu;opencl:gpu
89-
reset_intel_gpu: true
90108
extra_lit_opts: --param matrix-xmx8=True
91109
use_igc_dev: true
92110
- name: E2E tests on Intel Ponte Vecchio GPU
93111
runner: '["Linux", "pvc"]'
94112
image_options: -u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN
95113
target_devices: level_zero:gpu;opencl:gpu
96-
reset_intel_gpu: true
97114
extra_lit_opts: -j 50
98115
- name: Dev IGC on Intel Ponte Vecchio GPU
99116
runner: '["Linux", "pvc"]'
100117
image: ghcr.io/intel/llvm/ubuntu2404_intel_drivers:devigc
101118
image_options: -u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN
102119
target_devices: level_zero:gpu;opencl:gpu
103-
reset_intel_gpu: true
104120
use_igc_dev: true
105121
extra_lit_opts: -j 50
106122
- name: Intel Battlemage Graphics
107123
runner: '["Linux", "bmg"]'
108124
image_options: -u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN
109125
target_devices: level_zero:gpu
110-
reset_intel_gpu: true
111126
- name: SPIR-V Backend / Intel Battlemage Graphics
112127
runner: '["Linux", "bmg"]'
113128
image_options: -u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN
114129
target_devices: level_zero:gpu;opencl:gpu;opencl:cpu
115-
reset_intel_gpu: true
116130
extra_lit_opts: --param spirv-backend=True
117131
e2e_binaries_artifact: sycl_e2e_bin_default_spirv_backend
118132
uses: ./.github/workflows/sycl-linux-run-tests.yml
@@ -123,7 +137,6 @@ jobs:
123137
image_options: ${{ matrix.image_options }}
124138
target_devices: ${{ matrix.target_devices }}
125139
extra_lit_opts: ${{ matrix.extra_lit_opts }}
126-
reset_intel_gpu: ${{ matrix.reset_intel_gpu }}
127140
repo_ref: ${{ github.sha }}
128141
sycl_toolchain_artifact: sycl_linux_default
129142
sycl_toolchain_archive: ${{ needs.build.outputs.artifact_archive_name }}
@@ -159,11 +172,9 @@ jobs:
159172
- name: Intel GEN12 Graphics system
160173
runner: '["Linux", "gen12"]'
161174
image_extra_opts: --device=/dev/dri
162-
reset_intel_gpu: true
163175
- name: Intel Arc A-Series Graphics system
164176
runner: '["Linux", "arc"]'
165177
image_extra_opts: --device=/dev/dri
166-
reset_intel_gpu: true
167178
- name: AMD system
168179
runner: '["Linux", "amdgpu"]'
169180
image_extra_opts: --device=/dev/dri --device=/dev/kfd
@@ -176,7 +187,6 @@ jobs:
176187
runner: ${{ matrix. runner }}
177188
image_options: -u 1001 --privileged --cap-add SYS_ADMIN ${{ matrix.image_extra_opts }}
178189
target_devices: all
179-
reset_intel_gpu: ${{ matrix.reset_intel_gpu }}
180190

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

0 commit comments

Comments
 (0)