From 7cc5222394255f7359b20923d278e3f9163fc0d1 Mon Sep 17 00:00:00 2001 From: Tanguy Pruvot Date: Tue, 9 Sep 2014 23:04:32 +0200 Subject: [PATCH] Move common check_cpu functions to root --- JHA/jackpotcoin.cu | 9 +--- Makefile.am | 2 +- bitslice_transformations_quad.cu | 10 ++++ ccminer.vcxproj | 4 +- ccminer.vcxproj.filters | 4 +- quark/cuda_checkhash.cu => cuda_checkhash.cu | 54 ++++++++------------ cuda_nist5.cu | 12 +---- quark/animecoin.cu | 9 +--- quark/quarkcoin.cu | 5 -- x11/fresh.cu | 26 ++-------- x11/x11.cu | 12 ++--- x13/x13.cu | 16 ++---- x15/whirlpool.cu | 7 +-- x15/x14.cu | 4 -- x15/x15.cu | 4 -- x17/x17.cu | 5 -- 16 files changed, 54 insertions(+), 129 deletions(-) rename quark/cuda_checkhash.cu => cuda_checkhash.cu (58%) diff --git a/JHA/jackpotcoin.cu b/JHA/jackpotcoin.cu index 3db2a4f..804e609 100644 --- a/JHA/jackpotcoin.cu +++ b/JHA/jackpotcoin.cu @@ -5,14 +5,13 @@ extern "C" #include "sph/sph_groestl.h" #include "sph/sph_jh.h" #include "sph/sph_skein.h" +} + #include "miner.h" #include "cuda_helper.h" -} -// aus cpu-miner.c extern int device_map[8]; -// Speicher für Input/Output der verketteten Hashfunktionen static uint32_t *d_hash[8]; extern void jackpot_keccak512_cpu_init(int thr_id, int threads); @@ -31,10 +30,6 @@ extern void quark_jh512_cpu_hash_64(int thr_id, int threads, uint32_t startNounc extern void quark_skein512_cpu_init(int thr_id, int threads); extern void quark_skein512_cpu_hash_64(int thr_id, int threads, uint32_t startNounce, uint32_t *d_nonceVector, uint32_t *d_hash, int order); -extern void cuda_check_cpu_init(int thr_id, int threads); -extern void cuda_check_cpu_setTarget(const void *ptarget); -extern uint32_t cuda_check_cpu_hash_64(int thr_id, int threads, uint32_t startNounce, uint32_t *d_nonceVector, uint32_t *d_inputHash, int order); - extern void jackpot_compactTest_cpu_init(int thr_id, int threads); extern void jackpot_compactTest_cpu_hash_64(int thr_id, int threads, uint32_t startNounce, uint32_t *inpHashes, uint32_t *d_validNonceTable, uint32_t *d_nonces1, size_t *nrm1, diff --git a/Makefile.am b/Makefile.am index 2067074..7cfaa74 100644 --- a/Makefile.am +++ b/Makefile.am @@ -29,7 +29,7 @@ ccminer_SOURCES = elist.h miner.h compat.h \ groestlcoin.cpp cuda_groestlcoin.cu cuda_groestlcoin.h \ myriadgroestl.cpp cuda_myriadgroestl.cu \ JHA/jackpotcoin.cu JHA/cuda_jha_keccak512.cu \ - JHA/cuda_jha_compactionTest.cu quark/cuda_checkhash.cu \ + JHA/cuda_jha_compactionTest.cu cuda_checkhash.cu \ quark/cuda_jh512.cu quark/cuda_quark_blake512.cu quark/cuda_quark_groestl512.cu quark/cuda_skein512.cu \ quark/cuda_bmw512.cu quark/cuda_quark_keccak512.cu \ quark/quarkcoin.cu quark/animecoin.cu \ diff --git a/bitslice_transformations_quad.cu b/bitslice_transformations_quad.cu index 8f7bcf8..48c7f04 100644 --- a/bitslice_transformations_quad.cu +++ b/bitslice_transformations_quad.cu @@ -7,6 +7,8 @@ #define __shfl(var, srcLane, width) (uint32_t)(var) #endif +#ifdef __CUDA_ARCH__ + __device__ __forceinline__ void to_bitslice_quad(uint32_t *input, uint32_t *output) { @@ -429,3 +431,11 @@ void from_bitslice_quad(uint32_t *input, uint32_t *output) if (threadIdx.x % 4) output[i] = output[i+1] = 0; } } + +#else + +/* host "fake" functions */ +#define from_bitslice_quad(st, out) +#define to_bitslice_quad(in, msg) in[0] = (uint32_t) in[0]; + +#endif /* device only code */ diff --git a/ccminer.vcxproj b/ccminer.vcxproj index 06ba665..dc5b3f1 100644 --- a/ccminer.vcxproj +++ b/ccminer.vcxproj @@ -432,7 +432,7 @@ copy "$(CudaToolkitBinDir)\cudart64*.dll" "$(OutDir)" %(AdditionalOptions) 64 - + false --ptxas-options=-O2 %(AdditionalOptions) %(AdditionalOptions) @@ -570,4 +570,4 @@ copy "$(CudaToolkitBinDir)\cudart64*.dll" "$(OutDir)" - \ No newline at end of file + diff --git a/ccminer.vcxproj.filters b/ccminer.vcxproj.filters index 065e196..2648137 100644 --- a/ccminer.vcxproj.filters +++ b/ccminer.vcxproj.filters @@ -415,7 +415,7 @@ Source Files\CUDA\x13 - + Source Files\CUDA @@ -449,4 +449,4 @@ Source Files\CUDA - \ No newline at end of file + diff --git a/quark/cuda_checkhash.cu b/cuda_checkhash.cu similarity index 58% rename from quark/cuda_checkhash.cu rename to cuda_checkhash.cu index 1ce25ec..a7806aa 100644 --- a/quark/cuda_checkhash.cu +++ b/cuda_checkhash.cu @@ -9,66 +9,56 @@ __constant__ uint32_t pTarget[8]; static uint32_t *d_resNounce[8]; static uint32_t *h_resNounce[8]; -// aus heavy.cu -extern cudaError_t MyStreamSynchronize(cudaStream_t stream, int situation, int thr_id); - -__global__ void cuda_check_gpu_hash_64(int threads, uint32_t startNounce, uint32_t *g_nonceVector, uint32_t *g_hash, uint32_t *resNounce) +__global__ +void cuda_check_gpu_hash_64(int threads, uint32_t startNounce, uint32_t *g_nonceVector, uint32_t *g_hash, uint32_t *resNounce) { int thread = (blockDim.x * blockIdx.x + threadIdx.x); if (thread < threads) { - // bestimme den aktuellen Zähler + // bestimme den aktuellen Zähler uint32_t nounce = (g_nonceVector != NULL) ? g_nonceVector[thread] : (startNounce + thread); int hashPosition = nounce - startNounce; - uint32_t *inpHash = &g_hash[16 * hashPosition]; + uint32_t *inpHash = &g_hash[hashPosition<<4]; uint32_t hash[8]; -#pragma unroll 8 + + #pragma unroll 8 for (int i=0; i < 8; i++) hash[i] = inpHash[i]; - // kopiere Ergebnis - int i, position = -1; - bool rc = true; - -#pragma unroll 8 - for (i = 7; i >= 0; i--) { + for (int i = 7; i >= 0; i--) { if (hash[i] > pTarget[i]) { - if(position < i) { - position = i; - rc = false; - } - } - if (hash[i] < pTarget[i]) { - if(position < i) { - position = i; - rc = true; - } - } + return; + } + if (hash[i] < pTarget[i]) { + break; + } } - if(rc == true) - if(resNounce[0] > nounce) - resNounce[0] = nounce; + if(resNounce[0] > nounce) + resNounce[0] = nounce; } } // Setup-Funktionen -__host__ void cuda_check_cpu_init(int thr_id, int threads) +__host__ +void cuda_check_cpu_init(int thr_id, int threads) { cudaMallocHost(&h_resNounce[thr_id], 1*sizeof(uint32_t)); cudaMalloc(&d_resNounce[thr_id], 1*sizeof(uint32_t)); } // Target Difficulty setzen -__host__ void cuda_check_cpu_setTarget(const void *ptarget) +__host__ +void cuda_check_cpu_setTarget(const void *ptarget) { // die Message zur Berechnung auf der GPU - cudaMemcpyToSymbol( pTarget, ptarget, 8*sizeof(uint32_t), 0, cudaMemcpyHostToDevice); + cudaMemcpyToSymbol(pTarget, ptarget, 8*sizeof(uint32_t), 0, cudaMemcpyHostToDevice); } -__host__ uint32_t cuda_check_cpu_hash_64(int thr_id, int threads, uint32_t startNounce, uint32_t *d_nonceVector, uint32_t *d_inputHash, int order) +__host__ +uint32_t cuda_check_cpu_hash_64(int thr_id, int threads, uint32_t startNounce, uint32_t *d_nonceVector, uint32_t *d_inputHash, int order) { uint32_t result = 0xffffffff; cudaMemset(d_resNounce[thr_id], 0xff, sizeof(uint32_t)); @@ -79,7 +69,7 @@ __host__ uint32_t cuda_check_cpu_hash_64(int thr_id, int threads, uint32_t start dim3 grid((threads + threadsperblock-1)/threadsperblock); dim3 block(threadsperblock); - // Größe des dynamischen Shared Memory Bereichs + // Größe des dynamischen Shared Memory Bereichs size_t shared_size = 0; cuda_check_gpu_hash_64 <<>>(threads, startNounce, d_nonceVector, d_inputHash, d_resNounce[thr_id]); diff --git a/cuda_nist5.cu b/cuda_nist5.cu index 419c1a5..1189f18 100644 --- a/cuda_nist5.cu +++ b/cuda_nist5.cu @@ -11,7 +11,7 @@ extern "C" #include "cuda_helper.h" -// aus cpu-miner.c +// in cpu-miner.c extern int device_map[8]; // Speicher für Input/Output der verketteten Hashfunktionen @@ -33,9 +33,6 @@ extern void quark_keccak512_cpu_hash_64(int thr_id, int threads, uint32_t startN extern void quark_skein512_cpu_init(int thr_id, int threads); extern void quark_skein512_cpu_hash_64(int thr_id, int threads, uint32_t startNounce, uint32_t *d_nonceVector, uint32_t *d_hash, int order); -extern void cuda_check_cpu_init(int thr_id, int threads); -extern void cuda_check_cpu_setTarget(const void *ptarget); -extern uint32_t cuda_check_cpu_hash_64(int thr_id, int threads, uint32_t startNounce, uint32_t *d_nonceVector, uint32_t *d_inputHash, int order); // Original nist5hash Funktion aus einem miner Quelltext extern "C" void nist5hash(void *state, const void *input) @@ -46,30 +43,25 @@ extern "C" void nist5hash(void *state, const void *input) sph_keccak512_context ctx_keccak; sph_skein512_context ctx_skein; - unsigned char hash[64]; + uint8_t hash[64]; sph_blake512_init(&ctx_blake); - // ZBLAKE; sph_blake512 (&ctx_blake, input, 80); sph_blake512_close(&ctx_blake, (void*) hash); sph_groestl512_init(&ctx_groestl); - // ZGROESTL; sph_groestl512 (&ctx_groestl, (const void*) hash, 64); sph_groestl512_close(&ctx_groestl, (void*) hash); sph_jh512_init(&ctx_jh); - // ZJH; sph_jh512 (&ctx_jh, (const void*) hash, 64); sph_jh512_close(&ctx_jh, (void*) hash); sph_keccak512_init(&ctx_keccak); - // ZKECCAK; sph_keccak512 (&ctx_keccak, (const void*) hash, 64); sph_keccak512_close(&ctx_keccak, (void*) hash); sph_skein512_init(&ctx_skein); - // ZSKEIN; sph_skein512 (&ctx_skein, (const void*) hash, 64); sph_skein512_close(&ctx_skein, (void*) hash); diff --git a/quark/animecoin.cu b/quark/animecoin.cu index 4b2d097..0d7466a 100644 --- a/quark/animecoin.cu +++ b/quark/animecoin.cu @@ -6,14 +6,12 @@ extern "C" #include "sph/sph_skein.h" #include "sph/sph_jh.h" #include "sph/sph_keccak.h" +} #include "miner.h" #include "cuda_helper.h" -} -// aus cpu-miner.c extern int device_map[8]; -// Speicher für Input/Output der verketteten Hashfunktionen static uint32_t *d_hash[8]; // Speicher zur Generierung der Noncevektoren für die bedingten Hashes @@ -43,10 +41,6 @@ extern void quark_keccak512_cpu_hash_64(int thr_id, int threads, uint32_t startN extern void quark_jh512_cpu_init(int thr_id, int threads); extern void quark_jh512_cpu_hash_64(int thr_id, int threads, uint32_t startNounce, uint32_t *d_nonceVector, uint32_t *d_hash, int order); -extern void cuda_check_cpu_init(int thr_id, int threads); -extern void cuda_check_cpu_setTarget(const void *ptarget); -extern uint32_t cuda_check_cpu_hash_64(int thr_id, int threads, uint32_t startNounce, uint32_t *d_nonceVector, uint32_t *d_inputHash, int order); - extern void quark_compactTest_cpu_init(int thr_id, int threads); extern void quark_compactTest_cpu_hash_64(int thr_id, int threads, uint32_t startNounce, uint32_t *inpHashes, uint32_t *d_validNonceTable, uint32_t *d_nonces1, size_t *nrm1, @@ -165,7 +159,6 @@ struct HashPredicate uint32_t m_startNonce; }; -extern bool opt_benchmark; extern "C" int scanhash_anime(int thr_id, uint32_t *pdata, const uint32_t *ptarget, uint32_t max_nonce, diff --git a/quark/quarkcoin.cu b/quark/quarkcoin.cu index a905ec4..1adac57 100644 --- a/quark/quarkcoin.cu +++ b/quark/quarkcoin.cu @@ -14,7 +14,6 @@ extern "C" extern int device_map[8]; -// Speicher für Input/Output der verketteten Hashfunktionen static uint32_t *d_hash[8]; // Speicher zur Generierung der Noncevektoren für die bedingten Hashes @@ -44,10 +43,6 @@ extern void quark_keccak512_cpu_hash_64(int thr_id, int threads, uint32_t startN extern void quark_jh512_cpu_init(int thr_id, int threads); extern void quark_jh512_cpu_hash_64(int thr_id, int threads, uint32_t startNounce, uint32_t *d_nonceVector, uint32_t *d_hash, int order); -extern void cuda_check_cpu_init(int thr_id, int threads); -extern void cuda_check_cpu_setTarget(const void *ptarget); -extern uint32_t cuda_check_cpu_hash_64(int thr_id, int threads, uint32_t startNounce, uint32_t *d_nonceVector, uint32_t *d_inputHash, int order); - extern void quark_compactTest_cpu_init(int thr_id, int threads); extern void quark_compactTest_cpu_hash_64(int thr_id, int threads, uint32_t startNounce, uint32_t *inpHashes, uint32_t *d_validNonceTable, uint32_t *d_nonces1, size_t *nrm1, diff --git a/x11/fresh.cu b/x11/fresh.cu index 11bdda6..0c5179a 100644 --- a/x11/fresh.cu +++ b/x11/fresh.cu @@ -5,9 +5,9 @@ extern "C" { #include "sph/sph_shavite.h" #include "sph/sph_simd.h" #include "sph/sph_echo.h" +} #include "miner.h" #include "cuda_helper.h" -} // to test gpu hash on a null buffer #define NULLTEST 0 @@ -15,7 +15,6 @@ extern "C" { static uint32_t *d_hash[8]; extern int device_map[8]; -extern bool opt_benchmark; extern void x11_shavite512_cpu_init(int thr_id, int threads); extern void x11_shavite512_setBlock_80(void *pdata); @@ -28,10 +27,6 @@ extern void x11_simd512_cpu_hash_64(int thr_id, int threads, uint32_t startNounc extern void x11_echo512_cpu_init(int thr_id, int threads); extern void x11_echo512_cpu_hash_64(int thr_id, int threads, uint32_t startNounce, uint32_t *d_nonceVector, uint32_t *d_hash, int order); -extern void cuda_check_cpu_init(int thr_id, int threads); -extern void cuda_check_cpu_setTarget(const void *ptarget); -extern uint32_t cuda_check_cpu_hash_64(int thr_id, int threads, uint32_t startNounce, uint32_t *d_nonceVector, uint32_t *d_inputHash, int order); - extern void quark_compactTest_cpu_init(int thr_id, int threads); extern void quark_compactTest_cpu_hash_64(int thr_id, int threads, uint32_t startNounce, uint32_t *inpHashes, uint32_t *d_noncesTrue, size_t *nrmTrue, uint32_t *d_noncesFalse, size_t *nrmFalse, @@ -75,15 +70,6 @@ extern "C" void fresh_hash(void *state, const void *input) memcpy(state, hash, 32); } -#if NULLTEST -static void print_hash(unsigned char *hash) -{ - for (int i=0; i < 32; i += 4) { - printf("%02x%02x%02x%02x ", hash[i], hash[i+1], hash[i+2], hash[i+3]); - } -} -#endif - extern "C" int scanhash_fresh(int thr_id, uint32_t *pdata, const uint32_t *ptarget, uint32_t max_nonce, unsigned long *hashes_done) @@ -92,15 +78,9 @@ extern "C" int scanhash_fresh(int thr_id, uint32_t *pdata, const int throughput = 256*256*8; static bool init[8] = {0,0,0,0,0,0,0,0}; uint32_t endiandata[20]; - uint32_t Htarg = ptarget[7]; if (opt_benchmark) - ((uint32_t*)ptarget)[7] = Htarg = 0x0000ff; - -#if NULLTEST - for (int k=0; k < 20; k++) - pdata[k] = 0; -#endif + ((uint32_t*)ptarget)[7] = 0x00ff; if (!init[thr_id]) { @@ -123,6 +103,8 @@ extern "C" int scanhash_fresh(int thr_id, uint32_t *pdata, x11_shavite512_setBlock_80((void*)endiandata); cuda_check_cpu_setTarget(ptarget); do { + uint32_t Htarg = ptarget[7]; + uint32_t foundNonce; int order = 0; diff --git a/x11/x11.cu b/x11/x11.cu index dc2f97f..60ea553 100644 --- a/x11/x11.cu +++ b/x11/x11.cu @@ -1,4 +1,3 @@ - extern "C" { #include "sph/sph_blake.h" @@ -13,13 +12,13 @@ extern "C" #include "sph/sph_shavite.h" #include "sph/sph_simd.h" #include "sph/sph_echo.h" +} #include "miner.h" #include "cuda_helper.h" #include #include -} // in cpu-miner.c extern int device_map[8]; @@ -62,14 +61,9 @@ extern void x11_simd512_cpu_hash_64(int thr_id, int threads, uint32_t startNounc extern void x11_echo512_cpu_init(int thr_id, int threads); extern void x11_echo512_cpu_hash_64(int thr_id, int threads, uint32_t startNounce, uint32_t *d_nonceVector, uint32_t *d_hash, int order); -extern void cuda_check_cpu_init(int thr_id, int threads); -extern void cuda_check_cpu_setTarget(const void *ptarget); -extern uint32_t cuda_check_cpu_hash_64(int thr_id, int threads, uint32_t startNounce, uint32_t *d_nonceVector, uint32_t *d_inputHash, int order); - extern void quark_compactTest_cpu_init(int thr_id, int threads); -extern void quark_compactTest_cpu_hash_64(int thr_id, int threads, uint32_t startNounce, uint32_t *inpHashes, - uint32_t *d_noncesTrue, size_t *nrmTrue, uint32_t *d_noncesFalse, size_t *nrmFalse, - int order); +extern void quark_compactTest_cpu_hash_64(int thr_id, int threads, uint32_t startNounce, uint32_t *inpHashes, + uint32_t *d_noncesTrue, size_t *nrmTrue, uint32_t *d_noncesFalse, size_t *nrmFalse, int order); // X11 Hashfunktion extern "C" void x11hash(void *output, const void *input) diff --git a/x13/x13.cu b/x13/x13.cu index 70a8ee1..c751211 100644 --- a/x13/x13.cu +++ b/x13/x13.cu @@ -18,18 +18,16 @@ extern "C" #include "sph/sph_hamsi.h" #include "sph/sph_fugue.h" - +} #include "miner.h" #include "cuda_helper.h" -} -// aus cpu-miner.c extern int device_map[8]; -// Speicher für Input/Output der verketteten Hashfunktionen static uint32_t *d_hash[8]; + extern void quark_blake512_cpu_init(int thr_id, int threads); extern void quark_blake512_cpu_setBlock_80(void *pdata); extern void quark_blake512_cpu_hash_80(int thr_id, int threads, uint32_t startNounce, uint32_t *d_hash, int order); @@ -40,7 +38,6 @@ extern void quark_bmw512_cpu_hash_64(int thr_id, int threads, uint32_t startNoun extern void quark_groestl512_cpu_init(int thr_id, int threads); extern void quark_groestl512_cpu_hash_64(int thr_id, int threads, uint32_t startNounce, uint32_t *d_nonceVector, uint32_t *d_hash, int order); -//extern void quark_doublegroestl512_cpu_hash_64(int thr_id, int threads, uint32_t startNounce, uint32_t *d_nonceVector, uint32_t *d_hash, int order); extern void quark_skein512_cpu_init(int thr_id, int threads); extern void quark_skein512_cpu_hash_64(int thr_id, int threads, uint32_t startNounce, uint32_t *d_nonceVector, uint32_t *d_hash, int order); @@ -72,14 +69,9 @@ extern void x13_hamsi512_cpu_hash_64(int thr_id, int threads, uint32_t startNoun extern void x13_fugue512_cpu_init(int thr_id, int threads); extern void x13_fugue512_cpu_hash_64(int thr_id, int threads, uint32_t startNounce, uint32_t *d_nonceVector, uint32_t *d_hash, int order); -extern void cuda_check_cpu_init(int thr_id, int threads); -extern void cuda_check_cpu_setTarget(const void *ptarget); -extern uint32_t cuda_check_cpu_hash_64(int thr_id, int threads, uint32_t startNounce, uint32_t *d_nonceVector, uint32_t *d_inputHash, int order); - extern void quark_compactTest_cpu_init(int thr_id, int threads); extern void quark_compactTest_cpu_hash_64(int thr_id, int threads, uint32_t startNounce, uint32_t *inpHashes, - uint32_t *d_noncesTrue, size_t *nrmTrue, uint32_t *d_noncesFalse, size_t *nrmFalse, - int order); + uint32_t *d_noncesTrue, size_t *nrmTrue, uint32_t *d_noncesFalse, size_t *nrmFalse, int order); // X13 Hashfunktion extern "C" void x13hash(void *output, const void *input) @@ -159,8 +151,6 @@ extern "C" void x13hash(void *output, const void *input) } -extern bool opt_benchmark; - extern "C" int scanhash_x13(int thr_id, uint32_t *pdata, const uint32_t *ptarget, uint32_t max_nonce, unsigned long *hashes_done) diff --git a/x15/whirlpool.cu b/x15/whirlpool.cu index eeb50e7..192a71c 100644 --- a/x15/whirlpool.cu +++ b/x15/whirlpool.cu @@ -9,20 +9,17 @@ extern "C" // from cpu-miner.c extern int device_map[8]; -extern bool opt_benchmark; // Speicher für Input/Output der verketteten Hashfunktionen static uint32_t *d_hash[8]; extern void x15_whirlpool_cpu_init(int thr_id, int threads, int mode); +extern void x15_whirlpool_cpu_hash_64(int thr_id, int threads, uint32_t startNounce, uint32_t *d_nonceVector, uint32_t *d_hash, int order); + extern void whirlpool512_setBlock_80(void *pdata, const void *ptarget); extern void whirlpool512_cpu_hash_80(int thr_id, int threads, uint32_t startNounce, uint32_t *d_hash, int order); -extern void x15_whirlpool_cpu_hash_64(int thr_id, int threads, uint32_t startNounce, uint32_t *d_nonceVector, uint32_t *d_hash, int order); extern uint32_t whirlpool512_cpu_finalhash_64(int thr_id, int threads, uint32_t startNounce, uint32_t *d_nonceVector, uint32_t *d_hash, int order); -extern void cuda_check_cpu_init(int thr_id, int threads); -extern void cuda_check_cpu_setTarget(const void *ptarget); -extern uint32_t cuda_check_cpu_hash_64(int thr_id, int threads, uint32_t startNounce, uint32_t *d_nonceVector, uint32_t *d_inputHash, int order); // CPU Hash function extern "C" void wcoinhash(void *state, const void *input) diff --git a/x15/x14.cu b/x15/x14.cu index b3519cd..7335a0d 100644 --- a/x15/x14.cu +++ b/x15/x14.cu @@ -76,10 +76,6 @@ extern void x13_fugue512_cpu_hash_64(int thr_id, int threads, uint32_t startNoun extern void x14_shabal512_cpu_init(int thr_id, int threads); extern void x14_shabal512_cpu_hash_64(int thr_id, int threads, uint32_t startNounce, uint32_t *d_nonceVector, uint32_t *d_hash, int order); -extern void cuda_check_cpu_init(int thr_id, int threads); -extern void cuda_check_cpu_setTarget(const void *ptarget); -extern uint32_t cuda_check_cpu_hash_64(int thr_id, int threads, uint32_t startNounce, uint32_t *d_nonceVector, uint32_t *d_inputHash, int order); - extern void quark_compactTest_cpu_init(int thr_id, int threads); extern void quark_compactTest_cpu_hash_64(int thr_id, int threads, uint32_t startNounce, uint32_t *inpHashes, uint32_t *d_noncesTrue, size_t *nrmTrue, uint32_t *d_noncesFalse, size_t *nrmFalse, int order); diff --git a/x15/x15.cu b/x15/x15.cu index faea354..012cafd 100644 --- a/x15/x15.cu +++ b/x15/x15.cu @@ -81,10 +81,6 @@ extern void x15_whirlpool_cpu_init(int thr_id, int threads, int mode); extern void x15_whirlpool_cpu_hash_64(int thr_id, int threads, uint32_t startNounce, uint32_t *d_nonceVector, uint32_t *d_hash, int order); extern void x15_whirlpool_cpu_free(int thr_id); -extern void cuda_check_cpu_init(int thr_id, int threads); -extern void cuda_check_cpu_setTarget(const void *ptarget); -extern uint32_t cuda_check_cpu_hash_64(int thr_id, int threads, uint32_t startNounce, uint32_t *d_nonceVector, uint32_t *d_inputHash, int order); - extern void quark_compactTest_cpu_init(int thr_id, int threads); extern void quark_compactTest_cpu_hash_64(int thr_id, int threads, uint32_t startNounce, uint32_t *inpHashes, uint32_t *d_noncesTrue, size_t *nrmTrue, uint32_t *d_noncesFalse, size_t *nrmFalse, int order); diff --git a/x17/x17.cu b/x17/x17.cu index 65d2259..608ce60 100644 --- a/x17/x17.cu +++ b/x17/x17.cu @@ -89,11 +89,6 @@ extern void x17_sha512_cpu_hash_64(int thr_id, int threads, uint32_t startNounce extern void x17_haval256_cpu_init(int thr_id, int threads); extern void x17_haval256_cpu_hash_64(int thr_id, int threads, uint32_t startNounce, uint32_t *d_nonceVector, uint32_t *d_hash, int order); - -extern void cuda_check_cpu_init(int thr_id, int threads); -extern void cuda_check_cpu_setTarget(const void *ptarget); -extern uint32_t cuda_check_cpu_hash_64(int thr_id, int threads, uint32_t startNounce, uint32_t *d_nonceVector, uint32_t *d_inputHash, int order); - extern void quark_compactTest_cpu_init(int thr_id, int threads); extern void quark_compactTest_cpu_hash_64(int thr_id, int threads, uint32_t startNounce, uint32_t *inpHashes, uint32_t *d_noncesTrue, size_t *nrmTrue, uint32_t *d_noncesFalse, size_t *nrmFalse,