Skip to content
Merged
Changes from all commits
Commits
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
27 changes: 21 additions & 6 deletions src/runner.rs
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,9 @@ fn run_suite(
executor: executor_name.into(),
extra_args: bench.extra_args.clone(),
};
for _ in 0..(config.proc_execs) {
let progress = get_progress_percentage(config, *completed_pexecs);
print!(">>> haste: {:3.0}% {key}", progress.round() as i64);
let progress = get_progress_percentage(config, *completed_pexecs);
print!(">>> haste: {:3.0}% {key} ...", progress.round() as i64);
for i in 0..(config.proc_execs) {
io::stdout().flush().ok();
run_benchmark(
results,
Expand All @@ -66,7 +66,24 @@ fn run_suite(
bench,
);
*completed_pexecs += 1;
let progress = get_progress_percentage(config, *completed_pexecs);
let so_far = results
.data
.get(&key.to_string())
.unwrap()
.iter()
.map(|x| format!("{x}ms"))
.collect::<Vec<_>>()
.join(" ");
print!(
"\r>>> haste: {:3.0}% {key} {so_far}",
progress.round() as i64
);
if i + 1 < config.proc_execs {
print!(" ...");
}
}
println!();
}
}

Expand Down Expand Up @@ -106,7 +123,7 @@ fn run_benchmark(
let elapsed = f64::from(u32::try_from(t.elapsed().as_millis()).unwrap());

if !output.status.success() {
println!("");
println!();
eprintln!("error: benchmark command exited non-zero!");
eprintln!("args: {cmd:?}");
let stdout = String::from_utf8_lossy(&output.stdout);
Expand All @@ -120,8 +137,6 @@ fn run_benchmark(
process::exit(1)
}

println!(" {elapsed}ms");

let bench_key = BenchKey {
benchmark: bench_name.to_owned(),
executor: executor_name.to_owned(),
Expand Down