Skip to content

Commit f0a95bd

Browse files
authored
Merge branch 'llvm:main' into __bdos-calculation
2 parents d08abc7 + 8af3f74 commit f0a95bd

File tree

14,797 files changed

+968781
-698965
lines changed

Some content is hidden

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

14,797 files changed

+968781
-698965
lines changed

.arcconfig

Lines changed: 0 additions & 8 deletions
This file was deleted.

.arclint

Lines changed: 0 additions & 15 deletions
This file was deleted.

.ci/generate-buildkite-pipeline-premerge

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ function compute-projects-to-test() {
6868
done
6969
;;
7070
clang)
71-
for p in clang-tools-extra compiler-rt flang libc lldb openmp cross-project-tests; do
71+
for p in clang-tools-extra compiler-rt flang lldb cross-project-tests; do
7272
echo $p
7373
done
7474
;;
@@ -224,7 +224,7 @@ fi
224224
# needs while letting them run on the infrastructure provided by LLVM.
225225

226226
# Figure out which projects need to be built on each platform
227-
all_projects="bolt clang-tools-extra compiler-rt cross-project-tests flang libc libclc lld lldb llvm mlir openmp polly pstl"
227+
all_projects="bolt clang clang-tools-extra compiler-rt cross-project-tests flang libc libclc lld lldb llvm mlir openmp polly pstl"
228228
modified_projects="$(keep-modified-projects ${all_projects})"
229229

230230
linux_projects_to_test=$(exclude-linux $(compute-projects-to-test ${modified_projects}))

.ci/monolithic-linux.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,4 +54,4 @@ cmake -S ${MONOREPO_ROOT}/llvm -B ${BUILD_DIR} \
5454

5555
echo "--- ninja"
5656
# Targets are not escaped as they are passed as separate arguments.
57-
ninja -C "${BUILD_DIR}" ${targets}
57+
ninja -C "${BUILD_DIR}" -k 0 ${targets}

.ci/monolithic-windows.sh

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,12 @@ targets="${2}"
3838

3939
echo "--- cmake"
4040
pip install -q -r ${MONOREPO_ROOT}/mlir/python/requirements.txt
41+
42+
# The CMAKE_*_LINKER_FLAGS to disable the manifest come from research
43+
# on fixing a build reliability issue on the build server, please
44+
# see https://github.com/llvm/llvm-project/pull/82393 and
45+
# https://discourse.llvm.org/t/rfc-future-of-windows-pre-commit-ci/76840/40
46+
# for further information.
4147
cmake -S ${MONOREPO_ROOT}/llvm -B ${BUILD_DIR} \
4248
-D LLVM_ENABLE_PROJECTS="${projects}" \
4349
-G Ninja \
@@ -49,8 +55,11 @@ cmake -S ${MONOREPO_ROOT}/llvm -B ${BUILD_DIR} \
4955
-D COMPILER_RT_BUILD_ORC=OFF \
5056
-D CMAKE_C_COMPILER_LAUNCHER=sccache \
5157
-D CMAKE_CXX_COMPILER_LAUNCHER=sccache \
52-
-D MLIR_ENABLE_BINDINGS_PYTHON=ON
58+
-D MLIR_ENABLE_BINDINGS_PYTHON=ON \
59+
-D CMAKE_EXE_LINKER_FLAGS="/MANIFEST:NO" \
60+
-D CMAKE_MODULE_LINKER_FLAGS="/MANIFEST:NO" \
61+
-D CMAKE_SHARED_LINKER_FLAGS="/MANIFEST:NO"
5362

5463
echo "--- ninja"
5564
# Targets are not escaped as they are passed as separate arguments.
56-
ninja -C "${BUILD_DIR}" ${targets}
65+
ninja -C "${BUILD_DIR}" -k 0 ${targets}

.clang-tidy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Checks: '-*,clang-diagnostic-*,llvm-*,misc-*,-misc-const-correctness,-misc-unused-parameters,-misc-non-private-member-variables-in-classes,-misc-no-recursion,-misc-use-anonymous-namespace,readability-identifier-naming'
1+
Checks: '-*,clang-diagnostic-*,llvm-*,misc-*,-misc-const-correctness,-misc-unused-parameters,-misc-non-private-member-variables-in-classes,-misc-no-recursion,-misc-use-anonymous-namespace,readability-identifier-naming,-misc-include-cleaner'
22
CheckOptions:
33
- key: readability-identifier-naming.ClassCase
44
value: CamelCase

.git-blame-ignore-revs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,3 +78,6 @@ f6d557ee34b6bbdb1dc32f29e34b4a4a8ad35e81
7878
082b89b25faae3e45a023caf51b65ca0f02f377f
7979
0ba22f51d128bee9d69756c56c4678097270e10b
8080
84da0e1bb75f8666cf222d2f600f37bebb9ea389
81+
82+
# [NFC] clang-format utils/TableGen (#80973)
83+
b9079baaddfed5e604fbfaa1d81a7a1c38e78c26

.github/CODEOWNERS

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,14 @@
2727
/llvm/lib/Transforms/Scalar/MemCpyOptimizer.cpp @nikic
2828
/llvm/lib/Transforms/InstCombine/ @nikic
2929

30+
/clang/include/clang/Sema/Sema.h @Endilll
3031
/clang/test/CXX/drs/ @Endilll
3132
/clang/www/cxx_dr_status.html @Endilll
3233
/clang/www/make_cxx_dr_status @Endilll
3334

35+
clang/lib/AST/Interp/ @tbaederr
36+
clang/test/AST/Interp/ @tbaederr
37+
3438
/lldb/ @JDevlieghere
3539

3640
# MLIR Interfaces.
@@ -101,3 +105,9 @@
101105

102106
# MLIR Sparsifier.
103107
/mlir/**/*SparseTensor*/ @aartbik @PeimingLiu @yinying-lisa-li @matthias-springer
108+
109+
# BOLT
110+
/bolt/ @aaupov @maksfb @rafaelauler @ayermolo @dcci
111+
112+
# Bazel build system.
113+
/utils/bazel/ @rupprecht

.github/new-prs-labeler.yml

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -629,6 +629,8 @@ backend:DirectX:
629629
- '**/*DirectX*/**'
630630
- '**/*DXIL*/**'
631631
- '**/*dxil*/**'
632+
- '**/*DXContainer*'
633+
- '**/*DXContainer*/**'
632634

633635
backend:SPIR-V:
634636
- clang/lib/Driver/ToolChains/SPIRV.*
@@ -822,9 +824,56 @@ backend:X86:
822824
- llvm/lib/TargetParser/X86*
823825
- llvm/utils/TableGen/X86*
824826

827+
backend:PowerPC:
828+
- llvm/include/llvm/BinaryFormat/ELFRelocs/PowerPC*
829+
- llvm/include/llvm/BinaryFormat/XCOFF.h
830+
- llvm/include/llvm/IR/IntrinsicsPowerPC.td
831+
- llvm/lib/CodeGen/AsmPrinter/AIXException.cpp
832+
- llvm/lib/Target/PowerPC/**
833+
- llvm/test/Analysis/**/PowerPC/**
834+
- llvm/test/CodeGen/PowerPC/**
835+
- llvm/test/CodeGen/MIR/PowerPC/**
836+
- llvm/test/DebugInfo/XCOFF/**
837+
- llvm/test/DebugInfo/PowerPC/**
838+
- llvm/test/LTO/PowerPC/**
839+
- llvm/test/MC/Disassembler/PowerPC/**
840+
- llvm/test/MC/PowerPC/**
841+
- llvm/test/MC/XCOFF/**
842+
- llvm/test/Transforms/**/PowerPC/**
843+
- clang/include/clang/Basic/BuiltinsPPC.*
844+
- clang/lib/Basic/Targets/PPC.*
845+
- clang/lib/CodeGen/Targets/PPC.cpp
846+
- clang/lib/Driver/ToolChains/PPC*
847+
- clang/lib/Driver/ToolChains/AIX*
848+
- clang/lib/Driver/ToolChains/Arch/PPC.*
849+
- clang/test/CodeGen/PowerPC/**
850+
851+
backend:SystemZ:
852+
- llvm/include/llvm/BinaryFormat/ELFRelocs/SystemZ*
853+
- llvm/include/llvm/BinaryFormat/GOFF.h
854+
- llvm/include/llvm/IR/IntrinsicsSystemZ.td
855+
- llvm/lib/Target/SystemZ/**
856+
- llvm/test/Analysis/**/SystemZ/**
857+
- llvm/test/CodeGen/SystemZ/**
858+
- llvm/test/DebugInfo/SystemZ/**
859+
- llvm/test/ExecutionEngine/**/SystemZ/**
860+
- llvm/test/MC/Disassembler/SystemZ/**
861+
- llvm/test/MC/GOFF/**
862+
- llvm/test/MC/SystemZ/**
863+
- llvm/test/Transforms/**/SystemZ/**
864+
- clang/include/clang/Basic/BuiltinsSystemZ.*
865+
- clang/lib/Basic/Targets/SystemZ.*
866+
- clang/lib/CodeGen/Targets/SystemZ.cpp
867+
- clang/lib/Driver/ToolChains/ZOS*
868+
- clang/lib/Driver/ToolChains/Arch/SystemZ.*
869+
- clang/test/CodeGen/SystemZ/**
870+
825871
third-party:unittests:
826872
- third-party/unittests/**
827873

874+
third-party:benchmark:
875+
- third-party/benchmark/**
876+
828877
llvm:binary-utilities:
829878
- llvm/docs/CommandGuide/llvm-*
830879
- llvm/include/llvm/BinaryFormat/**
@@ -886,3 +935,6 @@ openmp:libomp:
886935

887936
openmp:libomptarget:
888937
- any: ['openmp/**', '!openmp/runtime/**']
938+
939+
bazel:
940+
- utils/bazel/**

.github/workflows/build-ci-container.yml

Lines changed: 55 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
name: Build CI Container
32

43
permissions:
@@ -19,9 +18,41 @@ on:
1918
- '.github/workflows/containers/github-action-ci/**'
2019

2120
jobs:
22-
build-ci-container:
21+
# TODO(boomanaiden154): Switch this back to a single stage build when we can
22+
# run this on the self-hosted runners and don't have to do it this way to
23+
# avoid timeouts.
24+
build-ci-container-stage1:
2325
if: github.repository_owner == 'llvm'
2426
runs-on: ubuntu-latest
27+
steps:
28+
- name: Checkout LLVM
29+
uses: actions/checkout@v4
30+
with:
31+
sparse-checkout: .github/workflows/containers/github-action-ci/
32+
- name: Change podman Root Direcotry
33+
run: |
34+
mkdir -p ~/.config/containers
35+
sudo mkdir -p /mnt/podman
36+
sudo chown `whoami`:`whoami` /mnt/podman
37+
cp ./.github/workflows/containers/github-action-ci/storage.conf ~/.config/containers/storage.conf
38+
podman info
39+
- name: Build container stage1
40+
working-directory: ./.github/workflows/containers/github-action-ci/
41+
run: |
42+
podman build -t stage1-toolchain --target stage1-toolchain -f stage1.Dockerfile .
43+
- name: Save container image
44+
run: |
45+
podman save stage1-toolchain > stage1-toolchain.tar
46+
- name: Upload container image
47+
uses: actions/upload-artifact@v4
48+
with:
49+
name: stage1-toolchain
50+
path: stage1-toolchain.tar
51+
retention-days: 1
52+
build-ci-container-stage2:
53+
if: github.repository_owner == 'llvm'
54+
runs-on: ubuntu-latest
55+
needs: build-ci-container-stage1
2556
permissions:
2657
packages: write
2758
steps:
@@ -38,10 +69,31 @@ jobs:
3869
with:
3970
sparse-checkout: .github/workflows/containers/github-action-ci/
4071

72+
- name: Change podman Root Direcotry
73+
run: |
74+
mkdir -p ~/.config/containers
75+
sudo mkdir -p /mnt/podman
76+
sudo chown `whoami`:`whoami` /mnt/podman
77+
cp ./.github/workflows/containers/github-action-ci/storage.conf ~/.config/containers/storage.conf
78+
podman info
79+
80+
# Download the container image into /mnt/podman rather than
81+
# $GITHUB_WORKSPACE to avoid space limitations on the default drive
82+
# and use the permissions setup for /mnt/podman.
83+
- name: Download stage1-toolchain
84+
uses: actions/download-artifact@v4
85+
with:
86+
name: stage1-toolchain
87+
path: /mnt/podman
88+
89+
- name: Load stage1-toolchain
90+
run: |
91+
podman load -i /mnt/podman/stage1-toolchain.tar
92+
4193
- name: Build Container
4294
working-directory: ./.github/workflows/containers/github-action-ci/
4395
run: |
44-
podman build -t ${{ steps.vars.outputs.container-name-tag }} .
96+
podman build -t ${{ steps.vars.outputs.container-name-tag }} -f stage2.Dockerfile .
4597
podman tag ${{ steps.vars.outputs.container-name-tag }} ${{ steps.vars.outputs.container-name }}:latest
4698
4799
- name: Test Container

0 commit comments

Comments
 (0)