fzorb/REDACTED-rig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge 4447c81afe into 038c4fbe34

Browse source
This commit is contained in:
michael-EA 2023-04-08 15:10:55 +05:00 • committed by GitHub
commit 912f037162
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 82 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/backend/cpu/CpuWorker.cpp
View file

@ -54,6 +54,8 @@ namespace xmrig {
static constexpr uint32_t kReserveCount = 32768;
static constexpr size_t GHOSTRIDER_RTM_CORE_ALGO_LIMIT = 15;
static constexpr size_t GHOSTRIDER_MIKE_CORE_ALGO_LIMIT = 11;
#ifdef XMRIG_ALGO_CN_HEAVY
static std::mutex cn_heavyZen3MemoryMutex;
@ -168,8 +170,8 @@ bool xmrig::CpuWorker<N>::selfTest()
# ifdef XMRIG_ALGO_GHOSTRIDER
if (m_algorithm.family() == Algorithm::GHOSTRIDER) {
return (N == 8) && verify(Algorithm::GHOSTRIDER_RTM, test_output_gr);
}
return (N == 8) && verify(Algorithm::GHOSTRIDER_RTM, test_output_gr)
&& verify(Algorithm::GHOSTRIDER_MIKE, test_output_gr_mike); }
# endif
if (m_algorithm.family() == Algorithm::CN) {
@ -317,7 +319,11 @@ void xmrig::CpuWorker<N>::start()
# ifdef XMRIG_ALGO_GHOSTRIDER
case Algorithm::GHOSTRIDER:
if (N == 8) {
ghostrider::hash_octa(m_job.blob(), job.size(), m_hash, m_ctx, m_ghHelper);
if (job.algorithm().id() != Algorithm::GHOSTRIDER_MIKE) {
ghostrider::hash_octa<GHOSTRIDER_RTM_CORE_ALGO_LIMIT>(m_job.blob(), job.size(), m_hash, m_ctx, m_ghHelper);
} else {
ghostrider::hash_octa<GHOSTRIDER_MIKE_CORE_ALGO_LIMIT>(m_job.blob(), job.size(), m_hash, m_ctx, m_ghHelper);
}
}
else {
valid = false;
@ -387,7 +393,7 @@ template<size_t N>
bool xmrig::CpuWorker<N>::verify(const Algorithm &algorithm, const uint8_t *referenceValue)
{
# ifdef XMRIG_ALGO_GHOSTRIDER
if (algorithm == Algorithm::GHOSTRIDER_RTM) {
if (algorithm.family() == Algorithm::GHOSTRIDER) {
uint8_t blob[N * 80] = {};
for (size_t i = 0; i < N; ++i) {
blob[i * 80 + 0] = static_cast<uint8_t>(i);
@ -396,7 +402,12 @@ bool xmrig::CpuWorker<N>::verify(const Algorithm &algorithm, const uint8_t *refe
}
uint8_t hash1[N * 32] = {};
ghostrider::hash_octa(blob, 80, hash1, m_ctx, 0, false);
if (algorithm.id() != Algorithm::GHOSTRIDER_MIKE) {
ghostrider::hash_octa<GHOSTRIDER_RTM_CORE_ALGO_LIMIT>(blob, 80, hash1, m_ctx, 0, false);
}
else {
ghostrider::hash_octa<GHOSTRIDER_MIKE_CORE_ALGO_LIMIT>(blob, 80, hash1, m_ctx, 0, false);
}
for (size_t i = 0; i < N; ++i) {
blob[i * 80 + 0] = static_cast<uint8_t>(i);
@ -405,7 +416,12 @@ bool xmrig::CpuWorker<N>::verify(const Algorithm &algorithm, const uint8_t *refe
}
uint8_t hash2[N * 32] = {};
ghostrider::hash_octa(blob, 80, hash2, m_ctx, 0, false);
if (algorithm.id() != Algorithm::GHOSTRIDER_MIKE) {
ghostrider::hash_octa<GHOSTRIDER_RTM_CORE_ALGO_LIMIT>(blob, 80, hash2, m_ctx, 0, false);
}
else {
ghostrider::hash_octa<GHOSTRIDER_MIKE_CORE_ALGO_LIMIT>(blob, 80, hash2, m_ctx, 0, false);
}
for (size_t i = 0; i < N * 32; ++i) {
if ((hash1[i] ^ hash2[i]) != referenceValue[i]) {

4
src/backend/cpu/platform/HwlocCpuInfo.cpp
View file

@ -299,7 +299,7 @@ void xmrig::HwlocCpuInfo::processTopLevelCache(hwloc_obj_t cache, const Algorith
findByType(cache, HWLOC_OBJ_CORE, [&cores](hwloc_obj_t found) { cores.emplace_back(found); });
# ifdef XMRIG_ALGO_GHOSTRIDER
if ((algorithm == Algorithm::GHOSTRIDER_RTM) && (PUs > cores.size()) && (PUs < cores.size() * 2)) {
if ((algorithm == Algorithm::GHOSTRIDER_RTM || algorithm == Algorithm::GHOSTRIDER_MIKE) && (PUs > cores.size()) && (PUs < cores.size() * 2)) {
// Don't use E-cores on Alder Lake
cores.erase(std::remove_if(cores.begin(), cores.end(), [](hwloc_obj_t c) { return hwloc_bitmap_weight(c->cpuset) == 1; }), cores.end());
@ -359,7 +359,7 @@ void xmrig::HwlocCpuInfo::processTopLevelCache(hwloc_obj_t cache, const Algorith
}
# ifdef XMRIG_ALGO_GHOSTRIDER
if (algorithm == Algorithm::GHOSTRIDER_RTM) {
if (algorithm == Algorithm::GHOSTRIDER_RTM || algorithm == Algorithm::GHOSTRIDER_MIKE) {
// GhostRider implementation runs 8 hashes at a time
intensity = 8;
// Always 1 thread per core (it uses additional helper thread when possible)

8
src/base/crypto/Algorithm.cpp
View file

@ -98,7 +98,7 @@ const char *Algorithm::kKAWPOW_RVN = "kawpow";
#ifdef XMRIG_ALGO_GHOSTRIDER
const char* Algorithm::kGHOSTRIDER = "ghostrider";
const char* Algorithm::kGHOSTRIDER_RTM = "ghostrider";
const char* Algorithm::kGHOSTRIDER_MIKE = "ghostrider/mike";
#endif
@ -162,6 +162,7 @@ static const std::map<uint32_t, const char *> kAlgorithmNames = {
# ifdef XMRIG_ALGO_GHOSTRIDER
ALGO_NAME(GHOSTRIDER_RTM),
ALGO_NAME(GHOSTRIDER_MIKE),
# endif
};
@ -278,6 +279,9 @@ static const std::map<const char *, Algorithm::Id, aliasCompare> kAlgorithmAlias
# ifdef XMRIG_ALGO_GHOSTRIDER
ALGO_ALIAS_AUTO(GHOSTRIDER_RTM), ALGO_ALIAS(GHOSTRIDER_RTM, "ghostrider/rtm"),
ALGO_ALIAS(GHOSTRIDER_RTM, "gr"),
ALGO_ALIAS_AUTO(GHOSTRIDER_MIKE), ALGO_ALIAS(GHOSTRIDER_MIKE, "ghostrider/mike"),
ALGO_ALIAS(GHOSTRIDER_MIKE, "gr/mike"),
ALGO_ALIAS(GHOSTRIDER_MIKE, "mike"),
# endif
};
@ -353,7 +357,7 @@ std::vector<xmrig::Algorithm> xmrig::Algorithm::all(const std::function<bool(con
RX_0, RX_WOW, RX_ARQ, RX_GRAFT, RX_SFX, RX_KEVA,
AR2_CHUKWA, AR2_CHUKWA_V2, AR2_WRKZ,
KAWPOW_RVN,
GHOSTRIDER_RTM
GHOSTRIDER_RTM, GHOSTRIDER_MIKE
};
Algorithms out;

7
src/base/crypto/Algorithm.h
View file

@ -72,6 +72,7 @@ public:
CN_GR_4 = 0x63120104, // "cn/turtle" GhostRider
CN_GR_5 = 0x63120105, // "cn/turtle-lite" GhostRider
GHOSTRIDER_RTM = 0x6c150000, // "ghostrider" GhostRider
GHOSTRIDER_MIKE = 0x6c15006d, // "ghostrider/mike" GhostRider variant Mike/VKAX
RX_0 = 0x72151200, // "rx/0" RandomX (reference configuration).
RX_WOW = 0x72141177, // "rx/wow" RandomWOW (Wownero).
RX_ARQ = 0x72121061, // "rx/arq" RandomARQ (Arqma).
@ -161,6 +162,7 @@ public:
# ifdef XMRIG_ALGO_GHOSTRIDER
static const char* kGHOSTRIDER;
static const char* kGHOSTRIDER_RTM;
static const char* kGHOSTRIDER_MIKE;
# endif
inline Algorithm() = default;
@ -182,8 +184,9 @@ public:
inline Id id() const { return m_id; }
inline size_t l2() const { return l2(m_id); }
inline uint32_t family() const { return family(m_id); }
inline uint32_t minIntensity() const { return ((m_id == GHOSTRIDER_RTM) ? 8 : 1); };
inline uint32_t maxIntensity() const { return isCN() ? 5 : ((m_id == GHOSTRIDER_RTM) ? 8 : 1); };
inline uint32_t minIntensity() const { return ((m_id == GHOSTRIDER_RTM || m_id == GHOSTRIDER_MIKE) ? 8 : 1); };
inline uint32_t maxIntensity() const { return isCN() ? 5 : ((m_id == GHOSTRIDER_RTM || m_id == GHOSTRIDER_MIKE) ? 8 : 1); };
inline size_t l3() const { return l3(m_id); }

10
src/base/net/stratum/EthStratumClient.cpp
View file

@ -77,7 +77,7 @@ int64_t xmrig::EthStratumClient::submit(const JobResult& result)
params.PushBack(result.jobId.toJSON(), allocator);
# ifdef XMRIG_ALGO_GHOSTRIDER
if (m_pool.algorithm().id() == Algorithm::GHOSTRIDER_RTM) {
if (m_pool.algorithm().id() == Algorithm::GHOSTRIDER_RTM || m_pool.algorithm().id() == Algorithm::GHOSTRIDER_MIKE) {
params.PushBack(Value("00000000000000000000000000000000", static_cast<uint32_t>(m_extraNonce2Size * 2)), allocator);
params.PushBack(Value(m_ntime.data(), allocator), allocator);
@ -114,7 +114,7 @@ int64_t xmrig::EthStratumClient::submit(const JobResult& result)
uint64_t actual_diff;
# ifdef XMRIG_ALGO_GHOSTRIDER
if (result.algorithm == Algorithm::GHOSTRIDER_RTM) {
if (result.algorithm == Algorithm::GHOSTRIDER_RTM || result.algorithm == Algorithm::GHOSTRIDER_MIKE) {
actual_diff = reinterpret_cast<const uint64_t*>(result.result())[3];
}
else
@ -202,7 +202,7 @@ void xmrig::EthStratumClient::parseNotification(const char *method, const rapidj
return;
}
if (m_pool.algorithm().id() != Algorithm::GHOSTRIDER_RTM) {
if (m_pool.algorithm().id() != Algorithm::GHOSTRIDER_RTM && m_pool.algorithm().id() != Algorithm::GHOSTRIDER_MIKE) {
return;
}
@ -236,7 +236,7 @@ void xmrig::EthStratumClient::parseNotification(const char *method, const rapidj
algo = m_pool.coin().algorithm();
}
const size_t min_arr_size = (algo.id() == Algorithm::GHOSTRIDER_RTM) ? 8 : 6;
const size_t min_arr_size = (algo.id() == Algorithm::GHOSTRIDER_RTM || algo.id() == Algorithm::GHOSTRIDER_MIKE) ? 8 : 6;
if (arr.Size() < min_arr_size) {
LOG_ERR("%s " RED("invalid mining.notify notification: params array has wrong size"), tag());
@ -257,7 +257,7 @@ void xmrig::EthStratumClient::parseNotification(const char *method, const rapidj
std::stringstream s;
# ifdef XMRIG_ALGO_GHOSTRIDER
if (algo.id() == Algorithm::GHOSTRIDER_RTM) {
if (algo.id() == Algorithm::GHOSTRIDER_RTM || algo.id() == Algorithm::GHOSTRIDER_MIKE) {
// Raptoreum uses Bitcoin's Stratum protocol
// https://en.bitcoinwiki.org/wiki/Stratum_mining_protocol#mining.notify

22
src/crypto/cn/CryptoNight_test.h
View file

@ -452,6 +452,28 @@ const static uint8_t test_output_gr[256] = {
0xC4, 0xA7, 0xC7, 0x77, 0xAD, 0xF8, 0x09, 0x61, 0x16, 0xBB, 0xAA, 0x7E, 0xAB, 0xC3, 0x00, 0x25,
0xBA, 0xA8, 0x97, 0xC7, 0x7D, 0x38, 0x46, 0x0E, 0x59, 0xAC, 0xCB, 0xAE, 0xFE, 0x3C, 0x6F, 0x01
};
// "GhostRider/Mike"
const static uint8_t test_output_gr_mike[256] = {
0x4a, 0xad, 0xfc, 0x1b, 0xad, 0x21, 0x65, 0xa7, 0x69, 0x6f, 0x87, 0x3e, 0x5d, 0xb7, 0x3c, 0x20,
0x5f, 0x3a, 0x4b, 0x87, 0xa3, 0x4b, 0x54, 0x35, 0x70, 0xca, 0xfc, 0x95, 0x48, 0xab, 0x5b,
0x74, 0xfc, 0x9c, 0xb, 0xd8, 0xe5, 0x98, 0x1, 0xf1, 0x9f, 0x9e, 0x7f, 0xd4, 0xe4, 0xaf,
0x7d, 0x14, 0x7d, 0xde, 0x8e, 0x8a, 0xdf, 0xe6, 0x4a, 0x30, 0x9a, 0x92, 0xf5, 0x12, 0x3f,
0x16, 0xf3, 0xf0, 0xc7, 0x2f, 0xf7, 0x4b, 0x6, 0x82, 0xa5, 0x50, 0xa0, 0xb3, 0xb8, 0x81,
0xa, 0xde, 0x29, 0x4e, 0xcd, 0x72, 0x57, 0x60, 0x4e, 0xc1, 0x23, 0x46, 0x1b, 0x39, 0x23,
0xcc, 0x4a, 0x64, 0x7b, 0x2d, 0x8b, 0x4, 0xa1, 0xea, 0xa4, 0xa0, 0xf9, 0x3d, 0x7d, 0x26,
0x22, 0xf0, 0xa6, 0xa, 0x18, 0x2c, 0xd5, 0x88, 0x4f, 0x47, 0xb7, 0x72, 0x83, 0xa9, 0xcd,
0x17, 0x24, 0xb, 0x39, 0x3c, 0x54, 0x51, 0x47, 0xef, 0x77, 0x55, 0xa, 0x9b, 0x56, 0x6,
0x47, 0xbe, 0xdb, 0x85, 0x78, 0x3a, 0x15, 0x31, 0x8c, 0x60, 0xce, 0xe9, 0x9a, 0x1f, 0xdd,
0x8c, 0xcc, 0xf0, 0x17, 0xa5, 0x99, 0x17, 0xb5, 0x5d, 0x30, 0xae, 0x8d, 0x7a, 0xd2, 0xfd,
0xd5, 0x66, 0xdd, 0x23, 0xa0, 0xca, 0x56, 0x66, 0x64, 0x6c, 0x38, 0xda, 0xdf, 0x91, 0x12,
0x6, 0x9a, 0x11, 0x13, 0x4e, 0xcf, 0x71, 0xf4, 0xb, 0x26, 0x50, 0x7d, 0x0, 0x6f, 0xc4,
0x39, 0xb5, 0xd, 0xaa, 0xa3, 0x60, 0x5e, 0x41, 0x82, 0xe0, 0xce, 0x38, 0x7f, 0x37, 0x90,
0xac, 0x53, 0xbe, 0x46, 0xb4, 0x6a, 0xc4, 0xb8, 0xe1, 0x9f, 0x31, 0x9f, 0xf4, 0xff, 0x46,
0x73, 0x92, 0xee, 0x64, 0xa6, 0x44, 0xac, 0xd4, 0x33, 0xb8, 0x3b, 0x84, 0x42, 0x7e, 0x9a,
0x80, 0xf0, 0xa8, 0x71, 0xf0, 0x81, 0xc4, 0xc1, 0x52, 0xff, 0x27, 0x4e, 0x7, 0xf0, 0x70
};
#endif

20
src/crypto/ghostrider/ghostrider.cpp
View file

@ -538,7 +538,7 @@ void destroy_helper_thread(HelperThread* t)
delete t;
}
template <size_t CORE_ALGO_LIMIT>
void hash_octa(const uint8_t* data, size_t size, uint8_t* output, cryptonight_ctx** ctx, HelperThread* helper, bool verbose)
{
enum { N = 8 };
@ -549,7 +549,7 @@ void hash_octa(const uint8_t* data, size_t size, uint8_t* output, cryptonight_ct
}
// PrevBlockHash (GhostRider's seed) is stored in bytes [4; 36)
uint32_t core_indices[15];
uint32_t core_indices[CORE_ALGO_LIMIT];
select_indices(core_indices, data + 4);
uint32_t cn_indices[6];
@ -600,6 +600,9 @@ void hash_octa(const uint8_t* data, size_t size, uint8_t* output, cryptonight_ct
for (size_t i = 0; i < 5; ++i) {
for (size_t j = n; j < N; ++j) {
if ((part * 5 + i) >= CORE_ALGO_LIMIT) {
break;
}
core_hash[core_indices[part * 5 + i]](input + j * input_size, input_size, tmp + j * 64);
}
input = tmp;
@ -644,6 +647,9 @@ void hash_octa(const uint8_t* data, size_t size, uint8_t* output, cryptonight_ct
for (size_t i = 0; i < 5; ++i) {
for (size_t j = 0; j < n; ++j) {
if ((part * 5 + i) >= CORE_ALGO_LIMIT) {
break;
}
core_hash[core_indices[part * 5 + i]](input + j * input_size, input_size, tmp + j * 64);
}
input = tmp;
@ -712,6 +718,9 @@ void hash_octa(const uint8_t* data, size_t size, uint8_t* output, cryptonight_ct
for (size_t i = 0; i < 5; ++i) {
for (size_t j = n; j < N; ++j) {
if ((part * 5 + i) >= CORE_ALGO_LIMIT) {
break;
}
core_hash[core_indices[part * 5 + i]](input + j * input_size, input_size, tmp + j * 64);
}
input = tmp;
@ -732,6 +741,9 @@ void hash_octa(const uint8_t* data, size_t size, uint8_t* output, cryptonight_ct
for (size_t i = 0; i < 5; ++i) {
for (size_t j = 0; j < n; ++j) {
if ((part * 5 + i) >= CORE_ALGO_LIMIT) {
break;
}
core_hash[core_indices[part * 5 + i]](data + j * size, size, tmp + j * 64);
}
data = tmp;
@ -768,6 +780,7 @@ HelperThread* create_helper_thread(int64_t, int, const std::vector<int64_t>&) {
void destroy_helper_thread(HelperThread*) {}
template <size_t CORE_ALGO_LIMIT>
void hash_octa(const uint8_t* data, size_t size, uint8_t* output, cryptonight_ctx** ctx, HelperThread*, bool verbose)
{
constexpr uint32_t N = 8;
@ -828,6 +841,9 @@ void hash_octa(const uint8_t* data, size_t size, uint8_t* output, cryptonight_ct
for (size_t i = 0; i < 5; ++i) {
for (size_t j = 0; j < N; ++j) {
if ((part * 5 + i) >= CORE_ALGO_LIMIT) {
break;
}
core_hash[core_indices[part * 5 + i]](data + j * size, size, tmp + j * 64);
}
data = tmp;

2
src/crypto/ghostrider/ghostrider.h
View file

@ -41,6 +41,8 @@ struct HelperThread;
void benchmark();
HelperThread* create_helper_thread(int64_t cpu_index, int priority, const std::vector<int64_t>& affinities);
void destroy_helper_thread(HelperThread* t);
template<size_t CORE_ALGO_LIMIT>
void hash_octa(const uint8_t* data, size_t size, uint8_t* output, cryptonight_ctx** ctx, HelperThread* helper, bool verbose = true);