From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Fri, 15 Nov 2019 12:20:46 +0000 (+0000)
Subject: [Minor] Move CPU detection out of the cryptobox module
X-Git-Tag: 2.2~37
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=177d37b1abe692ebb5d0284d7b6fd49cab3b0ad2;p=rspamd.git

[Minor] Move CPU detection out of the cryptobox module
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 58d0daa87..51e0db3c2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -65,14 +65,117 @@ OPTION(ENABLE_LUA_REPL     "Enables Lua repl (requires C++11 compiler) [default:
 OPTION(ENABLE_BLAS         "Enables libopenblas support [default: OFF]" OFF)
 
 
-INCLUDE(FindArch)
-TARGET_ARCHITECTURE(ARCH)
+############################# INCLUDE SECTION #############################################
 
+INCLUDE(CheckIncludeFiles)
+INCLUDE(CheckFunctionExists)
+INCLUDE(CheckSymbolExists)
+INCLUDE(CheckCSourceCompiles)
+INCLUDE(CheckCSourceRuns)
+INCLUDE(CheckLibraryExists)
+INCLUDE(CheckCCompilerFlag)
+INCLUDE(CMakeParseArguments)
+INCLUDE(FindArch)
+INCLUDE(AsmOp)
 INCLUDE(FindRagel)
 IF(NOT RAGEL_FOUND)
 	MESSAGE(FATAL_ERROR "Ragel is required to build rspamd")
 ENDIF()
 
+FIND_PACKAGE(PkgConfig REQUIRED)
+FIND_PACKAGE(Perl REQUIRED)
+
+TARGET_ARCHITECTURE(ARCH)
+
+SET(ASM_CODE "
+	.macro TEST1 op
+	\\op %eax, %eax
+	.endm
+	TEST1 xorl
+	")
+ASM_OP(HAVE_SLASHMACRO "slash macro convention")
+
+SET(ASM_CODE "
+	.macro TEST1 op
+	$0 %eax, %eax
+	.endm
+	TEST1 xorl
+	")
+ASM_OP(HAVE_DOLLARMACRO "dollar macro convention")
+
+# For now we support only x86_64 architecture with optimizations
+IF("${ARCH}" STREQUAL "x86_64")
+	IF(NOT HAVE_SLASHMACRO AND NOT HAVE_DOLLARMACRO)
+		MESSAGE(FATAL_ERROR "Your assembler cannot compile macros, please check your CMakeFiles/CMakeError.log")
+	ENDIF()
+
+	SET(ASM_CODE "vpaddq %ymm0, %ymm0, %ymm0")
+	ASM_OP(HAVE_AVX2 "avx2")
+	# Handle broken compilers, sigh...
+	IF(HAVE_AVX2)
+		CHECK_C_SOURCE_COMPILES(
+				"
+#include <stddef.h>
+#pragma GCC push_options
+#pragma GCC target(\"avx2\")
+#ifndef __SSE2__
+#define __SSE2__
+#endif
+#ifndef __SSE__
+#define __SSE__
+#endif
+#ifndef __SSE4_2__
+#define __SSE4_2__
+#endif
+#ifndef __SSE4_1__
+#define __SSE4_1__
+#endif
+#ifndef __SSEE3__
+#define __SSEE3__
+#endif
+#ifndef __AVX__
+#define __AVX__
+#endif
+#ifndef __AVX2__
+#define __AVX2__
+#endif
+
+#ifndef __clang__
+#if __GNUC__ < 6
+#error Broken due to compiler bug
+#endif
+#endif
+
+#include <immintrin.h>
+static void foo(const char* a) __attribute__((__target__(\"avx2\")));
+static void foo(const char* a)
+{
+	__m256i str = _mm256_loadu_si256((__m256i *)a);
+	__m256i t = _mm256_loadu_si256((__m256i *)a + 1);
+	_mm256_add_epi8(str, t);
+}
+int main(int argc, char** argv) {
+	foo(argv[0]);
+}" HAVE_AVX2_C_COMPILER)
+		IF(NOT HAVE_AVX2_C_COMPILER)
+			MESSAGE(STATUS "Your compiler has broken AVX2 support")
+			UNSET(HAVE_AVX2 CACHE)
+		ENDIF()
+	ENDIF()
+	SET(ASM_CODE "vpaddq %xmm0, %xmm0, %xmm0")
+	ASM_OP(HAVE_AVX "avx")
+	SET(ASM_CODE "pmuludq %xmm0, %xmm0")
+	ASM_OP(HAVE_SSE2 "sse2")
+	SET(ASM_CODE "lddqu 0(%esi), %xmm0")
+	ASM_OP(HAVE_SSE3 "sse3")
+	SET(ASM_CODE "pshufb %xmm0, %xmm0")
+	ASM_OP(HAVE_SSSE3 "ssse3")
+	SET(ASM_CODE "pblendw \$0, %xmm0, %xmm0")
+	ASM_OP(HAVE_SSE41 "sse41")
+	SET(ASM_CODE "crc32 %eax, %eax")
+	ASM_OP(HAVE_SSE42 "sse42")
+ENDIF()
+
 IF (NOT "${ARCH}" STREQUAL "x86_64")
 	MESSAGE(STATUS "Hyperscan support is possible only for x86_64 architecture")
 	SET(ENABLE_HYPERSCAN "OFF")
@@ -200,20 +303,6 @@ ELSE(ENABLE_STATIC MATCHES "ON")
 	ENDIF (NO_SHARED MATCHES "OFF")
 ENDIF (ENABLE_STATIC MATCHES "ON")
 
-############################# INCLUDE SECTION #############################################
-
-INCLUDE(CheckIncludeFiles)
-INCLUDE(CheckFunctionExists)
-INCLUDE(CheckSymbolExists)
-INCLUDE(CheckCSourceCompiles)
-INCLUDE(CheckCSourceRuns)
-INCLUDE(CheckLibraryExists)
-INCLUDE(CheckCCompilerFlag)
-INCLUDE(CMakeParseArguments)
-
-FIND_PACKAGE(PkgConfig REQUIRED)
-FIND_PACKAGE(Perl REQUIRED)
-
 ############################# MACRO SECTION #############################################
 
 # Find lua installation
diff --git a/src/libcryptobox/CMakeLists.txt b/src/libcryptobox/CMakeLists.txt
index beeeb1eec..86e44e83c 100644
--- a/src/libcryptobox/CMakeLists.txt
+++ b/src/libcryptobox/CMakeLists.txt
@@ -1,102 +1,9 @@
-INCLUDE(AsmOp)
-
-TARGET_ARCHITECTURE(ARCH)
-
 SET(CHACHASRC ${CMAKE_CURRENT_SOURCE_DIR}/chacha20/chacha.c
 	${CMAKE_CURRENT_SOURCE_DIR}/chacha20/ref.c)
 
 SET(BASE64SRC ${CMAKE_CURRENT_SOURCE_DIR}/base64/ref.c
 		${CMAKE_CURRENT_SOURCE_DIR}/base64/base64.c)
 
-SET(ASM_CODE "
-	.macro TEST1 op
-	\\op %eax, %eax
-	.endm
-	TEST1 xorl
-	")
-ASM_OP(HAVE_SLASHMACRO "slash macro convention")
-
-SET(ASM_CODE "
-	.macro TEST1 op
-	$0 %eax, %eax
-	.endm
-	TEST1 xorl
-	")
-ASM_OP(HAVE_DOLLARMACRO "dollar macro convention")
-
-# For now we support only x86_64 architecture with optimizations
-IF("${ARCH}" STREQUAL "x86_64")
-	IF(NOT HAVE_SLASHMACRO AND NOT HAVE_DOLLARMACRO)
-		MESSAGE(FATAL_ERROR "Your assembler cannot compile macros, please check your CMakeFiles/CMakeError.log")
-	ENDIF()
-
-	SET(ASM_CODE "vpaddq %ymm0, %ymm0, %ymm0")
-	ASM_OP(HAVE_AVX2 "avx2")
-	# Handle broken compilers, sigh...
-	IF(HAVE_AVX2)
-		CHECK_C_SOURCE_COMPILES(
-"
-#include <stddef.h>
-#pragma GCC push_options
-#pragma GCC target(\"avx2\")
-#ifndef __SSE2__
-#define __SSE2__
-#endif
-#ifndef __SSE__
-#define __SSE__
-#endif
-#ifndef __SSE4_2__
-#define __SSE4_2__
-#endif
-#ifndef __SSE4_1__
-#define __SSE4_1__
-#endif
-#ifndef __SSEE3__
-#define __SSEE3__
-#endif
-#ifndef __AVX__
-#define __AVX__
-#endif
-#ifndef __AVX2__
-#define __AVX2__
-#endif
-
-#ifndef __clang__
-#if __GNUC__ < 6
-#error Broken due to compiler bug
-#endif
-#endif
-
-#include <immintrin.h>
-static void foo(const char* a) __attribute__((__target__(\"avx2\")));
-static void foo(const char* a)
-{
-	__m256i str = _mm256_loadu_si256((__m256i *)a);
-	__m256i t = _mm256_loadu_si256((__m256i *)a + 1);
-	_mm256_add_epi8(str, t);
-}
-int main(int argc, char** argv) {
-	foo(argv[0]);
-}" HAVE_AVX2_C_COMPILER)
-		IF(NOT HAVE_AVX2_C_COMPILER)
-			MESSAGE(STATUS "Your compiler has broken AVX2 support")
-			UNSET(HAVE_AVX2 CACHE)
-		ENDIF()
-	ENDIF()
-	SET(ASM_CODE "vpaddq %xmm0, %xmm0, %xmm0")
-	ASM_OP(HAVE_AVX "avx")
-	SET(ASM_CODE "pmuludq %xmm0, %xmm0")
-	ASM_OP(HAVE_SSE2 "sse2")
-	SET(ASM_CODE "lddqu 0(%esi), %xmm0")
-	ASM_OP(HAVE_SSE3 "sse3")
-	SET(ASM_CODE "pshufb %xmm0, %xmm0")
-	ASM_OP(HAVE_SSSE3 "ssse3")
-	SET(ASM_CODE "pblendw \$0, %xmm0, %xmm0")
-	ASM_OP(HAVE_SSE41 "sse41")
-	SET(ASM_CODE "crc32 %eax, %eax")
-	ASM_OP(HAVE_SSE42 "sse42")
-ENDIF()
-
 IF(HAVE_AVX2)
 	SET(CHACHASRC ${CHACHASRC} ${CMAKE_CURRENT_SOURCE_DIR}/chacha20/avx2.S)
 	SET(BASE64SRC ${BASE64SRC} ${CMAKE_CURRENT_SOURCE_DIR}/base64/avx2.c)