Skip to content

Commit

Permalink
Disabled VAES for cn/gpu
Browse files Browse the repository at this point in the history
  • Loading branch information
@MoneroOcean
MoneroOcean committed Dec 3, 2021
1 parent 615715e commit bdeb44e
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 13 deletions.
24 changes: 12 additions & 12 deletions src/crypto/cn/CryptoNight_x86.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@ static NOINLINE void cn_explode_scratchpad(cryptonight_ctx *ctx)
constexpr CnAlgo<ALGO> props;

# ifdef XMRIG_VAES
if (!SOFT_AES && !props.isHeavy() && cn_vaes_enabled) {
if (!SOFT_AES && !props.isHeavy() && ALGO != Algorithm::CN_GPU && cn_vaes_enabled) {
cn_explode_scratchpad_vaes(ctx, props.memory(), props.half_mem());
return;
}
Expand Down Expand Up @@ -409,7 +409,7 @@ static NOINLINE void cn_implode_scratchpad(cryptonight_ctx *ctx)
constexpr CnAlgo<ALGO> props;

# ifdef XMRIG_VAES
if (!SOFT_AES && !props.isHeavy() && cn_vaes_enabled) {
if (!SOFT_AES && !props.isHeavy() && ALGO != Algorithm::CN_GPU && cn_vaes_enabled) {
cn_implode_scratchpad_vaes(ctx, props.memory(), props.half_mem());
return;
}
Expand Down Expand Up @@ -1144,7 +1144,7 @@ inline void cryptonight_double_hash_asm(const uint8_t *__restrict__ input, size_
}

# ifdef XMRIG_VAES
if (!props.isHeavy() && cn_vaes_enabled) {
if (!props.isHeavy() && ALGO != Algorithm::CN_GPU && cn_vaes_enabled) {
cn_explode_scratchpad_vaes_double(ctx[0], ctx[1], props.memory(), props.half_mem());
}
else
Expand Down Expand Up @@ -1192,7 +1192,7 @@ inline void cryptonight_double_hash_asm(const uint8_t *__restrict__ input, size_
}

# ifdef XMRIG_VAES
if (!props.isHeavy() && cn_vaes_enabled) {
if (!props.isHeavy() && ALGO != Algorithm::CN_GPU && cn_vaes_enabled) {
cn_implode_scratchpad_vaes_double(ctx[0], ctx[1], props.memory(), props.half_mem());
}
else
Expand Down Expand Up @@ -1272,7 +1272,7 @@ static NOINLINE void cryptonight_double_hash_gr_sse41(const uint8_t *__restrict_
}

# ifdef XMRIG_VAES
if (!props.isHeavy() && cn_vaes_enabled) {
if (!props.isHeavy() && ALGO != Algorithm::CN_GPU && cn_vaes_enabled) {
cn_explode_scratchpad_vaes_double(ctx[0], ctx[1], props.memory(), props.half_mem());
}
else
Expand All @@ -1298,7 +1298,7 @@ static NOINLINE void cryptonight_double_hash_gr_sse41(const uint8_t *__restrict_
if (ALGO == Algorithm::CN_GR_5) cn_gr5_double_mainloop_asm(ctx);

# ifdef XMRIG_VAES
if (!props.isHeavy() && cn_vaes_enabled) {
if (!props.isHeavy() && ALGO != Algorithm::CN_GPU && cn_vaes_enabled) {
cn_implode_scratchpad_vaes_double(ctx[0], ctx[1], props.memory(), props.half_mem());
}
else
Expand Down Expand Up @@ -1378,7 +1378,7 @@ inline void cryptonight_double_hash(const uint8_t *__restrict__ input, size_t si
}

# ifdef XMRIG_VAES
if (!SOFT_AES && !props.isHeavy() && cn_vaes_enabled) {
if (!SOFT_AES && !props.isHeavy() && ALGO != Algorithm::CN_GPU && cn_vaes_enabled) {
cn_explode_scratchpad_vaes_double(ctx[0], ctx[1], props.memory(), props.half_mem());
}
else
Expand Down Expand Up @@ -1582,7 +1582,7 @@ inline void cryptonight_double_hash(const uint8_t *__restrict__ input, size_t si
}

# ifdef XMRIG_VAES
if (!SOFT_AES && !props.isHeavy() && cn_vaes_enabled) {
if (!SOFT_AES && !props.isHeavy() && ALGO != Algorithm::CN_GPU && cn_vaes_enabled) {
cn_implode_scratchpad_vaes_double(ctx[0], ctx[1], props.memory(), props.half_mem());
}
else
Expand Down Expand Up @@ -1625,7 +1625,7 @@ static NOINLINE void cryptonight_quad_hash_gr_sse41(const uint8_t* __restrict__
}

# ifdef XMRIG_VAES
if (!props.isHeavy() && cn_vaes_enabled) {
if (!props.isHeavy() && ALGO != Algorithm::CN_GPU && cn_vaes_enabled) {
cn_explode_scratchpad_vaes_double(ctx[0], ctx[1], props.memory(), props.half_mem());
cn_explode_scratchpad_vaes_double(ctx[2], ctx[3], props.memory(), props.half_mem());
}
Expand Down Expand Up @@ -1653,7 +1653,7 @@ static NOINLINE void cryptonight_quad_hash_gr_sse41(const uint8_t* __restrict__
if (ALGO == Algorithm::CN_GR_5) cn_gr5_quad_mainloop_asm(ctx);

# ifdef XMRIG_VAES
if (!props.isHeavy() && cn_vaes_enabled) {
if (!props.isHeavy() && ALGO != Algorithm::CN_GPU && cn_vaes_enabled) {
cn_implode_scratchpad_vaes_double(ctx[0], ctx[1], props.memory(), props.half_mem());
cn_implode_scratchpad_vaes_double(ctx[2], ctx[3], props.memory(), props.half_mem());
}
Expand Down Expand Up @@ -1918,7 +1918,7 @@ inline void cryptonight_quad_hash(const uint8_t *__restrict__ input, size_t size
}

# ifdef XMRIG_VAES
if (!SOFT_AES && !props.isHeavy() && cn_vaes_enabled) {
if (!SOFT_AES && !props.isHeavy() && ALGO != Algorithm::CN_GPU && cn_vaes_enabled) {
cn_explode_scratchpad_vaes_double(ctx[0], ctx[1], props.memory(), props.half_mem());
cn_explode_scratchpad_vaes_double(ctx[2], ctx[3], props.memory(), props.half_mem());
}
Expand Down Expand Up @@ -1981,7 +1981,7 @@ inline void cryptonight_quad_hash(const uint8_t *__restrict__ input, size_t size
}

# ifdef XMRIG_VAES
if (!SOFT_AES && !props.isHeavy() && cn_vaes_enabled) {
if (!SOFT_AES && !props.isHeavy() && ALGO != Algorithm::CN_GPU && cn_vaes_enabled) {
cn_implode_scratchpad_vaes_double(ctx[0], ctx[1], props.memory(), props.half_mem());
cn_implode_scratchpad_vaes_double(ctx[2], ctx[3], props.memory(), props.half_mem());
}
Expand Down
2 changes: 1 addition & 1 deletion src/version.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#define APP_ID "xmrig"
#define APP_NAME "XMRig"
#define APP_DESC "XMRig miner"
#define APP_VERSION "6.16.2-mo1"
#define APP_VERSION "6.16.2-mo2"
#define APP_DOMAIN "xmrig.com"
#define APP_SITE "www.xmrig.com"
#define APP_COPYRIGHT "Copyright (C) 2016-2021 xmrig.com"
Expand Down

0 comments on commit bdeb44e

Please sign in to comment.