aboutsummaryrefslogtreecommitdiffstats
path: root/src/tests/test_simd.cpp
diff options
context:
space:
mode:
authorJack Lloyd <[email protected]>2017-10-11 17:02:20 -0400
committerJack Lloyd <[email protected]>2017-10-12 11:13:11 -0400
commit175f09ffd806f2f19cd509017a67ae1384f29ae1 (patch)
tree6194884467e4720dd79797cd106a45d60211f35f /src/tests/test_simd.cpp
parent40b3f979723b2b3dfb5c44047d7f786a73fd7f6f (diff)
Add compile-time rotation functions
The problem with asm rol/ror is the compiler can't schedule effectively. But we only need asm in the case when the rotation is variable, so distinguish the two cases. If a compile time constant, then static_assert that the rotation is in the correct range and do the straightforward expression knowing the compiler will probably do the right thing. Otherwise do a tricky expression that both GCC and Clang happen to have recognize. Avoid the reduction case; instead require that the rotation be in range (this reverts 2b37c13dcf). Remove the asm rotations (making this branch illnamed), because now both Clang and GCC will create a roll without any extra help. Remove the reduction/mask by the word size for the variable case. The compiler can't optimize that it out well, but it's easy to ensure it is valid in the callers, especially now that the variable input cases are easy to grep for.
Diffstat (limited to 'src/tests/test_simd.cpp')
-rw-r--r--src/tests/test_simd.cpp32
1 files changed, 15 insertions, 17 deletions
diff --git a/src/tests/test_simd.cpp b/src/tests/test_simd.cpp
index 6da743514..1f192c6b6 100644
--- a/src/tests/test_simd.cpp
+++ b/src/tests/test_simd.cpp
@@ -42,23 +42,21 @@ class SIMD_32_Tests final : public Test
const Botan::SIMD_4x32 input(pat1, pat2, pat3, pat4);
- Botan::SIMD_4x32 rol = input;
- rol.rotate_left(3);
-
- test_eq(result, "rotate_left", rol,
- Botan::rotate_left(pat1, 3),
- Botan::rotate_left(pat2, 3),
- Botan::rotate_left(pat3, 3),
- Botan::rotate_left(pat4, 3));
-
- Botan::SIMD_4x32 ror = input;
- ror.rotate_right(9);
-
- test_eq(result, "rotate_right", ror,
- Botan::rotate_right(pat1, 9),
- Botan::rotate_right(pat2, 9),
- Botan::rotate_right(pat3, 9),
- Botan::rotate_right(pat4, 9));
+ Botan::SIMD_4x32 rol = input.rotl<3>();
+
+ test_eq(result, "rotl", rol,
+ Botan::rotl<3>(pat1),
+ Botan::rotl<3>(pat2),
+ Botan::rotl<3>(pat3),
+ Botan::rotl<3>(pat4));
+
+ Botan::SIMD_4x32 ror = input.rotr<9>();
+
+ test_eq(result, "rotr", ror,
+ Botan::rotr<9>(pat1),
+ Botan::rotr<9>(pat2),
+ Botan::rotr<9>(pat3),
+ Botan::rotr<9>(pat4));
Botan::SIMD_4x32 add = input + splat;
test_eq(result, "add +", add, pat1 + pat1, pat2 + pat1, pat3 + pat1, pat4 + pat1);