Skip to content

Commit 072903e

Browse files
KobzolKobzol
committed
Disable LLVM PGO
1 parent 198db08 commit 072903e

File tree

1 file changed

+68
-68
lines changed

1 file changed

+68
-68
lines changed

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

+68-68
Original file line numberDiff line numberDiff line change
@@ -73,76 +73,76 @@ fn execute_pipeline(
7373
// Stage 2: Gather LLVM PGO profiles
7474
// Here we build a PGO instrumented LLVM, reusing the previously PGO optimized rustc.
7575
// Then we use the instrumented LLVM to gather LLVM PGO profiles.
76-
let llvm_pgo_profile = timer.section("Stage 2 (LLVM PGO)", |stage| {
77-
// Remove the previous, uninstrumented build of LLVM.
78-
clear_llvm_files(env)?;
79-
80-
let llvm_profile_dir_root = env.opt_artifacts().join("llvm-pgo");
81-
82-
stage.section("Build PGO instrumented LLVM", |section| {
83-
Bootstrap::build(env)
84-
.llvm_pgo_instrument(&llvm_profile_dir_root)
85-
.avoid_rustc_rebuild()
86-
.run(section)
87-
})?;
88-
89-
let profile = stage
90-
.section("Gather profiles", |_| gather_llvm_profiles(env, &llvm_profile_dir_root))?;
91-
92-
print_free_disk_space()?;
93-
94-
// Proactively delete the instrumented artifacts, to avoid using them by accident in
95-
// follow-up stages.
96-
clear_llvm_files(env)?;
97-
98-
Ok(profile)
99-
})?;
100-
101-
let llvm_bolt_profile = if false {
102-
//env.supports_bolt() {
103-
// Stage 3: Build BOLT instrumented LLVM
104-
// We build a PGO optimized LLVM in this step, then instrument it with BOLT and gather BOLT profiles.
105-
// Note that we don't remove LLVM artifacts after this step, so that they are reused in the final dist build.
106-
// BOLT instrumentation is performed "on-the-fly" when the LLVM library is copied to the sysroot of rustc,
107-
// therefore the LLVM artifacts on disk are not "tainted" with BOLT instrumentation and they can be reused.
108-
timer.section("Stage 3 (LLVM BOLT)", |stage| {
109-
stage.section("Build PGO optimized LLVM", |stage| {
110-
Bootstrap::build(env)
111-
.with_llvm_bolt_ldflags()
112-
.llvm_pgo_optimize(&llvm_pgo_profile)
113-
.avoid_rustc_rebuild()
114-
.run(stage)
115-
})?;
116-
117-
// Find the path to the `libLLVM.so` file
118-
let llvm_lib = io::find_file_in_dir(
119-
&env.build_artifacts().join("stage2").join("lib"),
120-
"libLLVM",
121-
".so",
122-
)?;
123-
124-
// Instrument it and gather profiles
125-
let profile = with_bolt_instrumented(&llvm_lib, || {
126-
stage.section("Gather profiles", |_| gather_llvm_bolt_profiles(env))
127-
})?;
128-
print_free_disk_space()?;
129-
130-
// Now optimize the library with BOLT. The `libLLVM-XXX.so` library is actually hard-linked
131-
// from several places, and this specific path (`llvm_lib`) will *not* be packaged into
132-
// the final dist build. However, when BOLT optimizes an artifact, it does so *in-place*,
133-
// therefore it will actually optimize all the hard links, which means that the final
134-
// packaged `libLLVM.so` file *will* be BOLT optimized.
135-
bolt_optimize(&llvm_lib, &profile).context("Could not optimize LLVM with BOLT")?;
136-
137-
// LLVM is not being cleared here, we want to use the BOLT-optimized LLVM
138-
Ok(Some(profile))
139-
})?
140-
} else {
141-
None
142-
};
76+
// let llvm_pgo_profile = timer.section("Stage 2 (LLVM PGO)", |stage| {
77+
// // Remove the previous, uninstrumented build of LLVM.
78+
// clear_llvm_files(env)?;
79+
//
80+
// let llvm_profile_dir_root = env.opt_artifacts().join("llvm-pgo");
81+
//
82+
// stage.section("Build PGO instrumented LLVM", |section| {
83+
// Bootstrap::build(env)
84+
// .llvm_pgo_instrument(&llvm_profile_dir_root)
85+
// .avoid_rustc_rebuild()
86+
// .run(section)
87+
// })?;
88+
//
89+
// let profile = stage
90+
// .section("Gather profiles", |_| gather_llvm_profiles(env, &llvm_profile_dir_root))?;
91+
//
92+
// print_free_disk_space()?;
93+
//
94+
// // Proactively delete the instrumented artifacts, to avoid using them by accident in
95+
// // follow-up stages.
96+
// clear_llvm_files(env)?;
97+
//
98+
// Ok(profile)
99+
// })?;
100+
101+
// let llvm_bolt_profile = if false {
102+
// //env.supports_bolt() {
103+
// // Stage 3: Build BOLT instrumented LLVM
104+
// // We build a PGO optimized LLVM in this step, then instrument it with BOLT and gather BOLT profiles.
105+
// // Note that we don't remove LLVM artifacts after this step, so that they are reused in the final dist build.
106+
// // BOLT instrumentation is performed "on-the-fly" when the LLVM library is copied to the sysroot of rustc,
107+
// // therefore the LLVM artifacts on disk are not "tainted" with BOLT instrumentation and they can be reused.
108+
// timer.section("Stage 3 (LLVM BOLT)", |stage| {
109+
// stage.section("Build PGO optimized LLVM", |stage| {
110+
// Bootstrap::build(env)
111+
// .with_llvm_bolt_ldflags()
112+
// .llvm_pgo_optimize(&llvm_pgo_profile)
113+
// .avoid_rustc_rebuild()
114+
// .run(stage)
115+
// })?;
116+
//
117+
// // Find the path to the `libLLVM.so` file
118+
// let llvm_lib = io::find_file_in_dir(
119+
// &env.build_artifacts().join("stage2").join("lib"),
120+
// "libLLVM",
121+
// ".so",
122+
// )?;
123+
//
124+
// // Instrument it and gather profiles
125+
// let profile = with_bolt_instrumented(&llvm_lib, || {
126+
// stage.section("Gather profiles", |_| gather_llvm_bolt_profiles(env))
127+
// })?;
128+
// print_free_disk_space()?;
129+
//
130+
// // Now optimize the library with BOLT. The `libLLVM-XXX.so` library is actually hard-linked
131+
// // from several places, and this specific path (`llvm_lib`) will *not* be packaged into
132+
// // the final dist build. However, when BOLT optimizes an artifact, it does so *in-place*,
133+
// // therefore it will actually optimize all the hard links, which means that the final
134+
// // packaged `libLLVM.so` file *will* be BOLT optimized.
135+
// bolt_optimize(&llvm_lib, &profile).context("Could not optimize LLVM with BOLT")?;
136+
//
137+
// // LLVM is not being cleared here, we want to use the BOLT-optimized LLVM
138+
// Ok(Some(profile))
139+
// })?
140+
// } else {
141+
// None
142+
// };
143143

144144
let mut dist = Bootstrap::dist(env, &dist_args)
145-
.llvm_pgo_optimize(&llvm_pgo_profile)
145+
// .llvm_pgo_optimize(&llvm_pgo_profile)
146146
.rustc_pgo_optimize(&rustc_pgo_profile)
147147
.avoid_rustc_rebuild();
148148

0 commit comments

Comments
 (0)