saymrwulf/curve25519-dalek-source
1
0
Fork 0
mirror of https://github.com/saymrwulf/curve25519-dalek-source.git synced 2026-09-06 20:41:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix non-unique benchmark IDs for newer criterion versions.

Browse source
This commit is contained in:
Isis Lovecruft 2021-08-17 00:14:00 +00:00
parent b87fdda11d
commit 076cf347ba
No known key found for this signature in database
GPG key ID: AB41313533E8E812
2 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Cargo.toml
View file

@ -33,7 +33,7 @@ travis-ci = { repository = "dalek-cryptography/curve25519-dalek", branch = "mast
[dev-dependencies] [dev-dependencies]
sha2 = { version = "0.9", default-features = false } sha2 = { version = "0.9", default-features = false }
bincode = "1" bincode = "1"
criterion = "0.3.0" criterion = { version = "0.3.0", features = ["html_reports"] }
hex = "0.4.2" hex = "0.4.2"
rand = "0.7" rand = "0.7"

16
benches/dalek_benchmarks.rs
View file

@ -180,12 +180,12 @@ mod multiscalar_benches {
dynamic_fraction: f64, dynamic_fraction: f64,
) { ) {
for multiscalar_size in &MULTISCALAR_SIZES { for multiscalar_size in &MULTISCALAR_SIZES {
c.bench_with_input( let bench_id = BenchmarkId::new(
BenchmarkId::new( "Variable-time mixed-base",
"Variable-time mixed-base multiscalar multiplication ({:.0}pct dyn)", format!("(size: {:?}), ({:.0}pct dyn)", multiscalar_size, 100.0 * dynamic_fraction),
format!("({:.0}pct dyn)", 100.0 * dynamic_fraction), );
),
&multiscalar_size, c.bench_with_input(bench_id, &multiscalar_size,
move |b, &&total_size| { move |b, &&total_size| {
let dynamic_size = ((total_size as f64) * dynamic_fraction) as usize; let dynamic_size = ((total_size as f64) * dynamic_fraction) as usize;
let static_size = total_size - dynamic_size; let static_size = total_size - dynamic_size;
@ -221,16 +221,18 @@ mod multiscalar_benches {
} }
fn multiscalar_multiplications(c: &mut Criterion) { fn multiscalar_multiplications(c: &mut Criterion) {
let mut group: BenchmarkGroup<_> = c.benchmark_group("Multiscalar muls"); let mut group: BenchmarkGroup<_> = c.benchmark_group("Multiscalar multiplications");
consttime_multiscalar_mul(&mut group); consttime_multiscalar_mul(&mut group);
vartime_multiscalar_mul(&mut group); vartime_multiscalar_mul(&mut group);
vartime_precomputed_pure_static(&mut group); vartime_precomputed_pure_static(&mut group);
let dynamic_fracs = [0.0, 0.2, 0.5]; let dynamic_fracs = [0.0, 0.2, 0.5];
for frac in dynamic_fracs.iter() { for frac in dynamic_fracs.iter() {
vartime_precomputed_helper(&mut group, *frac); vartime_precomputed_helper(&mut group, *frac);
} }
group.finish(); group.finish();
} }