skunk: merged kernel to use when possible

for now, only used for maxwell/pascal with cuda 7.5 or 8.0
tpruvot · Aug 13, 2017 · 9a7d74e · 9a7d74e
1 parent 6e32ec2
commit 9a7d74e
Show file tree

Hide file tree

Showing 10 changed files with 2,070 additions and 22 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -55,7 +55,8 @@ ccminer_SOURCES	= elist.h miner.h compat.h \
 			  quark/nist5.cu \
 			  quark/quarkcoin.cu quark/cuda_quark_compactionTest.cu \
 			  neoscrypt/neoscrypt.cpp neoscrypt/neoscrypt-cpu.c neoscrypt/cuda_neoscrypt.cu \
-			  pentablake.cu skein.cu cuda_skeincoin.cu skein2.cpp skunk.cu zr5.cu \
+			  pentablake.cu skein.cu cuda_skeincoin.cu skein2.cpp zr5.cu \
+			  skunk/skunk.cu skunk/cuda_skunk.cu skunk/cuda_skunk_streebog.cu \
 			  sha256/sha256d.cu sha256/cuda_sha256d.cu sha256/sha256t.cu sha256/cuda_sha256t.cu \
 			  sia/sia.cu sia/sia-rpc.cpp sph/blake2b.c \
 			  sph/bmw.c sph/blake.c sph/groestl.c sph/jh.c sph/keccak.c sph/skein.c \

diff --git a/ccminer.cpp b/ccminer.cpp
@@ -2226,6 +2226,7 @@ static void *miner_thread(void *userdata)
 			case ALGO_JHA:
 			case ALGO_LYRA2v2:
 			case ALGO_S3:
+			case ALGO_SKUNK:
 			case ALGO_TIMETRAVEL:
 			case ALGO_BITCORE:
 			case ALGO_X11EVO:

diff --git a/ccminer.vcxproj b/ccminer.vcxproj
@@ -532,7 +532,12 @@
     <CudaCompile Include="cuda_skeincoin.cu">
       <MaxRegCount>48</MaxRegCount>
     </CudaCompile>
-    <CudaCompile Include="skunk.cu" />
+    <CudaCompile Include="skunk\skunk.cu" />
+    <CudaCompile Include="skunk\cuda_skunk.cu">
+      <CodeGeneration>compute_50,sm_50;compute_52,sm_52</CodeGeneration>
+      <MaxRegCount>64</MaxRegCount>
+    </CudaCompile>
+    <CudaCompile Include="skunk\cuda_skunk_streebog.cu" />
     <CudaCompile Include="tribus.cu" />
     <ClInclude Include="x11\cuda_x11_aes.cuh" />
     <CudaCompile Include="x11\cuda_x11_cubehash512.cu" />

diff --git a/ccminer.vcxproj.filters b/ccminer.vcxproj.filters
@@ -46,6 +46,9 @@
     <Filter Include="Source Files\CUDA\qubit">
       <UniqueIdentifier>{f3ed23a2-8ce7-41a5-b051-6da56047dc35}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Source Files\CUDA\skunk">
+      <UniqueIdentifier>{23ed23a2-8e7a-65a2-b051-8aa63047d352}</UniqueIdentifier>
+    </Filter>
     <Filter Include="Source Files\CUDA\x11">
       <UniqueIdentifier>{dd751f2d-bfd6-42c1-8f9b-cbe94e539353}</UniqueIdentifier>
     </Filter>
@@ -754,8 +757,14 @@
     <CudaCompile Include="pentablake.cu">
       <Filter>Source Files\CUDA</Filter>
     </CudaCompile>
-    <CudaCompile Include="skunk.cu">
-      <Filter>Source Files\CUDA</Filter>
+    <CudaCompile Include="skunk\skunk.cu">
+      <Filter>Source Files\CUDA\skunk</Filter>
+    </CudaCompile>
+    <CudaCompile Include="skunk\cuda_skunk.cu">
+      <Filter>Source Files\CUDA\skunk</Filter>
+    </CudaCompile>
+    <CudaCompile Include="skunk\cuda_skunk_streebog.cu">
+      <Filter>Source Files\CUDA\skunk</Filter>
     </CudaCompile>
     <CudaCompile Include="tribus.cu">
       <Filter>Source Files\CUDA</Filter>

diff --git a/skunk/cuda_skunk.cu b/skunk/cuda_skunk.cu