Skip to content
This repository was archived by the owner on Jan 11, 2026. It is now read-only.

Commit 156edc2

Browse files
KlausTKlausT
committed
Merge branch 'windows' into cuda9
2 parents a7a7e22 + 80d080d commit 156edc2

29 files changed

+67
-15
lines changed

‎Algo256/blake256.cu‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -693,8 +693,8 @@ extern int scanhash_blake256(int thr_id, uint32_t *pdata, uint32_t *ptarget,
693693
uint32_t crcsum;
694694
#endif
695695
unsigned int intensity = 28;
696-
uint32_t throughput = device_intensity(device_map[thr_id], __func__, 1U << intensity);
697-
throughput = min(throughput, max_nonce - first_nonce) & 0xfffffc00;
696+
uint32_t throughputmax = device_intensity(device_map[thr_id], __func__, 1U << intensity);
697+
uint32_t throughput = min(throughputmax, max_nonce - first_nonce) & 0xfffffc00;
698698

699699
int rc = 0;
700700

@@ -717,6 +717,8 @@ extern int scanhash_blake256(int thr_id, uint32_t *pdata, uint32_t *ptarget,
717717
static THREAD volatile bool init = false;
718718
if(!init)
719719
{
720+
if(throughputmax == intensity)
721+
applog(LOG_INFO, "GPU #%d: using default intensity %.3f", device_map[thr_id], throughput2intensity(throughputmax));
720722
CUDA_SAFE_CALL(cudaSetDevice(device_map[thr_id]));
721723
CUDA_SAFE_CALL(cudaDeviceReset());
722724
CUDA_SAFE_CALL(cudaSetDeviceFlags(cudaDeviceScheduleBlockingSync));

‎Algo256/keccak256.cu‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,8 @@ extern int scanhash_keccak256(int thr_id, uint32_t *pdata,
5050
static THREAD volatile bool init = false;
5151
if(!init)
5252
{
53+
if(throughputmax == intensity)
54+
applog(LOG_INFO, "GPU #%d: using default intensity %.3f", device_map[thr_id], throughput2intensity(throughputmax));
5355
CUDA_SAFE_CALL(cudaSetDevice(device_map[thr_id]));
5456
CUDA_SAFE_CALL(cudaDeviceReset());
5557
CUDA_SAFE_CALL(cudaSetDeviceFlags(cudaDeviceScheduleBlockingSync));

‎JHA/jackpotcoin.cu‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,8 @@ extern int scanhash_jackpot(int thr_id, uint32_t *pdata,
9595

9696
if (!init)
9797
{
98+
if(throughputmax == 1<<20)
99+
applog(LOG_INFO, "GPU #%d: using default intensity 20", device_map[thr_id]);
98100
CUDA_SAFE_CALL(cudaSetDevice(device_map[thr_id]));
99101
CUDA_SAFE_CALL(cudaDeviceReset());
100102
CUDA_SAFE_CALL(cudaSetDeviceFlags(cudaDeviceScheduleBlockingSync));

‎Sia/sia.cu‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -230,6 +230,8 @@ int scanhash_sia(int thr_id, uint32_t *pdata, uint32_t *ptarget, uint32_t max_no
230230
sia_gpu_init(thr_id);
231231

232232
throughputmax = device_intensity(device_map[thr_id], __func__, 1U << 28);
233+
if(throughputmax == 1<<28)
234+
applog(LOG_INFO, "GPU #%d: using default intensity 28", device_map[thr_id]);
233235
mining_has_stopped[thr_id] = false;
234236
init = true;
235237
}

‎bitcoin.cu‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,15 +128,17 @@ int scanhash_bitcoin(int thr_id, uint32_t *pdata,
128128
static THREAD uint32_t *h_nounce = nullptr;
129129

130130
const uint32_t first_nonce = pdata[19];
131-
uint32_t throughput = device_intensity(device_map[thr_id], __func__, 1U << 28);
132-
throughput = min(throughput, (max_nonce - first_nonce)) & 0xfffffc00;
131+
uint32_t throughputmax = device_intensity(device_map[thr_id], __func__, 1U << 28);
132+
uint32_t throughput = min(throughputmax, (max_nonce - first_nonce)) & 0xfffffc00;
133133

134134
if (opt_benchmark)
135135
ptarget[7] = 0x0005;
136136

137137
static THREAD volatile bool init = false;
138138
if(!init)
139139
{
140+
if(throughputmax == 1<<28)
141+
applog(LOG_INFO, "GPU #%d: using default intensity 28", device_map[thr_id]);
140142
CUDA_SAFE_CALL(cudaSetDevice(device_map[thr_id]));
141143
CUDA_SAFE_CALL(cudaDeviceReset());
142144
CUDA_SAFE_CALL(cudaSetDeviceFlags(cudaDeviceScheduleBlockingSync));

‎ccminer-config-win.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@
156156
#define PACKAGE_NAME "ccminer"
157157

158158
/* Define to the full name and version of this package. */
159-
#define PACKAGE_STRING "ccminer 8.18-KlausT"
159+
#define PACKAGE_STRING "ccminer 8.19-KlausT"
160160

161161
/* Define to the one symbol short name of this package. */
162162
#define PACKAGE_TARNAME "ccminer"
@@ -165,7 +165,7 @@
165165
#define PACKAGE_URL ""
166166

167167
/* Define to the version of this package. */
168-
#define PACKAGE_VERSION "8.18-KlausT"
168+
#define PACKAGE_VERSION "8.19-KlausT"
169169

170170
/* If using the C implementation of alloca, define if you know the
171171
direction of stack growth for your system; otherwise it will be
@@ -188,7 +188,7 @@
188188
//#define USE_XOP 1
189189

190190
/* Version number of package */
191-
#define VERSION "8.18-KlausT"
191+
#define VERSION "8.19-KlausT"
192192

193193
/* Define curl_free() as free() if our version of curl lacks curl_free. */
194194
/* #undef curl_free */

‎configure.ac‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
AC_INIT([ccminer], [8.18-KlausT])
1+
AC_INIT([ccminer], [8.19-KlausT])
22

33
AC_PREREQ([2.59c])
44
AC_CANONICAL_SYSTEM

‎cuda_nist5.cu‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@ extern int scanhash_nist5(int thr_id, uint32_t *pdata,
7474

7575
const uint32_t first_nonce = pdata[19];
7676

77-
uint32_t throughput = device_intensity(device_map[thr_id], __func__, 1 << 19); // 256*256*16
78-
throughput = min(throughput, (max_nonce - first_nonce)) & 0xfffffc00;
77+
uint32_t throughputmax = device_intensity(device_map[thr_id], __func__, 1 << 19); // 256*256*16
78+
uint32_t throughput = min(throughputmax, (max_nonce - first_nonce)) & 0xfffffc00;
7979

8080
if (opt_benchmark)
8181
ptarget[7] = 0x0Fu;
@@ -84,6 +84,8 @@ extern int scanhash_nist5(int thr_id, uint32_t *pdata,
8484
if(!init)
8585
{
8686
oldthroughput = throughput;
87+
if(throughputmax == 1<<19)
88+
applog(LOG_INFO, "GPU #%d: using default intensity 19", device_map[thr_id]);
8789
CUDA_SAFE_CALL(cudaSetDevice(device_map[thr_id]));
8890
CUDA_SAFE_CALL(cudaDeviceReset());
8991
CUDA_SAFE_CALL(cudaSetDeviceFlags(cudaDeviceScheduleBlockingSync));

‎fuguecoin.cpp‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@ extern int scanhash_fugue256(int thr_id, uint32_t *pdata, uint32_t *ptarget,
3838
static THREAD volatile bool init = false;
3939
if(!init)
4040
{
41+
if(throughputmax == intensity)
42+
applog(LOG_INFO, "GPU #%d: using default intensity %.3f", device_map[thr_id], throughput2intensity(throughputmax));
4143
#if defined WIN32 && !defined _WIN64
4244
// 2GB limit for cudaMalloc
4345
if(throughputmax > 0x7fffffffULL / (8 * sizeof(uint32_t)))

‎groestlcoin.cpp‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,8 @@ extern int scanhash_groestlcoin(int thr_id, uint32_t *pdata, uint32_t *ptarget,
6666
static THREAD volatile bool init = false;
6767
if(!init)
6868
{
69+
if(throughputmax == intensity)
70+
applog(LOG_INFO, "GPU #%d: using default intensity %.3f", device_map[thr_id], throughput2intensity(throughputmax));
6971
CUDA_SAFE_CALL(cudaSetDevice(device_map[thr_id]));
7072
CUDA_SAFE_CALL(cudaDeviceReset());
7173
CUDA_SAFE_CALL(cudaSetDeviceFlags(cudaDeviceScheduleBlockingSync));

0 commit comments

Comments
 (0)