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

Cleanup SIMON64 and SPECK64 flags in Makefile (GH #834)

pull/838/head
Jeffrey Walton 2019-05-16 18:57:57 -04:00
parent edc0952b25
commit b25b6f0892
No known key found for this signature in database
GPG Key ID: B36AB348921B1838
4 changed files with 2 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
GNUmakefile
View File

@ -275,9 +275,7 @@ ifeq ($(DETECT_FEATURES),1)
KECCAK_FLAG = $(SSSE3_FLAG) KECCAK_FLAG = $(SSSE3_FLAG)
LEA_FLAG = $(SSSE3_FLAG) LEA_FLAG = $(SSSE3_FLAG)
SIMECK_FLAG = $(SSSE3_FLAG) SIMECK_FLAG = $(SSSE3_FLAG)
SIMON64_FLAG = $(SSSE3_FLAG)
SIMON128_FLAG = $(SSSE3_FLAG) SIMON128_FLAG = $(SSSE3_FLAG)
SPECK64_FLAG = $(SSSE3_FLAG)
SPECK128_FLAG = $(SSSE3_FLAG) SPECK128_FLAG = $(SSSE3_FLAG)
SUN_LDFLAGS += $(SSSE3_FLAG) SUN_LDFLAGS += $(SSSE3_FLAG)
else else

2
GNUmakefile-cross
View File

@ -227,9 +227,7 @@ ifeq ($(DETECT_FEATURES),1)
CHAM_FLAG = $(SSSE3_FLAG) CHAM_FLAG = $(SSSE3_FLAG)
LEA_FLAG = $(SSSE3_FLAG) LEA_FLAG = $(SSSE3_FLAG)
SIMECK_FLAG = $(SSSE3_FLAG) SIMECK_FLAG = $(SSSE3_FLAG)
SIMON64_FLAG = $(SSSE3_FLAG)
SIMON128_FLAG = $(SSSE3_FLAG) SIMON128_FLAG = $(SSSE3_FLAG)
SPECK64_FLAG = $(SSSE3_FLAG)
SPECK128_FLAG = $(SSSE3_FLAG) SPECK128_FLAG = $(SSSE3_FLAG)
else else
SSSE3_FLAG = SSSE3_FLAG =

10
simon64_simd.cpp
View File

@ -16,13 +16,10 @@
// #undef CRYPTOPP_SSE41_AVAILABLE // #undef CRYPTOPP_SSE41_AVAILABLE
// #undef CRYPTOPP_ARM_NEON_AVAILABLE // #undef CRYPTOPP_ARM_NEON_AVAILABLE
#if (CRYPTOPP_SSSE3_AVAILABLE) #if (CRYPTOPP_SSE41_AVAILABLE)
# include "adv_simd.h" # include "adv_simd.h"
# include <pmmintrin.h> # include <pmmintrin.h>
# include <tmmintrin.h> # include <tmmintrin.h>
#endif
#if (CRYPTOPP_SSE41_AVAILABLE)
# include <smmintrin.h> # include <smmintrin.h>
#endif #endif
@ -30,11 +27,6 @@
# include <ammintrin.h> # include <ammintrin.h>
#endif #endif
#if defined(__AVX512F__)
# define CRYPTOPP_AVX512_ROTATE 1
# include <immintrin.h>
#endif
// C1189: error: This header is specific to ARM targets // C1189: error: This header is specific to ARM targets
#if (CRYPTOPP_ARM_NEON_AVAILABLE) #if (CRYPTOPP_ARM_NEON_AVAILABLE)
# include "adv_simd.h" # include "adv_simd.h"

10
speck64_simd.cpp
View File

@ -16,13 +16,10 @@
// #undef CRYPTOPP_SSE41_AVAILABLE // #undef CRYPTOPP_SSE41_AVAILABLE
// #undef CRYPTOPP_ARM_NEON_AVAILABLE // #undef CRYPTOPP_ARM_NEON_AVAILABLE
#if (CRYPTOPP_SSSE3_AVAILABLE) #if (CRYPTOPP_SSE41_AVAILABLE)
# include "adv_simd.h" # include "adv_simd.h"
# include <pmmintrin.h> # include <pmmintrin.h>
# include <tmmintrin.h> # include <tmmintrin.h>
#endif
#if (CRYPTOPP_SSE41_AVAILABLE)
# include <smmintrin.h> # include <smmintrin.h>
#endif #endif
@ -30,11 +27,6 @@
# include <ammintrin.h> # include <ammintrin.h>
#endif #endif
#if defined(__AVX512F__)
# define CRYPTOPP_AVX512_ROTATE 1
# include <immintrin.h>
#endif
// C1189: error: This header is specific to ARM targets // C1189: error: This header is specific to ARM targets
#if (CRYPTOPP_ARM_NEON_AVAILABLE) #if (CRYPTOPP_ARM_NEON_AVAILABLE)
# include "adv_simd.h" # include "adv_simd.h"