Limit VMResult cases when concrete #447
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
msooseth
approved these changes
Feb 5, 2024
| @@ -1251,32 +1251,11 @@ getCodeLocation vm = (vm.state.contract, vm.state.pc) | |||
| query :: Query t s -> EVM t s () | |||
| query = assign #result . Just . HandleEffect . Query | |||
|
|
|||
| choose :: Choose t s -> EVM t s () | |||
| choose :: Choose s -> EVM Symbolic s () | |||
There was a problem hiding this comment.
Notes to self: so choose is only defined for Symbolic now.
| @@ -2718,6 +2715,10 @@ instance VMOps Concrete where | |||
|
|
|||
| whenSymbolicElse _ a = a | |||
|
|
|||
| partial _ = internalError "won't happen during concrete exec" | |||
There was a problem hiding this comment.
Right, so partial cannot happen during concrete exec
| @@ -2589,6 +2565,27 @@ instance VMOps Symbolic where | |||
| toGas _ = () | |||
| whenSymbolicElse a _ = a | |||
|
|
|||
| partial e = assign #result (Just (Unfinished e)) | |||
There was a problem hiding this comment.
partial now only needs to be defined for symbolic exec
There was a problem hiding this comment.
In the long run, partial should not be part of VMOps but it needs a slight refactor to other functions
| @@ -46,7 +45,7 @@ data Action t s a where | |||
| Wait :: Query t s -> Action t s () | |||
|
|
|||
| -- | Multiple things can happen | |||
| Ask :: Choose t s -> Action t s () | |||
| Ask :: Choose s -> Action Symbolic s () | |||
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.
Description
This builds on top of #427. Better types using
VMTypeallowed to eliminate dead code and optimize concrete execution with specializedbranch. The speedup is ~10% on ethereum-tests.Checklist