mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Pass BOLT settings at the correct step

Browse Source
This commit is contained in:
Jakub Beránek 2023-10-11 22:40:04 +02:00
parent 9a0e90f7b4
commit 482a8204bc
No known key found for this signature in database
GPG Key ID: 909CD0D26483516B
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/bootstrap/compile.rs
View File

@ -907,7 +907,7 @@ impl Step for Rustc {
} }
if builder.build.config.enable_bolt_settings && compiler.stage == 1 { if builder.build.config.enable_bolt_settings && compiler.stage == 1 {
// Relocations are required for BOLT to work.k // Relocations are required for BOLT to work.
cargo.env("RUSTC_BOLT_LINK_FLAGS", "1"); cargo.env("RUSTC_BOLT_LINK_FLAGS", "1");
} }

10
src/tools/opt-dist/src/main.rs
View File

@ -215,7 +215,12 @@ fn execute_pipeline(
print_free_disk_space()?; print_free_disk_space()?;
stage.section("Build PGO optimized rustc", |section| { stage.section("Build PGO optimized rustc", |section| {
Bootstrap::build(env).rustc_pgo_optimize(&profile).run(section) let mut cmd = Bootstrap::build(env).rustc_pgo_optimize(&profile);
if env.use_bolt() {
cmd = cmd.with_rustc_bolt_ldflags();
}
cmd.run(section)
})?; })?;
Ok(profile) Ok(profile)
@ -259,7 +264,6 @@ fn execute_pipeline(
stage.section("Build PGO optimized LLVM", |stage| { stage.section("Build PGO optimized LLVM", |stage| {
Bootstrap::build(env) Bootstrap::build(env)
.with_llvm_bolt_ldflags() .with_llvm_bolt_ldflags()
.with_rustc_bolt_ldflags()
.llvm_pgo_optimize(&llvm_pgo_profile) .llvm_pgo_optimize(&llvm_pgo_profile)
.avoid_rustc_rebuild() .avoid_rustc_rebuild()
.run(stage) .run(stage)
@ -270,7 +274,7 @@ fn execute_pipeline(
log::info!("Optimizing {llvm_lib} with BOLT"); log::info!("Optimizing {llvm_lib} with BOLT");
// FIXME(kobzol: try gather profiles together, at once for LLVM and rustc // FIXME(kobzol): try gather profiles together, at once for LLVM and rustc
// Instrument the libraries and gather profiles // Instrument the libraries and gather profiles
let llvm_profile = with_bolt_instrumented(&llvm_lib, |llvm_profile_dir| { let llvm_profile = with_bolt_instrumented(&llvm_lib, |llvm_profile_dir| {
stage.section("Gather profiles", |_| { stage.section("Gather profiles", |_| {