Patch for concurrent iterator & others (onto v1.11.6) #386

Closed
roysc wants to merge 1565 commits from v1.11.6-statediff-v5 into master
Showing only changes of commit fe5a26733c - Show all commits

View File

@ -284,26 +284,33 @@ func opBenchmark(bench *testing.B, op executionFunc, args ...string) {
var ( var (
env = NewEVM(BlockContext{}, TxContext{}, nil, params.TestChainConfig, Config{}) env = NewEVM(BlockContext{}, TxContext{}, nil, params.TestChainConfig, Config{})
stack = newstack() stack = newstack()
scope = &ScopeContext{nil, stack, nil}
evmInterpreter = NewEVMInterpreter(env, env.Config) evmInterpreter = NewEVMInterpreter(env, env.Config)
) )
env.interpreter = evmInterpreter env.interpreter = evmInterpreter
// convert args // convert args
byteArgs := make([][]byte, len(args)) intArgs := make([]*uint256.Int, len(args))
for i, arg := range args { for i, arg := range args {
byteArgs[i] = common.Hex2Bytes(arg) intArgs[i] = new(uint256.Int).SetBytes(common.Hex2Bytes(arg))
} }
pc := uint64(0) pc := uint64(0)
bench.ResetTimer() bench.ResetTimer()
for i := 0; i < bench.N; i++ { for i := 0; i < bench.N; i++ {
for _, arg := range byteArgs { for _, arg := range intArgs {
a := new(uint256.Int) stack.push(arg)
a.SetBytes(arg)
stack.push(a)
} }
op(&pc, evmInterpreter, &ScopeContext{nil, stack, nil}) op(&pc, evmInterpreter, scope)
stack.pop() stack.pop()
} }
bench.StopTimer()
for i, arg := range args {
want := new(uint256.Int).SetBytes(common.Hex2Bytes(arg))
if have := intArgs[i]; !want.Eq(have) {
bench.Fatalf("input #%d mutated, have %x want %x", i, have, want)
}
}
} }
func BenchmarkOpAdd64(b *testing.B) { func BenchmarkOpAdd64(b *testing.B) {