Skip to content

Commit 293d48b

Browse files
committed
Merge remote-tracking branch 'upstream/sycl' into sycl_prof_tool
* upstream/sycl: (2757 commits) [SYCL][Doc] Fixing incorrect merge of community Readme.md with our version (#5636) [SYCL] Change USM pooling parameters. (#5457) [CI] Fix cache location on Windows (#5603) [SYCL][NFC] Fix a warning about uninitialized struct members (#5610) [Buildbot] Update Windows GPU version to 101.1340 (#5620) Fix SPIRV -> OCL barrier call argument attributes Move SPV_INTEL_memory_access_aliasing tokens from spirv_internal [SYCL][ESIMD] Add support for named barrier APIs (#5583) [SYCL][L0] Remove ZeModule when program build failed (#5541) [SYCL] Silence "unknown attribute" warning for `device_indirectly_callable` (#5591) [SYCL][DOC] Introductory material for extensions (#5605) [SYCL][DOC] Change extension names to lower case (#5607) [SYCL] Improve get_kernel_bundle performance (#5496) [SYCL] Do not build device code for sub-devices (#5240) [sycl-post-link] Fix a crash during spec-constant properties generation (#5538) [SYCL][DOC] Move SPIR-V and OpenCL extensions (#5578) [SYCL][ESIMD][EMU] Update memory intrinsics for ESIMD_EMU plugin (#4748) [CI] Allow stale issue bot to analyze more issues (#5602) [SYCL][L0] Honor property::queue::enable_profiling (#5543) [OpenMP] Properly save strings when doing LTO ...
2 parents ac51c0a + 890e71e commit 293d48b

File tree

12,434 files changed

+374685
-212856
lines changed

Some content is hidden

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

12,434 files changed

+374685
-212856
lines changed

.clang-tidy

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ CheckOptions:
66
value: CamelCase
77
- key: readability-identifier-naming.FunctionCase
88
value: camelBack
9+
# Exclude from scanning as this is an exported symbol used for fuzzing
10+
# throughout the code base.
11+
- key: readability-identifier-naming.FunctionIgnoredRegexp
12+
value: "LLVMFuzzerTestOneInput"
913
- key: readability-identifier-naming.MemberCase
1014
value: CamelCase
1115
- key: readability-identifier-naming.ParameterCase

.github/workflows/closed-issues.yml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
name: Labeling closed issues
2+
on:
3+
issues:
4+
types: ['closed']
5+
6+
jobs:
7+
automate-issues-labels:
8+
runs-on: ubuntu-latest
9+
if: github.repository == 'llvm/llvm-project'
10+
steps:
11+
- uses: andymckay/[email protected]
12+
with:
13+
remove-labels: "awaiting-review"
Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
# This contains the workflow definitions that allow users to test backports
2+
# to the release branch using comments on issues.
3+
#
4+
# /cherry-pick <commit> <...>
5+
#
6+
# This comment will attempt to cherry-pick the given commits to the latest
7+
# release branch (release/Y.x) and if successful push the result to a branch
8+
# on github.
9+
#
10+
# /branch <owner>/<repo>/<branch>
11+
#
12+
# This comment will create a pull request from <branch> to the latest release
13+
# branch.
14+
15+
name: Issue Release Workflow
16+
17+
on:
18+
issue_comment:
19+
types:
20+
- created
21+
- edited
22+
23+
env:
24+
COMMENT_BODY: ${{ github.event.comment.body }}
25+
26+
jobs:
27+
backport-commits:
28+
name: Backport Commits
29+
runs-on: ubuntu-20.04
30+
if: >-
31+
(github.repository == 'llvm/llvm-project') &&
32+
!startswith(github.event.comment.body, '<!--IGNORE-->') &&
33+
contains(github.event.comment.body, '/cherry-pick')
34+
steps:
35+
- name: Fetch LLVM sources
36+
uses: actions/checkout@v2
37+
with:
38+
repository: llvm/llvm-project
39+
# GitHub stores the token used for checkout and uses it for pushes
40+
# too, but we want to use a different token for pushing, so we need
41+
# to disable persist-credentials here.
42+
persist-credentials: false
43+
fetch-depth: 0
44+
45+
- name: Setup Environment
46+
run: |
47+
pip install -r ./llvm/utils/git/requirements.txt
48+
./llvm/utils/git/github-automation.py --token ${{ github.token }} setup-llvmbot-git
49+
50+
- name: Backport Commits
51+
run: |
52+
printf "$COMMENT_BODY" |
53+
./llvm/utils/git/github-automation.py \
54+
--repo $GITHUB_REPOSITORY \
55+
--token ${{ secrets.RELEASE_WORKFLOW_PUSH_SECRET }} \
56+
release-workflow \
57+
--issue-number ${{ github.event.issue.number }} \
58+
auto
59+
60+
create-pull-request:
61+
name: Create Pull Request
62+
runs-on: ubuntu-20.04
63+
if: >-
64+
(github.repository == 'llvm/llvm-project') &&
65+
!startswith(github.event.comment.body, '<!--IGNORE-->') &&
66+
contains(github.event.comment.body, '/branch')
67+
68+
steps:
69+
- name: Fetch LLVM sources
70+
uses: actions/checkout@v2
71+
72+
- name: Setup Environment
73+
run: |
74+
pip install -r ./llvm/utils/git/requirements.txt
75+
76+
- name: Create Pull Request
77+
run: |
78+
printf "$COMMENT_BODY" |
79+
./llvm/utils/git/github-automation.py \
80+
--repo $GITHUB_REPOSITORY \
81+
--token ${{ secrets.RELEASE_WORKFLOW_PUSH_SECRET }} \
82+
release-workflow \
83+
--issue-number ${{ github.event.issue.number }} \
84+
auto

.github/workflows/issue-subscriber.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,9 @@ jobs:
1313
- name: Setup Automation Script
1414
run: |
1515
curl -O -L https://raw.githubusercontent.com/$GITHUB_REPOSITORY/$GITHUB_SHA/llvm/utils/git/github-automation.py
16+
curl -O -L https://raw.githubusercontent.com/$GITHUB_REPOSITORY/$GITHUB_SHA/llvm/utils/git/requirements.txt
1617
chmod a+x github-automation.py
17-
pip install PyGithub
18+
pip install -r requirements.txt
1819
1920
- name: Update watchers
2021
run: |

.github/workflows/sycl_containers.yaml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,15 @@ jobs:
107107
uses: actions/checkout@v2
108108
with:
109109
fetch-depth: 2
110+
- name: Get dependencies configuration
111+
id: deps
112+
run: |
113+
DEPS=`cat devops/dependencies.json`
114+
DEPS="${DEPS//'%'/'%25'}"
115+
DEPS="${DEPS//$'\n'/'%0A'}"
116+
DEPS="${DEPS//$'\r'/'%0D'}"
117+
echo $DEPS
118+
echo "::set-output name=deps::$DEPS"
110119
- name: Build and Push Container
111120
uses: ./devops/actions/build_container
112121
with:
@@ -117,4 +126,10 @@ jobs:
117126
tags: |
118127
ghcr.io/${{ github.repository }}/ubuntu2004_intel_drivers:unstable-${{ github.sha }}
119128
ghcr.io/${{ github.repository }}/ubuntu2004_intel_drivers:unstable
129+
build-args: |
130+
compute_runtime_tag=${{fromJson(steps.deps.outputs.deps).linux_staging.compute_runtime.github_tag}}
131+
igc_tag=${{fromJson(steps.deps.outputs.deps).linux_staging.igc.github_tag}}
132+
tbb_tag=${{fromJson(steps.deps.outputs.deps).linux_staging.tbb.github_tag}}
133+
fpgaemu_tag=${{fromJson(steps.deps.outputs.deps).linux_staging.fpgaemu.github_tag}}
134+
cpu_tag=${{fromJson(steps.deps.outputs.deps).linux_staging.oclcpu.github_tag}}
120135

.github/workflows/sycl_linux_build_and_test.yml

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ on:
4040
build_configure_extra_args:
4141
type: string
4242
required: false
43-
default: "--hip --hip-amd-arch=gfx906 --cuda"
43+
default: "--hip --cuda"
4444
build_artifact_suffix:
4545
type: string
4646
required: true
@@ -86,7 +86,7 @@ jobs:
8686
\"build_cache_root\":\"/__w/\",
8787
\"build_cache_suffix\":\"default\",
8888
\"build_cache_size\":\"2G\",
89-
\"build_configure_extra_args\":\"--hip --hip-amd-arch=gfx906 --cuda\",
89+
\"build_configure_extra_args\":\"--hip --cuda\",
9090
\"build_artifact_suffix\":\"default\",
9191
\"build_upload_artifact\":\"false\",
9292
\"intel_drivers_image\":\"ghcr.io/intel/llvm/ubuntu2004_intel_drivers:latest\",
@@ -150,33 +150,34 @@ jobs:
150150
--cmake-opt="-DLLVM_INSTALL_UTILS=ON" \
151151
--cmake-opt="-DSYCL_PI_TESTS=OFF"
152152
- name: Compile
153+
id: build
153154
run: cmake --build $GITHUB_WORKSPACE/build
154155
# TODO allow to optionally disable in-tree checks
155156
- name: check-llvm
156-
if: always()
157+
if: ${{ always() && !cancelled() && steps.build.outcome == 'success' }}
157158
run: |
158159
cmake --build $GITHUB_WORKSPACE/build --target check-llvm
159160
- name: check-clang
160-
if: always()
161+
if: ${{ always() && !cancelled() && steps.build.outcome == 'success' }}
161162
run: |
162163
export XDG_CACHE_HOME=$GITHUB_WORKSPACE/os_cache
163164
cmake --build $GITHUB_WORKSPACE/build --target check-clang
164165
- name: check-sycl
165-
if: always()
166+
if: ${{ always() && !cancelled() && steps.build.outcome == 'success' }}
166167
run: |
167168
# TODO consider moving this to Dockerfile
168169
export LD_LIBRARY_PATH=/usr/local/cuda/compat/:/usr/local/cuda/lib64:$LD_LIBRARY_PATH
169170
cmake --build $GITHUB_WORKSPACE/build --target check-sycl
170171
- name: check-llvm-spirv
171-
if: always()
172+
if: ${{ always() && !cancelled() && steps.build.outcome == 'success' }}
172173
run: |
173174
cmake --build $GITHUB_WORKSPACE/build --target check-llvm-spirv
174175
- name: check-xptifw
175-
if: always()
176+
if: ${{ always() && !cancelled() && steps.build.outcome == 'success' }}
176177
run: |
177178
cmake --build $GITHUB_WORKSPACE/build --target check-xptifw
178179
- name: check-libclc
179-
if: always()
180+
if: ${{ always() && !cancelled() && steps.build.outcome == 'success' }}
180181
run: |
181182
cmake --build $GITHUB_WORKSPACE/build --target check-libclc
182183
- name: Install

.github/workflows/sycl_nightly.yml

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,13 @@ jobs:
1818
build_github_cache: true
1919
build_cache_root: "/__w/"
2020
build_artifact_suffix: default
21+
lts_config: "ocl_gen9;ocl_x64;hip_amdgpu"
22+
23+
windows_default:
24+
name: Windows (experimental)
25+
if: github.repository == 'intel/llvm'
26+
uses: ./.github/workflows/sycl_windows_build_and_test.yml
27+
2128
ubuntu2004_docker_build_push:
2229
if: github.repository == 'intel/llvm'
2330
runs-on: ubuntu-latest
@@ -54,4 +61,14 @@ jobs:
5461
tags: |
5562
ghcr.io/${{ github.repository }}/sycl_ubuntu2004_nightly:no-drivers-${{ github.sha }}
5663
ghcr.io/${{ github.repository }}/sycl_ubuntu2004_nightly:no-drivers
57-
64+
ubuntu2004_build_test_new_pm:
65+
# Default Linux building and LIT testing using new Pass Manager by default
66+
if: github.repository == 'intel/llvm'
67+
uses: intel/llvm/.github/workflows/sycl_linux_build_and_test.yml@sycl
68+
with:
69+
build_runs_on: build
70+
build_cache_root: "/__w/"
71+
build_cache_suffix: new_pm
72+
build_artifact_suffix: new_pm
73+
build_configure_extra_args: '--hip --cuda --cmake-opt=-DLLVM_ENABLE_NEW_PASS_MANAGER=ON'
74+
lts_config: "hip_amdgpu;ocl_x64"

.github/workflows/sycl_precommit.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,4 @@ jobs:
3030
build_cache_size: "8G"
3131
build_artifact_suffix: "default"
3232
build_cache_suffix: "default"
33-
lts_config: "hip_amdgpu;ocl_x64"
33+
lts_config: "hip_amdgpu;ocl_x64;ocl_gen9;l0_gen9"
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
name: Stale Issues
2+
3+
on:
4+
schedule:
5+
- cron: '30 1 * * *'
6+
7+
jobs:
8+
close-issues:
9+
runs-on: ubuntu-latest
10+
steps:
11+
- uses: actions/stale@v4
12+
with:
13+
stale-issue-message: 'This issue is stale because it has been open 180 days with no activity. Remove stale label or comment or this will be automatically closed in 30 days.'
14+
close-issue-message: 'This issue was closed because it has been stalled for 30 days with no activity. Please, re-open if the issue still exists.'
15+
days-before-stale: 180
16+
days-before-close: 30
17+
exempt-issue-labels: 'confirmed,hip,cuda,enhancement,help wanted,upstream'
18+
stale-issue-label: 'stale'
19+
exempt-all-issue-assignees: true
20+
operations-per-run: 200
21+
Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
name: SYCL Windows Test
2+
3+
on:
4+
workflow_call:
5+
6+
jobs:
7+
build:
8+
name: Build
9+
runs-on: windows-2022
10+
steps:
11+
- uses: actions/checkout@v2
12+
with:
13+
path: src
14+
fetch-depth: 1
15+
- name: Install dependencies
16+
shell: cmd
17+
run: |
18+
choco install -y cuda --version 11.6.0.51123
19+
choco install -y ninja
20+
choco install -y sccache --version 0.2.15
21+
refreshenv
22+
echo CUDA_PATH=%CUDA_PATH%
23+
echo CUDA_PATH=%CUDA_PATH% >> %GITHUB_ENV%
24+
- uses: ilammy/msvc-dev-cmd@9f8ae839b01883414208f29e3e24524387f48e1f
25+
with:
26+
arch: amd64
27+
- name: Setup Cache
28+
uses: actions/cache@v2
29+
if: ${{ github.event_name != 'pull_request' }}
30+
id: cache
31+
with:
32+
path: cache
33+
key: sycl-win-build-${{ github.sha }}
34+
restore-keys: |
35+
sycl-win-build-
36+
- name: Build
37+
shell: cmd
38+
env:
39+
CUDA_PATH: 'C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v11.6'
40+
CUDA_TOOLKIT_ROOT_DIR: 'C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v11.6'
41+
# TODO switch to clang-cl and lld when this is fixed https://github.com/oneapi-src/level-zero/issues/83
42+
# TODO enable sccache, when problems with PDB are resolved
43+
run: |
44+
mkdir build
45+
mkdir install
46+
IF NOT EXIST cache MKDIR cache
47+
set SCCACHE_DIR=%GITHUB_WORKSPACE%\cache
48+
set PATH=C:\ProgramData\chocolatey\lib\sccache\tools\sccache-v0.2.15-x86_64-pc-windows-msvc;%PATH%
49+
python.exe src/buildbot/configure.py -o build ^
50+
--cmake-opt="-DCMAKE_C_COMPILER=cl" ^
51+
--cmake-opt="-DCMAKE_CXX_COMPILER=cl" ^
52+
--cmake-opt="-DCMAKE_INSTALL_PREFIX=%GITHUB_WORKSPACE%\install" ^
53+
--cmake-opt="-DCMAKE_CXX_COMPILER_LAUNCHER=sccache" ^
54+
--cmake-opt="-DCMAKE_C_COMPILER_LAUNCHER=sccache" ^
55+
--cuda
56+
cmake --build build --target sycl-toolchain
57+
sccache --show-stats
58+
- name: Install
59+
shell: cmd
60+
run: cmake --build build --target deploy-sycl-toolchain
61+
- name: Upload toolchain
62+
uses: actions/upload-artifact@v2
63+
with:
64+
name: sycl_windows_default
65+
path: install/**/*

0 commit comments

Comments
 (0)