Skip to content

Commit b6c0aa2

Browse files
committed
Merge remote-tracking branch 'origin/sycl' into fix-bfloat16-coop
2 parents a0488cb + 8ef14d5 commit b6c0aa2

File tree

662 files changed

+12727
-5099
lines changed

Some content is hidden

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

662 files changed

+12727
-5099
lines changed

.github/workflows/docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ jobs:
6565
fetch-depth: 1
6666
- name: Get subprojects that have doc changes
6767
id: docs-changed-subprojects
68-
uses: tj-actions/changed-files@v44
68+
uses: tj-actions/changed-files@v45
6969
with:
7070
files_yaml: |
7171
llvm:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232

3333
- name: Get changed files
3434
id: changed-files
35-
uses: tj-actions/changed-files@v44
35+
uses: tj-actions/changed-files@v45
3636
with:
3737
separator: ","
3838
skip_initial_fetch: true

.github/workflows/release-binaries.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -428,7 +428,7 @@ jobs:
428428

429429
- name: Attest Build Provenance
430430
id: provenance
431-
uses: actions/attest-build-provenance@897ed5eab6ed058a474202017ada7f40bfa52940 # v1.0.0
431+
uses: actions/attest-build-provenance@1c608d11d69870c2092266b3f9a6f3abbf17002c # v1.4.3
432432
with:
433433
subject-path: ${{ needs.prepare.outputs.release-binary-filename }}
434434

.github/workflows/release-sources.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ jobs:
9292
- name: Attest Build Provenance
9393
if: github.event_name != 'pull_request'
9494
id: provenance
95-
uses: actions/attest-build-provenance@897ed5eab6ed058a474202017ada7f40bfa52940 # v1.0.0
95+
uses: actions/attest-build-provenance@1c608d11d69870c2092266b3f9a6f3abbf17002c # v1.4.3
9696
with:
9797
subject-path: "*.xz"
9898
- if: github.event_name != 'pull_request'

.github/workflows/scorecard.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
persist-credentials: false
3737

3838
- name: "Run analysis"
39-
uses: ossf/scorecard-action@dc50aa9510b46c811795eb24b2f1ba02a914e534 # v2.3.3
39+
uses: ossf/scorecard-action@62b2cac7ed8198b15735ed49ab1e5cf35480ba46 # v2.4.0
4040
with:
4141
results_file: results.sarif
4242
results_format: sarif
@@ -57,6 +57,6 @@ jobs:
5757

5858
# Upload the results to GitHub's code scanning dashboard.
5959
- name: "Upload to code-scanning"
60-
uses: github/codeql-action/upload-sarif@b611370bb5703a7efb587f9d136a52ea24c5c38c # v3.25.11
60+
uses: github/codeql-action/upload-sarif@e2b3eafc8d227b0241d48be5f425d47c2d750a13 # v3.26.10
6161
with:
6262
sarif_file: results.sarif

.github/workflows/sycl-docs.yml

Lines changed: 25 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -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:
@@ -35,24 +43,18 @@ jobs:
3543
-s $GITHUB_WORKSPACE/repo -o $GITHUB_WORKSPACE/build -t Release --docs
3644
cmake --build . --target docs-sycl-html
3745
cmake --build . --target docs-clang-html
38-
- name: Deploy
39-
if: ${{ github.event_name == 'schedule' }}
40-
env:
41-
SSH_KEY: ${{secrets.ACTIONS_DEPLOY_KEY}}
42-
run: |
43-
mkdir -p ~/.ssh
44-
echo "$SSH_KEY" > ~/.ssh/id_rsa
45-
chmod 600 ~/.ssh/id_rsa
46-
eval "$(ssh-agent -s)"
47-
ssh-add -k ~/.ssh/id_rsa
48-
git clone [email protected]:intel/llvm-docs.git docs
49-
cd $GITHUB_WORKSPACE/docs
50-
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/
5152
touch .nojekyll
52-
yes | \cp -rf $GITHUB_WORKSPACE/build/tools/sycl/doc/html/* .
53-
mv $GITHUB_WORKSPACE/build/tools/clang/docs/html clang/
54-
git config --global user.name "iclsrc"
55-
git config --global user.email "[email protected]"
56-
git add .
57-
git diff-index --quiet HEAD || git commit --amend -m "Update docs" -s
58-
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-linux-run-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ permissions:
151151

152152
jobs:
153153
run:
154-
if: inputs.skip_run == 'false'
154+
if: github.event_name == 'workflow_dispatch' || inputs.skip_run == 'false'
155155
name: ${{ inputs.name }}
156156
runs-on: ${{ fromJSON(inputs.runner) }}
157157
container:

.github/workflows/sycl-nightly.yml

Lines changed: 3 additions & 3 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
@@ -198,7 +198,7 @@ jobs:
198198
echo "TAG=$(date +'%Y-%m-%d')-${GITHUB_SHA::7}" >> "$GITHUB_OUTPUT"
199199
fi
200200
- name: Upload binaries
201-
uses: softprops/action-gh-release@a74c6b72af54cfa997e81df42d94703d6313a2d0
201+
uses: softprops/action-gh-release@c062e08bd532815e2082a85e87e3ef29c3e6d191
202202
with:
203203
files: |
204204
sycl_linux.tar.gz

.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

0 commit comments

Comments
 (0)