perf: remove TrieUpdates::removed_nodes and StorageTrieUpdates::removed_nodes (attempt 2) #13929
+482
−360
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
1 task
emhane
added
the
C-perf
kien-rise
force-pushed
the
0007-removed-nodes
branch
from
9f5db66 to
d0bee8b
Compare
kien-rise
force-pushed
the
0007-removed-nodes
branch
from
d0bee8b to
0d0cc88
Compare
kien-rise
changed the title
mattsse
requested changes
Jan 24, 2025
Comment on lines
-21
to
-22
| account_nodes: HashMap<Nibbles, EntryDiff<Option<BranchNodeCompact>>>, | ||
| removed_nodes: HashMap<Nibbles, EntryDiff<bool>>, |
There was a problem hiding this comment.
this refactor isn't straight forward to me, unclear how account/removed nodes translate to task/regular/database
I'd appreciate a few additional docs
Comment on lines
-213
to
+164
| .storage_nodes | ||
| .keys() | ||
| .chain(regular.storage_nodes.keys()) | ||
| for key in Iterator::chain(task.changed_nodes.keys(), regular.changed_nodes.keys()) |
There was a problem hiding this comment.
why do we need the fully qualified syntax here
Comment on lines
+186
to
+188
| task: &Option<Option<BranchNodeCompact>>, | ||
| regular: &Option<Option<BranchNodeCompact>>, | ||
| database: &Option<BranchNodeCompact>, |
There was a problem hiding this comment.
I see that task/regular/database is mostlikely coming from here, so perhaps @rkrasiuk needs to fill in the blanks
Comment on lines
-15
to
+14
| /// Collection of removed intermediate account nodes indexed by full path. | ||
| #[cfg_attr(any(test, feature = "serde"), serde(with = "serde_nibbles_set"))] | ||
| pub removed_nodes: HashSet<Nibbles>, | ||
| pub changed_nodes: HashMap<Nibbles, Option<BranchNodeCompact>>, |
There was a problem hiding this comment.
also not immediately clear how removed translated to changed here
2 tasks
|
I am gonna convert this PR to Draft (to prevent any accidental merge) because #13976 is (potentially) a simpler version. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Replaces #13872. This PR is only slightly worse than #13872, but the code changes are minimal.
Checklist
benches/*Motivation
Under high load (TPS > 50,000),
MemoryOverlayStateProviderRef::trie_stateis taking a considerable amount of time (over 200ms). One factor contributing to this is theTrieUpdates::extend_reffunction. Optimizing the struct definition ofTrieUpdatescould help improve the performance of theextend_reffunction.Solution
First, this PR changes the struct definitions of
TrieUpdatesandStorageTrieUpdates:pub struct TrieUpdates { - pub account_nodes: HashMap<Nibbles, BranchNodeCompact>, - pub removed_nodes: HashSet<Nibbles>, + pub changed_nodes: HashMap<Nibbles, Option<BranchNodeCompact>>, pub storage_tries: B256HashMap<StorageTrieUpdates>, } pub struct StorageTrieUpdates { pub is_deleted: bool, - pub storage_nodes: HashMap<Nibbles, BranchNodeCompact>, - pub removed_nodes: HashSet<Nibbles>, + pub changed_nodes: HashMap<Nibbles, Option<BranchNodeCompact>>, }Next, this PR replaces the following steps in fn
TrieUpdates::extend_ref:self.account_nodes.retain(|nibbles, _| !other.removed_nodes.contains(nibbles));self.account_nodes.extend(exclude_empty_from_pair(other.account_nodes.iter().map(|(k, v)| (k.clone(), v.clone()))));self.removed_nodes.extend(exclude_empty(other.removed_nodes.iter().cloned()));by
self.account_nodes.extend(exclude_empty_from_pair(other.account_nodes.iter().map(|(k, v)| (k.clone(), v.clone()))));Similar changes is applied to
StorageTrieUpdates::extend_ref.Criterion Benchmarks
E2E Benchmarks
Before and After
Before
30,601.00 tps, 1,056,914,565.83 gps, no chain lag, 585111076/609686114 μs
54,594.73 tps, 1,146,512,812.78 gps, no chain lag, 323457659/332195794 μs
6,331.00 tps, 882,451,082.10 gps, no chain lag, 1254878698/1270738569 μs
After
30,601.00 tps, 1,056,921,850.84 gps, no chain lag, 523309918/561875948 μs
54,601.00 tps, 1,146,644,512.25 gps, no chain lag, 298599422 μs/315966032 μs
6,331.00 tps, 882,450,529.38 gps, no chain lag, 1151877682/1180946313 μs
Other benchmarks