AVM: Improve error handling and execution time #3612
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
jannotti
force-pushed
the
avm-error-handling
branch
from
f6a0068 to
c24bb1f
Compare
jasonpaulos
reviewed
Feb 11, 2022
Codecov Report
@@ Coverage Diff @@
## master #3612 +/- ##
==========================================
+ Coverage 49.76% 49.84% +0.08%
==========================================
Files 392 392
Lines 68766 68670 -96
==========================================
+ Hits 34219 34227 +8
+ Misses 30785 30690 -95
+ Partials 3762 3753 -9
Continue to review full report at Codecov.
|
| @@ -656,7 +641,7 @@ func eval(program []byte, cx *EvalContext) (pass bool, err error) { | |||
| defer func() { | |||
| // Ensure we update the debugger before exiting | |||
| if cx.Debugger != nil { | |||
| errDbg := cx.Debugger.Complete(cx.refreshDebugState()) | |||
| errDbg := cx.Debugger.Complete(cx.refreshDebugState(err)) | |||
There was a problem hiding this comment.
looks like this is the only where refreshDebugState receives non-nil err, on other two cases below they are would not be even called if err != nil. So maybe
Suggested change
| errDbg := cx.Debugger.Complete(cx.refreshDebugState(err)) | |
| ds := cx.refreshDebugState() | |
| ds.Error = err | |
| errDbg := cx.Debugger.Complete(ds) |
| last := len(cx.stack) - 1 // value | ||
| prev := last - 1 // state key | ||
| pprev := prev - 1 // account | ||
|
|
||
| sv := cx.stack[last] | ||
| key := string(cx.stack[prev].Bytes) | ||
|
|
||
| if cx.Ledger == nil { |
There was a problem hiding this comment.
I understand this is a repetitive check... is it prereq now?
There was a problem hiding this comment.
Yes, EvalContract does the check when first entering stateful evaluation, so it seems pointless to keep checking it in the stateful ops.
jannotti
changed the title
Also some benchmarks that show relative costs for the CPU part of processing transactions
cx.Ledger !=nil is checked in EvalContract(). There's no reason to check it again in stateful teal ops.
Tests more opcodes, including branches and others that have not return values. Automates handling of more opcodes by understanding immediate arguments. Fixes the ordering of return value testing.
jannotti
force-pushed
the
avm-error-handling
branch
from
a456fc5 to
47f54b2
Compare
…refactor Refactor TestReturnTypes to generate a test case for each opcode
Co-authored-by: Michael Diamant <[email protected]>
michaeldiamant
approved these changes
Mar 15, 2022
There was a problem hiding this comment.
@jannotti I'm leaving approval with the following notes:
- I most closely reviewed renames and changes to
data/transactions/logic/evalStateful_test.go. - I scanned other changes, but didn't scrutinize all of them. Since I'm new to the codebase, I leave it at your discretion if you believe a 2nd approval is warranted prior to merging.
jasonpaulos
approved these changes
Mar 15, 2022
This was referenced Apr 27, 2022
This was referenced May 2, 2022
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.
This reworks the opcode function interface to return errors directly instead of setting cx.err which was error-prone.
It also makes a couple small optimizations.