mirror of
https://github.com/xmrig/xmrig.git
synced 2024-12-23 12:09:22 +00:00
Merge pull request #1635 from SChernykh/dev
Pooled allocation of RandomX VMs
This commit is contained in:
commit
70a3a83c26
11 changed files with 68 additions and 61 deletions
|
@ -118,7 +118,7 @@ void xmrig::CpuWorker<N>::allocateRandomX_VM()
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!m_vm) {
|
if (!m_vm) {
|
||||||
m_vm = new RxVm(dataset, m_memory->scratchpad(), !m_hwAES, m_assembly);
|
m_vm = new RxVm(dataset, m_memory->scratchpad(), !m_hwAES, m_assembly, m_node);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -41,7 +41,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
#define RANDOMX_DATASET_MAX_SIZE 2181038080
|
#define RANDOMX_DATASET_MAX_SIZE 2181038080
|
||||||
|
|
||||||
// Increase it if some configs use larger programs
|
// Increase it if some configs use larger programs
|
||||||
#define RANDOMX_PROGRAM_MAX_SIZE 512
|
#define RANDOMX_PROGRAM_MAX_SIZE 320
|
||||||
|
|
||||||
// Increase it if some configs use larger scratchpad
|
// Increase it if some configs use larger scratchpad
|
||||||
#define RANDOMX_SCRATCHPAD_L3_MAX_SIZE 2097152
|
#define RANDOMX_SCRATCHPAD_L3_MAX_SIZE 2097152
|
||||||
|
|
|
@ -42,6 +42,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "backend/cpu/Cpu.h"
|
#include "backend/cpu/Cpu.h"
|
||||||
|
#include "crypto/common/VirtualMemory.h"
|
||||||
|
#include <mutex>
|
||||||
|
|
||||||
#include <cassert>
|
#include <cassert>
|
||||||
|
|
||||||
|
@ -311,6 +313,8 @@ RandomX_ConfigurationKeva RandomX_KevaConfig;
|
||||||
|
|
||||||
alignas(64) RandomX_ConfigurationBase RandomX_CurrentConfig;
|
alignas(64) RandomX_ConfigurationBase RandomX_CurrentConfig;
|
||||||
|
|
||||||
|
static std::mutex vm_pool_mutex;
|
||||||
|
|
||||||
extern "C" {
|
extern "C" {
|
||||||
|
|
||||||
randomx_cache *randomx_create_cache(randomx_flags flags, uint8_t *memory) {
|
randomx_cache *randomx_create_cache(randomx_flags flags, uint8_t *memory) {
|
||||||
|
@ -395,45 +399,75 @@ extern "C" {
|
||||||
delete dataset;
|
delete dataset;
|
||||||
}
|
}
|
||||||
|
|
||||||
randomx_vm *randomx_create_vm(randomx_flags flags, randomx_cache *cache, randomx_dataset *dataset, uint8_t *scratchpad) {
|
randomx_vm* randomx_create_vm(randomx_flags flags, randomx_cache* cache, randomx_dataset* dataset, uint8_t* scratchpad, uint32_t node) {
|
||||||
assert(cache != nullptr || (flags & RANDOMX_FLAG_FULL_MEM));
|
assert(cache != nullptr || (flags & RANDOMX_FLAG_FULL_MEM));
|
||||||
assert(cache == nullptr || cache->isInitialized());
|
assert(cache == nullptr || cache->isInitialized());
|
||||||
assert(dataset != nullptr || !(flags & RANDOMX_FLAG_FULL_MEM));
|
assert(dataset != nullptr || !(flags & RANDOMX_FLAG_FULL_MEM));
|
||||||
|
|
||||||
randomx_vm* vm = nullptr;
|
randomx_vm* vm = nullptr;
|
||||||
|
|
||||||
|
std::lock_guard<std::mutex> lock(vm_pool_mutex);
|
||||||
|
|
||||||
|
static uint8_t* vm_pool[64] = {};
|
||||||
|
static size_t vm_pool_offset[64] = {};
|
||||||
|
|
||||||
|
constexpr size_t VM_POOL_SIZE = 2 * 1024 * 1024;
|
||||||
|
|
||||||
|
if (node >= 64) {
|
||||||
|
node = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!vm_pool[node]) {
|
||||||
|
vm_pool[node] = (uint8_t*) xmrig::VirtualMemory::allocateLargePagesMemory(VM_POOL_SIZE);
|
||||||
|
if (!vm_pool[node]) {
|
||||||
|
vm_pool[node] = (uint8_t*) rx_aligned_alloc(VM_POOL_SIZE, 4096);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void* p = vm_pool[node] + vm_pool_offset[node];
|
||||||
|
size_t vm_size = 0;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
switch (flags & (RANDOMX_FLAG_FULL_MEM | RANDOMX_FLAG_JIT | RANDOMX_FLAG_HARD_AES)) {
|
switch (flags & (RANDOMX_FLAG_FULL_MEM | RANDOMX_FLAG_JIT | RANDOMX_FLAG_HARD_AES)) {
|
||||||
case RANDOMX_FLAG_DEFAULT:
|
case RANDOMX_FLAG_DEFAULT:
|
||||||
vm = new randomx::InterpretedLightVmDefault();
|
vm = new(p) randomx::InterpretedLightVmDefault();
|
||||||
|
vm_size = sizeof(randomx::InterpretedLightVmDefault);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case RANDOMX_FLAG_FULL_MEM:
|
case RANDOMX_FLAG_FULL_MEM:
|
||||||
vm = new randomx::InterpretedVmDefault();
|
vm = new(p) randomx::InterpretedVmDefault();
|
||||||
|
vm_size = sizeof(randomx::InterpretedVmDefault);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case RANDOMX_FLAG_JIT:
|
case RANDOMX_FLAG_JIT:
|
||||||
vm = new randomx::CompiledLightVmDefault();
|
vm = new(p) randomx::CompiledLightVmDefault();
|
||||||
|
vm_size = sizeof(randomx::CompiledLightVmDefault);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case RANDOMX_FLAG_FULL_MEM | RANDOMX_FLAG_JIT:
|
case RANDOMX_FLAG_FULL_MEM | RANDOMX_FLAG_JIT:
|
||||||
vm = new randomx::CompiledVmDefault();
|
vm = new(p) randomx::CompiledVmDefault();
|
||||||
|
vm_size = sizeof(randomx::CompiledVmDefault);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case RANDOMX_FLAG_HARD_AES:
|
case RANDOMX_FLAG_HARD_AES:
|
||||||
vm = new randomx::InterpretedLightVmHardAes();
|
vm = new(p) randomx::InterpretedLightVmHardAes();
|
||||||
|
vm_size = sizeof(randomx::InterpretedLightVmHardAes);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case RANDOMX_FLAG_FULL_MEM | RANDOMX_FLAG_HARD_AES:
|
case RANDOMX_FLAG_FULL_MEM | RANDOMX_FLAG_HARD_AES:
|
||||||
vm = new randomx::InterpretedVmHardAes();
|
vm = new(p) randomx::InterpretedVmHardAes();
|
||||||
|
vm_size = sizeof(randomx::InterpretedVmHardAes);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case RANDOMX_FLAG_JIT | RANDOMX_FLAG_HARD_AES:
|
case RANDOMX_FLAG_JIT | RANDOMX_FLAG_HARD_AES:
|
||||||
vm = new randomx::CompiledLightVmHardAes();
|
vm = new(p) randomx::CompiledLightVmHardAes();
|
||||||
|
vm_size = sizeof(randomx::CompiledLightVmHardAes);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case RANDOMX_FLAG_FULL_MEM | RANDOMX_FLAG_JIT | RANDOMX_FLAG_HARD_AES:
|
case RANDOMX_FLAG_FULL_MEM | RANDOMX_FLAG_JIT | RANDOMX_FLAG_HARD_AES:
|
||||||
vm = new randomx::CompiledVmHardAes();
|
vm = new(p) randomx::CompiledVmHardAes();
|
||||||
|
vm_size = sizeof(randomx::CompiledVmHardAes);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
|
@ -452,10 +486,16 @@ extern "C" {
|
||||||
vm->setFlags(flags);
|
vm->setFlags(flags);
|
||||||
}
|
}
|
||||||
catch (std::exception &ex) {
|
catch (std::exception &ex) {
|
||||||
delete vm;
|
|
||||||
vm = nullptr;
|
vm = nullptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (vm) {
|
||||||
|
vm_pool_offset[node] += vm_size;
|
||||||
|
if (vm_pool_offset[node] + 4096 > VM_POOL_SIZE) {
|
||||||
|
vm_pool_offset[node] = 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return vm;
|
return vm;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -471,9 +511,8 @@ extern "C" {
|
||||||
machine->setDataset(dataset);
|
machine->setDataset(dataset);
|
||||||
}
|
}
|
||||||
|
|
||||||
void randomx_destroy_vm(randomx_vm *machine) {
|
void randomx_destroy_vm(randomx_vm* vm) {
|
||||||
assert(machine != nullptr);
|
vm->~randomx_vm();
|
||||||
delete machine;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void randomx_calculate_hash(randomx_vm *machine, const void *input, size_t inputSize, void *output) {
|
void randomx_calculate_hash(randomx_vm *machine, const void *input, size_t inputSize, void *output) {
|
||||||
|
|
|
@ -308,7 +308,7 @@ RANDOMX_EXPORT void randomx_release_dataset(randomx_dataset *dataset);
|
||||||
* (3) cache parameter is NULL and RANDOMX_FLAG_FULL_MEM is not set
|
* (3) cache parameter is NULL and RANDOMX_FLAG_FULL_MEM is not set
|
||||||
* (4) dataset parameter is NULL and RANDOMX_FLAG_FULL_MEM is set
|
* (4) dataset parameter is NULL and RANDOMX_FLAG_FULL_MEM is set
|
||||||
*/
|
*/
|
||||||
RANDOMX_EXPORT randomx_vm *randomx_create_vm(randomx_flags flags, randomx_cache *cache, randomx_dataset *dataset, uint8_t *scratchpad);
|
RANDOMX_EXPORT randomx_vm *randomx_create_vm(randomx_flags flags, randomx_cache *cache, randomx_dataset *dataset, uint8_t *scratchpad, uint32_t node);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Reinitializes a virtual machine with a new Cache. This function should be called anytime
|
* Reinitializes a virtual machine with a new Cache. This function should be called anytime
|
||||||
|
|
|
@ -41,16 +41,8 @@ namespace randomx {
|
||||||
class CompiledVm : public VmBase<softAes>
|
class CompiledVm : public VmBase<softAes>
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
void* operator new(size_t size) {
|
void* operator new(size_t, void* ptr) { return ptr; }
|
||||||
void* ptr = AlignedAllocator<CacheLineSize>::allocMemory(size);
|
void operator delete(void*) {}
|
||||||
if (ptr == nullptr)
|
|
||||||
throw std::bad_alloc();
|
|
||||||
return ptr;
|
|
||||||
}
|
|
||||||
|
|
||||||
void operator delete(void* ptr) {
|
|
||||||
AlignedAllocator<CacheLineSize>::freeMemory(ptr, sizeof(CompiledVm));
|
|
||||||
}
|
|
||||||
|
|
||||||
void setDataset(randomx_dataset* dataset) override;
|
void setDataset(randomx_dataset* dataset) override;
|
||||||
void run(void* seed) override;
|
void run(void* seed) override;
|
||||||
|
|
|
@ -37,16 +37,8 @@ namespace randomx {
|
||||||
class CompiledLightVm : public CompiledVm<softAes>
|
class CompiledLightVm : public CompiledVm<softAes>
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
void* operator new(size_t size) {
|
void* operator new(size_t, void* ptr) { return ptr; }
|
||||||
void* ptr = AlignedAllocator<CacheLineSize>::allocMemory(size);
|
void operator delete(void*) {}
|
||||||
if (ptr == nullptr)
|
|
||||||
throw std::bad_alloc();
|
|
||||||
return ptr;
|
|
||||||
}
|
|
||||||
|
|
||||||
void operator delete(void* ptr) {
|
|
||||||
AlignedAllocator<CacheLineSize>::freeMemory(ptr, sizeof(CompiledLightVm));
|
|
||||||
}
|
|
||||||
|
|
||||||
void setCache(randomx_cache* cache) override;
|
void setCache(randomx_cache* cache) override;
|
||||||
void setDataset(randomx_dataset* dataset) override { }
|
void setDataset(randomx_dataset* dataset) override { }
|
||||||
|
|
|
@ -49,16 +49,8 @@ namespace randomx {
|
||||||
using VmBase<softAes>::datasetPtr;
|
using VmBase<softAes>::datasetPtr;
|
||||||
using VmBase<softAes>::datasetOffset;
|
using VmBase<softAes>::datasetOffset;
|
||||||
|
|
||||||
void* operator new(size_t size) {
|
void* operator new(size_t, void* ptr) { return ptr; }
|
||||||
void* ptr = AlignedAllocator<CacheLineSize>::allocMemory(size);
|
void operator delete(void*) {}
|
||||||
if (ptr == nullptr)
|
|
||||||
throw std::bad_alloc();
|
|
||||||
return ptr;
|
|
||||||
}
|
|
||||||
|
|
||||||
void operator delete(void* ptr) {
|
|
||||||
AlignedAllocator<CacheLineSize>::freeMemory(ptr, sizeof(InterpretedVm));
|
|
||||||
}
|
|
||||||
|
|
||||||
void run(void* seed) override;
|
void run(void* seed) override;
|
||||||
void setDataset(randomx_dataset* dataset) override;
|
void setDataset(randomx_dataset* dataset) override;
|
||||||
|
|
|
@ -39,16 +39,8 @@ namespace randomx {
|
||||||
using VmBase<softAes>::mem;
|
using VmBase<softAes>::mem;
|
||||||
using VmBase<softAes>::cachePtr;
|
using VmBase<softAes>::cachePtr;
|
||||||
|
|
||||||
void* operator new(size_t size) {
|
void* operator new(size_t, void* ptr) { return ptr; }
|
||||||
void* ptr = AlignedAllocator<CacheLineSize>::allocMemory(size);
|
void operator delete(void*) {}
|
||||||
if (ptr == nullptr)
|
|
||||||
throw std::bad_alloc();
|
|
||||||
return ptr;
|
|
||||||
}
|
|
||||||
|
|
||||||
void operator delete(void* ptr) {
|
|
||||||
AlignedAllocator<CacheLineSize>::freeMemory(ptr, sizeof(InterpretedLightVm));
|
|
||||||
}
|
|
||||||
|
|
||||||
void setDataset(randomx_dataset* dataset) override { }
|
void setDataset(randomx_dataset* dataset) override { }
|
||||||
void setCache(randomx_cache* cache) override;
|
void setCache(randomx_cache* cache) override;
|
||||||
|
|
|
@ -31,7 +31,7 @@
|
||||||
#include "crypto/rx/RxVm.h"
|
#include "crypto/rx/RxVm.h"
|
||||||
|
|
||||||
|
|
||||||
xmrig::RxVm::RxVm(RxDataset *dataset, uint8_t *scratchpad, bool softAes, xmrig::Assembly assembly)
|
xmrig::RxVm::RxVm(RxDataset *dataset, uint8_t *scratchpad, bool softAes, xmrig::Assembly assembly, uint32_t node)
|
||||||
{
|
{
|
||||||
if (!softAes) {
|
if (!softAes) {
|
||||||
m_flags |= RANDOMX_FLAG_HARD_AES;
|
m_flags |= RANDOMX_FLAG_HARD_AES;
|
||||||
|
@ -53,7 +53,7 @@ xmrig::RxVm::RxVm(RxDataset *dataset, uint8_t *scratchpad, bool softAes, xmrig::
|
||||||
m_flags |= RANDOMX_FLAG_AMD;
|
m_flags |= RANDOMX_FLAG_AMD;
|
||||||
}
|
}
|
||||||
|
|
||||||
m_vm = randomx_create_vm(static_cast<randomx_flags>(m_flags), dataset->cache() ? dataset->cache()->get() : nullptr, dataset->get(), scratchpad);
|
m_vm = randomx_create_vm(static_cast<randomx_flags>(m_flags), dataset->cache() ? dataset->cache()->get() : nullptr, dataset->get(), scratchpad, node);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -50,7 +50,7 @@ class RxVm
|
||||||
public:
|
public:
|
||||||
XMRIG_DISABLE_COPY_MOVE_DEFAULT(RxVm);
|
XMRIG_DISABLE_COPY_MOVE_DEFAULT(RxVm);
|
||||||
|
|
||||||
RxVm(RxDataset *dataset, uint8_t *scratchpad, bool softAes, xmrig::Assembly assembly);
|
RxVm(RxDataset *dataset, uint8_t *scratchpad, bool softAes, xmrig::Assembly assembly, uint32_t node);
|
||||||
~RxVm();
|
~RxVm();
|
||||||
|
|
||||||
inline randomx_vm *get() const { return m_vm; }
|
inline randomx_vm *get() const { return m_vm; }
|
||||||
|
|
|
@ -116,7 +116,7 @@ static void getResults(JobBundle &bundle, std::vector<JobResult> &results, uint3
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
auto vm = new RxVm(dataset, memory->scratchpad(), !hwAES, Assembly::NONE);
|
auto vm = new RxVm(dataset, memory->scratchpad(), !hwAES, Assembly::NONE, 0);
|
||||||
|
|
||||||
for (uint32_t nonce : bundle.nonces) {
|
for (uint32_t nonce : bundle.nonces) {
|
||||||
*bundle.job.nonce() = nonce;
|
*bundle.job.nonce() = nonce;
|
||||||
|
|
Loading…
Reference in a new issue