Permalink
Browse files

bench: skip the disabled whirlpoolx

+ veltor free
+ some missed/extra log things...
  • Loading branch information...
1 parent 009b013 commit 2f57ee9157b8cd6e485c3a418778837e11b6f0ec @tpruvot committed Sep 26, 2016
Showing with 5 additions and 3 deletions.
  1. +1 −0 Algo256/blake2s.cu
  2. +3 −0 bench.cpp
  3. +1 −3 neoscrypt/neoscrypt.cpp
View
@@ -432,6 +432,7 @@ extern "C" int scanhash_blake2s(int thr_id, struct work *work, uint32_t max_nonc
cudaDeviceSetCacheConfig(cudaFuncCachePreferL1);
CUDA_LOG_ERROR();
}
+ gpulog(LOG_INFO, thr_id, "Intensity set to %g, %u cuda threads", throughput2intensity(throughput), throughput);
CUDA_CALL_OR_RET_X(cudaMalloc(&d_resNonce[thr_id], NBN * sizeof(uint32_t)), -1);
CUDA_CALL_OR_RET_X(cudaMallocHost(&h_resNonce[thr_id], NBN * sizeof(uint32_t)), -1);
View
@@ -72,7 +72,9 @@ void algo_free_all(int thr_id)
free_sib(thr_id);
free_s3(thr_id);
free_vanilla(thr_id);
+ free_veltor(thr_id);
free_whirl(thr_id);
+ //free_whirlx(thr_id);
free_x11evo(thr_id);
free_x11(thr_id);
free_x13(thr_id);
@@ -103,6 +105,7 @@ bool bench_algo_switch_next(int thr_id)
if (algo == ALGO_DMD_GR) algo++; // same as groestl
if (algo == ALGO_MJOLLNIR) algo++; // same as heavy
if (algo == ALGO_WHIRLCOIN) algo++; // same as whirlpool
+ if (algo == ALGO_WHIRLPOOLX) algo++; // disabled
if (device_sm[dev_id] && device_sm[dev_id] < 300) {
// incompatible SM 2.1 kernels...
@@ -40,14 +40,12 @@ int scanhash_neoscrypt(int thr_id, struct work* work, uint32_t max_nonce, unsign
cudaSetDeviceFlags(cudaDeviceScheduleBlockingSync);
cudaGetLastError(); // reset errors if device is not "reset"
}
- gpulog(LOG_INFO, thr_id, "Intensity set to %g (+5), %u cuda threads", throughput2intensity(throughput), throughput);
-
if (device_sm[dev_id] <= 300) {
gpulog(LOG_ERR, thr_id, "Sorry neoscrypt is not supported on SM 3.0 devices");
proper_exit(EXIT_CODE_CUDA_ERROR);
}
+ gpulog(LOG_INFO, thr_id, "Intensity set to %g (+5), %u cuda threads", throughput2intensity(throughput), throughput);
- gpulog(LOG_INFO, thr_id, "Using %d cuda threads", throughput);
neoscrypt_init(thr_id, throughput);
init[thr_id] = true;

0 comments on commit 2f57ee9

Please sign in to comment.