Skip to content

Commit a2810fa

Browse files
committed
Merge branch 'main' of https://github.com/llvm/llvm-project into fix/92759
2 parents d160eb6 + ef01c75 commit a2810fa

File tree

8,548 files changed

+515241
-138370
lines changed

Some content is hidden

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

8,548 files changed

+515241
-138370
lines changed

.ci/generate-buildkite-pipeline-premerge

Lines changed: 47 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,8 @@ echo "Directories modified:" >&2
5353
echo "$modified_dirs" >&2
5454

5555
function compute-projects-to-test() {
56+
isForWindows=$1
57+
shift
5658
projects=${@}
5759
for project in ${projects}; do
5860
echo "${project}"
@@ -63,20 +65,44 @@ function compute-projects-to-test() {
6365
done
6466
;;
6567
llvm)
66-
for p in bolt clang clang-tools-extra flang lld lldb mlir polly; do
68+
for p in bolt clang clang-tools-extra lld lldb mlir polly; do
6769
echo $p
6870
done
71+
# Flang is not stable in Windows CI at the moment
72+
if [[ $isForWindows == 0 ]]; then
73+
echo flang
74+
fi
6975
;;
7076
clang)
71-
for p in clang-tools-extra compiler-rt lldb cross-project-tests; do
77+
# lldb is temporarily removed to alleviate Linux pre-commit CI waiting times
78+
for p in clang-tools-extra compiler-rt cross-project-tests; do
7279
echo $p
7380
done
7481
;;
7582
clang-tools-extra)
7683
echo libc
7784
;;
7885
mlir)
79-
echo flang
86+
# Flang is not stable in Windows CI at the moment
87+
if [[ $isForWindows == 0 ]]; then
88+
echo flang
89+
fi
90+
;;
91+
*)
92+
# Nothing to do
93+
;;
94+
esac
95+
done
96+
}
97+
98+
function compute-runtimes-to-test() {
99+
projects=${@}
100+
for project in ${projects}; do
101+
case ${project} in
102+
clang)
103+
for p in libcxx libcxxabi libunwind; do
104+
echo $p
105+
done
80106
;;
81107
*)
82108
# Nothing to do
@@ -128,7 +154,6 @@ function exclude-linux() {
128154
for project in ${projects}; do
129155
case ${project} in
130156
cross-project-tests) ;; # tests failing
131-
lldb) ;; # tests failing
132157
openmp) ;; # https://github.com/google/llvm-premerge-checks/issues/410
133158
*)
134159
echo "${project}"
@@ -145,7 +170,7 @@ function exclude-windows() {
145170
compiler-rt) ;; # tests taking too long
146171
openmp) ;; # TODO: having trouble with the Perl installation
147172
libc) ;; # no Windows support
148-
lldb) ;; # tests failing
173+
lldb) ;; # custom environment requirements (https://github.com/llvm/llvm-project/pull/94208#issuecomment-2146256857)
149174
bolt) ;; # tests are not supported yet
150175
*)
151176
echo "${project}"
@@ -178,8 +203,17 @@ function check-targets() {
178203
cross-project-tests)
179204
echo "check-cross-project"
180205
;;
206+
libcxx)
207+
echo "check-cxx"
208+
;;
209+
libcxxabi)
210+
echo "check-cxxabi"
211+
;;
212+
libunwind)
213+
echo "check-unwind"
214+
;;
181215
lldb)
182-
echo "check-all" # TODO: check-lldb may not include all the LLDB tests?
216+
echo "check-lldb"
183217
;;
184218
pstl)
185219
echo "check-all"
@@ -207,17 +241,6 @@ if echo "$modified_dirs" | grep -q -E "^(libcxx|libcxxabi|libunwind|runtimes|cma
207241
EOF
208242
fi
209243

210-
# If clang changed.
211-
if echo "$modified_dirs" | grep -q -E "^(clang)$"; then
212-
cat <<EOF
213-
- trigger: "clang-ci"
214-
build:
215-
message: "${buildMessage}"
216-
commit: "${BUILDKITE_COMMIT}"
217-
branch: "${BUILDKITE_BRANCH}"
218-
EOF
219-
fi
220-
221244
# Generic pipeline for projects that have not defined custom steps.
222245
#
223246
# Individual projects should instead define the pre-commit CI tests that suits their
@@ -227,11 +250,15 @@ fi
227250
all_projects="bolt clang clang-tools-extra compiler-rt cross-project-tests flang libc libclc lld lldb llvm mlir openmp polly pstl"
228251
modified_projects="$(keep-modified-projects ${all_projects})"
229252

230-
linux_projects_to_test=$(exclude-linux $(compute-projects-to-test ${modified_projects}))
253+
linux_projects_to_test=$(exclude-linux $(compute-projects-to-test 0 ${modified_projects}))
231254
linux_check_targets=$(check-targets ${linux_projects_to_test} | sort | uniq)
232255
linux_projects=$(add-dependencies ${linux_projects_to_test} | sort | uniq)
233256

234-
windows_projects_to_test=$(exclude-windows $(compute-projects-to-test ${modified_projects}))
257+
linux_runtimes_to_test=$(compute-runtimes-to-test ${linux_projects_to_test})
258+
linux_runtime_check_targets=$(check-targets ${linux_runtimes_to_test} | sort | uniq)
259+
linux_runtimes=$(echo ${linux_runtimes_to_test} | sort | uniq)
260+
261+
windows_projects_to_test=$(exclude-windows $(compute-projects-to-test 1 ${modified_projects}))
235262
windows_check_targets=$(check-targets ${windows_projects_to_test} | sort | uniq)
236263
windows_projects=$(add-dependencies ${windows_projects_to_test} | sort | uniq)
237264

@@ -255,7 +282,7 @@ if [[ "${linux_projects}" != "" ]]; then
255282
CC: 'clang'
256283
CXX: 'clang++'
257284
commands:
258-
- './.ci/monolithic-linux.sh "$(echo ${linux_projects} | tr ' ' ';')" "$(echo ${linux_check_targets})"'
285+
- './.ci/monolithic-linux.sh "$(echo ${linux_projects} | tr ' ' ';')" "$(echo ${linux_check_targets})" "$(echo ${linux_runtimes} | tr ' ' ';')" "$(echo ${linux_runtime_check_targets})"'
259286
EOF
260287
fi
261288

.ci/monolithic-linux.sh

Lines changed: 74 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ set -o pipefail
1818

1919
MONOREPO_ROOT="${MONOREPO_ROOT:="$(git rev-parse --show-toplevel)"}"
2020
BUILD_DIR="${BUILD_DIR:=${MONOREPO_ROOT}/build}"
21+
INSTALL_DIR="${BUILD_DIR}/install"
2122
rm -rf "${BUILD_DIR}"
2223

2324
ccache --zero-stats
@@ -38,6 +39,7 @@ targets="${2}"
3839

3940
echo "--- cmake"
4041
pip install -q -r "${MONOREPO_ROOT}"/mlir/python/requirements.txt
42+
pip install -q -r "${MONOREPO_ROOT}"/lldb/test/requirements.txt
4143
cmake -S "${MONOREPO_ROOT}"/llvm -B "${BUILD_DIR}" \
4244
-D LLVM_ENABLE_PROJECTS="${projects}" \
4345
-G Ninja \
@@ -49,8 +51,79 @@ cmake -S "${MONOREPO_ROOT}"/llvm -B "${BUILD_DIR}" \
4951
-D LLVM_ENABLE_LLD=ON \
5052
-D CMAKE_CXX_FLAGS=-gmlt \
5153
-D LLVM_CCACHE_BUILD=ON \
52-
-D MLIR_ENABLE_BINDINGS_PYTHON=ON
54+
-D MLIR_ENABLE_BINDINGS_PYTHON=ON \
55+
-D CMAKE_INSTALL_PREFIX="${INSTALL_DIR}"
5356

5457
echo "--- ninja"
5558
# Targets are not escaped as they are passed as separate arguments.
5659
ninja -C "${BUILD_DIR}" -k 0 ${targets}
60+
61+
runtimes="${3}"
62+
runtime_targets="${4}"
63+
64+
# Compiling runtimes with just-built Clang and running their tests
65+
# as an additional testing for Clang.
66+
if [[ "${runtimes}" != "" ]]; then
67+
if [[ "${runtime_targets}" == "" ]]; then
68+
echo "Runtimes to build are specified, but targets are not."
69+
exit 1
70+
fi
71+
72+
echo "--- ninja install-clang"
73+
74+
ninja -C ${BUILD_DIR} install-clang install-clang-resource-headers
75+
76+
RUNTIMES_BUILD_DIR="${MONOREPO_ROOT}/build-runtimes"
77+
INSTALL_DIR="${BUILD_DIR}/install"
78+
mkdir -p ${RUNTIMES_BUILD_DIR}
79+
80+
echo "--- cmake runtimes C++03"
81+
82+
cmake -S "${MONOREPO_ROOT}/runtimes" -B "${RUNTIMES_BUILD_DIR}" -GNinja \
83+
-D CMAKE_C_COMPILER="${INSTALL_DIR}/bin/clang" \
84+
-D CMAKE_CXX_COMPILER="${INSTALL_DIR}/bin/clang++" \
85+
-D LLVM_ENABLE_RUNTIMES="${runtimes}" \
86+
-D LIBCXX_CXX_ABI=libcxxabi \
87+
-D CMAKE_BUILD_TYPE=RelWithDebInfo \
88+
-D CMAKE_INSTALL_PREFIX="${INSTALL_DIR}" \
89+
-D LIBCXX_TEST_PARAMS="std=c++03" \
90+
-D LIBCXXABI_TEST_PARAMS="std=c++03"
91+
92+
echo "--- ninja runtimes C++03"
93+
94+
ninja -vC "${RUNTIMES_BUILD_DIR}" ${runtime_targets}
95+
96+
echo "--- cmake runtimes C++26"
97+
98+
rm -rf "${RUNTIMES_BUILD_DIR}"
99+
cmake -S "${MONOREPO_ROOT}/runtimes" -B "${RUNTIMES_BUILD_DIR}" -GNinja \
100+
-D CMAKE_C_COMPILER="${INSTALL_DIR}/bin/clang" \
101+
-D CMAKE_CXX_COMPILER="${INSTALL_DIR}/bin/clang++" \
102+
-D LLVM_ENABLE_RUNTIMES="${runtimes}" \
103+
-D LIBCXX_CXX_ABI=libcxxabi \
104+
-D CMAKE_BUILD_TYPE=RelWithDebInfo \
105+
-D CMAKE_INSTALL_PREFIX="${INSTALL_DIR}" \
106+
-D LIBCXX_TEST_PARAMS="std=c++26" \
107+
-D LIBCXXABI_TEST_PARAMS="std=c++26"
108+
109+
echo "--- ninja runtimes C++26"
110+
111+
ninja -vC "${RUNTIMES_BUILD_DIR}" ${runtime_targets}
112+
113+
echo "--- cmake runtimes clang modules"
114+
115+
rm -rf "${RUNTIMES_BUILD_DIR}"
116+
cmake -S "${MONOREPO_ROOT}/runtimes" -B "${RUNTIMES_BUILD_DIR}" -GNinja \
117+
-D CMAKE_C_COMPILER="${INSTALL_DIR}/bin/clang" \
118+
-D CMAKE_CXX_COMPILER="${INSTALL_DIR}/bin/clang++" \
119+
-D LLVM_ENABLE_RUNTIMES="${runtimes}" \
120+
-D LIBCXX_CXX_ABI=libcxxabi \
121+
-D CMAKE_BUILD_TYPE=RelWithDebInfo \
122+
-D CMAKE_INSTALL_PREFIX="${INSTALL_DIR}" \
123+
-D LIBCXX_TEST_PARAMS="enable_modules=clang" \
124+
-D LIBCXXABI_TEST_PARAMS="enable_modules=clang"
125+
126+
echo "--- ninja runtimes clang modules"
127+
128+
ninja -vC "${RUNTIMES_BUILD_DIR}" ${runtime_targets}
129+
fi

.ci/monolithic-windows.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@ pip install -q -r "${MONOREPO_ROOT}"/mlir/python/requirements.txt
4444
# see https://github.com/llvm/llvm-project/pull/82393 and
4545
# https://discourse.llvm.org/t/rfc-future-of-windows-pre-commit-ci/76840/40
4646
# for further information.
47+
# We limit the number of parallel compile jobs to 24 control memory
48+
# consumption and improve build reliability.
4749
cmake -S "${MONOREPO_ROOT}"/llvm -B "${BUILD_DIR}" \
4850
-D LLVM_ENABLE_PROJECTS="${projects}" \
4951
-G Ninja \
@@ -58,7 +60,9 @@ cmake -S "${MONOREPO_ROOT}"/llvm -B "${BUILD_DIR}" \
5860
-D MLIR_ENABLE_BINDINGS_PYTHON=ON \
5961
-D CMAKE_EXE_LINKER_FLAGS="/MANIFEST:NO" \
6062
-D CMAKE_MODULE_LINKER_FLAGS="/MANIFEST:NO" \
61-
-D CMAKE_SHARED_LINKER_FLAGS="/MANIFEST:NO"
63+
-D CMAKE_SHARED_LINKER_FLAGS="/MANIFEST:NO" \
64+
-D LLVM_PARALLEL_COMPILE_JOBS=16 \
65+
-D LLVM_PARALLEL_LINK_JOBS=4
6266

6367
echo "--- ninja"
6468
# Targets are not escaped as they are passed as separate arguments.

.github/new-prs-labeler.yml

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,9 @@ llvm-lit:
5454
- llvm/utils/lit/**/*
5555

5656
PGO:
57+
- llvm/**/ProfileData/**/*
58+
- llvm/**/SampleProfile*
59+
- llvm/**/CodeGen/MIRSampleProfile*
5760
- llvm/lib/Transforms/Instrumentation/CGProfile.cpp
5861
- llvm/lib/Transforms/Instrumentation/ControlHeightReduction.cpp
5962
- llvm/lib/Transforms/Instrumentation/IndirectCallPromotion.cpp
@@ -62,9 +65,9 @@ PGO:
6265
- llvm/lib/Transforms/Instrumentation/ValueProfile*
6366
- llvm/test/Instrumentation/InstrProfiling/**/*
6467
- llvm/test/Transforms/PGOProfile/**/*
68+
- llvm/test/Transforms/SampleProfile/**/*
6569
- llvm/**/llvm-profdata/**/*
6670
- llvm/**/llvm-profgen/**/*
67-
- llvm/unittests/ProfileData/**/*
6871

6972
vectorization:
7073
- llvm/lib/Transforms/Vectorize/**/*
@@ -714,6 +717,16 @@ backend:AMDGPU:
714717
- '**/*amdgpu*/**'
715718
- '**/*AMDGPU*/**'
716719

720+
backend:NVPTX:
721+
- 'llvm/**/*nvvm*'
722+
- 'llvm/**/*NVVM*'
723+
- 'llvm/**/*nvptx*'
724+
- 'llvm/**/*NVPTX*'
725+
- 'llvm/**/*nvvm*/**'
726+
- 'llvm/**/*NVVM*/**'
727+
- 'llvm/**/*nvptx*/**'
728+
- 'llvm/**/*NVPTX*/**'
729+
717730
backend:RISC-V:
718731
- clang/**/*riscv*
719732
- clang/**/*RISCV*
@@ -746,6 +759,8 @@ backend:ARM:
746759
- clang/lib/CodeGen/Targets/ARM.cpp
747760
- clang/include/clang/Basic/BuiltinsARM*
748761
- llvm/test/MC/DisasemblerARM/**
762+
- clang/include/clang/Sema/SemaARM.h
763+
- clang/lib/Sema/SemaARM.cpp
749764

750765
backend:AArch64:
751766
- llvm/include/llvm/IR/IntrinsicsAArch64.td
@@ -757,6 +772,8 @@ backend:AArch64:
757772
- clang/lib/CodeGen/Targets/AArch64.cpp
758773
- clang/include/clang/Basic/BuiltinsAArch64*
759774
- llvm/test/MC/Disassembler/AArch64/**
775+
- clang/include/clang/Sema/SemaARM.h
776+
- clang/lib/Sema/SemaARM.cpp
760777

761778
backend:loongarch:
762779
- llvm/include/llvm/IR/IntrinsicsLoongArch.td
@@ -767,6 +784,8 @@ backend:loongarch:
767784
- clang/lib/Driver/ToolChains/Arch/LoongArch.*
768785
- clang/lib/CodeGen/Targets/LoongArch.cpp
769786
- clang/include/clang/Basic/BuiltinsLoongArch*
787+
- clang/include/clang/Sema/SemaLoongArch.h
788+
- clang/lib/Sema/SemaLoongArch.cpp
770789

771790
backend:MSP430:
772791
- llvm/include/llvm/IR/IntrinsicsMSP430.td
@@ -814,6 +833,8 @@ backend:WebAssembly:
814833
- llvm/unittests/Target/WebAssembly/**
815834
- llvm/test/DebugInfo/WebAssembly/**
816835
- llvm/test/MC/WebAssembly/**
836+
- clang/include/clang/Sema/SemaWasm.h
837+
- clang/lib/Sema/SemaLoongWasm.cpp
817838

818839
backend:X86:
819840
- llvm/include/llvm/IR/IntrinsicsX86.td
@@ -833,6 +854,8 @@ backend:X86:
833854
- llvm/include/llvm/TargetParser/X86*
834855
- llvm/lib/TargetParser/X86*
835856
- llvm/utils/TableGen/X86*
857+
- clang/include/clang/Sema/SemaX86.h
858+
- clang/lib/Sema/SemaX86.cpp
836859

837860
backend:PowerPC:
838861
- llvm/include/llvm/BinaryFormat/ELFRelocs/PowerPC*
@@ -857,6 +880,8 @@ backend:PowerPC:
857880
- clang/lib/Driver/ToolChains/AIX*
858881
- clang/lib/Driver/ToolChains/Arch/PPC.*
859882
- clang/test/CodeGen/PowerPC/**
883+
- clang/include/clang/Sema/SemaPPC.h
884+
- clang/lib/Sema/SemaPPC.cpp
860885

861886
backend:SystemZ:
862887
- llvm/include/llvm/BinaryFormat/ELFRelocs/SystemZ*
@@ -877,6 +902,8 @@ backend:SystemZ:
877902
- clang/lib/Driver/ToolChains/ZOS*
878903
- clang/lib/Driver/ToolChains/Arch/SystemZ.*
879904
- clang/test/CodeGen/SystemZ/**
905+
- clang/include/clang/Sema/SemaSystemZ.h
906+
- clang/lib/Sema/SemaSystemZ.cpp
880907

881908
third-party:unittests:
882909
- third-party/unittests/**
Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
import json
2+
import multiprocessing
3+
import os
4+
import re
5+
import subprocess
6+
import sys
7+
8+
9+
def run_analyzer(data):
10+
os.chdir(data["directory"])
11+
command = (
12+
data["command"]
13+
+ f" --analyze --analyzer-output html -o analyzer-results -Xclang -analyzer-config -Xclang max-nodes=75000"
14+
)
15+
print(command)
16+
subprocess.run(command, shell=True, check=True)
17+
18+
19+
def pool_error(e):
20+
print("Error analyzing file:", e)
21+
22+
23+
def main():
24+
db_path = sys.argv[1]
25+
database = json.load(open(db_path))
26+
27+
with multiprocessing.Pool() as pool:
28+
pool.map_async(run_analyzer, [k for k in database], error_callback=pool_error)
29+
pool.close()
30+
pool.join()
31+
32+
33+
if __name__ == "__main__":
34+
main()

0 commit comments

Comments
 (0)