Skip to content

Commit c0d9e0e

Browse files
authored
Merge branch 'sycl' into cb_event
2 parents 87bc5ac + 889db98 commit c0d9e0e

File tree

277 files changed

+4720
-1189
lines changed

Some content is hidden

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

277 files changed

+4720
-1189
lines changed

.github/workflows/coverity.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
cd $GITHUB_WORKSPACE/build
4646
python3 $GITHUB_WORKSPACE/src/buildbot/configure.py -w $GITHUB_WORKSPACE \
4747
-s $GITHUB_WORKSPACE/src -o $GITHUB_WORKSPACE/build -t Release \
48-
--ci-defaults --hip --cuda \
48+
--ci-defaults --use-zstd --hip --cuda \
4949
-DNATIVECPU_USE_OCK=Off
5050
5151
- name: Build with coverity

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

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

.github/workflows/sycl-check-ready-to-merge-prs.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ permissions: read-all
1414

1515
jobs:
1616
notify-ready-prs:
17+
if: github.repository == 'intel/llvm'
1718
permissions:
1819
pull-requests: write
1920
runs-on: ubuntu-latest

.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-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

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

Lines changed: 10 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:
@@ -64,33 +64,34 @@ on:
6464
pr_no:
6565
type: string
6666
description: |
67-
PR no. to build SYCL from:
68-
69-
SYCL will be built from HEAD of incoming branch.
67+
PR no. to build SYCL from - it will be built from HEAD of incoming branch.
68+
69+
Leave both pr_no and commit_hash empty to use the latest commit from branch/tag this workflow started from.
7070
required: false
7171
default: ''
7272
commit_hash:
7373
type: string
7474
description: |
75-
Commit hash (within intel/llvm) to build SYCL from:
75+
Commit hash (within intel/llvm) to build SYCL from.
7676
77-
Leave both pr_no and commit_hash empty to use latest commit.
77+
Leave both pr_no and commit_hash empty to use the latest commit from branch/tag this workflow started from.
7878
required: false
7979
default: ''
8080
save_name:
8181
type: string
8282
description: |
83-
Name to use for the benchmark result:
83+
Name to use for the benchmark result
8484
required: false
8585
default: ''
8686
upload_results:
87-
description: 'Save and upload results (to https://intel.github.io/llvm/benchmarks)'
87+
description: Save and upload results (to https://intel.github.io/llvm/benchmarks)
8888
type: choice
8989
options:
9090
- false
9191
- true
9292
default: true
9393
runner:
94+
description: Self-hosted runner to use for the benchmarks
9495
type: choice
9596
options:
9697
- '["PVC_PERF"]'

.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" ^

CONTRIBUTING.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,9 @@ To contribute:
3333
[clang-tidy](https://clang.llvm.org/extra/clang-tidy/) tools can be
3434
integrated into your workflow to ensure formatting and stylistic
3535
compliance of your changes. To avoid code formatting misalignment with
36-
GitHub Actions check we recommend using 10 version of clang-format tool
37-
(default version on Ubuntu 22.04).
36+
the GitHub Actions check we recommend using the same version of clang-format
37+
as used in the CI. See [.github/workflows/pr-code-format.yml](https://github.com/intel/llvm/blob/sycl/.github/workflows/pr-code-format.yml)
38+
for the current version.
3839
- Use
3940

4041
```bash

buildbot/configure.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ def do_configure(args, passthrough_args):
6464

6565
sycl_enable_xpti_tracing = "ON"
6666
xpti_enable_werror = "OFF"
67-
llvm_enable_zstd = "OFF"
67+
llvm_enable_zstd = "ON"
6868
spirv_enable_dis = "OFF"
6969

7070
if sys.platform != "darwin":

clang/include/clang/Driver/Options.td

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7557,6 +7557,10 @@ let Visibility = [SYCLRTCOnlyOption] in {
75577557
let Group = sycl_rtc_only_Group in {
75587558
def auto_pch : Flag<["--"], "auto-pch">,
75597559
HelpText<"Enable Auto-PCH for SYCL RTC Compilation">;
7560+
def persistent_auto_pch_EQ
7561+
: Joined<["--"], "persistent-auto-pch=">,
7562+
HelpText<"Use Persistent Auto-PCH cache located at <dir> for SYCL "
7563+
"RTC Compilation">;
75607564
} // let Group = sycl_rtc_only_Group
75617565
} // let Visibility = [SYCLRTCOnlyOption]
75627566

0 commit comments

Comments
 (0)