This repository has been archived by the owner on Jan 13, 2025. It is now read-only.
cost model could double count builtin instruction cost #32422
Merged
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
2. fix the issue
tao-stones
commented
Jul 7, 2023
tao-stones
commented
Jul 7, 2023
tao-stones
commented
Jul 7, 2023
| if let Ok(ComputeBudgetInstruction::SetComputeUnitLimit(_)) = | ||
| try_from_slice_unchecked(&instruction.data) | ||
| { | ||
| compute_unit_limit_is_set = true; |
There was a problem hiding this comment.
have to explicitly check if SetComputeUnitLimit is included in the TX, only then can safely override default with compute_budget.compute_unit_limit.
|
|
tao-stones
commented
Jul 8, 2023
Codecov Report
@@ Coverage Diff @@
## master #32422 +/- ##
=======================================
Coverage 82.1% 82.1%
=======================================
Files 778 778
Lines 210107 210152 +45
=======================================
+ Hits 172556 172642 +86
+ Misses 37551 37510 -41 |
apfitzge
approved these changes
Jul 10, 2023
| bpf_costs = bpf_costs.saturating_add(DEFAULT_INSTRUCTION_COMPUTE_UNIT_LIMIT.into()); | ||
| bpf_costs = bpf_costs | ||
| .saturating_add(u64::from(DEFAULT_INSTRUCTION_COMPUTE_UNIT_LIMIT)) | ||
| .min(u64::from(MAX_COMPUTE_UNIT_LIMIT)); |
There was a problem hiding this comment.
probably don't need to do this every time, right? just do it after the loop
Comment on lines
+112
to
+113
| if let Ok(ComputeBudgetInstruction::SetComputeUnitLimit(_)) = | ||
| try_from_slice_unchecked(&instruction.data) |
There was a problem hiding this comment.
this feels dirty, but is a quick fix.
mergify bot
pushed a commit
that referenced
this pull request
Jul 17, 2023
1. add tests to demo builtin cost could be double counted; 2. quick fix for now (cherry picked from commit c69bc00) # Conflicts: # cost-model/src/cost_model.rs # program-runtime/src/compute_budget.rs
mergify bot
pushed a commit
that referenced
this pull request
Jul 17, 2023
1. add tests to demo builtin cost could be double counted; 2. quick fix for now (cherry picked from commit c69bc00) # Conflicts: # runtime/src/cost_model.rs
This was referenced Jul 17, 2023
willhickey
pushed a commit
that referenced
this pull request
Jul 18, 2023
1. add tests to demo builtin cost could be double counted; 2. quick fix for now (cherry picked from commit c69bc00) # Conflicts: # runtime/src/cost_model.rs
tao-stones
added a commit
that referenced
this pull request
Jul 19, 2023
…rt of #32422) (#32516) * cost model could double count builtin instruction cost (#32422) 1. add tests to demo builtin cost could be double counted; 2. quick fix for now (cherry picked from commit c69bc00) # Conflicts: # runtime/src/cost_model.rs * fix backport merge conflict * fix a logic error --------- Co-authored-by: Tao Zhu <82401714+taozhu-chicago@users.noreply.github.com> Co-authored-by: Tao Zhu <tao@solana.com>
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Problem
Philip @ FD pointed out "when there are no ComputeBudgetProgram instructions but at least 1 non-builtin instruction, bpf_execution_cost is initially set to 200k*(number of non-built-in instructions) but then overwritten to 200k*(number of non-ComputeBudgetProgram instructions) by the result of compute_budget.process_instructions . This means that if you have a mix of built-in and non-built-in instructions, the built-in ones get double counted (included in builtins_execution_cost and bpf_execution_cost )."
Summary of Changes
test_transaction_cost_with_mix_instruction_without_compute_budgetto cost_model.rs, confirms builtin ix add cost tobpf_execution_costtest_process_mixed_instructions_without_compute_budgetto compute_budget.rs, to explicitly demo default compute unit limit behaviorset_compute_unit_limitinstruction inCostModel::get_transaction_cost()to fix the issue.Fixes #