Commit 590497658053941b756c7648a3cd97b0e0e98a56
2012-02-08T18:13:32
Reinstate original code as much as possible for comparison.
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
diff --git a/diakgcn120208.cl b/diakgcn120208.cl
index b5d3196..7a87207 100644
--- a/diakgcn120208.cl
+++ b/diakgcn120208.cl
@@ -3,7 +3,9 @@
// Parts and / or ideas for this kernel are based upon the public-domain poclbm project, the phatk kernel by Phateus and the DiabloMiner kernel by DiabloD3.
// The kernel was rewritten by me (Diapolo) and is still public-domain!
-#if defined VECTORS4
+#ifdef VECTORS8
+ typedef uint8 u;
+#elif defined VECTORS4
typedef uint4 u;
#elif defined VECTORS2
typedef uint2 u;
@@ -29,7 +31,9 @@
#ifdef GOFFSET
typedef uint uu;
#else
- #if defined VECTORS4
+ #ifdef VECTORS8
+ typedef uint8 uu;
+ #elif defined VECTORS4
typedef uint4 uu;
#elif defined VECTORS2
typedef uint2 uu;
@@ -63,23 +67,29 @@ __kernel
u W[17];
u V[8];
-#if defined VECTORS4
+#ifdef VECTORS8
+ #ifdef GOFFSET
+ u nonce = ((uint)get_global_id(0) << 3) + (u)(0, 1, 2, 3, 4, 5, 6, 7);
+ #else
+ u nonce = ((uint)get_group_id(0) * (uint)WORKSIZE * 8U) + ((uint)get_local_id(0) * 8U) + base;
+ #endif
+#elif defined VECTORS4
#ifdef GOFFSET
- u nonce = base + (get_global_id(0)<<2) + (uint4)(0, 1, 2, 3);
+ u nonce = ((uint)get_global_id(0) << 2) + (u)(0, 1, 2, 3);
#else
- u nonce = base + (uint)(get_local_id(0)) * 4u + (uint)(get_group_id(0)) * (WORKSIZE * 4u);
+ u nonce = ((uint)get_group_id(0) * (uint)WORKSIZE * 4U) + ((uint)get_local_id(0) * 4U) + base;
#endif
#elif defined VECTORS2
#ifdef GOFFSET
- u nonce = base + (get_global_id(0)<<1) + (uint2)(0, 1);
+ u nonce = ((uint)get_global_id(0) << 1) + (u)(0, 1);
#else
- u nonce = base + (uint)(get_local_id(0)) * 2u + (uint)(get_group_id(0)) * (WORKSIZE * 2u);
+ u nonce = ((uint)get_group_id(0) * (uint)get_local_size(0) * 2U) + ((uint)get_local_id(0) * 2U) + base;
#endif
#else
#ifdef GOFFSET
- u nonce = base + get_global_id(0);
+ u nonce = (uint)get_global_id(0);
#else
- u nonce = base + get_local_id(0) + get_group_id(0) * (WORKSIZE);
+ u nonce = ((uint)get_group_id(0) * (uint)WORKSIZE) + (uint)get_local_id(0) + base;
#endif
#endif