Skip to content

Commit dbb903f

Browse files
committed
Merge branch 'main' of github.com:llvm/llvm-project into DefaultLambdaCapture
2 parents 35df1c6 + 3cb2174 commit dbb903f

File tree

2,729 files changed

+100754
-49267
lines changed

Some content is hidden

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

2,729 files changed

+100754
-49267
lines changed

.ci/all_requirements.txt

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -194,9 +194,9 @@ ml-dtypes==0.5.1 ; python_version < "3.13" \
194194
--hash=sha256:d13755f8e8445b3870114e5b6240facaa7cb0c3361e54beba3e07fa912a6e12b \
195195
--hash=sha256:fd918d4e6a4e0c110e2e05be7a7814d10dc1b95872accbf6512b80a109b71ae1
196196
# via -r mlir/python/requirements.txt
197-
nanobind==2.7.0 \
198-
--hash=sha256:73b12d0e751d140d6c1bf4b215e18818a8debfdb374f08dc3776ad208d808e74 \
199-
--hash=sha256:f9f1b160580c50dcf37b6495a0fd5ec61dc0d95dae5f8004f87dd9ad7eb46b34
197+
nanobind==2.9.2 \
198+
--hash=sha256:c37957ffd5eac7eda349cff3622ecd32e5ee1244ecc912c99b5bc8188bafd16e \
199+
--hash=sha256:e7608472de99d375759814cab3e2c94aba3f9ec80e62cfef8ced495ca5c27d6e
200200
# via -r mlir/python/requirements.txt
201201
numpy==2.0.2 \
202202
--hash=sha256:0123ffdaa88fa4ab64835dcbde75dcdf89c453c922f18dced6e27c90d1d0ec5a \
@@ -383,6 +383,10 @@ swig==4.3.1 \
383383
--hash=sha256:efec16327029f682f649a26da726bb0305be8800bd0f1fa3e81bf0769cf5b476 \
384384
--hash=sha256:fc496c0d600cf1bb2d91e28d3d6eae9c4301e5ea7a0dec5a4281b5efed4245a8
385385
# via -r lldb/test/requirements.txt
386+
typing-extensions==4.15.0 \
387+
--hash=sha256:0cea48d173cc12fa28ecabc3b837ea3cf6f38c6d1136f85cbaaf598984861466 \
388+
--hash=sha256:f0fa19c6845758ab08074a0cfa8b7aecb71c999ca73d62883bc25cc018c4e548
389+
# via -r mlir/python/requirements.txt
386390
urllib3==2.5.0 \
387391
--hash=sha256:3fc47733c7e419d4bc3f6b3dc2b4f890bb743906a30d56ba4a5bfa4bbff92760 \
388392
--hash=sha256:e6b01673c0fa6a13e374b50871808eb3bf7046c4b125b216f6bf1cc604cff0dc

.ci/compute_projects.py

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,7 @@
150150
"mlir": "check-mlir",
151151
"openmp": "check-openmp",
152152
"polly": "check-polly",
153+
"lit": "check-lit",
153154
}
154155

155156
RUNTIMES = {"libcxx", "libcxxabi", "libunwind", "compiler-rt", "libc", "flang-rt"}
@@ -166,8 +167,12 @@
166167
("llvm", "utils", "gn"): "gn",
167168
(".github", "workflows", "premerge.yaml"): ".ci",
168169
("third-party",): ".ci",
170+
("llvm", "utils", "lit"): "lit",
169171
}
170172

173+
# Projects that should run tests but cannot be explicitly built.
174+
SKIP_BUILD_PROJECTS = ["CIR", "lit"]
175+
171176
# Projects that should not run any tests. These need to be metaprojects.
172177
SKIP_PROJECTS = ["docs", "gn"]
173178

@@ -315,7 +320,9 @@ def get_env_variables(modified_files: list[str], platform: str) -> Set[str]:
315320
# clang build, but it requires an explicit option to enable. We set that
316321
# option here, and remove it from the projects_to_build list.
317322
enable_cir = "ON" if "CIR" in projects_to_build else "OFF"
318-
projects_to_build.discard("CIR")
323+
# Remove any metaprojects from the list of projects to build.
324+
for project in SKIP_BUILD_PROJECTS:
325+
projects_to_build.discard(project)
319326

320327
# We use a semicolon to separate the projects/runtimes as they get passed
321328
# to the CMake invocation and thus we need to use the CMake list separator

.ci/compute_projects_test.py

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -413,6 +413,30 @@ def test_third_party_benchmark(self):
413413
"check-cxx check-cxxabi check-unwind",
414414
)
415415

416+
def test_lit(self):
417+
env_variables = compute_projects.get_env_variables(
418+
["llvm/utils/lit/CMakeLists.txt"], "Linux"
419+
)
420+
self.assertEqual(
421+
env_variables["projects_to_build"],
422+
"bolt;clang;clang-tools-extra;flang;lld;lldb;llvm;mlir;polly",
423+
)
424+
self.assertEqual(
425+
env_variables["project_check_targets"],
426+
"check-bolt check-clang check-clang-tools check-flang check-lit check-lld check-lldb check-llvm check-mlir check-polly",
427+
)
428+
self.assertEqual(
429+
env_variables["runtimes_to_build"], "libcxx;libcxxabi;libunwind"
430+
)
431+
self.assertEqual(
432+
env_variables["runtimes_check_targets"],
433+
"",
434+
)
435+
self.assertEqual(
436+
env_variables["runtimes_check_targets_needs_reconfig"],
437+
"check-cxx check-cxxabi check-unwind",
438+
)
439+
416440

417441
if __name__ == "__main__":
418442
unittest.main()

.github/CODEOWNERS

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,10 @@
5959
/mlir/**/BufferizableOpInterfaceImpl.* @matthias-springer
6060
/mlir/Dialect/*/Transforms/Bufferize.cpp @matthias-springer
6161

62+
# DLTI Dialect in MLIR
63+
/mlir/**/Dialect/DLTI @rolfmorel
64+
/mlir/**/DataLayoutInterfaces.* @rolfmorel
65+
6266
# Linalg Dialect in MLIR.
6367
/mlir/include/mlir/Dialect/Linalg @dcaballe @nicolasvasilache @rengolin
6468
/mlir/lib/Dialect/Linalg @dcaballe @nicolasvasilache @rengolin
@@ -96,9 +100,9 @@
96100
/mlir/lib/Dialect/Tensor/Transforms/* @hanhanW @nicolasvasilache
97101

98102
# Transform Dialect in MLIR.
99-
/mlir/include/mlir/Dialect/Transform/* @ftynse @nicolasvasilache
100-
/mlir/lib/Dialect/Transform/* @ftynse @nicolasvasilache
101-
/mlir/**/*TransformOps* @ftynse @nicolasvasilache
103+
/mlir/include/mlir/Dialect/Transform/* @ftynse @nicolasvasilache @rolfmorel
104+
/mlir/lib/Dialect/Transform/* @ftynse @nicolasvasilache @rolfmorel
105+
/mlir/**/*TransformOps* @ftynse @nicolasvasilache @rolfmorel
102106

103107
# SPIR-V Dialect in MLIR.
104108
/mlir/**/SPIRV/ @antiagainst @kuhar
@@ -132,6 +136,9 @@
132136
/mlir/**/Transforms/Mem2Reg.* @moxinilian
133137
/mlir/**/Transforms/SROA.* @moxinilian
134138

139+
# MLIR IRDL-related
140+
/mlir/**/*IRDL* @moxinilian
141+
135142
# BOLT
136143
/bolt/ @aaupov @maksfb @rafaelauler @ayermolo @yota9 @paschalis-mpeis @yozhu
137144

.github/workflows/issue-write.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ on:
66
- "Check code formatting"
77
- "Check for private emails used in PRs"
88
- "PR Request Release Note"
9+
- "Code lint"
910
types:
1011
- completed
1112

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

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -32,19 +32,6 @@ jobs:
3232
base_sha: 'HEAD~1'
3333
sha: 'HEAD'
3434

35-
# We need to pull the script from the main branch, so that we ensure
36-
# we get the latest version of this script.
37-
- name: Fetch code formatting utils
38-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
39-
with:
40-
repository: ${{ github.repository }}
41-
ref: ${{ github.base_ref }}
42-
sparse-checkout: |
43-
llvm/utils/git/requirements_formatting.txt
44-
llvm/utils/git/code-format-helper.py
45-
sparse-checkout-cone-mode: false
46-
path: code-format-tools
47-
4835
- name: "Listed files"
4936
env:
5037
CHANGED_FILES: ${{ steps.changed-files.outputs.all_changed_files }}
@@ -65,10 +52,10 @@ jobs:
6552
with:
6653
python-version: '3.11'
6754
cache: 'pip'
68-
cache-dependency-path: 'code-format-tools/llvm/utils/git/requirements_formatting.txt'
55+
cache-dependency-path: 'llvm/utils/git/requirements_formatting.txt'
6956

7057
- name: Install python dependencies
71-
run: pip install -r code-format-tools/llvm/utils/git/requirements_formatting.txt
58+
run: pip install -r llvm/utils/git/requirements_formatting.txt
7259

7360
- name: Run code formatter
7461
env:
@@ -77,7 +64,7 @@ jobs:
7764
# Create an empty comments file so the pr-write job doesn't fail.
7865
run: |
7966
echo "[]" > comments &&
80-
python ./code-format-tools/llvm/utils/git/code-format-helper.py \
67+
python ./llvm/utils/git/code-format-helper.py \
8168
--write-comment-to-file \
8269
--token ${{ secrets.GITHUB_TOKEN }} \
8370
--issue-number $GITHUB_PR_NUMBER \

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

Lines changed: 112 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,112 @@
1+
name: "Code lint"
2+
3+
permissions:
4+
contents: read
5+
6+
on:
7+
pull_request:
8+
branches:
9+
- main
10+
- 'users/**'
11+
paths:
12+
- 'clang-tools-extra/clang-tidy/**'
13+
- '.github/workflows/pr-code-lint.yml'
14+
15+
jobs:
16+
code_linter:
17+
if: github.repository_owner == 'llvm'
18+
runs-on: ubuntu-24.04
19+
defaults:
20+
run:
21+
shell: bash
22+
container:
23+
image: 'ghcr.io/llvm/ci-ubuntu-24.04:latest'
24+
timeout-minutes: 60
25+
concurrency:
26+
group: ${{ github.workflow }}-${{ github.ref }}
27+
cancel-in-progress: true
28+
steps:
29+
- name: Fetch LLVM sources
30+
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
31+
with:
32+
fetch-depth: 2
33+
34+
- name: Get changed files
35+
id: changed-files
36+
uses: step-security/changed-files@3dbe17c78367e7d60f00d78ae6781a35be47b4a1 # v45.0.1
37+
with:
38+
separator: ","
39+
skip_initial_fetch: true
40+
base_sha: 'HEAD~1'
41+
sha: 'HEAD'
42+
43+
- name: Listed files
44+
env:
45+
CHANGED_FILES: ${{ steps.changed-files.outputs.all_changed_files }}
46+
run: |
47+
echo "Changed files:"
48+
echo "$CHANGED_FILES"
49+
50+
- name: Install clang-tidy
51+
uses: aminya/setup-cpp@17c11551771948abc5752bbf3183482567c7caf0 # v1.1.1
52+
with:
53+
clang-tidy: 20.1.8
54+
55+
- name: Setup Python env
56+
uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5.4.0
57+
with:
58+
python-version: '3.12'
59+
60+
- name: Install Python dependencies
61+
run: python3 -m pip install -r llvm/utils/git/requirements_linting.txt
62+
63+
# TODO: create special mapping for 'codegen' targets, for now build predefined set
64+
# TODO: add entrypoint in 'compute_projects.py' that only adds a project and its direct dependencies
65+
- name: Configure and CodeGen
66+
run: |
67+
git config --global --add safe.directory '*'
68+
69+
. <(git diff --name-only HEAD~1...HEAD | python3 .ci/compute_projects.py)
70+
71+
if [[ "${projects_to_build}" == "" ]]; then
72+
echo "No projects to analyze"
73+
exit 0
74+
fi
75+
76+
cmake -G Ninja \
77+
-B build \
78+
-S llvm \
79+
-DLLVM_ENABLE_ASSERTIONS=OFF \
80+
-DLLVM_ENABLE_PROJECTS="${projects_to_build}" \
81+
-DCMAKE_CXX_COMPILER=clang++ \
82+
-DCMAKE_C_COMPILER=clang \
83+
-DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
84+
-DLLVM_INCLUDE_TESTS=OFF \
85+
-DCLANG_INCLUDE_TESTS=OFF \
86+
-DCMAKE_BUILD_TYPE=Release
87+
88+
ninja -C build \
89+
clang-tablegen-targets \
90+
genconfusable # for "ConfusableIdentifierCheck.h"
91+
92+
- name: Run code linter
93+
env:
94+
GITHUB_PR_NUMBER: ${{ github.event.pull_request.number }}
95+
CHANGED_FILES: ${{ steps.changed-files.outputs.all_changed_files }}
96+
run: |
97+
echo "[]" > comments &&
98+
python3 llvm/utils/git/code-lint-helper.py \
99+
--token ${{ secrets.GITHUB_TOKEN }} \
100+
--issue-number $GITHUB_PR_NUMBER \
101+
--start-rev HEAD~1 \
102+
--end-rev HEAD \
103+
--verbose \
104+
--changed-files "$CHANGED_FILES"
105+
106+
- name: Upload results
107+
uses: actions/upload-artifact@26f96dfa697d77e81fd5907df203aa23a56210a8 #v4.3.0
108+
if: always()
109+
with:
110+
name: workflow-args
111+
path: |
112+
comments

clang-tools-extra/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ include(GNUInstallDirs)
55

66
option(CLANG_TIDY_ENABLE_STATIC_ANALYZER
77
"Include static analyzer checks in clang-tidy" ON)
8+
option(CLANG_TIDY_ENABLE_QUERY_BASED_CUSTOM_CHECKS
9+
"Enable query-based custom checks in clang-tidy" ON)
810

911
if(CLANG_INCLUDE_TESTS)
1012
umbrella_lit_testsuite_begin(check-clang-tools)

clang-tools-extra/clang-include-fixer/IncludeFixer.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,7 @@ bool IncludeFixerActionFactory::runInvocation(
9494

9595
// Create the compiler's actual diagnostics engine. We want to drop all
9696
// diagnostics here.
97-
Compiler.createDiagnostics(Files->getVirtualFileSystem(),
98-
new clang::IgnoringDiagConsumer,
97+
Compiler.createDiagnostics(new clang::IgnoringDiagConsumer,
9998
/*ShouldOwnClient=*/true);
10099
Compiler.createSourceManager(*Files);
101100

clang-tools-extra/clang-tidy/.clang-tidy

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ Checks: >
55
-bugprone-branch-clone,
66
-bugprone-easily-swappable-parameters,
77
-bugprone-narrowing-conversions,
8-
-bugprone-suspicious-stringview-data-usage,
98
-bugprone-unchecked-optional-access,
109
-bugprone-unused-return-value,
1110
modernize-*,

0 commit comments

Comments
 (0)