Skip to content

perf: bias towards proof results #19426

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

Merged
mattsse merged 1 commit into from
Oct 31, 2025
Merged

perf: bias towards proof results #19426

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
116 changes: 58 additions & 58 deletions crates/engine/tree/src/tree/payload_processor/multiproof.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1029,7 +1029,64 @@ impl MultiProofTask {
loop {
trace!(target: "engine::tree::payload_processor::multiproof", "entering main channel receiving loop");

crossbeam_channel::select! {
crossbeam_channel::select_biased! {
Copy link
Copy Markdown
Member

@shekhirin shekhirin Oct 31, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nice

recv(self.proof_result_rx) -> proof_msg => {
match proof_msg {
Ok(proof_result) => {
proofs_processed += 1;

self.metrics
.proof_calculation_duration_histogram
.record(proof_result.elapsed);

self.multiproof_manager.on_calculation_complete();

// Convert ProofResultMessage to SparseTrieUpdate
match proof_result.result {
Ok(proof_result_data) => {
debug!(
target: "engine::tree::payload_processor::multiproof",
sequence = proof_result.sequence_number,
total_proofs = proofs_processed,
"Processing calculated proof from worker"
);

let update = SparseTrieUpdate {
state: proof_result.state,
multiproof: proof_result_data.into_multiproof(),
};

if let Some(combined_update) =
self.on_proof(proof_result.sequence_number, update)
{
let _ = self.to_sparse_trie.send(combined_update);
}
}
Err(error) => {
error!(target: "engine::tree::payload_processor::multiproof", ?error, "proof calculation error from worker");
return
}
}

if self.is_done(
proofs_processed,
state_update_proofs_requested,
prefetch_proofs_requested,
updates_finished,
) {
debug!(
target: "engine::tree::payload_processor::multiproof",
"State updates finished and all proofs processed, ending calculation"
);
break
}
}
Err(_) => {
error!(target: "engine::tree::payload_processor::multiproof", "Proof result channel closed unexpectedly");
return
}
}
},
recv(self.rx) -> message => {
match message {
Ok(msg) => match msg {
Expand Down Expand Up @@ -1129,63 +1186,6 @@ impl MultiProofTask {
return
}
}
},
recv(self.proof_result_rx) -> proof_msg => {
match proof_msg {
Ok(proof_result) => {
proofs_processed += 1;

self.metrics
.proof_calculation_duration_histogram
.record(proof_result.elapsed);

self.multiproof_manager.on_calculation_complete();

// Convert ProofResultMessage to SparseTrieUpdate
match proof_result.result {
Ok(proof_result_data) => {
debug!(
target: "engine::tree::payload_processor::multiproof",
sequence = proof_result.sequence_number,
total_proofs = proofs_processed,
"Processing calculated proof from worker"
);

let update = SparseTrieUpdate {
state: proof_result.state,
multiproof: proof_result_data.into_multiproof(),
};

if let Some(combined_update) =
self.on_proof(proof_result.sequence_number, update)
{
let _ = self.to_sparse_trie.send(combined_update);
}
}
Err(error) => {
error!(target: "engine::tree::payload_processor::multiproof", ?error, "proof calculation error from worker");
return
}
}

if self.is_done(
proofs_processed,
state_update_proofs_requested,
prefetch_proofs_requested,
updates_finished,
) {
debug!(
target: "engine::tree::payload_processor::multiproof",
"State updates finished and all proofs processed, ending calculation"
);
break
}
}
Err(_) => {
error!(target: "engine::tree::payload_processor::multiproof", "Proof result channel closed unexpectedly");
return
}
}
}
}
}
Expand Down