Merge pull request #17 from uutils/e2e-bench-only

E2e bench only
This commit is contained in:
Sylvestre Ledru
2026-05-31 11:17:38 +02:00
committed by GitHub
+98 -326
View File
@@ -4,302 +4,32 @@
// file that was distributed with this source code.
use criterion::{Criterion, black_box, criterion_group, criterion_main};
use uu_grep::matcher::Matcher;
use uu_grep::{BinaryMode, ColorConfig, Config, DeviceMode, DirectoryMode, GlobSet, RegexMode};
use std::ffi::OsString;
use std::path::Path;
fn make_config<'a>(
patterns: &'a [&'a str],
regex_mode: RegexMode,
ignore_case: bool,
invert_match: bool,
word_regexp: bool,
) -> Config<'a> {
Config {
directory_mode: DirectoryMode::Read,
device_mode: DeviceMode::Default,
follow_symlinks: false,
include_globs: GlobSet::new(),
exclude_globs: GlobSet::new(),
exclude_dir_globs: GlobSet::new(),
label: "(standard input)",
#[cfg(windows)]
strip_cr: false,
binary_mode: BinaryMode::Binary,
max_count: None,
before_context: 0,
after_context: 0,
has_context: false,
patterns,
regex_mode,
ignore_case,
invert_match,
word_regexp,
line_regexp: false,
quiet: true,
count: false,
show_filename: false,
files_with_matches: false,
files_without_match: false,
only_matching: false,
byte_offset: false,
line_number: false,
initial_tab: false,
null_separator: false,
null_data: false,
line_buffered: false,
no_messages: true,
group_separator: None,
use_color: false,
color_config: ColorConfig {
matched_selected: "",
matched_context: "",
filename: "",
line_number: "",
byte_offset: "",
separator: "",
selected_line: "",
context_line: "",
reverse_video: false,
no_erase: false,
},
}
/// Run grep end-to-end through the real `uumain` entry point. `args` are the
/// arguments after the program name (flags, pattern, paths). The exit status is
/// ignored — we only care about the work performed.
fn run(args: &[&str]) {
let mut argv: Vec<OsString> = Vec::with_capacity(args.len() + 1);
argv.push(OsString::from("grep"));
argv.extend(args.iter().map(OsString::from));
let _ = uu_grep::uumain(argv.into_iter());
}
fn bench_compile(c: &mut Criterion) {
let mut group = c.benchmark_group("compile");
group.bench_function("fixed_string", |b| {
b.iter(|| {
let patterns: &[&str] = &["hello world"];
let config = make_config(patterns, RegexMode::Fixed, false, false, false);
let matcher = Matcher::compile(black_box(&config)).unwrap();
let _ = black_box(&matcher);
})
});
group.bench_function("basic_regex", |b| {
b.iter(|| {
let patterns: &[&str] = &[r"[0-9]\{4\}-[0-9]\{2\}-[0-9]\{2\}"];
let config = make_config(patterns, RegexMode::Basic, false, false, false);
let matcher = Matcher::compile(black_box(&config)).unwrap();
let _ = black_box(&matcher);
})
});
group.bench_function("extended_regex", |b| {
b.iter(|| {
let patterns: &[&str] = &[r"[0-9]{4}-[0-9]{2}-[0-9]{2}"];
let config = make_config(patterns, RegexMode::Extended, false, false, false);
let matcher = Matcher::compile(black_box(&config)).unwrap();
let _ = black_box(&matcher);
})
});
group.bench_function("perl_regex", |b| {
b.iter(|| {
let patterns: &[&str] = &[r"\d{4}-\d{2}-\d{2}\s+\d{2}:\d{2}:\d{2}"];
let config = make_config(patterns, RegexMode::Perl, false, false, false);
let matcher = Matcher::compile(black_box(&config)).unwrap();
let _ = black_box(&matcher);
})
});
group.bench_function("multiple_patterns", |b| {
b.iter(|| {
let patterns: &[&str] = &["error", "warning", "critical", "fatal", "panic"];
let config = make_config(patterns, RegexMode::Fixed, false, false, false);
let matcher = Matcher::compile(black_box(&config)).unwrap();
let _ = black_box(&matcher);
})
});
group.finish();
}
fn bench_match(c: &mut Criterion) {
let mut group = c.benchmark_group("match");
// Fixed string match - hit
{
let patterns: &[&str] = &["ERROR"];
let config = make_config(patterns, RegexMode::Fixed, false, false, false);
let matcher = Matcher::compile(&config).unwrap();
let line = b"2024-01-15 10:30:45 ERROR: Connection timeout on server-42";
group.bench_function("fixed_string_hit", |b| {
b.iter(|| black_box(matcher.match_line(black_box(line))))
});
}
// Fixed string match - miss
{
let patterns: &[&str] = &["CRITICAL"];
let config = make_config(patterns, RegexMode::Fixed, false, false, false);
let matcher = Matcher::compile(&config).unwrap();
let line = b"2024-01-15 10:30:45 INFO: Server started successfully";
group.bench_function("fixed_string_miss", |b| {
b.iter(|| black_box(matcher.match_line(black_box(line))))
});
}
// Extended regex match
{
let patterns: &[&str] = &[r"[0-9]{4}-[0-9]{2}-[0-9]{2}"];
let config = make_config(patterns, RegexMode::Extended, false, false, false);
let matcher = Matcher::compile(&config).unwrap();
let line = b"2024-01-15 10:30:45 ERROR: Connection timeout";
group.bench_function("extended_regex_hit", |b| {
b.iter(|| black_box(matcher.match_line(black_box(line))))
});
}
// Case-insensitive match
{
let patterns: &[&str] = &["error"];
let config = make_config(patterns, RegexMode::Fixed, true, false, false);
let matcher = Matcher::compile(&config).unwrap();
let line = b"2024-01-15 10:30:45 ERROR: Connection timeout";
group.bench_function("case_insensitive_hit", |b| {
b.iter(|| black_box(matcher.match_line(black_box(line))))
});
}
// Inverted match
{
let patterns: &[&str] = &["ERROR"];
let config = make_config(patterns, RegexMode::Fixed, false, true, false);
let matcher = Matcher::compile(&config).unwrap();
let line = b"2024-01-15 10:30:45 INFO: Server started successfully";
group.bench_function("inverted_match", |b| {
b.iter(|| black_box(matcher.match_line(black_box(line))))
});
}
// Word boundary match
{
let patterns: &[&str] = &["error"];
let config = make_config(patterns, RegexMode::Fixed, true, false, true);
let matcher = Matcher::compile(&config).unwrap();
let line = b"2024-01-15 10:30:45 error: Connection timeout";
group.bench_function("word_boundary_hit", |b| {
b.iter(|| black_box(matcher.match_line(black_box(line))))
});
}
// Multiple patterns
{
let patterns: &[&str] = &["error", "warning", "critical", "fatal", "panic"];
let config = make_config(patterns, RegexMode::Fixed, true, false, false);
let matcher = Matcher::compile(&config).unwrap();
let line = b"2024-01-15 10:30:45 WARNING: High memory usage detected on node-7";
group.bench_function("multi_pattern_hit", |b| {
b.iter(|| black_box(matcher.match_line(black_box(line))))
});
}
// Long line
{
let patterns: &[&str] = &["needle"];
let config = make_config(patterns, RegexMode::Fixed, false, false, false);
let matcher = Matcher::compile(&config).unwrap();
let mut long_line = "a".repeat(5000);
long_line.push_str("needle");
long_line.push_str(&"b".repeat(5000));
let long_line_bytes = long_line.into_bytes();
group.bench_function("long_line_hit", |b| {
b.iter(|| black_box(matcher.match_line(black_box(&long_line_bytes))))
});
}
group.finish();
}
fn bench_throughput(c: &mut Criterion) {
let mut group = c.benchmark_group("throughput");
// Simulate processing many lines (like searching a log file)
let lines: Vec<Vec<u8>> = (0..1000)
.map(|i| {
if i % 50 == 0 {
format!(
"2024-01-15 10:30:{:02} ERROR: Connection timeout on server-{}",
i % 60,
i
)
.into_bytes()
} else {
format!(
"2024-01-15 10:30:{:02} INFO: Request processed in {}ms",
i % 60,
i * 3
)
.into_bytes()
}
})
.collect();
{
let patterns: &[&str] = &["ERROR"];
let config = make_config(patterns, RegexMode::Fixed, false, false, false);
let matcher = Matcher::compile(&config).unwrap();
group.bench_function("scan_1000_lines_fixed", |b| {
b.iter(|| {
let mut matches = 0u64;
for line in &lines {
if matcher.match_line(black_box(line)).is_some() {
matches += 1;
}
}
black_box(matches)
})
});
}
{
let patterns: &[&str] = &[r"[0-9]+ *ms"];
let config = make_config(patterns, RegexMode::Extended, false, false, false);
let matcher = Matcher::compile(&config).unwrap();
group.bench_function("scan_1000_lines_regex", |b| {
b.iter(|| {
let mut matches = 0u64;
for line in &lines {
if matcher.match_line(black_box(line)).is_some() {
matches += 1;
}
}
black_box(matches)
})
});
}
group.finish();
}
/// End-to-end search throughput, driven through the real `uumain` entry point
/// so the whole pipeline (input buffering, searcher, output) is exercised.
///
/// `bench_match` / `bench_throughput` call `Matcher::match_line` on pre-split
/// lines, which measures matching in isolation. They cannot see a change to how
/// the *searcher* feeds data to the matcher (e.g. scanning whole buffers instead
/// of testing one line at a time), because they never run the searcher. These
/// cases do: a literal pattern (which a buffer-at-a-time engine can accelerate)
/// and an extended-regex control (which cannot), over a multi-megabyte file.
fn bench_search(c: &mut Criterion) {
use std::ffi::OsString;
// A log-like file large enough to cross many internal read buffers.
/// Build a multi-megabyte log-like corpus plus a directory holding it alongside
/// a binary file. Every line contains `worker-<n>` and a `2024-…` timestamp; a
/// rare `RAREHIT` marker appears on a handful of lines (≈ every 10000th).
/// Returns `(dir, log_file)`.
fn build_corpus() -> (std::path::PathBuf, std::path::PathBuf) {
let mut content = String::new();
for i in 0..80_000u32 {
if i % 100 == 0 {
if i % 10_000 == 0 {
content.push_str(&format!(
"2024-01-15 10:30:{:02} RAREHIT worker-{i} special marker seen\n",
i % 60
));
} else if i % 100 == 0 {
content.push_str(&format!(
"2024-01-15 10:30:{:02} ERROR worker-{i} connection reset\n",
i % 60
@@ -314,43 +44,85 @@ fn bench_search(c: &mut Criterion) {
}
assert!(content.len() > 4 * 1024 * 1024);
let mut path = std::env::temp_dir();
path.push(format!("uu_grep_bench_{}.log", std::process::id()));
std::fs::write(&path, &content).unwrap();
let path_arg = path.clone().into_os_string();
let dir = std::env::temp_dir().join(format!("uu_grep_bench_{}", std::process::id()));
std::fs::create_dir_all(&dir).unwrap();
let log = dir.join("app.log");
std::fs::write(&log, &content).unwrap();
// `-q` with a pattern that never matches forces a full scan of the file and
// produces no output, so the timing reflects pure scanning throughput.
let run = |extra_flag: Option<&str>, pattern: &str| {
let mut args: Vec<OsString> = vec![OsString::from("grep"), OsString::from("-q")];
if let Some(flag) = extra_flag {
args.push(OsString::from(flag));
}
args.push(OsString::from(pattern));
args.push(path_arg.clone());
// No match => Err(exit code 1); we only care about the work, not status.
let _ = uu_grep::uumain(args.into_iter());
};
// A binary file (contains NUL) that also holds the marker, so `-I` has
// something to skip while recursing.
let mut binary = vec![0u8, 1, 2, 3];
binary.extend_from_slice(b"RAREHIT in binary blob");
binary.extend(std::iter::repeat_n(0u8, 4096));
std::fs::write(dir.join("data.bin"), &binary).unwrap();
let mut group = c.benchmark_group("search");
group.bench_function("scan_literal_no_match", |b| {
b.iter(|| run(None, black_box("NONEXISTENT_TOKEN_XYZ")))
});
group.bench_function("scan_regex_no_match", |b| {
b.iter(|| run(Some("-E"), black_box("NON[0-9]EXISTENT_TOKEN")))
});
group.finish();
let _ = std::fs::remove_file(&path);
(dir, log)
}
criterion_group!(
benches,
bench_compile,
bench_match,
bench_throughput,
bench_search
);
fn bench_e2e(c: &mut Criterion) {
let (dir, log) = build_corpus();
let file = log.to_str().unwrap();
let dir_str = dir.to_str().unwrap();
// Pure scanning throughput: `-q` with a pattern that never matches forces a
// full scan and produces no output. A literal (which a buffer-at-a-time
// searcher can accelerate) versus an extended-regex control (which cannot).
{
let mut group = c.benchmark_group("scan");
group.bench_function("literal_no_match", |b| {
b.iter(|| run(black_box(&["-q", "NONEXISTENT_TOKEN_XYZ", file])))
});
group.bench_function("regex_no_match", |b| {
b.iter(|| run(black_box(&["-q", "-E", "NON[0-9]EXISTENT_TOKEN", file])))
});
group.finish();
}
// Real invocation shapes from the `grep` tldr page, each scanning the whole
// corpus. The `RAREHIT` marker matches only a handful of lines, so output
// stays small while the full-file scan dominates.
{
let mut group = c.benchmark_group("usage");
// Search for a pattern within a file.
group.bench_function("search_pattern", |b| {
b.iter(|| run(black_box(&["RAREHIT", file])))
});
// Search for an exact string (-F).
group.bench_function("fixed_string", |b| {
b.iter(|| run(black_box(&["-F", "RAREHIT", file])))
});
// Recursive search ignoring binary files (-rI).
group.bench_function("recursive_no_binary", |b| {
b.iter(|| run(black_box(&["-rI", "RAREHIT", dir_str])))
});
// Print 3 lines of context (-C 3).
group.bench_function("context", |b| {
b.iter(|| run(black_box(&["-C", "3", "RAREHIT", file])))
});
// Filename + line number with forced color (-Hn --color=always).
group.bench_function("filename_lineno_color", |b| {
b.iter(|| run(black_box(&["-Hn", "--color=always", "RAREHIT", file])))
});
// Print only the matched text (-o).
group.bench_function("only_matching", |b| {
b.iter(|| run(black_box(&["-o", "RAREHIT", file])))
});
// Invert match (-v); `worker-` is on every line, so nothing is printed
// and this measures the full inverted scan.
group.bench_function("invert_match", |b| {
b.iter(|| run(black_box(&["-v", "worker-", file])))
});
// Extended regex, case-insensitive (-Ei).
group.bench_function("extended_icase", |b| {
b.iter(|| run(black_box(&["-Ei", "rarehit", file])))
});
group.finish();
}
let _ = std::fs::remove_dir_all(Path::new(dir_str));
}
criterion_group!(benches, bench_e2e);
criterion_main!(benches);