Skip to content

boulder: Clean out PGO profiling data between runs #877

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
joebonrichie wants to merge 1 commit into
base: main
Choose a base branch
from
Open

boulder: Clean out PGO profiling data between runs #877

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 6 additions & 6 deletions boulder/src/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ use nix::{
use thiserror::Error;
use tui::Styled;

use self::job::Job;
use self::job::{Job, pgo_dir};
use crate::{
Env, Macros, Paths, Recipe, Timing,
architecture::BuildTarget,
Expand Down Expand Up @@ -196,16 +196,16 @@ impl Builder {
for (i, target) in self.targets.iter().enumerate() {
println!("{}", build_target_prefix(target.build_target, i));

// Clean out any pre-existing profiling data from PGO runs
if let Some(job) = target.jobs.iter().find(|job| job.pgo_stage.is_some()) {
util::recreate_dir(&pgo_dir(&job.build_dir))?;
}

for (i, job) in target.jobs.iter().enumerate() {
let is_pgo = job.pgo_stage.is_some();

// Recreate work dir for each job
util::recreate_dir(&job.work_dir)?;
// Ensure pgo dir exists
if is_pgo {
let pgo_dir = PathBuf::from(format!("{}-pgo", job.build_dir.display()));
util::ensure_dir_exists(&pgo_dir)?;
}

if let Some(stage) = job.pgo_stage {
println!("{}", pgo_stage_prefix(stage, i));
Expand Down
4 changes: 4 additions & 0 deletions boulder/src/build/job.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,10 @@ fn work_dir(build_dir: &Path, upstreams: &[Upstream]) -> PathBuf {
work_dir
}

pub fn pgo_dir(build_dir: &Path) -> PathBuf {
PathBuf::from(format!("{}-pgo", build_dir.display()))
}

#[derive(Debug, Error)]
pub enum Error {
#[error("missing arch macros: {0}")]
Expand Down
4 changes: 2 additions & 2 deletions boulder/src/build/job/phase.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ use crate::build::pgo;
use crate::build::script::ScriptBundle;
use crate::{Macros, Paths, Recipe, architecture::BuildTarget};

use super::{Error, work_dir};
use super::{Error, pgo_dir, work_dir};

pub fn list(pgo_stage: Option<pgo::Stage>) -> Vec<Phase> {
if matches!(pgo_stage, Some(pgo::Stage::One | pgo::Stage::Two)) {
Expand Down Expand Up @@ -216,7 +216,7 @@ impl Phase {
env.add_builtin_string("pgo_stage", "NONE");
}

env.add_builtin_string("pgo_dir", format!("{}-pgo", build_dir.display()));
env.add_builtin_string("pgo_dir", pgo_dir(&build_dir).display());

add_tuning(target, pgo_stage, recipe, macros, &mut env)?;

Expand Down
Loading