From 755cca003cf791581b1f0bbb4c2427d8412d0ef9 Mon Sep 17 00:00:00 2001 From: Jorropo Date: Thu, 2 Jun 2022 09:49:58 +0200 Subject: [PATCH] chore: replace blake2b implementation by golang.org/x/crypto In 2016-12-13 d8e61c69ab46ca38328da2f4995abaf93b252290 golang.org/x/crypto gained a blake2b AVX implementation. There is also an AVX2 one. It is faster than what we are using right now. This commit allows for faster code and remove a dependency. For future improvements (like NEON) /x/crypto seems more maintained (it isn't an archived repo). benchmark old ns/op new ns/op delta BenchmarkSum128-12 252 140 -44.35% BenchmarkSum1K-12 1221 986 -19.24% benchmark old MB/s new MB/s speedup BenchmarkSum128-12 507.37 911.98 1.80x BenchmarkSum1K-12 838.70 1038.43 1.24x --- go.mod | 5 ++-- go.sum | 22 ++++++++-------- register/blake2/multihash_blake2.go | 40 ++++++++++++----------------- 3 files changed, 28 insertions(+), 39 deletions(-) diff --git a/go.mod b/go.mod index 40604a0..189f70d 100644 --- a/go.mod +++ b/go.mod @@ -1,18 +1,17 @@ module github.com/multiformats/go-multihash require ( - github.com/minio/blake2b-simd v0.0.0-20160723061019-3f5f724cb5b1 github.com/minio/sha256-simd v1.0.0 github.com/mr-tron/base58 v1.2.0 github.com/multiformats/go-varint v0.0.6 github.com/spaolacci/murmur3 v1.1.0 - golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83 + golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e lukechampine.com/blake3 v1.1.6 ) require ( github.com/klauspost/cpuid/v2 v2.0.9 // indirect - golang.org/x/sys v0.0.0-20210309074719-68d13333faf2 // indirect + golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1 // indirect ) go 1.17 diff --git a/go.sum b/go.sum index 42a516e..680bbcd 100644 --- a/go.sum +++ b/go.sum @@ -1,8 +1,6 @@ github.com/klauspost/cpuid/v2 v2.0.4/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= github.com/klauspost/cpuid/v2 v2.0.9 h1:lgaqFMSdTdQYdZ04uHyN2d/eKdOMyi2YLSvlQIBFYa4= github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= -github.com/minio/blake2b-simd v0.0.0-20160723061019-3f5f724cb5b1 h1:lYpkrQH5ajf0OXOcUbGjvZxxijuBwbbmlSxLiuofa+g= -github.com/minio/blake2b-simd v0.0.0-20160723061019-3f5f724cb5b1/go.mod h1:pD8RvIylQ358TN4wwqatJ8rNavkEINozVn9DtGI3dfQ= github.com/minio/sha256-simd v1.0.0 h1:v1ta+49hkWZyvaKwrQB8elexRqm6Y0aMLjCNsrYxo6g= github.com/minio/sha256-simd v1.0.0/go.mod h1:OuYzVNI5vcoYIAmbIvHPl3N3jUzVedXbKy5RFepssQM= github.com/mr-tron/base58 v1.2.0 h1:T/HDJBh4ZCPbU39/+c3rRvE0uKBQlU27+QI8LJ4t64o= @@ -11,15 +9,15 @@ github.com/multiformats/go-varint v0.0.6 h1:gk85QWKxh3TazbLxED/NlDVv8+q+ReFJk7Y2 github.com/multiformats/go-varint v0.0.6/go.mod h1:3Ls8CIEsrijN6+B7PbrXRPxHRPuXSrVKRY101jdMZYE= github.com/spaolacci/murmur3 v1.1.0 h1:7c1g84S4BPRrfL5Xrdp6fOJ206sU9y293DDHaoy0bLI= github.com/spaolacci/murmur3 v1.1.0/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= -golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83 h1:/ZScEX8SfEmUGRHs0gxpqteO5nfNW6axyZbBdw9A12g= -golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= -golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210309074719-68d13333faf2 h1:46ULzRKLh1CwgRq2dC5SlBzEqqNCi8rreOZnNrbqcIY= -golang.org/x/sys v0.0.0-20210309074719-68d13333faf2/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= -golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e h1:T8NU3HyQ8ClP4SEE+KbFlg6n0NhuTsN4MyznaarGsZM= +golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1 h1:SrN+KX8Art/Sf4HNj6Zcz06G7VEz+7w9tdXTPOZ7+l4= +golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= lukechampine.com/blake3 v1.1.6 h1:H3cROdztr7RCfoaTpGZFQsrqvweFLrqS73j7L7cmR5c= lukechampine.com/blake3 v1.1.6/go.mod h1:tkKEOtDkNtklkXtLNEOGNq5tcV90tJiA1vAA12R78LA= diff --git a/register/blake2/multihash_blake2.go b/register/blake2/multihash_blake2.go index de8f51c..6794df7 100644 --- a/register/blake2/multihash_blake2.go +++ b/register/blake2/multihash_blake2.go @@ -1,21 +1,21 @@ /* - This package has no purpose except to perform registration of multihashes. +This package has no purpose except to perform registration of multihashes. - It is meant to be used as a side-effecting import, e.g. +It is meant to be used as a side-effecting import, e.g. - import ( - _ "github.com/multiformats/go-multihash/register/blake2" - ) + import ( + _ "github.com/multiformats/go-multihash/register/blake2" + ) - This package registers several multihashes for the blake2 family - (both the 's' and the 'b' variants, and in a variety of sizes). +This package registers several multihashes for the blake2 family +(both the 's' and the 'b' variants, and in a variety of sizes). */ package blake2 import ( "hash" - "github.com/minio/blake2b-simd" + "golang.org/x/crypto/blake2b" "golang.org/x/crypto/blake2s" "github.com/multiformats/go-multihash/core" @@ -31,29 +31,21 @@ const ( func init() { // blake2s // This package only enables support for 32byte (256 bit) blake2s. - multihash.Register(blake2s_min+31, func() hash.Hash { h, _ := blake2s.New256(nil); return h }) + multihash.Register(blake2s_min+31, func() hash.Hash { + h, err := blake2s.New256(nil) + if err != nil { + panic(err) + } + return h + }) // blake2b // There's a whole range of these. for c := uint64(blake2b_min); c <= blake2b_max; c++ { size := int(c - blake2b_min + 1) - // special case these lengths to avoid allocations. - switch size { - case 32: - multihash.Register(c, blake2b.New256) - continue - case 64: - multihash.Register(c, blake2b.New512) - continue - } - - // Ok, allocate away. - // (The config object here being a pointer is a tad unfortunate, - // but we manage amortize it away by making them just once anyway.) - cfg := &blake2b.Config{Size: uint8(size)} multihash.Register(c, func() hash.Hash { - hasher, err := blake2b.New(cfg) + hasher, err := blake2b.New(size, nil) if err != nil { panic(err) }