diff --git a/Algo256/blake256.cu b/Algo256/blake256.cu index f1a7291..b0709f3 100644 --- a/Algo256/blake256.cu +++ b/Algo256/blake256.cu @@ -472,7 +472,7 @@ extern "C" int scanhash_blake256(int thr_id, uint32_t *pdata, const uint32_t *pt else if (opt_debug) { applog_hash((uchar*)ptarget); applog_compare_hash((uchar*)vhashcpu, (uchar*)ptarget); - applog(LOG_DEBUG, "GPU #%d: result for nonce %08x does not validate on CPU!", thr_id, foundNonce); + applog(LOG_WARNING, "GPU #%d: result for nonce %08x does not validate on CPU!", device_map[thr_id], foundNonce); } } diff --git a/Algo256/keccak256.cu b/Algo256/keccak256.cu index 865c220..17c57c9 100644 --- a/Algo256/keccak256.cu +++ b/Algo256/keccak256.cu @@ -79,7 +79,7 @@ extern "C" int scanhash_keccak256(int thr_id, uint32_t *pdata, return 1; } else { - applog(LOG_DEBUG, "GPU #%d: result for nounce %08x does not validate on CPU!", thr_id, foundNonce); + applog(LOG_WARNING, "GPU #%d: result for nounce %08x does not validate on CPU!", device_map[thr_id], foundNonce); } } diff --git a/JHA/jackpotcoin.cu b/JHA/jackpotcoin.cu index 699033a..50b9c0b 100644 --- a/JHA/jackpotcoin.cu +++ b/JHA/jackpotcoin.cu @@ -228,9 +228,9 @@ extern "C" int scanhash_jackpot(int thr_id, uint32_t *pdata, } pdata[19] = foundNonce; return res; - } - else { - applog(LOG_INFO, "GPU #%d: result for nonce $%08X does not validate on CPU (%d rounds)!", thr_id, foundNonce, rounds); + } else { + applog(LOG_WARNING, "GPU #%d: result for nonce %08x does not validate on CPU!", + device_map[thr_id], foundNonce); } } diff --git a/cuda_nist5.cu b/cuda_nist5.cu index 90e770f..e691615 100644 --- a/cuda_nist5.cu +++ b/cuda_nist5.cu @@ -132,7 +132,7 @@ extern "C" int scanhash_nist5(int thr_id, uint32_t *pdata, return res; } else { - applog(LOG_INFO, "GPU #%d: result for nonce $%08X does not validate on CPU!", thr_id, foundNonce); + applog(LOG_WARNING, "GPU #%d: result for nonce %08x does not validate on CPU!", device_map[thr_id], foundNonce); } } diff --git a/fuguecoin.cpp b/fuguecoin.cpp index ddc3cda..fdd28c7 100644 --- a/fuguecoin.cpp +++ b/fuguecoin.cpp @@ -70,7 +70,8 @@ extern "C" int scanhash_fugue256(int thr_id, uint32_t *pdata, const uint32_t *pt *hashes_done = foundNounce - start_nonce + 1; return 1; } else { - applog(LOG_INFO, "GPU #%d: result for nonce $%08X does not validate on CPU!", thr_id, foundNounce); + applog(LOG_WARNING, "GPU #%d: result for nonce %08x does not validate on CPU!", + device_map[thr_id], foundNounce); } } diff --git a/groestlcoin.cpp b/groestlcoin.cpp index 1e33ff7..db74549 100644 --- a/groestlcoin.cpp +++ b/groestlcoin.cpp @@ -79,7 +79,7 @@ extern "C" int scanhash_groestlcoin(int thr_id, uint32_t *pdata, const uint32_t free(outputHash); return true; } else { - applog(LOG_INFO, "GPU #%d: result for nonce $%08X does not validate on CPU!", thr_id, foundNounce); + applog(LOG_WARNING, "GPU #%d: result for nonce %08x does not validate on CPU!", device_map[thr_id], foundNounce); } foundNounce = 0xffffffff; diff --git a/lyra2/lyra2RE.cu b/lyra2/lyra2RE.cu index 448b3f1..dbeab7a 100644 --- a/lyra2/lyra2RE.cu +++ b/lyra2/lyra2RE.cu @@ -112,7 +112,7 @@ extern "C" int scanhash_lyra2(int thr_id, uint32_t *pdata, pdata[19] = foundNonce; return 1; } else { - applog(LOG_INFO, "GPU #%d: result for %08x does not validate on CPU!", thr_id, foundNonce); + applog(LOG_WARNING, "GPU #%d: result for %08x does not validate on CPU!", device_map[thr_id], foundNonce); } } diff --git a/myriadgroestl.cpp b/myriadgroestl.cpp index 5918154..41b3d83 100644 --- a/myriadgroestl.cpp +++ b/myriadgroestl.cpp @@ -82,7 +82,7 @@ extern "C" int scanhash_myriad(int thr_id, uint32_t *pdata, const uint32_t *ptar free(outputHash); return true; } else { - applog(LOG_INFO, "GPU #%d: result for nonce $%08X does not validate on CPU!", thr_id, foundNounce); + applog(LOG_WARNING, "GPU #%d: result for nonce %08x does not validate on CPU!", device_map[thr_id], foundNounce); } foundNounce = 0xffffffff; diff --git a/pentablake.cu b/pentablake.cu index d150a91..e3bd64e 100644 --- a/pentablake.cu +++ b/pentablake.cu @@ -424,12 +424,8 @@ extern "C" int scanhash_pentablake(int thr_id, uint32_t *pdata, const uint32_t * } pdata[19] = foundNonce; return rc; - } - else if (vhashcpu[7] > Htarg) { - applog(LOG_WARNING, "GPU #%d: result for nounce %08x is not in range: %x > %x", thr_id, foundNonce, vhashcpu[7], Htarg); - } - else { - applog(LOG_WARNING, "GPU #%d: result for nounce %08x does not validate on CPU!", thr_id, foundNonce); + } else { + applog(LOG_WARNING, "GPU #%d: result for nounce %08x does not validate on CPU!", device_map[thr_id], foundNonce); } } diff --git a/pluck/pluck.cu b/pluck/pluck.cu index d06f5f9..f2c1f90 100644 --- a/pluck/pluck.cu +++ b/pluck/pluck.cu @@ -194,7 +194,6 @@ extern "C" int scanhash_pluck(int thr_id, uint32_t *pdata, const uint32_t *ptarg if (!init[thr_id]) { cudaSetDevice(device_map[thr_id]); - //cudaDeviceReset(); //cudaSetDeviceFlags(cudaDeviceScheduleBlockingSync); //cudaDeviceSetCacheConfig(cudaFuncCachePreferL1); cudaMalloc(&d_hash[thr_id], opt_pluck_n * 1024 * throughput); @@ -224,7 +223,7 @@ extern "C" int scanhash_pluck(int thr_id, uint32_t *pdata, const uint32_t *ptarg pdata[19] = foundNonce; return 1; } else { - applog(LOG_INFO, "GPU #%d: result for %08x does not validate on CPU!", thr_id, foundNonce); + applog(LOG_WARNING, "GPU #%d: result for %08x does not validate on CPU!", device_map[thr_id], foundNonce); } } diff --git a/quark/animecoin.cu b/quark/animecoin.cu index 0db927c..8f432ee 100644 --- a/quark/animecoin.cu +++ b/quark/animecoin.cu @@ -274,7 +274,7 @@ extern "C" int scanhash_anime(int thr_id, uint32_t *pdata, pdata[19] = foundNonce; return res; } else { - applog(LOG_INFO, "GPU #%d: result for nonce $%08X does not validate on CPU!", thr_id, foundNonce); + applog(LOG_WARNING, "GPU #%d: result for nonce %08x does not validate on CPU!", device_map[thr_id], foundNonce); } } diff --git a/quark/quarkcoin.cu b/quark/quarkcoin.cu index c586592..2fda2da 100644 --- a/quark/quarkcoin.cu +++ b/quark/quarkcoin.cu @@ -241,7 +241,7 @@ extern "C" int scanhash_quark(int thr_id, uint32_t *pdata, *hashes_done = foundNonce - first_nonce + 1; return 1; } else { - applog(LOG_INFO, "GPU #%d: result for nonce $%08X does not validate on CPU!", thr_id, foundNonce); + applog(LOG_WARNING, "GPU #%d: result for nonce %08x does not validate on CPU!", device_map[thr_id], foundNonce); } } diff --git a/qubit/deep.cu b/qubit/deep.cu index 02409b2..ce6720d 100644 --- a/qubit/deep.cu +++ b/qubit/deep.cu @@ -113,7 +113,7 @@ extern "C" int scanhash_deep(int thr_id, uint32_t *pdata, return res; } else { - applog(LOG_INFO, "GPU #%d: result for nonce $%08X does not validate on CPU!", thr_id, foundNonce); + applog(LOG_WARNING, "GPU #%d: result for nonce %08x does not validate on CPU!", device_map[thr_id], foundNonce); } } diff --git a/qubit/doom.cu b/qubit/doom.cu index 3b550eb..1a8aa4e 100644 --- a/qubit/doom.cu +++ b/qubit/doom.cu @@ -77,9 +77,8 @@ extern "C" int scanhash_doom(int thr_id, uint32_t *pdata, *hashes_done = min(max_nonce - first_nonce, (uint64_t) pdata[19] - first_nonce + throughput); pdata[19] = foundNonce; return 1; - } - else { - applog(LOG_INFO, "GPU #%d: result for nonce $%08X does not validate on CPU!", thr_id, foundNonce); + } else { + applog(LOG_WARNING, "GPU #%d: result for nonce %08x does not validate on CPU!", device_map[thr_id], foundNonce); } } diff --git a/qubit/qubit.cu b/qubit/qubit.cu index 52d313f..133cec3 100644 --- a/qubit/qubit.cu +++ b/qubit/qubit.cu @@ -139,7 +139,7 @@ extern "C" int scanhash_qubit(int thr_id, uint32_t *pdata, return res; } else { - applog(LOG_INFO, "GPU #%d: result for nonce $%08X does not validate on CPU!", thr_id, foundNonce); + applog(LOG_WARNING, "GPU #%d: result for nonce %08x does not validate on CPU!", device_map[thr_id], foundNonce); } } diff --git a/scrypt-jane.cpp b/scrypt-jane.cpp index b435208..a54acab 100644 --- a/scrypt-jane.cpp +++ b/scrypt-jane.cpp @@ -595,8 +595,6 @@ int scanhash_scrypt_jane(int thr_id, uint32_t *pdata, const uint32_t *ptarget, u if (memcmp(thash, &hash[cur][8*i], 32) == 0) { - //applog(LOG_INFO, "GPU #%d: %s result validates on CPU.", device_map[thr_id], device_name[thr_id]); - *hashes_done = n - pdata[19]; pdata[19] = tmp_nonce; scrypt_free(&Vbuf); @@ -606,7 +604,8 @@ int scanhash_scrypt_jane(int thr_id, uint32_t *pdata, const uint32_t *ptarget, u gettimeofday(tv_end, NULL); return 1; } else { - applog(LOG_INFO, "GPU #%d: %s result does not validate on CPU (i=%d, s=%d)!", device_map[thr_id], device_name[thr_id], i, cur); + applog(LOG_WARNING, "GPU #%d: %s result does not validate on CPU! (i=%d, s=%d)", + device_map[thr_id], device_name[thr_id], i, cur); } } } diff --git a/scrypt.cpp b/scrypt.cpp index 86313d5..31efa07 100644 --- a/scrypt.cpp +++ b/scrypt.cpp @@ -896,9 +896,10 @@ int scanhash_scrypt(int thr_id, uint32_t *pdata, const uint32_t *ptarget, unsign if (memcmp(&hash[cur][i * 8], refhash, 32) != 0) good = false; } - if (!good) - applog(LOG_INFO, "GPU #%d: %s result does not validate on CPU (i=%d, s=%d)!", device_map[thr_id], device_name[thr_id], i, cur); - else { + if (!good) { + applog(LOG_WARNING, "GPU #%d: %s result does not validate on CPU! (i=%d, s=%d)", + device_map[thr_id], device_name[thr_id], i, cur); + } else { *hashes_done = n - pdata[19]; pdata[19] = nonce[cur] + i; result = 1; diff --git a/skein.cu b/skein.cu index 5c67cd8..131812b 100644 --- a/skein.cu +++ b/skein.cu @@ -413,7 +413,7 @@ extern "C" int scanhash_skeincoin(int thr_id, uint32_t *pdata, const uint32_t *p return res; } else { - applog(LOG_INFO, "GPU #%d: result for nonce $%08X does not validate on CPU!", device_map[thr_id], foundNonce); + applog(LOG_WARNING, "GPU #%d: result for nonce %08x does not validate on CPU!", device_map[thr_id], foundNonce); } } pdata[19] += throughput; diff --git a/skein2.cu b/skein2.cu index c1e8669..b264597 100644 --- a/skein2.cu +++ b/skein2.cu @@ -95,9 +95,8 @@ extern "C" int scanhash_skein2(int thr_id, uint32_t *pdata, const uint32_t *ptar } pdata[19] = swab32(foundNonce); return res; - } - else { - applog(LOG_INFO, "GPU #%d: result for nonce $%08X does not validate on CPU!", device_map[thr_id], foundNonce); + } else { + applog(LOG_WARNING, "GPU #%d: result for nonce %08x does not validate on CPU!", device_map[thr_id], foundNonce); } } diff --git a/x11/fresh.cu b/x11/fresh.cu index 653389f..1d6a6c9 100644 --- a/x11/fresh.cu +++ b/x11/fresh.cu @@ -140,12 +140,8 @@ extern "C" int scanhash_fresh(int thr_id, uint32_t *pdata, } pdata[19] = foundNonce; return res; - } - else if (vhash64[7] > Htarg) { - applog(LOG_INFO, "GPU #%d: result for %08x is not in range: %x > %x", thr_id, foundNonce, vhash64[7], Htarg); - } - else { - applog(LOG_INFO, "GPU #%d: result for %08x does not validate on CPU!", thr_id, foundNonce); + } else { + applog(LOG_WARNING, "GPU #%d: result for %08x does not validate on CPU!", device_map[thr_id], foundNonce); } } diff --git a/x11/s3.cu b/x11/s3.cu index de6707e..f0ebbd6 100644 --- a/x11/s3.cu +++ b/x11/s3.cu @@ -119,7 +119,7 @@ extern "C" int scanhash_s3(int thr_id, uint32_t *pdata, return res; } else { - applog(LOG_INFO, "GPU #%d: result for nonce $%08X does not validate on CPU!", thr_id, foundNonce); + applog(LOG_WARNING, "GPU #%d: result for nonce $%08X does not validate on CPU!", device_map[thr_id], foundNonce); } } diff --git a/x11/x11.cu b/x11/x11.cu index d5802df..fce4997 100644 --- a/x11/x11.cu +++ b/x11/x11.cu @@ -230,12 +230,8 @@ extern "C" int scanhash_x11(int thr_id, uint32_t *pdata, } pdata[19] = foundNonce; return res; - } - else if (vhash64[7] > Htarg) { - applog(LOG_INFO, "GPU #%d: result for %08x is not in range: %x > %x", thr_id, foundNonce, vhash64[7], Htarg); - } - else { - applog(LOG_INFO, "GPU #%d: result for %08x does not validate on CPU!", thr_id, foundNonce); + } else { + applog(LOG_WARNING, "GPU #%d: result for %08x does not validate on CPU!", device_map[thr_id], foundNonce); } } diff --git a/x13/x13.cu b/x13/x13.cu index ecdc616..77d01d7 100644 --- a/x13/x13.cu +++ b/x13/x13.cu @@ -226,12 +226,8 @@ extern "C" int scanhash_x13(int thr_id, uint32_t *pdata, } pdata[19] = foundNonce; return res; - } - else if (vhash64[7] > Htarg) { - applog(LOG_INFO, "GPU #%d: result for %08x is not in range: %x > %x", thr_id, foundNonce, vhash64[7], Htarg); - } - else { - applog(LOG_INFO, "GPU #%d: result for %08x does not validate on CPU!", thr_id, foundNonce); + } else { + applog(LOG_WARNING, "GPU #%d: result for %08x does not validate on CPU!", device_map[thr_id], foundNonce); } } diff --git a/x15/whirlpool.cu b/x15/whirlpool.cu index c44f4c8..eb0a032 100644 --- a/x15/whirlpool.cu +++ b/x15/whirlpool.cu @@ -106,12 +106,8 @@ extern "C" int scanhash_whc(int thr_id, uint32_t *pdata, #endif pdata[19] = foundNonce; return res; - } - else if (vhash64[7] > Htarg) { - applog(LOG_INFO, "GPU #%d: result for %08x is not in range: %x > %x", thr_id, foundNonce, vhash64[7], Htarg); - } - else { - applog(LOG_INFO, "GPU #%d: result for %08x does not validate on CPU!", thr_id, foundNonce); + } else { + applog(LOG_WARNING, "GPU #%d: result for %08x does not validate on CPU!", device_map[thr_id], foundNonce); } } pdata[19] += throughput; diff --git a/x15/whirlpoolx.cu b/x15/whirlpoolx.cu index fd323a4..c9a448e 100644 --- a/x15/whirlpoolx.cu +++ b/x15/whirlpoolx.cu @@ -78,12 +78,8 @@ extern "C" int scanhash_whirlpoolx(int thr_id, uint32_t *pdata, const uint32_t * *hashes_done = pdata[19] - first_nonce + throughput; pdata[19] = foundNonce; return 1; - } - else if (vhash64[7] > Htarg) { - applog(LOG_INFO, "GPU #%d: result for %08x is not in range: %x > %x", thr_id, foundNonce, vhash64[7], Htarg); - } - else { - applog(LOG_INFO, "GPU #%d: result for %08x does not validate on CPU!", thr_id, foundNonce); + } else { + applog(LOG_WARNING, "GPU #%d: result for %08x does not validate on CPU!", device_map[thr_id], foundNonce); } } diff --git a/x15/x14.cu b/x15/x14.cu index d306cd0..abd398f 100644 --- a/x15/x14.cu +++ b/x15/x14.cu @@ -235,12 +235,8 @@ extern "C" int scanhash_x14(int thr_id, uint32_t *pdata, } pdata[19] = foundNonce; return res; - } - else if (vhash64[7] > Htarg) { - applog(LOG_INFO, "GPU #%d: result for %08x is not in range: %x > %x", thr_id, foundNonce, vhash64[7], Htarg); - } - else { - applog(LOG_INFO, "GPU #%d: result for %08x does not validate on CPU!", thr_id, foundNonce); + } else { + applog(LOG_WARNING, "GPU #%d: result for %08x does not validate on CPU!", device_map[thr_id], foundNonce); } } pdata[19] += throughput; diff --git a/x15/x15.cu b/x15/x15.cu index eaa312b..2a220ec 100644 --- a/x15/x15.cu +++ b/x15/x15.cu @@ -247,12 +247,8 @@ extern "C" int scanhash_x15(int thr_id, uint32_t *pdata, } pdata[19] = foundNonce; return res; - } - else if (vhash64[7] > Htarg) { - applog(LOG_INFO, "GPU #%d: result for %08x is not in range: %x > %x", thr_id, foundNonce, vhash64[7], Htarg); - } - else { - applog(LOG_INFO, "GPU #%d: result for %08x does not validate on CPU!", thr_id, foundNonce); + } else { + applog(LOG_WARNING, "GPU #%d: result for %08x does not validate on CPU!", device_map[thr_id], foundNonce); } } diff --git a/x17/x17.cu b/x17/x17.cu index be855d3..6aa74a3 100644 --- a/x17/x17.cu +++ b/x17/x17.cu @@ -272,12 +272,8 @@ extern "C" int scanhash_x17(int thr_id, uint32_t *pdata, } pdata[19] = foundNonce; return res; - } - else if (vhash64[7] > Htarg) { - applog(LOG_INFO, "GPU #%d: result for %08x is not in range: %x > %x", thr_id, foundNonce, vhash64[7], Htarg); - } - else { - applog(LOG_INFO, "GPU #%d: result for %08x does not validate on CPU!", thr_id, foundNonce); + } else { + applog(LOG_WARNING, "GPU #%d: result for %08x does not validate on CPU!", device_map[thr_id], foundNonce); } }