Implement run resources funcs #1175
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
mmsc2
requested review from
igaray,
Oppen,
fmoletta,
entropidelic,
juanbono,
pefontana and
Juan-M-V
as code owners
fmoletta
reviewed
May 22, 2023
fmoletta
reviewed
May 22, 2023
fmoletta
reviewed
May 22, 2023
| @@ -516,20 +517,26 @@ impl CairoRunner { | |||
| pub fn run_until_pc( | |||
| &mut self, | |||
| address: Relocatable, | |||
| run_resources: &mut Option<RunResources>, | |||
There was a problem hiding this comment.
Maybe this could be Option<&mut RunResources> instead?
As to avoid having to call it with &mut None
There was a problem hiding this comment.
i was unsure which one would be a better option but the suggestion is fair enough, besides it matches the behavior it has in the function.
There was a problem hiding this comment.
i was trying to apply the suggestion but it doesn't like that i mutated the Option value without setting &mut Option in the parameters, maybe there is a work around.
There was a problem hiding this comment.
It will be ugly but I think mut Option<&mut RunResources> is likely to work.
fmoletta
reviewed
May 22, 2023
Oppen
reviewed
May 23, 2023
|
Benchmark Results for unmodified programs 🚀
|
Codecov Report
@@ Coverage Diff @@
## main #1175 +/- ##
==========================================
- Coverage 97.60% 97.60% -0.01%
==========================================
Files 89 89
Lines 36066 36198 +132
==========================================
+ Hits 35202 35330 +128
- Misses 864 868 +4
📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more |
Oppen
approved these changes
May 25, 2023
src/vm/runners/cairo_runner.rs
Outdated
Comment on lines
530
to
536
| while vm.run_context.pc != address | ||
| && !if let Some(r) = run_resources.as_ref() { | ||
| r.consumed() | ||
| } else { | ||
| false | ||
| } | ||
| { |
There was a problem hiding this comment.
This looks confusing. Can you find a way to make it more straightforward?
There was a problem hiding this comment.
i think i can pull out a solution by calling a function that engulfs that behavior.
fmoletta
approved these changes
May 31, 2023
juanbono
approved these changes
May 31, 2023
pefontana
approved these changes
Jun 6, 2023
kariy
pushed a commit
to dojoengine/cairo-rs
that referenced
this pull request
Jun 23, 2023
* Add RunResources structure * Modify changelog * change data type of n_steps from u64 to usize * Implement run resources functions * Fix tests * set comment about calculation in cairo_run * Change CHangelog and remove option from RunResources * Fix clippy * Add clone trait to run resources * Add debug and default traits to RunResources * Fix error in while loop inside run_until_pc * Add helper function for clarity in run_until_pc loop * Add test for cairo 0 contracts * Add tests with Cairo 1 contracts * Move RunResources struct to vm::runners::cairo_runner::RunResources * Update CHANGELOG.md * Fix wasm and no-std compilation --------- Co-authored-by: Pedro Fontana <fontana.pedro93@gmail.com>
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.
TITLE
Description
Description of the pull request changes and motivation.
Checklist