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

Base was being set wrongly meaning we were repeating searches and the rate was actually lower than displayed :(

Browse Source 
Tweak Ma with new changes.
Change default vectors to 2 since it's faster than 4 even when 4 is reported as preferred.
This commit is contained in:
Con Kolivas 2011-06-27 22:05:03 +10:00
parent c566605195
commit 2dbb39444d
2 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ocl.c
View File

@ -324,6 +324,10 @@ retry:
} }
memcpy(source, rawsource, pl); memcpy(source, rawsource, pl);
/* For some reason 2 vectors is still better even if the card says
* otherwise */
if (clState->preferred_vwidth > 1)
clState->preferred_vwidth = 2;
if (opt_vectors) if (opt_vectors)
clState->preferred_vwidth = opt_vectors; clState->preferred_vwidth = opt_vectors;
if (opt_worksize && opt_worksize <= clState->max_work_size) if (opt_worksize && opt_worksize <= clState->max_work_size)

35
poclbm.cl
View File

@ -1,3 +1,6 @@
// -ck modified kernel taken from Phoenix taken from poclbm, with aspects of
// phatk and others.
// This file is taken and modified from the public-domain poclbm project, and // This file is taken and modified from the public-domain poclbm project, and
// we have therefore decided to keep it public-domain in Phoenix. // we have therefore decided to keep it public-domain in Phoenix.
@ -47,7 +50,7 @@ __constant uint K[64] = {
#define ch(x, y, z) amd_bytealign(x, y, z) #define ch(x, y, z) amd_bytealign(x, y, z)
// Ma can also be implemented in terms of BFI_INT... // Ma can also be implemented in terms of BFI_INT...
#define Ma(x, y, z) amd_bytealign((y), (x | z), (z & x)) #define Ma(x, y, z) amd_bytealign( (z^x), (y), (x) )
#else #else
#define ch(x, y, z) (z ^ (x & (y ^ z))) #define ch(x, y, z) (z ^ (x & (y ^ z)))
#define Ma(x, y, z) ((x & z) | (y & (x | z))) #define Ma(x, y, z) ((x & z) | (y & (x | z)))
@ -76,12 +79,12 @@ __kernel void search( const uint state0, const uint state1, const uint state2, c
u W[24]; u W[24];
u Vals[8]; u Vals[8];
u nonce; u nonce;
uint it; u it;
#ifdef VECTORS4 #ifdef VECTORS4
nonce = ((base >> 2) + (get_global_id(0))<<2) + (uint4)(0, 1, 2, 3); nonce = base + (get_global_id(0)<<2) + (uint4)(0, 1, 2, 3);
#elif defined VECTORS2 #elif defined VECTORS2
nonce = ((base >> 1) + (get_global_id(0))<<1) + (uint2)(0, 1); nonce = base + (get_global_id(0)<<1) + (uint2)(0, 1);
#else #else
nonce = base + get_global_id(0); nonce = base + get_global_id(0);
#endif #endif
@ -627,9 +630,9 @@ __kernel void search( const uint state0, const uint state1, const uint state2, c
#if defined(VECTORS4) || defined(VECTORS2) #if defined(VECTORS4) || defined(VECTORS2)
if (Vals[7].x == 0) if (Vals[7].x == 0)
{ {
for (it = 0; it != 127; it++) { for (it.x = 0; it.x != 127; it.x++) {
if (!output[it]) { if (!output[it.x]) {
output[it] = nonce.x; output[it.x] = nonce.x;
output[127] = 1; output[127] = 1;
break; break;
} }
@ -637,9 +640,9 @@ __kernel void search( const uint state0, const uint state1, const uint state2, c
} }
if (Vals[7].y == 0) if (Vals[7].y == 0)
{ {
for (it = 0; it != 127; it++) { for (it.y = 0; it.y != 127; it.y++) {
if (!output[it]) { if (!output[it.y]) {
output[it] = nonce.y; output[it.y] = nonce.y;
output[127] = 1; output[127] = 1;
break; break;
} }
@ -648,9 +651,9 @@ __kernel void search( const uint state0, const uint state1, const uint state2, c
#ifdef VECTORS4 #ifdef VECTORS4
if (Vals[7].z == 0) if (Vals[7].z == 0)
{ {
for (it = 0; it != 127; it++) { for (it.z = 0; it.z != 127; it.z++) {
if (!output[it]) { if (!output[it.z]) {
output[it] = nonce.z; output[it.z] = nonce.z;
output[127] = 1; output[127] = 1;
break; break;
} }
@ -658,9 +661,9 @@ __kernel void search( const uint state0, const uint state1, const uint state2, c
} }
if (Vals[7].w == 0) if (Vals[7].w == 0)
{ {
for (it = 0; it != 127; it++) { for (it.w = 0; it.w != 127; it.w++) {
if (!output[it]) { if (!output[it.w]) {
output[it] = nonce.w; output[it.w] = nonce.w;
output[127] = 1; output[127] = 1;
break; break;
} }