Cleanup header includes for SSE
Travis is failing because the system headers don't guard their functions and datatypess properlypull/703/head
parent
2876371cea
commit
3e55bfca7d
|
|
@ -15,7 +15,6 @@
|
||||||
// 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.
|
||||||
// #undef CRYPTOPP_SSSE3_AVAILABLE
|
// #undef CRYPTOPP_SSSE3_AVAILABLE
|
||||||
// #undef CRYPTOPP_SSE41_AVAILABLE
|
|
||||||
// #undef CRYPTOPP_ARM_NEON_AVAILABLE
|
// #undef CRYPTOPP_ARM_NEON_AVAILABLE
|
||||||
|
|
||||||
#if (CRYPTOPP_SSSE3_AVAILABLE)
|
#if (CRYPTOPP_SSSE3_AVAILABLE)
|
||||||
|
|
@ -23,10 +22,6 @@
|
||||||
# include <tmmintrin.h>
|
# include <tmmintrin.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if (CRYPTOPP_SSE41_AVAILABLE)
|
|
||||||
# include <smmintrin.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if defined(__AVX512F__) && defined(__AVX512VL__)
|
#if defined(__AVX512F__) && defined(__AVX512VL__)
|
||||||
# define CRYPTOPP_AVX512_ROTATE 1
|
# define CRYPTOPP_AVX512_ROTATE 1
|
||||||
# include <immintrin.h>
|
# include <immintrin.h>
|
||||||
|
|
|
||||||
|
|
@ -14,7 +14,6 @@
|
||||||
|
|
||||||
// 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.
|
||||||
// #undef CRYPTOPP_SSSE3_AVAILABLE
|
|
||||||
// #undef CRYPTOPP_SSE41_AVAILABLE
|
// #undef CRYPTOPP_SSE41_AVAILABLE
|
||||||
// #undef CRYPTOPP_ARM_NEON_AVAILABLE
|
// #undef CRYPTOPP_ARM_NEON_AVAILABLE
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -15,7 +15,6 @@
|
||||||
// Uncomment for benchmarking C++ against SSE or NEON.
|
// Uncomment for benchmarking C++ against SSE or NEON.
|
||||||
// Do so in both speck.cpp and speck-simd.cpp.
|
// Do so in both speck.cpp and speck-simd.cpp.
|
||||||
// #undef CRYPTOPP_SSSE3_AVAILABLE
|
// #undef CRYPTOPP_SSSE3_AVAILABLE
|
||||||
// #undef CRYPTOPP_SSE41_AVAILABLE
|
|
||||||
// #undef CRYPTOPP_ARM_NEON_AVAILABLE
|
// #undef CRYPTOPP_ARM_NEON_AVAILABLE
|
||||||
|
|
||||||
#if (CRYPTOPP_SSSE3_AVAILABLE)
|
#if (CRYPTOPP_SSSE3_AVAILABLE)
|
||||||
|
|
@ -23,10 +22,6 @@
|
||||||
# include <tmmintrin.h>
|
# include <tmmintrin.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if (CRYPTOPP_SSE41_AVAILABLE)
|
|
||||||
# include <smmintrin.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if defined(__AVX512F__) && defined(__AVX512VL__)
|
#if defined(__AVX512F__) && defined(__AVX512VL__)
|
||||||
# define CRYPTOPP_AVX512_ROTATE 1
|
# define CRYPTOPP_AVX512_ROTATE 1
|
||||||
# include <immintrin.h>
|
# include <immintrin.h>
|
||||||
|
|
|
||||||
|
|
@ -14,7 +14,6 @@
|
||||||
|
|
||||||
// Uncomment for benchmarking C++ against SSE or NEON.
|
// Uncomment for benchmarking C++ against SSE or NEON.
|
||||||
// Do so in both speck.cpp and speck-simd.cpp.
|
// Do so in both speck.cpp and speck-simd.cpp.
|
||||||
// #undef CRYPTOPP_SSSE3_AVAILABLE
|
|
||||||
// #undef CRYPTOPP_SSE41_AVAILABLE
|
// #undef CRYPTOPP_SSE41_AVAILABLE
|
||||||
// #undef CRYPTOPP_ARM_NEON_AVAILABLE
|
// #undef CRYPTOPP_ARM_NEON_AVAILABLE
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue