Skip to content

Skip unnecessary components in x64 try builds #142963

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
+19 −2
Open

Skip unnecessary components in x64 try builds #142963

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
18673bc
Skip unnecessary components in x64 try builds
Kobzol Jun 24, 2025
ced1523
Skip more dist components
Kobzol Jun 24, 2025
76a8080
Do not build GCC in fast try builds
Kobzol Jun 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/ci/docker/host-x86_64/dist-x86_64-linux/dist.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,7 @@ python3 ../x.py build --set rust.debug=true opt-dist
build-manifest bootstrap

# Use GCC for building GCC, as it seems to behave badly when built with Clang
CC=/rustroot/bin/cc CXX=/rustroot/bin/c++ python3 ../x.py dist gcc
# Only build GCC on full builds, not try builds
if [ "${DIST_TRY_BUILD:-0}" == "0" ]; then
CC=/rustroot/bin/cc CXX=/rustroot/bin/c++ python3 ../x.py dist gcc
fi
11 changes: 10 additions & 1 deletion src/tools/opt-dist/src/exec.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,15 @@ impl Bootstrap {
}
}

fn add_shared_x_flags(env: &Environment, cmd: CmdBuilder) -> CmdBuilder {
fn add_shared_x_flags(env: &Environment, mut cmd: CmdBuilder) -> CmdBuilder {
// Skip things that cannot be skipped through `x ... --skip`
cmd = cmd
.arg("--set")
.arg("rust.llvm-bitcode-linker=false")
// Skip wasm-component-ld
.arg("--set")
.arg("build.extended=false")
.arg("--set")
.arg("rust.codegen-backends=['llvm']");
if env.is_fast_try_build() { cmd.arg("--set").arg("rust.deny-warnings=false") } else { cmd }
}
5 changes: 5 additions & 0 deletions src/tools/opt-dist/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -407,13 +407,18 @@ fn main() -> anyhow::Result<()> {
for target in [
"rust-docs",
"rustc-docs",
"rustc-dev",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Question: to double-check, the "fast try build" is where the user never specified an actual job matcher, right?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, the try builds most often used for perf. runs. The are so slow now :( A few years ago after my optimizations they were barely 1 hour, but now it's 2.5h :( Just BOLT alone takes >1h, it writes 100 GiB of profiles to disk, lol.

"rust-dev",
"rust-docs-json",
"rust-analyzer",
"rustc-src",
"extended",
"clippy",
"miri",
"rustfmt",
"gcc",
"generate-copyright",
"bootstrap",
] {
build_args.extend(["--skip".to_string(), target.to_string()]);
}
Expand Down
Loading