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

fix(nns): Fix benchmark by simulating proper behavior in canbench-rs build #3160

Merged
merged 3 commits into from
Dec 13, 2024
Merged

fix(nns): Fix benchmark by simulating proper behavior in canbench-rs build #3160

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fa4be70
fix(nns): Fix benchmark by simulating proper behavior in canbench-rs …
max-dfinity Dec 12, 2024
da9b6cd
update benchmarks
max-dfinity Dec 12, 2024
b77a165
PR Feedback - better differentiation between prod and testing
max-dfinity Dec 13, 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
46 changes: 23 additions & 23 deletions rs/nns/governance/canbench/canbench_results.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,73 +1,73 @@
benches:
add_neuron_active_maximum:
total:
instructions: 36164619
instructions: 36155076
heap_increase: 1
stable_memory_increase: 0
scopes: {}
add_neuron_active_typical:
total:
instructions: 1834736
instructions: 1834230
heap_increase: 0
stable_memory_increase: 0
scopes: {}
add_neuron_inactive_maximum:
total:
instructions: 96124805
instructions: 96097938
heap_increase: 1
stable_memory_increase: 0
scopes: {}
add_neuron_inactive_typical:
total:
instructions: 7369666
instructions: 7366914
heap_increase: 0
stable_memory_increase: 0
scopes: {}
cascading_vote_all_heap:
total:
instructions: 34418252
instructions: 34431941
heap_increase: 0
stable_memory_increase: 128
scopes: {}
cascading_vote_heap_neurons_stable_index:
total:
instructions: 56553893
instructions: 56566838
heap_increase: 0
stable_memory_increase: 128
scopes: {}
cascading_vote_stable_everything:
total:
instructions: 371815016
instructions: 163131819
heap_increase: 0
stable_memory_increase: 128
scopes: {}
cascading_vote_stable_neurons_with_heap_index:
total:
instructions: 349629136
instructions: 140864617
heap_increase: 0
stable_memory_increase: 128
scopes: {}
centralized_following_all_stable:
total:
instructions: 174310560
instructions: 68259968
heap_increase: 0
stable_memory_increase: 128
scopes: {}
compute_ballots_for_new_proposal_with_stable_neurons:
total:
instructions: 1815415
instructions: 1815411
heap_increase: 0
stable_memory_increase: 0
scopes: {}
draw_maturity_from_neurons_fund_heap:
total:
instructions: 7242119
instructions: 7248219
heap_increase: 0
stable_memory_increase: 0
scopes: {}
draw_maturity_from_neurons_fund_stable:
total:
instructions: 10300850
instructions: 10293728
heap_increase: 0
stable_memory_increase: 0
scopes: {}
Expand All @@ -79,13 +79,13 @@ benches:
scopes: {}
list_active_neurons_fund_neurons_stable:
total:
instructions: 2450279
instructions: 2450275
heap_increase: 0
stable_memory_increase: 0
scopes: {}
list_neurons_heap:
total:
instructions: 3900350
instructions: 3900688
heap_increase: 9
stable_memory_increase: 0
scopes: {}
Expand All @@ -97,13 +97,13 @@ benches:
scopes: {}
list_neurons_ready_to_unstake_maturity_stable:
total:
instructions: 36937657
instructions: 36937653
heap_increase: 0
stable_memory_increase: 0
scopes: {}
list_neurons_stable:
total:
instructions: 97878941
instructions: 97962451
heap_increase: 5
stable_memory_increase: 0
scopes: {}
Expand All @@ -115,19 +115,19 @@ benches:
scopes: {}
list_ready_to_spawn_neuron_ids_stable:
total:
instructions: 36926358
instructions: 36926354
heap_increase: 0
stable_memory_increase: 0
scopes: {}
neuron_data_validation_heap:
total:
instructions: 349808709
instructions: 349668956
heap_increase: 0
stable_memory_increase: 0
scopes: {}
neuron_data_validation_stable:
total:
instructions: 312718406
instructions: 312681996
heap_increase: 0
stable_memory_increase: 0
scopes: {}
Expand All @@ -139,25 +139,25 @@ benches:
scopes: {}
neuron_metrics_calculation_stable:
total:
instructions: 2476869
instructions: 2476865
heap_increase: 0
stable_memory_increase: 0
scopes: {}
range_neurons_performance:
total:
instructions: 47700446
instructions: 47700442
heap_increase: 0
stable_memory_increase: 0
scopes: {}
single_vote_all_stable:
total:
instructions: 2477911
instructions: 2731286
heap_increase: 0
stable_memory_increase: 128
scopes: {}
update_recent_ballots_stable_memory:
total:
instructions: 236980
instructions: 236846
heap_increase: 0
stable_memory_increase: 0
scopes: {}
Expand Down
36 changes: 26 additions & 10 deletions rs/nns/governance/src/voting.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ use crate::{
pb::v1::{Ballot, ProposalData, Topic, Topic::NeuronManagement, Vote},
storage::with_voting_state_machines_mut,
};
#[cfg(not(test))]
use ic_nervous_system_long_message::is_message_over_threshold;
#[cfg(test)]
use ic_nervous_system_temporary::Temporary;
Expand All @@ -29,25 +28,36 @@ const SOFT_VOTING_INSTRUCTIONS_LIMIT: u64 = if cfg!(feature = "test") {
BILLION
};

#[cfg(not(test))]
fn over_soft_message_limit() -> bool {
is_message_over_threshold(SOFT_VOTING_INSTRUCTIONS_LIMIT)
}

// The following test methods let us test this internally
#[cfg(test)]
thread_local! {
static OVER_SOFT_MESSAGE_LIMIT: std::cell::Cell<bool> = const { std::cell::Cell::new(false) }
static OVER_SOFT_MESSAGE_LIMIT: std::cell::Cell<bool> = const { std::cell::Cell::new(false) };
static CANBENCH_FAKE_INSTRUCTION_COUNTER: std::cell::Cell<Option<u64>> = const { std::cell::Cell::new(None) };
}

#[cfg(test)]
fn temporarily_set_over_soft_message_limit(over: bool) -> Temporary {
Temporary::new(&OVER_SOFT_MESSAGE_LIMIT, over)
}

#[cfg(test)]
max-dfinity marked this conversation as resolved.
Show resolved Hide resolved
fn over_soft_message_limit() -> bool {
OVER_SOFT_MESSAGE_LIMIT.with(|over| over.get())
if cfg!(test) {
OVER_SOFT_MESSAGE_LIMIT.with(|over| over.get())
} else if cfg!(feature = "canbench-rs") {
CANBENCH_FAKE_INSTRUCTION_COUNTER.with(|counter| {
let current_instruction_counter = ic_cdk::api::instruction_counter();
let stored_value = counter.get();

if let Some(limit) = stored_value {
current_instruction_counter > limit
} else {
let limit = ic_cdk::api::instruction_counter() + SOFT_VOTING_INSTRUCTIONS_LIMIT;
counter.set(Some(limit));
false // Since it's the first time, assume not over limit
}
})
} else {
is_message_over_threshold(SOFT_VOTING_INSTRUCTIONS_LIMIT)
}
}

async fn noop_self_call_if_over_instructions(
Expand All @@ -64,6 +74,12 @@ async fn noop_self_call_if_over_instructions(
.await
.map_err(|e| e.to_string())
} else {
if over_soft_message_limit() {
let limit = ic_cdk::api::instruction_counter() + SOFT_VOTING_INSTRUCTIONS_LIMIT;
CANBENCH_FAKE_INSTRUCTION_COUNTER.with(|counter| {
counter.set(Some(limit));
});
}
Ok(())
}
}
Expand Down
Loading