Skip to content

Commit e8ae9bb

Browse files
committed
Auto merge of #112049 - Kobzol:pgo-omit-benchmarks, r=<try>
[do not merge] CI experiments try-job: dist-x86_64-linux try-job: dist-aarch64-linux
2 parents 7022271 + bd84997 commit e8ae9bb

2 files changed

Lines changed: 2 additions & 4 deletions

File tree

src/tools/opt-dist/src/bolt.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ pub fn with_bolt_instrumented<F: FnOnce(&Utf8Path) -> anyhow::Result<R>, R>(
3333
.arg(&format!("--instrumentation-file={profile_prefix}"))
3434
// Make sure that each process will write its profiles into a separate file
3535
.arg("--instrumentation-file-append-pid")
36+
.arg("--drop-cortex-a53-843419-veneers")
3637
.arg("-o")
3738
.arg(instrumented_path.display())
3839
.run()

src/tools/opt-dist/src/main.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -174,8 +174,6 @@ fn create_environment(args: Args) -> anyhow::Result<(Environment, Vec<String>)>
174174
let target_triple =
175175
std::env::var("PGO_HOST").expect("PGO_HOST environment variable missing");
176176

177-
let is_aarch64 = target_triple.starts_with("aarch64");
178-
179177
let checkout_dir = Utf8PathBuf::from("/checkout");
180178
let env = EnvironmentBuilder::default()
181179
.host_tuple(target_triple)
@@ -185,8 +183,7 @@ fn create_environment(args: Args) -> anyhow::Result<(Environment, Vec<String>)>
185183
.artifact_dir(Utf8PathBuf::from("/tmp/tmp-multistage/opt-artifacts"))
186184
.build_dir(checkout_dir.join("obj").join("build"))
187185
.shared_llvm(true)
188-
// FIXME: Enable bolt for aarch64 once it's fixed upstream. Broken as of December 2024.
189-
.use_bolt(!is_aarch64)
186+
.use_bolt(true)
190187
.skipped_tests(vec![])
191188
.run_tests(true)
192189
.fast_try_build(is_fast_try_build)

0 commit comments

Comments
 (0)