Optimize memory buffer, simplify set32, use sha256-simd

cl/utils/crypto.go

@@ -14,7 +14,7 @@
 package utils
 
 import (
-	"crypto/sha256"
+	"github.com/minio/sha256-simd"
 	"hash"
 	"sync"
 )

cmd/erigon-cl/core/state/state.go

@@ -1,7 +1,7 @@
 package state
 
 import (
-	"crypto/sha256"
+	"github.com/minio/sha256-simd"
 	"encoding/binary"
 
 	lru "github.com/hashicorp/golang-lru"

core/vm/contracts.go

@@ -17,9 +17,9 @@
 package vm
 
 import (
-	"crypto/sha256"
 	"encoding/binary"
 	"errors"
+	"github.com/minio/sha256-simd"
 	"math/big"
 
 	"github.com/holiman/uint256"

core/vm/interpreter.go

@@ -18,6 +18,7 @@ package vm
 
 import (
 	"hash"
+	"sync"
 
 	"github.com/ledgerwatch/erigon-lib/chain"
 	libcommon "github.com/ledgerwatch/erigon-lib/common"
@@ -43,6 +44,12 @@ type Config struct {
 	ExtraEips []int // Additional EIPS that are to be enabled
 }
 
+var pool = sync.Pool{
+	New: func() any {
+		return NewMemory()
+	},
+}
+
 func (vmConfig *Config) HasEip3860(rules *chain.Rules) bool {
 	for _, eip := range vmConfig.ExtraEips {
 		if eip == 3860 {
@@ -192,8 +199,8 @@ func (in *EVMInterpreter) Run(contract *Contract, input []byte, readOnly bool) (
 	in.returnData = nil
 
 	var (
-		op          OpCode        // current opcode
-		mem         = NewMemory() // bound memory
+		op          OpCode // current opcode
+		mem         = pool.Get().(*Memory)
 		locStack    = stack.New()
 		callContext = &ScopeContext{
 			Memory:   mem,
@@ -215,6 +222,8 @@ func (in *EVMInterpreter) Run(contract *Contract, input []byte, readOnly bool) (
 	// Don't move this deferrred function, it's placed before the capturestate-deferred method,
 	// so that it get's executed _after_: the capturestate needs the stacks before
 	// they are returned to the pools
+	mem.Reset()
+	defer pool.Put(mem)
 	defer stack.ReturnNormalStack(locStack)
 	contract.Input = input
 
@@ -304,7 +313,8 @@ func (in *EVMInterpreter) Run(contract *Contract, input []byte, readOnly bool) (
 		err = nil // clear stop token error
 	}
 
-	return res, err
+	ret = append(ret, res...)
+	return
 }
 
 // Depth returns the current call stack depth.

core/vm/memory.go

@@ -30,7 +30,9 @@ type Memory struct {
 
 // NewMemory returns a new memory model.
 func NewMemory() *Memory {
-	return &Memory{}
+	return &Memory{
+		store: make([]byte, 0, 4*1024),
+	}
 }
 
 // Set sets offset + size to value
@@ -56,8 +58,7 @@ func (m *Memory) Set32(offset uint64, val *uint256.Int) {
 		panic("invalid memory: store empty")
 	}
 	// Zero the memory area
-	copy(m.store[offset:offset+32], []byte{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0})
-	// Fill in relevant bits
+	copy(m.store[offset:offset+32], zeroes)
 	val.WriteToSlice(m.store[offset:])
 }
 
@@ -77,6 +78,11 @@ func (m *Memory) Resize(size uint64) {
 	m.store = append(m.store, zeroes[:l]...)
 }
 
+func (m *Memory) Reset() {
+	m.lastGasCost = 0
+	m.store = m.store[:0]
+}
+
 // GetCopy returns offset + size as a new slice
 func (m *Memory) GetCopy(offset, size int64) (cpy []byte) {
 	if size == 0 {

crypto/ecies/ecies_test.go

@@ -33,7 +33,7 @@ import (
 	"bytes"
 	"crypto/elliptic"
 	"crypto/rand"
-	"crypto/sha256"
+	"github.com/minio/sha256-simd"
 	"encoding/hex"
 	"flag"
 	"fmt"

crypto/ecies/params.go

@@ -37,7 +37,7 @@ import (
 	"crypto/aes"
 	"crypto/cipher"
 	"crypto/elliptic"
-	"crypto/sha256"
+	"github.com/minio/sha256-simd"
 	"crypto/sha512"
 	"fmt"
 	"hash"

p2p/discover/v5wire/crypto_test.go

@@ -20,7 +20,7 @@ import (
 	"bytes"
 	"crypto/ecdsa"
 	"crypto/elliptic"
-	"crypto/sha256"
+	"github.com/minio/sha256-simd"
 	"reflect"
 	"strings"
 	"testing"

p2p/discover/v5wire/encoding.go

@@ -22,7 +22,7 @@ import (
 	"crypto/cipher"
 	"crypto/ecdsa"
 	crand "crypto/rand"
-	"crypto/sha256"
+	"github.com/minio/sha256-simd"
 	"encoding/binary"
 	"errors"
 	"fmt"

p2p/server_test.go

@@ -19,7 +19,7 @@ package p2p
 import (
 	"context"
 	"crypto/ecdsa"
-	"crypto/sha256"
+	"github.com/minio/sha256-simd"
 	"errors"
 	"io"
 	"math/rand"

turbo/trie/vtree/verkle_utils_test.go

@@ -1,7 +1,7 @@
 package vtree
 
 import (
-	"crypto/sha256"
+	"github.com/minio/sha256-simd"
 	"math/big"
 	"math/rand"
 	"testing"