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

kernel: integrate Zuikkis' kernel, selectable with --kernel=zuikkis.

Browse Source 
Kernel ckolivas is still the default. Needs documentation, too.

https://github.com/veox/sgminer/issues/4
This commit is contained in:
Noel Maersk 2014-01-20 23:32:44 +02:00
parent afdc8b5ffb
commit 7950c10374
5 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configure.ac
View File

@ -318,6 +318,7 @@ fi
AC_DEFINE_UNQUOTED([SGMINER_PREFIX], ["$prefix/bin"], [Path to sgminer install]) AC_DEFINE_UNQUOTED([SGMINER_PREFIX], ["$prefix/bin"], [Path to sgminer install])
AC_DEFINE_UNQUOTED([CKOLIVAS_KERNNAME], ["ckolivas"], [Filename for original scrypt kernel]) AC_DEFINE_UNQUOTED([CKOLIVAS_KERNNAME], ["ckolivas"], [Filename for original scrypt kernel])
AC_DEFINE_UNQUOTED([ZUIKKIS_KERNNAME], ["zuikkis"], [Filename for Zuikkis' optimised kernel])
AC_SUBST(OPENCL_LIBS) AC_SUBST(OPENCL_LIBS)

10
driver-opencl.c
View File

@ -198,6 +198,8 @@ static enum cl_kernels select_kernel(char *arg)
{ {
if (!strcmp(arg, "ckolivas")) if (!strcmp(arg, "ckolivas"))
return KL_CKOLIVAS; return KL_CKOLIVAS;
if (!strcmp(arg, "zuikkis"))
return KL_ZUIKKIS;
return KL_NONE; return KL_NONE;
} }
@ -1211,7 +1213,10 @@ static bool opencl_thread_prepare(struct thr_info *thr)
{ {
switch (clStates[i]->chosen_kernel) { switch (clStates[i]->chosen_kernel) {
case KL_CKOLIVAS: case KL_CKOLIVAS:
cgpu->kname = "scrypt"; cgpu->kname = "ckolivas";
break;
case KL_ZUIKKIS:
cgpu->kname = "zuikkis";
break; break;
default: default:
break; break;
@ -1244,6 +1249,9 @@ static bool opencl_thread_init(struct thr_info *thr)
case KL_CKOLIVAS: case KL_CKOLIVAS:
thrdata->queue_kernel_parameters = &queue_scrypt_kernel; thrdata->queue_kernel_parameters = &queue_scrypt_kernel;
break; break;
case KL_ZUIKKIS:
thrdata->queue_kernel_parameters = &queue_scrypt_kernel;
break;
default: default:
break; break;
} }

1
miner.h
View File

@ -373,6 +373,7 @@ enum dev_enable {
enum cl_kernels { enum cl_kernels {
KL_NONE, KL_NONE,
KL_CKOLIVAS, KL_CKOLIVAS,
KL_ZUIKKIS,
}; };
enum dev_reason { enum dev_reason {

6
ocl.c
View File

@ -422,6 +422,12 @@ _clState *initCl(unsigned int gpu, char *name, size_t nameSize)
/* Scrypt only supports vector 1 */ /* Scrypt only supports vector 1 */
cgpu->vwidth = 1; cgpu->vwidth = 1;
break; break;
case KL_ZUIKKIS:
strcpy(filename, ZUIKKIS_KERNNAME".cl");
strcpy(binaryfilename, ZUIKKIS_KERNNAME);
/* Scrypt only supports vector 1 */
cgpu->vwidth = 1;
break;
case KL_NONE: /* Shouldn't happen */ case KL_NONE: /* Shouldn't happen */
break; break;
} }

3
sgminer.c
View File

@ -4124,6 +4124,9 @@ void write_config(FILE *fcfg)
case KL_CKOLIVAS: case KL_CKOLIVAS:
fprintf(fcfg, "ckolivas"); fprintf(fcfg, "ckolivas");
break; break;
case KL_ZUIKKIS:
fprintf(fcfg, "zuikkis");
break;
} }
} }
fputs("\",\n\"lookup-gap\" : \"", fcfg); fputs("\",\n\"lookup-gap\" : \"", fcfg);