forked from cerc-io/plugeth
295693759e
* core/vm/runtime/tests: add more benchmarks * core/vm: initial work on improving alloc count for calls to precompiles name old time/op new time/op delta SimpleLoop/identity-precompile-10M-6 117ms ±75% 43ms ± 1% -63.09% (p=0.008 n=5+5) SimpleLoop/loop-10M-6 79.6ms ± 4% 70.5ms ± 1% -11.42% (p=0.008 n=5+5) name old alloc/op new alloc/op delta SimpleLoop/identity-precompile-10M-6 24.4MB ± 0% 4.9MB ± 0% -79.94% (p=0.008 n=5+5) SimpleLoop/loop-10M-6 13.2kB ± 0% 13.2kB ± 0% ~ (p=0.357 n=5+5) name old allocs/op new allocs/op delta SimpleLoop/identity-precompile-10M-6 382k ± 0% 153k ± 0% -59.99% (p=0.000 n=5+4) SimpleLoop/loop-10M-6 40.0 ± 0% 40.0 ± 0% ~ (all equal) * core/vm: don't allocate big.int for touch name old time/op new time/op delta SimpleLoop/identity-precompile-10M-6 43.3ms ± 1% 42.4ms ± 7% ~ (p=0.151 n=5+5) SimpleLoop/loop-10M-6 70.5ms ± 1% 76.7ms ± 1% +8.67% (p=0.008 n=5+5) name old alloc/op new alloc/op delta SimpleLoop/identity-precompile-10M-6 4.90MB ± 0% 2.46MB ± 0% -49.83% (p=0.008 n=5+5) SimpleLoop/loop-10M-6 13.2kB ± 0% 13.2kB ± 1% ~ (p=0.571 n=5+5) name old allocs/op new allocs/op delta SimpleLoop/identity-precompile-10M-6 153k ± 0% 76k ± 0% -49.98% (p=0.029 n=4+4) SimpleLoop/loop-10M-6 40.0 ± 0% 40.0 ± 0% ~ (all equal) * core/vm: reduce allocs in staticcall name old time/op new time/op delta SimpleLoop/identity-precompile-10M-6 42.4ms ± 7% 37.5ms ± 6% -11.68% (p=0.008 n=5+5) SimpleLoop/loop-10M-6 76.7ms ± 1% 69.1ms ± 1% -9.82% (p=0.008 n=5+5) name old alloc/op new alloc/op delta SimpleLoop/identity-precompile-10M-6 2.46MB ± 0% 0.02MB ± 0% -99.35% (p=0.008 n=5+5) SimpleLoop/loop-10M-6 13.2kB ± 1% 13.2kB ± 0% ~ (p=0.143 n=5+5) name old allocs/op new allocs/op delta SimpleLoop/identity-precompile-10M-6 76.4k ± 0% 0.1k ± 0% ~ (p=0.079 n=4+5) SimpleLoop/loop-10M-6 40.0 ± 0% 40.0 ± 0% ~ (all equal) * trie: better use of hasher keccakState * core/state/statedb: reduce allocations in getDeletedStateObject * core/vm: reduce allocations in all call derivates * core/vm: reduce allocations in call variants - Make returnstack `uint32` - Use a `sync.Pool` of `stack`s * core/vm: fix tests * core/vm: goimports * core/vm: tracer fix + staticcall gas fix * core/vm: add back snapshot to staticcall * core/vm: review concerns + make returnstack pooled + enable returndata in traces * core/vm: fix some test tracer method signatures * core/vm: run gencodec, minor comment polish Co-authored-by: Péter Szilágyi <peterke@gmail.com>
130 lines
3.9 KiB
Go
130 lines
3.9 KiB
Go
// Copyright 2017 The go-ethereum Authors
|
|
// This file is part of go-ethereum.
|
|
//
|
|
// go-ethereum is free software: you can redistribute it and/or modify
|
|
// it under the terms of the GNU General Public License as published by
|
|
// the Free Software Foundation, either version 3 of the License, or
|
|
// (at your option) any later version.
|
|
//
|
|
// go-ethereum is distributed in the hope that it will be useful,
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
// GNU General Public License for more details.
|
|
//
|
|
// You should have received a copy of the GNU General Public License
|
|
// along with go-ethereum. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
package main
|
|
|
|
import (
|
|
"encoding/json"
|
|
"errors"
|
|
"fmt"
|
|
"io/ioutil"
|
|
"os"
|
|
|
|
"github.com/ethereum/go-ethereum/core/state"
|
|
"github.com/ethereum/go-ethereum/core/vm"
|
|
"github.com/ethereum/go-ethereum/log"
|
|
"github.com/ethereum/go-ethereum/tests"
|
|
|
|
cli "gopkg.in/urfave/cli.v1"
|
|
)
|
|
|
|
var stateTestCommand = cli.Command{
|
|
Action: stateTestCmd,
|
|
Name: "statetest",
|
|
Usage: "executes the given state tests",
|
|
ArgsUsage: "<file>",
|
|
}
|
|
|
|
// StatetestResult contains the execution status after running a state test, any
|
|
// error that might have occurred and a dump of the final state if requested.
|
|
type StatetestResult struct {
|
|
Name string `json:"name"`
|
|
Pass bool `json:"pass"`
|
|
Fork string `json:"fork"`
|
|
Error string `json:"error,omitempty"`
|
|
State *state.Dump `json:"state,omitempty"`
|
|
}
|
|
|
|
func stateTestCmd(ctx *cli.Context) error {
|
|
if len(ctx.Args().First()) == 0 {
|
|
return errors.New("path-to-test argument required")
|
|
}
|
|
// Configure the go-ethereum logger
|
|
glogger := log.NewGlogHandler(log.StreamHandler(os.Stderr, log.TerminalFormat(false)))
|
|
glogger.Verbosity(log.Lvl(ctx.GlobalInt(VerbosityFlag.Name)))
|
|
log.Root().SetHandler(glogger)
|
|
|
|
// Configure the EVM logger
|
|
config := &vm.LogConfig{
|
|
DisableMemory: ctx.GlobalBool(DisableMemoryFlag.Name),
|
|
DisableStack: ctx.GlobalBool(DisableStackFlag.Name),
|
|
DisableStorage: ctx.GlobalBool(DisableStorageFlag.Name),
|
|
DisableReturnData: ctx.GlobalBool(DisableReturnDataFlag.Name),
|
|
}
|
|
var (
|
|
tracer vm.Tracer
|
|
debugger *vm.StructLogger
|
|
)
|
|
switch {
|
|
case ctx.GlobalBool(MachineFlag.Name):
|
|
tracer = vm.NewJSONLogger(config, os.Stderr)
|
|
|
|
case ctx.GlobalBool(DebugFlag.Name):
|
|
debugger = vm.NewStructLogger(config)
|
|
tracer = debugger
|
|
|
|
default:
|
|
debugger = vm.NewStructLogger(config)
|
|
}
|
|
// Load the test content from the input file
|
|
src, err := ioutil.ReadFile(ctx.Args().First())
|
|
if err != nil {
|
|
return err
|
|
}
|
|
var tests map[string]tests.StateTest
|
|
if err = json.Unmarshal(src, &tests); err != nil {
|
|
return err
|
|
}
|
|
// Iterate over all the tests, run them and aggregate the results
|
|
cfg := vm.Config{
|
|
Tracer: tracer,
|
|
Debug: ctx.GlobalBool(DebugFlag.Name) || ctx.GlobalBool(MachineFlag.Name),
|
|
}
|
|
results := make([]StatetestResult, 0, len(tests))
|
|
for key, test := range tests {
|
|
for _, st := range test.Subtests() {
|
|
// Run the test and aggregate the result
|
|
result := &StatetestResult{Name: key, Fork: st.Fork, Pass: true}
|
|
_, state, err := test.Run(st, cfg, false)
|
|
// print state root for evmlab tracing
|
|
if ctx.GlobalBool(MachineFlag.Name) && state != nil {
|
|
fmt.Fprintf(os.Stderr, "{\"stateRoot\": \"%x\"}\n", state.IntermediateRoot(false))
|
|
}
|
|
if err != nil {
|
|
// Test failed, mark as so and dump any state to aid debugging
|
|
result.Pass, result.Error = false, err.Error()
|
|
if ctx.GlobalBool(DumpFlag.Name) && state != nil {
|
|
dump := state.RawDump(false, false, true)
|
|
result.State = &dump
|
|
}
|
|
}
|
|
|
|
results = append(results, *result)
|
|
|
|
// Print any structured logs collected
|
|
if ctx.GlobalBool(DebugFlag.Name) {
|
|
if debugger != nil {
|
|
fmt.Fprintln(os.Stderr, "#### TRACE ####")
|
|
vm.WriteTrace(os.Stderr, debugger.StructLogs())
|
|
}
|
|
}
|
|
}
|
|
}
|
|
out, _ := json.MarshalIndent(results, "", " ")
|
|
fmt.Println(string(out))
|
|
return nil
|
|
}
|