Merge pull request xmrig#65 from SChernykh/dev

Fixed broken AstroBWT
diantinoto · Aug 30, 2020 · 9a7f215 · 9a7f215
2 parents dffb1a2 + b312669
commit 9a7f215
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/src/cryptonight.h b/src/cryptonight.h
@@ -121,7 +121,7 @@ void cryptonight_extra_cpu_prepare(nvid_ctx *ctx, uint32_t startNonce, const xmr
 void cryptonight_gpu_hash(nvid_ctx *ctx, const xmrig::Algorithm &algorithm, uint64_t height, uint32_t startNonce);
 void cryptonight_extra_cpu_final(nvid_ctx *ctx, uint32_t startNonce, uint64_t target, uint32_t *rescount, uint32_t *resnonce, const xmrig::Algorithm &algorithm);
 
-void rx_extra_cpu_set_data(nvid_ctx *ctx, const void *data, size_t len);
+void cuda_extra_cpu_set_data(nvid_ctx *ctx, const void *data, size_t len);
 void randomx_prepare(nvid_ctx *ctx, const void *dataset, size_t dataset_size, uint32_t batch_size);
 
 namespace RandomX_Arqma   { void hash(nvid_ctx *ctx, uint32_t nonce, uint64_t target, uint32_t *rescount, uint32_t *resnonce, uint32_t batch_size); }

diff --git a/src/cuda_extra.cu b/src/cuda_extra.cu
@@ -303,14 +303,10 @@ void cryptonight_extra_cpu_set_data(nvid_ctx *ctx, const void *data, size_t len)
 }
 
 
-void rx_extra_cpu_set_data(nvid_ctx *ctx, const void *data, size_t len)
+void cuda_extra_cpu_set_data(nvid_ctx *ctx, const void *data, size_t len)
 {
     ctx->inputlen = static_cast<unsigned int>(len);
-
-    uint8_t buf[kMaxBlobSize];
-    memcpy(buf, data, len);
-
-    CUDA_CHECK(ctx->device_id, cudaMemcpy(ctx->d_input, buf, len, cudaMemcpyHostToDevice));
+    CUDA_CHECK(ctx->device_id, cudaMemcpy(ctx->d_input, data, len, cudaMemcpyHostToDevice));
 }
 
 

diff --git a/src/xmrig-cuda.cpp b/src/xmrig-cuda.cpp
@@ -354,8 +354,10 @@ bool setJob_v2(nvid_ctx *ctx, const void *data, size_t size, const char *algo)
     }
 
     try {
-        if (xmrig::Algorithm::family(ctx->algorithm) == xmrig::Algorithm::RANDOM_X) {
-            rx_extra_cpu_set_data(ctx, data, size);
+        const xmrig::Algorithm::Family f = xmrig::Algorithm::family(ctx->algorithm);
+
+        if ((f == xmrig::Algorithm::RANDOM_X) || (f == xmrig::Algorithm::ASTROBWT)) {
+            cuda_extra_cpu_set_data(ctx, data, size);
         }
         else {
             cryptonight_extra_cpu_set_data(ctx, data, size);
@@ -381,8 +383,10 @@ bool setJob(nvid_ctx *ctx, const void *data, size_t size, int32_t algo)
     ctx->algorithm = algo;
 
     try {
-        if (xmrig::Algorithm::family(static_cast<xmrig::Algorithm::Id>(algo)) == xmrig::Algorithm::RANDOM_X) {
-            rx_extra_cpu_set_data(ctx, data, size);
+        const xmrig::Algorithm::Family f = xmrig::Algorithm::family(ctx->algorithm);
+
+        if ((f == xmrig::Algorithm::RANDOM_X) || (f == xmrig::Algorithm::ASTROBWT)) {
+            cuda_extra_cpu_set_data(ctx, data, size);
         }
         else {
             cryptonight_extra_cpu_set_data(ctx, data, size);