Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cleanup everything in GPU context when releasing it #1

Merged
merged 1 commit into from
Oct 29, 2019
Merged

Cleanup everything in GPU context when releasing it #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion src/cryptonight.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
24 changes: 0 additions & 24 deletions src/cuda_extra.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
29 changes: 25 additions & 4 deletions src/xmrig-cuda.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
#include <map>
#include <mutex>
#include <string>
#include <cuda_runtime_api.h>


static std::mutex mutex;
Expand Down Expand Up @@ -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;
}
Expand Down