Skip to content

Commit f8f6916

Browse files
Merge remote-tracking branch 'whitneywhtsang/merge' into sycl-mlir
2 parents d45ee0c + 1e90026 commit f8f6916

File tree

11,791 files changed

+756870
-1777645
lines changed

Some content is hidden

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

11,791 files changed

+756870
-1777645
lines changed

.github/workflows/issue-release-workflow.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,14 @@ env:
2929
jobs:
3030
backport-commits:
3131
name: Backport Commits
32-
runs-on: ubuntu-20.04
32+
runs-on: ubuntu-latest
3333
if: >-
3434
(github.repository == 'llvm/llvm-project') &&
3535
!startswith(github.event.comment.body, '<!--IGNORE-->') &&
3636
contains(github.event.action == 'opened' && github.event.issue.body || github.event.comment.body, '/cherry-pick')
3737
steps:
3838
- name: Fetch LLVM sources
39-
uses: actions/checkout@v2
39+
uses: actions/checkout@v3
4040
with:
4141
repository: llvm/llvm-project
4242
# GitHub stores the token used for checkout and uses it for pushes
@@ -63,15 +63,15 @@ jobs:
6363
6464
create-pull-request:
6565
name: Create Pull Request
66-
runs-on: ubuntu-20.04
66+
runs-on: ubuntu-latest
6767
if: >-
6868
(github.repository == 'llvm/llvm-project') &&
6969
!startswith(github.event.comment.body, '<!--IGNORE-->') &&
7070
contains(github.event.comment.body, '/branch')
7171
7272
steps:
7373
- name: Fetch LLVM sources
74-
uses: actions/checkout@v2
74+
uses: actions/checkout@v3
7575
with:
7676
persist-credentials: false
7777

.github/workflows/libclang-abi-tests.yml

Lines changed: 48 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ concurrency:
2323
group: ${{ github.workflow }}-${{ github.ref }}
2424
cancel-in-progress: ${{ startsWith(github.ref, 'refs/pull/') }}
2525

26-
2726
jobs:
2827
abi-dump-setup:
2928
if: github.repository_owner == 'llvm'
@@ -57,28 +56,27 @@ jobs:
5756
baseline_ref="llvmorg-$major_version.0.0"
5857
5958
# If there is a minor release, we want to use that as the base line.
60-
minor_ref=`git ls-remote --refs -t $remote_repo llvmorg-$major_version.[1-9].[0-9] | tail -n1 | grep -o 'llvmorg-.\+' || true`
59+
minor_ref=$(git ls-remote --refs -t $remote_repo llvmorg-$major_version.[1-9].[0-9] | tail -n1 | grep -o 'llvmorg-.\+' || true)
6160
if [ -n "$minor_ref" ]; then
6261
baseline_ref=$minor_ref
6362
else
6463
# Check if we have a release candidate
65-
rc_ref=`git ls-remote --refs -t $remote_repo llvmorg-$major_version.[1-9].[0-9]-rc* | tail -n1 | grep -o 'llvmorg-.\+' || true`
64+
rc_ref=$(git ls-remote --refs -t $remote_repo llvmorg-$major_version.[1-9].[0-9]-rc* | tail -n1 | grep -o 'llvmorg-.\+' || true)
6665
if [ -n "$rc_ref" ]; then
6766
baseline_ref=$rc_ref
6867
fi
6968
fi
70-
echo ::set-output name=BASELINE_VERSION_MAJOR::$major_version
71-
echo ::set-output name=BASELINE_REF::$baseline_ref
72-
echo ::set-output name=ABI_HEADERS::clang-c
73-
echo ::set-output name=ABI_LIBS::libclang.so
69+
echo "BASELINE_VERSION_MAJOR=$major_version" >> $GITHUB_OUTPUT
70+
echo "BASELINE_REF=$baseline_ref" >> $GITHUB_OUTPUT
71+
echo "ABI_HEADERS=clang-c" >> $GITHUB_OUTPUT
72+
echo "ABI_LIBS=libclang.so" >> $GITHUB_OUTPUT
7473
else
75-
echo ::set-output name=BASELINE_VERSION_MAJOR::${{ steps.version.outputs.LLVM_VERSION_MAJOR }}
76-
echo ::set-output name=BASELINE_REF::llvmorg-${{ steps.version.outputs.LLVM_VERSION_MAJOR }}.0.0
77-
echo ::set-output name=ABI_HEADERS::.
78-
echo ::set-output name=ABI_LIBS::libclang.so libclang-cpp.so
74+
echo "BASELINE_VERSION_MAJOR=${{ steps.version.outputs.LLVM_VERSION_MAJOR }}" >> $GITHUB_OUTPUT
75+
echo "BASELINE_REF=llvmorg-${{ steps.version.outputs.LLVM_VERSION_MAJOR }}.0.0" >> $GITHUB_OUTPUT
76+
echo "ABI_HEADERS=." >> $GITHUB_OUTPUT
77+
echo "ABI_LIBS=libclang.so libclang-cpp.so" >> $GITHUB_OUTPUT
7978
fi
8079
81-
8280
abi-dump:
8381
if: github.repository_owner == 'llvm'
8482
needs: abi-dump-setup
@@ -98,41 +96,41 @@ jobs:
9896
ref: ${{ github.sha }}
9997
repo: ${{ github.repository }}
10098
steps:
101-
- name: Install Ninja
102-
uses: llvm/actions/install-ninja@main
103-
- name: Install abi-compliance-checker
104-
run: |
105-
sudo apt-get install abi-dumper autoconf pkg-config
106-
- name: Install universal-ctags
107-
run: |
108-
git clone https://github.com/universal-ctags/ctags.git
109-
cd ctags
110-
./autogen.sh
111-
./configure
112-
sudo make install
113-
- name: Download source code
114-
uses: llvm/actions/get-llvm-project-src@main
115-
with:
116-
ref: ${{ matrix.ref }}
117-
repo: ${{ matrix.repo }}
118-
- name: Configure
119-
run: |
120-
mkdir install
121-
cmake -B build -S llvm -G Ninja -DLLVM_ENABLE_PROJECTS=clang -DCMAKE_BUILD_TYPE=Debug -DLLVM_TARGETS_TO_BUILD="" -DLLVM_BUILD_LLVM_DYLIB=ON -DLLVM_LINK_LLVM_DYLIB=ON -DCMAKE_C_FLAGS_DEBUG="-g1 -Og" -DCMAKE_CXX_FLAGS_DEBUG="-g1 -Og" -DCMAKE_INSTALL_PREFIX=`pwd`/install llvm
122-
- name: Build
123-
run: ninja -C build/ ${{ needs.abi-dump-setup.outputs.ABI_LIBS }} install-clang-headers
124-
- name: Dump ABI
125-
run: |
126-
parallel abi-dumper -lver ${{ matrix.ref }} -skip-cxx -public-headers ./install/include/${{ needs.abi-dump-setup.outputs.ABI_HEADERS }} -o {}-${{ matrix.ref }}.abi ./build/lib/{} ::: ${{ needs.abi-dump-setup.outputs.ABI_LIBS }}
127-
for lib in ${{ needs.abi-dump-setup.outputs.ABI_LIBS }}; do
128-
# Remove symbol versioning from dumps, so we can compare across major versions.
129-
sed -i 's/LLVM_[0-9]\+/LLVM_NOVERSION/' $lib-${{ matrix.ref }}.abi
130-
done
131-
- name: Upload ABI file
132-
uses: actions/upload-artifact@v2
133-
with:
134-
name: ${{ matrix.name }}
135-
path: "*${{ matrix.ref }}.abi"
99+
- name: Install Ninja
100+
uses: llvm/actions/install-ninja@main
101+
- name: Install abi-compliance-checker
102+
run: |
103+
sudo apt-get install abi-dumper autoconf pkg-config
104+
- name: Install universal-ctags
105+
run: |
106+
git clone https://github.com/universal-ctags/ctags.git
107+
cd ctags
108+
./autogen.sh
109+
./configure
110+
sudo make install
111+
- name: Download source code
112+
uses: llvm/actions/get-llvm-project-src@main
113+
with:
114+
ref: ${{ matrix.ref }}
115+
repo: ${{ matrix.repo }}
116+
- name: Configure
117+
run: |
118+
mkdir install
119+
cmake -B build -S llvm -G Ninja -DLLVM_ENABLE_PROJECTS=clang -DCMAKE_BUILD_TYPE=Debug -DLLVM_TARGETS_TO_BUILD="" -DLLVM_BUILD_LLVM_DYLIB=ON -DLLVM_LINK_LLVM_DYLIB=ON -DCMAKE_C_FLAGS_DEBUG="-g1 -Og" -DCMAKE_CXX_FLAGS_DEBUG="-g1 -Og" -DCMAKE_INSTALL_PREFIX=$(pwd)/install llvm
120+
- name: Build
121+
run: ninja -C build/ ${{ needs.abi-dump-setup.outputs.ABI_LIBS }} install-clang-headers
122+
- name: Dump ABI
123+
run: |
124+
parallel abi-dumper -lver ${{ matrix.ref }} -skip-cxx -public-headers ./install/include/${{ needs.abi-dump-setup.outputs.ABI_HEADERS }} -o {}-${{ matrix.ref }}.abi ./build/lib/{} ::: ${{ needs.abi-dump-setup.outputs.ABI_LIBS }}
125+
for lib in ${{ needs.abi-dump-setup.outputs.ABI_LIBS }}; do
126+
# Remove symbol versioning from dumps, so we can compare across major versions.
127+
sed -i 's/LLVM_[0-9]\+/LLVM_NOVERSION/' $lib-${{ matrix.ref }}.abi
128+
done
129+
- name: Upload ABI file
130+
uses: actions/upload-artifact@v3
131+
with:
132+
name: ${{ matrix.name }}
133+
path: '*${{ matrix.ref }}.abi'
136134

137135
abi-compare:
138136
if: github.repository_owner == 'llvm'
@@ -142,11 +140,11 @@ jobs:
142140
- abi-dump
143141
steps:
144142
- name: Download baseline
145-
uses: actions/download-artifact@v1
143+
uses: actions/download-artifact@v3
146144
with:
147145
name: build-baseline
148146
- name: Download latest
149-
uses: actions/download-artifact@v1
147+
uses: actions/download-artifact@v3
150148
with:
151149
name: build-latest
152150

@@ -159,8 +157,7 @@ jobs:
159157
done
160158
- name: Upload ABI Comparison
161159
if: always()
162-
uses: actions/upload-artifact@v2
160+
uses: actions/upload-artifact@v3
163161
with:
164162
name: compat-report-${{ github.sha }}
165163
path: compat_reports/
166-

.github/workflows/lldb-tests.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ concurrency:
2929
group: ${{ github.workflow }}-${{ github.ref }}
3030
cancel-in-progress: ${{ startsWith(github.ref, 'refs/pull/') }}
3131

32-
3332
jobs:
3433
build_lldb:
3534
if: github.repository_owner == 'llvm'

.github/workflows/llvm-bugs.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,13 @@ jobs:
99
auto-subscribe:
1010
runs-on: ubuntu-latest
1111
steps:
12-
- uses: actions/setup-node@v2
12+
- uses: actions/setup-node@v3
1313
with:
14-
node-version: 14
14+
node-version: 18
15+
check-latest: true
1516
- run: npm install mailgun.js form-data
1617
- name: Send notification
17-
uses: actions/github-script@v5
18+
uses: actions/github-script@v6
1819
env:
1920
MAILGUN_API_KEY: ${{ secrets.LLVM_BUGS_KEY }}
2021
with:

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ concurrency:
2222
# Cancel intermediate builds: only if it is a pull request build.
2323
# If the group name here is the same as the group name in the workflow that includes
2424
# this one, then the action will try to wait on itself and get stuck.
25-
group: llvm-project-${{ github.workflow }}-${{ inputs.projects}}${{ github.ref }}
25+
group: llvm-project-${{ github.workflow }}-${{ inputs.projects }}${{ github.ref }}
2626
cancel-in-progress: ${{ startsWith(github.ref, 'refs/pull/') }}
2727

2828
jobs:
@@ -53,7 +53,7 @@ jobs:
5353
- name: Setup Python
5454
uses: actions/setup-python@v4
5555
with:
56-
python-version: '3.10'
56+
python-version: '3.11'
5757
- name: Install Ninja
5858
uses: llvm/actions/install-ninja@main
5959
# actions/checkout deletes any existing files in the new git directory,
@@ -83,13 +83,13 @@ jobs:
8383
PKG_CONFIG_PATH: /usr/local/Homebrew/Library/Homebrew/os/mac/pkgconfig//12
8484
with:
8585
cmake_args: '-GNinja -DLLVM_ENABLE_PROJECTS="${{ inputs.projects }}" -DCMAKE_BUILD_TYPE=Release -DLLDB_INCLUDE_TESTS=OFF -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'
86-
build_target: '${{ inputs.build_target }}'
86+
build_target: '${{ inputs.build_target }}'
8787

8888
- name: Build and Test libclc
8989
if: "!startsWith(matrix.os, 'windows') && contains(inputs.projects, 'libclc')"
9090
run: |
9191
# Make sure all of LLVM libraries that llvm-config needs are built.
9292
ninja -C build
93-
cmake -G Ninja -S libclc -B libclc-build -DLLVM_CONFIG=`pwd`/build/bin/llvm-config -DLIBCLC_TARGETS_TO_BUILD="amdgcn--;amdgcn--amdhsa;r600--;nvptx--;nvptx64--;nvptx--nvidiacl;nvptx64--nvidiacl"
93+
cmake -G Ninja -S libclc -B libclc-build -DLLVM_DIR=$(pwd)/build/lib/cmake/llvm -DLIBCLC_TARGETS_TO_BUILD="amdgcn--;amdgcn--amdhsa;r600--;nvptx--;nvptx64--;nvptx--nvidiacl;nvptx64--nvidiacl"
9494
ninja -C libclc-build
9595
ninja -C libclc-build test

0 commit comments

Comments
 (0)