GOSTSec
/
ccminer-gostd-lite
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

warnings: use the right device id (device_map[thr_id])

master
Tanguy Pruvot 10 years ago
parent
b1e9277611
commit
3d3f2e2cb5
28 changed files with 46 additions and 84 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      Algo256/blake256.cu
  2. 2
      Algo256/keccak256.cu
  3. 6
      JHA/jackpotcoin.cu
  4. 2
      cuda_nist5.cu
  5. 3
      fuguecoin.cpp
  6. 2
      groestlcoin.cpp
  7. 2
      lyra2/lyra2RE.cu
  8. 2
      myriadgroestl.cpp
  9. 8
      pentablake.cu
  10. 3
      pluck/pluck.cu
  11. 2
      quark/animecoin.cu
  12. 2
      quark/quarkcoin.cu
  13. 2
      qubit/deep.cu
  14. 5
      qubit/doom.cu
  15. 2
      qubit/qubit.cu
  16. 5
      scrypt-jane.cpp
  17. 7
      scrypt.cpp
  18. 2
      skein.cu
  19. 5
      skein2.cu
  20. 8
      x11/fresh.cu
  21. 2
      x11/s3.cu
  22. 8
      x11/x11.cu
  23. 8
      x13/x13.cu
  24. 8
      x15/whirlpool.cu
  25. 8
      x15/whirlpoolx.cu
  26. 8
      x15/x14.cu
  27. 8
      x15/x15.cu
  28. 8
      x17/x17.cu

2
Algo256/blake256.cu
Unescape View File

@ -472,7 +472,7 @@ extern "C" int scanhash_blake256(int thr_id, uint32_t *pdata, const uint32_t *pt @@ -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);
}
}

2
Algo256/keccak256.cu
Unescape View File

@ -79,7 +79,7 @@ extern "C" int scanhash_keccak256(int thr_id, uint32_t *pdata, @@ -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);
}
}

6
JHA/jackpotcoin.cu
Unescape View File

@ -228,9 +228,9 @@ extern "C" int scanhash_jackpot(int thr_id, uint32_t *pdata, @@ -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);
}
}

2
cuda_nist5.cu
Unescape View File

@ -132,7 +132,7 @@ extern "C" int scanhash_nist5(int thr_id, uint32_t *pdata, @@ -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);
}
}

3
fuguecoin.cpp
Unescape View File

@ -70,7 +70,8 @@ extern "C" int scanhash_fugue256(int thr_id, uint32_t *pdata, const uint32_t *pt @@ -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);
}
}

2
groestlcoin.cpp
Unescape View File

@ -79,7 +79,7 @@ extern "C" int scanhash_groestlcoin(int thr_id, uint32_t *pdata, const uint32_t @@ -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;

2
lyra2/lyra2RE.cu
Unescape View File

@ -112,7 +112,7 @@ extern "C" int scanhash_lyra2(int thr_id, uint32_t *pdata, @@ -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);
}
}

2
myriadgroestl.cpp
Unescape View File

@ -82,7 +82,7 @@ extern "C" int scanhash_myriad(int thr_id, uint32_t *pdata, const uint32_t *ptar @@ -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;

8
pentablake.cu
Unescape View File

@ -424,12 +424,8 @@ extern "C" int scanhash_pentablake(int thr_id, uint32_t *pdata, const uint32_t * @@ -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);
}
}

3
pluck/pluck.cu
Unescape View File

@ -194,7 +194,6 @@ extern "C" int scanhash_pluck(int thr_id, uint32_t *pdata, const uint32_t *ptarg @@ -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 @@ -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);
}
}

2
quark/animecoin.cu
Unescape View File

@ -274,7 +274,7 @@ extern "C" int scanhash_anime(int thr_id, uint32_t *pdata, @@ -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);
}
}

2
quark/quarkcoin.cu
Unescape View File

@ -241,7 +241,7 @@ extern "C" int scanhash_quark(int thr_id, uint32_t *pdata, @@ -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);
}
}

2
qubit/deep.cu
Unescape View File

@ -113,7 +113,7 @@ extern "C" int scanhash_deep(int thr_id, uint32_t *pdata, @@ -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);
}
}

5
qubit/doom.cu
Unescape View File

@ -77,9 +77,8 @@ extern "C" int scanhash_doom(int thr_id, uint32_t *pdata, @@ -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);
}
}

2
qubit/qubit.cu
Unescape View File

@ -139,7 +139,7 @@ extern "C" int scanhash_qubit(int thr_id, uint32_t *pdata, @@ -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);
}
}

5
scrypt-jane.cpp
Unescape View File

@ -595,8 +595,6 @@ int scanhash_scrypt_jane(int thr_id, uint32_t *pdata, const uint32_t *ptarget, u @@ -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 @@ -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);
}
}
}

7
scrypt.cpp
Unescape View File

@ -896,9 +896,10 @@ int scanhash_scrypt(int thr_id, uint32_t *pdata, const uint32_t *ptarget, unsign @@ -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;

2
skein.cu
Unescape View File

@ -413,7 +413,7 @@ extern "C" int scanhash_skeincoin(int thr_id, uint32_t *pdata, const uint32_t *p @@ -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;

5
skein2.cu
Unescape View File

@ -95,9 +95,8 @@ extern "C" int scanhash_skein2(int thr_id, uint32_t *pdata, const uint32_t *ptar @@ -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);
}
}

8
x11/fresh.cu
Unescape View File

@ -140,12 +140,8 @@ extern "C" int scanhash_fresh(int thr_id, uint32_t *pdata, @@ -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);
}
}

2
x11/s3.cu
Unescape View File

@ -119,7 +119,7 @@ extern "C" int scanhash_s3(int thr_id, uint32_t *pdata, @@ -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);
}
}

8
x11/x11.cu
Unescape View File

@ -230,12 +230,8 @@ extern "C" int scanhash_x11(int thr_id, uint32_t *pdata, @@ -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);
}
}

8
x13/x13.cu
Unescape View File

@ -226,12 +226,8 @@ extern "C" int scanhash_x13(int thr_id, uint32_t *pdata, @@ -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);
}
}

8
x15/whirlpool.cu
Unescape View File

@ -106,12 +106,8 @@ extern "C" int scanhash_whc(int thr_id, uint32_t *pdata, @@ -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;

8
x15/whirlpoolx.cu
Unescape View File

@ -78,12 +78,8 @@ extern "C" int scanhash_whirlpoolx(int thr_id, uint32_t *pdata, const uint32_t * @@ -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);
}
}

8
x15/x14.cu
Unescape View File

@ -235,12 +235,8 @@ extern "C" int scanhash_x14(int thr_id, uint32_t *pdata, @@ -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;

8
x15/x15.cu
Unescape View File

@ -247,12 +247,8 @@ extern "C" int scanhash_x15(int thr_id, uint32_t *pdata, @@ -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);
}
}

8
x17/x17.cu
Unescape View File

@ -272,12 +272,8 @@ extern "C" int scanhash_x17(int thr_id, uint32_t *pdata, @@ -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);
}
}

Write Preview
Loading…
Cancel
Save