mirror of
https://github.com/GOSTSec/ccminer
synced 2025-01-22 04:24:29 +00:00
remove double reference to luffa algo
doomcoin is dead but the luffa algo is still used (Joincoin).. keep doom as alias for compat... rename functions...
This commit is contained in:
Tanguy Pruvot
parent
d25b42e41b
commit
5636e2be5e
@ -48,7 +48,7 @@ ccminer_SOURCES = elist.h miner.h compat.h \
|
||||
sph/hamsi.c sph/hamsi_helper.c sph/sph_hamsi.h \
|
||||
sph/shabal.c sph/whirlpool.c sph/sha2big.c sph/haval.c \
|
||||
pluck/pluck.cu pluck/cuda_pluck.cu \
|
||||
qubit/qubit.cu qubit/qubit_luffa512.cu qubit/deep.cu qubit/doom.cu \
|
||||
qubit/qubit.cu qubit/qubit_luffa512.cu qubit/deep.cu qubit/luffa.cu \
|
||||
x11/x11.cu x11/fresh.cu x11/cuda_x11_luffa512.cu x11/cuda_x11_cubehash512.cu \
|
||||
x11/cuda_x11_shavite512.cu x11/cuda_x11_simd512.cu x11/cuda_x11_echo.cu \
|
||||
x11/cuda_x11_luffa512_Cubehash.cu \
|
||||
@ -79,7 +79,7 @@ ccminer_CPPFLAGS = @LIBCURL_CPPFLAGS@ @OPENMP_CFLAGS@ $(CPPFLAGS) $(PTHREAD_FLAG
|
||||
|
||||
nvcc_ARCH = -gencode=arch=compute_50,code=\"sm_50,compute_50\"
|
||||
|
||||
#nvcc_ARCH += -gencode=arch=compute_52,code=\"sm_52,compute_52\"
|
||||
nvcc_ARCH += -gencode=arch=compute_52,code=\"sm_52,compute_52\"
|
||||
#nvcc_ARCH += -gencode=arch=compute_35,code=\"sm_35,compute_35\"
|
||||
#nvcc_ARCH += -gencode=arch=compute_30,code=\"sm_30,compute_30\"
|
||||
#nvcc_ARCH += -gencode=arch=compute_20,code=\"sm_21,compute_20\"
|
||||
|
||||
@ -33,7 +33,8 @@ TalkCoin
|
||||
DarkCoin and other X11 coins
|
||||
Saffroncoin blake (256 14-rounds)
|
||||
BlakeCoin (256 8-rounds)
|
||||
Deep, Doom and Qubit
|
||||
Qubit (Digibyte, ...)
|
||||
Luffa (Joincoin)
|
||||
Keccak (Maxcoin)
|
||||
Pentablake (Blake 512 x5)
|
||||
1Coin Triple S
|
||||
@ -73,7 +74,7 @@ its command line interface and options.
|
||||
heavy use to mine Heavycoin
|
||||
jackpot use to mine Jackpotcoin
|
||||
keccak use to mine Maxcoin
|
||||
luffa use to mine Doomcoin
|
||||
luffa use to mine Joincoin
|
||||
lyra2 use to mine Vertcoin
|
||||
mjollnir use to mine Mjollnircoin
|
||||
myr-gr use to mine Myriad-Groest
|
||||
@ -222,7 +223,7 @@ features.
|
||||
Add --diff-multiplier (-m) and rename --diff to --diff-factor (-f)
|
||||
Some fixes for default pool params values (multipool)
|
||||
First steps to handle nvml application clocks and P0 on the GTX9xx
|
||||
Optimize qubit, deep and doom
|
||||
Optimize qubit, deep and luffa algos
|
||||
|
||||
May 26th 2015 v1.6.4
|
||||
Implement multi-pool support (failover and time rotate)
|
||||
|
||||
16
ccminer.cpp
16
ccminer.cpp
@ -90,14 +90,13 @@ enum sha_algos {
|
||||
ALGO_BLAKECOIN,
|
||||
ALGO_DEEP,
|
||||
ALGO_DMD_GR,
|
||||
ALGO_DOOM,
|
||||
ALGO_FRESH,
|
||||
ALGO_FUGUE256, /* Fugue256 */
|
||||
ALGO_GROESTL,
|
||||
ALGO_HEAVY, /* Heavycoin hash */
|
||||
ALGO_KECCAK,
|
||||
ALGO_JACKPOT,
|
||||
ALGO_LUFFA_DOOM,
|
||||
ALGO_LUFFA,
|
||||
ALGO_LYRA2,
|
||||
ALGO_MJOLLNIR, /* Hefty hash */
|
||||
ALGO_MYR_GR,
|
||||
@ -126,7 +125,6 @@ static const char *algo_names[] = {
|
||||
"blakecoin",
|
||||
"deep",
|
||||
"dmd-gr",
|
||||
"doom", /* is luffa */
|
||||
"fresh",
|
||||
"fugue256",
|
||||
"groestl",
|
||||
@ -297,7 +295,7 @@ Options:\n\
|
||||
heavy Heavycoin\n\
|
||||
jackpot Jackpot\n\
|
||||
keccak Keccak-256 (Maxcoin)\n\
|
||||
luffa Doomcoin\n\
|
||||
luffa Joincoin\n\
|
||||
lyra2 VertCoin\n\
|
||||
mjollnir Mjollnircoin\n\
|
||||
myr-gr Myriad-Groestl\n\
|
||||
@ -1741,9 +1739,8 @@ static void *miner_thread(void *userdata)
|
||||
case ALGO_KECCAK:
|
||||
minmax = 0x40000000U;
|
||||
break;
|
||||
case ALGO_DOOM:
|
||||
case ALGO_JACKPOT:
|
||||
case ALGO_LUFFA_DOOM:
|
||||
case ALGO_LUFFA:
|
||||
minmax = 0x2000000;
|
||||
break;
|
||||
case ALGO_S3:
|
||||
@ -1818,9 +1815,8 @@ static void *miner_thread(void *userdata)
|
||||
max_nonce, &hashes_done);
|
||||
break;
|
||||
|
||||
case ALGO_DOOM:
|
||||
case ALGO_LUFFA_DOOM:
|
||||
rc = scanhash_doom(thr_id, work.data, work.target,
|
||||
case ALGO_LUFFA:
|
||||
rc = scanhash_luffa(thr_id, work.data, work.target,
|
||||
max_nonce, &hashes_done);
|
||||
break;
|
||||
|
||||
@ -2656,6 +2652,8 @@ void parse_arg(int key, char *arg)
|
||||
// some aliases...
|
||||
if (!strcasecmp("diamond", arg))
|
||||
i = opt_algo = ALGO_DMD_GR;
|
||||
if (!strcasecmp("doom", arg))
|
||||
i = opt_algo = ALGO_LUFFA;
|
||||
else if (!strcasecmp("ziftr", arg))
|
||||
i = opt_algo = ALGO_ZR5;
|
||||
else
|
||||
|
||||
@ -430,7 +430,7 @@
|
||||
</CudaCompile>
|
||||
<CudaCompile Include="qubit\deep.cu">
|
||||
</CudaCompile>
|
||||
<CudaCompile Include="qubit\doom.cu">
|
||||
<CudaCompile Include="qubit\luffa.cu">
|
||||
</CudaCompile>
|
||||
<CudaCompile Include="qubit\qubit.cu">
|
||||
</CudaCompile>
|
||||
|
||||
@ -481,7 +481,7 @@
|
||||
<CudaCompile Include="qubit\deep.cu">
|
||||
<Filter>Source Files\CUDA\qubit</Filter>
|
||||
</CudaCompile>
|
||||
<CudaCompile Include="qubit\doom.cu">
|
||||
<CudaCompile Include="qubit\luffa.cu">
|
||||
<Filter>Source Files\CUDA\qubit</Filter>
|
||||
</CudaCompile>
|
||||
<CudaCompile Include="qubit\qubit.cu">
|
||||
|
||||
4
miner.h
4
miner.h
@ -265,7 +265,7 @@ extern int scanhash_deep(int thr_id, uint32_t *pdata,
|
||||
const uint32_t *ptarget, uint32_t max_nonce,
|
||||
unsigned long *hashes_done);
|
||||
|
||||
extern int scanhash_doom(int thr_id, uint32_t *pdata,
|
||||
extern int scanhash_luffa(int thr_id, uint32_t *pdata,
|
||||
const uint32_t *ptarget, uint32_t max_nonce,
|
||||
unsigned long *hashes_done);
|
||||
|
||||
@ -733,7 +733,7 @@ void print_hash_tests(void);
|
||||
void animehash(void *state, const void *input);
|
||||
void blake256hash(void *output, const void *input, int8_t rounds);
|
||||
void deephash(void *state, const void *input);
|
||||
void doomhash(void *state, const void *input);
|
||||
void luffa_hash(void *state, const void *input);
|
||||
void fresh_hash(void *state, const void *input);
|
||||
void fugue256_hash(unsigned char* output, const unsigned char* input, int len);
|
||||
void heavycoin_hash(unsigned char* output, const unsigned char* input, int len);
|
||||
|
||||
@ -1,6 +1,5 @@
|
||||
/*
|
||||
* qubit algorithm
|
||||
*
|
||||
* luffa 80 algo (Introduced by Doomcoin)
|
||||
*/
|
||||
extern "C" {
|
||||
#include "sph/sph_luffa.h"
|
||||
@ -16,7 +15,7 @@ extern void qubit_luffa512_cpu_init(int thr_id, uint32_t threads);
|
||||
extern void qubit_luffa512_cpu_setBlock_80(void *pdata);
|
||||
extern void qubit_luffa512_cpu_hash_80(int thr_id, uint32_t threads, uint32_t startNounce, uint32_t *d_hash, int order);
|
||||
|
||||
extern "C" void doomhash(void *state, const void *input)
|
||||
extern "C" void luffa_hash(void *state, const void *input)
|
||||
{
|
||||
uint8_t _ALIGN(64) hash[64];
|
||||
|
||||
@ -31,7 +30,7 @@ extern "C" void doomhash(void *state, const void *input)
|
||||
|
||||
static bool init[MAX_GPUS] = { 0 };
|
||||
|
||||
extern "C" int scanhash_doom(int thr_id, uint32_t *pdata, const uint32_t *ptarget,
|
||||
extern "C" int scanhash_luffa(int thr_id, uint32_t *pdata, const uint32_t *ptarget,
|
||||
uint32_t max_nonce, unsigned long *hashes_done)
|
||||
{
|
||||
uint32_t _ALIGN(64) endiandata[20];
|
||||
@ -71,7 +70,7 @@ extern "C" int scanhash_doom(int thr_id, uint32_t *pdata, const uint32_t *ptarge
|
||||
{
|
||||
uint32_t _ALIGN(64) vhash64[8];
|
||||
be32enc(&endiandata[19], foundNonce);
|
||||
doomhash(vhash64, endiandata);
|
||||
luffa_hash(vhash64, endiandata);
|
||||
|
||||
if (vhash64[7] <= ptarget[7] && fulltest(vhash64, ptarget)) {
|
||||
//*hashes_done = min(max_nonce - first_nonce, (uint64_t) pdata[19] - first_nonce + throughput);
|
||||
Loading…
x
Reference in New Issue
Block a user