aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/lib/stream/chacha/chacha_avx2/chacha_avx2.cpp83
-rw-r--r--src/lib/stream/chacha/chacha_sse2/chacha_sse2.cpp76
2 files changed, 79 insertions, 80 deletions
diff --git a/src/lib/stream/chacha/chacha_avx2/chacha_avx2.cpp b/src/lib/stream/chacha/chacha_avx2/chacha_avx2.cpp
index b8b448ab7..1cc619ef6 100644
--- a/src/lib/stream/chacha/chacha_avx2/chacha_avx2.cpp
+++ b/src/lib/stream/chacha/chacha_avx2/chacha_avx2.cpp
@@ -11,17 +11,17 @@ namespace Botan {
//static
BOTAN_FUNC_ISA("avx2")
-void ChaCha::chacha_avx2_x8(uint8_t output[64*8], uint32_t input[16], size_t rounds)
+void ChaCha::chacha_avx2_x8(uint8_t output[64*8], uint32_t state[16], size_t rounds)
{
BOTAN_ASSERT(rounds % 2 == 0, "Valid rounds");
- const __m128i* input_mm = reinterpret_cast<const __m128i*>(input);
+ const __m128i* state_mm = reinterpret_cast<const __m128i*>(state);
__m256i* output_mm = reinterpret_cast<__m256i*>(output);
- const __m256i input0 = _mm256_broadcastsi128_si256(_mm_loadu_si128(input_mm));
- const __m256i input1 = _mm256_broadcastsi128_si256(_mm_loadu_si128(input_mm + 1));
- const __m256i input2 = _mm256_broadcastsi128_si256(_mm_loadu_si128(input_mm + 2));
- const __m256i input3 = _mm256_broadcastsi128_si256(_mm_loadu_si128(input_mm + 3));
+ const __m256i state0 = _mm256_broadcastsi128_si256(_mm_loadu_si128(state_mm));
+ const __m256i state1 = _mm256_broadcastsi128_si256(_mm_loadu_si128(state_mm + 1));
+ const __m256i state2 = _mm256_broadcastsi128_si256(_mm_loadu_si128(state_mm + 2));
+ const __m256i state3 = _mm256_broadcastsi128_si256(_mm_loadu_si128(state_mm + 3));
const __m256i CTR0 = _mm256_set_epi32(0, 0, 0, 0, 0, 0, 0, 4);
const __m256i CTR1 = _mm256_set_epi32(0, 0, 0, 1, 0, 0, 0, 5);
@@ -36,25 +36,25 @@ void ChaCha::chacha_avx2_x8(uint8_t output[64*8], uint32_t input[16], size_t rou
#define mm_rotl(r, n) \
_mm256_or_si256(_mm256_slli_epi32(r, n), _mm256_srli_epi32(r, 32-n))
- __m256i X0_0 = input0;
- __m256i X0_1 = input1;
- __m256i X0_2 = input2;
- __m256i X0_3 = _mm256_add_epi64(input3, CTR0);
+ __m256i X0_0 = state0;
+ __m256i X0_1 = state1;
+ __m256i X0_2 = state2;
+ __m256i X0_3 = _mm256_add_epi64(state3, CTR0);
- __m256i X1_0 = input0;
- __m256i X1_1 = input1;
- __m256i X1_2 = input2;
- __m256i X1_3 = _mm256_add_epi64(input3, CTR1);
+ __m256i X1_0 = state0;
+ __m256i X1_1 = state1;
+ __m256i X1_2 = state2;
+ __m256i X1_3 = _mm256_add_epi64(state3, CTR1);
- __m256i X2_0 = input0;
- __m256i X2_1 = input1;
- __m256i X2_2 = input2;
- __m256i X2_3 = _mm256_add_epi64(input3, CTR2);
+ __m256i X2_0 = state0;
+ __m256i X2_1 = state1;
+ __m256i X2_2 = state2;
+ __m256i X2_3 = _mm256_add_epi64(state3, CTR2);
- __m256i X3_0 = input0;
- __m256i X3_1 = input1;
- __m256i X3_2 = input2;
- __m256i X3_3 = _mm256_add_epi64(input3, CTR3);
+ __m256i X3_0 = state0;
+ __m256i X3_1 = state1;
+ __m256i X3_2 = state2;
+ __m256i X3_3 = _mm256_add_epi64(state3, CTR3);
for(size_t r = 0; r != rounds / 2; ++r)
{
@@ -211,28 +211,28 @@ void ChaCha::chacha_avx2_x8(uint8_t output[64*8], uint32_t input[16], size_t rou
X3_3 = _mm256_shuffle_epi32(X3_3, _MM_SHUFFLE(0, 3, 2, 1));
}
- X0_0 = _mm256_add_epi32(X0_0, input0);
- X0_1 = _mm256_add_epi32(X0_1, input1);
- X0_2 = _mm256_add_epi32(X0_2, input2);
- X0_3 = _mm256_add_epi32(X0_3, input3);
+ X0_0 = _mm256_add_epi32(X0_0, state0);
+ X0_1 = _mm256_add_epi32(X0_1, state1);
+ X0_2 = _mm256_add_epi32(X0_2, state2);
+ X0_3 = _mm256_add_epi32(X0_3, state3);
X0_3 = _mm256_add_epi64(X0_3, CTR0);
- X1_0 = _mm256_add_epi32(X1_0, input0);
- X1_1 = _mm256_add_epi32(X1_1, input1);
- X1_2 = _mm256_add_epi32(X1_2, input2);
- X1_3 = _mm256_add_epi32(X1_3, input3);
+ X1_0 = _mm256_add_epi32(X1_0, state0);
+ X1_1 = _mm256_add_epi32(X1_1, state1);
+ X1_2 = _mm256_add_epi32(X1_2, state2);
+ X1_3 = _mm256_add_epi32(X1_3, state3);
X1_3 = _mm256_add_epi64(X1_3, CTR1);
- X2_0 = _mm256_add_epi32(X2_0, input0);
- X2_1 = _mm256_add_epi32(X2_1, input1);
- X2_2 = _mm256_add_epi32(X2_2, input2);
- X2_3 = _mm256_add_epi32(X2_3, input3);
+ X2_0 = _mm256_add_epi32(X2_0, state0);
+ X2_1 = _mm256_add_epi32(X2_1, state1);
+ X2_2 = _mm256_add_epi32(X2_2, state2);
+ X2_3 = _mm256_add_epi32(X2_3, state3);
X2_3 = _mm256_add_epi64(X2_3, CTR2);
- X3_0 = _mm256_add_epi32(X3_0, input0);
- X3_1 = _mm256_add_epi32(X3_1, input1);
- X3_2 = _mm256_add_epi32(X3_2, input2);
- X3_3 = _mm256_add_epi32(X3_3, input3);
+ X3_0 = _mm256_add_epi32(X3_0, state0);
+ X3_1 = _mm256_add_epi32(X3_1, state1);
+ X3_2 = _mm256_add_epi32(X3_2, state2);
+ X3_3 = _mm256_add_epi32(X3_3, state3);
X3_3 = _mm256_add_epi64(X3_3, CTR3);
_mm256_storeu_si256(output_mm , _mm256_permute2x128_si256(X0_0, X0_1, 1 + (3 << 4)));
@@ -255,9 +255,8 @@ void ChaCha::chacha_avx2_x8(uint8_t output[64*8], uint32_t input[16], size_t rou
#undef mm_rotl
- input[12] += 8;
- if(input[12] < 8)
- input[13]++;
-
+ state[12] += 8;
+ if(state[12] < 8)
+ state[13]++;
}
}
diff --git a/src/lib/stream/chacha/chacha_sse2/chacha_sse2.cpp b/src/lib/stream/chacha/chacha_sse2/chacha_sse2.cpp
index 9641be67b..121c92a3e 100644
--- a/src/lib/stream/chacha/chacha_sse2/chacha_sse2.cpp
+++ b/src/lib/stream/chacha/chacha_sse2/chacha_sse2.cpp
@@ -12,41 +12,41 @@ namespace Botan {
//static
BOTAN_FUNC_ISA("sse2")
-void ChaCha::chacha_sse2_x4(uint8_t output[64*4], uint32_t input[16], size_t rounds)
+void ChaCha::chacha_sse2_x4(uint8_t output[64*4], uint32_t state[16], size_t rounds)
{
BOTAN_ASSERT(rounds % 2 == 0, "Valid rounds");
- const __m128i* input_mm = reinterpret_cast<const __m128i*>(input);
+ const __m128i* state_mm = reinterpret_cast<const __m128i*>(state);
__m128i* output_mm = reinterpret_cast<__m128i*>(output);
- __m128i input0 = _mm_loadu_si128(input_mm);
- __m128i input1 = _mm_loadu_si128(input_mm + 1);
- __m128i input2 = _mm_loadu_si128(input_mm + 2);
- __m128i input3 = _mm_loadu_si128(input_mm + 3);
+ __m128i state0 = _mm_loadu_si128(state_mm);
+ __m128i state1 = _mm_loadu_si128(state_mm + 1);
+ __m128i state2 = _mm_loadu_si128(state_mm + 2);
+ __m128i state3 = _mm_loadu_si128(state_mm + 3);
// TODO: try transposing, which would avoid the permutations each round
#define mm_rotl(r, n) \
_mm_or_si128(_mm_slli_epi32(r, n), _mm_srli_epi32(r, 32-n))
- __m128i r0_0 = input0;
- __m128i r0_1 = input1;
- __m128i r0_2 = input2;
- __m128i r0_3 = input3;
+ __m128i r0_0 = state0;
+ __m128i r0_1 = state1;
+ __m128i r0_2 = state2;
+ __m128i r0_3 = state3;
- __m128i r1_0 = input0;
- __m128i r1_1 = input1;
- __m128i r1_2 = input2;
+ __m128i r1_0 = state0;
+ __m128i r1_1 = state1;
+ __m128i r1_2 = state2;
__m128i r1_3 = _mm_add_epi64(r0_3, _mm_set_epi32(0, 0, 0, 1));
- __m128i r2_0 = input0;
- __m128i r2_1 = input1;
- __m128i r2_2 = input2;
+ __m128i r2_0 = state0;
+ __m128i r2_1 = state1;
+ __m128i r2_2 = state2;
__m128i r2_3 = _mm_add_epi64(r0_3, _mm_set_epi32(0, 0, 0, 2));
- __m128i r3_0 = input0;
- __m128i r3_1 = input1;
- __m128i r3_2 = input2;
+ __m128i r3_0 = state0;
+ __m128i r3_1 = state1;
+ __m128i r3_2 = state2;
__m128i r3_3 = _mm_add_epi64(r0_3, _mm_set_epi32(0, 0, 0, 3));
for(size_t r = 0; r != rounds / 2; ++r)
@@ -204,27 +204,27 @@ void ChaCha::chacha_sse2_x4(uint8_t output[64*4], uint32_t input[16], size_t rou
r3_3 = _mm_shuffle_epi32(r3_3, _MM_SHUFFLE(0, 3, 2, 1));
}
- r0_0 = _mm_add_epi32(r0_0, input0);
- r0_1 = _mm_add_epi32(r0_1, input1);
- r0_2 = _mm_add_epi32(r0_2, input2);
- r0_3 = _mm_add_epi32(r0_3, input3);
+ r0_0 = _mm_add_epi32(r0_0, state0);
+ r0_1 = _mm_add_epi32(r0_1, state1);
+ r0_2 = _mm_add_epi32(r0_2, state2);
+ r0_3 = _mm_add_epi32(r0_3, state3);
- r1_0 = _mm_add_epi32(r1_0, input0);
- r1_1 = _mm_add_epi32(r1_1, input1);
- r1_2 = _mm_add_epi32(r1_2, input2);
- r1_3 = _mm_add_epi32(r1_3, input3);
+ r1_0 = _mm_add_epi32(r1_0, state0);
+ r1_1 = _mm_add_epi32(r1_1, state1);
+ r1_2 = _mm_add_epi32(r1_2, state2);
+ r1_3 = _mm_add_epi32(r1_3, state3);
r1_3 = _mm_add_epi64(r1_3, _mm_set_epi32(0, 0, 0, 1));
- r2_0 = _mm_add_epi32(r2_0, input0);
- r2_1 = _mm_add_epi32(r2_1, input1);
- r2_2 = _mm_add_epi32(r2_2, input2);
- r2_3 = _mm_add_epi32(r2_3, input3);
+ r2_0 = _mm_add_epi32(r2_0, state0);
+ r2_1 = _mm_add_epi32(r2_1, state1);
+ r2_2 = _mm_add_epi32(r2_2, state2);
+ r2_3 = _mm_add_epi32(r2_3, state3);
r2_3 = _mm_add_epi64(r2_3, _mm_set_epi32(0, 0, 0, 2));
- r3_0 = _mm_add_epi32(r3_0, input0);
- r3_1 = _mm_add_epi32(r3_1, input1);
- r3_2 = _mm_add_epi32(r3_2, input2);
- r3_3 = _mm_add_epi32(r3_3, input3);
+ r3_0 = _mm_add_epi32(r3_0, state0);
+ r3_1 = _mm_add_epi32(r3_1, state1);
+ r3_2 = _mm_add_epi32(r3_2, state2);
+ r3_3 = _mm_add_epi32(r3_3, state3);
r3_3 = _mm_add_epi64(r3_3, _mm_set_epi32(0, 0, 0, 3));
_mm_storeu_si128(output_mm + 0, r0_0);
@@ -249,9 +249,9 @@ void ChaCha::chacha_sse2_x4(uint8_t output[64*4], uint32_t input[16], size_t rou
#undef mm_rotl
- input[12] += 4;
- if(input[12] < 4)
- input[13]++;
+ state[12] += 4;
+ if(state[12] < 4)
+ state[13]++;
}
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-22 05:14:05 +0000