piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 06:09:50 -06:00
Code Issues Packages Projects Releases Wiki Activity

crypto/sha1: simplify enablement of sha insns on non-msvc

Browse Source
This commit is contained in:
Shawn Hoffman
2022-08-02 23:05:07 -07:00
parent 4e6aa28da4
commit 78142e30cc
2 changed files with 3 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Source/Core/Common/CMakeLists.txt
View File

@ -139,6 +139,7 @@ add_library(common
if(NOT MSVC AND _M_ARM_64) if(NOT MSVC AND _M_ARM_64)
set_source_files_properties( set_source_files_properties(
Crypto/AES.cpp Crypto/AES.cpp
Crypto/SHA1.cpp
PROPERTIES COMPILE_FLAGS "-march=armv8-a+crypto") PROPERTIES COMPILE_FLAGS "-march=armv8-a+crypto")
endif() endif()

24
Source/Core/Common/Crypto/SHA1.cpp
View File

@ -19,14 +19,6 @@
#ifdef _M_X86_64 #ifdef _M_X86_64
#include <immintrin.h> #include <immintrin.h>
#elif defined(_M_ARM_64) #elif defined(_M_ARM_64)
#if defined(__clang__)
// This is a bit of a hack to get clang to accept the sha1 intrinsics without modifying cmdline
// flags. Note __ARM_FEATURE_CRYPTO is deprecated and "SHA2" flag is the lowest one which includes
// SHA1.
#define __ARM_FEATURE_SHA2
// ...needed for older clang before they made the switchover to more granular flags.
#define __ARM_FEATURE_CRYPTO
#endif
#include <arm_acle.h> #include <arm_acle.h>
#include <arm_neon.h> #include <arm_neon.h>
#endif #endif
@ -256,17 +248,6 @@ private:
#ifdef _M_ARM_64 #ifdef _M_ARM_64
// The armv8 flags are very annoying:
// clang inserts "+" prefixes itself, gcc does not.
// clang has deprecated "crypto" (removed in clang 13), gcc has not.
#ifdef _MSC_VER
#define TARGET_ARMV8_SHA1
#elif defined(__clang__)
#define TARGET_ARMV8_SHA1 [[gnu::target("sha2")]]
#elif defined(__GNUC__)
#define TARGET_ARMV8_SHA1 [[gnu::target("+crypto")]]
#endif
class ContextNeon final : public BlockContext class ContextNeon final : public BlockContext
{ {
public: public:
@ -287,7 +268,6 @@ private:
u32 e{}; u32 e{};
}; };
TARGET_ARMV8_SHA1
static inline uint32x4_t MsgSchedule(WorkBlock* wblock, size_t i) static inline uint32x4_t MsgSchedule(WorkBlock* wblock, size_t i)
{ {
auto& w = *wblock; auto& w = *wblock;
@ -299,7 +279,7 @@ private:
} }
template <size_t Func> template <size_t Func>
TARGET_ARMV8_SHA1 static inline constexpr uint32x4_t f(State state, uint32x4_t w) static inline constexpr uint32x4_t f(State state, uint32x4_t w)
{ {
const auto wk = vaddq_u32(w, vdupq_n_u32(K[Func])); const auto wk = vaddq_u32(w, vdupq_n_u32(K[Func]));
if constexpr (Func == 0) if constexpr (Func == 0)
@ -311,7 +291,7 @@ private:
} }
template <size_t Func> template <size_t Func>
TARGET_ARMV8_SHA1 static inline constexpr State FourRounds(State state, uint32x4_t w) static inline constexpr State FourRounds(State state, uint32x4_t w)
{ {
#ifdef _MSC_VER #ifdef _MSC_VER
// FIXME it seems the msvc optimizer gets a little too happy // FIXME it seems the msvc optimizer gets a little too happy