bastion algo

Signed-off-by: Tanguy Pruvot <tanguy.pruvot@gmail.com>
tpruvot · Mar 7, 2017 · 3ede61b · 3ede61b
1 parent 1b7c2fc
commit 3ede61b
Show file tree

Hide file tree

Showing 11 changed files with 484 additions and 0 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -28,6 +28,7 @@ ccminer_SOURCES	= elist.h miner.h compat.h \
 			  heavy/cuda_hefty1.cu heavy/cuda_hefty1.h \
 			  heavy/cuda_keccak512.cu heavy/cuda_keccak512.h \
 			  heavy/cuda_sha256.cu heavy/cuda_sha256.h \
+			  heavy/bastion.cu heavy/cuda_bastion.cu \
 			  fuguecoin.cpp Algo256/cuda_fugue256.cu sph/fugue.c uint256.h \
 			  groestlcoin.cpp cuda_groestlcoin.cu cuda_groestlcoin.h \
 			  myriadgroestl.cpp cuda_myriadgroestl.cu \

diff --git a/algos.h b/algos.h
@@ -9,6 +9,7 @@ enum sha_algos {
 	ALGO_BLAKE,
 	ALGO_BLAKE2S,
 	ALGO_BMW,
+	ALGO_BASTION,
 	ALGO_C11,
 	ALGO_CRYPTOLIGHT,
 	ALGO_CRYPTONIGHT,
@@ -66,6 +67,7 @@ static const char *algo_names[] = {
 	"blake",
 	"blake2s",
 	"bmw",
+	"bastion",
 	"c11",
 	"cryptolight",
 	"cryptonight",

diff --git a/bench.cpp b/bench.cpp
@@ -44,6 +44,7 @@ void bench_free()
 void algo_free_all(int thr_id)
 {
 	// only initialized algos will be freed
+	free_bastion(thr_id);
 	free_blake256(thr_id);
 	free_blake2s(thr_id);
 	free_bmw(thr_id);

diff --git a/ccminer.cpp b/ccminer.cpp
@@ -223,6 +223,7 @@ static char const usage[] = "\
 Usage: " PROGRAM_NAME " [OPTIONS]\n\
 Options:\n\
   -a, --algo=ALGO       specify the hash algorithm to use\n\
+			bastion     Hefty bastion\n\
 			blake       Blake 256 (SFR)\n\
 			blake2s     Blake2-S 256 (NEVA)\n\
 			blakecoin   Fast Blake 256 (8 rounds)\n\
@@ -2196,6 +2197,9 @@ static void *miner_thread(void *userdata)
 		/* scan nonces for a proof-of-work hash */
 		switch (opt_algo) {
 
+		case ALGO_BASTION:
+			rc = scanhash_bastion(thr_id, &work, max_nonce, &hashes_done);
+			break;
 		case ALGO_BLAKECOIN:
 			rc = scanhash_blake256(thr_id, &work, max_nonce, &hashes_done, 8);
 			break;

diff --git a/ccminer.vcxproj b/ccminer.vcxproj
@@ -435,6 +435,8 @@
     </CudaCompile>
     <CudaCompile Include="heavy\heavy.cu">
     </CudaCompile>
+    <CudaCompile Include="heavy\bastion.cu" />
+    <CudaCompile Include="heavy\cuda_bastion.cu" />
     <CudaCompile Include="JHA\cuda_jha_compactionTest.cu">
       <AdditionalOptions Condition="'$(Configuration)'=='Release'">-Xptxas "-abi=yes" %(AdditionalOptions)</AdditionalOptions>
       <AdditionalOptions Condition="'$(Configuration)'=='Debug'">-Xptxas "-abi=yes" %(AdditionalOptions)</AdditionalOptions>

diff --git a/ccminer.vcxproj.filters b/ccminer.vcxproj.filters
@@ -619,6 +619,12 @@
     <CudaCompile Include="heavy\heavy.cu">
       <Filter>Source Files\CUDA\heavy</Filter>
     </CudaCompile>
+    <CudaCompile Include="heavy\bastion.cu">
+      <Filter>Source Files\CUDA\heavy</Filter>
+    </CudaCompile>
+    <CudaCompile Include="heavy\cuda_bastion.cu">
+      <Filter>Source Files\CUDA\heavy</Filter>
+    </CudaCompile>
     <CudaCompile Include="quark\cuda_bmw512.cu">
       <Filter>Source Files\CUDA\quark</Filter>
     </CudaCompile>