feat: EVM execution opcode level optimization

cmd/evm/main.go

@@ -114,6 +114,12 @@ var (
 		Category: traceCategory,
 	}
 
+	// Vm flags.
+	VMOpcodeOptimizeFlag = &cli.BoolFlag{
+		Name:  "vm.opcode.optimize",
+		Usage: "enable opcode optimization",
+	}
+
 	// Deprecated flags.
 	DebugFlag = &cli.BoolFlag{
 		Name:     "debug",

cmd/evm/runner.go

@@ -284,7 +284,8 @@ func runCmd(ctx *cli.Context) error {
 		BlobHashes:  blobHashes,
 		BlobBaseFee: blobBaseFee,
 		EVMConfig: vm.Config{
-			Tracer: tracer,
+			Tracer:                    tracer,
+			EnableOpcodeOptimizations: ctx.Bool(VMOpcodeOptimizeFlag.Name),
 		},
 	}
 

cmd/evm/testdata/eof/results.initcode.txt

@@ -202,38 +202,38 @@ ERR: undefined instruction: op opcode 0xac not defined, pos 0
 ERR: undefined instruction: op opcode 0xad not defined, pos 0
 ERR: undefined instruction: op opcode 0xae not defined, pos 0
 ERR: undefined instruction: op opcode 0xaf not defined, pos 0
-ERR: undefined instruction: op opcode 0xb0 not defined, pos 0
-ERR: undefined instruction: op opcode 0xb1 not defined, pos 0
-ERR: undefined instruction: op opcode 0xb2 not defined, pos 0
-ERR: undefined instruction: op opcode 0xb3 not defined, pos 0
-ERR: undefined instruction: op opcode 0xb4 not defined, pos 0
-ERR: undefined instruction: op opcode 0xb5 not defined, pos 0
-ERR: undefined instruction: op opcode 0xb6 not defined, pos 0
-ERR: undefined instruction: op opcode 0xb7 not defined, pos 0
-ERR: undefined instruction: op opcode 0xb8 not defined, pos 0
-ERR: undefined instruction: op opcode 0xb9 not defined, pos 0
-ERR: undefined instruction: op opcode 0xba not defined, pos 0
-ERR: undefined instruction: op opcode 0xbb not defined, pos 0
-ERR: undefined instruction: op opcode 0xbc not defined, pos 0
-ERR: undefined instruction: op opcode 0xbd not defined, pos 0
-ERR: undefined instruction: op opcode 0xbe not defined, pos 0
-ERR: undefined instruction: op opcode 0xbf not defined, pos 0
-ERR: undefined instruction: op opcode 0xc0 not defined, pos 0
-ERR: undefined instruction: op opcode 0xc1 not defined, pos 0
-ERR: undefined instruction: op opcode 0xc2 not defined, pos 0
-ERR: undefined instruction: op opcode 0xc3 not defined, pos 0
-ERR: undefined instruction: op opcode 0xc4 not defined, pos 0
-ERR: undefined instruction: op opcode 0xc5 not defined, pos 0
-ERR: undefined instruction: op opcode 0xc6 not defined, pos 0
-ERR: undefined instruction: op opcode 0xc7 not defined, pos 0
-ERR: undefined instruction: op opcode 0xc8 not defined, pos 0
-ERR: undefined instruction: op opcode 0xc9 not defined, pos 0
-ERR: undefined instruction: op opcode 0xca not defined, pos 0
-ERR: undefined instruction: op opcode 0xcb not defined, pos 0
-ERR: undefined instruction: op opcode 0xcc not defined, pos 0
-ERR: undefined instruction: op opcode 0xcd not defined, pos 0
-ERR: undefined instruction: op opcode 0xce not defined, pos 0
-ERR: undefined instruction: op opcode 0xcf not defined, pos 0
+ERR: undefined instruction: op NOP, pos 0
+ERR: undefined instruction: op ANDSWAP1POPSWAP2SWAP1, pos 0
+ERR: undefined instruction: op SWAP2SWAP1POPJUMP, pos 0
+ERR: undefined instruction: op SWAP1POPSWAP2SWAP1, pos 0
+ERR: undefined instruction: op POPSWAP2SWAP1POP, pos 0
+ERR: undefined instruction: op PUSH2JUMP, pos 0
+ERR: undefined instruction: op PUSH2JUMPI, pos 0
+ERR: undefined instruction: op PUSH1PUSH1, pos 0
+ERR: undefined instruction: op PUSH1ADD, pos 0
+ERR: undefined instruction: op PUSH1SHL, pos 0
+ERR: undefined instruction: op PUSH1DUP1, pos 0
+ERR: undefined instruction: op SWAP1POP, pos 0
+ERR: undefined instruction: op POPJUMP, pos 0
+ERR: undefined instruction: op POP2, pos 0
+ERR: undefined instruction: op SWAP2SWAP1, pos 0
+ERR: undefined instruction: op SWAP2POP, pos 0
+ERR: undefined instruction: op DUP2LT, pos 0
+ERR: undefined instruction: op JUMPIFZERO, pos 0
+ERR: undefined instruction: op ISZEROPUSH2, pos 0
+ERR: undefined instruction: op DUP2MSTOREPUSH1ADD, pos 0
+ERR: undefined instruction: op DUP1PUSH4EQPUSH2, pos 0
+ERR: undefined instruction: op PUSH1CALLDATALOADPUSH1SHRDUP1PUSH4GTPUSH2, pos 0
+ERR: undefined instruction: op PUSH1PUSH1PUSH1SHLSUB, pos 0
+ERR: undefined instruction: op ANDDUP2ADDSWAP1DUP2LT, pos 0
+ERR: undefined instruction: op SWAP1PUSH1DUP1NOTSWAP2ADDANDDUP2ADDSWAP1DUP2LT, pos 0
+ERR: undefined instruction: op DUP3AND, pos 0
+ERR: undefined instruction: op SWAP2SWAP1DUP3SUBSWAP2DUP3GTPUSH2, pos 0
+ERR: undefined instruction: op SWAP1DUP2, pos 0
+ERR: undefined instruction: op SHRSHRDUP1MULDUP1, pos 0
+ERR: undefined instruction: op SWAP3POPPOPPOP, pos 0
+ERR: undefined instruction: op SUBSLTISZEROPUSH2, pos 0
+ERR: undefined instruction: op DUP11MULDUP3SUBMULDUP1, pos 0
 ERR: undefined instruction: op opcode 0xd4 not defined, pos 0
 ERR: undefined instruction: op opcode 0xd5 not defined, pos 0
 ERR: undefined instruction: op opcode 0xd6 not defined, pos 0
@@ -2250,7 +2250,7 @@ ERR: invalid jump destination: out-of-bounds offset: offset -21151, dest -20628,
 ERR: initcode contains a RETURN or STOP opcode
 ERR: initcode contains a RETURN or STOP opcode
 ERR: initcode contains a RETURN or STOP opcode
-ERR: undefined instruction: op opcode 0xc8 not defined, pos 1179
+ERR: undefined instruction: op SWAP1PUSH1DUP1NOTSWAP2ADDANDDUP2ADDSWAP1DUP2LT, pos 1179
 ERR: invalid dataloadN argument: arg 5, last 32, pos 1728
 ERR: invalid dataloadN argument: arg 62719, last 32, pos 945
 ERR: invalid dataloadN argument: arg 16, last 32, pos 771

cmd/evm/testdata/eof/results.regular.txt

@@ -202,38 +202,38 @@ ERR: undefined instruction: op opcode 0xac not defined, pos 0
 ERR: undefined instruction: op opcode 0xad not defined, pos 0
 ERR: undefined instruction: op opcode 0xae not defined, pos 0
 ERR: undefined instruction: op opcode 0xaf not defined, pos 0
-ERR: undefined instruction: op opcode 0xb0 not defined, pos 0
-ERR: undefined instruction: op opcode 0xb1 not defined, pos 0
-ERR: undefined instruction: op opcode 0xb2 not defined, pos 0
-ERR: undefined instruction: op opcode 0xb3 not defined, pos 0
-ERR: undefined instruction: op opcode 0xb4 not defined, pos 0
-ERR: undefined instruction: op opcode 0xb5 not defined, pos 0
-ERR: undefined instruction: op opcode 0xb6 not defined, pos 0
-ERR: undefined instruction: op opcode 0xb7 not defined, pos 0
-ERR: undefined instruction: op opcode 0xb8 not defined, pos 0
-ERR: undefined instruction: op opcode 0xb9 not defined, pos 0
-ERR: undefined instruction: op opcode 0xba not defined, pos 0
-ERR: undefined instruction: op opcode 0xbb not defined, pos 0
-ERR: undefined instruction: op opcode 0xbc not defined, pos 0
-ERR: undefined instruction: op opcode 0xbd not defined, pos 0
-ERR: undefined instruction: op opcode 0xbe not defined, pos 0
-ERR: undefined instruction: op opcode 0xbf not defined, pos 0
-ERR: undefined instruction: op opcode 0xc0 not defined, pos 0
-ERR: undefined instruction: op opcode 0xc1 not defined, pos 0
-ERR: undefined instruction: op opcode 0xc2 not defined, pos 0
-ERR: undefined instruction: op opcode 0xc3 not defined, pos 0
-ERR: undefined instruction: op opcode 0xc4 not defined, pos 0
-ERR: undefined instruction: op opcode 0xc5 not defined, pos 0
-ERR: undefined instruction: op opcode 0xc6 not defined, pos 0
-ERR: undefined instruction: op opcode 0xc7 not defined, pos 0
-ERR: undefined instruction: op opcode 0xc8 not defined, pos 0
-ERR: undefined instruction: op opcode 0xc9 not defined, pos 0
-ERR: undefined instruction: op opcode 0xca not defined, pos 0
-ERR: undefined instruction: op opcode 0xcb not defined, pos 0
-ERR: undefined instruction: op opcode 0xcc not defined, pos 0
-ERR: undefined instruction: op opcode 0xcd not defined, pos 0
-ERR: undefined instruction: op opcode 0xce not defined, pos 0
-ERR: undefined instruction: op opcode 0xcf not defined, pos 0
+ERR: undefined instruction: op NOP, pos 0
+ERR: undefined instruction: op ANDSWAP1POPSWAP2SWAP1, pos 0
+ERR: undefined instruction: op SWAP2SWAP1POPJUMP, pos 0
+ERR: undefined instruction: op SWAP1POPSWAP2SWAP1, pos 0
+ERR: undefined instruction: op POPSWAP2SWAP1POP, pos 0
+ERR: undefined instruction: op PUSH2JUMP, pos 0
+ERR: undefined instruction: op PUSH2JUMPI, pos 0
+ERR: undefined instruction: op PUSH1PUSH1, pos 0
+ERR: undefined instruction: op PUSH1ADD, pos 0
+ERR: undefined instruction: op PUSH1SHL, pos 0
+ERR: undefined instruction: op PUSH1DUP1, pos 0
+ERR: undefined instruction: op SWAP1POP, pos 0
+ERR: undefined instruction: op POPJUMP, pos 0
+ERR: undefined instruction: op POP2, pos 0
+ERR: undefined instruction: op SWAP2SWAP1, pos 0
+ERR: undefined instruction: op SWAP2POP, pos 0
+ERR: undefined instruction: op DUP2LT, pos 0
+ERR: undefined instruction: op JUMPIFZERO, pos 0
+ERR: undefined instruction: op ISZEROPUSH2, pos 0
+ERR: undefined instruction: op DUP2MSTOREPUSH1ADD, pos 0
+ERR: undefined instruction: op DUP1PUSH4EQPUSH2, pos 0
+ERR: undefined instruction: op PUSH1CALLDATALOADPUSH1SHRDUP1PUSH4GTPUSH2, pos 0
+ERR: undefined instruction: op PUSH1PUSH1PUSH1SHLSUB, pos 0
+ERR: undefined instruction: op ANDDUP2ADDSWAP1DUP2LT, pos 0
+ERR: undefined instruction: op SWAP1PUSH1DUP1NOTSWAP2ADDANDDUP2ADDSWAP1DUP2LT, pos 0
+ERR: undefined instruction: op DUP3AND, pos 0
+ERR: undefined instruction: op SWAP2SWAP1DUP3SUBSWAP2DUP3GTPUSH2, pos 0
+ERR: undefined instruction: op SWAP1DUP2, pos 0
+ERR: undefined instruction: op SHRSHRDUP1MULDUP1, pos 0
+ERR: undefined instruction: op SWAP3POPPOPPOP, pos 0
+ERR: undefined instruction: op SUBSLTISZEROPUSH2, pos 0
+ERR: undefined instruction: op DUP11MULDUP3SUBMULDUP1, pos 0
 ERR: undefined instruction: op opcode 0xd4 not defined, pos 0
 ERR: undefined instruction: op opcode 0xd5 not defined, pos 0
 ERR: undefined instruction: op opcode 0xd6 not defined, pos 0
@@ -2250,7 +2250,7 @@ ERR: invalid jump destination: out-of-bounds offset: offset -21151, dest -20628,
 ERR: invalid dataloadN argument: arg 24833, last 0, pos 1397
 ERR: invalid jump destination: out-of-bounds offset: offset 24833, dest 26278, pos 1443
 ERR: stack limit reached 1048 (1024): at pos 75
-ERR: undefined instruction: op opcode 0xc8 not defined, pos 1179
+ERR: undefined instruction: op SWAP1PUSH1DUP1NOTSWAP2ADDANDDUP2ADDSWAP1DUP2LT, pos 1179
 ERR: invalid dataloadN argument: arg 5, last 32, pos 1728
 ERR: invalid dataloadN argument: arg 62719, last 32, pos 945
 ERR: invalid dataloadN argument: arg 16, last 32, pos 771

cmd/geth/main.go

@@ -183,6 +183,7 @@ var (
 		utils.LogDebugFlag,
 		utils.LogBacktraceAtFlag,
 		utils.BlobExtraReserveFlag,
+		utils.VMOpcodeOptimizeFlag,
 		utils.EnableIncrSnapshotFlag,
 		utils.IncrSnapshotPathFlag,
 		utils.IncrSnapshotBlockIntervalFlag,

cmd/utils/flags.go

@@ -43,6 +43,7 @@ import (
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/common/fdlimit"
 	"github.com/ethereum/go-ethereum/core"
+	"github.com/ethereum/go-ethereum/core/opcodeCompiler/compiler"
 	"github.com/ethereum/go-ethereum/core/rawdb"
 	"github.com/ethereum/go-ethereum/core/txpool/blobpool"
 	"github.com/ethereum/go-ethereum/core/txpool/legacypool"
@@ -1200,6 +1201,12 @@ Please note that --` + MetricsHTTPFlag.Name + ` must be set to start the server.
 		Category: flags.MetricsCategory,
 	}
 
+	VMOpcodeOptimizeFlag = &cli.BoolFlag{
+		Name:     "vm.opcode.optimize",
+		Usage:    "enable opcode optimization",
+		Category: flags.VMCategory,
+	}
+
 	CheckSnapshotWithMPT = &cli.BoolFlag{
 		Name:     "check-snapshot-with-mpt",
 		Usage:    "Enable checking between snapshot and MPT ",
@@ -2204,6 +2211,13 @@ func SetEthConfig(ctx *cli.Context, stack *node.Node, cfg *ethconfig.Config) {
 		cfg.EnablePreimageRecording = ctx.Bool(VMEnableDebugFlag.Name)
 	}
 
+	if ctx.IsSet(VMOpcodeOptimizeFlag.Name) {
+		cfg.EnableOpcodeOptimizing = ctx.Bool(VMOpcodeOptimizeFlag.Name)
+		if cfg.EnableOpcodeOptimizing {
+			compiler.EnableOptimization()
+		}
+	}
+
 	if ctx.IsSet(RPCGlobalGasCapFlag.Name) {
 		cfg.RPCGasCap = ctx.Uint64(RPCGlobalGasCapFlag.Name)
 	}
@@ -2820,7 +2834,12 @@ func MakeChain(ctx *cli.Context, stack *node.Node, readonly bool) (*core.BlockCh
 		options.TriesInMemory = ctx.Uint64(TriesInMemoryFlag.Name)
 	}
 	vmcfg := vm.Config{
-		EnablePreimageRecording: ctx.Bool(VMEnableDebugFlag.Name),
+		EnablePreimageRecording:   ctx.Bool(VMEnableDebugFlag.Name),
+		EnableOpcodeOptimizations: ctx.Bool(VMOpcodeOptimizeFlag.Name),
+	}
+
+	if vmcfg.EnableOpcodeOptimizations {
+		compiler.EnableOptimization()
 	}
 	if ctx.IsSet(VMTraceFlag.Name) {
 		if name := ctx.String(VMTraceFlag.Name); name != "" {