mirror of
https://github.com/xmrig/xmrig.git
synced 2024-10-30 13:07:46 +00:00
Removed duplicate strings.
This commit is contained in:
parent
aee0762424
commit
e9ae4deb91
6 changed files with 60 additions and 63 deletions
|
@ -36,7 +36,6 @@ namespace xmrig {
|
||||||
|
|
||||||
|
|
||||||
static const char *kAsterisk = "*";
|
static const char *kAsterisk = "*";
|
||||||
static const char *kCn2 = "cn/2";
|
|
||||||
|
|
||||||
|
|
||||||
} // namespace xmrig
|
} // namespace xmrig
|
||||||
|
@ -118,8 +117,8 @@ xmrig::String xmrig::Threads<T>::profileName(const Algorithm &algorithm, bool st
|
||||||
return String();
|
return String();
|
||||||
}
|
}
|
||||||
|
|
||||||
if (algorithm.family() == Algorithm::CN && algorithm.base() == Algorithm::CN_2 && has(kCn2)) {
|
if (algorithm.family() == Algorithm::CN && algorithm.base() == Algorithm::CN_2 && has(Algorithm::kCN_2)) {
|
||||||
return kCn2;
|
return Algorithm::kCN_2;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (name.contains("/")) {
|
if (name.contains("/")) {
|
||||||
|
|
|
@ -1,12 +1,6 @@
|
||||||
/* XMRig
|
/* XMRig
|
||||||
* Copyright 2010 Jeff Garzik <jgarzik@pobox.com>
|
* Copyright (c) 2018-2021 SChernykh <https://github.com/SChernykh>
|
||||||
* Copyright 2012-2014 pooler <pooler@litecoinpool.org>
|
* Copyright (c) 2016-2021 XMRig <https://github.com/xmrig>, <support@xmrig.com>
|
||||||
* Copyright 2014 Lucas Jones <https://github.com/lucasjones>
|
|
||||||
* Copyright 2014-2016 Wolf9466 <https://github.com/OhGodAPet>
|
|
||||||
* Copyright 2016 Jay D Dee <jayddee246@gmail.com>
|
|
||||||
* Copyright 2017-2018 XMR-Stak <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
|
|
||||||
* Copyright 2018-2020 SChernykh <https://github.com/SChernykh>
|
|
||||||
* 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
|
||||||
|
@ -53,7 +47,7 @@ size_t inline generate<Algorithm::CN>(Threads<CpuThreads> &threads, uint32_t lim
|
||||||
{
|
{
|
||||||
size_t count = 0;
|
size_t count = 0;
|
||||||
|
|
||||||
count += generate("cn", threads, Algorithm::CN_1, limit);
|
count += generate(Algorithm::kCN, threads, Algorithm::CN_1, limit);
|
||||||
|
|
||||||
if (!threads.isExist(Algorithm::CN_0)) {
|
if (!threads.isExist(Algorithm::CN_0)) {
|
||||||
threads.disable(Algorithm::CN_0);
|
threads.disable(Algorithm::CN_0);
|
||||||
|
@ -70,7 +64,7 @@ size_t inline generate<Algorithm::CN_LITE>(Threads<CpuThreads> &threads, uint32_
|
||||||
{
|
{
|
||||||
size_t count = 0;
|
size_t count = 0;
|
||||||
|
|
||||||
count += generate("cn-lite", threads, Algorithm::CN_LITE_1, limit);
|
count += generate(Algorithm::kCN_LITE, threads, Algorithm::CN_LITE_1, limit);
|
||||||
|
|
||||||
if (!threads.isExist(Algorithm::CN_LITE_0)) {
|
if (!threads.isExist(Algorithm::CN_LITE_0)) {
|
||||||
threads.disable(Algorithm::CN_LITE_0);
|
threads.disable(Algorithm::CN_LITE_0);
|
||||||
|
@ -86,7 +80,7 @@ size_t inline generate<Algorithm::CN_LITE>(Threads<CpuThreads> &threads, uint32_
|
||||||
template<>
|
template<>
|
||||||
size_t inline generate<Algorithm::CN_HEAVY>(Threads<CpuThreads> &threads, uint32_t limit)
|
size_t inline generate<Algorithm::CN_HEAVY>(Threads<CpuThreads> &threads, uint32_t limit)
|
||||||
{
|
{
|
||||||
return generate("cn-heavy", threads, Algorithm::CN_HEAVY_0, limit);
|
return generate(Algorithm::kCN_HEAVY, threads, Algorithm::CN_HEAVY_0, limit);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -95,7 +89,7 @@ size_t inline generate<Algorithm::CN_HEAVY>(Threads<CpuThreads> &threads, uint32
|
||||||
template<>
|
template<>
|
||||||
size_t inline generate<Algorithm::CN_PICO>(Threads<CpuThreads> &threads, uint32_t limit)
|
size_t inline generate<Algorithm::CN_PICO>(Threads<CpuThreads> &threads, uint32_t limit)
|
||||||
{
|
{
|
||||||
return generate("cn-pico", threads, Algorithm::CN_PICO_0, limit);
|
return generate(Algorithm::kCN_PICO, threads, Algorithm::CN_PICO_0, limit);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -104,7 +98,7 @@ size_t inline generate<Algorithm::CN_PICO>(Threads<CpuThreads> &threads, uint32_
|
||||||
template<>
|
template<>
|
||||||
size_t inline generate<Algorithm::CN_FEMTO>(Threads<CpuThreads>& threads, uint32_t limit)
|
size_t inline generate<Algorithm::CN_FEMTO>(Threads<CpuThreads>& threads, uint32_t limit)
|
||||||
{
|
{
|
||||||
return generate("cn/upx2", threads, Algorithm::CN_UPX2, limit);
|
return generate(Algorithm::kCN_UPX2, threads, Algorithm::CN_UPX2, limit);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -120,30 +114,30 @@ size_t inline generate<Algorithm::RANDOM_X>(Threads<CpuThreads> &threads, uint32
|
||||||
if (!threads.isExist(Algorithm::RX_ARQ)) {
|
if (!threads.isExist(Algorithm::RX_ARQ)) {
|
||||||
auto arq = cpuInfo->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, Algorithm::kRX_WOW);
|
||||||
++count;
|
++count;
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
count += threads.move("rx/arq", std::move(arq));
|
count += threads.move(Algorithm::kRX_ARQ, std::move(arq));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!threads.isExist(Algorithm::RX_KEVA)) {
|
if (!threads.isExist(Algorithm::RX_KEVA)) {
|
||||||
auto keva = cpuInfo->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, Algorithm::kRX_WOW);
|
||||||
++count;
|
++count;
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
count += threads.move("rx/keva", std::move(keva));
|
count += threads.move(Algorithm::kRX_KEVA, std::move(keva));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!threads.isExist(Algorithm::RX_WOW)) {
|
if (!threads.isExist(Algorithm::RX_WOW)) {
|
||||||
count += threads.move("rx/wow", std::move(wow));
|
count += threads.move(Algorithm::kRX_WOW, std::move(wow));
|
||||||
}
|
}
|
||||||
|
|
||||||
count += generate("rx", threads, Algorithm::RX_0, limit);
|
count += generate(Algorithm::kRX, threads, Algorithm::RX_0, limit);
|
||||||
|
|
||||||
return count;
|
return count;
|
||||||
}
|
}
|
||||||
|
@ -154,7 +148,7 @@ size_t inline generate<Algorithm::RANDOM_X>(Threads<CpuThreads> &threads, uint32
|
||||||
template<>
|
template<>
|
||||||
size_t inline generate<Algorithm::ARGON2>(Threads<CpuThreads> &threads, uint32_t limit)
|
size_t inline generate<Algorithm::ARGON2>(Threads<CpuThreads> &threads, uint32_t limit)
|
||||||
{
|
{
|
||||||
return generate("argon2", threads, Algorithm::AR2_CHUKWA_V2, limit);
|
return generate(Algorithm::kAR2, threads, Algorithm::AR2_CHUKWA_V2, limit);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -163,7 +157,7 @@ size_t inline generate<Algorithm::ARGON2>(Threads<CpuThreads> &threads, uint32_t
|
||||||
template<>
|
template<>
|
||||||
size_t inline generate<Algorithm::ASTROBWT>(Threads<CpuThreads>& threads, uint32_t limit)
|
size_t inline generate<Algorithm::ASTROBWT>(Threads<CpuThreads>& threads, uint32_t limit)
|
||||||
{
|
{
|
||||||
return generate("astrobwt", threads, Algorithm::ASTROBWT_DERO, limit);
|
return generate(Algorithm::kASTROBWT, threads, Algorithm::ASTROBWT_DERO, limit);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -1,12 +1,6 @@
|
||||||
/* XMRig
|
/* XMRig
|
||||||
* Copyright 2010 Jeff Garzik <jgarzik@pobox.com>
|
* Copyright (c) 2018-2021 SChernykh <https://github.com/SChernykh>
|
||||||
* Copyright 2012-2014 pooler <pooler@litecoinpool.org>
|
* Copyright (c) 2016-2021 XMRig <https://github.com/xmrig>, <support@xmrig.com>
|
||||||
* Copyright 2014 Lucas Jones <https://github.com/lucasjones>
|
|
||||||
* Copyright 2014-2016 Wolf9466 <https://github.com/OhGodAPet>
|
|
||||||
* Copyright 2016 Jay D Dee <jayddee246@gmail.com>
|
|
||||||
* Copyright 2017-2018 XMR-Stak <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
|
|
||||||
* Copyright 2018-2020 SChernykh <https://github.com/SChernykh>
|
|
||||||
* 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
|
||||||
|
@ -56,8 +50,8 @@ size_t inline generate<Algorithm::CN>(Threads<CudaThreads> &threads, const std::
|
||||||
{
|
{
|
||||||
size_t count = 0;
|
size_t count = 0;
|
||||||
|
|
||||||
count += generate("cn", threads, Algorithm::CN_1, devices);
|
count += generate(Algorithm::kCN, threads, Algorithm::CN_1, devices);
|
||||||
count += generate("cn/2", threads, Algorithm::CN_2, devices);
|
count += generate(Algorithm::kCN_2, threads, Algorithm::CN_2, devices);
|
||||||
|
|
||||||
if (!threads.isExist(Algorithm::CN_0)) {
|
if (!threads.isExist(Algorithm::CN_0)) {
|
||||||
threads.disable(Algorithm::CN_0);
|
threads.disable(Algorithm::CN_0);
|
||||||
|
@ -72,7 +66,7 @@ size_t inline generate<Algorithm::CN>(Threads<CudaThreads> &threads, const std::
|
||||||
template<>
|
template<>
|
||||||
size_t inline generate<Algorithm::CN_LITE>(Threads<CudaThreads> &threads, const std::vector<CudaDevice> &devices)
|
size_t inline generate<Algorithm::CN_LITE>(Threads<CudaThreads> &threads, const std::vector<CudaDevice> &devices)
|
||||||
{
|
{
|
||||||
size_t count = generate("cn-lite", threads, Algorithm::CN_LITE_1, devices);
|
size_t count = generate(Algorithm::kCN_LITE, threads, Algorithm::CN_LITE_1, devices);
|
||||||
|
|
||||||
if (!threads.isExist(Algorithm::CN_LITE_0)) {
|
if (!threads.isExist(Algorithm::CN_LITE_0)) {
|
||||||
threads.disable(Algorithm::CN_LITE_0);
|
threads.disable(Algorithm::CN_LITE_0);
|
||||||
|
@ -88,7 +82,7 @@ size_t inline generate<Algorithm::CN_LITE>(Threads<CudaThreads> &threads, const
|
||||||
template<>
|
template<>
|
||||||
size_t inline generate<Algorithm::CN_HEAVY>(Threads<CudaThreads> &threads, const std::vector<CudaDevice> &devices)
|
size_t inline generate<Algorithm::CN_HEAVY>(Threads<CudaThreads> &threads, const std::vector<CudaDevice> &devices)
|
||||||
{
|
{
|
||||||
return generate("cn-heavy", threads, Algorithm::CN_HEAVY_0, devices);
|
return generate(Algorithm::kCN_HEAVY, threads, Algorithm::CN_HEAVY_0, devices);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -97,7 +91,7 @@ size_t inline generate<Algorithm::CN_HEAVY>(Threads<CudaThreads> &threads, const
|
||||||
template<>
|
template<>
|
||||||
size_t inline generate<Algorithm::CN_PICO>(Threads<CudaThreads> &threads, const std::vector<CudaDevice> &devices)
|
size_t inline generate<Algorithm::CN_PICO>(Threads<CudaThreads> &threads, const std::vector<CudaDevice> &devices)
|
||||||
{
|
{
|
||||||
return generate("cn-pico", threads, Algorithm::CN_PICO_0, devices);
|
return generate(Algorithm::kCN_PICO, threads, Algorithm::CN_PICO_0, devices);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -106,7 +100,7 @@ size_t inline generate<Algorithm::CN_PICO>(Threads<CudaThreads> &threads, const
|
||||||
template<>
|
template<>
|
||||||
size_t inline generate<Algorithm::CN_FEMTO>(Threads<CudaThreads>& threads, const std::vector<CudaDevice>& devices)
|
size_t inline generate<Algorithm::CN_FEMTO>(Threads<CudaThreads>& threads, const std::vector<CudaDevice>& devices)
|
||||||
{
|
{
|
||||||
return generate("cn/upx2", threads, Algorithm::CN_UPX2, devices);
|
return generate(Algorithm::kCN_UPX2, threads, Algorithm::CN_UPX2, devices);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -123,18 +117,18 @@ size_t inline generate<Algorithm::RANDOM_X>(Threads<CudaThreads> &threads, const
|
||||||
auto kva = CudaThreads(devices, Algorithm::RX_KEVA);
|
auto kva = CudaThreads(devices, Algorithm::RX_KEVA);
|
||||||
|
|
||||||
if (!threads.isExist(Algorithm::RX_WOW) && wow != rx) {
|
if (!threads.isExist(Algorithm::RX_WOW) && wow != rx) {
|
||||||
count += threads.move("rx/wow", std::move(wow));
|
count += threads.move(Algorithm::kRX_WOW, std::move(wow));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!threads.isExist(Algorithm::RX_ARQ) && arq != rx) {
|
if (!threads.isExist(Algorithm::RX_ARQ) && arq != rx) {
|
||||||
count += threads.move("rx/arq", std::move(arq));
|
count += threads.move(Algorithm::kRX_ARQ, std::move(arq));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!threads.isExist(Algorithm::RX_KEVA) && kva != rx) {
|
if (!threads.isExist(Algorithm::RX_KEVA) && kva != rx) {
|
||||||
count += threads.move("rx/keva", std::move(kva));
|
count += threads.move(Algorithm::kRX_KEVA, std::move(kva));
|
||||||
}
|
}
|
||||||
|
|
||||||
count += threads.move("rx", std::move(rx));
|
count += threads.move(Algorithm::kRX, std::move(rx));
|
||||||
|
|
||||||
return count;
|
return count;
|
||||||
}
|
}
|
||||||
|
@ -145,7 +139,7 @@ size_t inline generate<Algorithm::RANDOM_X>(Threads<CudaThreads> &threads, const
|
||||||
template<>
|
template<>
|
||||||
size_t inline generate<Algorithm::ASTROBWT>(Threads<CudaThreads> &threads, const std::vector<CudaDevice> &devices)
|
size_t inline generate<Algorithm::ASTROBWT>(Threads<CudaThreads> &threads, const std::vector<CudaDevice> &devices)
|
||||||
{
|
{
|
||||||
return generate("astrobwt", threads, Algorithm::ASTROBWT_DERO, devices);
|
return generate(Algorithm::kASTROBWT, threads, Algorithm::ASTROBWT_DERO, devices);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -154,7 +148,7 @@ size_t inline generate<Algorithm::ASTROBWT>(Threads<CudaThreads> &threads, const
|
||||||
template<>
|
template<>
|
||||||
size_t inline generate<Algorithm::KAWPOW>(Threads<CudaThreads> &threads, const std::vector<CudaDevice> &devices)
|
size_t inline generate<Algorithm::KAWPOW>(Threads<CudaThreads> &threads, const std::vector<CudaDevice> &devices)
|
||||||
{
|
{
|
||||||
return generate("kawpow", threads, Algorithm::KAWPOW_RVN, devices);
|
return generate(Algorithm::kKAWPOW, threads, Algorithm::KAWPOW_RVN, devices);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -1,12 +1,6 @@
|
||||||
/* XMRig
|
/* XMRig
|
||||||
* Copyright 2010 Jeff Garzik <jgarzik@pobox.com>
|
* Copyright (c) 2018-2021 SChernykh <https://github.com/SChernykh>
|
||||||
* Copyright 2012-2014 pooler <pooler@litecoinpool.org>
|
* Copyright (c) 2016-2021 XMRig <https://github.com/xmrig>, <support@xmrig.com>
|
||||||
* Copyright 2014 Lucas Jones <https://github.com/lucasjones>
|
|
||||||
* Copyright 2014-2016 Wolf9466 <https://github.com/OhGodAPet>
|
|
||||||
* Copyright 2016 Jay D Dee <jayddee246@gmail.com>
|
|
||||||
* Copyright 2017-2018 XMR-Stak <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
|
|
||||||
* Copyright 2018-2019 SChernykh <https://github.com/SChernykh>
|
|
||||||
* Copyright 2016-2019 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
|
||||||
|
@ -55,8 +49,8 @@ size_t inline generate<Algorithm::CN>(Threads<OclThreads> &threads, const std::v
|
||||||
{
|
{
|
||||||
size_t count = 0;
|
size_t count = 0;
|
||||||
|
|
||||||
count += generate("cn", threads, Algorithm::CN_1, devices);
|
count += generate(Algorithm::kCN, threads, Algorithm::CN_1, devices);
|
||||||
count += generate("cn/2", threads, Algorithm::CN_2, devices);
|
count += generate(Algorithm::kCN_2, threads, Algorithm::CN_2, devices);
|
||||||
|
|
||||||
if (!threads.isExist(Algorithm::CN_0)) {
|
if (!threads.isExist(Algorithm::CN_0)) {
|
||||||
threads.disable(Algorithm::CN_0);
|
threads.disable(Algorithm::CN_0);
|
||||||
|
@ -71,7 +65,7 @@ size_t inline generate<Algorithm::CN>(Threads<OclThreads> &threads, const std::v
|
||||||
template<>
|
template<>
|
||||||
size_t inline generate<Algorithm::CN_LITE>(Threads<OclThreads> &threads, const std::vector<OclDevice> &devices)
|
size_t inline generate<Algorithm::CN_LITE>(Threads<OclThreads> &threads, const std::vector<OclDevice> &devices)
|
||||||
{
|
{
|
||||||
size_t count = generate("cn-lite", threads, Algorithm::CN_LITE_1, devices);
|
size_t count = generate(Algorithm::kCN_LITE, threads, Algorithm::CN_LITE_1, devices);
|
||||||
|
|
||||||
if (!threads.isExist(Algorithm::CN_LITE_0)) {
|
if (!threads.isExist(Algorithm::CN_LITE_0)) {
|
||||||
threads.disable(Algorithm::CN_LITE_0);
|
threads.disable(Algorithm::CN_LITE_0);
|
||||||
|
@ -87,7 +81,7 @@ size_t inline generate<Algorithm::CN_LITE>(Threads<OclThreads> &threads, const s
|
||||||
template<>
|
template<>
|
||||||
size_t inline generate<Algorithm::CN_HEAVY>(Threads<OclThreads> &threads, const std::vector<OclDevice> &devices)
|
size_t inline generate<Algorithm::CN_HEAVY>(Threads<OclThreads> &threads, const std::vector<OclDevice> &devices)
|
||||||
{
|
{
|
||||||
return generate("cn-heavy", threads, Algorithm::CN_HEAVY_0, devices);
|
return generate(Algorithm::kCN_HEAVY, threads, Algorithm::CN_HEAVY_0, devices);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -96,7 +90,7 @@ size_t inline generate<Algorithm::CN_HEAVY>(Threads<OclThreads> &threads, const
|
||||||
template<>
|
template<>
|
||||||
size_t inline generate<Algorithm::CN_PICO>(Threads<OclThreads> &threads, const std::vector<OclDevice> &devices)
|
size_t inline generate<Algorithm::CN_PICO>(Threads<OclThreads> &threads, const std::vector<OclDevice> &devices)
|
||||||
{
|
{
|
||||||
return generate("cn-pico", threads, Algorithm::CN_PICO_0, devices);
|
return generate(Algorithm::kCN_PICO, threads, Algorithm::CN_PICO_0, devices);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -105,7 +99,7 @@ size_t inline generate<Algorithm::CN_PICO>(Threads<OclThreads> &threads, const s
|
||||||
template<>
|
template<>
|
||||||
size_t inline generate<Algorithm::CN_FEMTO>(Threads<OclThreads>& threads, const std::vector<OclDevice>& devices)
|
size_t inline generate<Algorithm::CN_FEMTO>(Threads<OclThreads>& threads, const std::vector<OclDevice>& devices)
|
||||||
{
|
{
|
||||||
return generate("cn/upx2", threads, Algorithm::CN_UPX2, devices);
|
return generate(Algorithm::kCN_UPX2, threads, Algorithm::CN_UPX2, devices);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -121,14 +115,14 @@ size_t inline generate<Algorithm::RANDOM_X>(Threads<OclThreads> &threads, const
|
||||||
auto arq = OclThreads(devices, Algorithm::RX_ARQ);
|
auto arq = OclThreads(devices, Algorithm::RX_ARQ);
|
||||||
|
|
||||||
if (!threads.isExist(Algorithm::RX_WOW) && wow != rx) {
|
if (!threads.isExist(Algorithm::RX_WOW) && wow != rx) {
|
||||||
count += threads.move("rx/wow", std::move(wow));
|
count += threads.move(Algorithm::kRX_WOW, std::move(wow));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!threads.isExist(Algorithm::RX_ARQ) && arq != rx) {
|
if (!threads.isExist(Algorithm::RX_ARQ) && arq != rx) {
|
||||||
count += threads.move("rx/arq", std::move(arq));
|
count += threads.move(Algorithm::kRX_ARQ, std::move(arq));
|
||||||
}
|
}
|
||||||
|
|
||||||
count += threads.move("rx", std::move(rx));
|
count += threads.move(Algorithm::kRX, std::move(rx));
|
||||||
|
|
||||||
return count;
|
return count;
|
||||||
}
|
}
|
||||||
|
@ -139,7 +133,7 @@ size_t inline generate<Algorithm::RANDOM_X>(Threads<OclThreads> &threads, const
|
||||||
template<>
|
template<>
|
||||||
size_t inline generate<Algorithm::ASTROBWT>(Threads<OclThreads>& threads, const std::vector<OclDevice>& devices)
|
size_t inline generate<Algorithm::ASTROBWT>(Threads<OclThreads>& threads, const std::vector<OclDevice>& devices)
|
||||||
{
|
{
|
||||||
return generate("astrobwt", threads, Algorithm::ASTROBWT_DERO, devices);
|
return generate(Algorithm::kASTROBWT, threads, Algorithm::ASTROBWT_DERO, devices);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -148,7 +142,7 @@ size_t inline generate<Algorithm::ASTROBWT>(Threads<OclThreads>& threads, const
|
||||||
template<>
|
template<>
|
||||||
size_t inline generate<Algorithm::KAWPOW>(Threads<OclThreads>& threads, const std::vector<OclDevice>& devices)
|
size_t inline generate<Algorithm::KAWPOW>(Threads<OclThreads>& threads, const std::vector<OclDevice>& devices)
|
||||||
{
|
{
|
||||||
return generate("kawpow", threads, Algorithm::KAWPOW_RVN, devices);
|
return generate(Algorithm::kKAWPOW, threads, Algorithm::KAWPOW_RVN, devices);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -37,6 +37,7 @@ namespace xmrig {
|
||||||
|
|
||||||
|
|
||||||
const char *Algorithm::kINVALID = "invalid";
|
const char *Algorithm::kINVALID = "invalid";
|
||||||
|
const char *Algorithm::kCN = "cn";
|
||||||
const char *Algorithm::kCN_0 = "cn/0";
|
const char *Algorithm::kCN_0 = "cn/0";
|
||||||
const char *Algorithm::kCN_1 = "cn/1";
|
const char *Algorithm::kCN_1 = "cn/1";
|
||||||
const char *Algorithm::kCN_2 = "cn/2";
|
const char *Algorithm::kCN_2 = "cn/2";
|
||||||
|
@ -51,17 +52,20 @@ const char *Algorithm::kCN_DOUBLE = "cn/double";
|
||||||
const char *Algorithm::kCN_CCX = "cn/ccx";
|
const char *Algorithm::kCN_CCX = "cn/ccx";
|
||||||
|
|
||||||
#ifdef XMRIG_ALGO_CN_LITE
|
#ifdef XMRIG_ALGO_CN_LITE
|
||||||
|
const char *Algorithm::kCN_LITE = "cn-lite";
|
||||||
const char *Algorithm::kCN_LITE_0 = "cn-lite/0";
|
const char *Algorithm::kCN_LITE_0 = "cn-lite/0";
|
||||||
const char *Algorithm::kCN_LITE_1 = "cn-lite/1";
|
const char *Algorithm::kCN_LITE_1 = "cn-lite/1";
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef XMRIG_ALGO_CN_HEAVY
|
#ifdef XMRIG_ALGO_CN_HEAVY
|
||||||
|
const char *Algorithm::kCN_HEAVY = "cn-heavy";
|
||||||
const char *Algorithm::kCN_HEAVY_0 = "cn-heavy/0";
|
const char *Algorithm::kCN_HEAVY_0 = "cn-heavy/0";
|
||||||
const char *Algorithm::kCN_HEAVY_TUBE = "cn-heavy/tube";
|
const char *Algorithm::kCN_HEAVY_TUBE = "cn-heavy/tube";
|
||||||
const char *Algorithm::kCN_HEAVY_XHV = "cn-heavy/xhv";
|
const char *Algorithm::kCN_HEAVY_XHV = "cn-heavy/xhv";
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef XMRIG_ALGO_CN_PICO
|
#ifdef XMRIG_ALGO_CN_PICO
|
||||||
|
const char *Algorithm::kCN_PICO = "cn-pico";
|
||||||
const char *Algorithm::kCN_PICO_0 = "cn-pico/0";
|
const char *Algorithm::kCN_PICO_0 = "cn-pico/0";
|
||||||
const char *Algorithm::kCN_PICO_TLO = "cn-pico/tlo";
|
const char *Algorithm::kCN_PICO_TLO = "cn-pico/tlo";
|
||||||
#endif
|
#endif
|
||||||
|
@ -71,6 +75,7 @@ const char *Algorithm::kCN_UPX2 = "cn/upx2";
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef XMRIG_ALGO_RANDOMX
|
#ifdef XMRIG_ALGO_RANDOMX
|
||||||
|
const char *Algorithm::kRX = "rx";
|
||||||
const char *Algorithm::kRX_0 = "rx/0";
|
const char *Algorithm::kRX_0 = "rx/0";
|
||||||
const char *Algorithm::kRX_WOW = "rx/wow";
|
const char *Algorithm::kRX_WOW = "rx/wow";
|
||||||
const char *Algorithm::kRX_ARQ = "rx/arq";
|
const char *Algorithm::kRX_ARQ = "rx/arq";
|
||||||
|
@ -79,16 +84,19 @@ const char *Algorithm::kRX_KEVA = "rx/keva";
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef XMRIG_ALGO_ARGON2
|
#ifdef XMRIG_ALGO_ARGON2
|
||||||
|
const char *Algorithm::kAR2 = "argon2";
|
||||||
const char *Algorithm::kAR2_CHUKWA = "argon2/chukwa";
|
const char *Algorithm::kAR2_CHUKWA = "argon2/chukwa";
|
||||||
const char *Algorithm::kAR2_CHUKWA_V2 = "argon2/chukwav2";
|
const char *Algorithm::kAR2_CHUKWA_V2 = "argon2/chukwav2";
|
||||||
const char *Algorithm::kAR2_WRKZ = "argon2/ninja";
|
const char *Algorithm::kAR2_WRKZ = "argon2/ninja";
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef XMRIG_ALGO_ASTROBWT
|
#ifdef XMRIG_ALGO_ASTROBWT
|
||||||
|
const char *Algorithm::kASTROBWT = "astrobwt";
|
||||||
const char *Algorithm::kASTROBWT_DERO = "astrobwt";
|
const char *Algorithm::kASTROBWT_DERO = "astrobwt";
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef XMRIG_ALGO_KAWPOW
|
#ifdef XMRIG_ALGO_KAWPOW
|
||||||
|
const char *Algorithm::kKAWPOW = "kawpow";
|
||||||
const char *Algorithm::kKAWPOW_RVN = "kawpow";
|
const char *Algorithm::kKAWPOW_RVN = "kawpow";
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -92,6 +92,7 @@ public:
|
||||||
};
|
};
|
||||||
|
|
||||||
static const char *kINVALID;
|
static const char *kINVALID;
|
||||||
|
static const char *kCN;
|
||||||
static const char *kCN_0;
|
static const char *kCN_0;
|
||||||
static const char *kCN_1;
|
static const char *kCN_1;
|
||||||
static const char *kCN_2;
|
static const char *kCN_2;
|
||||||
|
@ -106,17 +107,20 @@ public:
|
||||||
static const char *kCN_CCX;
|
static const char *kCN_CCX;
|
||||||
|
|
||||||
# ifdef XMRIG_ALGO_CN_LITE
|
# ifdef XMRIG_ALGO_CN_LITE
|
||||||
|
static const char *kCN_LITE;
|
||||||
static const char *kCN_LITE_0;
|
static const char *kCN_LITE_0;
|
||||||
static const char *kCN_LITE_1;
|
static const char *kCN_LITE_1;
|
||||||
# endif
|
# endif
|
||||||
|
|
||||||
# ifdef XMRIG_ALGO_CN_HEAVY
|
# ifdef XMRIG_ALGO_CN_HEAVY
|
||||||
|
static const char *kCN_HEAVY;
|
||||||
static const char *kCN_HEAVY_0;
|
static const char *kCN_HEAVY_0;
|
||||||
static const char *kCN_HEAVY_TUBE;
|
static const char *kCN_HEAVY_TUBE;
|
||||||
static const char *kCN_HEAVY_XHV;
|
static const char *kCN_HEAVY_XHV;
|
||||||
# endif
|
# endif
|
||||||
|
|
||||||
# ifdef XMRIG_ALGO_CN_PICO
|
# ifdef XMRIG_ALGO_CN_PICO
|
||||||
|
static const char *kCN_PICO;
|
||||||
static const char *kCN_PICO_0;
|
static const char *kCN_PICO_0;
|
||||||
static const char *kCN_PICO_TLO;
|
static const char *kCN_PICO_TLO;
|
||||||
# endif
|
# endif
|
||||||
|
@ -126,6 +130,7 @@ public:
|
||||||
# endif
|
# endif
|
||||||
|
|
||||||
# ifdef XMRIG_ALGO_RANDOMX
|
# ifdef XMRIG_ALGO_RANDOMX
|
||||||
|
static const char *kRX;
|
||||||
static const char *kRX_0;
|
static const char *kRX_0;
|
||||||
static const char *kRX_WOW;
|
static const char *kRX_WOW;
|
||||||
static const char *kRX_ARQ;
|
static const char *kRX_ARQ;
|
||||||
|
@ -134,16 +139,19 @@ public:
|
||||||
# endif
|
# endif
|
||||||
|
|
||||||
# ifdef XMRIG_ALGO_ARGON2
|
# ifdef XMRIG_ALGO_ARGON2
|
||||||
|
static const char *kAR2;
|
||||||
static const char *kAR2_CHUKWA;
|
static const char *kAR2_CHUKWA;
|
||||||
static const char *kAR2_CHUKWA_V2;
|
static const char *kAR2_CHUKWA_V2;
|
||||||
static const char *kAR2_WRKZ;
|
static const char *kAR2_WRKZ;
|
||||||
# endif
|
# endif
|
||||||
|
|
||||||
# ifdef XMRIG_ALGO_ASTROBWT
|
# ifdef XMRIG_ALGO_ASTROBWT
|
||||||
|
static const char *kASTROBWT;
|
||||||
static const char *kASTROBWT_DERO;
|
static const char *kASTROBWT_DERO;
|
||||||
# endif
|
# endif
|
||||||
|
|
||||||
# ifdef XMRIG_ALGO_KAWPOW
|
# ifdef XMRIG_ALGO_KAWPOW
|
||||||
|
static const char *kKAWPOW;
|
||||||
static const char *kKAWPOW_RVN;
|
static const char *kKAWPOW_RVN;
|
||||||
# endif
|
# endif
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue