Skip to content

Commit 3cdcb31

Browse files
committed
Auto merge of #107651 - Kobzol:ci-single-cgu, r=<try>
[WIP] Build `rustc` with a single CGU on x64 Linux Follow-up attempt to #87650. I wonder if anything changed with the addition of LTO. I also enabled a single CGU only for the actual build of the compiler on CI, so that we can better see the perf. effects on the bootstrap benchmark.
2 parents e7f9f48 + a47a9eb commit 3cdcb31

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

.github/workflows/ci.yml

-1
Original file line numberDiff line numberDiff line change
@@ -529,7 +529,6 @@ jobs:
529529
try:
530530
name: "try - ${{ matrix.name }}"
531531
env:
532-
DIST_TRY_BUILD: 1
533532
CI_JOB_NAME: "${{ matrix.name }}"
534533
CARGO_REGISTRIES_CRATES_IO_PROTOCOL: sparse
535534
HEAD_SHA: "${{ github.event.pull_request.head.sha || github.sha }}"

src/ci/docker/host-x86_64/dist-x86_64-linux/Dockerfile

+2-1
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,8 @@ ENV RUST_CONFIGURE_ARGS \
8484
--set llvm.ninja=false \
8585
--set rust.jemalloc \
8686
--set rust.use-lld=true \
87-
--set rust.lto=thin
87+
--set rust.lto=thin \
88+
--set rust.codegen-units=1
8889

8990
ENV SCRIPT python3 ../x.py build --set rust.debug=true opt-dist && \
9091
./build/$HOSTS/stage0-tools-bin/opt-dist python3 ../x.py dist \

src/ci/github-actions/ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -689,7 +689,7 @@ jobs:
689689
<<: *base-ci-job
690690
name: try - ${{ matrix.name }}
691691
env:
692-
DIST_TRY_BUILD: 1
692+
# DIST_TRY_BUILD: 1
693693
<<: [*shared-ci-variables, *prod-variables]
694694
if: github.event_name == 'push' && (github.ref == 'refs/heads/try' || github.ref == 'refs/heads/try-perf') && github.repository == 'rust-lang-ci/rust'
695695
strategy:

0 commit comments

Comments
 (0)