change thr_id to device_map[thr_id]

KlausT · Aug 12, 2018 · ad9300d · ad9300d
1 parent ce19c94
commit ad9300d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/Algo256/blake256.cu b/Algo256/blake256.cu
@@ -765,7 +765,7 @@ extern int scanhash_blake256(int thr_id, uint32_t *pdata, uint32_t *ptarget,
 			//applog(LOG_BLUE, "%08x %16llx", vhashcpu[6], targetHigh);
 			if (vhashcpu[7] <= target7 && fulltest(vhashcpu, ptarget))
 			{
-				if (opt_benchmark) applog(LOG_INFO, "GPU #%d Found nounce %08x", thr_id, foundNonce);
+				if (opt_benchmark) applog(LOG_INFO, "GPU #%d Found nounce %08x", device_map[thr_id], foundNonce);
 				rc = 1;
 				*hashes_done = pdata[19] - first_nonce + throughput;
 				pdata[19] = foundNonce;
@@ -780,7 +780,7 @@ extern int scanhash_blake256(int thr_id, uint32_t *pdata, uint32_t *ptarget,
 					if (vhashcpu[7] <= target7 && fulltest(vhashcpu, ptarget))
 					{
 						pdata[21] = extra_results[thr_id][0];
-						if(opt_benchmark) applog(LOG_INFO, "GPU #%d Found second nounce %08x", thr_id, extra_results[thr_id][0]);
+						if(opt_benchmark) applog(LOG_INFO, "GPU #%d Found second nounce %08x", device_map[thr_id], extra_results[thr_id][0]);
 //						applog(LOG_BLUE, "1:%x 2:%x", foundNonce, extra_results[thr_id][0]);
 						rc = 2;
 					}

diff --git a/lyra2/lyra2REv2.cpp b/lyra2/lyra2REv2.cpp
@@ -214,7 +214,7 @@ int scanhash_lyra2v2(int thr_id, uint32_t *pdata,
 					{
 						pdata[21] = foundNonce[1];
 						res++;
-						if(opt_benchmark)  applog(LOG_INFO, "GPU #%d Found second nonce %08x", thr_id, foundNonce[1]);
+						if(opt_benchmark)  applog(LOG_INFO, "GPU #%d Found second nonce %08x", device_map[thr_id], foundNonce[1]);
 					}
 					else
 					{
@@ -223,7 +223,7 @@ int scanhash_lyra2v2(int thr_id, uint32_t *pdata,
 					}
 				}
 				pdata[19] = foundNonce[0];
-				if (opt_benchmark) applog(LOG_INFO, "GPU #%d Found nonce % 08x", thr_id, foundNonce[0]);
+				if (opt_benchmark) applog(LOG_INFO, "GPU #%d Found nonce % 08x", device_map[thr_id], foundNonce[0]);
 				return res;
 			}
 			else

diff --git a/x11/c11.cpp b/x11/c11.cpp
@@ -238,26 +238,26 @@ int scanhash_c11(int thr_id, uint32_t *pdata,
 						pdata[21] = foundnonces[1];
 						res++;
 						if(opt_benchmark)
-							applog(LOG_INFO, "GPU #%d: Found second nonce %08x", thr_id, foundnonces[1]);
+							applog(LOG_INFO, "GPU #%d: Found second nonce %08x", device_map[thr_id], foundnonces[1]);
 					}
 					else
 					{
 						if(vhash64[7] != Htarg)
 						{
-							applog(LOG_INFO, "GPU #%d: result for %08x does not validate on CPU!", thr_id, foundnonces[1]);
+							applog(LOG_INFO, "GPU #%d: result for %08x does not validate on CPU!", device_map[thr_id], foundnonces[1]);
 						}
 					}
 				}
 				pdata[19] = foundnonces[0];
 				if(opt_benchmark)
-					applog(LOG_INFO, "GPU #%d: Found nonce %08x", thr_id, foundnonces[0]);
+					applog(LOG_INFO, "GPU #%d: Found nonce %08x", device_map[thr_id], foundnonces[0]);
 				return res;
 			}
 			else
 			{
 				if(vhash64[7] != Htarg)
 				{
-					applog(LOG_INFO, "GPU #%d: result for %08x does not validate on CPU!", thr_id, foundnonces[0]);
+					applog(LOG_INFO, "GPU #%d: result for %08x does not validate on CPU!", device_map[thr_id], foundnonces[0]);
 				}
 			}
 		}