Skip to content

Commit 3821df4

Browse files
authored
Merge branch 'intel:sycl' into work_group_memoy_new
2 parents a9b2875 + 6e095fd commit 3821df4

File tree

453 files changed

+7287
-3685
lines changed

Some content is hidden

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

453 files changed

+7287
-3685
lines changed

.github/CODEOWNERS

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,9 +139,10 @@ sycl/include/sycl/ext/oneapi/experimental/graph.hpp @intel/sycl-graphs-reviewers
139139
sycl/source/detail/graph_impl.cpp @intel/sycl-graphs-reviewers
140140
sycl/source/detail/graph_impl.hpp @intel/sycl-graphs-reviewers
141141
sycl/unittests/Extensions/CommandGraph/ @intel/sycl-graphs-reviewers
142-
sycl/doc/design/CommandGraph.md @intel/sycl-graphs-reviewers
143142
sycl/test-e2e/Graph @intel/sycl-graphs-reviewers
143+
sycl/doc/design/CommandGraph.md @intel/sycl-graphs-reviewers
144144
sycl/doc/extensions/**/sycl_ext_oneapi_graph.asciidoc @intel/sycl-graphs-reviewers
145+
sycl/doc/syclgraph/ @intel/sycl-graphs-reviewers
145146

146147
# syclcompat library
147148
sycl/**/syclcompat/ @intel/syclcompat-lib-reviewers

.github/workflows/sycl-docs.yml

Lines changed: 27 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Generate Doxygen documentation
1+
name: Generate documentation
22

33
on:
44
schedule:
@@ -10,13 +10,21 @@ on:
1010
- '.github/workflows/sycl-docs.yml'
1111
- 'clang/docs/**'
1212
- 'sycl/doc/**'
13+
push:
14+
branches:
15+
- sycl
16+
paths:
17+
- '.github/workflows/sycl-docs.yml'
18+
- 'clang/docs/**'
19+
- 'sycl/doc/**'
1320

14-
permissions: read-all
21+
permissions:
22+
contents: read
23+
pages: write
24+
id-token: write
1525

1626
jobs:
1727
build:
18-
permissions:
19-
contents: write # for Git to git push
2028
runs-on: ubuntu-latest
2129
if: github.repository == 'intel/llvm'
2230
steps:
@@ -25,38 +33,28 @@ jobs:
2533
path: repo
2634
- name: Install deps
2735
run: |
28-
sudo apt-get install -y doxygen graphviz ssh ninja-build libhwloc-dev
36+
sudo apt-get install -y graphviz ssh ninja-build libhwloc-dev
2937
sudo pip3 install -r repo/llvm/docs/requirements.txt
3038
- name: Build Docs
3139
run: |
3240
mkdir -p $GITHUB_WORKSPACE/build
3341
cd $GITHUB_WORKSPACE/build
3442
python $GITHUB_WORKSPACE/repo/buildbot/configure.py -w $GITHUB_WORKSPACE \
3543
-s $GITHUB_WORKSPACE/repo -o $GITHUB_WORKSPACE/build -t Release --docs
36-
cmake --build . --target doxygen-sycl
37-
cmake --build . --target doxygen-clang
3844
cmake --build . --target docs-sycl-html
3945
cmake --build . --target docs-clang-html
40-
- name: Deploy
41-
if: ${{ github.event_name == 'schedule' }}
42-
env:
43-
SSH_KEY: ${{secrets.ACTIONS_DEPLOY_KEY}}
44-
run: |
45-
mkdir -p ~/.ssh
46-
echo "$SSH_KEY" > ~/.ssh/id_rsa
47-
chmod 600 ~/.ssh/id_rsa
48-
eval "$(ssh-agent -s)"
49-
ssh-add -k ~/.ssh/id_rsa
50-
git clone [email protected]:intel/llvm-docs.git docs
51-
cd $GITHUB_WORKSPACE/docs
52-
git rm -rf .
46+
# Copy the generated docs to a separate directory for uploading.
47+
mkdir $GITHUB_WORKSPACE/install_docs
48+
cd $GITHUB_WORKSPACE/install_docs
49+
mkdir clang
50+
mv $GITHUB_WORKSPACE/build/tools/sycl/doc/html/* .
51+
mv $GITHUB_WORKSPACE/build/tools/clang/docs/html/* clang/
5352
touch .nojekyll
54-
yes | \cp -rf $GITHUB_WORKSPACE/build/tools/sycl/doc/html/* .
55-
mv $GITHUB_WORKSPACE/build/tools/sycl/doc/doxygen/html doxygen/
56-
mv $GITHUB_WORKSPACE/build/tools/clang/docs/html clang/
57-
mv $GITHUB_WORKSPACE/build/tools/clang/docs/doxygen/html clang_doxygen/
58-
git config --global user.name "iclsrc"
59-
git config --global user.email "[email protected]"
60-
git add .
61-
git diff-index --quiet HEAD || git commit --amend -m "Update docs" -s
62-
git push -f
53+
# Upload the generated docs as an artifact and deploy to GitHub Pages.
54+
- name: Upload artifact
55+
uses: actions/upload-pages-artifact@v3
56+
with:
57+
path: ./install_docs
58+
- name: Deploy to GitHub Pages
59+
if: ${{ github.event_name == 'push' }}
60+
uses: actions/deploy-pages@v4

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

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -83,22 +83,22 @@ jobs:
8383
- name: Intel
8484
runner: '["Linux", "gen12"]'
8585
image: ghcr.io/intel/llvm/ubuntu2204_intel_drivers:latest
86-
image_options: -u 1001 --device=/dev/dri --privileged --cap-add SYS_ADMIN
86+
image_options: -u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN
8787
target_devices: level_zero:gpu;opencl:gpu;opencl:cpu
8888
reset_intel_gpu: true
8989
extra_lit_opts: --param gpu-intel-gen12=True
9090
- name: E2E tests on Intel Arc A-Series Graphics
9191
runner: '["Linux", "arc"]'
9292
image: ghcr.io/intel/llvm/ubuntu2204_intel_drivers:latest
93-
image_options: -u 1001 --device=/dev/dri --privileged --cap-add SYS_ADMIN
93+
image_options: -u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN
9494
target_devices: level_zero:gpu;opencl:gpu
9595
reset_intel_gpu: true
9696
extra_lit_opts: --param matrix-xmx8=True --param gpu-intel-dg2=True
9797
env: '{"LIT_FILTER":${{ needs.determine_arc_tests.outputs.arc_tests }} }'
9898
- name: E2E tests with dev igc on Intel Arc A-Series Graphics
9999
runner: '["Linux", "arc"]'
100100
image: ghcr.io/intel/llvm/ubuntu2204_intel_drivers:devigc
101-
image_options: -u 1001 --device=/dev/dri --privileged --cap-add SYS_ADMIN
101+
image_options: -u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN
102102
target_devices: level_zero:gpu;opencl:gpu
103103
reset_intel_gpu: true
104104
extra_lit_opts: --param matrix-xmx8=True --param gpu-intel-dg2=True
@@ -116,8 +116,16 @@ jobs:
116116
extra_lit_opts: ${{ matrix.extra_lit_opts }}
117117
env: ${{ matrix.env || '{}' }}
118118

119-
install_igc_driver: ${{ contains(needs.detect_changes.outputs.filters, 'drivers') }}
120-
install_dev_igc_driver: ${{ matrix.use_igc_dev && contains(needs.detect_changes.outputs.filters, 'devigccfg') || 'false' }}
119+
# Do not install drivers on AMD and CUDA runners.
120+
install_igc_driver: >-
121+
${{ !contains(matrix.target_devices, 'ext_oneapi_cuda') &&
122+
!contains(matrix.target_devices, 'ext_oneapi_hip') &&
123+
contains(needs.detect_changes.outputs.filters, 'drivers') }}
124+
install_dev_igc_driver: >-
125+
${{ !contains(matrix.target_devices, 'ext_oneapi_cuda') &&
126+
!contains(matrix.target_devices, 'ext_oneapi_hip') &&
127+
matrix.use_igc_dev && contains(needs.detect_changes.outputs.filters, 'devigccfg') ||
128+
'false' }}
121129
# Run only if the PR does not have the 'ci-no-devigc' label.
122130
skip_run: ${{matrix.use_igc_dev && contains(github.event.pull_request.labels.*.name, 'ci-no-devigc') || 'false'}}
123131

.github/workflows/sycl-nightly.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
- name: Intel L0 GPU
5454
runner: '["Linux", "gen12"]'
5555
image: ghcr.io/intel/llvm/ubuntu2204_intel_drivers:latest
56-
image_options: -u 1001 --device=/dev/dri --privileged --cap-add SYS_ADMIN
56+
image_options: -u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN
5757
target_devices: level_zero:gpu
5858
reset_intel_gpu: true
5959
tests_selector: e2e
@@ -62,7 +62,7 @@ jobs:
6262
- name: Intel OCL GPU
6363
runner: '["Linux", "gen12"]'
6464
image: ghcr.io/intel/llvm/ubuntu2204_intel_drivers:latest
65-
image_options: -u 1001 --device=/dev/dri --privileged --cap-add SYS_ADMIN
65+
image_options: -u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN
6666
target_devices: opencl:gpu
6767
reset_intel_gpu: true
6868
tests_selector: e2e

.github/workflows/sycl-post-commit.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ jobs:
8787
name: ${{ matrix.name }}
8888
runner: ${{ matrix. runner }}
8989
image: ${{ matrix.image || 'ghcr.io/intel/llvm/ubuntu2204_intel_drivers:latest' }}
90-
image_options: ${{ matrix.image_options || '-u 1001 --device=/dev/dri --privileged --cap-add SYS_ADMIN' }}
90+
image_options: ${{ matrix.image_options || '-u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN' }}
9191
target_devices: ${{ matrix.target_devices || 'level_zero:gpu' }}
9292
reset_intel_gpu: ${{ matrix.reset_intel_gpu }}
9393

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

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,17 @@ jobs:
8686
# Run E2E tests.
8787
export LIT_OPTS="-v --no-progress-bar --show-unsupported --show-pass --show-xfail --max-time 3600 --time-tests ${{ inputs.extra_lit_opts }}"
8888
cmake --build build-e2e --target check-sycl-e2e
89+
- name: Detect hung tests
90+
shell: powershell
91+
run: |
92+
$exitCode = 0
93+
$hungTests = Get-Process | Where-Object { ($_.Path -match "llvm\\install") -or ($_.Path -match "llvm\\build-e2e") }
94+
$hungTests | Foreach-Object {
95+
$exitCode = 1
96+
echo "Test $($_.Path) hung!"
97+
Stop-Process -Force $_
98+
}
99+
exit $exitCode
89100
- name: Cleanup
90101
shell: cmd
91102
if: always()

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ source project. One of the examples is
4242
Features parity between this project and downstream projects is not guaranteed.
4343

4444
Project documentation is available at:
45-
[DPC++ Documentation](https://intel.github.io/llvm-docs/).
45+
[DPC++ Documentation](https://intel.github.io/llvm/).
4646

4747
### How to use DPC++
4848

buildbot/configure.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,6 @@ def do_configure(args):
116116
llvm_enable_assertions = "OFF"
117117

118118
if args.docs:
119-
llvm_enable_doxygen = "ON"
120119
llvm_enable_sphinx = "ON"
121120

122121
if args.shared_libs:

clang/include/clang/Basic/DiagnosticSemaKinds.td

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12433,6 +12433,12 @@ def err_sycl_kernel_incorrectly_named : Error<
1243312433
"'-fsycl-unnamed-lambda' to enable unnamed kernel lambdas"
1243412434
"}0">;
1243512435

12436+
// SYCL free function kernels extension.
12437+
def note_free_function_kernel_param_type_not_fwd_declarable : Note<
12438+
"%0 is not forward declarable">;
12439+
def note_free_function_kernel_param_type_not_supported : Note<
12440+
"%0 is not yet supported as a free function kernel parameter">;
12441+
1243612442
def err_sycl_kernel_not_function_object
1243712443
: Error<"kernel parameter must be a lambda or function object">;
1243812444
def err_sycl_restrict : Error<

clang/include/clang/Basic/LangOptions.def

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,6 @@ LANGOPT(SYCLAllowFuncPtr , 1, 0, "Allow function pointers in SYCL device code")
307307
LANGOPT(SYCLStdLayoutKernelParams, 1, 0, "Enable standard layout requirement for SYCL kernel parameters")
308308
LANGOPT(SYCLUnnamedLambda , 1, 0, "Allow unnamed lambda SYCL kernels")
309309
LANGOPT(SYCLForceInlineKernelLambda , 1, 0, "Force inline SYCL kernel lambdas in entry point")
310-
LANGOPT(SYCLAllowAllFeaturesInConstexpr, 1, 0, "Allow all C++ features in SYCL device code in manifestly constant-evaluated expressions")
311310
LANGOPT(SYCLESIMDForceStatelessMem, 1, 0, "Make accessors use USM memory in ESIMD kernels")
312311
LANGOPT(SYCLESIMDBuildHostCode, 1, 1, "Build the host implementation of ESIMD functions")
313312
ENUM_LANGOPT(SYCLVersion , SYCLMajorVersion, 2, SYCL_None, "Version of the SYCL standard used")

0 commit comments

Comments
 (0)