From 8c45e3226d8ef75664cd66646193a4ef453e0772 Mon Sep 17 00:00:00 2001
From: SChernykh <sergey.v.chernykh@gmail.com>
Date: Thu, 15 Oct 2020 14:39:54 +0200
Subject: [PATCH] Fixed roundSize() usage in OCL/CUDA
---
src/backend/cuda/CudaWorker.cpp | 4 ++--
src/backend/opencl/OclWorker.cpp | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/backend/cuda/CudaWorker.cpp b/src/backend/cuda/CudaWorker.cpp
index 72be72ff6..c0a4f9333 100644
--- a/src/backend/cuda/CudaWorker.cpp
+++ b/src/backend/cuda/CudaWorker.cpp
@@ -189,7 +189,7 @@ void xmrig::CudaWorker::start()
}
const size_t batch_size = intensity();
- if (!Nonce::isOutdated(Nonce::CUDA, m_job.sequence()) && !m_job.nextRound(roundSize(batch_size), batch_size)) {
+ if (!Nonce::isOutdated(Nonce::CUDA, m_job.sequence()) && !m_job.nextRound(1, roundSize(batch_size))) {
JobResults::done(m_job.currentJob());
}
@@ -211,7 +211,7 @@ bool xmrig::CudaWorker::consumeJob()
}
const size_t batch_size = intensity();
- m_job.add(m_miner->job(), roundSize(batch_size) * batch_size, Nonce::CUDA);
+ m_job.add(m_miner->job(), roundSize(batch_size), Nonce::CUDA);
return m_runner->set(m_job.currentJob(), m_job.blob());
}
diff --git a/src/backend/opencl/OclWorker.cpp b/src/backend/opencl/OclWorker.cpp
index 2e61ac74e..bf5a7e14f 100644
--- a/src/backend/opencl/OclWorker.cpp
+++ b/src/backend/opencl/OclWorker.cpp
@@ -180,7 +180,7 @@ void xmrig::OclWorker::start()
{
cl_uint results[0x100];
- const uint32_t runnerRoundSize = m_runner->roundSize();
+ const uint32_t runnerRoundSize = roundSize(m_runner->roundSize());
while (Nonce::sequence(Nonce::OPENCL) > 0) {
if (!isReady()) {
@@ -220,7 +220,7 @@ void xmrig::OclWorker::start()
JobResults::submit(m_job.currentJob(), results, results[0xFF], m_deviceIndex);
}
- if (!Nonce::isOutdated(Nonce::OPENCL, m_job.sequence()) && !m_job.nextRound(roundSize(runnerRoundSize), runnerRoundSize)) {
+ if (!Nonce::isOutdated(Nonce::OPENCL, m_job.sequence()) && !m_job.nextRound(1, runnerRoundSize)) {
JobResults::done(m_job.currentJob());
}
@@ -241,7 +241,7 @@ bool xmrig::OclWorker::consumeJob()
return false;
}
- m_job.add(m_miner->job(), roundSize(m_intensity) * m_intensity, Nonce::OPENCL);
+ m_job.add(m_miner->job(), roundSize(m_intensity), Nonce::OPENCL);
try {
m_runner->set(m_job.currentJob(), m_job.blob());