Merge in attn-smallvec (sigp#2182)

commit 7f62b7c Author: Paul Hauner <[email protected]> Date: Mon Feb 1 11:23:58 2021 +1100 Use smallvec for bitfield
paulhauner · Apr 13, 2021 · 511da5e · 511da5e
1 parent f9f33a1
commit 511da5e
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 8 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/consensus/ssz_types/Cargo.toml b/consensus/ssz_types/Cargo.toml
@@ -15,6 +15,7 @@ serde_utils = { path = "../serde_utils" }
 eth2_ssz = "0.1.2"
 typenum = "1.12.0"
 arbitrary = { version = "0.4.6", features = ["derive"], optional = true }
+smallvec = "1.6.1"
 
 [dev-dependencies]
 serde_json = "1.0.58"

diff --git a/consensus/ssz_types/src/bitfield.rs b/consensus/ssz_types/src/bitfield.rs
@@ -4,10 +4,13 @@ use core::marker::PhantomData;
 use serde::de::{Deserialize, Deserializer};
 use serde::ser::{Serialize, Serializer};
 use serde_utils::hex::{encode as hex_encode, PrefixedHexVisitor};
+use smallvec::{smallvec, SmallVec};
 use ssz::{Decode, Encode};
 use tree_hash::Hash256;
 use typenum::Unsigned;
 
+const SMALLVEC_LEN: usize = 32;
+
 /// A marker trait applied to `Variable` and `Fixed` that defines the behaviour of a `Bitfield`.
 pub trait BitfieldBehaviour: Clone {}
 
@@ -89,7 +92,7 @@ pub type BitVector<N> = Bitfield<Fixed<N>>;
 /// bit-index. E.g., `vec![0b0000_0001, 0b0000_0010]` has bits `0, 9` set.
 #[derive(Clone, Debug, PartialEq)]
 pub struct Bitfield<T> {
-    bytes: Vec<u8>,
+    bytes: SmallVec<[u8; 32]>,
     len: usize,
     _phantom: PhantomData<T>,
 }
@@ -104,7 +107,7 @@ impl<N: Unsigned + Clone> Bitfield<Variable<N>> {
     pub fn with_capacity(num_bits: usize) -> Result<Self, Error> {
         if num_bits <= N::to_usize() {
             Ok(Self {
-                bytes: vec![0; bytes_for_bit_len(num_bits)],
+                bytes: smallvec![0; bytes_for_bit_len(num_bits)],
                 len: num_bits,
                 _phantom: PhantomData,
             })
@@ -142,8 +145,8 @@ impl<N: Unsigned + Clone> Bitfield<Variable<N>> {
 
         bytes.resize(bytes_for_bit_len(len + 1), 0);
 
-        let mut bitfield: Bitfield<Variable<N>> = Bitfield::from_raw_bytes(bytes, len + 1)
-            .unwrap_or_else(|_| {
+        let mut bitfield: Bitfield<Variable<N>> =
+            Bitfield::from_raw_bytes(bytes.into_vec(), len + 1).unwrap_or_else(|_| {
                 unreachable!(
                     "Bitfield with {} bytes must have enough capacity for {} bits.",
                     bytes_for_bit_len(len + 1),
@@ -154,7 +157,7 @@ impl<N: Unsigned + Clone> Bitfield<Variable<N>> {
             .set(len, true)
             .expect("len must be in bounds for bitfield.");
 
-        bitfield.bytes
+        bitfield.bytes.into_vec()
     }
 
     /// Instantiates a new instance from `bytes`. Consumes the same format that `self.into_bytes()`
@@ -233,7 +236,7 @@ impl<N: Unsigned + Clone> Bitfield<Fixed<N>> {
     /// All bits are initialized to `false`.
     pub fn new() -> Self {
         Self {
-            bytes: vec![0; bytes_for_bit_len(Self::capacity())],
+            bytes: smallvec![0; bytes_for_bit_len(Self::capacity())],
             len: Self::capacity(),
             _phantom: PhantomData,
         }
@@ -328,7 +331,7 @@ impl<T: BitfieldBehaviour> Bitfield<T> {
 
     /// Returns the underlying bytes representation of the bitfield.
     pub fn into_raw_bytes(self) -> Vec<u8> {
-        self.bytes
+        self.bytes.into_vec()
     }
 
     /// Returns a view into the underlying bytes representation of the bitfield.
@@ -345,8 +348,10 @@ impl<T: BitfieldBehaviour> Bitfield<T> {
     /// - `bit_len` is not a multiple of 8 and `bytes` contains set bits that are higher than, or
     /// equal to `bit_len`.
     fn from_raw_bytes(bytes: Vec<u8>, bit_len: usize) -> Result<Self, Error> {
+        let bytes: SmallVec<[u8; SMALLVEC_LEN]> = bytes.into();
+
         if bit_len == 0 {
-            if bytes.len() == 1 && bytes == [0] {
+            if bytes.len() == 1 && bytes.as_slice() == [0] {
                 // A bitfield with `bit_len` 0 can only be represented by a single zero byte.
                 Ok(Self {
                     bytes,