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

Update poclbm kernel to FF sized mask and only check that range.

Browse Source
This commit is contained in:
Con Kolivas 2011-08-17 15:47:18 +10:00
parent 93ff09e577
commit 0f782ba6bd
5 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.am
View File

@ -15,7 +15,7 @@ INCLUDES = $(PTHREAD_FLAGS) -fno-strict-aliasing $(JANSSON_INCLUDES)
bin_PROGRAMS = cgminer bin_PROGRAMS = cgminer
bin_SCRIPTS = phatk110816.cl poclbm110717.cl bin_SCRIPTS = phatk110816.cl poclbm110816.cl
cgminer_SOURCES = elist.h miner.h compat.h bench_block.h \ cgminer_SOURCES = elist.h miner.h compat.h bench_block.h \
main.c util.c \ main.c util.c \
@ -23,7 +23,7 @@ cgminer_SOURCES = elist.h miner.h compat.h bench_block.h \
sha256_generic.c sha256_4way.c sha256_via.c \ sha256_generic.c sha256_4way.c sha256_via.c \
sha256_cryptopp.c sha256_sse2_amd64.c \ sha256_cryptopp.c sha256_sse2_amd64.c \
sha256_sse4_amd64.c \ sha256_sse4_amd64.c \
phatk110816.cl poclbm110717.cl phatk110816.cl poclbm110816.cl
cgminer_LDFLAGS = $(PTHREAD_FLAGS) cgminer_LDFLAGS = $(PTHREAD_FLAGS)
cgminer_LDADD = @LIBCURL_LIBS@ @JANSSON_LIBS@ @PTHREAD_LIBS@ @OPENCL_LIBS@ @NCURSES_LIBS@ @PDCURSES_LIBS@ lib/libgnu.a ccan/libccan.a cgminer_LDADD = @LIBCURL_LIBS@ @JANSSON_LIBS@ @PTHREAD_LIBS@ @OPENCL_LIBS@ @NCURSES_LIBS@ @PDCURSES_LIBS@ lib/libgnu.a ccan/libccan.a

6
findnonce.c
View File

@ -181,14 +181,14 @@ static void *postcalc_hash(void *userdata)
pthread_detach(pthread_self()); pthread_detach(pthread_self());
cycle: cycle:
while (entry < MAXBUFFERS) { while (entry < OUTBUFFERS) {
if (pcd->res[entry]) { if (pcd->res[entry]) {
nonce = pcd->res[entry++]; nonce = pcd->res[entry++];
break; break;
} }
entry++; entry++;
} }
if (entry == MAXBUFFERS) if (entry == OUTBUFFERS)
goto out; goto out;
A = blk->cty_a; B = blk->cty_b; A = blk->cty_a; B = blk->cty_b;
@ -231,7 +231,7 @@ cycle:
hw_errors++; hw_errors++;
thr->cgpu->hw_errors++; thr->cgpu->hw_errors++;
} }
if (entry < MAXBUFFERS) if (entry < OUTBUFFERS)
goto cycle; goto cycle;
out: out:
free(pcd); free(pcd);

1
findnonce.h
View File

@ -7,6 +7,7 @@
/* Maximum worksize 4k to match page size */ /* Maximum worksize 4k to match page size */
#define MAXBUFFERS (4095) #define MAXBUFFERS (4095)
#define BUFFERSIZE (sizeof(uint32_t) * (MAXBUFFERS + 1)) #define BUFFERSIZE (sizeof(uint32_t) * (MAXBUFFERS + 1))
#define OUTBUFFERS (0xFF)
#ifdef HAVE_OPENCL #ifdef HAVE_OPENCL
extern void precalc_hash(dev_blk_ctx *blk, uint32_t *state, uint32_t *data); extern void precalc_hash(dev_blk_ctx *blk, uint32_t *state, uint32_t *data);

4
ocl.c
View File

@ -350,8 +350,8 @@ _clState *initCl(unsigned int gpu, char *name, size_t nameSize)
switch (chosen_kernel) { switch (chosen_kernel) {
case KL_POCLBM: case KL_POCLBM:
strcpy(filename, "poclbm110717.cl"); strcpy(filename, "poclbm110816.cl");
strcpy(binaryfilename, "poclbm110717"); strcpy(binaryfilename, "poclbm110816");
break; break;
case KL_NONE: /* Shouldn't happen */ case KL_NONE: /* Shouldn't happen */
case KL_PHATK: case KL_PHATK:

14
poclbm110717.cl → poclbm110816.cl
View File

@ -625,32 +625,30 @@ __kernel void search( const uint state0, const uint state1, const uint state2, c
Vals[7] = Vals[7] + Vals[3] + (rotr(Vals[0], 6) ^ rotr(Vals[0], 11) ^ rotr(Vals[0], 25)) + ch(Vals[0], Vals[1], Vals[2]) + K[60] + W[12]; Vals[7] = Vals[7] + Vals[3] + (rotr(Vals[0], 6) ^ rotr(Vals[0], 11) ^ rotr(Vals[0], 25)) + ch(Vals[0], Vals[1], Vals[2]) + K[60] + W[12];
Vals[7]+=0x5be0cd19U;
#define MAXBUFFERS (4095) #define MAXBUFFERS (4095)
#define NFLAG (0xFFEUL) #define NFLAG (0xFF)
#if defined(VECTORS4) || defined(VECTORS2) #if defined(VECTORS4) || defined(VECTORS2)
if (Vals[7].x == 0) if (Vals[7].x == -0x5be0cd19U)
{ {
output[MAXBUFFERS] = output[NFLAG & nonce.x] = nonce.x; output[MAXBUFFERS] = output[NFLAG & nonce.x] = nonce.x;
} }
if (Vals[7].y == 0) if (Vals[7].y == -0x5be0cd19U)
{ {
output[MAXBUFFERS] = output[NFLAG & nonce.y] = nonce.y; output[MAXBUFFERS] = output[NFLAG & nonce.y] = nonce.y;
} }
#ifdef VECTORS4 #ifdef VECTORS4
if (Vals[7].z == 0) if (Vals[7].z == -0x5be0cd19U)
{ {
output[MAXBUFFERS] = output[NFLAG & nonce.z] = nonce.z; output[MAXBUFFERS] = output[NFLAG & nonce.z] = nonce.z;
} }
if (Vals[7].w == 0) if (Vals[7].w == -0x5be0cd19U)
{ {
output[MAXBUFFERS] = output[NFLAG & nonce.w] = nonce.w; output[MAXBUFFERS] = output[NFLAG & nonce.w] = nonce.w;
} }
#endif #endif
#else #else
if (Vals[7] == 0) if (Vals[7] == -0x5be0cd19U)
{ {
output[MAXBUFFERS] = output[NFLAG & nonce] = nonce; output[MAXBUFFERS] = output[NFLAG & nonce] = nonce;
} }