From 263b880c929ee0f64f734e17d0e09d3d57c98306 Mon Sep 17 00:00:00 2001 From: Jonas Schneider-Bensch Date: Wed, 11 Sep 2024 16:20:18 +0200 Subject: [PATCH 1/3] Fix benchmarks --- libcrux-ml-dsa/benches/bench_utils.rs | 6 +++--- libcrux-ml-dsa/benches/ml-dsa.rs | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libcrux-ml-dsa/benches/bench_utils.rs b/libcrux-ml-dsa/benches/bench_utils.rs index 0ea3450e8..1eb958c27 100644 --- a/libcrux-ml-dsa/benches/bench_utils.rs +++ b/libcrux-ml-dsa/benches/bench_utils.rs @@ -51,7 +51,7 @@ macro_rules! bench { // Warmup for _ in 0..bench_utils::WARMUP_ITERATIONS { let input = $setup($input); - $routine(input); + let _ = $routine(input); } // Benchmark @@ -59,7 +59,7 @@ macro_rules! bench { let input = $setup($input); let start = std::time::Instant::now(); - core::hint::black_box($routine(input)); + let _ = core::hint::black_box($routine(input)); let end = std::time::Instant::now(); time += end.duration_since(start); @@ -116,7 +116,7 @@ macro_rules! bench_group_libcrux { let signing_randomness: [u8; SIGNING_RANDOMNESS_SIZE] = bench_utils::random_array(); let message = bench_utils::random_array::<1023>(); let keypair = p::generate_key_pair(key_generation_seed); - let signature = p::sign(&keypair.signing_key, &message, signing_randomness); + let signature = p::sign(&keypair.signing_key, &message, signing_randomness).unwrap(); (keypair, message, signature) }, |(keypair, message, signature): ($keypair_t, [u8; 1023], $signature_t)| { diff --git a/libcrux-ml-dsa/benches/ml-dsa.rs b/libcrux-ml-dsa/benches/ml-dsa.rs index b4957030b..ac1b96ed8 100644 --- a/libcrux-ml-dsa/benches/ml-dsa.rs +++ b/libcrux-ml-dsa/benches/ml-dsa.rs @@ -67,7 +67,7 @@ pub fn comparisons_verification(c: &mut Criterion) { let keypair = ml_dsa_65::generate_key_pair(randomness); rng.fill_bytes(&mut randomness); - let signature = ml_dsa_65::sign(&keypair.signing_key, &message, randomness); + let signature = ml_dsa_65::sign(&keypair.signing_key, &message, randomness).unwrap(); group.bench_function("libcrux", move |b| { b.iter(|| { From 6ba626316c5fa316965571fb29c293783dd6073d Mon Sep 17 00:00:00 2001 From: Jonas Schneider-Bensch Date: Wed, 11 Sep 2024 16:21:07 +0200 Subject: [PATCH 2/3] Format --- libcrux-ml-dsa/benches/bench_utils.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libcrux-ml-dsa/benches/bench_utils.rs b/libcrux-ml-dsa/benches/bench_utils.rs index 1eb958c27..52b63e16b 100644 --- a/libcrux-ml-dsa/benches/bench_utils.rs +++ b/libcrux-ml-dsa/benches/bench_utils.rs @@ -116,7 +116,8 @@ macro_rules! bench_group_libcrux { let signing_randomness: [u8; SIGNING_RANDOMNESS_SIZE] = bench_utils::random_array(); let message = bench_utils::random_array::<1023>(); let keypair = p::generate_key_pair(key_generation_seed); - let signature = p::sign(&keypair.signing_key, &message, signing_randomness).unwrap(); + let signature = + p::sign(&keypair.signing_key, &message, signing_randomness).unwrap(); (keypair, message, signature) }, |(keypair, message, signature): ($keypair_t, [u8; 1023], $signature_t)| { From a452304be00dde2b06461bfc85d24551868a2457 Mon Sep 17 00:00:00 2001 From: Jonas Schneider-Bensch Date: Wed, 11 Sep 2024 16:23:35 +0200 Subject: [PATCH 3/3] Build benchmarks (without running) on CI --- .github/workflows/mldsa.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/mldsa.yml b/.github/workflows/mldsa.yml index a05d1e6c3..40be6f8c0 100644 --- a/.github/workflows/mldsa.yml +++ b/.github/workflows/mldsa.yml @@ -98,3 +98,9 @@ jobs: run: | cargo clean cargo test --verbose --release $RUST_TARGET_FLAG + + # Benchmarks + - name: 🔨 Build Benchmarks + run: | + cargo clean + cargo bench --no-run