Skip to content

Commit ad4aa1f

Browse files
committed
Merge branch 'main' into HEAD
2 parents 9217419 + 7674811 commit ad4aa1f

File tree

9,080 files changed

+586690
-268239
lines changed

Some content is hidden

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

9,080 files changed

+586690
-268239
lines changed

.ci/generate-buildkite-pipeline-premerge

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ function add-dependencies() {
9191
echo "${project}"
9292
case ${project} in
9393
bolt)
94-
for p in lld llvm; do
94+
for p in clang lld llvm; do
9595
echo $p
9696
done
9797
;;

.ci/monolithic-linux.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ cmake -S "${MONOREPO_ROOT}"/llvm -B "${BUILD_DIR}" \
4848
-D LLVM_LIT_ARGS="-v --xunit-xml-output ${BUILD_DIR}/test-results.xml --timeout=1200 --time-tests" \
4949
-D LLVM_ENABLE_LLD=ON \
5050
-D CMAKE_CXX_FLAGS=-gmlt \
51-
-D BOLT_CLANG_EXE=/usr/bin/clang \
5251
-D LLVM_CCACHE_BUILD=ON \
5352
-D MLIR_ENABLE_BINDINGS_PYTHON=ON
5453

.github/CODEOWNERS

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
/llvm/lib/Analysis/ScalarEvolution.cpp @nikic
2424
/llvm/lib/Analysis/ValueTracking.cpp @nikic
2525
/llvm/lib/IR/ConstantRange.cpp @nikic
26+
/llvm/lib/IR/Core.cpp @nikic
2627
/llvm/lib/Transforms/Scalar/CorrelatedValuePropagation.cpp @nikic
2728
/llvm/lib/Transforms/Scalar/MemCpyOptimizer.cpp @nikic
2829
/llvm/lib/Transforms/InstCombine/ @nikic
@@ -35,6 +36,10 @@
3536
clang/lib/AST/Interp/ @tbaederr
3637
clang/test/AST/Interp/ @tbaederr
3738

39+
/clang/include/clang/CIR @lanza @bcardosolopes
40+
/clang/lib/CIR @lanza @bcardosolopes
41+
/clang/tools/cir-* @lanza @bcardosolopes
42+
3843
/lldb/ @JDevlieghere
3944

4045
# MLIR Interfaces.
@@ -59,8 +64,8 @@ clang/test/AST/Interp/ @tbaederr
5964
/mlir/Dialect/*/Transforms/Bufferize.cpp @matthias-springer
6065

6166
# Linalg Dialect in MLIR.
62-
/mlir/include/mlir/Dialect/Linalg/* @dcaballe @nicolasvasilache
63-
/mlir/lib/Dialect/Linalg/* @dcaballe @nicolasvasilache
67+
/mlir/include/mlir/Dialect/Linalg/* @dcaballe @nicolasvasilache @rengolin
68+
/mlir/lib/Dialect/Linalg/* @dcaballe @nicolasvasilache @rengolin
6469
/mlir/lib/Dialect/Linalg/Transforms/DecomposeLinalgOps.cpp @MaheshRavishankar @nicolasvasilache
6570
/mlir/lib/Dialect/Linalg/Transforms/DropUnitDims.cpp @MaheshRavishankar @nicolasvasilache
6671
/mlir/lib/Dialect/Linalg/Transforms/ElementwiseOpFusion.cpp @MaheshRavishankar @nicolasvasilache
@@ -127,7 +132,7 @@ clang/test/AST/Interp/ @tbaederr
127132
/bolt/ @aaupov @maksfb @rafaelauler @ayermolo @dcci
128133

129134
# Bazel build system.
130-
/utils/bazel/ @rupprecht
135+
/utils/bazel/ @rupprecht @keith
131136

132137
# InstallAPI and TextAPI
133138
/llvm/**/TextAPI/ @cyndyishida

.github/new-prs-labeler.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
BOLT:
2+
- bolt/**/*
3+
14
ClangIR:
25
- clang/include/clang/CIR/**/*
36
- clang/lib/CIR/**/*
@@ -236,7 +239,7 @@ mlir:dlti:
236239
- mlir/**/DLTI/**
237240

238241
mlir:emitc:
239-
- mlir/**/EmitC/**
242+
- mlir/**/*EmitC*/**
240243
- mlir/lib/Target/Cpp/**
241244

242245
mlir:func:
@@ -303,7 +306,7 @@ mlir:tensor:
303306
- mlir/**/Tensor/**
304307

305308
mlir:tosa:
306-
- mlir/**/Tosa/**
309+
- mlir/**/*Tosa*/**
307310

308311
mlir:ub:
309312
- mlir/**/UB/**
@@ -467,6 +470,7 @@ backend:m68k:
467470

468471
libc++:
469472
- libcxx/**
473+
- .github/workflows/libcxx-*
470474

471475
libc++abi:
472476
- libcxxabi/**

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

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

5454
- name: Setup Environment
5555
run: |
56-
pip install -r ./llvm/utils/git/requirements.txt
56+
pip install --require-hashes -r ./llvm/utils/git/requirements.txt
5757
./llvm/utils/git/github-automation.py --token ${{ github.token }} setup-llvmbot-git
5858
5959
- name: Backport Commits

.github/workflows/issue-subscriber.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
- name: Setup Automation Script
2323
working-directory: ./llvm/utils/git/
2424
run: |
25-
pip install -r requirements.txt
25+
pip install --require-hashes -r requirements.txt
2626
2727
- name: Update watchers
2828
working-directory: ./llvm/utils/git/

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ jobs:
3333
ABI_HEADERS: ${{ steps.vars.outputs.ABI_HEADERS }}
3434
ABI_LIBS: ${{ steps.vars.outputs.ABI_LIBS }}
3535
BASELINE_VERSION_MAJOR: ${{ steps.vars.outputs.BASELINE_VERSION_MAJOR }}
36-
BASELINE_VERSION_MINOR: ${{ steps.vars.outputs.BASELINE_VERSION_MINOR }}
3736
LLVM_VERSION_MAJOR: ${{ steps.version.outputs.LLVM_VERSION_MAJOR }}
3837
LLVM_VERSION_MINOR: ${{ steps.version.outputs.LLVM_VERSION_MINOR }}
3938
LLVM_VERSION_PATCH: ${{ steps.version.outputs.LLVM_VERSION_PATCH }}
@@ -51,9 +50,9 @@ jobs:
5150
id: vars
5251
run: |
5352
remote_repo='https://github.com/llvm/llvm-project'
54-
if [ ${{ steps.version.outputs.LLVM_VERSION_MINOR }} -ne 0 ] || [ ${{ steps.version.outputs.LLVM_VERSION_PATCH }} -eq 0 ]; then
53+
if [ ${{ steps.version.outputs.LLVM_VERSION_PATCH }} -eq 0 ]; then
5554
major_version=$(( ${{ steps.version.outputs.LLVM_VERSION_MAJOR }} - 1))
56-
baseline_ref="llvmorg-$major_version.0.0"
55+
baseline_ref="llvmorg-$major_version.1.0"
5756
5857
# If there is a minor release, we want to use that as the base line.
5958
minor_ref=$(git ls-remote --refs -t "$remote_repo" llvmorg-"$major_version".[1-9].[0-9] | tail -n1 | grep -o 'llvmorg-.\+' || true)
@@ -75,7 +74,7 @@ jobs:
7574
else
7675
{
7776
echo "BASELINE_VERSION_MAJOR=${{ steps.version.outputs.LLVM_VERSION_MAJOR }}"
78-
echo "BASELINE_REF=llvmorg-${{ steps.version.outputs.LLVM_VERSION_MAJOR }}.0.0"
77+
echo "BASELINE_REF=llvmorg-${{ steps.version.outputs.LLVM_VERSION_MAJOR }}.1.0"
7978
echo "ABI_HEADERS=."
8079
echo "ABI_LIBS=libclang.so libclang-cpp.so"
8180
} >> "$GITHUB_OUTPUT"

.github/workflows/libcxx-build-and-test.yaml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -61,20 +61,17 @@ jobs:
6161
]
6262
cc: [ 'clang-19' ]
6363
cxx: [ 'clang++-19' ]
64-
clang_tidy: [ 'ON' ]
6564
include:
6665
- config: 'generic-gcc'
6766
cc: 'gcc-13'
6867
cxx: 'g++-13'
69-
clang_tidy: 'OFF'
7068
steps:
7169
- uses: actions/checkout@v4
7270
- name: ${{ matrix.config }}.${{ matrix.cxx }}
7371
run: libcxx/utils/ci/run-buildbot ${{ matrix.config }}
7472
env:
7573
CC: ${{ matrix.cc }}
7674
CXX: ${{ matrix.cxx }}
77-
ENABLE_CLANG_TIDY: ${{ matrix.clang_tidy }}
7875
- uses: actions/upload-artifact@26f96dfa697d77e81fd5907df203aa23a56210a8 # v4.3.0
7976
if: always()
8077
with:
@@ -102,28 +99,23 @@ jobs:
10299
]
103100
cc: [ 'clang-19' ]
104101
cxx: [ 'clang++-19' ]
105-
clang_tidy: [ 'ON' ]
106102
include:
107103
- config: 'generic-gcc-cxx11'
108104
cc: 'gcc-13'
109105
cxx: 'g++-13'
110-
clang_tidy: 'OFF'
111106
- config: 'generic-cxx23'
112107
cc: 'clang-17'
113108
cxx: 'clang++-17'
114-
clang_tidy: 'OFF'
115109
- config: 'generic-cxx26'
116110
cc: 'clang-18'
117111
cxx: 'clang++-18'
118-
clang_tidy: 'ON'
119112
steps:
120113
- uses: actions/checkout@v4
121114
- name: ${{ matrix.config }}
122115
run: libcxx/utils/ci/run-buildbot ${{ matrix.config }}
123116
env:
124117
CC: ${{ matrix.cc }}
125118
CXX: ${{ matrix.cxx }}
126-
ENABLE_CLANG_TIDY: ${{ matrix.clang_tidy }}
127119
- uses: actions/upload-artifact@26f96dfa697d77e81fd5907df203aa23a56210a8 # v4.3.0
128120
if: always() # Upload artifacts even if the build or test suite fails
129121
with:
@@ -188,7 +180,6 @@ jobs:
188180
env:
189181
CC: clang-19
190182
CXX: clang++-19
191-
ENABLE_CLANG_TIDY: "OFF"
192183
- uses: actions/upload-artifact@26f96dfa697d77e81fd5907df203aa23a56210a8 # v4.3.0
193184
if: always()
194185
with:

.github/workflows/llvm-bugs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
runs-on: ubuntu-latest
1515
if: github.repository == 'llvm/llvm-project'
1616
steps:
17-
- uses: actions/setup-node@v3
17+
- uses: actions/setup-node@v4
1818
with:
1919
node-version: 18
2020
check-latest: true

.github/workflows/merged-prs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
- name: Setup Automation Script
3030
working-directory: ./llvm/utils/git/
3131
run: |
32-
pip install -r requirements.txt
32+
pip install --require-hashes -r requirements.txt
3333
3434
- name: Add Buildbot information comment
3535
working-directory: ./llvm/utils/git/

.github/workflows/new-prs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
- name: Setup Automation Script
4444
working-directory: ./llvm/utils/git/
4545
run: |
46-
pip install -r requirements.txt
46+
pip install --require-hashes -r requirements.txt
4747
4848
- name: Greet Author
4949
working-directory: ./llvm/utils/git/
Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
name: PR Request Release Note
2+
3+
permissions:
4+
contents: read
5+
pull-requests: write
6+
7+
on:
8+
pull_request:
9+
types:
10+
- closed
11+
12+
jobs:
13+
request-release-note:
14+
if: >-
15+
github.repository_owner == 'llvm' &&
16+
startsWith(github.ref, 'refs/heads/release')
17+
18+
runs-on: ubuntu-latest
19+
steps:
20+
# We need to pull the script from the main branch, so that we ensure
21+
# we get the latest version of this script.
22+
- name: Checkout Scripts
23+
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
24+
with:
25+
sparse-checkout: |
26+
llvm/utils/git/requirements.txt
27+
llvm/utils/git/github-automation.py
28+
sparse-checkout-cone-mode: false
29+
30+
- name: Install Dependencies
31+
run: |
32+
pip install --require-hashes -r llvm/utils/git/requirements.txt
33+
34+
- name: Request Release Note
35+
env:
36+
# We need to use an llvmbot token here, because we are mentioning a user.
37+
GITHUB_TOKEN: ${{ github.token }}
38+
run: |
39+
python3 llvm/utils/git/github-automation.py \
40+
--repo "$GITHUB_REPOSITORY" \
41+
--token "$GITHUB_TOKEN" \
42+
request-release-note \
43+
--pr-number ${{ github.event.pull_request.number}}

.github/workflows/pr-subscriber.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
- name: Setup Automation Script
2323
working-directory: ./llvm/utils/git/
2424
run: |
25-
pip install -r requirements.txt
25+
pip install --require-hashes -r requirements.txt
2626
2727
- name: Update watchers
2828
working-directory: ./llvm/utils/git/

0 commit comments

Comments
 (0)