Phi2 dirty wip (50% shares)

DumaxFr · Jun 4, 2018 · 8480b05 · 8480b05
1 parent f1c6368
commit 8480b05
Show file tree

Hide file tree

Showing 11 changed files with 1,972 additions and 3 deletions.
diff --git a/algos.h b/algos.h
@@ -38,6 +38,7 @@ enum sha_algos {
 	ALGO_NIST5,
 	ALGO_PENTABLAKE,
 	ALGO_PHI,
+	ALGO_PHI2D,
 	ALGO_POLYTIMOS,
 	ALGO_QUARK,
 	ALGO_QUBIT,
@@ -109,6 +110,7 @@ static const char *algo_names[] = {
 	"nist5",
 	"penta",
 	"phi",
+	"phi2d",
 	"polytimos",
 	"quark",
 	"qubit",

diff --git a/bench.cpp b/bench.cpp
@@ -81,6 +81,7 @@ void algo_free_all(int thr_id)
 	free_nist5(thr_id);
 	free_pentablake(thr_id);
 	free_phi(thr_id);
+	free_phi2d(thr_id);
 	free_polytimos(thr_id);
 	free_quark(thr_id);
 	free_qubit(thr_id);

diff --git a/ccminer.cpp b/ccminer.cpp
@@ -268,7 +268,8 @@ Options:\n\
 			neoscrypt   FeatherCoin, Phoenix, UFO...\n\
 			nist5       NIST5 (TalkCoin)\n\
 			penta       Pentablake hash (5x Blake 512)\n\
-			phi         BHCoin\n\
+			phi         Lux, Folm ...\n\
+			phi2d       Dirty Lux Phi2\n\
 			polytimos   Politimos\n\
 			quark       Quark\n\
 			qubit       Qubit\n\
@@ -2428,6 +2429,9 @@ static void *miner_thread(void *userdata)
 		case ALGO_PHI:
 			rc = scanhash_phi(thr_id, &work, max_nonce, &hashes_done);
 			break;
+		case ALGO_PHI2D:
+			rc = scanhash_phi2d(thr_id, &work, max_nonce, &hashes_done);
+			break;
 		case ALGO_POLYTIMOS:
 			rc = scanhash_polytimos(thr_id, &work, max_nonce, &hashes_done);
 			break;

diff --git a/ccminer.vcxproj b/ccminer.vcxproj
@@ -131,9 +131,8 @@
       <PtxAsOptionV>true</PtxAsOptionV>
       <Keep>true</Keep>
       <CodeGeneration>compute_61,sm_61</CodeGeneration>
-      <Include>$(NVTOOLSEXT_PATH)\include;..\..\..\Common\C99</Include>
+      <Include>$(NVTOOLSEXT_PATH)\include</Include>
       <TargetMachinePlatform>64</TargetMachinePlatform>
-      <NvccCompilation>ptx</NvccCompilation>
     </CudaCompile>
     <CudaLink>
       <PerformDeviceLink>false</PerformDeviceLink>
@@ -396,6 +395,8 @@
     <ClCompile Include="neoscrypt\neoscrypt-cpu.c" />
     <ClInclude Include="neoscrypt\cuda_vectors.h" />
     <ClInclude Include="phi\cuda_phi.h" />
+    <ClInclude Include="phi\cuda_phi2d.h" />
+    <ClInclude Include="phi\cuda_phi2_skein512.h" />
     <ClInclude Include="x11\cuda_x11_simd512_sm2.cuh" />
     <ClInclude Include="x16x\cuda_x16x.h" />
     <CudaCompile Include="Algo256\bmw.cu" />
@@ -549,6 +550,9 @@
     <CudaCompile Include="cuda.cpp" />
     <CudaCompile Include="cuda_groestlcoin.cu" />
     <CudaCompile Include="cuda_myriadgroestl.cu" />
+    <CudaCompile Include="phi\cuda_phi2_lyra2.cu" />
+    <CudaCompile Include="phi\cuda_phi2_skein512.cu" />
+    <CudaCompile Include="phi\phi2d.cu" />
     <CudaCompile Include="scrypt\blake.cu" />
     <CudaCompile Include="scrypt\keccak.cu" />
     <CudaCompile Include="scrypt\sha256.cu" />

diff --git a/ccminer.vcxproj.filters b/ccminer.vcxproj.filters
@@ -620,6 +620,8 @@
     <ClInclude Include="Algo512\cuda_b_hamsi512.h" />
     <ClInclude Include="Algo512\cuda_b_cubehash512.h" />
     <ClInclude Include="Algo512\cuda_b_jh512.h" />
+    <ClInclude Include="phi\cuda_phi2d.h" />
+    <ClInclude Include="phi\cuda_phi2_skein512.h" />
   </ItemGroup>
   <ItemGroup>
     <CudaCompile Include="cuda.cpp">
@@ -1008,6 +1010,9 @@
     <CudaCompile Include="Algo512\cuda_b_hamsi512.cu" />
     <CudaCompile Include="Algo512\cuda_b_cubehash512.cu" />
     <CudaCompile Include="Algo512\cuda_b_jh512.cu" />
+    <CudaCompile Include="phi\phi2d.cu" />
+    <CudaCompile Include="phi\cuda_phi2_skein512.cu" />
+    <CudaCompile Include="phi\cuda_phi2_lyra2.cu" />
   </ItemGroup>
   <ItemGroup>
     <Image Include="res\ccminer.ico">

diff --git a/miner.h b/miner.h
@@ -292,6 +292,7 @@ extern "C" {
     extern int scanhash_nist5(int thr_id, struct work *work, uint32_t max_nonce, unsigned long *hashes_done);
     extern int scanhash_pentablake(int thr_id, struct work *work, uint32_t max_nonce, unsigned long *hashes_done);
     extern int scanhash_phi(int thr_id, struct work* work, uint32_t max_nonce, unsigned long *hashes_done);
+    extern int scanhash_phi2d(int thr_id, struct work* work, uint32_t max_nonce, unsigned long *hashes_done);
     extern int scanhash_polytimos(int thr_id, struct work* work, uint32_t max_nonce, unsigned long *hashes_done);
     extern int scanhash_quark(int thr_id, struct work *work, uint32_t max_nonce, unsigned long *hashes_done);
     extern int scanhash_qubit(int thr_id, struct work* work, uint32_t max_nonce, unsigned long *hashes_done);
@@ -357,6 +358,7 @@ extern "C" {
     extern void free_nist5(int thr_id);
     extern void free_pentablake(int thr_id);
     extern void free_phi(int thr_id);
+    extern void free_phi2d(int thr_id);
     extern void free_polytimos(int thr_id);
     extern void free_quark(int thr_id);
     extern void free_qubit(int thr_id);
@@ -903,6 +905,7 @@ extern "C" {
     void nist5hash(void *state, const void *input);
     void pentablakehash(void *output, const void *input);
     void phihash(void *output, const void *input);
+    void phi2hash(void *output, const void *input);
     void polytimos_hash(void *output, const void *input);
     void quarkhash(void *state, const void *input);
     void qubithash(void *state, const void *input);