ok/jj
1
0
Fork 0
forked from mirrors/jj
Code Pull requests Activity

benches: drop dependency on criterion_bencher_compat

Browse source
This commit is contained in:
Yuya Nishihara 2023-03-27 17:29:59 +09:00
parent 91d0c28080
commit 0087f988f7
3 changed files with 35 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Cargo.lock generated
View file

@ -370,15 +370,6 @@ dependencies = [
"itertools",
]
[[package]]
name = "criterion_bencher_compat"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "31b825f80714ea1a9ec9b4047b42f9fea4c209e92a2addbc317fcc3e5f980e98"
dependencies = [
"criterion",
]
[[package]]
name = "crossbeam-channel"
version = "0.5.6"
@ -836,7 +827,6 @@ dependencies = [
"chrono",
"config",
"criterion",
"criterion_bencher_compat",
"digest",
"git2",
"hex",

1
lib/Cargo.toml
View file

@ -50,7 +50,6 @@ zstd = "0.12.3"
[dev-dependencies]
assert_matches = "1.5.0"
criterion = "0.4.0"
criterion_bencher_compat = "0.4.0"
insta = "1.29.0"
num_cpus = "1.15.0"
test-case = "3.0.0"

57
lib/benches/diff_bench.rs
View file

@ -1,5 +1,4 @@
use bencher::{benchmark_group, benchmark_main, Bencher};
use criterion_bencher_compat as bencher;
use criterion::{criterion_group, criterion_main, Criterion};
use jujutsu_lib::diff;
fn unchanged_lines(count: usize) -> (String, String) {
@ -30,40 +29,53 @@ fn reversed_lines(count: usize) -> (String, String) {
(left_lines.join(""), right_lines.join(""))
}
fn bench_diff_1k_unchanged_lines(b: &mut Bencher) {
fn bench_diff_1k_unchanged_lines(c: &mut Criterion) {
let (left, right) = unchanged_lines(1000);
b.iter(|| diff::diff(left.as_bytes(), right.as_bytes()));
c.bench_function("bench_diff_1k_unchanged_lines", |b| {
b.iter(|| diff::diff(left.as_bytes(), right.as_bytes()))
});
}
fn bench_diff_10k_unchanged_lines(b: &mut Bencher) {
fn bench_diff_10k_unchanged_lines(c: &mut Criterion) {
let (left, right) = unchanged_lines(10000);
b.iter(|| diff::diff(left.as_bytes(), right.as_bytes()));
c.bench_function("bench_diff_10k_unchanged_lines", |b| {
b.iter(|| diff::diff(left.as_bytes(), right.as_bytes()))
});
}
fn bench_diff_1k_modified_lines(b: &mut Bencher) {
fn bench_diff_1k_modified_lines(c: &mut Criterion) {
let (left, right) = modified_lines(1000);
b.iter(|| diff::diff(left.as_bytes(), right.as_bytes()));
c.bench_function("bench_diff_1k_modified_lines", |b| {
b.iter(|| diff::diff(left.as_bytes(), right.as_bytes()))
});
}
fn bench_diff_10k_modified_lines(b: &mut Bencher) {
fn bench_diff_10k_modified_lines(c: &mut Criterion) {
let (left, right) = modified_lines(10000);
b.iter(|| diff::diff(left.as_bytes(), right.as_bytes()));
c.bench_function("bench_diff_10k_modified_lines", |b| {
b.iter(|| diff::diff(left.as_bytes(), right.as_bytes()))
});
}
fn bench_diff_1k_lines_reversed(b: &mut Bencher) {
fn bench_diff_1k_lines_reversed(c: &mut Criterion) {
let (left, right) = reversed_lines(1000);
b.iter(|| diff::diff(left.as_bytes(), right.as_bytes()));
c.bench_function("bench_diff_1k_lines_reversed", |b| {
b.iter(|| diff::diff(left.as_bytes(), right.as_bytes()))
});
}
fn bench_diff_10k_lines_reversed(b: &mut Bencher) {
fn bench_diff_10k_lines_reversed(c: &mut Criterion) {
let (left, right) = reversed_lines(10000);
b.iter(|| diff::diff(left.as_bytes(), right.as_bytes()));
c.bench_function("bench_diff_10k_lines_reversed", |b| {
b.iter(|| diff::diff(left.as_bytes(), right.as_bytes()))
});
}
fn bench_diff_git_git_read_tree_c(b: &mut Bencher) {
b.iter(|| {
diff::diff(
br##"/*
fn bench_diff_git_git_read_tree_c(c: &mut Criterion) {
c.bench_function("bench_diff_git_git_read_tree_c", |b| {
b.iter(|| {
diff::diff(
br##"/*
* GIT - The information manager from hell
*
* Copyright (C) Linus Torvalds, 2005
@ -112,7 +124,7 @@ int main(int argc, char **argv)
return 0;
}
"##,
br##"/*
br##"/*
* GIT - The information manager from hell
*
* Copyright (C) Linus Torvalds, 2005
@ -201,11 +213,12 @@ int main(int argc, char **argv)
return 0;
}
"##,
)
)
})
});
}
benchmark_group!(
criterion_group!(
benches,
bench_diff_1k_unchanged_lines,
bench_diff_10k_unchanged_lines,
@ -215,4 +228,4 @@ benchmark_group!(
bench_diff_10k_lines_reversed,
bench_diff_git_git_read_tree_c,
);
benchmark_main!(benches);
criterion_main!(benches);