Skip to content

Commit 1d54ff5

Browse files
borsbors
committed
Auto merge of #112267 - lqd:win-1cgu, r=<try>
Build `rustc` with 1CGU on `x86_64-pc-windows-msvc` Part of the sanity checks for building rustc with 1CGU everywhere: - if the `dist-x86_64-msvc` builder doesn't timeout - how the resulting artifacts perform on `x86_64-pc-windows-msvc` r? `@ghost`
2 parents bdde2a8 + f892202 commit 1d54ff5

File tree

2 files changed

+32
-39
lines changed

2 files changed

+32
-39
lines changed

‎.github/workflows/ci.yml

+6-21
Original file line numberDiff line numberDiff line change
@@ -48,23 +48,6 @@ jobs:
4848
TOOLSTATE_REPO: "https://github.com/rust-lang-nursery/rust-toolstate"
4949
CACHE_DOMAIN: ci-caches.rust-lang.org
5050
if: "github.event_name == 'pull_request'"
51-
continue-on-error: "${{ matrix.name == 'mingw-check-tidy' }}"
52-
strategy:
53-
matrix:
54-
include:
55-
- name: mingw-check
56-
os: ubuntu-20.04-4core-16gb
57-
env: {}
58-
- name: mingw-check-tidy
59-
os: ubuntu-20.04-4core-16gb
60-
env: {}
61-
- name: x86_64-gnu-llvm-16
62-
env:
63-
ENABLE_GCC_CODEGEN: "1"
64-
os: ubuntu-20.04-16core-64gb
65-
- name: x86_64-gnu-tools
66-
os: ubuntu-20.04-16core-64gb
67-
env: {}
6851
defaults:
6952
run:
7053
shell: "${{ contains(matrix.os, 'windows') && 'msys2 {0}' || 'bash' }}"
@@ -438,7 +421,7 @@ jobs:
438421
os: windows-2019-8core-32gb
439422
- name: dist-x86_64-msvc
440423
env:
441-
RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-msvc --host=x86_64-pc-windows-msvc --target=x86_64-pc-windows-msvc --enable-full-tools --enable-profiler"
424+
RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-msvc --host=x86_64-pc-windows-msvc --target=x86_64-pc-windows-msvc --enable-full-tools --enable-profiler --set rust.codegen-units=1"
442425
SCRIPT: python x.py build --set rust.debug=true opt-dist && PGO_HOST=x86_64-pc-windows-msvc ./build/x86_64-pc-windows-msvc/stage0-tools-bin/opt-dist windows-ci -- python x.py dist bootstrap --include-default-paths
443426
DIST_REQUIRE_ALL_TOOLS: 1
444427
os: windows-2019-8core-32gb
@@ -610,10 +593,12 @@ jobs:
610593
strategy:
611594
matrix:
612595
include:
613-
- name: dist-x86_64-linux
596+
- name: dist-x86_64-msvc
614597
env:
615-
CODEGEN_BACKENDS: "llvm,cranelift"
616-
os: ubuntu-20.04-16core-64gb
598+
RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-msvc --host=x86_64-pc-windows-msvc --target=x86_64-pc-windows-msvc --enable-full-tools --enable-profiler --set rust.codegen-units=1"
599+
SCRIPT: python x.py build --set rust.debug=true opt-dist && PGO_HOST=x86_64-pc-windows-msvc ./build/x86_64-pc-windows-msvc/stage0-tools-bin/opt-dist windows-ci -- python x.py dist bootstrap --include-default-paths
600+
DIST_REQUIRE_ALL_TOOLS: 1
601+
os: windows-2019-8core-32gb
617602
defaults:
618603
run:
619604
shell: "${{ contains(matrix.os, 'windows') && 'msys2 {0}' || 'bash' }}"

‎src/ci/github-actions/ci.yml

+26-18
Original file line numberDiff line numberDiff line change
@@ -347,23 +347,23 @@ jobs:
347347
<<: [*shared-ci-variables, *public-variables]
348348
PR_CI_JOB: 1
349349
if: github.event_name == 'pull_request'
350-
continue-on-error: ${{ matrix.name == 'mingw-check-tidy' }}
351-
strategy:
352-
matrix:
353-
include:
354-
- name: mingw-check
355-
<<: *job-linux-4c
350+
# continue-on-error: ${{ matrix.name == 'mingw-check-tidy' }}
351+
# strategy:
352+
# matrix:
353+
# include:
354+
# - name: mingw-check
355+
# <<: *job-linux-4c
356356

357-
- name: mingw-check-tidy
358-
<<: *job-linux-4c
357+
# - name: mingw-check-tidy
358+
# <<: *job-linux-4c
359359

360-
- name: x86_64-gnu-llvm-16
361-
env:
362-
ENABLE_GCC_CODEGEN: "1"
363-
<<: *job-linux-16c
360+
# - name: x86_64-gnu-llvm-16
361+
# env:
362+
# ENABLE_GCC_CODEGEN: "1"
363+
# <<: *job-linux-16c
364364

365-
- name: x86_64-gnu-tools
366-
<<: *job-linux-16c
365+
# - name: x86_64-gnu-tools
366+
# <<: *job-linux-16c
367367

368368
auto:
369369
<<: *base-ci-job
@@ -687,6 +687,7 @@ jobs:
687687
--target=x86_64-pc-windows-msvc
688688
--enable-full-tools
689689
--enable-profiler
690+
--set rust.codegen-units=1
690691
SCRIPT: python x.py build --set rust.debug=true opt-dist && PGO_HOST=x86_64-pc-windows-msvc ./build/x86_64-pc-windows-msvc/stage0-tools-bin/opt-dist windows-ci -- python x.py dist bootstrap --include-default-paths
691692
DIST_REQUIRE_ALL_TOOLS: 1
692693
<<: *job-windows-8c
@@ -758,11 +759,18 @@ jobs:
758759
strategy:
759760
matrix:
760761
include:
761-
- &dist-x86_64-linux
762-
name: dist-x86_64-linux
762+
- name: dist-x86_64-msvc
763763
env:
764-
CODEGEN_BACKENDS: llvm,cranelift
765-
<<: *job-linux-16c
764+
RUST_CONFIGURE_ARGS: >-
765+
--build=x86_64-pc-windows-msvc
766+
--host=x86_64-pc-windows-msvc
767+
--target=x86_64-pc-windows-msvc
768+
--enable-full-tools
769+
--enable-profiler
770+
--set rust.codegen-units=1
771+
SCRIPT: python x.py build --set rust.debug=true opt-dist && PGO_HOST=x86_64-pc-windows-msvc ./build/x86_64-pc-windows-msvc/stage0-tools-bin/opt-dist windows-ci -- python x.py dist bootstrap --include-default-paths
772+
DIST_REQUIRE_ALL_TOOLS: 1
773+
<<: *job-windows-8c
766774

767775

768776
master:

0 commit comments

Comments
 (0)