From 49fd9c41d0269aa75ff40992f60a4a253bc9b852 Mon Sep 17 00:00:00 2001 From: Alexey Milovidov Date: Mon, 16 Dec 2019 04:21:09 +0300 Subject: [PATCH] Fixed performance test --- contrib/openssl-cmake/CMakeLists.txt | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/contrib/openssl-cmake/CMakeLists.txt b/contrib/openssl-cmake/CMakeLists.txt index 3a95b6abf28..6e3e823fc37 100644 --- a/contrib/openssl-cmake/CMakeLists.txt +++ b/contrib/openssl-cmake/CMakeLists.txt @@ -21,7 +21,8 @@ set(OPENSSL_MODULESDIR "/usr/local/lib/ossl-modules" CACHE PATH "Set the default add_definitions(-DOPENSSLDIR="${OPENSSLDIR}" -DENGINESDIR="${OPENSSL_ENGINESDIR}" -DMODULESDIR="${OPENSSL_MODULESDIR}") if(ARCH_AMD64) - add_definitions(-DAES_ASM -DBSAES_ASM -DECP_NISTZ256_ASM -DGHASH_ASM -DKECCAK1600_ASM -DMD5_ASM -DOPENSSL_BN_ASM_GF2m -DOPENSSL_BN_ASM_MONT -DOPENSSL_BN_ASM_MONT5 -DOPENSSL_CPUID_OBJ -DOPENSSL_IA32_SSE2 -DPOLY1305_ASM -DSHA1_ASM -DSHA256_ASM -DSHA512_ASM -DVPAES_ASM -DWHIRLPOOL_ASM -DX25519_ASM -DOPENSSL_USE_NODELETE -DL_ENDIAN) + # -DSHA256_ASM was removed because it doesn't work with asynchronous unwind (query profiler) for unknown reason. + add_definitions(-DAES_ASM -DBSAES_ASM -DECP_NISTZ256_ASM -DGHASH_ASM -DKECCAK1600_ASM -DMD5_ASM -DOPENSSL_BN_ASM_GF2m -DOPENSSL_BN_ASM_MONT -DOPENSSL_BN_ASM_MONT5 -DOPENSSL_CPUID_OBJ -DOPENSSL_IA32_SSE2 -DPOLY1305_ASM -DSHA1_ASM -DSHA512_ASM -DVPAES_ASM -DWHIRLPOOL_ASM -DX25519_ASM -DOPENSSL_USE_NODELETE -DL_ENDIAN) elseif(ARCH_AARCH64) add_definitions(-DECP_NISTZ256_ASM -DKECCAK1600_ASM -DOPENSSL_BN_ASM_MONT -DOPENSSL_CPUID_OBJ -DPOLY1305_ASM -DSHA1_ASM -DSHA256_ASM -DSHA512_ASM -DVPAES_ASM -DOPENSSL_USE_NODELETE -DL_ENDIAN) endif() @@ -910,7 +911,10 @@ if (ARCH_AMD64) ${OPENSSL_BINARY_DIR}/crypto/sha/sha1-mb-x86_64.s ${OPENSSL_BINARY_DIR}/crypto/sha/sha1-x86_64.s ${OPENSSL_BINARY_DIR}/crypto/sha/sha256-mb-x86_64.s - ${OPENSSL_BINARY_DIR}/crypto/sha/sha256-x86_64.s + + #${OPENSSL_BINARY_DIR}/crypto/sha/sha256-x86_64.s + ${OPENSSL_SOURCE_DIR}/crypto/sha/sha256.c + ${OPENSSL_BINARY_DIR}/crypto/sha/sha512-x86_64.s ${OPENSSL_BINARY_DIR}/crypto/whrlpool/wp-x86_64.s) elseif (ARCH_AARCH64)