Don't test nonce with sha and various fixes for scrypt.

cgminer.c

@@ -3971,6 +3971,9 @@ bool hashtest(const struct work *work)
 
 bool test_nonce(struct work *work, uint32_t nonce)
 {
+	if (opt_scrypt)
+		return true;
+
 	work->data[64 + 12 + 0] = (nonce >> 0) & 0xff;
 	work->data[64 + 12 + 1] = (nonce >> 8) & 0xff;
 	work->data[64 + 12 + 2] = (nonce >> 16) & 0xff;

miner.h

@@ -262,9 +262,7 @@ enum cl_kernels {
 	KL_PHATK,
 	KL_DIAKGCN,
 	KL_DIABLO,
-#ifdef USE_SCRYPT
 	KL_SCRYPT,
-#endif
 };
 
 enum dev_reason {

ocl.c

@@ -536,7 +536,7 @@ build:
 	char *CompilerOptions = calloc(1, 256);
 
 	if (opt_scrypt) {
-		sprintf(CompilerOptions, "-D LOOKUP_GAP=2 -D CONCURRENT_THREADS=512 -D WORKSIZE=%d",
+		sprintf(CompilerOptions, "-D LOOKUP_GAP=2 -D CONCURRENT_THREADS=6144 -D WORKSIZE=%d",
 			(int)clState->wsize);
 	} else {
 		sprintf(CompilerOptions, "-D WORKSIZE=%d -D VECTORS%d -D WORKVEC=%d",