mirror of
https://github.com/xmrig/xmrig.git
synced 2026-01-14 12:02:45 -05:00
Compare commits
24 Commits
v6.21.2
...
92ffcd34d6
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
92ffcd34d6 | ||
|
|
b108845627 | ||
|
|
046b2a17d3 | ||
|
|
5342f25fbf | ||
|
|
5f6bcfe949 | ||
|
|
ecef382326 | ||
|
|
86f5db19d2 | ||
|
|
b4a47d6ed0 | ||
|
|
f5095247e8 | ||
|
|
2bb07fe633 | ||
|
|
a7be8cb80c | ||
|
|
2ce16df423 | ||
|
|
5eaa6c152e | ||
|
|
6972f727c1 | ||
|
|
7897f10c48 | ||
|
|
da2fb331b3 | ||
|
|
57f3e9c3da | ||
|
|
1efe7e9562 | ||
|
|
caae7c64f0 | ||
|
|
9fbdcc0ef0 | ||
|
|
c7c26d97fe | ||
|
|
1f7e635b04 | ||
|
|
1c5786e3c5 | ||
|
|
44eb4f0038 |
@@ -1,3 +1,6 @@
|
|||||||
|
# v6.21.3
|
||||||
|
- [#3462](https://github.com/xmrig/xmrig/pull/3462) RandomX: correct memcpy size for JIT initialization.
|
||||||
|
|
||||||
# v6.21.2
|
# v6.21.2
|
||||||
- The dependencies of all prebuilt releases have been updated. Support for old Ubuntu releases has been dropped.
|
- The dependencies of all prebuilt releases have been updated. Support for old Ubuntu releases has been dropped.
|
||||||
- [#2800](https://github.com/xmrig/xmrig/issues/2800) Fixed donation with GhostRider algorithm for builds without KawPow algorithm.
|
- [#2800](https://github.com/xmrig/xmrig/issues/2800) Fixed donation with GhostRider algorithm for builds without KawPow algorithm.
|
||||||
|
|||||||
@@ -13,7 +13,6 @@ Option `coin` useful for pools without [algorithm negotiation](https://xmrig.com
|
|||||||
| Name | Memory | Version | Description | Notes |
|
| Name | Memory | Version | Description | Notes |
|
||||||
|------|--------|---------|-------------|-------|
|
|------|--------|---------|-------------|-------|
|
||||||
| `kawpow` | - | 6.0.0+ | KawPow (Ravencoin) | GPU only |
|
| `kawpow` | - | 6.0.0+ | KawPow (Ravencoin) | GPU only |
|
||||||
| `rx/keva` | 1 MB | 5.9.0+ | RandomKEVA (RandomX variant for Keva). | |
|
|
||||||
| `astrobwt` | 20 MB | 5.8.0+ | AstroBWT (Dero). | |
|
| `astrobwt` | 20 MB | 5.8.0+ | AstroBWT (Dero). | |
|
||||||
| `cn-pico/tlo` | 256 KB | 5.5.0+ | CryptoNight-Pico (Talleo). | |
|
| `cn-pico/tlo` | 256 KB | 5.5.0+ | CryptoNight-Pico (Talleo). | |
|
||||||
| `rx/sfx` | 2 MB | 5.4.0+ | RandomSFX (RandomX variant for Safex). | |
|
| `rx/sfx` | 2 MB | 5.4.0+ | RandomSFX (RandomX variant for Safex). | |
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
#!/bin/sh -e
|
#!/bin/sh -e
|
||||||
|
|
||||||
OPENSSL_VERSION="1.1.1s"
|
OPENSSL_VERSION="1.1.1u"
|
||||||
|
|
||||||
mkdir -p deps
|
mkdir -p deps
|
||||||
mkdir -p deps/include
|
mkdir -p deps/include
|
||||||
@@ -8,7 +8,7 @@ mkdir -p deps/lib
|
|||||||
|
|
||||||
mkdir -p build && cd build
|
mkdir -p build && cd build
|
||||||
|
|
||||||
wget https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz -O openssl-${OPENSSL_VERSION}.tar.gz
|
wget https://openssl.org/source/old/1.1.1/openssl-${OPENSSL_VERSION}.tar.gz -O openssl-${OPENSSL_VERSION}.tar.gz
|
||||||
tar -xzf openssl-${OPENSSL_VERSION}.tar.gz
|
tar -xzf openssl-${OPENSSL_VERSION}.tar.gz
|
||||||
|
|
||||||
cd openssl-${OPENSSL_VERSION}
|
cd openssl-${OPENSSL_VERSION}
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
#!/bin/sh -e
|
#!/bin/sh -e
|
||||||
|
|
||||||
OPENSSL_VERSION="3.0.13"
|
OPENSSL_VERSION="3.0.14"
|
||||||
|
|
||||||
mkdir -p deps
|
mkdir -p deps
|
||||||
mkdir -p deps/include
|
mkdir -p deps/include
|
||||||
@@ -8,7 +8,7 @@ mkdir -p deps/lib
|
|||||||
|
|
||||||
mkdir -p build && cd build
|
mkdir -p build && cd build
|
||||||
|
|
||||||
wget https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz -O openssl-${OPENSSL_VERSION}.tar.gz
|
wget https://github.com/openssl/openssl/releases/download/openssl-${OPENSSL_VERSION}/openssl-${OPENSSL_VERSION}.tar.gz -O openssl-${OPENSSL_VERSION}.tar.gz
|
||||||
tar -xzf openssl-${OPENSSL_VERSION}.tar.gz
|
tar -xzf openssl-${OPENSSL_VERSION}.tar.gz
|
||||||
|
|
||||||
cd openssl-${OPENSSL_VERSION}
|
cd openssl-${OPENSSL_VERSION}
|
||||||
|
|||||||
@@ -50,7 +50,6 @@ function rx()
|
|||||||
'randomx_constants_monero.h',
|
'randomx_constants_monero.h',
|
||||||
'randomx_constants_wow.h',
|
'randomx_constants_wow.h',
|
||||||
'randomx_constants_arqma.h',
|
'randomx_constants_arqma.h',
|
||||||
'randomx_constants_keva.h',
|
|
||||||
'randomx_constants_graft.h',
|
'randomx_constants_graft.h',
|
||||||
'aes.cl',
|
'aes.cl',
|
||||||
'blake2b.cl',
|
'blake2b.cl',
|
||||||
|
|||||||
@@ -6,8 +6,8 @@
|
|||||||
* 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 Lee Clagett <https://github.com/vtnerd>
|
* Copyright 2018 Lee Clagett <https://github.com/vtnerd>
|
||||||
* Copyright 2018-2020 SChernykh <https://github.com/SChernykh>
|
* Copyright 2018-2024 SChernykh <https://github.com/SChernykh>
|
||||||
* Copyright 2016-2020 XMRig <https://github.com/xmrig>, <support@xmrig.com>
|
* Copyright 2016-2024 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
|
||||||
@@ -23,7 +23,6 @@
|
|||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
#include <cstdlib>
|
#include <cstdlib>
|
||||||
#include <uv.h>
|
#include <uv.h>
|
||||||
|
|
||||||
@@ -61,13 +60,13 @@ int xmrig::App::exec()
|
|||||||
return 2;
|
return 2;
|
||||||
}
|
}
|
||||||
|
|
||||||
m_signals = std::make_shared<Signals>(this);
|
|
||||||
|
|
||||||
int rc = 0;
|
int rc = 0;
|
||||||
if (background(rc)) {
|
if (background(rc)) {
|
||||||
return rc;
|
return rc;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
m_signals = std::make_shared<Signals>(this);
|
||||||
|
|
||||||
rc = m_controller->init();
|
rc = m_controller->init();
|
||||||
if (rc != 0) {
|
if (rc != 0) {
|
||||||
return rc;
|
return rc;
|
||||||
|
|||||||
@@ -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-2020 SChernykh <https://github.com/SChernykh>
|
* Copyright 2018-2024 SChernykh <https://github.com/SChernykh>
|
||||||
* Copyright 2016-2020 XMRig <https://github.com/xmrig>, <support@xmrig.com>
|
* Copyright 2016-2024 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
|
||||||
@@ -22,7 +22,6 @@
|
|||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
#include <cstdlib>
|
#include <cstdlib>
|
||||||
#include <csignal>
|
#include <csignal>
|
||||||
#include <cerrno>
|
#include <cerrno>
|
||||||
@@ -53,16 +52,9 @@ bool xmrig::App::background(int &rc)
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
i = setsid();
|
if (setsid() < 0) {
|
||||||
|
|
||||||
if (i < 0) {
|
|
||||||
LOG_ERR("setsid() failed (errno = %d)", errno);
|
LOG_ERR("setsid() failed (errno = %d)", errno);
|
||||||
}
|
}
|
||||||
|
|
||||||
i = chdir("/");
|
|
||||||
if (i < 0) {
|
|
||||||
LOG_ERR("chdir() failed (errno = %d)", errno);
|
|
||||||
}
|
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -122,21 +122,15 @@ size_t inline generate<Algorithm::RANDOM_X>(Threads<CpuThreads> &threads, uint32
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!threads.isExist(Algorithm::RX_KEVA)) {
|
|
||||||
auto keva = cpuInfo->threads(Algorithm::RX_KEVA, limit);
|
|
||||||
if (keva == wow) {
|
|
||||||
threads.setAlias(Algorithm::RX_KEVA, Algorithm::kRX_WOW);
|
|
||||||
++count;
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
count += threads.move(Algorithm::kRX_KEVA, std::move(keva));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!threads.isExist(Algorithm::RX_WOW)) {
|
if (!threads.isExist(Algorithm::RX_WOW)) {
|
||||||
count += threads.move(Algorithm::kRX_WOW, std::move(wow));
|
count += threads.move(Algorithm::kRX_WOW, std::move(wow));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (!threads.isExist(Algorithm::RX_YADA)) {
|
||||||
|
auto yada = cpuInfo->threads(Algorithm::RX_YADA, limit);
|
||||||
|
count += threads.move(Algorithm::kRX_YADA, std::move(yada));
|
||||||
|
}
|
||||||
|
|
||||||
count += generate(Algorithm::kRX, threads, Algorithm::RX_0, limit);
|
count += generate(Algorithm::kRX, threads, Algorithm::RX_0, limit);
|
||||||
|
|
||||||
return count;
|
return count;
|
||||||
|
|||||||
@@ -114,7 +114,6 @@ size_t inline generate<Algorithm::RANDOM_X>(Threads<CudaThreads> &threads, const
|
|||||||
auto rx = CudaThreads(devices, Algorithm::RX_0);
|
auto rx = CudaThreads(devices, Algorithm::RX_0);
|
||||||
auto wow = CudaThreads(devices, Algorithm::RX_WOW);
|
auto wow = CudaThreads(devices, Algorithm::RX_WOW);
|
||||||
auto arq = CudaThreads(devices, Algorithm::RX_ARQ);
|
auto arq = CudaThreads(devices, Algorithm::RX_ARQ);
|
||||||
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(Algorithm::kRX_WOW, std::move(wow));
|
count += threads.move(Algorithm::kRX_WOW, std::move(wow));
|
||||||
@@ -124,10 +123,6 @@ size_t inline generate<Algorithm::RANDOM_X>(Threads<CudaThreads> &threads, const
|
|||||||
count += threads.move(Algorithm::kRX_ARQ, std::move(arq));
|
count += threads.move(Algorithm::kRX_ARQ, std::move(arq));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!threads.isExist(Algorithm::RX_KEVA) && kva != rx) {
|
|
||||||
count += threads.move(Algorithm::kRX_KEVA, std::move(kva));
|
|
||||||
}
|
|
||||||
|
|
||||||
count += threads.move(Algorithm::kRX, std::move(rx));
|
count += threads.move(Algorithm::kRX, std::move(rx));
|
||||||
|
|
||||||
return count;
|
return count;
|
||||||
|
|||||||
@@ -22,7 +22,6 @@
|
|||||||
#define ALGO_RX_WOW 0x72141177
|
#define ALGO_RX_WOW 0x72141177
|
||||||
#define ALGO_RX_ARQMA 0x72121061
|
#define ALGO_RX_ARQMA 0x72121061
|
||||||
#define ALGO_RX_SFX 0x72151273
|
#define ALGO_RX_SFX 0x72151273
|
||||||
#define ALGO_RX_KEVA 0x7214116b
|
|
||||||
#define ALGO_RX_GRAFT 0x72151267
|
#define ALGO_RX_GRAFT 0x72151267
|
||||||
#define ALGO_AR2_CHUKWA 0x61130000
|
#define ALGO_AR2_CHUKWA 0x61130000
|
||||||
#define ALGO_AR2_CHUKWA_V2 0x61140000
|
#define ALGO_AR2_CHUKWA_V2 0x61140000
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
namespace xmrig {
|
namespace xmrig {
|
||||||
|
|
||||||
static const char cryptonight_cl[61447] = {
|
static const char cryptonight_cl[61415] = {
|
||||||
0x23,0x69,0x66,0x64,0x65,0x66,0x20,0x53,0x54,0x41,0x54,0x49,0x43,0x0a,0x23,0x75,0x6e,0x64,0x65,0x66,0x20,0x53,0x54,0x41,0x54,0x49,0x43,0x0a,0x23,0x65,0x6e,0x64,
|
0x23,0x69,0x66,0x64,0x65,0x66,0x20,0x53,0x54,0x41,0x54,0x49,0x43,0x0a,0x23,0x75,0x6e,0x64,0x65,0x66,0x20,0x53,0x54,0x41,0x54,0x49,0x43,0x0a,0x23,0x65,0x6e,0x64,
|
||||||
0x69,0x66,0x0a,0x23,0x69,0x66,0x64,0x65,0x66,0x20,0x63,0x6c,0x5f,0x61,0x6d,0x64,0x5f,0x6d,0x65,0x64,0x69,0x61,0x5f,0x6f,0x70,0x73,0x0a,0x23,0x64,0x65,0x66,0x69,
|
0x69,0x66,0x0a,0x23,0x69,0x66,0x64,0x65,0x66,0x20,0x63,0x6c,0x5f,0x61,0x6d,0x64,0x5f,0x6d,0x65,0x64,0x69,0x61,0x5f,0x6f,0x70,0x73,0x0a,0x23,0x64,0x65,0x66,0x69,
|
||||||
0x6e,0x65,0x20,0x53,0x54,0x41,0x54,0x49,0x43,0x20,0x73,0x74,0x61,0x74,0x69,0x63,0x0a,0x23,0x65,0x6c,0x73,0x65,0x0a,0x23,0x64,0x65,0x66,0x69,0x6e,0x65,0x20,0x53,
|
0x6e,0x65,0x20,0x53,0x54,0x41,0x54,0x49,0x43,0x20,0x73,0x74,0x61,0x74,0x69,0x63,0x0a,0x23,0x65,0x6c,0x73,0x65,0x0a,0x23,0x64,0x65,0x66,0x69,0x6e,0x65,0x20,0x53,
|
||||||
@@ -34,8 +34,7 @@ static const char cryptonight_cl[61447] = {
|
|||||||
0x31,0x35,0x31,0x32,0x30,0x30,0x0a,0x23,0x64,0x65,0x66,0x69,0x6e,0x65,0x20,0x41,0x4c,0x47,0x4f,0x5f,0x52,0x58,0x5f,0x57,0x4f,0x57,0x20,0x30,0x78,0x37,0x32,0x31,
|
0x31,0x35,0x31,0x32,0x30,0x30,0x0a,0x23,0x64,0x65,0x66,0x69,0x6e,0x65,0x20,0x41,0x4c,0x47,0x4f,0x5f,0x52,0x58,0x5f,0x57,0x4f,0x57,0x20,0x30,0x78,0x37,0x32,0x31,
|
||||||
0x34,0x31,0x31,0x37,0x37,0x0a,0x23,0x64,0x65,0x66,0x69,0x6e,0x65,0x20,0x41,0x4c,0x47,0x4f,0x5f,0x52,0x58,0x5f,0x41,0x52,0x51,0x4d,0x41,0x20,0x30,0x78,0x37,0x32,
|
0x34,0x31,0x31,0x37,0x37,0x0a,0x23,0x64,0x65,0x66,0x69,0x6e,0x65,0x20,0x41,0x4c,0x47,0x4f,0x5f,0x52,0x58,0x5f,0x41,0x52,0x51,0x4d,0x41,0x20,0x30,0x78,0x37,0x32,
|
||||||
0x31,0x32,0x31,0x30,0x36,0x31,0x0a,0x23,0x64,0x65,0x66,0x69,0x6e,0x65,0x20,0x41,0x4c,0x47,0x4f,0x5f,0x52,0x58,0x5f,0x53,0x46,0x58,0x20,0x30,0x78,0x37,0x32,0x31,
|
0x31,0x32,0x31,0x30,0x36,0x31,0x0a,0x23,0x64,0x65,0x66,0x69,0x6e,0x65,0x20,0x41,0x4c,0x47,0x4f,0x5f,0x52,0x58,0x5f,0x53,0x46,0x58,0x20,0x30,0x78,0x37,0x32,0x31,
|
||||||
0x35,0x31,0x32,0x37,0x33,0x0a,0x23,0x64,0x65,0x66,0x69,0x6e,0x65,0x20,0x41,0x4c,0x47,0x4f,0x5f,0x52,0x58,0x5f,0x4b,0x45,0x56,0x41,0x20,0x30,0x78,0x37,0x32,0x31,
|
0x35,0x31,0x32,0x37,0x33,0x0a,0x23,0x64,0x65,0x66,0x69,0x6e,0x65,0x20,0x41,0x4c,0x47,0x4f,0x5f,0x52,0x58,0x5f,0x47,0x52,0x41,0x46,0x54,0x20,0x30,0x78,0x37,0x32,
|
||||||
0x34,0x31,0x31,0x36,0x62,0x0a,0x23,0x64,0x65,0x66,0x69,0x6e,0x65,0x20,0x41,0x4c,0x47,0x4f,0x5f,0x52,0x58,0x5f,0x47,0x52,0x41,0x46,0x54,0x20,0x30,0x78,0x37,0x32,
|
|
||||||
0x31,0x35,0x31,0x32,0x36,0x37,0x0a,0x23,0x64,0x65,0x66,0x69,0x6e,0x65,0x20,0x41,0x4c,0x47,0x4f,0x5f,0x41,0x52,0x32,0x5f,0x43,0x48,0x55,0x4b,0x57,0x41,0x20,0x30,
|
0x31,0x35,0x31,0x32,0x36,0x37,0x0a,0x23,0x64,0x65,0x66,0x69,0x6e,0x65,0x20,0x41,0x4c,0x47,0x4f,0x5f,0x41,0x52,0x32,0x5f,0x43,0x48,0x55,0x4b,0x57,0x41,0x20,0x30,
|
||||||
0x78,0x36,0x31,0x31,0x33,0x30,0x30,0x30,0x30,0x0a,0x23,0x64,0x65,0x66,0x69,0x6e,0x65,0x20,0x41,0x4c,0x47,0x4f,0x5f,0x41,0x52,0x32,0x5f,0x43,0x48,0x55,0x4b,0x57,
|
0x78,0x36,0x31,0x31,0x33,0x30,0x30,0x30,0x30,0x0a,0x23,0x64,0x65,0x66,0x69,0x6e,0x65,0x20,0x41,0x4c,0x47,0x4f,0x5f,0x41,0x52,0x32,0x5f,0x43,0x48,0x55,0x4b,0x57,
|
||||||
0x41,0x5f,0x56,0x32,0x20,0x30,0x78,0x36,0x31,0x31,0x34,0x30,0x30,0x30,0x30,0x0a,0x23,0x64,0x65,0x66,0x69,0x6e,0x65,0x20,0x41,0x4c,0x47,0x4f,0x5f,0x41,0x52,0x32,
|
0x41,0x5f,0x56,0x32,0x20,0x30,0x78,0x36,0x31,0x31,0x34,0x30,0x30,0x30,0x30,0x0a,0x23,0x64,0x65,0x66,0x69,0x6e,0x65,0x20,0x41,0x4c,0x47,0x4f,0x5f,0x41,0x52,0x32,
|
||||||
|
|||||||
@@ -6,8 +6,6 @@
|
|||||||
#include "randomx_constants_wow.h"
|
#include "randomx_constants_wow.h"
|
||||||
#elif (ALGO == ALGO_RX_ARQMA)
|
#elif (ALGO == ALGO_RX_ARQMA)
|
||||||
#include "randomx_constants_arqma.h"
|
#include "randomx_constants_arqma.h"
|
||||||
#elif (ALGO == ALGO_RX_KEVA)
|
|
||||||
#include "randomx_constants_keva.h"
|
|
||||||
#elif (ALGO == ALGO_RX_GRAFT)
|
#elif (ALGO == ALGO_RX_GRAFT)
|
||||||
#include "randomx_constants_graft.h"
|
#include "randomx_constants_graft.h"
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -1,96 +0,0 @@
|
|||||||
/*
|
|
||||||
Copyright (c) 2019 SChernykh
|
|
||||||
|
|
||||||
This file is part of RandomX OpenCL.
|
|
||||||
|
|
||||||
RandomX OpenCL is free software: you can redistribute it and/or modify
|
|
||||||
it under the terms of the GNU General Public License as published by
|
|
||||||
the Free Software Foundation, either version 3 of the License, or
|
|
||||||
(at your option) any later version.
|
|
||||||
|
|
||||||
RandomX OpenCL is distributed in the hope that it will be useful,
|
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
GNU General Public License for more details.
|
|
||||||
|
|
||||||
You should have received a copy of the GNU General Public License
|
|
||||||
along with RandomX OpenCL. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
//Dataset base size in bytes. Must be a power of 2.
|
|
||||||
#define RANDOMX_DATASET_BASE_SIZE 2147483648
|
|
||||||
|
|
||||||
//Dataset extra size. Must be divisible by 64.
|
|
||||||
#define RANDOMX_DATASET_EXTRA_SIZE 33554368
|
|
||||||
|
|
||||||
//Scratchpad L3 size in bytes. Must be a power of 2.
|
|
||||||
#define RANDOMX_SCRATCHPAD_L3 1048576
|
|
||||||
|
|
||||||
//Scratchpad L2 size in bytes. Must be a power of two and less than or equal to RANDOMX_SCRATCHPAD_L3.
|
|
||||||
#define RANDOMX_SCRATCHPAD_L2 131072
|
|
||||||
|
|
||||||
//Scratchpad L1 size in bytes. Must be a power of two (minimum 64) and less than or equal to RANDOMX_SCRATCHPAD_L2.
|
|
||||||
#define RANDOMX_SCRATCHPAD_L1 16384
|
|
||||||
|
|
||||||
//Jump condition mask size in bits.
|
|
||||||
#define RANDOMX_JUMP_BITS 8
|
|
||||||
|
|
||||||
//Jump condition mask offset in bits. The sum of RANDOMX_JUMP_BITS and RANDOMX_JUMP_OFFSET must not exceed 16.
|
|
||||||
#define RANDOMX_JUMP_OFFSET 8
|
|
||||||
|
|
||||||
//Integer instructions
|
|
||||||
#define RANDOMX_FREQ_IADD_RS 16
|
|
||||||
#define RANDOMX_FREQ_IADD_M 7
|
|
||||||
#define RANDOMX_FREQ_ISUB_R 16
|
|
||||||
#define RANDOMX_FREQ_ISUB_M 7
|
|
||||||
#define RANDOMX_FREQ_IMUL_R 16
|
|
||||||
#define RANDOMX_FREQ_IMUL_M 4
|
|
||||||
#define RANDOMX_FREQ_IMULH_R 4
|
|
||||||
#define RANDOMX_FREQ_IMULH_M 1
|
|
||||||
#define RANDOMX_FREQ_ISMULH_R 4
|
|
||||||
#define RANDOMX_FREQ_ISMULH_M 1
|
|
||||||
#define RANDOMX_FREQ_IMUL_RCP 8
|
|
||||||
#define RANDOMX_FREQ_INEG_R 2
|
|
||||||
#define RANDOMX_FREQ_IXOR_R 15
|
|
||||||
#define RANDOMX_FREQ_IXOR_M 5
|
|
||||||
#define RANDOMX_FREQ_IROR_R 8
|
|
||||||
#define RANDOMX_FREQ_IROL_R 2
|
|
||||||
#define RANDOMX_FREQ_ISWAP_R 4
|
|
||||||
|
|
||||||
//Floating point instructions
|
|
||||||
#define RANDOMX_FREQ_FSWAP_R 4
|
|
||||||
#define RANDOMX_FREQ_FADD_R 16
|
|
||||||
#define RANDOMX_FREQ_FADD_M 5
|
|
||||||
#define RANDOMX_FREQ_FSUB_R 16
|
|
||||||
#define RANDOMX_FREQ_FSUB_M 5
|
|
||||||
#define RANDOMX_FREQ_FSCAL_R 6
|
|
||||||
#define RANDOMX_FREQ_FMUL_R 32
|
|
||||||
#define RANDOMX_FREQ_FDIV_M 4
|
|
||||||
#define RANDOMX_FREQ_FSQRT_R 6
|
|
||||||
|
|
||||||
//Control instructions
|
|
||||||
#define RANDOMX_FREQ_CBRANCH 25
|
|
||||||
#define RANDOMX_FREQ_CFROUND 1
|
|
||||||
|
|
||||||
//Store instruction
|
|
||||||
#define RANDOMX_FREQ_ISTORE 16
|
|
||||||
|
|
||||||
//No-op instruction
|
|
||||||
#define RANDOMX_FREQ_NOP 0
|
|
||||||
|
|
||||||
#define RANDOMX_DATASET_ITEM_SIZE 64
|
|
||||||
|
|
||||||
#define RANDOMX_PROGRAM_SIZE 256
|
|
||||||
|
|
||||||
#define HASH_SIZE 64
|
|
||||||
#define ENTROPY_SIZE (128 + RANDOMX_PROGRAM_SIZE * 8)
|
|
||||||
#define REGISTERS_SIZE 256
|
|
||||||
#define IMM_BUF_SIZE (RANDOMX_PROGRAM_SIZE * 4 - REGISTERS_SIZE)
|
|
||||||
#define IMM_INDEX_COUNT ((IMM_BUF_SIZE / 4) - 2)
|
|
||||||
#define VM_STATE_SIZE (REGISTERS_SIZE + IMM_BUF_SIZE + RANDOMX_PROGRAM_SIZE * 4)
|
|
||||||
#define ROUNDING_MODE (RANDOMX_FREQ_CFROUND ? -1 : 0)
|
|
||||||
|
|
||||||
// Scratchpad L1/L2/L3 bits
|
|
||||||
#define LOC_L1 (32 - 14)
|
|
||||||
#define LOC_L2 (32 - 17)
|
|
||||||
#define LOC_L3 (32 - 20)
|
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
/* XMRig
|
/* XMRig
|
||||||
* Copyright (c) 2018-2023 SChernykh <https://github.com/SChernykh>
|
* Copyright (c) 2018-2024 SChernykh <https://github.com/SChernykh>
|
||||||
* Copyright (c) 2016-2023 XMRig <https://github.com/xmrig>, <support@xmrig.com>
|
* Copyright (c) 2016-2024 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
|
||||||
@@ -25,6 +25,8 @@
|
|||||||
#include "base/crypto/keccak.h"
|
#include "base/crypto/keccak.h"
|
||||||
#include "base/io/Env.h"
|
#include "base/io/Env.h"
|
||||||
#include "base/io/json/Json.h"
|
#include "base/io/json/Json.h"
|
||||||
|
#include "base/io/log/Log.h"
|
||||||
|
#include "base/io/log/Tags.h"
|
||||||
#include "base/kernel/Base.h"
|
#include "base/kernel/Base.h"
|
||||||
#include "base/tools/Chrono.h"
|
#include "base/tools/Chrono.h"
|
||||||
#include "base/tools/Cvt.h"
|
#include "base/tools/Cvt.h"
|
||||||
@@ -39,7 +41,6 @@
|
|||||||
|
|
||||||
|
|
||||||
#include <thread>
|
#include <thread>
|
||||||
#include <iostream>
|
|
||||||
|
|
||||||
|
|
||||||
namespace xmrig {
|
namespace xmrig {
|
||||||
@@ -81,8 +82,7 @@ static rapidjson::Value getResources(rapidjson::Document &doc)
|
|||||||
|
|
||||||
xmrig::Api::Api(Base *base) :
|
xmrig::Api::Api(Base *base) :
|
||||||
m_base(base),
|
m_base(base),
|
||||||
m_timestamp(Chrono::currentMSecsSinceEpoch()),
|
m_timestamp(Chrono::currentMSecsSinceEpoch())
|
||||||
m_httpd(nullptr)
|
|
||||||
{
|
{
|
||||||
base->addListener(this);
|
base->addListener(this);
|
||||||
|
|
||||||
@@ -118,7 +118,8 @@ void xmrig::Api::start()
|
|||||||
if (!m_httpd) {
|
if (!m_httpd) {
|
||||||
m_httpd = new Httpd(m_base);
|
m_httpd = new Httpd(m_base);
|
||||||
if (!m_httpd->start()) {
|
if (!m_httpd->start()) {
|
||||||
std::cerr << "HTTP server failed to start." << std::endl;
|
LOG_ERR("%s " RED_BOLD("HTTP API server failed to start."), Tags::network());
|
||||||
|
|
||||||
delete m_httpd; // Properly handle failure to start
|
delete m_httpd; // Properly handle failure to start
|
||||||
m_httpd = nullptr;
|
m_httpd = nullptr;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
/* XMRig
|
/* XMRig
|
||||||
* Copyright (c) 2018-2023 SChernykh <https://github.com/SChernykh>
|
* Copyright (c) 2018-2024 SChernykh <https://github.com/SChernykh>
|
||||||
* Copyright (c) 2016-2023 XMRig <https://github.com/xmrig>, <support@xmrig.com>
|
* Copyright (c) 2016-2024 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
|
||||||
|
|||||||
@@ -81,7 +81,7 @@ const char *Algorithm::kRX_WOW = "rx/wow";
|
|||||||
const char *Algorithm::kRX_ARQ = "rx/arq";
|
const char *Algorithm::kRX_ARQ = "rx/arq";
|
||||||
const char *Algorithm::kRX_GRAFT = "rx/graft";
|
const char *Algorithm::kRX_GRAFT = "rx/graft";
|
||||||
const char *Algorithm::kRX_SFX = "rx/sfx";
|
const char *Algorithm::kRX_SFX = "rx/sfx";
|
||||||
const char *Algorithm::kRX_KEVA = "rx/keva";
|
const char *Algorithm::kRX_YADA = "rx/yada";
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef XMRIG_ALGO_ARGON2
|
#ifdef XMRIG_ALGO_ARGON2
|
||||||
@@ -147,7 +147,7 @@ static const std::map<uint32_t, const char *> kAlgorithmNames = {
|
|||||||
ALGO_NAME(RX_ARQ),
|
ALGO_NAME(RX_ARQ),
|
||||||
ALGO_NAME(RX_GRAFT),
|
ALGO_NAME(RX_GRAFT),
|
||||||
ALGO_NAME(RX_SFX),
|
ALGO_NAME(RX_SFX),
|
||||||
ALGO_NAME(RX_KEVA),
|
ALGO_NAME(RX_YADA),
|
||||||
# endif
|
# endif
|
||||||
|
|
||||||
# ifdef XMRIG_ALGO_ARGON2
|
# ifdef XMRIG_ALGO_ARGON2
|
||||||
@@ -261,8 +261,8 @@ static const std::map<const char *, Algorithm::Id, aliasCompare> kAlgorithmAlias
|
|||||||
ALGO_ALIAS(RX_GRAFT, "randomgraft"),
|
ALGO_ALIAS(RX_GRAFT, "randomgraft"),
|
||||||
ALGO_ALIAS_AUTO(RX_SFX), ALGO_ALIAS(RX_SFX, "randomx/sfx"),
|
ALGO_ALIAS_AUTO(RX_SFX), ALGO_ALIAS(RX_SFX, "randomx/sfx"),
|
||||||
ALGO_ALIAS(RX_SFX, "randomsfx"),
|
ALGO_ALIAS(RX_SFX, "randomsfx"),
|
||||||
ALGO_ALIAS_AUTO(RX_KEVA), ALGO_ALIAS(RX_KEVA, "randomx/keva"),
|
ALGO_ALIAS_AUTO(RX_YADA), ALGO_ALIAS(RX_YADA, "randomx/yada"),
|
||||||
ALGO_ALIAS(RX_KEVA, "randomkeva"),
|
ALGO_ALIAS(RX_YADA, "randomyada"),
|
||||||
# endif
|
# endif
|
||||||
|
|
||||||
# ifdef XMRIG_ALGO_ARGON2
|
# ifdef XMRIG_ALGO_ARGON2
|
||||||
@@ -350,7 +350,7 @@ std::vector<xmrig::Algorithm> xmrig::Algorithm::all(const std::function<bool(con
|
|||||||
CN_HEAVY_0, CN_HEAVY_TUBE, CN_HEAVY_XHV,
|
CN_HEAVY_0, CN_HEAVY_TUBE, CN_HEAVY_XHV,
|
||||||
CN_PICO_0, CN_PICO_TLO,
|
CN_PICO_0, CN_PICO_TLO,
|
||||||
CN_UPX2,
|
CN_UPX2,
|
||||||
RX_0, RX_WOW, RX_ARQ, RX_GRAFT, RX_SFX, RX_KEVA,
|
RX_0, RX_WOW, RX_ARQ, RX_GRAFT, RX_SFX, RX_YADA,
|
||||||
AR2_CHUKWA, AR2_CHUKWA_V2, AR2_WRKZ,
|
AR2_CHUKWA, AR2_CHUKWA_V2, AR2_WRKZ,
|
||||||
KAWPOW_RVN,
|
KAWPOW_RVN,
|
||||||
GHOSTRIDER_RTM
|
GHOSTRIDER_RTM
|
||||||
|
|||||||
@@ -77,7 +77,7 @@ public:
|
|||||||
RX_ARQ = 0x72121061, // "rx/arq" RandomARQ (Arqma).
|
RX_ARQ = 0x72121061, // "rx/arq" RandomARQ (Arqma).
|
||||||
RX_GRAFT = 0x72151267, // "rx/graft" RandomGRAFT (Graft).
|
RX_GRAFT = 0x72151267, // "rx/graft" RandomGRAFT (Graft).
|
||||||
RX_SFX = 0x72151273, // "rx/sfx" RandomSFX (Safex Cash).
|
RX_SFX = 0x72151273, // "rx/sfx" RandomSFX (Safex Cash).
|
||||||
RX_KEVA = 0x7214116b, // "rx/keva" RandomKEVA (Keva).
|
RX_YADA = 0x72151279, // "rx/yada" RandomYada (YadaCoin).
|
||||||
AR2_CHUKWA = 0x61130000, // "argon2/chukwa" Argon2id (Chukwa).
|
AR2_CHUKWA = 0x61130000, // "argon2/chukwa" Argon2id (Chukwa).
|
||||||
AR2_CHUKWA_V2 = 0x61140000, // "argon2/chukwav2" Argon2id (Chukwa v2).
|
AR2_CHUKWA_V2 = 0x61140000, // "argon2/chukwav2" Argon2id (Chukwa v2).
|
||||||
AR2_WRKZ = 0x61120000, // "argon2/wrkz" Argon2id (WRKZ)
|
AR2_WRKZ = 0x61120000, // "argon2/wrkz" Argon2id (WRKZ)
|
||||||
@@ -143,7 +143,7 @@ public:
|
|||||||
static const char *kRX_ARQ;
|
static const char *kRX_ARQ;
|
||||||
static const char *kRX_GRAFT;
|
static const char *kRX_GRAFT;
|
||||||
static const char *kRX_SFX;
|
static const char *kRX_SFX;
|
||||||
static const char *kRX_KEVA;
|
static const char *kRX_YADA;
|
||||||
# endif
|
# endif
|
||||||
|
|
||||||
# ifdef XMRIG_ALGO_ARGON2
|
# ifdef XMRIG_ALGO_ARGON2
|
||||||
|
|||||||
@@ -50,11 +50,11 @@ static const CoinInfo coinInfo[] = {
|
|||||||
{ Algorithm::CN_R, "SUMO", "Sumokoin", 240, 1000000000, BLUE_BG_BOLD( WHITE_BOLD_S " sumo ") },
|
{ Algorithm::CN_R, "SUMO", "Sumokoin", 240, 1000000000, BLUE_BG_BOLD( WHITE_BOLD_S " sumo ") },
|
||||||
{ Algorithm::RX_ARQ, "ARQ", "ArQmA", 120, 1000000000, BLUE_BG_BOLD( WHITE_BOLD_S " arqma ") },
|
{ Algorithm::RX_ARQ, "ARQ", "ArQmA", 120, 1000000000, BLUE_BG_BOLD( WHITE_BOLD_S " arqma ") },
|
||||||
{ Algorithm::RX_GRAFT, "GRFT", "Graft", 120, 10000000000, BLUE_BG_BOLD( WHITE_BOLD_S " graft ") },
|
{ Algorithm::RX_GRAFT, "GRFT", "Graft", 120, 10000000000, BLUE_BG_BOLD( WHITE_BOLD_S " graft ") },
|
||||||
{ Algorithm::RX_KEVA, "KVA", "Kevacoin", 0, 0, MAGENTA_BG_BOLD(WHITE_BOLD_S " keva ") },
|
|
||||||
{ Algorithm::KAWPOW_RVN, "RVN", "Ravencoin", 0, 0, BLUE_BG_BOLD( WHITE_BOLD_S " raven ") },
|
{ Algorithm::KAWPOW_RVN, "RVN", "Ravencoin", 0, 0, BLUE_BG_BOLD( WHITE_BOLD_S " raven ") },
|
||||||
{ Algorithm::RX_WOW, "WOW", "Wownero", 300, 100000000000, MAGENTA_BG_BOLD(WHITE_BOLD_S " wownero ") },
|
{ Algorithm::RX_WOW, "WOW", "Wownero", 300, 100000000000, MAGENTA_BG_BOLD(WHITE_BOLD_S " wownero ") },
|
||||||
{ Algorithm::RX_0, "ZEPH", "Zephyr", 120, 1000000000000, BLUE_BG_BOLD( WHITE_BOLD_S " zephyr ") },
|
{ Algorithm::RX_0, "ZEPH", "Zephyr", 120, 1000000000000, BLUE_BG_BOLD( WHITE_BOLD_S " zephyr ") },
|
||||||
{ Algorithm::RX_0, "Townforge","Townforge", 30, 100000000, MAGENTA_BG_BOLD(WHITE_BOLD_S " townforge ") },
|
{ Algorithm::RX_0, "Townforge","Townforge", 30, 100000000, MAGENTA_BG_BOLD(WHITE_BOLD_S " townforge ") },
|
||||||
|
{ Algorithm::RX_YADA, "YDA", "YadaCoin", 120, 100000000, BLUE_BG_BOLD( WHITE_BOLD_S " yada ") },
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -36,11 +36,11 @@ public:
|
|||||||
SUMO,
|
SUMO,
|
||||||
ARQMA,
|
ARQMA,
|
||||||
GRAFT,
|
GRAFT,
|
||||||
KEVA,
|
|
||||||
RAVEN,
|
RAVEN,
|
||||||
WOWNERO,
|
WOWNERO,
|
||||||
ZEPHYR,
|
ZEPHYR,
|
||||||
TOWNFORGE,
|
TOWNFORGE,
|
||||||
|
YADA,
|
||||||
MAX
|
MAX
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -211,11 +211,13 @@ rapidjson::Value xmrig::Json::normalize(double value, bool zero)
|
|||||||
{
|
{
|
||||||
using namespace rapidjson;
|
using namespace rapidjson;
|
||||||
|
|
||||||
if (!std::isnormal(value)) {
|
const double value_rounded = floor(value * 100.0) / 100.0;
|
||||||
|
|
||||||
|
if (!std::isnormal(value) || !std::isnormal(value_rounded)) {
|
||||||
return zero ? Value(0.0) : Value(kNullType);
|
return zero ? Value(0.0) : Value(kNullType);
|
||||||
}
|
}
|
||||||
|
|
||||||
return Value(floor(value * 100.0) / 100.0);
|
return Value(value_rounded);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -118,15 +118,19 @@ bool xmrig::Job::setTarget(const char *target)
|
|||||||
|
|
||||||
const auto raw = Cvt::fromHex(target, strlen(target));
|
const auto raw = Cvt::fromHex(target, strlen(target));
|
||||||
const size_t size = raw.size();
|
const size_t size = raw.size();
|
||||||
|
if (algorithm() == Algorithm::RX_YADA) {
|
||||||
if (size == 4) {
|
m_target = strtoull(target, nullptr, 16);
|
||||||
m_target = 0xFFFFFFFFFFFFFFFFULL / (0xFFFFFFFFULL / uint64_t(*reinterpret_cast<const uint32_t *>(raw.data())));
|
|
||||||
}
|
|
||||||
else if (size == 8) {
|
|
||||||
m_target = *reinterpret_cast<const uint64_t *>(raw.data());
|
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
return false;
|
if (size == 4) {
|
||||||
|
m_target = 0xFFFFFFFFFFFFFFFFULL / (0xFFFFFFFFULL / uint64_t(*reinterpret_cast<const uint32_t *>(raw.data())));
|
||||||
|
}
|
||||||
|
else if (size == 8) {
|
||||||
|
m_target = *reinterpret_cast<const uint64_t *>(raw.data());
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
# ifdef XMRIG_PROXY_PROJECT
|
# ifdef XMRIG_PROXY_PROJECT
|
||||||
@@ -176,6 +180,10 @@ int32_t xmrig::Job::nonceOffset() const
|
|||||||
auto f = algorithm().family();
|
auto f = algorithm().family();
|
||||||
if (f == Algorithm::KAWPOW) return 32;
|
if (f == Algorithm::KAWPOW) return 32;
|
||||||
if (f == Algorithm::GHOSTRIDER) return 76;
|
if (f == Algorithm::GHOSTRIDER) return 76;
|
||||||
|
|
||||||
|
auto id = algorithm().id();
|
||||||
|
if (id == Algorithm::RX_YADA) return 147;
|
||||||
|
|
||||||
return 39;
|
return 39;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1078,6 +1078,6 @@ void JitCompilerA64::h_NOP(Instruction& instr, uint32_t& codePos)
|
|||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
InstructionGeneratorA64 JitCompilerA64::engine[257] = {};
|
InstructionGeneratorA64 JitCompilerA64::engine[256] = {};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -74,7 +74,7 @@ namespace randomx {
|
|||||||
void enableWriting() const;
|
void enableWriting() const;
|
||||||
void enableExecution() const;
|
void enableExecution() const;
|
||||||
|
|
||||||
static InstructionGeneratorA64 engine[257];
|
static InstructionGeneratorA64 engine[256];
|
||||||
|
|
||||||
private:
|
private:
|
||||||
const bool hugePages;
|
const bool hugePages;
|
||||||
|
|||||||
@@ -1443,6 +1443,6 @@ namespace randomx {
|
|||||||
emitByte(0x90, code, codePos);
|
emitByte(0x90, code, codePos);
|
||||||
}
|
}
|
||||||
|
|
||||||
alignas(64) InstructionGeneratorX86 JitCompilerX86::engine[257] = {};
|
alignas(64) InstructionGeneratorX86 JitCompilerX86::engine[256] = {};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -81,7 +81,7 @@ namespace randomx {
|
|||||||
void enableWriting() const;
|
void enableWriting() const;
|
||||||
void enableExecution() const;
|
void enableExecution() const;
|
||||||
|
|
||||||
alignas(64) static InstructionGeneratorX86 engine[257];
|
alignas(64) static InstructionGeneratorX86 engine[256];
|
||||||
|
|
||||||
private:
|
private:
|
||||||
int registerUsage[RegistersCount] = {};
|
int registerUsage[RegistersCount] = {};
|
||||||
|
|||||||
@@ -100,17 +100,18 @@ RandomX_ConfigurationSafex::RandomX_ConfigurationSafex()
|
|||||||
ArgonSalt = "RandomSFX\x01";
|
ArgonSalt = "RandomSFX\x01";
|
||||||
}
|
}
|
||||||
|
|
||||||
RandomX_ConfigurationKeva::RandomX_ConfigurationKeva()
|
RandomX_ConfigurationYada::RandomX_ConfigurationYada()
|
||||||
{
|
{
|
||||||
ArgonSalt = "RandomKV\x01";
|
ArgonSalt = "RandomXYadaCoin\x03";
|
||||||
ScratchpadL2_Size = 131072;
|
SuperscalarLatency = 150;
|
||||||
ScratchpadL3_Size = 1048576;
|
ArgonIterations = 4;
|
||||||
}
|
}
|
||||||
|
|
||||||
RandomX_ConfigurationBase::RandomX_ConfigurationBase()
|
RandomX_ConfigurationBase::RandomX_ConfigurationBase()
|
||||||
: ArgonIterations(3)
|
: ArgonIterations(3)
|
||||||
, ArgonLanes(1)
|
, ArgonLanes(1)
|
||||||
, ArgonSalt("RandomX\x03")
|
, ArgonSalt("RandomX\x03")
|
||||||
|
, SuperscalarLatency(170)
|
||||||
, ScratchpadL1_Size(16384)
|
, ScratchpadL1_Size(16384)
|
||||||
, ScratchpadL2_Size(262144)
|
, ScratchpadL2_Size(262144)
|
||||||
, ScratchpadL3_Size(2097152)
|
, ScratchpadL3_Size(2097152)
|
||||||
@@ -260,7 +261,7 @@ typedef void(randomx::JitCompilerX86::* InstructionGeneratorX86_2)(const randomx
|
|||||||
|
|
||||||
#define JIT_HANDLE(x, prev) do { \
|
#define JIT_HANDLE(x, prev) do { \
|
||||||
const InstructionGeneratorX86_2 p = &randomx::JitCompilerX86::h_##x; \
|
const InstructionGeneratorX86_2 p = &randomx::JitCompilerX86::h_##x; \
|
||||||
memcpy(randomx::JitCompilerX86::engine + k, &p, sizeof(p)); \
|
memcpy(randomx::JitCompilerX86::engine + k, &p, sizeof(randomx::JitCompilerX86::engine[k])); \
|
||||||
} while (0)
|
} while (0)
|
||||||
|
|
||||||
#elif (XMRIG_ARM == 8)
|
#elif (XMRIG_ARM == 8)
|
||||||
@@ -357,7 +358,7 @@ RandomX_ConfigurationWownero RandomX_WowneroConfig;
|
|||||||
RandomX_ConfigurationArqma RandomX_ArqmaConfig;
|
RandomX_ConfigurationArqma RandomX_ArqmaConfig;
|
||||||
RandomX_ConfigurationGraft RandomX_GraftConfig;
|
RandomX_ConfigurationGraft RandomX_GraftConfig;
|
||||||
RandomX_ConfigurationSafex RandomX_SafexConfig;
|
RandomX_ConfigurationSafex RandomX_SafexConfig;
|
||||||
RandomX_ConfigurationKeva RandomX_KevaConfig;
|
RandomX_ConfigurationYada RandomX_YadaConfig;
|
||||||
|
|
||||||
alignas(64) RandomX_ConfigurationBase RandomX_CurrentConfig;
|
alignas(64) RandomX_ConfigurationBase RandomX_CurrentConfig;
|
||||||
|
|
||||||
|
|||||||
@@ -69,7 +69,6 @@ struct RandomX_ConfigurationBase
|
|||||||
{
|
{
|
||||||
ArgonMemory = 262144,
|
ArgonMemory = 262144,
|
||||||
CacheAccesses = 8,
|
CacheAccesses = 8,
|
||||||
SuperscalarLatency = 170,
|
|
||||||
DatasetBaseSize = 2147483648,
|
DatasetBaseSize = 2147483648,
|
||||||
DatasetExtraSize = 33554368,
|
DatasetExtraSize = 33554368,
|
||||||
JumpBits = 8,
|
JumpBits = 8,
|
||||||
@@ -82,6 +81,7 @@ struct RandomX_ConfigurationBase
|
|||||||
uint32_t ArgonIterations;
|
uint32_t ArgonIterations;
|
||||||
uint32_t ArgonLanes;
|
uint32_t ArgonLanes;
|
||||||
const char* ArgonSalt;
|
const char* ArgonSalt;
|
||||||
|
uint32_t SuperscalarLatency;
|
||||||
|
|
||||||
uint32_t ScratchpadL1_Size;
|
uint32_t ScratchpadL1_Size;
|
||||||
uint32_t ScratchpadL2_Size;
|
uint32_t ScratchpadL2_Size;
|
||||||
@@ -146,14 +146,14 @@ struct RandomX_ConfigurationWownero : public RandomX_ConfigurationBase { RandomX
|
|||||||
struct RandomX_ConfigurationArqma : public RandomX_ConfigurationBase { RandomX_ConfigurationArqma(); };
|
struct RandomX_ConfigurationArqma : public RandomX_ConfigurationBase { RandomX_ConfigurationArqma(); };
|
||||||
struct RandomX_ConfigurationGraft : public RandomX_ConfigurationBase { RandomX_ConfigurationGraft(); };
|
struct RandomX_ConfigurationGraft : public RandomX_ConfigurationBase { RandomX_ConfigurationGraft(); };
|
||||||
struct RandomX_ConfigurationSafex : public RandomX_ConfigurationBase { RandomX_ConfigurationSafex(); };
|
struct RandomX_ConfigurationSafex : public RandomX_ConfigurationBase { RandomX_ConfigurationSafex(); };
|
||||||
struct RandomX_ConfigurationKeva : public RandomX_ConfigurationBase { RandomX_ConfigurationKeva(); };
|
struct RandomX_ConfigurationYada : public RandomX_ConfigurationBase { RandomX_ConfigurationYada(); };
|
||||||
|
|
||||||
extern RandomX_ConfigurationMonero RandomX_MoneroConfig;
|
extern RandomX_ConfigurationMonero RandomX_MoneroConfig;
|
||||||
extern RandomX_ConfigurationWownero RandomX_WowneroConfig;
|
extern RandomX_ConfigurationWownero RandomX_WowneroConfig;
|
||||||
extern RandomX_ConfigurationArqma RandomX_ArqmaConfig;
|
extern RandomX_ConfigurationArqma RandomX_ArqmaConfig;
|
||||||
extern RandomX_ConfigurationGraft RandomX_GraftConfig;
|
extern RandomX_ConfigurationGraft RandomX_GraftConfig;
|
||||||
extern RandomX_ConfigurationSafex RandomX_SafexConfig;
|
extern RandomX_ConfigurationSafex RandomX_SafexConfig;
|
||||||
extern RandomX_ConfigurationKeva RandomX_KevaConfig;
|
extern RandomX_ConfigurationYada RandomX_YadaConfig;
|
||||||
|
|
||||||
extern RandomX_ConfigurationBase RandomX_CurrentConfig;
|
extern RandomX_ConfigurationBase RandomX_CurrentConfig;
|
||||||
|
|
||||||
|
|||||||
@@ -44,8 +44,8 @@ const RandomX_ConfigurationBase *xmrig::RxAlgo::base(Algorithm::Id algorithm)
|
|||||||
case Algorithm::RX_SFX:
|
case Algorithm::RX_SFX:
|
||||||
return &RandomX_SafexConfig;
|
return &RandomX_SafexConfig;
|
||||||
|
|
||||||
case Algorithm::RX_KEVA:
|
case Algorithm::RX_YADA:
|
||||||
return &RandomX_KevaConfig;
|
return &RandomX_YadaConfig;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
|
|||||||
@@ -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.2"
|
#define APP_VERSION "6.21.4-dev"
|
||||||
#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"
|
||||||
@@ -30,7 +30,7 @@
|
|||||||
|
|
||||||
#define APP_VER_MAJOR 6
|
#define APP_VER_MAJOR 6
|
||||||
#define APP_VER_MINOR 21
|
#define APP_VER_MINOR 21
|
||||||
#define APP_VER_PATCH 2
|
#define APP_VER_PATCH 4
|
||||||
|
|
||||||
#ifdef _MSC_VER
|
#ifdef _MSC_VER
|
||||||
# if (_MSC_VER >= 1930)
|
# if (_MSC_VER >= 1930)
|
||||||
|
|||||||
Reference in New Issue
Block a user