Eliminate the need for permute() by generating code for each round
This commit is contained in:
renthraysk
parent
2343930773
commit
c649c5ac94
197
blake3.go
197
blake3.go
|
|
@ -60,37 +60,6 @@ func gy(state *[16]uint32, a, b, c, d int, my uint32) {
|
||||||
state[b] = bits.RotateLeft32(state[b]^state[c], -7)
|
state[b] = bits.RotateLeft32(state[b]^state[c], -7)
|
||||||
}
|
}
|
||||||
|
|
||||||
func round(state *[16]uint32, m *[16]uint32) {
|
|
||||||
// Mix the columns.
|
|
||||||
gx(state, 0, 4, 8, 12, m[0])
|
|
||||||
gy(state, 0, 4, 8, 12, m[1])
|
|
||||||
gx(state, 1, 5, 9, 13, m[2])
|
|
||||||
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.
|
|
||||||
gx(state, 0, 5, 10, 15, m[8])
|
|
||||||
gy(state, 0, 5, 10, 15, m[9])
|
|
||||||
gx(state, 1, 6, 11, 12, m[10])
|
|
||||||
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) {
|
|
||||||
*m = [16]uint32{
|
|
||||||
m[2], m[6], m[3], m[10],
|
|
||||||
m[7], m[0], m[4], m[13],
|
|
||||||
m[1], m[11], m[12], m[5],
|
|
||||||
m[9], m[14], m[15], m[8],
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// A node represents a chunk or parent in the BLAKE3 Merkle tree. In BLAKE3
|
// A node represents a chunk or parent in the BLAKE3 Merkle tree. In BLAKE3
|
||||||
// terminology, the elements of the bottom layer (aka "leaves") of the tree are
|
// terminology, the elements of the bottom layer (aka "leaves") of the tree are
|
||||||
// called chunk nodes, and the elements of upper layers (aka "interior nodes")
|
// called chunk nodes, and the elements of upper layers (aka "interior nodes")
|
||||||
|
|
@ -122,19 +91,159 @@ func (n node) compress() [16]uint32 {
|
||||||
uint32(n.counter), uint32(n.counter >> 32), n.blockLen, n.flags,
|
uint32(n.counter), uint32(n.counter >> 32), n.blockLen, n.flags,
|
||||||
}
|
}
|
||||||
|
|
||||||
round(&state, &n.block) // round 1
|
// round1
|
||||||
permute(&n.block)
|
|
||||||
round(&state, &n.block) // round 2
|
// Mix the columns.
|
||||||
permute(&n.block)
|
gx(&state, 0, 4, 8, 12, n.block[0])
|
||||||
round(&state, &n.block) // round 3
|
gy(&state, 0, 4, 8, 12, n.block[1])
|
||||||
permute(&n.block)
|
gx(&state, 1, 5, 9, 13, n.block[2])
|
||||||
round(&state, &n.block) // round 4
|
gy(&state, 1, 5, 9, 13, n.block[3])
|
||||||
permute(&n.block)
|
gx(&state, 2, 6, 10, 14, n.block[4])
|
||||||
round(&state, &n.block) // round 5
|
gy(&state, 2, 6, 10, 14, n.block[5])
|
||||||
permute(&n.block)
|
gx(&state, 3, 7, 11, 15, n.block[6])
|
||||||
round(&state, &n.block) // round 6
|
gy(&state, 3, 7, 11, 15, n.block[7])
|
||||||
permute(&n.block)
|
|
||||||
round(&state, &n.block) // round 7
|
// Mix the diagonals.
|
||||||
|
gx(&state, 0, 5, 10, 15, n.block[8])
|
||||||
|
gy(&state, 0, 5, 10, 15, n.block[9])
|
||||||
|
gx(&state, 1, 6, 11, 12, n.block[10])
|
||||||
|
gy(&state, 1, 6, 11, 12, n.block[11])
|
||||||
|
gx(&state, 2, 7, 8, 13, n.block[12])
|
||||||
|
gy(&state, 2, 7, 8, 13, n.block[13])
|
||||||
|
gx(&state, 3, 4, 9, 14, n.block[14])
|
||||||
|
gy(&state, 3, 4, 9, 14, n.block[15])
|
||||||
|
|
||||||
|
// round2
|
||||||
|
|
||||||
|
// Mix the columns.
|
||||||
|
gx(&state, 0, 4, 8, 12, n.block[2])
|
||||||
|
gy(&state, 0, 4, 8, 12, n.block[6])
|
||||||
|
gx(&state, 1, 5, 9, 13, n.block[3])
|
||||||
|
gy(&state, 1, 5, 9, 13, n.block[10])
|
||||||
|
gx(&state, 2, 6, 10, 14, n.block[7])
|
||||||
|
gy(&state, 2, 6, 10, 14, n.block[0])
|
||||||
|
gx(&state, 3, 7, 11, 15, n.block[4])
|
||||||
|
gy(&state, 3, 7, 11, 15, n.block[13])
|
||||||
|
|
||||||
|
// Mix the diagonals.
|
||||||
|
gx(&state, 0, 5, 10, 15, n.block[1])
|
||||||
|
gy(&state, 0, 5, 10, 15, n.block[11])
|
||||||
|
gx(&state, 1, 6, 11, 12, n.block[12])
|
||||||
|
gy(&state, 1, 6, 11, 12, n.block[5])
|
||||||
|
gx(&state, 2, 7, 8, 13, n.block[9])
|
||||||
|
gy(&state, 2, 7, 8, 13, n.block[14])
|
||||||
|
gx(&state, 3, 4, 9, 14, n.block[15])
|
||||||
|
gy(&state, 3, 4, 9, 14, n.block[8])
|
||||||
|
|
||||||
|
// round3
|
||||||
|
|
||||||
|
// Mix the columns.
|
||||||
|
gx(&state, 0, 4, 8, 12, n.block[3])
|
||||||
|
gy(&state, 0, 4, 8, 12, n.block[4])
|
||||||
|
gx(&state, 1, 5, 9, 13, n.block[10])
|
||||||
|
gy(&state, 1, 5, 9, 13, n.block[12])
|
||||||
|
gx(&state, 2, 6, 10, 14, n.block[13])
|
||||||
|
gy(&state, 2, 6, 10, 14, n.block[2])
|
||||||
|
gx(&state, 3, 7, 11, 15, n.block[7])
|
||||||
|
gy(&state, 3, 7, 11, 15, n.block[14])
|
||||||
|
|
||||||
|
// Mix the diagonals.
|
||||||
|
gx(&state, 0, 5, 10, 15, n.block[6])
|
||||||
|
gy(&state, 0, 5, 10, 15, n.block[5])
|
||||||
|
gx(&state, 1, 6, 11, 12, n.block[9])
|
||||||
|
gy(&state, 1, 6, 11, 12, n.block[0])
|
||||||
|
gx(&state, 2, 7, 8, 13, n.block[11])
|
||||||
|
gy(&state, 2, 7, 8, 13, n.block[15])
|
||||||
|
gx(&state, 3, 4, 9, 14, n.block[8])
|
||||||
|
gy(&state, 3, 4, 9, 14, n.block[1])
|
||||||
|
|
||||||
|
// round4
|
||||||
|
|
||||||
|
// Mix the columns.
|
||||||
|
gx(&state, 0, 4, 8, 12, n.block[10])
|
||||||
|
gy(&state, 0, 4, 8, 12, n.block[7])
|
||||||
|
gx(&state, 1, 5, 9, 13, n.block[12])
|
||||||
|
gy(&state, 1, 5, 9, 13, n.block[9])
|
||||||
|
gx(&state, 2, 6, 10, 14, n.block[14])
|
||||||
|
gy(&state, 2, 6, 10, 14, n.block[3])
|
||||||
|
gx(&state, 3, 7, 11, 15, n.block[13])
|
||||||
|
gy(&state, 3, 7, 11, 15, n.block[15])
|
||||||
|
|
||||||
|
// Mix the diagonals.
|
||||||
|
gx(&state, 0, 5, 10, 15, n.block[4])
|
||||||
|
gy(&state, 0, 5, 10, 15, n.block[0])
|
||||||
|
gx(&state, 1, 6, 11, 12, n.block[11])
|
||||||
|
gy(&state, 1, 6, 11, 12, n.block[2])
|
||||||
|
gx(&state, 2, 7, 8, 13, n.block[5])
|
||||||
|
gy(&state, 2, 7, 8, 13, n.block[8])
|
||||||
|
gx(&state, 3, 4, 9, 14, n.block[1])
|
||||||
|
gy(&state, 3, 4, 9, 14, n.block[6])
|
||||||
|
|
||||||
|
// round5
|
||||||
|
|
||||||
|
// Mix the columns.
|
||||||
|
gx(&state, 0, 4, 8, 12, n.block[12])
|
||||||
|
gy(&state, 0, 4, 8, 12, n.block[13])
|
||||||
|
gx(&state, 1, 5, 9, 13, n.block[9])
|
||||||
|
gy(&state, 1, 5, 9, 13, n.block[11])
|
||||||
|
gx(&state, 2, 6, 10, 14, n.block[15])
|
||||||
|
gy(&state, 2, 6, 10, 14, n.block[10])
|
||||||
|
gx(&state, 3, 7, 11, 15, n.block[14])
|
||||||
|
gy(&state, 3, 7, 11, 15, n.block[8])
|
||||||
|
|
||||||
|
// Mix the diagonals.
|
||||||
|
gx(&state, 0, 5, 10, 15, n.block[7])
|
||||||
|
gy(&state, 0, 5, 10, 15, n.block[2])
|
||||||
|
gx(&state, 1, 6, 11, 12, n.block[5])
|
||||||
|
gy(&state, 1, 6, 11, 12, n.block[3])
|
||||||
|
gx(&state, 2, 7, 8, 13, n.block[0])
|
||||||
|
gy(&state, 2, 7, 8, 13, n.block[1])
|
||||||
|
gx(&state, 3, 4, 9, 14, n.block[6])
|
||||||
|
gy(&state, 3, 4, 9, 14, n.block[4])
|
||||||
|
|
||||||
|
// round6
|
||||||
|
|
||||||
|
// Mix the columns.
|
||||||
|
gx(&state, 0, 4, 8, 12, n.block[9])
|
||||||
|
gy(&state, 0, 4, 8, 12, n.block[14])
|
||||||
|
gx(&state, 1, 5, 9, 13, n.block[11])
|
||||||
|
gy(&state, 1, 5, 9, 13, n.block[5])
|
||||||
|
gx(&state, 2, 6, 10, 14, n.block[8])
|
||||||
|
gy(&state, 2, 6, 10, 14, n.block[12])
|
||||||
|
gx(&state, 3, 7, 11, 15, n.block[15])
|
||||||
|
gy(&state, 3, 7, 11, 15, n.block[1])
|
||||||
|
|
||||||
|
// Mix the diagonals.
|
||||||
|
gx(&state, 0, 5, 10, 15, n.block[13])
|
||||||
|
gy(&state, 0, 5, 10, 15, n.block[3])
|
||||||
|
gx(&state, 1, 6, 11, 12, n.block[0])
|
||||||
|
gy(&state, 1, 6, 11, 12, n.block[10])
|
||||||
|
gx(&state, 2, 7, 8, 13, n.block[2])
|
||||||
|
gy(&state, 2, 7, 8, 13, n.block[6])
|
||||||
|
gx(&state, 3, 4, 9, 14, n.block[4])
|
||||||
|
gy(&state, 3, 4, 9, 14, n.block[7])
|
||||||
|
|
||||||
|
// round7
|
||||||
|
|
||||||
|
// Mix the columns.
|
||||||
|
gx(&state, 0, 4, 8, 12, n.block[11])
|
||||||
|
gy(&state, 0, 4, 8, 12, n.block[15])
|
||||||
|
gx(&state, 1, 5, 9, 13, n.block[5])
|
||||||
|
gy(&state, 1, 5, 9, 13, n.block[0])
|
||||||
|
gx(&state, 2, 6, 10, 14, n.block[1])
|
||||||
|
gy(&state, 2, 6, 10, 14, n.block[9])
|
||||||
|
gx(&state, 3, 7, 11, 15, n.block[8])
|
||||||
|
gy(&state, 3, 7, 11, 15, n.block[6])
|
||||||
|
|
||||||
|
// Mix the diagonals.
|
||||||
|
gx(&state, 0, 5, 10, 15, n.block[14])
|
||||||
|
gy(&state, 0, 5, 10, 15, n.block[10])
|
||||||
|
gx(&state, 1, 6, 11, 12, n.block[2])
|
||||||
|
gy(&state, 1, 6, 11, 12, n.block[12])
|
||||||
|
gx(&state, 2, 7, 8, 13, n.block[3])
|
||||||
|
gy(&state, 2, 7, 8, 13, n.block[4])
|
||||||
|
gx(&state, 3, 4, 9, 14, n.block[7])
|
||||||
|
gy(&state, 3, 4, 9, 14, n.block[13])
|
||||||
|
|
||||||
for i := range n.cv {
|
for i := range n.cv {
|
||||||
state[i] ^= state[i+8]
|
state[i] ^= state[i+8]
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,49 @@
|
||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
)
|
||||||
|
|
||||||
|
func permute(m *[16]uint32) {
|
||||||
|
*m = [16]uint32{
|
||||||
|
m[2], m[6], m[3], m[10],
|
||||||
|
m[7], m[0], m[4], m[13],
|
||||||
|
m[1], m[11], m[12], m[5],
|
||||||
|
m[9], m[14], m[15], m[8],
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func main() {
|
||||||
|
|
||||||
|
var m [16]uint32
|
||||||
|
|
||||||
|
for i := range m {
|
||||||
|
m[i] = uint32(i)
|
||||||
|
}
|
||||||
|
for x := 1; x < 8; x++ {
|
||||||
|
fmt.Printf(`// round%d
|
||||||
|
|
||||||
|
// Mix the columns.
|
||||||
|
gx(&state, 0, 4, 8, 12, n.block[%d])
|
||||||
|
gy(&state, 0, 4, 8, 12, n.block[%d])
|
||||||
|
gx(&state, 1, 5, 9, 13, n.block[%d])
|
||||||
|
gy(&state, 1, 5, 9, 13, n.block[%d])
|
||||||
|
gx(&state, 2, 6, 10, 14, n.block[%d])
|
||||||
|
gy(&state, 2, 6, 10, 14, n.block[%d])
|
||||||
|
gx(&state, 3, 7, 11, 15, n.block[%d])
|
||||||
|
gy(&state, 3, 7, 11, 15, n.block[%d])
|
||||||
|
|
||||||
|
// Mix the diagonals.
|
||||||
|
gx(&state, 0, 5, 10, 15, n.block[%d])
|
||||||
|
gy(&state, 0, 5, 10, 15, n.block[%d])
|
||||||
|
gx(&state, 1, 6, 11, 12, n.block[%d])
|
||||||
|
gy(&state, 1, 6, 11, 12, n.block[%d])
|
||||||
|
gx(&state, 2, 7, 8, 13, n.block[%d])
|
||||||
|
gy(&state, 2, 7, 8, 13, n.block[%d])
|
||||||
|
gx(&state, 3, 4, 9, 14, n.block[%d])
|
||||||
|
gy(&state, 3, 4, 9, 14, n.block[%d])
|
||||||
|
|
||||||
|
`, x, m[0], m[1], m[2], m[3], m[4], m[5], m[6], m[7], m[8], m[9], m[10], m[11], m[12], m[13], m[14], m[15])
|
||||||
|
permute(&m)
|
||||||
|
}
|
||||||
|
}
|
||||||
Reference in New Issue