Skip to content

Commit 7acec27

Browse files
ManishearthManishearth
authored
Remove tinystr old-version benchmarks (#3326)
* Remove tinystr old-version benchmarks
1 parent 0790ae3 commit 7acec27

File tree

5 files changed

+12
-162
lines changed

5 files changed

+12
-162
lines changed

‎Cargo.lock‎

Lines changed: 12 additions & 39 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎utils/tinystr/Cargo.toml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ criterion = "0.4"
4141
postcard = { version = "1.0.0", features = ["use-std"], default-features = false }
4242
rand = { version = "0.8.5", features = ["small_rng"] }
4343
serde_json = { version = "1.0", default-features = false, features = ["alloc"] }
44-
tinystr_old = { version = "0.4", package = "tinystr", features = ["serde"] }
4544

4645
[features]
4746
default = ["alloc"]

‎utils/tinystr/benches/common/mod.rs‎

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -37,43 +37,19 @@ macro_rules! bench_block {
3737
let mut group4 = $c.benchmark_group(&format!("{}/4", $name));
3838
group4.bench_function("String", $action!(String, STRINGS_4));
3939
group4.bench_function("TinyAsciiStr<4>", $action!(TinyAsciiStr<4>, STRINGS_4));
40-
group4.bench_function(
41-
"tinystr_old::TinyStr4",
42-
$action!(tinystr_old::TinyStr4, STRINGS_4),
43-
);
4440
group4.bench_function("TinyAsciiStr<8>", $action!(TinyAsciiStr<8>, STRINGS_4));
45-
group4.bench_function(
46-
"tinystr_old::TinyStr8",
47-
$action!(tinystr_old::TinyStr8, STRINGS_4),
48-
);
4941
group4.bench_function("TinyAsciiStr<16>", $action!(TinyAsciiStr<16>, STRINGS_4));
50-
group4.bench_function(
51-
"tinystr_old::TinyStr16",
52-
$action!(tinystr_old::TinyStr16, STRINGS_4),
53-
);
5442
group4.finish();
5543

5644
let mut group8 = $c.benchmark_group(&format!("{}/8", $name));
5745
group8.bench_function("String", $action!(String, STRINGS_8));
5846
group8.bench_function("TinyAsciiStr<8>", $action!(TinyAsciiStr<8>, STRINGS_8));
5947
group8.bench_function("TinyAsciiStr<16>", $action!(TinyAsciiStr<16>, STRINGS_8));
60-
group8.bench_function(
61-
"tinystr_old::TinyStr8",
62-
$action!(tinystr_old::TinyStr8, STRINGS_8),
63-
);
64-
group8.bench_function(
65-
"tinystr_old::TinyStr16",
66-
$action!(tinystr_old::TinyStr16, STRINGS_8),
67-
);
6848
group8.finish();
6949

7050
let mut group16 = $c.benchmark_group(&format!("{}/16", $name));
7151
group16.bench_function("String", $action!(String, STRINGS_16));
7252
group16.bench_function("TinyAsciiStr<16>", $action!(TinyAsciiStr<16>, STRINGS_16));
73-
group16.bench_function(
74-
"tinystr_old::TinyStr16",
75-
$action!(tinystr_old::TinyStr16, STRINGS_16),
76-
);
7753
group16.finish();
7854
};
7955
}

‎utils/tinystr/benches/construct.rs‎

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -47,41 +47,17 @@ fn construct_from_bytes(c: &mut Criterion) {
4747

4848
let mut group4 = c.benchmark_group("construct_from_bytes/4");
4949
group4.bench_function("TinyAsciiStr<4>", cfu!(TinyAsciiStr<4>, STRINGS_4));
50-
group4.bench_function(
51-
"tinystr_old::TinyStr4",
52-
cfu!(tinystr_old::TinyStr4, STRINGS_4),
53-
);
5450
group4.bench_function("TinyAsciiStr<8>", cfu!(TinyAsciiStr<8>, STRINGS_4));
55-
group4.bench_function(
56-
"tinystr_old::TinyStr8",
57-
cfu!(tinystr_old::TinyStr8, STRINGS_4),
58-
);
5951
group4.bench_function("TinyAsciiStr<16>", cfu!(TinyAsciiStr<16>, STRINGS_4));
60-
group4.bench_function(
61-
"tinystr_old::TinyStr16",
62-
cfu!(tinystr_old::TinyStr16, STRINGS_4),
63-
);
6452
group4.finish();
6553

6654
let mut group8 = c.benchmark_group("construct_from_bytes/8");
6755
group8.bench_function("TinyAsciiStr<8>", cfu!(TinyAsciiStr<8>, STRINGS_8));
68-
group8.bench_function(
69-
"tinystr_old::TinyStr8",
70-
cfu!(tinystr_old::TinyStr8, STRINGS_8),
71-
);
7256
group8.bench_function("TinyAsciiStr<16>", cfu!(TinyAsciiStr<16>, STRINGS_8));
73-
group8.bench_function(
74-
"tinystr_old::TinyStr16",
75-
cfu!(tinystr_old::TinyStr16, STRINGS_8),
76-
);
7757
group8.finish();
7858

7959
let mut group16 = c.benchmark_group("construct_from_bytes/16");
8060
group16.bench_function("TinyAsciiStr<16>", cfu!(TinyAsciiStr<16>, STRINGS_16));
81-
group16.bench_function(
82-
"tinystr_old::TinyStr16",
83-
cfu!(tinystr_old::TinyStr16, STRINGS_16),
84-
);
8561
group16.finish();
8662
}
8763

‎utils/tinystr/benches/overview.rs‎

Lines changed: 0 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,6 @@ use criterion::criterion_main;
1111
use criterion::Criterion;
1212

1313
use tinystr::TinyAsciiStr;
14-
use tinystr_old::TinyStr16;
15-
use tinystr_old::TinyStr4;
16-
use tinystr_old::TinyStr8;
1714

1815
fn overview(c: &mut Criterion) {
1916
let mut g = c.benchmark_group("overview");
@@ -35,23 +32,6 @@ fn overview(c: &mut Criterion) {
3532
});
3633
});
3734

38-
g.bench_function("construct/TinyStr", |b| {
39-
b.iter(|| {
40-
for s in STRINGS_4 {
41-
let _: TinyStr4 = black_box(s).parse().unwrap();
42-
let _: TinyStr8 = black_box(s).parse().unwrap();
43-
let _: TinyStr16 = black_box(s).parse().unwrap();
44-
}
45-
for s in STRINGS_8 {
46-
let _: TinyStr8 = black_box(s).parse().unwrap();
47-
let _: TinyStr16 = black_box(s).parse().unwrap();
48-
}
49-
for s in STRINGS_16 {
50-
let _: TinyStr16 = black_box(s).parse().unwrap();
51-
}
52-
});
53-
});
54-
5535
let parsed_ascii_4: Vec<TinyAsciiStr<4>> = STRINGS_4
5636
.iter()
5737
.map(|s| s.parse::<TinyAsciiStr<4>>().unwrap())
@@ -68,22 +48,6 @@ fn overview(c: &mut Criterion) {
6848
.map(|s| s.parse::<TinyAsciiStr<16>>().unwrap())
6949
.collect();
7050

71-
let parsed_tiny_4: Vec<TinyStr4> = STRINGS_4
72-
.iter()
73-
.map(|s| s.parse::<TinyStr4>().unwrap())
74-
.collect();
75-
let parsed_tiny_8: Vec<TinyStr8> = STRINGS_4
76-
.iter()
77-
.chain(STRINGS_8)
78-
.map(|s| s.parse::<TinyStr8>().unwrap())
79-
.collect();
80-
let parsed_tiny_16: Vec<TinyStr16> = STRINGS_4
81-
.iter()
82-
.chain(STRINGS_8)
83-
.chain(STRINGS_16)
84-
.map(|s| s.parse::<TinyStr16>().unwrap())
85-
.collect();
86-
8751
g.bench_function("read/TinyAsciiStr", |b| {
8852
b.iter(|| {
8953
let mut collector: usize = 0;
@@ -103,25 +67,6 @@ fn overview(c: &mut Criterion) {
10367
});
10468
});
10569

106-
g.bench_function("read/TinyStr", |b| {
107-
b.iter(|| {
108-
let mut collector: usize = 0;
109-
for t in black_box(&parsed_tiny_4) {
110-
let s: &str = t;
111-
collector += s.bytes().map(usize::from).sum::<usize>();
112-
}
113-
for t in black_box(&parsed_tiny_8) {
114-
let s: &str = t;
115-
collector += s.bytes().map(usize::from).sum::<usize>();
116-
}
117-
for t in black_box(&parsed_tiny_16) {
118-
let s: &str = t;
119-
collector += s.bytes().map(usize::from).sum::<usize>();
120-
}
121-
collector
122-
});
123-
});
124-
12570
g.bench_function("compare/TinyAsciiStr", |b| {
12671
b.iter(|| {
12772
let mut collector: usize = 0;
@@ -140,25 +85,6 @@ fn overview(c: &mut Criterion) {
14085
collector
14186
});
14287
});
143-
144-
g.bench_function("compare/TinyStr", |b| {
145-
b.iter(|| {
146-
let mut collector: usize = 0;
147-
for ts in black_box(&parsed_tiny_4).windows(2) {
148-
let o = ts[0].cmp(&ts[1]);
149-
collector ^= o as usize;
150-
}
151-
for ts in black_box(&parsed_tiny_8).windows(2) {
152-
let o = ts[0].cmp(&ts[1]);
153-
collector ^= o as usize;
154-
}
155-
for ts in black_box(&parsed_tiny_16).windows(2) {
156-
let o = ts[0].cmp(&ts[1]);
157-
collector ^= o as usize;
158-
}
159-
collector
160-
});
161-
});
16288
}
16389

16490
criterion_group!(benches, overview,);

0 commit comments

Comments
 (0)