56c4f2bfd4
The bulk of this PR is authored by @lightclient , in the original EOF-work. More recently, the code has been picked up and reworked for the new EOF specification, by @MariusVanDerWijden , in https://github.com/ethereum/go-ethereum/pull/29518, and also @shemnon has contributed with fixes. This PR is an attempt to start eating the elephant one small bite at a time, by selecting only the eof-validation as a standalone piece which can be merged without interfering too much in the core stuff. In this PR: - [x] Validation of eof containers, lifted from #29518, along with test-vectors from consensus-tests and fuzzing, to ensure that the move did not lose any functionality. - [x] Definition of eof opcodes, which is a prerequisite for validation - [x] Addition of `undefined` to a jumptable entry item. I'm not super-happy with this, but for the moment it seems the least invasive way to do it. A better way might be to go back and allowing nil-items or nil execute-functions to denote "undefined". - [x] benchmarks of eof validation speed --------- Co-authored-by: lightclient <lightclient@protonmail.com> Co-authored-by: Marius van der Wijden <m.vanderwijden@live.de> Co-authored-by: Danno Ferrin <danno.ferrin@shemnon.com>
136 lines
4.6 KiB
Go
136 lines
4.6 KiB
Go
// Copyright 2017 The go-ethereum Authors
|
|
// This file is part of the go-ethereum library.
|
|
//
|
|
// The go-ethereum library is free software: you can redistribute it and/or modify
|
|
// it under the terms of the GNU Lesser General Public License as published by
|
|
// the Free Software Foundation, either version 3 of the License, or
|
|
// (at your option) any later version.
|
|
//
|
|
// The go-ethereum library 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 Lesser General Public License for more details.
|
|
//
|
|
// You should have received a copy of the GNU Lesser General Public License
|
|
// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
package vm
|
|
|
|
import (
|
|
"math/bits"
|
|
"testing"
|
|
|
|
"github.com/ethereum/go-ethereum/crypto"
|
|
)
|
|
|
|
func TestJumpDestAnalysis(t *testing.T) {
|
|
tests := []struct {
|
|
code []byte
|
|
exp byte
|
|
which int
|
|
}{
|
|
{[]byte{byte(PUSH1), 0x01, 0x01, 0x01}, 0b0000_0010, 0},
|
|
{[]byte{byte(PUSH1), byte(PUSH1), byte(PUSH1), byte(PUSH1)}, 0b0000_1010, 0},
|
|
{[]byte{0x00, byte(PUSH1), 0x00, byte(PUSH1), 0x00, byte(PUSH1), 0x00, byte(PUSH1)}, 0b0101_0100, 0},
|
|
{[]byte{byte(PUSH8), byte(PUSH8), byte(PUSH8), byte(PUSH8), byte(PUSH8), byte(PUSH8), byte(PUSH8), byte(PUSH8), 0x01, 0x01, 0x01}, bits.Reverse8(0x7F), 0},
|
|
{[]byte{byte(PUSH8), 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01}, 0b0000_0001, 1},
|
|
{[]byte{0x01, 0x01, 0x01, 0x01, 0x01, byte(PUSH2), byte(PUSH2), byte(PUSH2), 0x01, 0x01, 0x01}, 0b1100_0000, 0},
|
|
{[]byte{0x01, 0x01, 0x01, 0x01, 0x01, byte(PUSH2), 0x01, 0x01, 0x01, 0x01, 0x01}, 0b0000_0000, 1},
|
|
{[]byte{byte(PUSH3), 0x01, 0x01, 0x01, byte(PUSH1), 0x01, 0x01, 0x01, 0x01, 0x01, 0x01}, 0b0010_1110, 0},
|
|
{[]byte{byte(PUSH3), 0x01, 0x01, 0x01, byte(PUSH1), 0x01, 0x01, 0x01, 0x01, 0x01, 0x01}, 0b0000_0000, 1},
|
|
{[]byte{0x01, byte(PUSH8), 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01}, 0b1111_1100, 0},
|
|
{[]byte{0x01, byte(PUSH8), 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01}, 0b0000_0011, 1},
|
|
{[]byte{byte(PUSH16), 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01}, 0b1111_1110, 0},
|
|
{[]byte{byte(PUSH16), 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01}, 0b1111_1111, 1},
|
|
{[]byte{byte(PUSH16), 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01}, 0b0000_0001, 2},
|
|
{[]byte{byte(PUSH8), 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, byte(PUSH1), 0x01}, 0b1111_1110, 0},
|
|
{[]byte{byte(PUSH8), 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, byte(PUSH1), 0x01}, 0b0000_0101, 1},
|
|
{[]byte{byte(PUSH32)}, 0b1111_1110, 0},
|
|
{[]byte{byte(PUSH32)}, 0b1111_1111, 1},
|
|
{[]byte{byte(PUSH32)}, 0b1111_1111, 2},
|
|
{[]byte{byte(PUSH32)}, 0b1111_1111, 3},
|
|
{[]byte{byte(PUSH32)}, 0b0000_0001, 4},
|
|
}
|
|
for i, test := range tests {
|
|
ret := codeBitmap(test.code)
|
|
if ret[test.which] != test.exp {
|
|
t.Fatalf("test %d: expected %x, got %02x", i, test.exp, ret[test.which])
|
|
}
|
|
}
|
|
}
|
|
|
|
const analysisCodeSize = 1200 * 1024
|
|
|
|
func BenchmarkJumpdestAnalysis_1200k(bench *testing.B) {
|
|
// 1.4 ms
|
|
code := make([]byte, analysisCodeSize)
|
|
bench.SetBytes(analysisCodeSize)
|
|
bench.ResetTimer()
|
|
for i := 0; i < bench.N; i++ {
|
|
codeBitmap(code)
|
|
}
|
|
bench.StopTimer()
|
|
}
|
|
func BenchmarkJumpdestHashing_1200k(bench *testing.B) {
|
|
// 4 ms
|
|
code := make([]byte, analysisCodeSize)
|
|
bench.SetBytes(analysisCodeSize)
|
|
bench.ResetTimer()
|
|
for i := 0; i < bench.N; i++ {
|
|
crypto.Keccak256Hash(code)
|
|
}
|
|
bench.StopTimer()
|
|
}
|
|
|
|
func BenchmarkJumpdestOpAnalysis(bench *testing.B) {
|
|
var op OpCode
|
|
bencher := func(b *testing.B) {
|
|
code := make([]byte, analysisCodeSize)
|
|
b.SetBytes(analysisCodeSize)
|
|
for i := range code {
|
|
code[i] = byte(op)
|
|
}
|
|
bits := make(bitvec, len(code)/8+1+4)
|
|
b.ResetTimer()
|
|
for i := 0; i < b.N; i++ {
|
|
clear(bits)
|
|
codeBitmapInternal(code, bits)
|
|
}
|
|
}
|
|
for op = PUSH1; op <= PUSH32; op++ {
|
|
bench.Run(op.String(), bencher)
|
|
}
|
|
op = JUMPDEST
|
|
bench.Run(op.String(), bencher)
|
|
op = STOP
|
|
bench.Run(op.String(), bencher)
|
|
}
|
|
|
|
func BenchmarkJumpdestOpEOFAnalysis(bench *testing.B) {
|
|
var op OpCode
|
|
bencher := func(b *testing.B) {
|
|
code := make([]byte, analysisCodeSize)
|
|
b.SetBytes(analysisCodeSize)
|
|
for i := range code {
|
|
code[i] = byte(op)
|
|
}
|
|
bits := make(bitvec, len(code)/8+1+4)
|
|
b.ResetTimer()
|
|
for i := 0; i < b.N; i++ {
|
|
clear(bits)
|
|
eofCodeBitmapInternal(code, bits)
|
|
}
|
|
}
|
|
for op = PUSH1; op <= PUSH32; op++ {
|
|
bench.Run(op.String(), bencher)
|
|
}
|
|
op = JUMPDEST
|
|
bench.Run(op.String(), bencher)
|
|
op = STOP
|
|
bench.Run(op.String(), bencher)
|
|
op = RJUMPV
|
|
bench.Run(op.String(), bencher)
|
|
op = EOFCREATE
|
|
bench.Run(op.String(), bencher)
|
|
}
|