GOSTSec/sgminer
1
0
Fork 0
mirror of https://github.com/GOSTSec/sgminer synced 2025-01-10 23:08:07 +00:00
Code Issues Releases Wiki Activity

Define max gpudevices in one macro.

Browse Source
This commit is contained in:
Con Kolivas 2011-09-08 14:44:14 +10:00
parent 4b43efceca
commit 6c8341f133
2 changed files with 26 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
main.c
View File

@ -210,7 +210,7 @@ static int nDevs;
static int opt_g_threads = 2; static int opt_g_threads = 2;
static int opt_device; static int opt_device;
static int total_devices; static int total_devices;
static bool gpu_devices[16]; static bool gpu_devices[MAX_GPUDEVICES];
static int gpu_threads; static int gpu_threads;
static bool forced_n_threads; static bool forced_n_threads;
static int opt_n_threads; static int opt_n_threads;
@ -1146,7 +1146,7 @@ static char *set_gpu_engine(char *arg)
} }
if (device == 1) { if (device == 1) {
for (i = 1; i < 16; i++) { for (i = 1; i < MAX_GPUDEVICES; i++) {
gpus[i].min_engine = gpus[0].min_engine; gpus[i].min_engine = gpus[0].min_engine;
gpus[i].gpu_engine = gpus[0].gpu_engine; gpus[i].gpu_engine = gpus[0].gpu_engine;
} }
@ -1182,7 +1182,7 @@ static char *set_gpu_fan(char *arg)
} }
if (device == 1) { if (device == 1) {
for (i = 1; i < 16; i++) { for (i = 1; i < MAX_GPUDEVICES; i++) {
gpus[i].min_fan = gpus[0].min_fan; gpus[i].min_fan = gpus[0].min_fan;
gpus[i].gpu_fan = gpus[0].gpu_fan; gpus[i].gpu_fan = gpus[0].gpu_fan;
} }
@ -1212,8 +1212,10 @@ static char *set_gpu_memclock(char *arg)
gpus[device++].gpu_memclock = val; gpus[device++].gpu_memclock = val;
} }
for (i = device; i < 16; i++) if (device == 1) {
gpus[i].gpu_memclock = val; for (i = device; i < MAX_GPUDEVICES; i++)
gpus[i].gpu_memclock = gpus[0].gpu_memclock;
}
return NULL; return NULL;
} }
@ -1239,8 +1241,10 @@ static char *set_gpu_powertune(char *arg)
gpus[device++].gpu_powertune = val; gpus[device++].gpu_powertune = val;
} }
for (i = device; i < 16; i++) if (device == 1) {
gpus[i].gpu_powertune = val; for (i = device; i < MAX_GPUDEVICES; i++)
gpus[i].gpu_powertune = gpus[0].gpu_powertune;
}
return NULL; return NULL;
} }
@ -1267,8 +1271,10 @@ static char *set_gpu_vddc(char *arg)
gpus[device++].gpu_vddc = val; gpus[device++].gpu_vddc = val;
} }
for (i = device; i < 16; i++) if (device == 1) {
gpus[i].gpu_vddc = val; for (i = device; i < MAX_GPUDEVICES; i++)
gpus[i].gpu_vddc = gpus[0].gpu_vddc;
}
return NULL; return NULL;
} }
@ -1297,7 +1303,7 @@ static char *set_temp_cutoff(char *arg)
*tco = val; *tco = val;
} }
if (device == 1) { if (device == 1) {
for (i = device; i < 16; i++) { for (i = device; i < MAX_GPUDEVICES; i++) {
tco = &gpus[i].adl.cutofftemp; tco = &gpus[i].adl.cutofftemp;
*tco = val; *tco = val;
} }
@ -1330,7 +1336,7 @@ static char *set_temp_overheat(char *arg)
*to = val; *to = val;
} }
if (device == 1) { if (device == 1) {
for (i = device; i < 16; i++) { for (i = device; i < MAX_GPUDEVICES; i++) {
to = &gpus[i].adl.overtemp; to = &gpus[i].adl.overtemp;
*to = val; *to = val;
} }
@ -1363,7 +1369,7 @@ static char *set_temp_target(char *arg)
*tt = val; *tt = val;
} }
if (device == 1) { if (device == 1) {
for (i = device; i < 16; i++) { for (i = device; i < MAX_GPUDEVICES; i++) {
tt = &gpus[i].adl.targettemp; tt = &gpus[i].adl.targettemp;
*tt = val; *tt = val;
} }
@ -1771,7 +1777,7 @@ static WINDOW *mainwin, *statuswin, *logwin;
static double total_secs = 0.1; static double total_secs = 0.1;
static char statusline[256]; static char statusline[256];
static int cpucursor, gpucursor, logstart, logcursor; static int cpucursor, gpucursor, logstart, logcursor;
struct cgpu_info gpus[16]; /* Maximum number apparently possible */ struct cgpu_info gpus[MAX_GPUDEVICES]; /* Maximum number apparently possible */
static struct cgpu_info *cpus; static struct cgpu_info *cpus;
static inline void unlock_curses(void) static inline void unlock_curses(void)
@ -3980,7 +3986,7 @@ enum {
}; };
#ifdef HAVE_OPENCL #ifdef HAVE_OPENCL
static _clState *clStates[16]; static _clState *clStates[MAX_GPUDEVICES];
static cl_int queue_poclbm_kernel(_clState *clState, dev_blk_ctx *blk) static cl_int queue_poclbm_kernel(_clState *clState, dev_blk_ctx *blk)
{ {
@ -5141,7 +5147,7 @@ int main (int argc, char *argv[])
#ifdef HAVE_OPENCL #ifdef HAVE_OPENCL
if (!skip_to_bench) { if (!skip_to_bench) {
for (i = 0; i < 16; i++) for (i = 0; i < MAX_GPUDEVICES; i++)
gpu_devices[i] = false; gpu_devices[i] = false;
nDevs = clDevicesNum(); nDevs = clDevicesNum();
if (nDevs < 0) { if (nDevs < 0) {
@ -5224,7 +5230,7 @@ int main (int argc, char *argv[])
if (total_devices) { if (total_devices) {
if (total_devices > nDevs) if (total_devices > nDevs)
quit(1, "More devices specified than exist"); quit(1, "More devices specified than exist");
for (i = 0; i < 16; i++) for (i = 0; i < MAX_GPUDEVICES; i++)
if (gpu_devices[i] && i + 1 > nDevs) if (gpu_devices[i] && i + 1 > nDevs)
quit (1, "Command line options set a device that doesn't exist"); quit (1, "Command line options set a device that doesn't exist");
} else { } else {

5
miner.h
View File

@ -377,12 +377,15 @@ struct work_restart {
char padding[128 - sizeof(unsigned long)]; char padding[128 - sizeof(unsigned long)];
}; };
#define MAX_GPUDEVICES 16
extern int hw_errors; extern int hw_errors;
extern bool use_syslog; extern bool use_syslog;
extern struct thr_info *thr_info; extern struct thr_info *thr_info;
extern int longpoll_thr_id; extern int longpoll_thr_id;
extern struct work_restart *work_restart; extern struct work_restart *work_restart;
extern struct cgpu_info gpus[16]; extern struct cgpu_info gpus[MAX_GPUDEVICES];
#ifdef HAVE_OPENCL #ifdef HAVE_OPENCL
typedef struct { typedef struct {