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

Hamsi fix

Browse Source 
Original implementation of x15 made changes to hamsi, which in turn
caused issues with other kernels.
This commit is contained in:
ystarnaud 2014-06-28 03:06:45 -04:00
parent e234b2d969
commit e0647546de
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
kernel/bitblock.cl
View File

@ -78,6 +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
#define SPH_HAMSI_EXPAND_BIG 1 #define SPH_HAMSI_EXPAND_BIG 1
#define SPH_HAMSI_SHORT 1
#include "blake.cl" #include "blake.cl"
#include "bmw.cl" #include "bmw.cl"

2
kernel/bitblockold.cl
View File

@ -88,7 +88,7 @@ typedef long sph_s64;
#include "shavite.cl" #include "shavite.cl"
#include "simd.cl" #include "simd.cl"
#include "echo.cl" #include "echo.cl"
#include "hamsi_old.cl" #include "hamsi.cl"
#include "fugue.cl" #include "fugue.cl"
#include "shabal.cl" #include "shabal.cl"
#include "whirlpool.cl" #include "whirlpool.cl"

9
kernel/hamsi.cl
View File

@ -103,7 +103,16 @@
#pragma warning (disable: 4146) #pragma warning (disable: 4146)
#endif #endif
//temp fix for shortened implementation of X15
#ifdef SPH_HAMSI_SHORT
#if SPH_HAMSI_EXPAND_BIG == 1
#include "hamsi_helper_big.cl"
#else
#include "hamsi_helper.cl" #include "hamsi_helper.cl"
#endif
#else
#include "hamsi_helper.cl"
#endif
__constant static const sph_u32 HAMSI_IV224[] = { __constant static const sph_u32 HAMSI_IV224[] = {
SPH_C32(0xc3967a67), SPH_C32(0xc3bc6c20), SPH_C32(0x4bc3bcc3), SPH_C32(0xc3967a67), SPH_C32(0xc3bc6c20), SPH_C32(0x4bc3bcc3),