b0b606dabe
## 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.
129 lines
2.8 KiB
Rust
129 lines
2.8 KiB
Rust
use ssz_derive::Encode;
|
|
use tree_hash::{Hash256, MerkleHasher, PackedEncoding, TreeHash, BYTES_PER_CHUNK};
|
|
use tree_hash_derive::TreeHash;
|
|
|
|
#[derive(Encode)]
|
|
struct HashVec {
|
|
vec: Vec<u8>,
|
|
}
|
|
|
|
impl From<Vec<u8>> for HashVec {
|
|
fn from(vec: Vec<u8>) -> Self {
|
|
Self { vec }
|
|
}
|
|
}
|
|
|
|
impl tree_hash::TreeHash for HashVec {
|
|
fn tree_hash_type() -> tree_hash::TreeHashType {
|
|
tree_hash::TreeHashType::List
|
|
}
|
|
|
|
fn tree_hash_packed_encoding(&self) -> PackedEncoding {
|
|
unreachable!("List should never be packed.")
|
|
}
|
|
|
|
fn tree_hash_packing_factor() -> usize {
|
|
unreachable!("List should never be packed.")
|
|
}
|
|
|
|
fn tree_hash_root(&self) -> Hash256 {
|
|
let mut hasher =
|
|
MerkleHasher::with_leaves((self.vec.len() + BYTES_PER_CHUNK - 1) / BYTES_PER_CHUNK);
|
|
|
|
for item in &self.vec {
|
|
hasher.write(&item.tree_hash_packed_encoding()).unwrap()
|
|
}
|
|
|
|
let root = hasher.finish().unwrap();
|
|
|
|
tree_hash::mix_in_length(&root, self.vec.len())
|
|
}
|
|
}
|
|
|
|
fn mix_in_selector(a: Hash256, selector: u8) -> Hash256 {
|
|
let mut b = [0; 32];
|
|
b[0] = selector;
|
|
|
|
Hash256::from_slice(ð2_hashing::hash32_concat(a.as_bytes(), &b))
|
|
}
|
|
|
|
fn u8_hash_concat(v1: u8, v2: u8) -> Hash256 {
|
|
let mut a = [0; 32];
|
|
let mut b = [0; 32];
|
|
|
|
a[0] = v1;
|
|
b[0] = v2;
|
|
|
|
Hash256::from_slice(ð2_hashing::hash32_concat(&a, &b))
|
|
}
|
|
|
|
fn u8_hash(x: u8) -> Hash256 {
|
|
let mut a = [0; 32];
|
|
a[0] = x;
|
|
Hash256::from_slice(&a)
|
|
}
|
|
|
|
#[derive(TreeHash)]
|
|
#[tree_hash(enum_behaviour = "transparent")]
|
|
enum FixedTrans {
|
|
A(u8),
|
|
B(u8),
|
|
}
|
|
|
|
#[test]
|
|
fn fixed_trans() {
|
|
assert_eq!(FixedTrans::A(2).tree_hash_root(), u8_hash(2));
|
|
assert_eq!(FixedTrans::B(2).tree_hash_root(), u8_hash(2));
|
|
}
|
|
|
|
#[derive(TreeHash)]
|
|
#[tree_hash(enum_behaviour = "union")]
|
|
enum FixedUnion {
|
|
A(u8),
|
|
B(u8),
|
|
}
|
|
|
|
#[test]
|
|
fn fixed_union() {
|
|
assert_eq!(FixedUnion::A(2).tree_hash_root(), u8_hash_concat(2, 0));
|
|
assert_eq!(FixedUnion::B(2).tree_hash_root(), u8_hash_concat(2, 1));
|
|
}
|
|
|
|
#[derive(TreeHash)]
|
|
#[tree_hash(enum_behaviour = "transparent")]
|
|
enum VariableTrans {
|
|
A(HashVec),
|
|
B(HashVec),
|
|
}
|
|
|
|
#[test]
|
|
fn variable_trans() {
|
|
assert_eq!(
|
|
VariableTrans::A(HashVec::from(vec![2])).tree_hash_root(),
|
|
u8_hash_concat(2, 1)
|
|
);
|
|
assert_eq!(
|
|
VariableTrans::B(HashVec::from(vec![2])).tree_hash_root(),
|
|
u8_hash_concat(2, 1)
|
|
);
|
|
}
|
|
|
|
#[derive(TreeHash)]
|
|
#[tree_hash(enum_behaviour = "union")]
|
|
enum VariableUnion {
|
|
A(HashVec),
|
|
B(HashVec),
|
|
}
|
|
|
|
#[test]
|
|
fn variable_union() {
|
|
assert_eq!(
|
|
VariableUnion::A(HashVec::from(vec![2])).tree_hash_root(),
|
|
mix_in_selector(u8_hash_concat(2, 1), 0)
|
|
);
|
|
assert_eq!(
|
|
VariableUnion::B(HashVec::from(vec![2])).tree_hash_root(),
|
|
mix_in_selector(u8_hash_concat(2, 1), 1)
|
|
);
|
|
}
|