Skip to content

Commit 89204cc

Browse files
authored
Merge branch 'main' into feature-bolt-linux-kernel-version
2 parents 035668e + cea738b commit 89204cc

File tree

3,630 files changed

+139669
-61717
lines changed

Some content is hidden

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

3,630 files changed

+139669
-61717
lines changed

.ci/metrics/metrics.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"https://influx-prod-13-prod-us-east-0.grafana.net/api/v1/push/influx/write"
1313
)
1414
GITHUB_PROJECT = "llvm/llvm-project"
15-
WORKFLOWS_TO_TRACK = ["Check code formatting"]
15+
WORKFLOWS_TO_TRACK = ["Check code formatting", "LLVM Premerge Checks"]
1616
SCRAPE_INTERVAL_SECONDS = 5 * 60
1717

1818

.ci/monolithic-linux.sh

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,11 @@ function at-exit {
3434

3535
# If building fails there will be no results files.
3636
shopt -s nullglob
37-
python3 "${MONOREPO_ROOT}"/.ci/generate_test_report.py ":linux: Linux x64 Test Results" \
38-
"linux-x64-test-results" "${BUILD_DIR}"/test-results.*.xml
37+
if command -v buildkite-agent 2>&1 >/dev/null
38+
then
39+
python3 "${MONOREPO_ROOT}"/.ci/generate_test_report.py ":linux: Linux x64 Test Results" \
40+
"linux-x64-test-results" "${BUILD_DIR}"/test-results.*.xml
41+
fi
3942
}
4043
trap at-exit EXIT
4144

.ci/monolithic-windows.sh

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,11 @@ function at-exit {
3333

3434
# If building fails there will be no results files.
3535
shopt -s nullglob
36-
python "${MONOREPO_ROOT}"/.ci/generate_test_report.py ":windows: Windows x64 Test Results" \
37-
"windows-x64-test-results" "${BUILD_DIR}"/test-results.*.xml
36+
if command -v buildkite-agent 2>&1 >/dev/null
37+
then
38+
python "${MONOREPO_ROOT}"/.ci/generate_test_report.py ":windows: Windows x64 Test Results" \
39+
"windows-x64-test-results" "${BUILD_DIR}"/test-results.*.xml
40+
fi
3841
}
3942
trap at-exit EXIT
4043

.git-blame-ignore-revs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,3 +97,6 @@ e80bc777749331e9519575f416c342f7626dd14d
9797

9898
# NFC: clang-format test_demangle.pass.cpp but keep test "lines"
9999
d33bf2e9df578ff7e44fd22504d6ad5a122b7ee6
100+
101+
# [lldb][NFC] clang-format MainLoopPosix.cpp
102+
66bdbfbaa08fa3d8e64a7fe136a8fb717f5cdbb7

.github/CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@
129129
/mlir/**/Transforms/SROA.* @moxinilian
130130

131131
# BOLT
132-
/bolt/ @aaupov @maksfb @rafaelauler @ayermolo @dcci
132+
/bolt/ @aaupov @maksfb @rafaelauler @ayermolo @dcci @yota9
133133

134134
# Bazel build system.
135135
/utils/bazel/ @rupprecht @keith

.github/new-prs-labeler.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -747,6 +747,12 @@ backend:RISC-V:
747747
- llvm/**/*riscv*
748748
- llvm/**/*RISCV*
749749

750+
backend:Xtensa:
751+
- clang/**/*xtensa*
752+
- clang/**/*Xtensa*
753+
- llvm/**/*xtensa*
754+
- llvm/**/*Xtensa*
755+
750756
lld:coff:
751757
- lld/**/COFF/**
752758
- lld/Common/**

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ jobs:
6060
- name: Test Container
6161
run: |
6262
for image in ${{ steps.vars.outputs.container-name-tag }} ${{ steps.vars.outputs.container-name }}; do
63-
podman run --rm -it $image /usr/bin/bash -x -c 'printf '\''#include <iostream>\nint main(int argc, char **argv) { std::cout << "Hello\\n"; }'\'' | clang++ -x c++ - && ./a.out | grep Hello'
63+
podman run --rm -it $image /usr/bin/bash -x -c 'cd $HOME && printf '\''#include <iostream>\nint main(int argc, char **argv) { std::cout << "Hello\\n"; }'\'' | clang++ -x c++ - && ./a.out | grep Hello'
6464
done
6565
6666
push-ci-container:

.github/workflows/containers/github-action-ci/Dockerfile

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,13 @@ RUN ninja -C ./build stage2-clang-bolt stage2-install-distribution && ninja -C .
4141
FROM base
4242

4343
COPY --from=stage1-toolchain $LLVM_SYSROOT $LLVM_SYSROOT
44-
44+
4545
# Need to install curl for hendrikmuhs/ccache-action
4646
# Need nodejs for some of the GitHub actions.
4747
# Need perl-modules for clang analyzer tests.
4848
# Need git for SPIRV-Tools tests.
4949
RUN apt-get update && \
50-
apt-get install -y \
50+
DEBIAN_FRONTEND=noninteractive apt-get install -y \
5151
binutils \
5252
cmake \
5353
curl \
@@ -56,7 +56,22 @@ RUN apt-get update && \
5656
ninja-build \
5757
nodejs \
5858
perl-modules \
59-
python3-psutil
59+
python3-psutil \
60+
61+
# These are needed by the premerge pipeline. Pip is used to install
62+
# dependent python packages and ccache is used for build caching. File and
63+
# tzdata are used for tests.
64+
python3-pip \
65+
ccache \
66+
file \
67+
tzdata
6068

6169
ENV LLVM_SYSROOT=$LLVM_SYSROOT
6270
ENV PATH=${LLVM_SYSROOT}/bin:${PATH}
71+
72+
# Create a new user to avoid test failures related to a lack of expected
73+
# permissions issues in some tests. Set the user id to 1001 as that is the
74+
# user id that Github Actions uses to perform the checkout action.
75+
RUN useradd gha -u 1001 -m -s /bin/bash
76+
USER gha
77+

.github/workflows/docs.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,9 +106,9 @@ jobs:
106106
with:
107107
python-version: '3.11'
108108
cache: 'pip'
109-
cache-dependency-path: 'llvm/docs/requirements.txt'
109+
cache-dependency-path: 'llvm/docs/requirements-hashed.txt'
110110
- name: Install python dependencies
111-
run: pip install -r llvm/docs/requirements.txt
111+
run: pip install -r llvm/docs/requirements-hashed.txt
112112
- name: Install system dependencies
113113
run: |
114114
sudo apt-get update

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,13 @@ jobs:
3737
stage1:
3838
if: github.repository_owner == 'llvm'
3939
runs-on: libcxx-self-hosted-linux
40-
container: ghcr.io/llvm/libcxx-linux-builder:0fd6f684b9c84c32d6cbfd9742402e788b2879f1
40+
container: ghcr.io/llvm/libcxx-linux-builder:d8a0709b1090350a7fe3604d8ab78c7d62f10698
4141
continue-on-error: false
4242
strategy:
4343
fail-fast: false
4444
matrix:
4545
config: [
46+
'frozen-cxx03-headers',
4647
'generic-cxx03',
4748
'generic-cxx26',
4849
'generic-modules'
@@ -74,7 +75,7 @@ jobs:
7475
stage2:
7576
if: github.repository_owner == 'llvm'
7677
runs-on: libcxx-self-hosted-linux
77-
container: ghcr.io/llvm/libcxx-linux-builder:0fd6f684b9c84c32d6cbfd9742402e788b2879f1
78+
container: ghcr.io/llvm/libcxx-linux-builder:d8a0709b1090350a7fe3604d8ab78c7d62f10698
7879
needs: [ stage1 ]
7980
continue-on-error: false
8081
strategy:
@@ -162,7 +163,7 @@ jobs:
162163
- config: 'generic-msan'
163164
machine: libcxx-self-hosted-linux
164165
runs-on: ${{ matrix.machine }}
165-
container: ghcr.io/llvm/libcxx-linux-builder:0fd6f684b9c84c32d6cbfd9742402e788b2879f1
166+
container: ghcr.io/llvm/libcxx-linux-builder:d8a0709b1090350a7fe3604d8ab78c7d62f10698
166167
steps:
167168
- uses: actions/checkout@v4
168169
- name: ${{ matrix.config }}

0 commit comments

Comments
 (0)