From 9d1db95a28702883f10622759008018b1a470206 Mon Sep 17 00:00:00 2001
From: Noel Maersk <veox@wemakethings.net>
Date: Mon, 20 Jan 2014 16:04:43 +0200
Subject: [PATCH] misc: move scrypt130511.cl kernel file to kernel/ckolivas.cl

Prepare for more kernels. :)

Get rid of the kernel date, since this fudges up commit history.

Named after Con Kolivas, the most recent committer.
---
 Makefile.am                           |  4 ++--
 configure.ac                          |  2 +-
 driver-opencl.c                       |  8 ++++----
 scrypt130511.cl => kernel/ckolivas.cl |  0
 miner.h                               |  2 +-
 ocl.c                                 | 10 +++++-----
 sgminer.c                             |  4 ++--
 7 files changed, 15 insertions(+), 15 deletions(-)
 rename scrypt130511.cl => kernel/ckolivas.cl (100%)

diff --git a/Makefile.am b/Makefile.am
index d670d6bb..633727c7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -37,7 +37,7 @@ sgminer_SOURCES += ocl.c ocl.h
 sgminer_SOURCES += findnonce.c findnonce.h
 sgminer_SOURCES += adl.c adl.h adl_functions.h
 sgminer_SOURCES += scrypt.c scrypt.h
-sgminer_SOURCES += *.cl
+sgminer_SOURCES += kernel/*.cl
 
-bin_SCRIPTS	= $(top_srcdir)/*.cl
+bin_SCRIPTS	= $(top_srcdir)/kernel/*.cl
 
diff --git a/configure.ac b/configure.ac
index 4197f16c..49978c2e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -317,7 +317,7 @@ fi
 
 AC_DEFINE_UNQUOTED([SGMINER_PREFIX], ["$prefix/bin"], [Path to sgminer install])
 
-AC_DEFINE_UNQUOTED([SCRYPT_KERNNAME], ["scrypt130511"], [Filename for scrypt kernel])
+AC_DEFINE_UNQUOTED([CKOLIVAS_KERNNAME], ["ckolivas"], [Filename for original scrypt kernel])
 
 
 AC_SUBST(OPENCL_LIBS)
diff --git a/driver-opencl.c b/driver-opencl.c
index 7d1cfc15..2d29707f 100644
--- a/driver-opencl.c
+++ b/driver-opencl.c
@@ -196,8 +196,8 @@ char *set_thread_concurrency(char *arg)
 
 static enum cl_kernels select_kernel(char *arg)
 {
-	if (!strcmp(arg, "scrypt"))
-		return KL_SCRYPT;
+	if (!strcmp(arg, "ckolivas"))
+		return KL_CKOLIVAS;
 
 	return KL_NONE;
 }
@@ -1210,7 +1210,7 @@ static bool opencl_thread_prepare(struct thr_info *thr)
 	if (!cgpu->kname)
 	{
 		switch (clStates[i]->chosen_kernel) {
-			case KL_SCRYPT:
+			case KL_CKOLIVAS:
 				cgpu->kname = "scrypt";
 				break;
 			default:
@@ -1241,7 +1241,7 @@ static bool opencl_thread_init(struct thr_info *thr)
 	}
 
 	switch (clState->chosen_kernel) {
-		case KL_SCRYPT:
+		case KL_CKOLIVAS:
 			thrdata->queue_kernel_parameters = &queue_scrypt_kernel;
 			break;
 		default:
diff --git a/scrypt130511.cl b/kernel/ckolivas.cl
similarity index 100%
rename from scrypt130511.cl
rename to kernel/ckolivas.cl
diff --git a/miner.h b/miner.h
index a74e3056..13962217 100644
--- a/miner.h
+++ b/miner.h
@@ -372,7 +372,7 @@ enum dev_enable {
 
 enum cl_kernels {
 	KL_NONE,
-	KL_SCRYPT,
+	KL_CKOLIVAS,
 };
 
 enum dev_reason {
diff --git a/ocl.c b/ocl.c
index 84446a5e..3d2dc0d8 100644
--- a/ocl.c
+++ b/ocl.c
@@ -400,8 +400,8 @@ _clState *initCl(unsigned int gpu, char *name, size_t nameSize)
 	char numbuf[16];
 
 	if (cgpu->kernel == KL_NONE) {
-		applog(LOG_INFO, "Selecting scrypt kernel");
-		clState->chosen_kernel = KL_SCRYPT;
+		applog(LOG_INFO, "Selecting kernel ckolivas");
+		clState->chosen_kernel = KL_CKOLIVAS;
 		cgpu->kernel = clState->chosen_kernel;
 	} else {
 		clState->chosen_kernel = cgpu->kernel;
@@ -416,9 +416,9 @@ _clState *initCl(unsigned int gpu, char *name, size_t nameSize)
 		preferred_vwidth = 2;
 
 	switch (clState->chosen_kernel) {
-		case KL_SCRYPT:
-			strcpy(filename, SCRYPT_KERNNAME".cl");
-			strcpy(binaryfilename, SCRYPT_KERNNAME);
+		case KL_CKOLIVAS:
+			strcpy(filename, CKOLIVAS_KERNNAME".cl");
+			strcpy(binaryfilename, CKOLIVAS_KERNNAME);
 			/* Scrypt only supports vector 1 */
 			cgpu->vwidth = 1;
 			break;
diff --git a/sgminer.c b/sgminer.c
index ffe4d5c0..06913134 100644
--- a/sgminer.c
+++ b/sgminer.c
@@ -4121,8 +4121,8 @@ void write_config(FILE *fcfg)
 			switch (gpus[i].kernel) {
 				case KL_NONE: // Shouldn't happen
 					break;
-				case KL_SCRYPT:
-					fprintf(fcfg, "scrypt");
+				case KL_CKOLIVAS:
+					fprintf(fcfg, "ckolivas");
 					break;
 			}
 		}