Ecosystem/xmrig
Ecosystem/xmrig
1
0
Fork 0
mirror of https://github.com/xmrig/xmrig.git synced 2024-09-30 06:21:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added "coin": "keva" and post PR cleanup.

Browse source
This commit is contained in:
XMRig 2020-03-07 20:38:44 +07:00
parent ab90af37b3
commit 1f36ea2a8e
No known key found for this signature in database
GPG key ID: 446A53638BE94409
6 changed files with 5674 additions and 5665 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/backend/cpu/CpuConfig_gen.h
View file

@ -5,8 +5,8 @@
* Copyright 2014-2016 Wolf9466 <https://github.com/OhGodAPet> * Copyright 2014-2016 Wolf9466 <https://github.com/OhGodAPet>
* Copyright 2016 Jay D Dee <jayddee246@gmail.com> * Copyright 2016 Jay D Dee <jayddee246@gmail.com>
* Copyright 2017-2018 XMR-Stak <https://github.com/fireice-uk>, <https://github.com/psychocrypt> * Copyright 2017-2018 XMR-Stak <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
* Copyright 2018-2019 SChernykh <https://github.com/SChernykh> * Copyright 2018-2020 SChernykh <https://github.com/SChernykh>
* Copyright 2016-2019 XMRig <https://github.com/xmrig>, <support@xmrig.com> * Copyright 2016-2020 XMRig <https://github.com/xmrig>, <support@xmrig.com>
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -109,11 +109,11 @@ template<>
size_t inline generate<Algorithm::RANDOM_X>(Threads<CpuThreads> &threads, uint32_t limit) size_t inline generate<Algorithm::RANDOM_X>(Threads<CpuThreads> &threads, uint32_t limit)
{ {
size_t count = 0; size_t count = 0;
auto cpuInfo = Cpu::info();
auto wow = Cpu::info()->threads(Algorithm::RX_WOW, limit); auto wow = cpuInfo->threads(Algorithm::RX_WOW, limit);
if (!threads.isExist(Algorithm::RX_ARQ)) { if (!threads.isExist(Algorithm::RX_ARQ)) {
auto arq = Cpu::info()->threads(Algorithm::RX_ARQ, limit); auto arq = cpuInfo->threads(Algorithm::RX_ARQ, limit);
if (arq == wow) { if (arq == wow) {
threads.setAlias(Algorithm::RX_ARQ, "rx/wow"); threads.setAlias(Algorithm::RX_ARQ, "rx/wow");
++count; ++count;
@ -124,7 +124,7 @@ size_t inline generate<Algorithm::RANDOM_X>(Threads<CpuThreads> &threads, uint32
} }
if (!threads.isExist(Algorithm::RX_KEVA)) { if (!threads.isExist(Algorithm::RX_KEVA)) {
auto keva = Cpu::info()->threads(Algorithm::RX_KEVA, limit); auto keva = cpuInfo->threads(Algorithm::RX_KEVA, limit);
if (keva == wow) { if (keva == wow) {
threads.setAlias(Algorithm::RX_KEVA, "rx/wow"); threads.setAlias(Algorithm::RX_KEVA, "rx/wow");
++count; ++count;

6
src/backend/cuda/CudaConfig_gen.h
View file

@ -5,8 +5,8 @@
* Copyright 2014-2016 Wolf9466 <https://github.com/OhGodAPet> * Copyright 2014-2016 Wolf9466 <https://github.com/OhGodAPet>
* Copyright 2016 Jay D Dee <jayddee246@gmail.com> * Copyright 2016 Jay D Dee <jayddee246@gmail.com>
* Copyright 2017-2018 XMR-Stak <https://github.com/fireice-uk>, <https://github.com/psychocrypt> * Copyright 2017-2018 XMR-Stak <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
* Copyright 2018-2019 SChernykh <https://github.com/SChernykh> * Copyright 2018-2020 SChernykh <https://github.com/SChernykh>
* Copyright 2016-2019 XMRig <https://github.com/xmrig>, <support@xmrig.com> * Copyright 2016-2020 XMRig <https://github.com/xmrig>, <support@xmrig.com>
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -126,7 +126,7 @@ size_t inline generate<Algorithm::RANDOM_X>(Threads<CudaThreads> &threads, const
} }
if (!threads.isExist(Algorithm::RX_KEVA) && kva != rx) { if (!threads.isExist(Algorithm::RX_KEVA) && kva != rx) {
count += threads.move("rx/kva", std::move(kva)); count += threads.move("rx/keva", std::move(kva));
} }
count += threads.move("rx", std::move(rx)); count += threads.move("rx", std::move(rx));

3733
src/backend/opencl/cl/cn/cryptonight_cl.h
View file

File diff suppressed because it is too large Load diff

7581
src/backend/opencl/cl/rx/randomx_cl.h
View file

File diff suppressed because it is too large Load diff

4
src/crypto/common/Coin.cpp
View file

@ -52,6 +52,7 @@ static CoinName const coin_names[] = {
{ "arqma", Coin::ARQMA }, { "arqma", Coin::ARQMA },
{ "arq", Coin::ARQMA }, { "arq", Coin::ARQMA },
{ "dero", Coin::DERO }, { "dero", Coin::DERO },
{ "keva", Coin::KEVA }
}; };
@ -71,6 +72,9 @@ xmrig::Algorithm::Id xmrig::Coin::algorithm(uint8_t blobVersion) const
case DERO: case DERO:
return (blobVersion >= 4) ? Algorithm::ASTROBWT_DERO : Algorithm::CN_0; return (blobVersion >= 4) ? Algorithm::ASTROBWT_DERO : Algorithm::CN_0;
case KEVA:
return (blobVersion >= 11) ? Algorithm::RX_KEVA : Algorithm::CN_R;
case INVALID: case INVALID:
break; break;
} }

3
src/crypto/common/Coin.h
View file

@ -41,7 +41,8 @@ public:
INVALID = -1, INVALID = -1,
MONERO, MONERO,
ARQMA, ARQMA,
DERO DERO,
KEVA
}; };