## Issue Addressed NA ## Proposed Changes I've noticed that our block hashing times increase significantly after the merge. I did some flamegraph-ing and noticed that we're allocating a `Vec` for each byte of each execution payload transaction. This seems like unnecessary work and a bit of a fragmentation risk. This PR switches to `SmallVec<[u8; 32]>` for the packed encoding of `TreeHash`. I believe this is a nice simple optimisation with no downside. ### Benchmarking These numbers were computed using #3580 on my desktop (i7 hex-core). You can see a bit of noise in the numbers, that's probably just my computer doing other things. Generally I found this change takes the time from 10-11ms to 8-9ms. I can also see all the allocations disappear from flamegraph. This is the block being benchmarked: https://beaconcha.in/slot/4704236 #### Before ``` [2022-09-15T21:44:19Z INFO lcli::block_root] Run 980: 10.553003ms [2022-09-15T21:44:19Z INFO lcli::block_root] Run 981: 10.563737ms [2022-09-15T21:44:19Z INFO lcli::block_root] Run 982: 10.646352ms [2022-09-15T21:44:19Z INFO lcli::block_root] Run 983: 10.628532ms [2022-09-15T21:44:19Z INFO lcli::block_root] Run 984: 10.552112ms [2022-09-15T21:44:19Z INFO lcli::block_root] Run 985: 10.587778ms [2022-09-15T21:44:19Z INFO lcli::block_root] Run 986: 10.640526ms [2022-09-15T21:44:19Z INFO lcli::block_root] Run 987: 10.587243ms [2022-09-15T21:44:19Z INFO lcli::block_root] Run 988: 10.554748ms [2022-09-15T21:44:19Z INFO lcli::block_root] Run 989: 10.551111ms [2022-09-15T21:44:19Z INFO lcli::block_root] Run 990: 11.559031ms [2022-09-15T21:44:19Z INFO lcli::block_root] Run 991: 11.944827ms [2022-09-15T21:44:19Z INFO lcli::block_root] Run 992: 10.554308ms [2022-09-15T21:44:19Z INFO lcli::block_root] Run 993: 11.043397ms [2022-09-15T21:44:19Z INFO lcli::block_root] Run 994: 11.043315ms [2022-09-15T21:44:19Z INFO lcli::block_root] Run 995: 11.207711ms [2022-09-15T21:44:19Z INFO lcli::block_root] Run 996: 11.056246ms [2022-09-15T21:44:19Z INFO lcli::block_root] Run 997: 11.049706ms [2022-09-15T21:44:19Z INFO lcli::block_root] Run 998: 11.432449ms [2022-09-15T21:44:19Z INFO lcli::block_root] Run 999: 11.149617ms ``` #### After ``` [2022-09-15T21:41:49Z INFO lcli::block_root] Run 980: 14.011653ms [2022-09-15T21:41:49Z INFO lcli::block_root] Run 981: 8.925314ms [2022-09-15T21:41:49Z INFO lcli::block_root] Run 982: 8.849563ms [2022-09-15T21:41:49Z INFO lcli::block_root] Run 983: 8.893689ms [2022-09-15T21:41:49Z INFO lcli::block_root] Run 984: 8.902964ms [2022-09-15T21:41:49Z INFO lcli::block_root] Run 985: 8.942067ms [2022-09-15T21:41:49Z INFO lcli::block_root] Run 986: 8.907088ms [2022-09-15T21:41:49Z INFO lcli::block_root] Run 987: 9.346101ms [2022-09-15T21:41:49Z INFO lcli::block_root] Run 988: 8.96142ms [2022-09-15T21:41:49Z INFO lcli::block_root] Run 989: 9.366437ms [2022-09-15T21:41:49Z INFO lcli::block_root] Run 990: 9.809334ms [2022-09-15T21:41:49Z INFO lcli::block_root] Run 991: 9.541561ms [2022-09-15T21:41:49Z INFO lcli::block_root] Run 992: 11.143518ms [2022-09-15T21:41:49Z INFO lcli::block_root] Run 993: 10.821181ms [2022-09-15T21:41:49Z INFO lcli::block_root] Run 994: 9.855973ms [2022-09-15T21:41:49Z INFO lcli::block_root] Run 995: 10.941006ms [2022-09-15T21:41:49Z INFO lcli::block_root] Run 996: 9.596155ms [2022-09-15T21:41:49Z INFO lcli::block_root] Run 997: 9.121739ms [2022-09-15T21:41:49Z INFO lcli::block_root] Run 998: 9.090019ms [2022-09-15T21:41:49Z INFO lcli::block_root] Run 999: 9.071885ms ``` ## Additional Info Please provide any additional information. For example, future considerations or information useful for reviewers.
338 lines
11 KiB
Rust
338 lines
11 KiB
Rust
#![recursion_limit = "256"]
|
|
use darling::FromDeriveInput;
|
|
use proc_macro::TokenStream;
|
|
use quote::quote;
|
|
use std::convert::TryInto;
|
|
use syn::{parse_macro_input, Attribute, DataEnum, DataStruct, DeriveInput, Meta};
|
|
|
|
/// The highest possible union selector value (higher values are reserved for backwards compatible
|
|
/// extensions).
|
|
const MAX_UNION_SELECTOR: u8 = 127;
|
|
|
|
#[derive(Debug, FromDeriveInput)]
|
|
#[darling(attributes(tree_hash))]
|
|
struct StructOpts {
|
|
#[darling(default)]
|
|
enum_behaviour: Option<String>,
|
|
}
|
|
|
|
const ENUM_TRANSPARENT: &str = "transparent";
|
|
const ENUM_UNION: &str = "union";
|
|
const ENUM_VARIANTS: &[&str] = &[ENUM_TRANSPARENT, ENUM_UNION];
|
|
const NO_ENUM_BEHAVIOUR_ERROR: &str = "enums require an \"enum_behaviour\" attribute, \
|
|
e.g., #[tree_hash(enum_behaviour = \"transparent\")]";
|
|
|
|
enum EnumBehaviour {
|
|
Transparent,
|
|
Union,
|
|
}
|
|
|
|
impl EnumBehaviour {
|
|
pub fn new(s: Option<String>) -> Option<Self> {
|
|
s.map(|s| match s.as_ref() {
|
|
ENUM_TRANSPARENT => EnumBehaviour::Transparent,
|
|
ENUM_UNION => EnumBehaviour::Union,
|
|
other => panic!(
|
|
"{} is an invalid enum_behaviour, use either {:?}",
|
|
other, ENUM_VARIANTS
|
|
),
|
|
})
|
|
}
|
|
}
|
|
|
|
/// Return a Vec of `syn::Ident` for each named field in the struct, whilst filtering out fields
|
|
/// that should not be hashed.
|
|
///
|
|
/// # Panics
|
|
/// Any unnamed struct field (like in a tuple struct) will raise a panic at compile time.
|
|
fn get_hashable_fields(struct_data: &syn::DataStruct) -> Vec<&syn::Ident> {
|
|
get_hashable_fields_and_their_caches(struct_data)
|
|
.into_iter()
|
|
.map(|(ident, _, _)| ident)
|
|
.collect()
|
|
}
|
|
|
|
/// Return a Vec of the hashable fields of a struct, and each field's type and optional cache field.
|
|
fn get_hashable_fields_and_their_caches(
|
|
struct_data: &syn::DataStruct,
|
|
) -> Vec<(&syn::Ident, syn::Type, Option<syn::Ident>)> {
|
|
struct_data
|
|
.fields
|
|
.iter()
|
|
.filter_map(|f| {
|
|
if should_skip_hashing(f) {
|
|
None
|
|
} else {
|
|
let ident = f
|
|
.ident
|
|
.as_ref()
|
|
.expect("tree_hash_derive only supports named struct fields");
|
|
let opt_cache_field = get_cache_field_for(f);
|
|
Some((ident, f.ty.clone(), opt_cache_field))
|
|
}
|
|
})
|
|
.collect()
|
|
}
|
|
|
|
/// Parse the cached_tree_hash attribute for a field.
|
|
///
|
|
/// Extract the cache field name from `#[cached_tree_hash(cache_field_name)]`
|
|
///
|
|
/// Return `Some(cache_field_name)` if the field has a cached tree hash attribute,
|
|
/// or `None` otherwise.
|
|
fn get_cache_field_for(field: &syn::Field) -> Option<syn::Ident> {
|
|
use syn::{MetaList, NestedMeta};
|
|
|
|
let parsed_attrs = cached_tree_hash_attr_metas(&field.attrs);
|
|
if let [Meta::List(MetaList { nested, .. })] = &parsed_attrs[..] {
|
|
nested.iter().find_map(|x| match x {
|
|
NestedMeta::Meta(Meta::Path(path)) => path.get_ident().cloned(),
|
|
_ => None,
|
|
})
|
|
} else {
|
|
None
|
|
}
|
|
}
|
|
|
|
/// Process the `cached_tree_hash` attributes from a list of attributes into structured `Meta`s.
|
|
fn cached_tree_hash_attr_metas(attrs: &[Attribute]) -> Vec<Meta> {
|
|
attrs
|
|
.iter()
|
|
.filter(|attr| attr.path.is_ident("cached_tree_hash"))
|
|
.flat_map(|attr| attr.parse_meta())
|
|
.collect()
|
|
}
|
|
|
|
/// Returns true if some field has an attribute declaring it should not be hashed.
|
|
///
|
|
/// The field attribute is: `#[tree_hash(skip_hashing)]`
|
|
fn should_skip_hashing(field: &syn::Field) -> bool {
|
|
field.attrs.iter().any(|attr| {
|
|
attr.path.is_ident("tree_hash")
|
|
&& attr.tokens.to_string().replace(' ', "") == "(skip_hashing)"
|
|
})
|
|
}
|
|
|
|
/// Implements `tree_hash::TreeHash` for some `struct`.
|
|
///
|
|
/// Fields are hashed in the order they are defined.
|
|
#[proc_macro_derive(TreeHash, attributes(tree_hash))]
|
|
pub fn tree_hash_derive(input: TokenStream) -> TokenStream {
|
|
let item = parse_macro_input!(input as DeriveInput);
|
|
let opts = StructOpts::from_derive_input(&item).unwrap();
|
|
let enum_opt = EnumBehaviour::new(opts.enum_behaviour);
|
|
|
|
match &item.data {
|
|
syn::Data::Struct(s) => {
|
|
if enum_opt.is_some() {
|
|
panic!("enum_behaviour is invalid for structs");
|
|
}
|
|
tree_hash_derive_struct(&item, s)
|
|
}
|
|
syn::Data::Enum(s) => match enum_opt.expect(NO_ENUM_BEHAVIOUR_ERROR) {
|
|
EnumBehaviour::Transparent => tree_hash_derive_enum_transparent(&item, s),
|
|
EnumBehaviour::Union => tree_hash_derive_enum_union(&item, s),
|
|
},
|
|
_ => panic!("tree_hash_derive only supports structs and enums."),
|
|
}
|
|
}
|
|
|
|
fn tree_hash_derive_struct(item: &DeriveInput, struct_data: &DataStruct) -> TokenStream {
|
|
let name = &item.ident;
|
|
let (impl_generics, ty_generics, where_clause) = &item.generics.split_for_impl();
|
|
|
|
let idents = get_hashable_fields(struct_data);
|
|
let num_leaves = idents.len();
|
|
|
|
let output = quote! {
|
|
impl #impl_generics tree_hash::TreeHash for #name #ty_generics #where_clause {
|
|
fn tree_hash_type() -> tree_hash::TreeHashType {
|
|
tree_hash::TreeHashType::Container
|
|
}
|
|
|
|
fn tree_hash_packed_encoding(&self) -> tree_hash::PackedEncoding {
|
|
unreachable!("Struct should never be packed.")
|
|
}
|
|
|
|
fn tree_hash_packing_factor() -> usize {
|
|
unreachable!("Struct should never be packed.")
|
|
}
|
|
|
|
fn tree_hash_root(&self) -> tree_hash::Hash256 {
|
|
let mut hasher = tree_hash::MerkleHasher::with_leaves(#num_leaves);
|
|
|
|
#(
|
|
hasher.write(self.#idents.tree_hash_root().as_bytes())
|
|
.expect("tree hash derive should not apply too many leaves");
|
|
)*
|
|
|
|
hasher.finish().expect("tree hash derive should not have a remaining buffer")
|
|
}
|
|
}
|
|
};
|
|
output.into()
|
|
}
|
|
|
|
/// Derive `TreeHash` for an enum in the "transparent" method.
|
|
///
|
|
/// The "transparent" method is distinct from the "union" method specified in the SSZ specification.
|
|
/// When using "transparent", the enum will be ignored and the contained field will be hashed as if
|
|
/// the enum does not exist.
|
|
///
|
|
///## Limitations
|
|
///
|
|
/// Only supports:
|
|
/// - Enums with a single field per variant, where
|
|
/// - All fields are "container" types.
|
|
///
|
|
/// ## Panics
|
|
///
|
|
/// Will panic at compile-time if the single field requirement isn't met, but will panic *at run
|
|
/// time* if the container type requirement isn't met.
|
|
fn tree_hash_derive_enum_transparent(
|
|
derive_input: &DeriveInput,
|
|
enum_data: &DataEnum,
|
|
) -> TokenStream {
|
|
let name = &derive_input.ident;
|
|
let (impl_generics, ty_generics, where_clause) = &derive_input.generics.split_for_impl();
|
|
|
|
let (patterns, type_exprs): (Vec<_>, Vec<_>) = enum_data
|
|
.variants
|
|
.iter()
|
|
.map(|variant| {
|
|
let variant_name = &variant.ident;
|
|
|
|
if variant.fields.len() != 1 {
|
|
panic!("TreeHash can only be derived for enums with 1 field per variant");
|
|
}
|
|
|
|
let pattern = quote! {
|
|
#name::#variant_name(ref inner)
|
|
};
|
|
|
|
let ty = &(&variant.fields).into_iter().next().unwrap().ty;
|
|
let type_expr = quote! {
|
|
<#ty as tree_hash::TreeHash>::tree_hash_type()
|
|
};
|
|
(pattern, type_expr)
|
|
})
|
|
.unzip();
|
|
|
|
let output = quote! {
|
|
impl #impl_generics tree_hash::TreeHash for #name #ty_generics #where_clause {
|
|
fn tree_hash_type() -> tree_hash::TreeHashType {
|
|
#(
|
|
assert_eq!(
|
|
#type_exprs,
|
|
tree_hash::TreeHashType::Container,
|
|
"all variants must be of container type"
|
|
);
|
|
)*
|
|
tree_hash::TreeHashType::Container
|
|
}
|
|
|
|
fn tree_hash_packed_encoding(&self) -> tree_hash::PackedEncoding {
|
|
unreachable!("Enum should never be packed")
|
|
}
|
|
|
|
fn tree_hash_packing_factor() -> usize {
|
|
unreachable!("Enum should never be packed")
|
|
}
|
|
|
|
fn tree_hash_root(&self) -> tree_hash::Hash256 {
|
|
match self {
|
|
#(
|
|
#patterns => inner.tree_hash_root(),
|
|
)*
|
|
}
|
|
}
|
|
}
|
|
};
|
|
output.into()
|
|
}
|
|
|
|
/// Derive `TreeHash` for an `enum` following the "union" SSZ spec.
|
|
///
|
|
/// The union selector will be determined based upon the order in which the enum variants are
|
|
/// defined. E.g., the top-most variant in the enum will have a selector of `0`, the variant
|
|
/// beneath it will have a selector of `1` and so on.
|
|
///
|
|
/// # Limitations
|
|
///
|
|
/// Only supports enums where each variant has a single field.
|
|
fn tree_hash_derive_enum_union(derive_input: &DeriveInput, enum_data: &DataEnum) -> TokenStream {
|
|
let name = &derive_input.ident;
|
|
let (impl_generics, ty_generics, where_clause) = &derive_input.generics.split_for_impl();
|
|
|
|
let patterns: Vec<_> = enum_data
|
|
.variants
|
|
.iter()
|
|
.map(|variant| {
|
|
let variant_name = &variant.ident;
|
|
|
|
if variant.fields.len() != 1 {
|
|
panic!("TreeHash can only be derived for enums with 1 field per variant");
|
|
}
|
|
|
|
quote! {
|
|
#name::#variant_name(ref inner)
|
|
}
|
|
})
|
|
.collect();
|
|
|
|
let union_selectors = compute_union_selectors(patterns.len());
|
|
|
|
let output = quote! {
|
|
impl #impl_generics tree_hash::TreeHash for #name #ty_generics #where_clause {
|
|
fn tree_hash_type() -> tree_hash::TreeHashType {
|
|
tree_hash::TreeHashType::Container
|
|
}
|
|
|
|
fn tree_hash_packed_encoding(&self) -> tree_hash::PackedEncoding {
|
|
unreachable!("Enum should never be packed")
|
|
}
|
|
|
|
fn tree_hash_packing_factor() -> usize {
|
|
unreachable!("Enum should never be packed")
|
|
}
|
|
|
|
fn tree_hash_root(&self) -> tree_hash::Hash256 {
|
|
match self {
|
|
#(
|
|
#patterns => {
|
|
let root = inner.tree_hash_root();
|
|
let selector = #union_selectors;
|
|
tree_hash::mix_in_selector(&root, selector)
|
|
.expect("derive macro should prevent out-of-bounds selectors")
|
|
},
|
|
)*
|
|
}
|
|
}
|
|
}
|
|
};
|
|
output.into()
|
|
}
|
|
|
|
fn compute_union_selectors(num_variants: usize) -> Vec<u8> {
|
|
let union_selectors = (0..num_variants)
|
|
.map(|i| {
|
|
i.try_into()
|
|
.expect("union selector exceeds u8::max_value, union has too many variants")
|
|
})
|
|
.collect::<Vec<u8>>();
|
|
|
|
let highest_selector = union_selectors
|
|
.last()
|
|
.copied()
|
|
.expect("0-variant union is not permitted");
|
|
|
|
assert!(
|
|
highest_selector <= MAX_UNION_SELECTOR,
|
|
"union selector {} exceeds limit of {}, enum has too many variants",
|
|
highest_selector,
|
|
MAX_UNION_SELECTOR
|
|
);
|
|
|
|
union_selectors
|
|
}
|