Commit 00290a3e02a573d6ec27b9ee3aee171c884bb5e1
2012-02-21T21:31:31
Select diablo kernel on all but GCN+SDK 2.6.
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
diff --git a/cgminer.c b/cgminer.c
index 8a38523..db4933e 100644
--- a/cgminer.c
+++ b/cgminer.c
@@ -714,7 +714,7 @@ static struct opt_table opt_config_table[] = {
"Specify a path to where the kernel .cl files are"),
OPT_WITH_ARG("--kernel|-k",
opt_set_charp, NULL, &opt_kernel,
- "Select kernel to use (poclbm, phatk or diakgcn - default: auto)"),
+ "Select kernel to use (diablo, poclbm, phatk or diakgcn - default: auto)"),
#endif
OPT_WITHOUT_ARG("--load-balance",
set_loadbalance, &pool_strategy,
diff --git a/device-gpu.c b/device-gpu.c
index 40cde84..f15307b 100644
--- a/device-gpu.c
+++ b/device-gpu.c
@@ -1009,7 +1009,7 @@ static void opencl_detect()
strcmp(opt_kernel, "phatk") &&
strcmp(opt_kernel, "diakgcn") &&
strcmp(opt_kernel, "diablo"))
- quit(1, "Invalid kernel name specified - must be poclbm, phatk or diakgcn");
+ quit(1, "Invalid kernel name specified - must be diablo, poclbm, phatk or diakgcn");
if (!strcmp(opt_kernel, "diakgcn"))
chosen_kernel = KL_DIAKGCN;
else if (!strcmp(opt_kernel, "poclbm"))
@@ -1147,12 +1147,12 @@ static bool opencl_thread_init(struct thr_info *thr)
thrdata->queue_kernel_parameters = &queue_poclbm_kernel;
break;
case KL_PHATK:
- default:
thrdata->queue_kernel_parameters = &queue_phatk_kernel;
break;
case KL_DIAKGCN:
thrdata->queue_kernel_parameters = &queue_diakgcn_kernel;
break;
+ default:
case KL_DIABLO:
thrdata->queue_kernel_parameters = &queue_diablo_kernel;
break;
diff --git a/ocl.c b/ocl.c
index 9fcd500..c4af35c 100644
--- a/ocl.c
+++ b/ocl.c
@@ -117,13 +117,6 @@ int clDevicesNum(void) {
status = clGetPlatformInfo(platform, CL_PLATFORM_VERSION, sizeof(pbuff), pbuff, NULL);
if (status == CL_SUCCESS)
applog(LOG_INFO, "CL Platform %d version: %s", i, pbuff);
- if (strstr(pbuff, "844.4") /* Linux 64 bit ATI 2.6 SDK */ ||
- strstr(pbuff, "851.4") /* Windows 64 bit "" */ ||
- strstr(pbuff, "831.4") /* Windows & Linux 32 bit "" */ ||
- strstr(pbuff, "898.1") /* Windows 64 bit 12.2 driver SDK */) {
- applog(LOG_WARNING, "AMD OpenCL SDK 2.6 installed giving POOR PERFORMANCE on R5xxx and R6xxx.");
- applog(LOG_WARNING, "Downgrade SDK, delete .bin files and restart cgminer to fix this.");
- }
status = clGetDeviceIDs(platform, CL_DEVICE_TYPE_GPU, 0, NULL, &numDevices);
if (status != CL_SUCCESS) {
applog(LOG_ERR, "Error %d: Getting Device IDs (num)", status);
@@ -371,20 +364,19 @@ _clState *initCl(unsigned int gpu, char *name, size_t nameSize)
char numbuf[10];
if (chosen_kernel == KL_NONE) {
- /* If no binary is available, and we have a card that suffers with phatk
+ /* If no binary is available, and we have a card that suffers with diablo
* on SDK2.6, use the poclbm kernel instead if one has not been
* selected. */
- if (strstr(name, "Tahiti") // GCN
- || !clState->hasBitAlign // Older Radeon & Nvidia
- || strstr(vbuff, "844.4") // Linux 64 bit ATI 2.6 SDK
- || strstr(vbuff, "851.4") // Windows 64 bit ""
- || strstr(vbuff, "831.4") // Windows & Linux 32 bit ""
- ) {
- applog(LOG_INFO, "Selecting poclbm kernel");
+ if (strstr(name, "Tahiti") &&
+ (strstr(vbuff, "844.4") || // Linux 64 bit ATI 2.6 SDK
+ strstr(vbuff, "851.4") || // Windows 64 bit ""
+ strstr(vbuff, "831.4"))) // Windows & Linux 32 bit ""
+ {
+ applog(LOG_INFO, "Selecting poclbm kernel");
clState->chosen_kernel = KL_POCLBM;
} else {
- applog(LOG_INFO, "Selecting phatk kernel");
- clState->chosen_kernel = KL_PHATK;
+ applog(LOG_INFO, "Selecting diablo kernel");
+ clState->chosen_kernel = KL_DIABLO;
}
} else
clState->chosen_kernel = chosen_kernel;
@@ -394,7 +386,6 @@ _clState *initCl(unsigned int gpu, char *name, size_t nameSize)
strcpy(filename, POCLBM_KERNNAME".cl");
strcpy(binaryfilename, POCLBM_KERNNAME);
break;
- case KL_NONE: /* Shouldn't happen */
case KL_PHATK:
strcpy(filename, PHATK_KERNNAME".cl");
strcpy(binaryfilename, PHATK_KERNNAME);
@@ -403,6 +394,7 @@ _clState *initCl(unsigned int gpu, char *name, size_t nameSize)
strcpy(filename, DIAKGCN_KERNNAME".cl");
strcpy(binaryfilename, DIAKGCN_KERNNAME);
break;
+ case KL_NONE: /* Shouldn't happen */
case KL_DIABLO:
strcpy(filename, DIABLO_KERNNAME".cl");
strcpy(binaryfilename, DIABLO_KERNNAME);