LumeWeb
/
blake3
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Split g() into 2 inlines funcs. 

Eliminates calls & BC in round
This commit is contained in:
renthraysk 2020-01-10 17:37:31 +00:00 committed by lukechampine
parent fd30fee094
commit 07853371e5
1 changed files with 30 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
blake3.go
View File

@ -9,6 +9,7 @@ import (
"errors" "errors"
"hash" "hash"
"io" "io"
"math/bits"
) )
const ( const (
@ -32,31 +33,40 @@ var iv = [8]uint32{
0x510E527F, 0x9B05688C, 0x1F83D9AB, 0x5BE0CD19, 0x510E527F, 0x9B05688C, 0x1F83D9AB, 0x5BE0CD19,
} }
func g(state *[16]uint32, a, b, c, d int, mx, my uint32) { func gx(state *[16]uint32, a, b, c, d int, mx uint32) {
rotr := func(x uint32, n int) uint32 { state[a] += state[b] + mx
return (x >> n) | (x << (32 - n)) state[d] = bits.RotateLeft32(state[d]^state[a], -16)
} state[c] += state[d]
state[a] = state[a] + state[b] + mx state[b] = bits.RotateLeft32(state[b]^state[c], -12)
state[d] = rotr(state[d]^state[a], 16) }
state[c] = state[c] + state[d]
state[b] = rotr(state[b]^state[c], 12) func gy(state *[16]uint32, a, b, c, d int, my uint32) {
state[a] = state[a] + state[b] + my state[a] += state[b] + my
state[d] = rotr(state[d]^state[a], 8) state[d] = bits.RotateLeft32(state[d]^state[a], -8)
state[c] = state[c] + state[d] state[c] += state[d]
state[b] = rotr(state[b]^state[c], 7) state[b] = bits.RotateLeft32(state[b]^state[c], -7)
} }
func round(state *[16]uint32, m *[16]uint32) { func round(state *[16]uint32, m *[16]uint32) {
// Mix the columns. // Mix the columns.
g(state, 0, 4, 8, 12, m[0], m[1]) gx(state, 0, 4, 8, 12, m[0])
g(state, 1, 5, 9, 13, m[2], m[3]) gy(state, 0, 4, 8, 12, m[1])
g(state, 2, 6, 10, 14, m[4], m[5]) gx(state, 1, 5, 9, 13, m[2])
g(state, 3, 7, 11, 15, m[6], m[7]) gy(state, 1, 5, 9, 13, m[3])
gx(state, 2, 6, 10, 14, m[4])
gy(state, 2, 6, 10, 14, m[5])
gx(state, 3, 7, 11, 15, m[6])
gy(state, 3, 7, 11, 15, m[7])
// Mix the diagonals. // Mix the diagonals.
g(state, 0, 5, 10, 15, m[8], m[9]) gx(state, 0, 5, 10, 15, m[8])
g(state, 1, 6, 11, 12, m[10], m[11]) gy(state, 0, 5, 10, 15, m[9])
g(state, 2, 7, 8, 13, m[12], m[13]) gx(state, 1, 6, 11, 12, m[10])
g(state, 3, 4, 9, 14, m[14], m[15]) gy(state, 1, 6, 11, 12, m[11])
gx(state, 2, 7, 8, 13, m[12])
gy(state, 2, 7, 8, 13, m[13])
gx(state, 3, 4, 9, 14, m[14])
gy(state, 3, 4, 9, 14, m[15])
} }
func permute(m *[16]uint32) { func permute(m *[16]uint32) {