Revert back BMI2 support.

This commit is contained in:
XMRig 2017-04-21 12:05:28 +03:00
parent 8ab4c1c8bd
commit cad15069c8
3 changed files with 1 additions and 13 deletions

View file

@ -102,7 +102,6 @@ if (CMAKE_SIZEOF_VOID_P EQUAL 8)
set(CRYPTONIGHT64
algo/cryptonight/cryptonight_av1_aesni.c
algo/cryptonight/cryptonight_av2_aesni_stak.c
algo/cryptonight/cryptonight_av3_aesni_bmi2.c
algo/cryptonight/cryptonight_av4_softaes.c
algo/cryptonight/cryptonight_av5_aesni_experimental.c
)

View file

@ -29,15 +29,6 @@
#include "crypto/c_keccak.h"
#ifdef __GNUC__
static inline uint64_t _umul128(uint64_t a, uint64_t b, uint64_t* hi)
{
unsigned __int128 r = (unsigned __int128)a * (unsigned __int128)b;
*hi = r >> 64;
return (uint64_t)r;
}
#endif
#define aes_genkey_sub(imm8) \
__m128i xout1 = _mm_aeskeygenassist_si128(*xout2, (imm8)); \
xout1 = _mm_shuffle_epi32(xout1, 0xFF); \
@ -249,7 +240,7 @@ void cryptonight_av3_aesni_bmi2(void *restrict output, const void *restrict inpu
uint64_t hi, lo, cl, ch;
cl = ((uint64_t*)&l0[idx0 & 0x1FFFF0])[0];
ch = ((uint64_t*)&l0[idx0 & 0x1FFFF0])[1];
lo = _umul128(idx0, cl, &hi);
lo = _mulx_u64(idx0, cl, &hi);
al0 += hi;
ah0 += lo;

View file

@ -282,8 +282,6 @@ static void *miner_thread(void *userdata) {
uint32_t max_nonce;
uint32_t end_nonce = 0xffffffffU / opt_n_threads * (thr_id + 1) - 0x20;
applog(LOG_BLUE, "%d", sizeof(struct cryptonight_ctx));
struct cryptonight_ctx *persistentctx = (struct cryptonight_ctx *) create_persistent_ctx(thr_id);
if (cpu_info.count > 1 && opt_n_threads > 1 && opt_affinity != -1L) {