1
0
mirror of https://github.com/xmrig/xmrig.git synced 2026-06-29 22:12:39 -04:00

Compare commits

...

3 Commits

Author SHA1 Message Date
MoneroOcean b6a93022f7 Fixed KCN algo 2024-06-01 11:18:15 +03:00
MoneroOcean 95d6482e2f Revert "Separate input/output flex_hash memory"
This reverts commit 2d1d781efa.
2024-06-01 11:17:57 +03:00
MoneroOcean 9d8e9add07 Fixed KCN algo 2024-06-01 11:17:47 +03:00
4 changed files with 6 additions and 6 deletions
+3
View File
@@ -36,6 +36,7 @@
#include "crypto/common/VirtualMemory.h" #include "crypto/common/VirtualMemory.h"
#include "crypto/rx/Rx.h" #include "crypto/rx/Rx.h"
#include "crypto/rx/RxDataset.h" #include "crypto/rx/RxDataset.h"
#include "crypto/ghostrider/sph_keccak.h"
#ifdef XMRIG_FEATURE_API #ifdef XMRIG_FEATURE_API
@@ -359,6 +360,8 @@ void xmrig::CpuBackend::setJob(const Job &job)
d_ptr->algo = job.algorithm(); d_ptr->algo = job.algorithm();
d_ptr->profileName = cpu.threads().profileName(job.algorithm()); d_ptr->profileName = cpu.threads().profileName(job.algorithm());
hard_coded_eb = (d_ptr->algo.id() != Algorithm::FLEX_KCN) ? 1 : 6;
if (d_ptr->profileName.isNull() || threads.empty()) { if (d_ptr->profileName.isNull() || threads.empty()) {
LOG_WARN("%s " RED_BOLD("disabled") YELLOW(" (no suitable configuration found)"), Tags::cpu()); LOG_WARN("%s " RED_BOLD("disabled") YELLOW(" (no suitable configuration found)"), Tags::cpu());
-2
View File
@@ -37,7 +37,6 @@
#include "crypto/rx/RxDataset.h" #include "crypto/rx/RxDataset.h"
#include "crypto/rx/RxVm.h" #include "crypto/rx/RxVm.h"
#include "crypto/ghostrider/ghostrider.h" #include "crypto/ghostrider/ghostrider.h"
#include "crypto/ghostrider/sph_keccak.h"
#include "crypto/flex/flex.h" #include "crypto/flex/flex.h"
#include "net/JobResults.h" #include "net/JobResults.h"
@@ -101,7 +100,6 @@ xmrig::CpuWorker<N>::CpuWorker(size_t id, const CpuLaunchData &data) :
# ifdef XMRIG_ALGO_GHOSTRIDER # ifdef XMRIG_ALGO_GHOSTRIDER
m_ghHelper = ghostrider::create_helper_thread(affinity(), data.priority, data.affinities); m_ghHelper = ghostrider::create_helper_thread(affinity(), data.priority, data.affinities);
hard_coded_eb = (m_algorithm.id() != Algorithm::FLEX_KCN) ? 1 : 6;
# endif # endif
} }
+2 -3
View File
@@ -120,7 +120,7 @@ void SwapBytes(void *pv, unsigned int n)
} }
void flex_hash(const char* input, char* output, cryptonight_ctx** ctx) { void flex_hash(const char* input, char* output, cryptonight_ctx** ctx) {
uint32_t hash[64/4], hash2[64/4]; uint32_t hash[64/4];
sph_blake512_context ctx_blake; sph_blake512_context ctx_blake;
sph_bmw512_context ctx_bmw; sph_bmw512_context ctx_bmw;
sph_groestl512_context ctx_groestl; sph_groestl512_context ctx_groestl;
@@ -289,8 +289,7 @@ void flex_hash(const char* input, char* output, cryptonight_ctx** ctx) {
sph_whirlpool_close(&ctx_whirlpool, hash); sph_whirlpool_close(&ctx_whirlpool, hash);
break; break;
} }
memcpy(hash2, hash, 64); in = (void*) hash;
in = (void*) hash2;
size = 64; size = 64;
} }
sph_keccak256_init(&ctx_keccak); sph_keccak256_init(&ctx_keccak);
+1 -1
View File
@@ -22,7 +22,7 @@
#define APP_ID "xmrig" #define APP_ID "xmrig"
#define APP_NAME "XMRig" #define APP_NAME "XMRig"
#define APP_DESC "XMRig miner" #define APP_DESC "XMRig miner"
#define APP_VERSION "6.21.3-mo13" #define APP_VERSION "6.21.3-mo14"
#define APP_DOMAIN "xmrig.com" #define APP_DOMAIN "xmrig.com"
#define APP_SITE "www.xmrig.com" #define APP_SITE "www.xmrig.com"
#define APP_COPYRIGHT "Copyright (C) 2016-2024 xmrig.com" #define APP_COPYRIGHT "Copyright (C) 2016-2024 xmrig.com"