Commit dfcb98debf8cd2ccb1c837405aadc66b4fec3d92
2012-02-23T00:45:40
Use the SDK and hardware information to choose good performing default kernels.
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
diff --git a/ocl.c b/ocl.c
index f892436..1a355ef 100644
--- a/ocl.c
+++ b/ocl.c
@@ -368,20 +368,27 @@ _clState *initCl(unsigned int gpu, char *name, size_t nameSize)
char numbuf[10];
if (gpus[gpu].kernel == KL_NONE) {
- /* 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") &&
- (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 {
+ if (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 ""
+ if (strstr(name, "Tahiti")) {
+ applog(LOG_INFO, "Selecting poclbm kernel");
+ clState->chosen_kernel = KL_POCLBM;
+ } else {
+ applog(LOG_INFO, "Selecting diablo kernel");
+ clState->chosen_kernel = KL_DIABLO;
+ }
+ } else if (strstr(vbuff, "898.1")) { // Windows 64 bit 12.2 driver
applog(LOG_INFO, "Selecting diablo kernel");
clState->chosen_kernel = KL_DIABLO;
+ } else if (clState->hasBitAlign) {
+ applog(LOG_INFO, "Selecting phatk kernel");
+ clState->chosen_kernel = KL_PHATK;
+ } else {
+ applog(LOG_INFO, "Selecting poclbm kernel");
+ clState->chosen_kernel = KL_POCLBM;
}
+
gpus[gpu].kernel = clState->chosen_kernel;
} else
clState->chosen_kernel = gpus[gpu].kernel;