Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

perf(trie): reduce allocations in sparse trie rlp node calculation #12092

Merged
merged 5 commits into from
Oct 28, 2024
Merged

perf(trie): reduce allocations in sparse trie rlp node calculation #12092

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f5471be
perf(trie): reduce allocations in sparse trie rlp node calculation
shekhirin Oct 26, 2024
737d867
create a struct with buffers
shekhirin Oct 28, 2024
647d79a
Merge remote-tracking branch 'origin/main' into alexey/sparse-trie-rl…
shekhirin Oct 28, 2024
b0cb906
Merge remote-tracking branch 'origin/main' into alexey/sparse-trie-rl…
shekhirin Oct 28, 2024
a6c6b50
Merge remote-tracking branch 'origin/main' into alexey/sparse-trie-rl…
shekhirin Oct 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 39 additions & 5 deletions crates/trie/sparse/src/trie.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -558,7 +558,7 @@ impl RevealedSparseTrie {
pub fn root(&mut self) -> B256 {
// take the current prefix set.
let mut prefix_set = std::mem::take(&mut self.prefix_set).freeze();
let root_rlp = self.rlp_node(Nibbles::default(), &mut prefix_set);
let root_rlp = self.rlp_node_allocate(Nibbles::default(), &mut prefix_set);
if let Some(root_hash) = root_rlp.as_hash() {
root_hash
} else {
Expand All @@ -571,8 +571,25 @@ impl RevealedSparseTrie {
pub fn update_rlp_node_level(&mut self, depth: usize) {
let targets = self.get_nodes_at_depth(depth);
let mut prefix_set = self.prefix_set.clone().freeze();

// stack of paths we need rlp nodes for
let mut path_stack = Vec::new();
// stack of rlp nodes
let mut rlp_node_stack = Vec::<(Nibbles, RlpNode)>::new();
// reusable branch child path
let mut branch_child_buf = SmallVec::<[Nibbles; 16]>::new_const();
// reusable branch value stack
let mut branch_value_stack_buf = SmallVec::<[RlpNode; 16]>::new_const();
shekhirin marked this conversation as resolved.
Show resolved Hide resolved

for target in targets {
self.rlp_node(target, &mut prefix_set);
path_stack.push(target);
self.rlp_node(
&mut prefix_set,
&mut path_stack,
&mut rlp_node_stack,
&mut branch_child_buf,
&mut branch_value_stack_buf,
);
}
}

Expand Down Expand Up @@ -616,7 +633,7 @@ impl RevealedSparseTrie {
targets
}

fn rlp_node(&mut self, path: Nibbles, prefix_set: &mut PrefixSet) -> RlpNode {
fn rlp_node_allocate(&mut self, path: Nibbles, prefix_set: &mut PrefixSet) -> RlpNode {
// stack of paths we need rlp nodes for
let mut path_stack = Vec::from([path]);
// stack of rlp nodes
Expand All @@ -626,6 +643,23 @@ impl RevealedSparseTrie {
// reusable branch value stack
let mut branch_value_stack_buf = SmallVec::<[RlpNode; 16]>::new_const();

self.rlp_node(
prefix_set,
&mut path_stack,
&mut rlp_node_stack,
&mut branch_child_buf,
&mut branch_value_stack_buf,
)
}

fn rlp_node(
&mut self,
prefix_set: &mut PrefixSet,
path_stack: &mut Vec<Nibbles>,
rlp_node_stack: &mut Vec<(Nibbles, RlpNode)>,
branch_child_buf: &mut SmallVec<[Nibbles; 16]>,
branch_value_stack_buf: &mut SmallVec<[RlpNode; 16]>,
) -> RlpNode {
'main: while let Some(path) = path_stack.pop() {
let rlp_node = match self.nodes.get_mut(&path).unwrap() {
SparseNode::Empty => RlpNode::word_rlp(&EMPTY_ROOT_HASH),
Expand Down Expand Up @@ -675,7 +709,7 @@ impl RevealedSparseTrie {
}

branch_value_stack_buf.clear();
for child_path in &branch_child_buf {
for child_path in branch_child_buf.iter() {
if rlp_node_stack.last().map_or(false, |e| &e.0 == child_path) {
let (_, child) = rlp_node_stack.pop().unwrap();
branch_value_stack_buf.push(child);
Expand All @@ -688,7 +722,7 @@ impl RevealedSparseTrie {
}

self.rlp_buf.clear();
let rlp_node = BranchNodeRef::new(&branch_value_stack_buf, *state_mask)
let rlp_node = BranchNodeRef::new(branch_value_stack_buf, *state_mask)
.rlp(&mut self.rlp_buf);
*hash = rlp_node.as_hash();
rlp_node
Expand Down
Loading