GOSTSec/ccminer
1
0
Fork 0
mirror of https://github.com/GOSTSec/ccminer synced 2025-01-19 03:00:07 +00:00
Code Issues Releases Wiki Activity

reset: take care of multi-threaded gpus (-d 0,0)

Browse Source 
to be tested... could create problems when reset in a chain like x11...
This commit is contained in:
Tanguy Pruvot 2015-04-21 09:11:04 +02:00
parent c7698afb4a
commit 1ad34dc13d
6 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ccminer.cpp
View File

@ -58,7 +58,7 @@ BOOL WINAPI ConsoleHandler(DWORD);
// from cuda.cpp // from cuda.cpp
int cuda_num_devices(); int cuda_num_devices();
void cuda_devicenames(); void cuda_devicenames();
void cuda_devicereset(); void cuda_shutdown();
int cuda_finddevice(char *name); int cuda_finddevice(char *name);
void cuda_print_devices(); void cuda_print_devices();
@ -485,7 +485,7 @@ void proper_exit(int reason)
{ {
abort_flag = true; abort_flag = true;
usleep(200 * 1000); usleep(200 * 1000);
cuda_devicereset(); cuda_shutdown();
if (reason == EXIT_CODE_OK && app_exit_code != EXIT_CODE_OK) { if (reason == EXIT_CODE_OK && app_exit_code != EXIT_CODE_OK) {
reason = app_exit_code; reason = app_exit_code;

18
cuda.cpp
View File

@ -82,9 +82,9 @@ void cuda_print_devices()
} }
} }
// Can't be called directly in cpu-miner.c void cuda_shutdown()
void cuda_devicereset()
{ {
cudaDeviceSynchronize();
cudaDeviceReset(); cudaDeviceReset();
} }
@ -173,6 +173,20 @@ int cuda_gpu_clocks(struct cgpu_info *gpu)
return -1; return -1;
} }
// if we use 2 threads on the same gpu, we need to reinit the threads
void cuda_reset_device(int thr_id, bool *init)
{
int dev_id = device_map[thr_id];
for (int i=0; i < MAX_GPUS; i++) {
if (device_map[i] == dev_id) {
init[i] = false;
}
}
restart_threads();
cudaDeviceSynchronize();
cudaDeviceReset();
}
void cudaReportHardwareFailure(int thr_id, cudaError_t err, const char* func) void cudaReportHardwareFailure(int thr_id, cudaError_t err, const char* func)
{ {
struct cgpu_info *gpu = &thr_info[thr_id].gpu; struct cgpu_info *gpu = &thr_info[thr_id].gpu;

1
cuda_helper.h
View File

@ -24,6 +24,7 @@ extern int cuda_arch[MAX_GPUS];
// common functions // common functions
extern int cuda_get_arch(int thr_id); extern int cuda_get_arch(int thr_id);
extern void cuda_reset_device(int thr_id, bool *init);
extern void cuda_check_cpu_init(int thr_id, uint32_t threads); extern void cuda_check_cpu_init(int thr_id, uint32_t threads);
extern void cuda_check_cpu_setTarget(const void *ptarget); extern void cuda_check_cpu_setTarget(const void *ptarget);
extern uint32_t cuda_check_hash(int thr_id, uint32_t threads, uint32_t startNounce, uint32_t *d_inputHash); extern uint32_t cuda_check_hash(int thr_id, uint32_t threads, uint32_t startNounce, uint32_t *d_inputHash);

1
skein.cu
View File

@ -359,7 +359,6 @@ extern "C" int scanhash_skeincoin(int thr_id, uint32_t *pdata, const uint32_t *p
if (!init[thr_id]) if (!init[thr_id])
{ {
cudaDeviceReset();
cudaSetDevice(device_map[thr_id]); cudaSetDevice(device_map[thr_id]);
cudaMalloc(&d_hash[thr_id], throughput * 64U); cudaMalloc(&d_hash[thr_id], throughput * 64U);

7
skein2.cu
View File

@ -48,15 +48,14 @@ extern "C" int scanhash_skein2(int thr_id, uint32_t *pdata, const uint32_t *ptar
if (!init[thr_id]) if (!init[thr_id])
{ {
cudaDeviceReset();
cudaSetDevice(device_map[thr_id]); cudaSetDevice(device_map[thr_id]);
cudaMalloc(&d_hash[thr_id], throughput * 64U); cudaMalloc(&d_hash[thr_id], throughput * 64U);
quark_skein512_cpu_init(thr_id, throughput); quark_skein512_cpu_init(thr_id, throughput);
cuda_check_cpu_init(thr_id, throughput); cuda_check_cpu_init(thr_id, throughput);
CUDA_SAFE_CALL(cudaDeviceSynchronize()); CUDA_SAFE_CALL(cudaDeviceSynchronize());
init[thr_id] = true; init[thr_id] = true;
} }

3
zr5.cu
View File

@ -302,7 +302,6 @@ extern "C" int scanhash_zr5(int thr_id, uint32_t *pdata, const uint32_t *ptarget
if (!init[thr_id]) if (!init[thr_id])
{ {
cudaDeviceReset();
cudaSetDevice(device_map[thr_id]); cudaSetDevice(device_map[thr_id]);
// constants // constants
@ -408,7 +407,7 @@ extern "C" int scanhash_zr5(int thr_id, uint32_t *pdata, const uint32_t *ptarget
applog(LOG_WARNING, "GPU #%d: result for %08x does not validate on CPU!", device_map[thr_id], foundNonce); applog(LOG_WARNING, "GPU #%d: result for %08x does not validate on CPU!", device_map[thr_id], foundNonce);
// reinit the card.. // reinit the card..
init[thr_id] = false; cuda_reset_device(thr_id, init);
pdata[19]++; pdata[19]++;
pdata[0] = oldp0; pdata[0] = oldp0;