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

Old Kernel Fix 

Old kernels would produce HW. Also, corrected an hamsi problem for
people who didn't use hamsi-expand-big 1.
djm34
ystarnaud 11 years ago
parent
5c9126fd61
commit
22c34fbf45
8 changed files with 2749 additions and 3405 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. 4
      algorithm.c
  2. 35
      kernel/bitblock.cl
  3. 2189
      kernel/bitblockold.cl
  4. 2
      kernel/hamsi.cl
  5. 35
      kernel/marucoin-mod.cl
  6. 1860
      kernel/marucoin-modold.cl
  7. 35
      kernel/x14.cl
  8. 1994
      kernel/x14old.cl

4
algorithm.c
Unescape View File

@ -94,8 +94,8 @@ static void append_scrypt_compiler_options(struct _build_kernel_data *data, stru
static void append_hamsi_compiler_options(struct _build_kernel_data *data, struct cgpu_info *cgpu, struct _algorithm_t *algorithm) static void append_hamsi_compiler_options(struct _build_kernel_data *data, struct cgpu_info *cgpu, struct _algorithm_t *algorithm)
{ {
char buf[255]; char buf[255];
sprintf(buf, " -D SPH_HAMSI_EXPAND_BIG=%d%s ", sprintf(buf, " -D SPH_HAMSI_EXPAND_BIG=%d -D SPH_HAMSI_SHORT=%d ",
opt_hamsi_expand_big, ((opt_hamsi_short)?" -D SPH_HAMSI_SHORT=1 ":"")); opt_hamsi_expand_big, ((opt_hamsi_short)?1:0));
strcat(data->compiler_options, buf); strcat(data->compiler_options, buf);
sprintf(buf, "big%u%s", (unsigned int)opt_hamsi_expand_big, ((opt_hamsi_short)?"hs":"")); sprintf(buf, "big%u%s", (unsigned int)opt_hamsi_expand_big, ((opt_hamsi_short)?"hs":""));

35
kernel/bitblock.cl
Unescape View File

@ -78,10 +78,7 @@ typedef int sph_s32;
#define SPH_CUBEHASH_UNROLL 0 #define SPH_CUBEHASH_UNROLL 0
#define SPH_KECCAK_UNROLL 1 #define SPH_KECCAK_UNROLL 1
#ifndef SPH_HAMSI_EXPAND_BIG #ifndef SPH_HAMSI_EXPAND_BIG
#define SPH_HAMSI_EXPAND_BIG 1 #define SPH_HAMSI_EXPAND_BIG 1
#endif
#ifndef SPH_HAMSI_SHORT
#define SPH_HAMSI_SHORT 1
#endif #endif
#include "blake.cl" #include "blake.cl"
@ -1108,15 +1105,20 @@ __kernel void search11(__global hash_t* hashes)
{ {
uint gid = get_global_id(0); uint gid = get_global_id(0);
__global hash_t *hash = &(hashes[gid-get_global_offset(0)]); __global hash_t *hash = &(hashes[gid-get_global_offset(0)]);
__local sph_u32 T512_L[1024];
__constant const sph_u32 *T512_C = &T512[0][0];
int init = get_local_id(0);
int step = get_local_size(0);
for (int i = init; i < 1024; i += step)
T512_L[i] = T512_C[i];
barrier(CLK_LOCAL_MEM_FENCE); #ifdef INPUT_BIG_LOCAL
__local sph_u32 T512_L[1024];
__constant const sph_u32 *T512_C = &T512[0][0];
int init = get_local_id(0);
int step = get_local_size(0);
for (int i = init; i < 1024; i += step)
T512_L[i] = T512_C[i];
barrier(CLK_LOCAL_MEM_FENCE);
#else
#define INPUT_BIG_LOCAL INPUT_BIG
#endif
sph_u32 c0 = HAMSI_IV512[0], c1 = HAMSI_IV512[1], c2 = HAMSI_IV512[2], c3 = HAMSI_IV512[3]; sph_u32 c0 = HAMSI_IV512[0], c1 = HAMSI_IV512[1], c2 = HAMSI_IV512[2], c3 = HAMSI_IV512[3];
sph_u32 c4 = HAMSI_IV512[4], c5 = HAMSI_IV512[5], c6 = HAMSI_IV512[6], c7 = HAMSI_IV512[7]; sph_u32 c4 = HAMSI_IV512[4], c5 = HAMSI_IV512[5], c6 = HAMSI_IV512[6], c7 = HAMSI_IV512[7];
@ -1128,10 +1130,11 @@ __kernel void search11(__global hash_t* hashes)
#define buf(u) hash->h1[i + u] #define buf(u) hash->h1[i + u]
for(int i = 0; i < 64; i += 8) { for(int i = 0; i < 64; i += 8)
INPUT_BIG_LOCAL; {
P_BIG; INPUT_BIG_LOCAL;
T_BIG; P_BIG;
T_BIG;
} }
#undef buf #undef buf

2189
kernel/bitblockold.cl
View File

File diff suppressed because it is too large Load Diff

2
kernel/hamsi.cl
Unescape View File

@ -105,7 +105,7 @@
//temp fix for shortened implementation of X15 //temp fix for shortened implementation of X15
#ifdef SPH_HAMSI_SHORT #ifdef SPH_HAMSI_SHORT
#if SPH_HAMSI_EXPAND_BIG == 1 #if SPH_HAMSI_SHORT == 1 && SPH_HAMSI_EXPAND_BIG == 1
#include "hamsi_helper_big.cl" #include "hamsi_helper_big.cl"
#else #else
#include "hamsi_helper.cl" #include "hamsi_helper.cl"

35
kernel/marucoin-mod.cl
Unescape View File

@ -78,9 +78,6 @@ typedef long sph_s64;
#if !defined SPH_HAMSI_EXPAND_BIG #if !defined SPH_HAMSI_EXPAND_BIG
#define SPH_HAMSI_EXPAND_BIG 1 #define SPH_HAMSI_EXPAND_BIG 1
#endif #endif
#ifndef SPH_HAMSI_SHORT
#define SPH_HAMSI_SHORT 1
#endif
#include "blake.cl" #include "blake.cl"
#include "bmw.cl" #include "bmw.cl"
@ -1093,16 +1090,21 @@ __kernel void search11(__global hash_t* hashes)
{ {
uint gid = get_global_id(0); uint gid = get_global_id(0);
__global hash_t *hash = &(hashes[gid-get_global_offset(0)]); __global hash_t *hash = &(hashes[gid-get_global_offset(0)]);
__local sph_u32 T512_L[1024];
__constant const sph_u32 *T512_C = &T512[0][0];
int init = get_local_id(0); #ifdef INPUT_BIG_LOCAL
int step = get_local_size(0); __local sph_u32 T512_L[1024];
for (int i = init; i < 1024; i += step) __constant const sph_u32 *T512_C = &T512[0][0];
T512_L[i] = T512_C[i];
int init = get_local_id(0);
barrier(CLK_LOCAL_MEM_FENCE); int step = get_local_size(0);
for (int i = init; i < 1024; i += step)
T512_L[i] = T512_C[i];
barrier(CLK_LOCAL_MEM_FENCE);
#else
#define INPUT_BIG_LOCAL INPUT_BIG
#endif
sph_u32 c0 = HAMSI_IV512[0], c1 = HAMSI_IV512[1], c2 = HAMSI_IV512[2], c3 = HAMSI_IV512[3]; sph_u32 c0 = HAMSI_IV512[0], c1 = HAMSI_IV512[1], c2 = HAMSI_IV512[2], c3 = HAMSI_IV512[3];
sph_u32 c4 = HAMSI_IV512[4], c5 = HAMSI_IV512[5], c6 = HAMSI_IV512[6], c7 = HAMSI_IV512[7]; sph_u32 c4 = HAMSI_IV512[4], c5 = HAMSI_IV512[5], c6 = HAMSI_IV512[6], c7 = HAMSI_IV512[7];
sph_u32 c8 = HAMSI_IV512[8], c9 = HAMSI_IV512[9], cA = HAMSI_IV512[10], cB = HAMSI_IV512[11]; sph_u32 c8 = HAMSI_IV512[8], c9 = HAMSI_IV512[9], cA = HAMSI_IV512[10], cB = HAMSI_IV512[11];
@ -1113,10 +1115,11 @@ __kernel void search11(__global hash_t* hashes)
#define buf(u) hash->h1[i + u] #define buf(u) hash->h1[i + u]
for(int i = 0; i < 64; i += 8) { for(int i = 0; i < 64; i += 8)
INPUT_BIG_LOCAL; {
P_BIG; INPUT_BIG_LOCAL;
T_BIG; P_BIG;
T_BIG;
} }
#undef buf #undef buf

1860
kernel/marucoin-modold.cl
View File

File diff suppressed because it is too large Load Diff

35
kernel/x14.cl
Unescape View File

@ -80,9 +80,6 @@ typedef int sph_s32;
#ifndef SPH_HAMSI_EXPAND_BIG #ifndef SPH_HAMSI_EXPAND_BIG
#define SPH_HAMSI_EXPAND_BIG 1 #define SPH_HAMSI_EXPAND_BIG 1
#endif #endif
#ifndef SPH_HAMSI_SHORT
#define SPH_HAMSI_SHORT 1
#endif
#include "blake.cl" #include "blake.cl"
#include "bmw.cl" #include "bmw.cl"
@ -1107,16 +1104,21 @@ __kernel void search11(__global hash_t* hashes)
{ {
uint gid = get_global_id(0); uint gid = get_global_id(0);
__global hash_t *hash = &(hashes[gid-get_global_offset(0)]); __global hash_t *hash = &(hashes[gid-get_global_offset(0)]);
__local sph_u32 T512_L[1024];
__constant const sph_u32 *T512_C = &T512[0][0];
int init = get_local_id(0);
int step = get_local_size(0);
for (int i = init; i < 1024; i += step)
T512_L[i] = T512_C[i];
barrier(CLK_LOCAL_MEM_FENCE);
#ifdef INPUT_BIG_LOCAL
__local sph_u32 T512_L[1024];
__constant const sph_u32 *T512_C = &T512[0][0];
int init = get_local_id(0);
int step = get_local_size(0);
for (int i = init; i < 1024; i += step)
T512_L[i] = T512_C[i];
barrier(CLK_LOCAL_MEM_FENCE);
#else
#define INPUT_BIG_LOCAL INPUT_BIG
#endif
sph_u32 c0 = HAMSI_IV512[0], c1 = HAMSI_IV512[1], c2 = HAMSI_IV512[2], c3 = HAMSI_IV512[3]; sph_u32 c0 = HAMSI_IV512[0], c1 = HAMSI_IV512[1], c2 = HAMSI_IV512[2], c3 = HAMSI_IV512[3];
sph_u32 c4 = HAMSI_IV512[4], c5 = HAMSI_IV512[5], c6 = HAMSI_IV512[6], c7 = HAMSI_IV512[7]; sph_u32 c4 = HAMSI_IV512[4], c5 = HAMSI_IV512[5], c6 = HAMSI_IV512[6], c7 = HAMSI_IV512[7];
sph_u32 c8 = HAMSI_IV512[8], c9 = HAMSI_IV512[9], cA = HAMSI_IV512[10], cB = HAMSI_IV512[11]; sph_u32 c8 = HAMSI_IV512[8], c9 = HAMSI_IV512[9], cA = HAMSI_IV512[10], cB = HAMSI_IV512[11];
@ -1127,10 +1129,11 @@ __kernel void search11(__global hash_t* hashes)
#define buf(u) hash->h1[i + u] #define buf(u) hash->h1[i + u]
for(int i = 0; i < 64; i += 8) { for(int i = 0; i < 64; i += 8)
INPUT_BIG_LOCAL; {
P_BIG; INPUT_BIG_LOCAL;
T_BIG; P_BIG;
T_BIG;
} }
#undef buf #undef buf

1994
kernel/x14old.cl
View File

File diff suppressed because it is too large Load Diff
Write Preview
Loading…
Cancel
Save