Skip to content

Commit 0c08ed7

Browse files
committed
Merge remote-tracking branch 'origin/sycl' into llvmspirv_pulldown
2 parents fde373c + 2799ba3 commit 0c08ed7

File tree

637 files changed

+11913
-6494
lines changed

Some content is hidden

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

637 files changed

+11913
-6494
lines changed

.ci/metrics/requirements.lock.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -255,9 +255,9 @@ python-dateutil==2.9.0.post0 \
255255
--hash=sha256:37dd54208da7e1cd875388217d5e00ebd4179249f90fb72437e91a35459a0ad3 \
256256
--hash=sha256:a8b2bc7bffae282281c8140a97d3aa9c14da0b136dfe83f850eea9a5f7470427
257257
# via -r ./requirements.txt
258-
requests==2.32.3 \
259-
--hash=sha256:55365417734eb18255590a9ff9eb97e9e1da868d4ccd6402399eaf68af20a760 \
260-
--hash=sha256:70761cfe03c773ceb22aa2f671b4757976145175cdfca038c02654d061d6dcc6
258+
requests==2.32.4 \
259+
--hash=sha256:27babd3cda2a6d50b30443204ee89830707d396671944c998b5975b031ac2b2c \
260+
--hash=sha256:27d0316682c8a29834d3264820024b62a36942083d52caf2f14c0591336d3422
261261
# via pygithub
262262
six==1.17.0 \
263263
--hash=sha256:4721f391ed90541fddacab5acf947aa0d3dc7d27b2e1e8eda2be8970586c3274 \

.github/workflows/libcxx-check-generated-files.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
1616

1717
- name: Install dependencies
18-
uses: aminya/setup-cpp@9dc9c217f497fe7342eed97e6f200bf101c9cc04 # v1.6.2
18+
uses: aminya/setup-cpp@004edc19527a83d56cda032658aab55c5e2ed48f # v1.7.0
1919
with:
2020
clangformat: 17.0.1
2121
ninja: true

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
echo "$CHANGED_FILES"
5656
5757
- name: Install clang-format
58-
uses: aminya/setup-cpp@9dc9c217f497fe7342eed97e6f200bf101c9cc04 # v1.6.2
58+
uses: aminya/setup-cpp@004edc19527a83d56cda032658aab55c5e2ed48f # v1.7.0
5959
with:
6060
clangformat: 20.1.5
6161

.github/workflows/release-lit.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
./llvm/utils/release/./github-upload-release.py --token "$GITHUB_TOKEN" --user ${{ github.actor }} --user-token "$USER_TOKEN" check-permissions
4646
4747
- name: Setup Cpp
48-
uses: aminya/setup-cpp@9dc9c217f497fe7342eed97e6f200bf101c9cc04 # v1.6.2
48+
uses: aminya/setup-cpp@004edc19527a83d56cda032658aab55c5e2ed48f # v1.7.0
4949
with:
5050
compiler: llvm-16.0.6
5151
cmake: true

.github/workflows/sycl-containers-igc-dev.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ jobs:
3535
imagefile: ubuntu2404_intel_drivers
3636
tag: devigc
3737
build_args: |
38-
"use_unstable_driver=false"
3938
"use_igc_dev=true"
4039
steps:
4140
- name: Checkout

.github/workflows/sycl-containers.yaml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -54,29 +54,23 @@ jobs:
5454
- name: Intel Drivers Ubuntu 22.04 Docker image
5555
file: ubuntu2204_intel_drivers
5656
tag: latest
57-
build_args: "use_unstable_driver=false"
57+
build_args: ""
5858
- name: Intel Drivers Ubuntu 24.04 Docker image
5959
file: ubuntu2404_intel_drivers
6060
tag: latest
61-
build_args: "use_unstable_driver=false"
62-
- name: Intel Drivers (unstable) Ubuntu 24.04 Docker image
63-
file: ubuntu2404_intel_drivers
64-
tag: unstable
65-
build_args: "use_unstable_driver=true"
61+
build_args: ""
6662
- name: Build + Intel Drivers Ubuntu 22.04 Docker image
6763
file: ubuntu2204_intel_drivers
6864
tag: alldeps
6965
build_args: |
7066
base_image=ghcr.io/intel/llvm/ubuntu2204_build
7167
base_tag=latest
72-
use_unstable_driver=false
7368
- name: Build + Intel Drivers Ubuntu 24.04 Docker image
7469
file: ubuntu2404_intel_drivers
7570
tag: alldeps
7671
build_args: |
7772
base_image=ghcr.io/intel/llvm/ubuntu2404_build
7873
base_tag=latest
79-
use_unstable_driver=false
8074
steps:
8175
- name: Checkout
8276
uses: actions/checkout@v4

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

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -322,3 +322,18 @@ jobs:
322322
binaries_artifact: ${{ inputs.e2e_binaries_artifact }}_spirv_backend
323323
sycl_compiler: $GITHUB_WORKSPACE/toolchain/bin/clang++
324324
extra_lit_opts: --param spirv-backend=True
325+
326+
- name: Remove E2E tests before preview-mode run
327+
if: ${{ inputs.e2e_binaries_artifact && always() && !cancelled() && steps.build.conclusion == 'success' }}
328+
run: rm -rf build-e2e
329+
330+
- name: Build E2E tests in Preview Mode
331+
if: ${{ inputs.e2e_binaries_artifact && always() && !cancelled() && steps.build.conclusion == 'success' }}
332+
uses: ./devops/actions/run-tests/e2e
333+
with:
334+
ref: ${{ inputs.ref || github.sha }}
335+
testing_mode: build-only
336+
target_devices: all
337+
binaries_artifact: ${{ inputs.e2e_binaries_artifact }}_preview
338+
sycl_compiler: $GITHUB_WORKSPACE/toolchain/bin/clang++
339+
extra_lit_opts: --param test-preview-mode=True

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

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ on:
2222
- '.github/workflows/sycl-macos-*.yml'
2323
- '.github/workflows/sycl-nightly.yml'
2424
- '.github/workflows/sycl-rel-nightly.yml'
25+
- '.github/workflows/sycl-rel-nightly-launch.yml'
2526
- '.github/workflows/trivy.yml'
2627
- 'devops/containers/**'
2728
- 'devops/actions/build_container/**'
@@ -110,7 +111,7 @@ jobs:
110111
- name: E2E tests on Intel Ponte Vecchio GPU
111112
runner: '["Linux", "pvc"]'
112113
image_options: -u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN
113-
target_devices: level_zero:gpu;opencl:gpu
114+
target_devices: level_zero:gpu;opencl:gpu;level_zero_v2:gpu
114115
- name: Dev IGC on Intel Ponte Vecchio GPU
115116
runner: '["Linux", "pvc"]'
116117
image: ghcr.io/intel/llvm/ubuntu2404_intel_drivers:devigc
@@ -120,13 +121,20 @@ jobs:
120121
- name: Intel Battlemage Graphics
121122
runner: '["Linux", "bmg"]'
122123
image_options: -u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN
123-
target_devices: level_zero:gpu
124+
target_devices: level_zero:gpu;level_zero_v2:gpu
124125
- name: SPIR-V Backend / Intel Battlemage Graphics
125126
runner: '["Linux", "bmg"]'
126127
image_options: -u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN
127128
target_devices: level_zero:gpu;opencl:gpu;opencl:cpu
128129
extra_lit_opts: --param spirv-backend=True
129130
e2e_binaries_artifact: sycl_e2e_bin_default_spirv_backend
131+
- name: Preview Mode
132+
runner: '["Linux", "gen12"]'
133+
image_options: -u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN
134+
target_devices: level_zero:gpu;opencl:gpu;opencl:cpu
135+
extra_lit_opts: --param test-preview-mode=True
136+
e2e_binaries_artifact: sycl_e2e_bin_default_preview
137+
130138
uses: ./.github/workflows/sycl-linux-run-tests.yml
131139
with:
132140
name: ${{ matrix.name }}
@@ -155,6 +163,7 @@ jobs:
155163
'false' }}
156164
# Run only if the PR does not have the 'ci-no-devigc' label.
157165
skip_run: ${{matrix.use_igc_dev && contains(github.event.pull_request.labels.*.name, 'ci-no-devigc') || 'false'}}
166+
env: ${{ contains(needs.detect_changes.outputs.filters, 'esimd') && '{}' || '{"LIT_FILTER_OUT":"ESIMD/"}' }}
158167

159168
test-perf:
160169
needs: [build, detect_changes]

.github/workflows/sycl-nightly.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ jobs:
287287
fail-fast: false
288288
matrix:
289289
runner: ['["PVC_PERF"]', '["BMG_PERF"]']
290-
backend: ['level_zero:gpu']
290+
backend: ['level_zero:gpu', 'level_zero_v2:gpu']
291291
include:
292292
- ref: ${{ github.sha }}
293293
save_name: 'Baseline'
@@ -333,7 +333,7 @@ jobs:
333333
echo "TAG=$(date +'%Y-%m-%d')-${GITHUB_SHA::7}" >> "$GITHUB_OUTPUT"
334334
fi
335335
- name: Upload binaries
336-
uses: softprops/action-gh-release@v2.2.2
336+
uses: softprops/action-gh-release@v2.3.2
337337
with:
338338
files: |
339339
sycl_linux.tar.gz
Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
# Github Actions launch scheduled workflows of the main branch only (sycl).
2+
# This is a workaround to set a scheduled launch of the sycl-rel-nightly.yml
3+
# workflow, which is located on the sycl-rel-* branch.
4+
5+
name: Scheduled sycl-rel-nightly launch
6+
7+
permissions: read-all
8+
9+
on:
10+
schedule:
11+
- cron: '0 3 * * *'
12+
workflow_dispatch:
13+
14+
jobs:
15+
launch:
16+
if: github.repository == 'intel/llvm'
17+
permissions:
18+
actions: write
19+
runs-on: ubuntu-latest
20+
steps:
21+
- name: Launch
22+
env:
23+
GH_TOKEN: ${{ github.token }}
24+
# To avoid excessive scheduled runs this script also checks if there are
25+
# new commits since the last run - it checks if the latest commit is
26+
# older >24h. That means the previous run already tested this commit.
27+
run: |
28+
if [ "$GITHUB_EVENT_NAME" = "schedule" ]; then
29+
latest_commit_time=$(curl -s https://api.github.com/repos/intel/llvm/commits/sycl-rel-6_2 | jq -r '.commit.committer.date')
30+
echo $latest_commit_time
31+
latest_commit_epoch=$(date -d "$latest_commit_time" +%s)
32+
now_epoch=$(date +%s)
33+
diff=$((now_epoch - latest_commit_epoch))
34+
if [ "$diff" -lt 86400 ]; then
35+
gh workflow run sycl-rel-nightly.yml --repo "${GITHUB_REPOSITORY}" --ref sycl-rel-6_2
36+
fi
37+
else
38+
gh workflow run sycl-rel-nightly.yml --repo "${GITHUB_REPOSITORY}" --ref sycl-rel-6_2
39+
fi

0 commit comments

Comments
 (0)