arne
/
cryptopp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix SIMON build when SSSE3 not available

pull/769/head
Jeffrey Walton 2018-12-29 00:48:12 -05:00
parent a9bd504b2f
commit 58772f3491
No known key found for this signature in database
GPG Key ID: B36AB348921B1838
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
simon128_simd.cpp
View File

@ -10,7 +10,6 @@
#include "simon.h" #include "simon.h"
#include "misc.h" #include "misc.h"
#include "adv_simd.h"
// Uncomment for benchmarking C++ against SSE or NEON. // Uncomment for benchmarking C++ against SSE or NEON.
// Do so in both simon.cpp and simon-simd.cpp. // Do so in both simon.cpp and simon-simd.cpp.
@ -18,6 +17,7 @@
// #undef CRYPTOPP_ARM_NEON_AVAILABLE // #undef CRYPTOPP_ARM_NEON_AVAILABLE
#if (CRYPTOPP_SSSE3_AVAILABLE) #if (CRYPTOPP_SSSE3_AVAILABLE)
# include "adv_simd.h"
# include <pmmintrin.h> # include <pmmintrin.h>
# include <tmmintrin.h> # include <tmmintrin.h>
#endif #endif
@ -26,12 +26,13 @@
# include <ammintrin.h> # include <ammintrin.h>
#endif #endif
#if defined(__AVX512F__) && defined(__AVX512VL__) #if defined(__AVX512F__)
# define CRYPTOPP_AVX512_ROTATE 1 # define CRYPTOPP_AVX512_ROTATE 1
# include <immintrin.h> # include <immintrin.h>
#endif #endif
#if (CRYPTOPP_ARM_NEON_AVAILABLE) #if (CRYPTOPP_ARM_NEON_AVAILABLE)
# include "adv_simd.h"
# include <arm_neon.h> # include <arm_neon.h>
#endif #endif
@ -43,6 +44,7 @@
#endif #endif
#if defined(CRYPTOPP_POWER7_AVAILABLE) #if defined(CRYPTOPP_POWER7_AVAILABLE)
# include "adv_simd.h"
# include "ppc_simd.h" # include "ppc_simd.h"
#endif #endif

6
simon64_simd.cpp
View File

@ -10,7 +10,6 @@
#include "simon.h" #include "simon.h"
#include "misc.h" #include "misc.h"
#include "adv_simd.h"
// Uncomment for benchmarking C++ against SSE or NEON. // Uncomment for benchmarking C++ against SSE or NEON.
// Do so in both simon.cpp and simon-simd.cpp. // Do so in both simon.cpp and simon-simd.cpp.
@ -18,6 +17,7 @@
// #undef CRYPTOPP_ARM_NEON_AVAILABLE // #undef CRYPTOPP_ARM_NEON_AVAILABLE
#if (CRYPTOPP_SSSE3_AVAILABLE) #if (CRYPTOPP_SSSE3_AVAILABLE)
# include "adv_simd.h"
# include <pmmintrin.h> # include <pmmintrin.h>
# include <tmmintrin.h> # include <tmmintrin.h>
#endif #endif
@ -30,12 +30,13 @@
# include <ammintrin.h> # include <ammintrin.h>
#endif #endif
#if defined(__AVX512F__) && defined(__AVX512VL__) #if defined(__AVX512F__)
# define CRYPTOPP_AVX512_ROTATE 1 # define CRYPTOPP_AVX512_ROTATE 1
# include <immintrin.h> # include <immintrin.h>
#endif #endif
#if (CRYPTOPP_ARM_NEON_AVAILABLE) #if (CRYPTOPP_ARM_NEON_AVAILABLE)
# include "adv_simd.h"
# include <arm_neon.h> # include <arm_neon.h>
#endif #endif
@ -47,6 +48,7 @@
#endif #endif
#if defined(CRYPTOPP_ALTIVEC_AVAILABLE) #if defined(CRYPTOPP_ALTIVEC_AVAILABLE)
# include "adv_simd.h"
# include "ppc_simd.h" # include "ppc_simd.h"
#endif #endif