github/reth
1
1
Fork 0
mirror of https://github.com/paradigmxyz/reth.git synced 2026-01-07 22:43:56 -05:00
Code Issues Packages Projects Releases Wiki Activity

perf(trie): reuse Vec buffer for branch hashes

Browse Source 
Add branch_hashes_buf to RlpNodeBuffers to avoid allocating a new Vec
on every branch node during trie hash computation. This reduces
allocator pressure in the hot path.
This commit is contained in:
yongkangc
2026-01-05 04:11:43 +00:00
parent 3d4efdb271
commit 08c783a726
2 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
crates/trie/sparse-parallel/src/trie.rs
View File

@@ -2289,7 +2289,7 @@ impl SparseSubtrieInner {
let mut tree_mask = TrieMask::default();
let mut hash_mask = TrieMask::default();
let mut hashes = Vec::new();
self.buffers.branch_hashes_buf.clear();
// Lazy lookup for branch node masks - shared across loop iterations
let mut path_masks_storage = None;
@@ -2339,7 +2339,7 @@ impl SparseSubtrieInner {
});
if let Some(hash) = hash {
hash_mask.set_bit(last_child_nibble);
hashes.push(hash);
self.buffers.branch_hashes_buf.push(hash);
}
}
@@ -2392,12 +2392,12 @@ impl SparseSubtrieInner {
if store_in_db_trie {
// Store in DB trie if there are either any children that are stored in
// the DB trie, or any children represent hashed values
hashes.reverse();
self.buffers.branch_hashes_buf.reverse();
let branch_node = BranchNodeCompact::new(
*state_mask,
tree_mask,
hash_mask,
hashes,
core::mem::take(&mut self.buffers.branch_hashes_buf),
hash.filter(|_| path.is_empty()),
);
update_actions
@@ -2558,6 +2558,8 @@ pub struct SparseSubtrieBuffers {
branch_value_stack_buf: SmallVec<[RlpNode; 16]>,
/// Reusable RLP buffer
rlp_buf: Vec<u8>,
/// Reusable buffer for collecting branch node hashes
branch_hashes_buf: Vec<B256>,
}
impl SparseSubtrieBuffers {
@@ -2577,6 +2579,9 @@ impl SparseSubtrieBuffers {
self.rlp_buf.clear();
self.rlp_buf.shrink_to_fit();
self.branch_hashes_buf.clear();
self.branch_hashes_buf.shrink_to_fit();
}
}

11
crates/trie/sparse/src/trie.rs
View File

@@ -1625,7 +1625,7 @@ impl SerialSparseTrie {
let mut tree_mask = TrieMask::default();
let mut hash_mask = TrieMask::default();
let mut hashes = Vec::new();
buffers.branch_hashes_buf.clear();
// Lazy lookup for branch node masks - shared across loop iterations
let mut path_masks_storage = None;
@@ -1676,7 +1676,7 @@ impl SerialSparseTrie {
});
if let Some(hash) = hash {
hash_mask.set_bit(last_child_nibble);
hashes.push(hash);
buffers.branch_hashes_buf.push(hash);
}
}
@@ -1727,12 +1727,12 @@ impl SerialSparseTrie {
if store_in_db_trie {
// Store in DB trie if there are either any children that are stored in
// the DB trie, or any children represent hashed values
hashes.reverse();
buffers.branch_hashes_buf.reverse();
let branch_node = BranchNodeCompact::new(
*state_mask,
tree_mask,
hash_mask,
hashes,
core::mem::take(&mut buffers.branch_hashes_buf),
hash.filter(|_| path.is_empty()),
);
updates.updated_nodes.insert(path, branch_node);
@@ -1969,6 +1969,8 @@ pub struct RlpNodeBuffers {
branch_child_buf: SmallVec<[Nibbles; 16]>,
/// Reusable branch value stack
branch_value_stack_buf: SmallVec<[RlpNode; 16]>,
/// Reusable buffer for collecting branch node hashes
branch_hashes_buf: Vec<B256>,
}
impl RlpNodeBuffers {
@@ -1983,6 +1985,7 @@ impl RlpNodeBuffers {
rlp_node_stack: Vec::new(),
branch_child_buf: SmallVec::<[Nibbles; 16]>::new_const(),
branch_value_stack_buf: SmallVec::<[RlpNode; 16]>::new_const(),
branch_hashes_buf: Vec::new(),
}
}
}