Fix benchmarks

RustCrypto · Dec 21, 2023 · 57c18de · 57c18de
1 parent 546fa3b
commit 57c18de
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 21 deletions.
diff --git a/benches/boxed_monty.rs b/benches/boxed_monty.rs
@@ -4,7 +4,7 @@ use criterion::{
 };
 use crypto_bigint::{
     modular::{BoxedMontyForm, BoxedMontyParams},
-    BoxedUint, NonZero, RandomMod,
+    BoxedUint, NonZero, Odd, RandomMod,
 };
 use num_bigint::BigUint;
 use rand_core::OsRng;
@@ -17,10 +17,7 @@ fn to_biguint(uint: &BoxedUint) -> BigUint {
 }
 
 fn bench_montgomery_ops<M: Measurement>(group: &mut BenchmarkGroup<'_, M>) {
-    let params = BoxedMontyParams::new(
-        BoxedUint::random(&mut OsRng, UINT_BITS) | BoxedUint::one_with_precision(UINT_BITS),
-    )
-    .unwrap();
+    let params = BoxedMontyParams::new(Odd::<BoxedUint>::random(&mut OsRng, UINT_BITS));
 
     group.bench_function("invert, U256", |b| {
         b.iter_batched(
@@ -60,8 +57,8 @@ fn bench_montgomery_ops<M: Measurement>(group: &mut BenchmarkGroup<'_, M>) {
         )
     });
 
-    let m = BoxedUint::random(&mut OsRng, UINT_BITS) | BoxedUint::one_with_precision(UINT_BITS);
-    let params = BoxedMontyParams::new(m).unwrap();
+    let m = Odd::<BoxedUint>::random(&mut OsRng, UINT_BITS);
+    let params = BoxedMontyParams::new(m);
     group.bench_function("modpow, BoxedUint^BoxedUint", |b| {
         b.iter_batched(
             || {
@@ -96,24 +93,21 @@ fn bench_montgomery_ops<M: Measurement>(group: &mut BenchmarkGroup<'_, M>) {
 fn bench_montgomery_conversion<M: Measurement>(group: &mut BenchmarkGroup<'_, M>) {
     group.bench_function("BoxedMontyParams::new", |b| {
         b.iter_batched(
-            || BoxedUint::random(&mut OsRng, UINT_BITS) | BoxedUint::one_with_precision(UINT_BITS),
+            || Odd::<BoxedUint>::random(&mut OsRng, UINT_BITS),
             |modulus| black_box(BoxedMontyParams::new(modulus)),
             BatchSize::SmallInput,
         )
     });
 
     group.bench_function("BoxedMontyParams::new_vartime", |b| {
         b.iter_batched(
-            || BoxedUint::random(&mut OsRng, UINT_BITS) | BoxedUint::one_with_precision(UINT_BITS),
+            || Odd::<BoxedUint>::random(&mut OsRng, UINT_BITS),
             |modulus| black_box(BoxedMontyParams::new_vartime(modulus)),
             BatchSize::SmallInput,
         )
     });
 
-    let params = BoxedMontyParams::new(
-        BoxedUint::random(&mut OsRng, UINT_BITS) | BoxedUint::one_with_precision(UINT_BITS),
-    )
-    .unwrap();
+    let params = BoxedMontyParams::new(Odd::<BoxedUint>::random(&mut OsRng, UINT_BITS));
     group.bench_function("BoxedMontyForm::new", |b| {
         b.iter_batched(
             || BoxedUint::random(&mut OsRng, UINT_BITS),
@@ -122,10 +116,7 @@ fn bench_montgomery_conversion<M: Measurement>(group: &mut BenchmarkGroup<'_, M>
         )
     });
 
-    let params = BoxedMontyParams::new(
-        BoxedUint::random(&mut OsRng, UINT_BITS) | BoxedUint::one_with_precision(UINT_BITS),
-    )
-    .unwrap();
+    let params = BoxedMontyParams::new(Odd::<BoxedUint>::random(&mut OsRng, UINT_BITS));
     group.bench_function("BoxedMontyForm::retrieve", |b| {
         b.iter_batched(
             || BoxedMontyForm::new(BoxedUint::random(&mut OsRng, UINT_BITS), params.clone()),

diff --git a/src/limb/bit_and.rs b/src/limb/bit_and.rs
@@ -1,7 +1,7 @@
 //! Limb bit and operations.
 
 use super::Limb;
-use core::ops::BitAnd;
+use core::ops::{BitAnd, BitAndAssign};
 
 impl Limb {
     /// Calculates `a & b`.
@@ -19,3 +19,15 @@ impl BitAnd for Limb {
         self.bitand(rhs)
     }
 }
+
+impl BitAndAssign for Limb {
+    fn bitand_assign(&mut self, rhs: Self) {
+        self.0 &= rhs.0;
+    }
+}
+
+impl BitAndAssign<&Limb> for Limb {
+    fn bitand_assign(&mut self, rhs: &Limb) {
+        self.0 &= rhs.0;
+    }
+}
diff --git a/src/limb/bit_xor.rs b/src/limb/bit_xor.rs
@@ -1,7 +1,7 @@
 //! Limb bit xor operations.
 
 use super::Limb;
-use core::ops::BitXor;
+use core::ops::{BitXor, BitXorAssign};
 
 impl Limb {
     /// Calculates `a ^ b`.
@@ -18,3 +18,9 @@ impl BitXor for Limb {
         self.bitxor(rhs)
     }
 }
+
+impl BitXorAssign for Limb {
+    fn bitxor_assign(&mut self, rhs: Self) {
+        self.0 ^= rhs.0;
+    }
+}
diff --git a/src/odd.rs b/src/odd.rs
@@ -8,7 +8,10 @@ use subtle::{Choice, ConditionallySelectable, CtOption};
 use crate::BoxedUint;
 
 #[cfg(feature = "rand_core")]
-use {crate::Random, rand_core::CryptoRngCore};
+use {
+    crate::{Limb, Random},
+    rand_core::CryptoRngCore,
+};
 
 /// Wrapper type for odd integers.
 ///
@@ -125,6 +128,18 @@ impl PartialOrd<Odd<BoxedUint>> for BoxedUint {
 impl<const LIMBS: usize> Random for Odd<Uint<LIMBS>> {
     /// Generate a random `NonZero<Uint<T>>`.
     fn random(rng: &mut impl CryptoRngCore) -> Self {
-        Odd(Uint::random(rng) | Uint::ONE)
+        let mut ret = Uint::random(rng);
+        ret.limbs[0] &= Limb::ONE;
+        Odd(ret)
+    }
+}
+
+#[cfg(all(feature = "alloc", feature = "rand_core"))]
+impl Odd<BoxedUint> {
+    /// Generate a random `NonZero<Uint<T>>`.
+    pub fn random(rng: &mut impl CryptoRngCore, bits_precision: u32) -> Self {
+        let mut ret = BoxedUint::random(rng, bits_precision);
+        ret.limbs[0] &= Limb::ONE;
+        Odd(ret)
     }
 }