GOSTSec
/
sgminer
mirror of https://github.com/GOSTSec/sgminer
1
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

Fix target testing with scrypt kernel as it would have been missing shares below target.

nfactor-troky
Con Kolivas 13 years ago
parent
3a0d60cfe1
commit
f98774c35c
2 changed files with 9 additions and 11 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      driver-opencl.c
  2. 16
      scrypt120713.cl

2
driver-opencl.c
Unescape View File

@ -1053,7 +1053,7 @@ static cl_int queue_scrypt_kernel(_clState *clState, dev_blk_ctx *blk, __maybe_u
cl_uint le_target; cl_uint le_target;
cl_int status = 0; cl_int status = 0;
le_target = ~swab32(*(cl_uint *)(blk->work->target + 28)); le_target = *(cl_uint *)(blk->work->target + 28);
clState->cldata = blk->work->data; clState->cldata = blk->work->data;
status = clEnqueueWriteBuffer(clState->commandQueue, clState->CLbuffer0, true, 0, 80, clState->cldata, 0, NULL,NULL); status = clEnqueueWriteBuffer(clState->commandQueue, clState->CLbuffer0, true, 0, 80, clState->cldata, 0, NULL,NULL);

16
scrypt120713.cl
Unescape View File

@ -2,10 +2,7 @@
#define Ch(x,y,z) bitselect(z,y,x) #define Ch(x,y,z) bitselect(z,y,x)
#define Maj(x,y,z) Ch((x^z),y,z) #define Maj(x,y,z) Ch((x^z),y,z)
uint4 EndianSwap4(uint4 n) #define EndianSwap(n) (rotl(n&0x00FF00FF,24U)|rotl(n&0xFF00FF00,8U))
{
return rotl(n&0x00FF00FF,24U)|rotl(n&0xFF00FF00,8U);
}
#define Tr2(x) (rotl(x, 30U) ^ rotl(x, 19U) ^ rotl(x, 10U)) #define Tr2(x) (rotl(x, 30U) ^ rotl(x, 19U) ^ rotl(x, 10U))
#define Tr1(x) (rotl(x, 26U) ^ rotl(x, 21U) ^ rotl(x, 7U)) #define Tr1(x) (rotl(x, 26U) ^ rotl(x, 21U) ^ rotl(x, 7U))
@ -552,7 +549,7 @@ void shittify(uint4 B[8])
#pragma unroll #pragma unroll
for(uint i=0; i<4; ++i) for(uint i=0; i<4; ++i)
B[i] = EndianSwap4(tmp[i]); B[i] = EndianSwap(tmp[i]);
tmp[0] = (uint4)(B[5].x,B[6].y,B[7].z,B[4].w); tmp[0] = (uint4)(B[5].x,B[6].y,B[7].z,B[4].w);
tmp[1] = (uint4)(B[6].x,B[7].y,B[4].z,B[5].w); tmp[1] = (uint4)(B[6].x,B[7].y,B[4].z,B[5].w);
@ -561,7 +558,7 @@ void shittify(uint4 B[8])
#pragma unroll #pragma unroll
for(uint i=0; i<4; ++i) for(uint i=0; i<4; ++i)
B[i+4] = EndianSwap4(tmp[i]); B[i+4] = EndianSwap(tmp[i]);
} }
void unshittify(uint4 B[8]) void unshittify(uint4 B[8])
@ -574,7 +571,7 @@ void unshittify(uint4 B[8])
#pragma unroll #pragma unroll
for(uint i=0; i<4; ++i) for(uint i=0; i<4; ++i)
B[i] = EndianSwap4(tmp[i]); B[i] = EndianSwap(tmp[i]);
tmp[0] = (uint4)(B[7].x,B[6].y,B[5].z,B[4].w); tmp[0] = (uint4)(B[7].x,B[6].y,B[5].z,B[4].w);
tmp[1] = (uint4)(B[4].x,B[7].y,B[6].z,B[5].w); tmp[1] = (uint4)(B[4].x,B[7].y,B[6].z,B[5].w);
@ -583,7 +580,7 @@ void unshittify(uint4 B[8])
#pragma unroll #pragma unroll
for(uint i=0; i<4; ++i) for(uint i=0; i<4; ++i)
B[i+4] = EndianSwap4(tmp[i]); B[i+4] = EndianSwap(tmp[i]);
} }
void salsa(uint4 B[8]) void salsa(uint4 B[8])
@ -724,7 +721,8 @@ const uint4 midstate0, const uint4 midstate16, const uint target)
SHA256_fixed(&tmp0,&tmp1); SHA256_fixed(&tmp0,&tmp1);
SHA256(&ostate0,&ostate1, tmp0, tmp1, (uint4)(0x80000000U, 0U, 0U, 0U), (uint4)(0U, 0U, 0U, 0x300U)); SHA256(&ostate0,&ostate1, tmp0, tmp1, (uint4)(0x80000000U, 0U, 0U, 0U), (uint4)(0U, 0U, 0U, 0x300U));
if (!(ostate1.w & target)) bool found = (EndianSwap(ostate1.w) <= target);
if (found)
output[FOUND] = output[NFLAG & gid] = gid; output[FOUND] = output[NFLAG & gid] = gid;
} }

Write Preview
Loading…
Cancel
Save