Skip to content

fix some benchmark (some of them were failing) #8773

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

Merged
sylvestre merged 1 commit into from
Sep 29, 2025
Merged

fix some benchmark (some of them were failing) #8773

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
98 changes: 45 additions & 53 deletions src/uu/numfmt/benches/numfmt_bench.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,108 +5,100 @@

use divan::{Bencher, black_box};
use uu_numfmt::uumain;
use uucore::benchmark::{run_util_function, setup_test_file, text_data};
use uucore::benchmark::run_util_function;

/// Benchmark SI formatting with different number counts
#[divan::bench(args = [1_000_000])]
/// Benchmark SI formatting by passing numbers as command-line arguments
#[divan::bench(args = [10_000])]
fn numfmt_to_si(bencher: Bencher, count: usize) {
let data = text_data::generate_numbers(count);
let file_path = setup_test_file(data.as_bytes());
let file_path_str = file_path.to_str().unwrap();
let numbers: Vec<String> = (1..=count).map(|n| n.to_string()).collect();
let mut args = vec!["--to=si"];
let number_refs: Vec<&str> = numbers.iter().map(|s| s.as_str()).collect();
args.extend(number_refs);

bencher.bench(|| {
black_box(run_util_function(uumain, &["--to=si", file_path_str]));
black_box(run_util_function(uumain, &args));
});
}

/// Benchmark SI formatting with precision format
#[divan::bench(args = [1_000_000])]
#[divan::bench(args = [10_000])]
fn numfmt_to_si_precision(bencher: Bencher, count: usize) {
let data = text_data::generate_numbers(count);
let file_path = setup_test_file(data.as_bytes());
let file_path_str = file_path.to_str().unwrap();
let numbers: Vec<String> = (1..=count).map(|n| n.to_string()).collect();
let mut args = vec!["--to=si", "--format=%.6f"];
let number_refs: Vec<&str> = numbers.iter().map(|s| s.as_str()).collect();
args.extend(number_refs);

bencher.bench(|| {
black_box(run_util_function(
uumain,
&["--to=si", "--format=%.6f", file_path_str],
));
black_box(run_util_function(uumain, &args));
});
}

/// Benchmark IEC (binary) formatting
#[divan::bench(args = [1_000_000])]
#[divan::bench(args = [10_000])]
fn numfmt_to_iec(bencher: Bencher, count: usize) {
let data = text_data::generate_numbers(count);
let file_path = setup_test_file(data.as_bytes());
let file_path_str = file_path.to_str().unwrap();
let numbers: Vec<String> = (1..=count).map(|n| n.to_string()).collect();
let mut args = vec!["--to=iec"];
let number_refs: Vec<&str> = numbers.iter().map(|s| s.as_str()).collect();
args.extend(number_refs);

bencher.bench(|| {
black_box(run_util_function(uumain, &["--to=iec", file_path_str]));
black_box(run_util_function(uumain, &args));
});
}

/// Benchmark parsing from SI format back to raw numbers
#[divan::bench(args = [1_000_000])]
#[divan::bench(args = [10_000])]
fn numfmt_from_si(bencher: Bencher, count: usize) {
// Generate SI formatted data (e.g., "1.0K", "2.0K", etc.)
let data = (1..=count)
.map(|n| format!("{:.1}K", n as f64 / 1000.0))
.collect::<Vec<_>>()
.join("\n");
let file_path = setup_test_file(data.as_bytes());
let file_path_str = file_path.to_str().unwrap();
// Generate SI formatted data (e.g., "1K", "2K", etc.)
let numbers: Vec<String> = (1..=count).map(|n| format!("{n}K")).collect();
let mut args = vec!["--from=si"];
let number_refs: Vec<&str> = numbers.iter().map(|s| s.as_str()).collect();
args.extend(number_refs);

bencher.bench(|| {
black_box(run_util_function(uumain, &["--from=si", file_path_str]));
black_box(run_util_function(uumain, &args));
});
}

/// Benchmark large numbers with SI formatting
#[divan::bench(args = [1_000_000])]
#[divan::bench(args = [10_000])]
fn numfmt_large_numbers_si(bencher: Bencher, count: usize) {
// Generate larger numbers (millions to billions range)
let data = (1..=count)
.map(|n| (n * 1_000_000).to_string())
.collect::<Vec<_>>()
.join("\n");
let file_path = setup_test_file(data.as_bytes());
let file_path_str = file_path.to_str().unwrap();
let numbers: Vec<String> = (1..=count).map(|n| (n * 1_000_000).to_string()).collect();
let mut args = vec!["--to=si"];
let number_refs: Vec<&str> = numbers.iter().map(|s| s.as_str()).collect();
args.extend(number_refs);

bencher.bench(|| {
black_box(run_util_function(uumain, &["--to=si", file_path_str]));
black_box(run_util_function(uumain, &args));
});
}

/// Benchmark different padding widths
#[divan::bench(args = [(1_000_000, 50)])]
#[divan::bench(args = [(10_000, 50)])]
fn numfmt_padding(bencher: Bencher, (count, padding): (usize, usize)) {
let data = text_data::generate_numbers(count);
let file_path = setup_test_file(data.as_bytes());
let file_path_str = file_path.to_str().unwrap();
let numbers: Vec<String> = (1..=count).map(|n| n.to_string()).collect();
let padding_arg = format!("--padding={padding}");
let mut args = vec!["--to=si", &padding_arg];
let number_refs: Vec<&str> = numbers.iter().map(|s| s.as_str()).collect();
args.extend(number_refs);

bencher.bench(|| {
black_box(run_util_function(
uumain,
&["--to=si", &padding_arg, file_path_str],
));
black_box(run_util_function(uumain, &args));
});
}

/// Benchmark round modes with SI formatting
#[divan::bench(args = [("up", 1_000_000), ("down", 1_000_000), ("towards-zero", 1_000_000)])]
#[divan::bench(args = [("up", 10_000), ("down", 10_000), ("towards-zero", 10_000)])]
fn numfmt_round_modes(bencher: Bencher, (round_mode, count): (&str, usize)) {
let data = text_data::generate_numbers(count);
let file_path = setup_test_file(data.as_bytes());
let file_path_str = file_path.to_str().unwrap();
let numbers: Vec<String> = (1..=count).map(|n| n.to_string()).collect();
let round_arg = format!("--round={round_mode}");
let mut args = vec!["--to=si", &round_arg];
let number_refs: Vec<&str> = numbers.iter().map(|s| s.as_str()).collect();
args.extend(number_refs);

bencher.bench(|| {
black_box(run_util_function(
uumain,
&["--to=si", &round_arg, file_path_str],
));
black_box(run_util_function(uumain, &args));
});
}

Expand Down
55 changes: 45 additions & 10 deletions src/uu/sort/benches/sort_bench.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
// file that was distributed with this source code.

use divan::{Bencher, black_box};
use tempfile::NamedTempFile;
use uu_sort::uumain;
use uucore::benchmark::{run_util_function, setup_test_file, text_data};

Expand All @@ -12,9 +13,14 @@ use uucore::benchmark::{run_util_function, setup_test_file, text_data};
fn sort_ascii_only(bencher: Bencher, num_lines: usize) {
let data = text_data::generate_ascii_data(num_lines);
let file_path = setup_test_file(&data);
let output_file = NamedTempFile::new().unwrap();
let output_path = output_file.path().to_str().unwrap();

bencher.bench(|| {
black_box(run_util_function(uumain, &[file_path.to_str().unwrap()]));
black_box(run_util_function(
uumain,
&["-o", output_path, file_path.to_str().unwrap()],
));
});
}

Expand All @@ -23,9 +29,14 @@ fn sort_ascii_only(bencher: Bencher, num_lines: usize) {
fn sort_accented_data(bencher: Bencher, num_lines: usize) {
let data = text_data::generate_accented_data(num_lines);
let file_path = setup_test_file(&data);
let output_file = NamedTempFile::new().unwrap();
let output_path = output_file.path().to_str().unwrap();

bencher.bench(|| {
black_box(run_util_function(uumain, &[file_path.to_str().unwrap()]));
black_box(run_util_function(
uumain,
&["-o", output_path, file_path.to_str().unwrap()],
));
});
}

Expand All @@ -34,9 +45,14 @@ fn sort_accented_data(bencher: Bencher, num_lines: usize) {
fn sort_mixed_data(bencher: Bencher, num_lines: usize) {
let data = text_data::generate_mixed_data(num_lines);
let file_path = setup_test_file(&data);
let output_file = NamedTempFile::new().unwrap();
let output_path = output_file.path().to_str().unwrap();

bencher.bench(|| {
black_box(run_util_function(uumain, &[file_path.to_str().unwrap()]));
black_box(run_util_function(
uumain,
&["-o", output_path, file_path.to_str().unwrap()],
));
});
}

Expand All @@ -45,9 +61,14 @@ fn sort_mixed_data(bencher: Bencher, num_lines: usize) {
fn sort_case_sensitive(bencher: Bencher, num_lines: usize) {
let data = text_data::generate_case_sensitive_data(num_lines);
let file_path = setup_test_file(&data);
let output_file = NamedTempFile::new().unwrap();
let output_path = output_file.path().to_str().unwrap();

bencher.bench(|| {
black_box(run_util_function(uumain, &[file_path.to_str().unwrap()]));
black_box(run_util_function(
uumain,
&["-o", output_path, file_path.to_str().unwrap()],
));
});
}

Expand All @@ -56,11 +77,13 @@ fn sort_case_sensitive(bencher: Bencher, num_lines: usize) {
fn sort_case_insensitive(bencher: Bencher, num_lines: usize) {
let data = text_data::generate_case_sensitive_data(num_lines);
let file_path = setup_test_file(&data);
let output_file = NamedTempFile::new().unwrap();
let output_path = output_file.path().to_str().unwrap();

bencher.bench(|| {
black_box(run_util_function(
uumain,
&["-f", file_path.to_str().unwrap()],
&["-f", "-o", output_path, file_path.to_str().unwrap()],
));
});
}
Expand All @@ -70,11 +93,13 @@ fn sort_case_insensitive(bencher: Bencher, num_lines: usize) {
fn sort_dictionary_order(bencher: Bencher, num_lines: usize) {
let data = text_data::generate_mixed_data(num_lines);
let file_path = setup_test_file(&data);
let output_file = NamedTempFile::new().unwrap();
let output_path = output_file.path().to_str().unwrap();

bencher.bench(|| {
black_box(run_util_function(
uumain,
&["-d", file_path.to_str().unwrap()],
&["-d", "-o", output_path, file_path.to_str().unwrap()],
));
});
}
Expand All @@ -92,10 +117,13 @@ fn sort_numeric(bencher: Bencher, num_lines: usize) {

let file_path = setup_test_file(&data);

let output_file = NamedTempFile::new().unwrap();
let output_path = output_file.path().to_str().unwrap();

bencher.bench(|| {
black_box(run_util_function(
uumain,
&["-n", file_path.to_str().unwrap()],
&["-n", "-o", output_path, file_path.to_str().unwrap()],
));
});
}
Expand All @@ -105,11 +133,13 @@ fn sort_numeric(bencher: Bencher, num_lines: usize) {
fn sort_reverse_locale(bencher: Bencher, num_lines: usize) {
let data = text_data::generate_accented_data(num_lines);
let file_path = setup_test_file(&data);
let output_file = NamedTempFile::new().unwrap();
let output_path = output_file.path().to_str().unwrap();

bencher.bench(|| {
black_box(run_util_function(
uumain,
&["-r", file_path.to_str().unwrap()],
&["-r", "-o", output_path, file_path.to_str().unwrap()],
));
});
}
Expand All @@ -130,11 +160,14 @@ fn sort_key_field(bencher: Bencher, num_lines: usize) {

let file_path = setup_test_file(&data);

let output_file = NamedTempFile::new().unwrap();
let output_path = output_file.path().to_str().unwrap();

bencher.bench(|| {
// Sort by second field
black_box(run_util_function(
uumain,
&["-k", "2", file_path.to_str().unwrap()],
&["-k", "2", "-o", output_path, file_path.to_str().unwrap()],
));
});
}
Expand All @@ -144,11 +177,13 @@ fn sort_key_field(bencher: Bencher, num_lines: usize) {
fn sort_unique_locale(bencher: Bencher, num_lines: usize) {
let data = text_data::generate_accented_data(num_lines);
let file_path = setup_test_file(&data);
let output_file = NamedTempFile::new().unwrap();
let output_path = output_file.path().to_str().unwrap();

bencher.bench(|| {
black_box(run_util_function(
uumain,
&["-u", file_path.to_str().unwrap()],
&["-u", "-o", output_path, file_path.to_str().unwrap()],
));
});
}
Expand Down
Loading
Loading