diff --git a/src/commitment_scheme/blake2s_ref.rs b/src/commitment_scheme/blake2s_ref.rs new file mode 100644 index 000000000..414279723 --- /dev/null +++ b/src/commitment_scheme/blake2s_ref.rs @@ -0,0 +1,217 @@ +//! An AVX512 implementation of the BLAKE2s compression function. +//! Based on https://github.com/oconnor663/blake2_simd/blob/master/blake2s/src/avx2.rs . + +pub const IV: [u32; 8] = [ + 0x6A09E667, 0xBB67AE85, 0x3C6EF372, 0xA54FF53A, 0x510E527F, 0x9B05688C, 0x1F83D9AB, 0x5BE0CD19, +]; + +pub const SIGMA: [[u8; 16]; 10] = [ + [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15], + [14, 10, 4, 8, 9, 15, 13, 6, 1, 12, 0, 2, 11, 7, 5, 3], + [11, 8, 12, 0, 5, 2, 15, 13, 10, 14, 3, 6, 7, 1, 9, 4], + [7, 9, 3, 1, 13, 12, 11, 14, 2, 6, 5, 10, 4, 0, 15, 8], + [9, 0, 5, 7, 2, 4, 10, 15, 14, 1, 11, 12, 6, 8, 3, 13], + [2, 12, 6, 10, 0, 11, 8, 3, 4, 13, 7, 5, 15, 14, 1, 9], + [12, 5, 1, 15, 14, 13, 4, 10, 0, 7, 6, 3, 9, 2, 8, 11], + [13, 11, 7, 14, 12, 1, 3, 9, 5, 0, 15, 4, 8, 6, 2, 10], + [6, 15, 14, 9, 11, 3, 0, 8, 12, 2, 13, 7, 1, 4, 10, 5], + [10, 2, 8, 4, 7, 6, 1, 5, 15, 11, 9, 14, 3, 12, 13, 0], +]; + +#[inline(always)] +fn add(a: u32, b: u32) -> u32 { + a.wrapping_add(b) +} + +#[inline(always)] +fn xor(a: u32, b: u32) -> u32 { + a ^ b +} + +#[inline(always)] +fn rot16(x: u32) -> u32 { + (x >> 16) | (x << (32 - 16)) +} + +#[inline(always)] +fn rot12(x: u32) -> u32 { + (x >> 12) | (x << (32 - 12)) +} + +#[inline(always)] +fn rot8(x: u32) -> u32 { + (x >> 8) | (x << (32 - 8)) +} + +#[inline(always)] +fn rot7(x: u32) -> u32 { + (x >> 7) | (x << (32 - 7)) +} + +#[inline(always)] +fn round(v: &mut [u32; 16], m: [u32; 16], r: usize) { + v[0] = add(v[0], m[SIGMA[r][0] as usize]); + v[1] = add(v[1], m[SIGMA[r][2] as usize]); + v[2] = add(v[2], m[SIGMA[r][4] as usize]); + v[3] = add(v[3], m[SIGMA[r][6] as usize]); + v[0] = add(v[0], v[4]); + v[1] = add(v[1], v[5]); + v[2] = add(v[2], v[6]); + v[3] = add(v[3], v[7]); + v[12] = xor(v[12], v[0]); + v[13] = xor(v[13], v[1]); + v[14] = xor(v[14], v[2]); + v[15] = xor(v[15], v[3]); + v[12] = rot16(v[12]); + v[13] = rot16(v[13]); + v[14] = rot16(v[14]); + v[15] = rot16(v[15]); + v[8] = add(v[8], v[12]); + v[9] = add(v[9], v[13]); + v[10] = add(v[10], v[14]); + v[11] = add(v[11], v[15]); + v[4] = xor(v[4], v[8]); + v[5] = xor(v[5], v[9]); + v[6] = xor(v[6], v[10]); + v[7] = xor(v[7], v[11]); + v[4] = rot12(v[4]); + v[5] = rot12(v[5]); + v[6] = rot12(v[6]); + v[7] = rot12(v[7]); + v[0] = add(v[0], m[SIGMA[r][1] as usize]); + v[1] = add(v[1], m[SIGMA[r][3] as usize]); + v[2] = add(v[2], m[SIGMA[r][5] as usize]); + v[3] = add(v[3], m[SIGMA[r][7] as usize]); + v[0] = add(v[0], v[4]); + v[1] = add(v[1], v[5]); + v[2] = add(v[2], v[6]); + v[3] = add(v[3], v[7]); + v[12] = xor(v[12], v[0]); + v[13] = xor(v[13], v[1]); + v[14] = xor(v[14], v[2]); + v[15] = xor(v[15], v[3]); + v[12] = rot8(v[12]); + v[13] = rot8(v[13]); + v[14] = rot8(v[14]); + v[15] = rot8(v[15]); + v[8] = add(v[8], v[12]); + v[9] = add(v[9], v[13]); + v[10] = add(v[10], v[14]); + v[11] = add(v[11], v[15]); + v[4] = xor(v[4], v[8]); + v[5] = xor(v[5], v[9]); + v[6] = xor(v[6], v[10]); + v[7] = xor(v[7], v[11]); + v[4] = rot7(v[4]); + v[5] = rot7(v[5]); + v[6] = rot7(v[6]); + v[7] = rot7(v[7]); + + v[0] = add(v[0], m[SIGMA[r][8] as usize]); + v[1] = add(v[1], m[SIGMA[r][10] as usize]); + v[2] = add(v[2], m[SIGMA[r][12] as usize]); + v[3] = add(v[3], m[SIGMA[r][14] as usize]); + v[0] = add(v[0], v[5]); + v[1] = add(v[1], v[6]); + v[2] = add(v[2], v[7]); + v[3] = add(v[3], v[4]); + v[15] = xor(v[15], v[0]); + v[12] = xor(v[12], v[1]); + v[13] = xor(v[13], v[2]); + v[14] = xor(v[14], v[3]); + v[15] = rot16(v[15]); + v[12] = rot16(v[12]); + v[13] = rot16(v[13]); + v[14] = rot16(v[14]); + v[10] = add(v[10], v[15]); + v[11] = add(v[11], v[12]); + v[8] = add(v[8], v[13]); + v[9] = add(v[9], v[14]); + v[5] = xor(v[5], v[10]); + v[6] = xor(v[6], v[11]); + v[7] = xor(v[7], v[8]); + v[4] = xor(v[4], v[9]); + v[5] = rot12(v[5]); + v[6] = rot12(v[6]); + v[7] = rot12(v[7]); + v[4] = rot12(v[4]); + v[0] = add(v[0], m[SIGMA[r][9] as usize]); + v[1] = add(v[1], m[SIGMA[r][11] as usize]); + v[2] = add(v[2], m[SIGMA[r][13] as usize]); + v[3] = add(v[3], m[SIGMA[r][15] as usize]); + v[0] = add(v[0], v[5]); + v[1] = add(v[1], v[6]); + v[2] = add(v[2], v[7]); + v[3] = add(v[3], v[4]); + v[15] = xor(v[15], v[0]); + v[12] = xor(v[12], v[1]); + v[13] = xor(v[13], v[2]); + v[14] = xor(v[14], v[3]); + v[15] = rot8(v[15]); + v[12] = rot8(v[12]); + v[13] = rot8(v[13]); + v[14] = rot8(v[14]); + v[10] = add(v[10], v[15]); + v[11] = add(v[11], v[12]); + v[8] = add(v[8], v[13]); + v[9] = add(v[9], v[14]); + v[5] = xor(v[5], v[10]); + v[6] = xor(v[6], v[11]); + v[7] = xor(v[7], v[8]); + v[4] = xor(v[4], v[9]); + v[5] = rot7(v[5]); + v[6] = rot7(v[6]); + v[7] = rot7(v[7]); + v[4] = rot7(v[4]); +} + +/// Performs a Blake2s compression. +pub fn compress( + h_vecs: [u32; 8], + msg_vecs: [u32; 16], + count_low: u32, + count_high: u32, + lastblock: u32, + lastnode: u32, +) -> [u32; 8] { + let mut v = [ + h_vecs[0], + h_vecs[1], + h_vecs[2], + h_vecs[3], + h_vecs[4], + h_vecs[5], + h_vecs[6], + h_vecs[7], + IV[0], + IV[1], + IV[2], + IV[3], + xor(IV[4], count_low), + xor(IV[5], count_high), + xor(IV[6], lastblock), + xor(IV[7], lastnode), + ]; + + round(&mut v, msg_vecs, 0); + round(&mut v, msg_vecs, 1); + round(&mut v, msg_vecs, 2); + round(&mut v, msg_vecs, 3); + round(&mut v, msg_vecs, 4); + round(&mut v, msg_vecs, 5); + round(&mut v, msg_vecs, 6); + round(&mut v, msg_vecs, 7); + round(&mut v, msg_vecs, 8); + round(&mut v, msg_vecs, 9); + + [ + xor(xor(h_vecs[0], v[0]), v[8]), + xor(xor(h_vecs[1], v[1]), v[9]), + xor(xor(h_vecs[2], v[2]), v[10]), + xor(xor(h_vecs[3], v[3]), v[11]), + xor(xor(h_vecs[4], v[4]), v[12]), + xor(xor(h_vecs[5], v[5]), v[13]), + xor(xor(h_vecs[6], v[6]), v[14]), + xor(xor(h_vecs[7], v[7]), v[15]), + ] +} diff --git a/src/commitment_scheme/mod.rs b/src/commitment_scheme/mod.rs index 68aa9653a..23001ed95 100644 --- a/src/commitment_scheme/mod.rs +++ b/src/commitment_scheme/mod.rs @@ -1,4 +1,5 @@ pub mod blake2_hash; +pub mod blake2s_ref; pub mod blake3_hash; pub mod hasher; pub mod merkle_decommitment; diff --git a/src/core/backend/avx512/blake2s_avx.rs b/src/core/backend/avx512/blake2s_avx.rs new file mode 100644 index 000000000..f74164576 --- /dev/null +++ b/src/core/backend/avx512/blake2s_avx.rs @@ -0,0 +1,345 @@ +//! An AVX512 implementation of the BLAKE2s compression function. +//! Based on https://github.com/oconnor663/blake2_simd/blob/master/blake2s/src/avx2.rs . + +use std::arch::x86_64::{ + __m512i, _mm512_add_epi32, _mm512_or_si512, _mm512_permutex2var_epi32, _mm512_set1_epi32, + _mm512_slli_epi32, _mm512_srli_epi32, _mm512_xor_si512, +}; + +use super::tranpose_utils::{ + EVENS_CONCAT_EVENS, HHALF_INTERLEAVE_HHALF, LHALF_INTERLEAVE_LHALF, ODDS_CONCAT_ODDS, +}; + +const IV: [u32; 8] = [ + 0x6A09E667, 0xBB67AE85, 0x3C6EF372, 0xA54FF53A, 0x510E527F, 0x9B05688C, 0x1F83D9AB, 0x5BE0CD19, +]; + +const SIGMA: [[u8; 16]; 10] = [ + [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15], + [14, 10, 4, 8, 9, 15, 13, 6, 1, 12, 0, 2, 11, 7, 5, 3], + [11, 8, 12, 0, 5, 2, 15, 13, 10, 14, 3, 6, 7, 1, 9, 4], + [7, 9, 3, 1, 13, 12, 11, 14, 2, 6, 5, 10, 4, 0, 15, 8], + [9, 0, 5, 7, 2, 4, 10, 15, 14, 1, 11, 12, 6, 8, 3, 13], + [2, 12, 6, 10, 0, 11, 8, 3, 4, 13, 7, 5, 15, 14, 1, 9], + [12, 5, 1, 15, 14, 13, 4, 10, 0, 7, 6, 3, 9, 2, 8, 11], + [13, 11, 7, 14, 12, 1, 3, 9, 5, 0, 15, 4, 8, 6, 2, 10], + [6, 15, 14, 9, 11, 3, 0, 8, 12, 2, 13, 7, 1, 4, 10, 5], + [10, 2, 8, 4, 7, 6, 1, 5, 15, 11, 9, 14, 3, 12, 13, 0], +]; + +/// # Safety +#[inline(always)] +pub unsafe fn set1(iv: i32) -> __m512i { + _mm512_set1_epi32(iv) +} + +#[inline(always)] +unsafe fn add(a: __m512i, b: __m512i) -> __m512i { + _mm512_add_epi32(a, b) +} + +#[inline(always)] +unsafe fn xor(a: __m512i, b: __m512i) -> __m512i { + _mm512_xor_si512(a, b) +} + +#[inline(always)] +unsafe fn rot16(x: __m512i) -> __m512i { + _mm512_or_si512(_mm512_srli_epi32(x, 16), _mm512_slli_epi32(x, 32 - 16)) +} + +#[inline(always)] +unsafe fn rot12(x: __m512i) -> __m512i { + _mm512_or_si512(_mm512_srli_epi32(x, 12), _mm512_slli_epi32(x, 32 - 12)) +} + +#[inline(always)] +unsafe fn rot8(x: __m512i) -> __m512i { + _mm512_or_si512(_mm512_srli_epi32(x, 8), _mm512_slli_epi32(x, 32 - 8)) +} + +#[inline(always)] +unsafe fn rot7(x: __m512i) -> __m512i { + _mm512_or_si512(_mm512_srli_epi32(x, 7), _mm512_slli_epi32(x, 32 - 7)) +} + +#[inline(always)] +unsafe fn round(v: &mut [__m512i; 16], m: [__m512i; 16], r: usize) { + v[0] = add(v[0], m[SIGMA[r][0] as usize]); + v[1] = add(v[1], m[SIGMA[r][2] as usize]); + v[2] = add(v[2], m[SIGMA[r][4] as usize]); + v[3] = add(v[3], m[SIGMA[r][6] as usize]); + v[0] = add(v[0], v[4]); + v[1] = add(v[1], v[5]); + v[2] = add(v[2], v[6]); + v[3] = add(v[3], v[7]); + v[12] = xor(v[12], v[0]); + v[13] = xor(v[13], v[1]); + v[14] = xor(v[14], v[2]); + v[15] = xor(v[15], v[3]); + v[12] = rot16(v[12]); + v[13] = rot16(v[13]); + v[14] = rot16(v[14]); + v[15] = rot16(v[15]); + v[8] = add(v[8], v[12]); + v[9] = add(v[9], v[13]); + v[10] = add(v[10], v[14]); + v[11] = add(v[11], v[15]); + v[4] = xor(v[4], v[8]); + v[5] = xor(v[5], v[9]); + v[6] = xor(v[6], v[10]); + v[7] = xor(v[7], v[11]); + v[4] = rot12(v[4]); + v[5] = rot12(v[5]); + v[6] = rot12(v[6]); + v[7] = rot12(v[7]); + v[0] = add(v[0], m[SIGMA[r][1] as usize]); + v[1] = add(v[1], m[SIGMA[r][3] as usize]); + v[2] = add(v[2], m[SIGMA[r][5] as usize]); + v[3] = add(v[3], m[SIGMA[r][7] as usize]); + v[0] = add(v[0], v[4]); + v[1] = add(v[1], v[5]); + v[2] = add(v[2], v[6]); + v[3] = add(v[3], v[7]); + v[12] = xor(v[12], v[0]); + v[13] = xor(v[13], v[1]); + v[14] = xor(v[14], v[2]); + v[15] = xor(v[15], v[3]); + v[12] = rot8(v[12]); + v[13] = rot8(v[13]); + v[14] = rot8(v[14]); + v[15] = rot8(v[15]); + v[8] = add(v[8], v[12]); + v[9] = add(v[9], v[13]); + v[10] = add(v[10], v[14]); + v[11] = add(v[11], v[15]); + v[4] = xor(v[4], v[8]); + v[5] = xor(v[5], v[9]); + v[6] = xor(v[6], v[10]); + v[7] = xor(v[7], v[11]); + v[4] = rot7(v[4]); + v[5] = rot7(v[5]); + v[6] = rot7(v[6]); + v[7] = rot7(v[7]); + + v[0] = add(v[0], m[SIGMA[r][8] as usize]); + v[1] = add(v[1], m[SIGMA[r][10] as usize]); + v[2] = add(v[2], m[SIGMA[r][12] as usize]); + v[3] = add(v[3], m[SIGMA[r][14] as usize]); + v[0] = add(v[0], v[5]); + v[1] = add(v[1], v[6]); + v[2] = add(v[2], v[7]); + v[3] = add(v[3], v[4]); + v[15] = xor(v[15], v[0]); + v[12] = xor(v[12], v[1]); + v[13] = xor(v[13], v[2]); + v[14] = xor(v[14], v[3]); + v[15] = rot16(v[15]); + v[12] = rot16(v[12]); + v[13] = rot16(v[13]); + v[14] = rot16(v[14]); + v[10] = add(v[10], v[15]); + v[11] = add(v[11], v[12]); + v[8] = add(v[8], v[13]); + v[9] = add(v[9], v[14]); + v[5] = xor(v[5], v[10]); + v[6] = xor(v[6], v[11]); + v[7] = xor(v[7], v[8]); + v[4] = xor(v[4], v[9]); + v[5] = rot12(v[5]); + v[6] = rot12(v[6]); + v[7] = rot12(v[7]); + v[4] = rot12(v[4]); + v[0] = add(v[0], m[SIGMA[r][9] as usize]); + v[1] = add(v[1], m[SIGMA[r][11] as usize]); + v[2] = add(v[2], m[SIGMA[r][13] as usize]); + v[3] = add(v[3], m[SIGMA[r][15] as usize]); + v[0] = add(v[0], v[5]); + v[1] = add(v[1], v[6]); + v[2] = add(v[2], v[7]); + v[3] = add(v[3], v[4]); + v[15] = xor(v[15], v[0]); + v[12] = xor(v[12], v[1]); + v[13] = xor(v[13], v[2]); + v[14] = xor(v[14], v[3]); + v[15] = rot8(v[15]); + v[12] = rot8(v[12]); + v[13] = rot8(v[13]); + v[14] = rot8(v[14]); + v[10] = add(v[10], v[15]); + v[11] = add(v[11], v[12]); + v[8] = add(v[8], v[13]); + v[9] = add(v[9], v[14]); + v[5] = xor(v[5], v[10]); + v[6] = xor(v[6], v[11]); + v[7] = xor(v[7], v[8]); + v[4] = xor(v[4], v[9]); + v[5] = rot7(v[5]); + v[6] = rot7(v[6]); + v[7] = rot7(v[7]); + v[4] = rot7(v[4]); +} + +/// Transposes input chunks (16 chunks of 16 u32s each), to get 16 __m512i, each +/// representing 16 packed instances of a message word. +/// # Safety +pub unsafe fn transpose_msgs(mut data: [__m512i; 16]) -> [__m512i; 16] { + // Transpose by applying 4 times the index permutation: + // abcd:0123 => 3abc:d012 + // where abcd:0123 denotes that 0b 0123 word in the 0b abcd chunk. + // In other words, rotate the index to the right by 1. + for _ in 0..4 { + data = [ + _mm512_permutex2var_epi32(data[0], EVENS_CONCAT_EVENS, data[1]), + _mm512_permutex2var_epi32(data[2], EVENS_CONCAT_EVENS, data[3]), + _mm512_permutex2var_epi32(data[4], EVENS_CONCAT_EVENS, data[5]), + _mm512_permutex2var_epi32(data[6], EVENS_CONCAT_EVENS, data[7]), + _mm512_permutex2var_epi32(data[8], EVENS_CONCAT_EVENS, data[9]), + _mm512_permutex2var_epi32(data[10], EVENS_CONCAT_EVENS, data[11]), + _mm512_permutex2var_epi32(data[12], EVENS_CONCAT_EVENS, data[13]), + _mm512_permutex2var_epi32(data[14], EVENS_CONCAT_EVENS, data[15]), + _mm512_permutex2var_epi32(data[0], ODDS_CONCAT_ODDS, data[1]), + _mm512_permutex2var_epi32(data[2], ODDS_CONCAT_ODDS, data[3]), + _mm512_permutex2var_epi32(data[4], ODDS_CONCAT_ODDS, data[5]), + _mm512_permutex2var_epi32(data[6], ODDS_CONCAT_ODDS, data[7]), + _mm512_permutex2var_epi32(data[8], ODDS_CONCAT_ODDS, data[9]), + _mm512_permutex2var_epi32(data[10], ODDS_CONCAT_ODDS, data[11]), + _mm512_permutex2var_epi32(data[12], ODDS_CONCAT_ODDS, data[13]), + _mm512_permutex2var_epi32(data[14], ODDS_CONCAT_ODDS, data[15]), + ]; + } + data +} + +/// Transposes states, from 8 packed words, to get 16 results, each of size 32B. +/// # Safety +pub unsafe fn transpose_states(mut states: [__m512i; 8]) -> [__m512i; 8] { + // Transpose by applying 3 times the index permutation: + // 012:abcd => d01:2abc + // where 012:abcd denotes that 0b 012 word in the 0b abcd chunk. + // In other words, rotate the index to the right by 1. + for _ in 0..3 { + states = [ + _mm512_permutex2var_epi32(states[0], EVENS_CONCAT_EVENS, states[1]), + _mm512_permutex2var_epi32(states[2], EVENS_CONCAT_EVENS, states[3]), + _mm512_permutex2var_epi32(states[4], EVENS_CONCAT_EVENS, states[5]), + _mm512_permutex2var_epi32(states[6], EVENS_CONCAT_EVENS, states[7]), + _mm512_permutex2var_epi32(states[0], ODDS_CONCAT_ODDS, states[1]), + _mm512_permutex2var_epi32(states[2], ODDS_CONCAT_ODDS, states[3]), + _mm512_permutex2var_epi32(states[4], ODDS_CONCAT_ODDS, states[5]), + _mm512_permutex2var_epi32(states[6], ODDS_CONCAT_ODDS, states[7]), + ]; + } + states +} + +/// Transposes states, from 8 packed words, to get 16 results, each of size 32B. +/// # Safety +pub unsafe fn untranspose_states(mut states: [__m512i; 8]) -> [__m512i; 8] { + // Transpose by applying 3 times the index permutation: + // 012:abcd => 12a:bcd0 + // where 012:abcd denotes that 0b 012 word in the 0b abcd chunk. + // In other words, rotate the index to the left by 1. + for _ in 0..3 { + states = [ + _mm512_permutex2var_epi32(states[0], LHALF_INTERLEAVE_LHALF, states[4]), + _mm512_permutex2var_epi32(states[0], HHALF_INTERLEAVE_HHALF, states[4]), + _mm512_permutex2var_epi32(states[1], LHALF_INTERLEAVE_LHALF, states[5]), + _mm512_permutex2var_epi32(states[1], HHALF_INTERLEAVE_HHALF, states[5]), + _mm512_permutex2var_epi32(states[2], LHALF_INTERLEAVE_LHALF, states[6]), + _mm512_permutex2var_epi32(states[2], HHALF_INTERLEAVE_HHALF, states[6]), + _mm512_permutex2var_epi32(states[3], LHALF_INTERLEAVE_LHALF, states[7]), + _mm512_permutex2var_epi32(states[3], HHALF_INTERLEAVE_HHALF, states[7]), + ]; + } + states +} + +/// Compress 16 blake2s instances. +/// # Safety +pub unsafe fn compress16( + h_vecs: [__m512i; 8], + msg_vecs: [__m512i; 16], + count_low: __m512i, + count_high: __m512i, + lastblock: __m512i, + lastnode: __m512i, +) -> [__m512i; 8] { + let mut v = [ + h_vecs[0], + h_vecs[1], + h_vecs[2], + h_vecs[3], + h_vecs[4], + h_vecs[5], + h_vecs[6], + h_vecs[7], + set1(IV[0] as i32), + set1(IV[1] as i32), + set1(IV[2] as i32), + set1(IV[3] as i32), + xor(set1(IV[4] as i32), count_low), + xor(set1(IV[5] as i32), count_high), + xor(set1(IV[6] as i32), lastblock), + xor(set1(IV[7] as i32), lastnode), + ]; + + round(&mut v, msg_vecs, 0); + round(&mut v, msg_vecs, 1); + round(&mut v, msg_vecs, 2); + round(&mut v, msg_vecs, 3); + round(&mut v, msg_vecs, 4); + round(&mut v, msg_vecs, 5); + round(&mut v, msg_vecs, 6); + round(&mut v, msg_vecs, 7); + round(&mut v, msg_vecs, 8); + round(&mut v, msg_vecs, 9); + + [ + xor(xor(h_vecs[0], v[0]), v[8]), + xor(xor(h_vecs[1], v[1]), v[9]), + xor(xor(h_vecs[2], v[2]), v[10]), + xor(xor(h_vecs[3], v[3]), v[11]), + xor(xor(h_vecs[4], v[4]), v[12]), + xor(xor(h_vecs[5], v[5]), v[13]), + xor(xor(h_vecs[6], v[6]), v[14]), + xor(xor(h_vecs[7], v[7]), v[15]), + ] +} + +#[cfg(all(target_arch = "x86_64", target_feature = "avx512f"))] +#[cfg(test)] +mod tests { + use super::{compress16, set1, transpose_msgs, transpose_states, untranspose_states}; + use crate::commitment_scheme::blake2s_ref::compress; + + #[test] + fn test_compress16() { + let states: [[u32; 8]; 16] = + std::array::from_fn(|i| std::array::from_fn(|j| (i + j) as u32)); + let msgs: [[u32; 16]; 16] = + std::array::from_fn(|i| std::array::from_fn(|j| (i + j + 20) as u32)); + let count_low = 1; + let count_high = 2; + let lastblock = 3; + let lastnode = 4; + let res_unvectorized = std::array::from_fn(|i| { + compress( + states[i], msgs[i], count_low, count_high, lastblock, lastnode, + ) + }); + + let res_vectorized: [[u32; 8]; 16] = unsafe { + std::mem::transmute(untranspose_states(compress16( + transpose_states(std::mem::transmute(states)), + transpose_msgs(std::mem::transmute(msgs)), + set1(count_low as i32), + set1(count_high as i32), + set1(lastblock as i32), + set1(lastnode as i32), + ))) + }; + + assert_eq!(res_unvectorized, res_vectorized); + } +} diff --git a/src/core/backend/avx512/m31.rs b/src/core/backend/avx512/m31.rs index d62a011b4..a1efc34d6 100644 --- a/src/core/backend/avx512/m31.rs +++ b/src/core/backend/avx512/m31.rs @@ -8,46 +8,15 @@ use std::ops::{Add, AddAssign, Mul, MulAssign, Neg, Sub, SubAssign}; use num_traits::One; +use super::tranpose_utils::{ + EVENS_CONCAT_EVENS, HHALF_INTERLEAVE_HHALF, LHALF_INTERLEAVE_LHALF, ODDS_CONCAT_ODDS, +}; use crate::core::fields::m31::{M31, P}; use crate::core::fields::FieldExpOps; pub const K_BLOCK_SIZE: usize = 16; pub const M512P: __m512i = unsafe { core::mem::transmute([P; K_BLOCK_SIZE]) }; -/// An input to _mm512_permutex2var_epi32, and is used to interleave the low half of a -/// with the low half of b. -pub const LHALF_INTERLEAVE_LHALF: __m512i = unsafe { - core::mem::transmute([ - 0b00000, 0b10000, 0b00001, 0b10001, 0b00010, 0b10010, 0b00011, 0b10011, 0b00100, 0b10100, - 0b00101, 0b10101, 0b00110, 0b10110, 0b00111, 0b10111, - ]) -}; -/// An input to _mm512_permutex2var_epi32, and is used to interleave the high half of a -/// with the high half of b. -pub const HHALF_INTERLEAVE_HHALF: __m512i = unsafe { - core::mem::transmute([ - 0b01000, 0b11000, 0b01001, 0b11001, 0b01010, 0b11010, 0b01011, 0b11011, 0b01100, 0b11100, - 0b01101, 0b11101, 0b01110, 0b11110, 0b01111, 0b11111, - ]) -}; - -/// An input to _mm512_permutex2var_epi32, and is used to concat the even words of a -/// with the even words of b. -pub const EVENS_CONCAT_EVENS: __m512i = unsafe { - core::mem::transmute([ - 0b00000, 0b00010, 0b00100, 0b00110, 0b01000, 0b01010, 0b01100, 0b01110, 0b10000, 0b10010, - 0b10100, 0b10110, 0b11000, 0b11010, 0b11100, 0b11110, - ]) -}; -/// An input to _mm512_permutex2var_epi32, and is used to concat the odd words of a -/// with the odd words of b. -pub const ODDS_CONCAT_ODDS: __m512i = unsafe { - core::mem::transmute([ - 0b00001, 0b00011, 0b00101, 0b00111, 0b01001, 0b01011, 0b01101, 0b01111, 0b10001, 0b10011, - 0b10101, 0b10111, 0b11001, 0b11011, 0b11101, 0b11111, - ]) -}; - /// AVX512 implementation of M31. /// Stores 16 M31 elements in a single 512-bit register. /// Each M31 element is unreduced in the range [0, P]. diff --git a/src/core/backend/avx512/mod.rs b/src/core/backend/avx512/mod.rs index e84a2c02d..4320e78d5 100644 --- a/src/core/backend/avx512/mod.rs +++ b/src/core/backend/avx512/mod.rs @@ -1,9 +1,11 @@ pub mod bit_reverse; +pub mod blake2s_avx; pub mod circle; pub mod cm31; pub mod fft; pub mod m31; pub mod qm31; +pub mod tranpose_utils; use bytemuck::{cast_slice, cast_slice_mut, Pod, Zeroable}; use num_traits::Zero; diff --git a/src/core/backend/avx512/tranpose_utils.rs b/src/core/backend/avx512/tranpose_utils.rs new file mode 100644 index 000000000..4e4f5d3a2 --- /dev/null +++ b/src/core/backend/avx512/tranpose_utils.rs @@ -0,0 +1,35 @@ +use std::arch::x86_64::__m512i; + +/// An input to _mm512_permutex2var_epi32, and is used to interleave the low half of a +/// with the low half of b. +pub const LHALF_INTERLEAVE_LHALF: __m512i = unsafe { + core::mem::transmute([ + 0b00000, 0b10000, 0b00001, 0b10001, 0b00010, 0b10010, 0b00011, 0b10011, 0b00100, 0b10100, + 0b00101, 0b10101, 0b00110, 0b10110, 0b00111, 0b10111, + ]) +}; +/// An input to _mm512_permutex2var_epi32, and is used to interleave the high half of a +/// with the high half of b. +pub const HHALF_INTERLEAVE_HHALF: __m512i = unsafe { + core::mem::transmute([ + 0b01000, 0b11000, 0b01001, 0b11001, 0b01010, 0b11010, 0b01011, 0b11011, 0b01100, 0b11100, + 0b01101, 0b11101, 0b01110, 0b11110, 0b01111, 0b11111, + ]) +}; + +/// An input to _mm512_permutex2var_epi32, and is used to concat the even words of a +/// with the even words of b. +pub const EVENS_CONCAT_EVENS: __m512i = unsafe { + core::mem::transmute([ + 0b00000, 0b00010, 0b00100, 0b00110, 0b01000, 0b01010, 0b01100, 0b01110, 0b10000, 0b10010, + 0b10100, 0b10110, 0b11000, 0b11010, 0b11100, 0b11110, + ]) +}; +/// An input to _mm512_permutex2var_epi32, and is used to concat the odd words of a +/// with the odd words of b. +pub const ODDS_CONCAT_ODDS: __m512i = unsafe { + core::mem::transmute([ + 0b00001, 0b00011, 0b00101, 0b00111, 0b01001, 0b01011, 0b01101, 0b01111, 0b10001, 0b10011, + 0b10101, 0b10111, 0b11001, 0b11011, 0b11101, 0b11111, + ]) +};