Skip to content

Commit bb22958

Browse files
committed
Merge remote-tracking branch 'origin/sycl' into llvmspirv_pulldown
2 parents e0c209f + 9e58dc3 commit bb22958

File tree

333 files changed

+8110
-1100
lines changed

Some content is hidden

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

333 files changed

+8110
-1100
lines changed
File renamed without changes.

.github/workflows/sycl-benchmark-aggregate.yml

Lines changed: 0 additions & 52 deletions
This file was deleted.

.github/workflows/coverity.yml renamed to .github/workflows/sycl-coverity.yml

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,18 @@
11
name: Coverity
22
on:
33
workflow_dispatch:
4+
inputs:
5+
description:
6+
description: 'Custom build description'
7+
required: true
8+
type: string
9+
default: 'Out-of-order Coverity scan'
10+
ref:
11+
description: 'Git ref to checkout and scan'
12+
required: true
13+
type: string
14+
default: 'sycl'
15+
416
schedule:
517
- cron: '0 0 * * 0'
618

@@ -27,7 +39,7 @@ jobs:
2739
- uses: ./devops/actions/cached_checkout
2840
with:
2941
path: src
30-
ref: ${{ github.sha }}
42+
ref: ${{ inputs.ref || github.sha }}
3143
cache_path: "/__w/repo_cache/"
3244

3345
- name: Get coverity tool
@@ -45,7 +57,7 @@ jobs:
4557
cd $GITHUB_WORKSPACE/build
4658
python3 $GITHUB_WORKSPACE/src/buildbot/configure.py -w $GITHUB_WORKSPACE \
4759
-s $GITHUB_WORKSPACE/src -o $GITHUB_WORKSPACE/build -t Release \
48-
--ci-defaults --hip --cuda \
60+
--ci-defaults --use-zstd --hip --cuda \
4961
-DNATIVECPU_USE_OCK=Off
5062
5163
- name: Build with coverity
@@ -56,10 +68,15 @@ jobs:
5668

5769
- name: Submit build
5870
run: |
71+
default_description="${{ inputs.description }}"
72+
if [[ -z $default_description ]]; then
73+
default_description="Regular build"
74+
fi
75+
5976
# Initialize a build. Fetch a cloud upload url.
6077
curl -X POST \
61-
-d version="sycl: ${{ github.sha }}" \
62-
-d description="Regular build" \
78+
-d version="${{ inputs.ref || github.sha }}" \
79+
-d description="$default_description" \
6380
-d email=${{ secrets.COVERITY_EMAIL }} \
6481
-d token=${{ secrets.COVERITY_TOKEN }} \
6582
-d file_name="intel_llvm.tgz" \

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ jobs:
201201
-s $GITHUB_WORKSPACE/src -o $GITHUB_WORKSPACE/build \
202202
-DCMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/toolchain \
203203
-t Release \
204-
--ci-defaults ${{ inputs.build_configure_extra_args }} \
204+
--ci-defaults --use-zstd ${{ inputs.build_configure_extra_args }} \
205205
-DCMAKE_C_COMPILER_LAUNCHER=ccache \
206206
-DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
207207
-DLLVM_INSTALL_UTILS=ON

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@ on:
2323
- '.github/workflows/sycl-nightly.yml'
2424
- '.github/workflows/sycl-rel-nightly.yml'
2525
- '.github/workflows/sycl-rel-nightly-launch.yml'
26-
- '.github/workflows/trivy.yml'
26+
- '.github/workflows/sycl-trivy.yml'
27+
- '.github/workflows/sycl-coverity.yml'
2728
- 'devops/containers/**'
2829
- 'devops/actions/build_container/**'
2930
- 'unified-runtime/examples/**'
@@ -241,6 +242,7 @@ jobs:
241242
benchmark_upload_results: false
242243
benchmark_preset: 'Minimal'
243244
benchmark_dry_run: true
245+
benchmark_exit_on_failure: true
244246
repo_ref: ${{ github.sha }}
245247
toolchain_artifact: ${{ needs.build.outputs.toolchain_artifact }}
246248
toolchain_artifact_filename: ${{ needs.build.outputs.toolchain_artifact_filename }}

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

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,12 @@ on:
140140
type: string
141141
default: 'false'
142142
required: False
143+
benchmark_exit_on_failure:
144+
description: |
145+
Whether or not to fail the workflow upon a failure.
146+
type: string
147+
default: 'false'
148+
required: False
143149

144150
workflow_dispatch:
145151
inputs:
@@ -211,6 +217,12 @@ on:
211217
- "build-only"
212218
- "run-only"
213219

220+
benchmark_exit_on_failure:
221+
type: choice
222+
options:
223+
- "true"
224+
- "false"
225+
214226
permissions:
215227
contents: read
216228
packages: read
@@ -358,6 +370,7 @@ jobs:
358370
save_name: ${{ inputs.benchmark_save_name }}
359371
preset: ${{ inputs.benchmark_preset }}
360372
dry_run: ${{ inputs.benchmark_dry_run }}
373+
exit_on_failure: ${{ inputs.benchmark_exit_on_failure }}
361374
build_ref: ${{ inputs.repo_ref }}
362375
env:
363376
RUNNER_TAG: ${{ inputs.runner }}

.github/workflows/sycl-macos-build-and-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
cd $GITHUB_WORKSPACE/build
5050
python3 $GITHUB_WORKSPACE/src/buildbot/configure.py -w $GITHUB_WORKSPACE \
5151
-s $GITHUB_WORKSPACE/src -o $GITHUB_WORKSPACE/build -t Release \
52-
--ci-defaults $ARGS \
52+
--ci-defaults --use-zstd $ARGS \
5353
-DCMAKE_C_COMPILER_LAUNCHER=ccache \
5454
-DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
5555
-DLLVM_INSTALL_UTILS=ON
File renamed without changes.

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

Lines changed: 24 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ on:
1515
PR no. to build SYCL from if specified: SYCL will be built from HEAD
1616
of incoming branch used by the specified PR no.
1717
18-
If both pr_no and commit_hash are empty, the latest SYCL nightly build
19-
will be used.
18+
If both pr_no and commit_hash are empty, the latest commit in
19+
deployment branch will be used.
2020
required: false
2121
default: ''
2222
commit_hash:
@@ -41,6 +41,12 @@ on:
4141
description: |
4242
Upload results to https://intel.github.io/llvm/benchmarks/.
4343
required: true
44+
exit_on_failure:
45+
type: string # true/false: workflow_dispatch does not support booleans
46+
description: |
47+
Fail benchmark script on any error. Limit number of iterations to just test correctness.
48+
required: false
49+
default: 'false'
4450
runner:
4551
type: string
4652
required: true
@@ -64,33 +70,41 @@ on:
6470
pr_no:
6571
type: string
6672
description: |
67-
PR no. to build SYCL from:
68-
69-
SYCL will be built from HEAD of incoming branch.
73+
PR no. to build SYCL from - it will be built from HEAD of incoming branch.
74+
75+
Leave both pr_no and commit_hash empty to use the latest commit from branch/tag this workflow started from.
7076
required: false
7177
default: ''
7278
commit_hash:
7379
type: string
7480
description: |
75-
Commit hash (within intel/llvm) to build SYCL from:
81+
Commit hash (within intel/llvm) to build SYCL from.
7682
77-
Leave both pr_no and commit_hash empty to use latest commit.
83+
Leave both pr_no and commit_hash empty to use the latest commit from branch/tag this workflow started from.
7884
required: false
7985
default: ''
8086
save_name:
8187
type: string
8288
description: |
83-
Name to use for the benchmark result:
89+
Name to use for the benchmark result
8490
required: false
8591
default: ''
8692
upload_results:
87-
description: 'Save and upload results (to https://intel.github.io/llvm/benchmarks)'
93+
description: Save and upload results (to https://intel.github.io/llvm/benchmarks)
8894
type: choice
8995
options:
9096
- false
9197
- true
9298
default: true
99+
exit_on_failure:
100+
description: Fail benchmark script on any error. Limit number of iterations to just test correctness.
101+
type: choice
102+
options:
103+
- false
104+
- true
105+
default: false
93106
runner:
107+
description: Self-hosted runner to use for the benchmarks
94108
type: choice
95109
options:
96110
- '["PVC_PERF"]'
@@ -192,6 +206,7 @@ jobs:
192206
benchmark_upload_results: ${{ inputs.upload_results }}
193207
benchmark_save_name: ${{ needs.sanitize_inputs.outputs.benchmark_save_name }}
194208
benchmark_preset: ${{ inputs.preset }}
209+
benchmark_exit_on_failure: ${{ inputs.exit_on_failure }}
195210
repo_ref: ${{ needs.sanitize_inputs.outputs.build_ref }}
196211
toolchain_artifact: ${{ needs.build_sycl.outputs.toolchain_artifact }}
197212
toolchain_artifact_filename: ${{ needs.build_sycl.outputs.toolchain_artifact_filename }}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ jobs:
147147
IF NOT EXIST D:\github\_work\cache MKDIR D:\github\_work\cache
148148
IF NOT EXIST D:\github\_work\cache\${{inputs.build_cache_suffix}} MKDIR D:\github\_work\cache\${{inputs.build_cache_suffix}}
149149
python.exe src/buildbot/configure.py -o build ^
150-
--ci-defaults %ARGS% ^
150+
--ci-defaults --use-zstd %ARGS% ^
151151
"-DCMAKE_C_COMPILER=${{inputs.cxx}}" ^
152152
"-DCMAKE_CXX_COMPILER=${{inputs.cxx}}" ^
153153
"-DCMAKE_INSTALL_PREFIX=%GITHUB_WORKSPACE%\install" ^

0 commit comments

Comments
 (0)