Merge pull request #1771 from jserv/update-sse2neon

Adopt new SSE2NEON and reduce ARM-specific changes
This commit is contained in:
xmrig 2020-07-11 02:32:56 +07:00 committed by GitHub
commit e5a2689052
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 4152 additions and 1527 deletions

View file

@ -33,7 +33,6 @@
#include "crypto/cn/CryptoNight_monero.h" #include "crypto/cn/CryptoNight_monero.h"
#include "crypto/cn/CryptoNight.h" #include "crypto/cn/CryptoNight.h"
#include "crypto/cn/soft_aes.h" #include "crypto/cn/soft_aes.h"
#include "crypto/common/portable/mm_malloc.h"
extern "C" extern "C"
@ -68,34 +67,6 @@ static inline void do_skein_hash(const uint8_t *input, size_t len, uint8_t *outp
void (* const extra_hashes[4])(const uint8_t *, size_t, uint8_t *) = {do_blake_hash, do_groestl_hash, do_jh_hash, do_skein_hash}; void (* const extra_hashes[4])(const uint8_t *, size_t, uint8_t *) = {do_blake_hash, do_groestl_hash, do_jh_hash, do_skein_hash};
static inline __attribute__((always_inline)) __m128i _mm_set_epi64x(const uint64_t a, const uint64_t b)
{
return vcombine_u64(vcreate_u64(b), vcreate_u64(a));
}
#if __ARM_FEATURE_CRYPTO
static inline __attribute__((always_inline)) __m128i _mm_aesenc_si128(__m128i v, __m128i rkey)
{
alignas(16) const __m128i zero = { 0 };
return veorq_u8(vaesmcq_u8(vaeseq_u8(v, zero)), rkey );
}
#else
static inline __attribute__((always_inline)) __m128i _mm_aesenc_si128(__m128i v, __m128i rkey)
{
alignas(16) const __m128i zero = { 0 };
return zero;
}
#endif
/* this one was not implemented yet so here it is */
static inline __attribute__((always_inline)) uint64_t _mm_cvtsi128_si64(__m128i a)
{
return vgetq_lane_u64(a, 0);
}
#if defined (__arm64__) || defined (__aarch64__) #if defined (__arm64__) || defined (__aarch64__)
static inline uint64_t __umul128(uint64_t a, uint64_t b, uint64_t* hi) static inline uint64_t __umul128(uint64_t a, uint64_t b, uint64_t* hi)
{ {

File diff suppressed because it is too large Load diff

View file

@ -28,7 +28,7 @@
#if defined(XMRIG_ARM) #if defined(XMRIG_ARM)
# include "crypto/cn/SSE2NEON.h" # include "crypto/cn/sse2neon.h"
#elif defined(__GNUC__) #elif defined(__GNUC__)
# include <x86intrin.h> # include <x86intrin.h>
#else #else

4151
src/crypto/cn/sse2neon.h Normal file

File diff suppressed because it is too large Load diff