Merge pull request #1 from SChernykh/master

Cleanup everything in GPU context when releasing it
xmrig · Oct 29, 2019 · 53683d0 · 53683d0
2 parents eee367f + ddf4a43
commit 53683d0
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 29 deletions.
diff --git a/src/cryptonight.h b/src/cryptonight.h
@@ -91,7 +91,6 @@ void cryptonight_extra_cpu_set_data(nvid_ctx *ctx, const void *data, size_t len)
 void cryptonight_extra_cpu_prepare(nvid_ctx *ctx, uint32_t startNonce, const xmrig::Algorithm &algorithm);
 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 cryptonight_extra_cpu_free(nvid_ctx *ctx);
 
 void randomx_prepare(nvid_ctx *ctx, const void *dataset, size_t dataset_size, uint32_t batch_size);
 

diff --git a/src/cuda_extra.cu b/src/cuda_extra.cu
@@ -469,30 +469,6 @@ void cryptonight_extra_cpu_final(nvid_ctx *ctx, uint32_t startNonce, uint64_t ta
     }
 }
 
-void cryptonight_extra_cpu_free(nvid_ctx *ctx)
-{
-    using namespace xmrig;
-
-    if (ctx->d_ctx_key1) {
-        CUDA_CHECK(ctx->device_id, cudaFree(ctx->d_ctx_key1));
-        CUDA_CHECK(ctx->device_id, cudaFree(ctx->d_ctx_key2));
-        CUDA_CHECK(ctx->device_id, cudaFree(ctx->d_ctx_text));
-        CUDA_CHECK(ctx->device_id, cudaFree(ctx->d_ctx_a));
-        CUDA_CHECK(ctx->device_id, cudaFree(ctx->d_ctx_b));
-    }
-
-    CUDA_CHECK(ctx->device_id, cudaFree(ctx->d_long_state));
-
-    CUDA_CHECK(ctx->device_id, cudaFree(ctx->d_input));
-    CUDA_CHECK(ctx->device_id, cudaFree(ctx->d_result_count));
-    CUDA_CHECK(ctx->device_id, cudaFree(ctx->d_result_nonce));
-    CUDA_CHECK(ctx->device_id, cudaFree(ctx->d_ctx_state));
-
-    if (ctx->algorithm.family() == Algorithm::CN_HEAVY) {
-        CUDA_CHECK(ctx->device_id, cudaFree(ctx->d_ctx_state2));
-    }
-}
-
 int cuda_get_devicecount()
 {
     int deviceCount = 0;

diff --git a/src/xmrig-cuda.cpp b/src/xmrig-cuda.cpp
@@ -31,6 +31,7 @@
 #include <map>
 #include <mutex>
 #include <string>
+#include <cuda_runtime_api.h>
 
 
 static std::mutex mutex;
@@ -334,11 +335,31 @@ void release(nvid_ctx *ctx)
         return;
     }
 
-    if (ctx->ready) {
-        cryptonight_extra_cpu_free(ctx);
-    }
+    delete[] ctx->device_name;
+
+    // cudaFree, cuModuleUnload, cuCtxDestroy check for nullptr internally
+
+    cudaFree(ctx->d_input);
+    cudaFree(ctx->d_result_count);
+    cudaFree(ctx->d_result_nonce);
+    cudaFree(ctx->d_long_state);
+    cudaFree(ctx->d_ctx_state);
+    cudaFree(ctx->d_ctx_state2);
+    cudaFree(ctx->d_ctx_a);
+    cudaFree(ctx->d_ctx_b);
+    cudaFree(ctx->d_ctx_key1);
+    cudaFree(ctx->d_ctx_key2);
+    cudaFree(ctx->d_ctx_text);
+
+    cudaFree(ctx->d_rx_dataset);
+    cudaFree(ctx->d_rx_hashes);
+    cudaFree(ctx->d_rx_entropy);
+    cudaFree(ctx->d_rx_vm_states);
+    cudaFree(ctx->d_rx_rounding);
+
+    cuModuleUnload(ctx->module);
 
-    delete [] ctx->device_name;
+    cuCtxDestroy(ctx->cuContext);
 
     delete ctx;
 }