CrimsonHawk/xmrig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Allow use old CUDA plugin.

Browse source
This commit is contained in:
XMRig 2019-12-20 21:10:13 +07:00
parent a25042db72
commit 449617d717
No known key found for this signature in database
GPG key ID: 446A53638BE94409
4 changed files with 14 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/backend/cuda/wrappers/CudaLib.cpp
View file

@ -28,6 +28,7 @@
#include "backend/cuda/wrappers/CudaLib.h"
#include "crypto/rx/RxAlgo.h"
namespace xmrig {
@ -163,7 +164,7 @@ bool xmrig::CudaLib::rxPrepare(nvid_ctx *ctx, const void *dataset, size_t datase
bool xmrig::CudaLib::setJob(nvid_ctx *ctx, const void *data, size_t size, const Algorithm &algorithm) noexcept
{
return pSetJob(ctx, data, size, algorithm);
return pSetJob(ctx, data, size, RxAlgo::id(algorithm));
}
@ -187,7 +188,7 @@ const char *xmrig::CudaLib::pluginVersion() noexcept
int xmrig::CudaLib::deviceInfo(nvid_ctx *ctx, int32_t blocks, int32_t threads, const Algorithm &algorithm, int32_t dataset_host) noexcept
{
return pDeviceInfo(ctx, blocks, threads, algorithm, dataset_host);
return pDeviceInfo(ctx, blocks, threads, RxAlgo::id(algorithm), dataset_host);
}

5
src/backend/opencl/OclLaunchData.cpp
View file

@ -27,7 +27,6 @@
#include "backend/opencl/OclLaunchData.h"
#include "backend/common/Tags.h"
#include "backend/opencl/OclConfig.h"
#include "crypto/rx/RxAlgo.h"
xmrig::OclLaunchData::OclLaunchData(const Miner *miner, const Algorithm &algorithm, const OclConfig &config, const OclPlatform &platform, const OclThread &thread, const OclDevice &device, int64_t affinity) :
@ -44,8 +43,8 @@ xmrig::OclLaunchData::OclLaunchData(const Miner *miner, const Algorithm &algorit
bool xmrig::OclLaunchData::isEqual(const OclLaunchData &other) const
{
return (RxAlgo::id(other.algorithm) == RxAlgo::id(algorithm) &&
other.thread == thread);
return (other.algorithm == algorithm &&
other.thread == thread);
}

10
src/crypto/rx/RxAlgo.cpp
View file

@ -37,16 +37,6 @@ xmrig::Algorithm::Id xmrig::RxAlgo::apply(Algorithm::Id algorithm)
}
xmrig::Algorithm::Id xmrig::RxAlgo::id(Algorithm::Id algorithm)
{
if (algorithm == Algorithm::RX_SFX || algorithm == Algorithm::RX_V) {
return Algorithm::RX_0;
}
return algorithm;
}
const RandomX_ConfigurationBase *xmrig::RxAlgo::base(Algorithm::Id algorithm)
{
switch (algorithm) {

10
src/crypto/rx/RxAlgo.h
View file

@ -46,12 +46,20 @@ class RxAlgo
{
public:
static Algorithm::Id apply(Algorithm::Id algorithm);
static Algorithm::Id id(Algorithm::Id algorithm);
static const RandomX_ConfigurationBase *base(Algorithm::Id algorithm);
static uint32_t programCount(Algorithm::Id algorithm);
static uint32_t programIterations(Algorithm::Id algorithm);
static uint32_t programSize(Algorithm::Id algorithm);
static uint32_t version(Algorithm::Id algorithm);
static inline Algorithm::Id id(Algorithm::Id algorithm)
{
if (algorithm == Algorithm::RX_SFX || algorithm == Algorithm::RX_V) {
return Algorithm::RX_0;
}
return algorithm;
}
};