Skip to content

Commit 5e66b4f

Browse files
sys-ce-bbsys-ce-bb
committed
Merge commit '9c4aab8ced72715ec9312b76eb3325d13c2895a2' into llvmspirv_pulldown
2 parents bd9e71b + 9c4aab8 commit 5e66b4f

File tree

4,922 files changed

+228938
-118081
lines changed

Some content is hidden

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

4,922 files changed

+228938
-118081
lines changed

‎.git-blame-ignore-revs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,3 +87,6 @@ e2c2ffbe7a1b5d9e32a2ce64279475b50c4cba5b
8787

8888
# [lldb][nfc] Deindent ProcessGDBRemote::SetThreadStopInfo by two levels
8989
b32931c5b32eb0d2cf37d688b34f8548c9674c19
90+
91+
# [libc++][NFC] Fix inconsistent quoting and spacing in our CSV files
92+
64946fdaf9864d8279da1c30e4d7214fe13d1427

‎.github/workflows/issue-write.yml

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,21 @@ jobs:
2424
github.event.workflow_run.conclusion == 'failure'
2525
)
2626
steps:
27+
- name: Fetch Sources
28+
uses: actions/checkout@v4
29+
with:
30+
sparse-checkout: |
31+
.github/workflows/unprivileged-download-artifact/action.yml
32+
sparse-checkout-cone-mode: false
2733
- name: 'Download artifact'
28-
uses: actions/download-artifact@6b208ae046db98c579e8a3aa621ab581ff575935 # v4.1.1
34+
uses: ./.github/workflows/unprivileged-download-artifact
35+
id: download-artifact
2936
with:
30-
github-token: ${{ secrets.ISSUE_WRITE_DOWNLOAD_ARTIFACT }}
3137
run-id: ${{ github.event.workflow_run.id }}
32-
name: workflow-args
38+
artifact-name: workflow-args
3339

3440
- name: 'Comment on PR'
41+
if: steps.download-artifact.outputs.artifact-id != ''
3542
uses: actions/github-script@v7
3643
with:
3744
github-token: ${{ secrets.GITHUB_TOKEN }}
@@ -144,5 +151,7 @@ jobs:
144151
});
145152
146153
- name: Dump comments file
147-
if: always()
154+
if: >-
155+
always() &&
156+
steps.download-artifact.outputs.artifact-id != ''
148157
run: cat comments

‎.github/workflows/llvm-project-tests.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,7 @@ jobs:
131131
-DCMAKE_BUILD_TYPE=Release \
132132
-DLLVM_ENABLE_ASSERTIONS=ON \
133133
-DLLDB_INCLUDE_TESTS=OFF \
134+
-DLIBCLC_TARGETS_TO_BUILD="amdgcn--;amdgcn--amdhsa;r600--;nvptx--;nvptx64--;nvptx--nvidiacl;nvptx64--nvidiacl" \
134135
-DCMAKE_C_COMPILER_LAUNCHER=sccache \
135136
-DCMAKE_CXX_COMPILER_LAUNCHER=sccache \
136137
$extra_cmake_args \
@@ -142,8 +143,6 @@ jobs:
142143
env:
143144
LLVM_BUILDDIR: ${{ steps.build-llvm.outputs.llvm-builddir }}
144145
run: |
145-
# Make sure all of LLVM libraries that llvm-config needs are built.
146+
# The libclc tests don't have a generated check target so all we can
147+
# do is build it.
146148
ninja -C "$LLVM_BUILDDIR"
147-
cmake -G Ninja -S libclc -B libclc-build -DLLVM_DIR="$LLVM_BUILDDIR"/lib/cmake/llvm -DLIBCLC_TARGETS_TO_BUILD="amdgcn--;amdgcn--amdhsa;r600--;nvptx--;nvptx64--;nvptx--nvidiacl;nvptx64--nvidiacl"
148-
ninja -C libclc-build
149-
ninja -C libclc-build test

‎.github/workflows/release-asset-audit.py

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
import github
2+
import sys
3+
4+
def main():
5+
token = sys.argv[1]
6+
7+
gh = github.Github(login_or_token=token)
8+
repo = gh.get_repo("llvm/llvm-project")
9+
10+
uploaders = set(
11+
[
12+
"DimitryAndric",
13+
"stefanp-ibm",
14+
"lei137",
15+
"omjavaid",
16+
"nicolerabjohn",
17+
"amy-kwan",
18+
"mandlebug",
19+
"zmodem",
20+
"androm3da",
21+
"tru",
22+
"rovka",
23+
"rorth",
24+
"quinnlp",
25+
"kamaub",
26+
"abrisco",
27+
"jakeegan",
28+
"maryammo",
29+
"tstellar",
30+
"github-actions[bot]",
31+
]
32+
)
33+
34+
for release in repo.get_releases():
35+
print("Release:", release.title)
36+
for asset in release.get_assets():
37+
created_at = asset.created_at
38+
updated_at = (
39+
"" if asset.created_at == asset.updated_at else asset.updated_at
40+
)
41+
print(
42+
f"{asset.name} : {asset.uploader.login} [{created_at} {updated_at}] ( {asset.download_count} )"
43+
)
44+
if asset.uploader.login not in uploaders:
45+
with open('comment', 'w') as file:
46+
file.write(f'@{asset.uploader.login} is not a valid uploader.')
47+
sys.exit(1)
48+
49+
50+
if __name__ == "__main__":
51+
main()

‎.github/workflows/release-asset-audit.yml

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
name: Release Asset Audit
2+
3+
on:
4+
workflow_dispatch:
5+
release:
6+
schedule:
7+
# * is a special character in YAML so you have to quote this string
8+
# Run once an hour
9+
- cron: '5 * * * *'
10+
11+
pull_request:
12+
paths:
13+
- ".github/workflows/release-asset-audit.py"
14+
- ".github/workflows/release-asset-audit.yml"
15+
16+
permissions:
17+
contents: read # Default everything to read-only
18+
19+
jobs:
20+
audit:
21+
name: "Release Asset Audit"
22+
runs-on: ubuntu-22.04
23+
if: github.repository == 'llvm/llvm-project'
24+
steps:
25+
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 #v4.1.6
26+
- name: "Run Audit Script"
27+
env:
28+
GITHUB_TOKEN: ${{ github.token }}
29+
run: |
30+
pip install --require-hashes -r ./llvm/utils/git/requirements.txt
31+
python3 ./.github/workflows/release-asset-audit.py $GITHUB_TOKEN
32+
- name: "File Issue"
33+
if: >-
34+
github.event_name != 'pull_request' &&
35+
failure()
36+
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea #v7.0.1
37+
with:
38+
github-token: ${{ secrets.ISSUE_SUBSCRIBER_TOKEN }}
39+
script: |
40+
var fs = require('fs');
41+
var body = ''
42+
if (fs.existsSync('./comment')) {
43+
body = fs.readFileSync('./comment') + "\n\n";
44+
}
45+
body = body + `\n\nhttps://github.com/${context.repo.owner}/${context.repo.repo}/actions/runs/${context.runId}`
46+
47+
const issue = await github.rest.issues.create({
48+
owner: context.repo.owner,
49+
repo: context.repo.repo,
50+
title: "Release Asset Audit Failed",
51+
labels: ['infrastructure'],
52+
body: body
53+
});
54+
console.log(issue);

‎.github/workflows/release-binaries-all.yml

Lines changed: 94 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,94 @@
1+
name: Release Binaries All
2+
3+
permissions:
4+
contents: read # Default everything to read-only
5+
6+
on:
7+
workflow_dispatch:
8+
inputs:
9+
release-version:
10+
description: 'Release Version'
11+
required: true
12+
type: string
13+
upload:
14+
description: 'Upload binaries to the release page'
15+
required: true
16+
default: false
17+
type: boolean
18+
19+
workflow_call:
20+
inputs:
21+
release-version:
22+
description: 'Release Version'
23+
required: true
24+
type: string
25+
upload:
26+
description: 'Upload binaries to the release page'
27+
required: true
28+
default: false
29+
type: boolean
30+
31+
pull_request:
32+
types:
33+
- opened
34+
- synchronize
35+
- reopened
36+
# When a PR is closed, we still start this workflow, but then skip
37+
# all the jobs, which makes it effectively a no-op. The reason to
38+
# do this is that it allows us to take advantage of concurrency groups
39+
# to cancel in progress CI jobs whenever the PR is closed.
40+
- closed
41+
paths:
42+
- '.github/workflows/release-binaries-all.yml'
43+
- '.github/workflows/release-binaries.yml'
44+
- '.github/workflows/release-binaries-setup-stage/*'
45+
- '.github/workflows/release-binaries-save-stage/*'
46+
47+
concurrency:
48+
group: ${{ github.workflow }}-${{ github.event.pull_request.number || 'dispatch' }}
49+
cancel-in-progress: True
50+
51+
jobs:
52+
setup-variables:
53+
if: >-
54+
(github.event_name != 'pull_request' || github.event.action != 'closed')
55+
runs-on: ubuntu-22.04
56+
outputs:
57+
release-version: ${{ steps.vars.outputs.release-version }}
58+
upload: ${{ steps.vars.outputs.upload }}
59+
steps:
60+
- shell: bash
61+
id: vars
62+
run: |
63+
upload="${{ inputs.upload }}"
64+
release_version="${{ inputs.release-version }}"
65+
if [ "${{ github.event_name }}" = "pull_request" ]; then
66+
upload="false"
67+
release_version=""
68+
fi
69+
echo "release-version=$release_version" >> "$GITHUB_OUTPUT"
70+
echo "upload=$upload" >> "$GITHUB_OUTPUT"
71+
72+
release-binaries-all:
73+
name: Build Release Binaries
74+
needs:
75+
- setup-variables
76+
permissions:
77+
contents: write # For release uploads
78+
id-token: write # For artifact attestations
79+
attestations: write # For artifact attestations
80+
strategy:
81+
fail-fast: false
82+
matrix:
83+
runs-on:
84+
- ubuntu-22.04
85+
- windows-2022
86+
- macos-13
87+
- macos-14
88+
89+
uses: ./.github/workflows/release-binaries.yml
90+
with:
91+
release-version: "${{ needs.setup-variables.outputs.release-version }}"
92+
upload: ${{ needs.setup-variables.outputs.upload == 'true'}}
93+
runs-on: "${{ matrix.runs-on }}"
94+

‎.github/workflows/release-binaries-save-stage/action.yml

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
name: Save Stage
2+
description: >-
3+
Upload the source and binary directories from a build stage so that they
4+
can be re-used in the next stage. This action is used to the release
5+
binaries workflow into multiple stages to avoid the 6 hour timeout on
6+
the GitHub hosted runners.
7+
inputs:
8+
build-prefix:
9+
description: "Directory containing the build directory."
10+
required: true
11+
type: 'string'
12+
13+
runs:
14+
using: "composite"
15+
steps:
16+
# We need to create an archive of the build directory, because it has too
17+
# many files to upload.
18+
- name: Package Build and Source Directories
19+
shell: bash
20+
run: |
21+
# Windows does not support symlinks, so we need to dereference them.
22+
tar --exclude build/ ${{ (runner.os == 'Windows' && '-h') || '' }} -c . | zstd -T0 -c > ../llvm-project.tar.zst
23+
mv ../llvm-project.tar.zst .
24+
tar -C ${{ inputs.build-prefix }} -c build/ | zstd -T0 -c > build.tar.zst
25+
26+
- name: Upload Stage 1 Source
27+
uses: actions/upload-artifact@26f96dfa697d77e81fd5907df203aa23a56210a8 #v4.3.0
28+
with:
29+
name: ${{ runner.os }}-${{ runner.arch }}-${{ github.job }}-source
30+
path: llvm-project.tar.zst
31+
retention-days: 2
32+
33+
- name: Upload Stage 1 Build Dir
34+
uses: actions/upload-artifact@26f96dfa697d77e81fd5907df203aa23a56210a8 #v4.3.0
35+
with:
36+
name: ${{ runner.os}}-${{ runner.arch }}-${{ github.job }}-build
37+
path: build.tar.zst
38+
retention-days: 2

‎.github/workflows/release-binaries-setup-stage/action.yml

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
name: Setup Stage
2+
description: >-
3+
Setup the next stage of the release binaries workflow. This sets up the
4+
environment correctly for a new stage of the release binaries workflow
5+
and also restores the source and build directory from the previous stage.
6+
7+
inputs:
8+
previous-artifact:
9+
description: >-
10+
A unique descriptor for the artifact from the previous stage. This will
11+
be used to construct the final artifact pattern, which is:
12+
$RUNNER_OS-$RUNNER_ARCH-$PREVIOUS_ARTIFACT-*
13+
required: false
14+
type: 'string'
15+
16+
outputs:
17+
build-prefix:
18+
description: "Directory containing the build directory."
19+
value: ${{ steps.build-prefix.outputs.build-prefix }}
20+
21+
runs:
22+
using: "composite"
23+
steps:
24+
- name: Install Ninja
25+
uses: llvm/actions/install-ninja@22e9f909d35b50bd1181709564bfe816eaeaae81 # main
26+
27+
- name: Setup Windows
28+
if: startsWith(runner.os, 'Windows')
29+
uses: llvm/actions/setup-windows@main
30+
with:
31+
arch: amd64
32+
33+
- name: Set Build Prefix
34+
id: build-prefix
35+
shell: bash
36+
run: |
37+
build_prefix=`pwd`
38+
if [ "${{ runner.os }}" = "Linux" ]; then
39+
sudo chown $USER:$USER /mnt/
40+
build_prefix=/mnt/
41+
fi
42+
echo "build-prefix=$build_prefix" >> $GITHUB_OUTPUT
43+
44+
- name: Download Previous Stage Artifact
45+
if: ${{ inputs.previous-artifact }}
46+
id: download
47+
uses: actions/download-artifact@6b208ae046db98c579e8a3aa621ab581ff575935 # v4.1.1
48+
with:
49+
pattern: ${{ runner.os }}-${{ runner.arch }}-${{ inputs.previous-artifact }}-*
50+
merge-multiple: true
51+
52+
- name: Unpack Artifact
53+
if: ${{ steps.download.outputs.download-path }}
54+
shell: bash
55+
run: |
56+
tar --zstd -xf llvm-project.tar.zst
57+
rm llvm-project.tar.zst
58+
tar --zstd -C ${{ steps.build-prefix.outputs.build-prefix}} -xf build.tar.zst
59+
rm build.tar.zst

0 commit comments

Comments
 (0)