Commit 75888a1f6860a0df59751391c547e6d392dca3c2
2011-07-10T20:14:28
Implement device selection(s) with -d.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122
diff --git a/main.c b/main.c
index e2a82c4..881826a 100644
--- a/main.c
+++ b/main.c
@@ -134,6 +134,9 @@ static enum sha256_algos opt_algo = ALGO_C;
#endif
static int nDevs;
static int opt_g_threads = 2;
+static int opt_device;
+static int total_devices;
+static bool gpu_devices[16];
static int gpu_threads;
static bool forced_n_threads;
static int opt_n_threads;
@@ -229,6 +232,20 @@ static char *set_int_1_to_10(const char *arg, int *i)
return set_int_range(arg, i, 1, 10);
}
+static char *set_devices(const char *arg, int *i)
+{
+ char *err = opt_set_intval(arg, i);
+
+ if (err)
+ return err;
+
+ if (*i < 0 || *i > 15)
+ return "Invalid GPU device number";
+ total_devices++;
+ gpu_devices[*i] = true;
+ return NULL;
+}
+
static char *set_url(const char *arg, char **p)
{
opt_set_charp(arg, p);
@@ -286,6 +303,9 @@ static struct opt_table opt_config_table[] = {
enable_debug, &opt_debug,
"Enable debug output"),
#ifdef HAVE_OPENCL
+ OPT_WITH_ARG("--device|-d",
+ set_devices, NULL, &opt_device,
+ "Select device to use, (Use repeat -d for mulitple devices, default: all)"),
OPT_WITH_ARG("--gpu-threads|-g",
set_int_0_to_10, opt_show_intval, &opt_g_threads,
"Number of threads per GPU (0 - 10)"),
@@ -1635,7 +1655,7 @@ static void *wakeup_thread(void *userdata)
int main (int argc, char *argv[])
{
struct thr_info *thr;
- unsigned int i;
+ unsigned int i, j = 0;
char name[32];
struct cgpu_info *gpus = NULL, *cpus = NULL;
@@ -1657,10 +1677,11 @@ int main (int argc, char *argv[])
#endif /* !WIN32 */
#ifdef HAVE_OPENCL
+ for (i = 0; i < 16; i++)
+ gpu_devices[true] = false;
nDevs = clDevicesNum();
if (nDevs < 0)
return 1;
-
#endif
if (nDevs)
opt_n_threads = 0;
@@ -1679,7 +1700,23 @@ int main (int argc, char *argv[])
return 1;
}
- gpu_threads = nDevs * opt_g_threads;
+ if (total_devices) {
+ if (total_devices > nDevs) {
+ applog(LOG_ERR, "More devices specified than exist");
+ return 1;
+ }
+ for (i = 0; i < 16; i++)
+ if (gpu_devices[i] && i + 1 > nDevs) {
+ applog(LOG_ERR, "Command line options set a device that doesn't exist");
+ return 1;
+ }
+ gpu_threads = total_devices * opt_g_threads;
+ } else {
+ gpu_threads = nDevs * opt_g_threads;
+ for (i = 0; i < nDevs; i++)
+ gpu_devices[i] = true;
+ }
+
if (!gpu_threads && !forced_n_threads) {
/* Maybe they turned GPU off; restore default CPU threads. */
opt_n_threads = num_processors;
@@ -1782,10 +1819,15 @@ int main (int argc, char *argv[])
}
#ifdef HAVE_OPENCL
+ i = 0;
+
/* start GPU mining threads */
- for (i = 0; i < gpu_threads; i++) {
- int gpu = gpu_from_thr_id(i);
+ for (j = 0; j < nDevs * opt_g_threads; j++) {
+ int gpu = gpu_from_thr_id(j);
+ /* Skip devices not set to work */
+ if (!gpu_devices[gpu])
+ continue;
thr = &thr_info[i];
thr->id = i;
gpus[gpu].is_gpu = 1;
@@ -1811,9 +1853,10 @@ int main (int argc, char *argv[])
return 1;
}
pthread_detach(thr->pth);
+ i++;
}
- applog(LOG_INFO, "%d gpu miner threads started", i);
+ applog(LOG_INFO, "%d gpu miner threads started", gpu_threads);
#endif
/* start CPU mining threads */