mirror of
https://github.com/GOSTSec/ccminer
synced 2025-02-09 13:24:21 +00:00
keccak second nonce, and higher intensity
This commit is contained in:
parent
cf886b5907
commit
015d129aa6
@ -72,7 +72,8 @@ extern "C" int scanhash_keccak256(int thr_id, struct work* work, uint32_t max_no
|
|||||||
|
|
||||||
if(!use_compat_kernels[thr_id]) {
|
if(!use_compat_kernels[thr_id]) {
|
||||||
uint32_t intensity = 23;
|
uint32_t intensity = 23;
|
||||||
if (strstr(device_name[dev_id], "GTX 1080")) intensity = 25;
|
if (strstr(device_name[dev_id], "GTX 1070")) intensity = 25;
|
||||||
|
if (strstr(device_name[dev_id], "GTX 1080")) intensity = 26;
|
||||||
throughput = cuda_default_throughput(thr_id, 1U << intensity);
|
throughput = cuda_default_throughput(thr_id, 1U << intensity);
|
||||||
keccak256_cpu_init(thr_id);
|
keccak256_cpu_init(thr_id);
|
||||||
} else {
|
} else {
|
||||||
@ -120,7 +121,17 @@ extern "C" int scanhash_keccak256(int thr_id, struct work* work, uint32_t max_no
|
|||||||
if (vhash[7] <= ptarget[7] && fulltest(vhash, ptarget)) {
|
if (vhash[7] <= ptarget[7] && fulltest(vhash, ptarget)) {
|
||||||
work->valid_nonces = 1;
|
work->valid_nonces = 1;
|
||||||
work_set_target_ratio(work, vhash);
|
work_set_target_ratio(work, vhash);
|
||||||
pdata[19] = work->nonces[0] + 1;
|
if (!use_compat_kernels[thr_id] && work->nonces[1] != UINT32_MAX) {
|
||||||
|
be32enc(&endiandata[19], work->nonces[1]);
|
||||||
|
keccak256_hash(vhash, endiandata);
|
||||||
|
if (vhash[7] <= ptarget[7] && fulltest(vhash, ptarget)) {
|
||||||
|
work->valid_nonces++;
|
||||||
|
bn_set_target_ratio(work, vhash, 1);
|
||||||
|
}
|
||||||
|
pdata[19] = max(work->nonces[0], work->nonces[1]) + 1;
|
||||||
|
} else {
|
||||||
|
pdata[19] = work->nonces[0] + 1;
|
||||||
|
}
|
||||||
return work->valid_nonces;
|
return work->valid_nonces;
|
||||||
}
|
}
|
||||||
else if (vhash[7] > Htarg) {
|
else if (vhash[7] > Htarg) {
|
||||||
|
@ -824,7 +824,7 @@
|
|||||||
<Filter>Source Files\CUDA\Algo256</Filter>
|
<Filter>Source Files\CUDA\Algo256</Filter>
|
||||||
</CudaCompile>
|
</CudaCompile>
|
||||||
<CudaCompile Include="Algo256\keccak256.cu">
|
<CudaCompile Include="Algo256\keccak256.cu">
|
||||||
<Filter>Source Files\CUDA</Filter>
|
<Filter>Source Files\CUDA\Algo256</Filter>
|
||||||
</CudaCompile>
|
</CudaCompile>
|
||||||
<CudaCompile Include="Algo256\cuda_blake256.cu">
|
<CudaCompile Include="Algo256\cuda_blake256.cu">
|
||||||
<Filter>Source Files\CUDA\Algo256</Filter>
|
<Filter>Source Files\CUDA\Algo256</Filter>
|
||||||
|
@ -60,8 +60,8 @@ IDI_ICON1 ICON "ccminer.ico"
|
|||||||
//
|
//
|
||||||
|
|
||||||
VS_VERSION_INFO VERSIONINFO
|
VS_VERSION_INFO VERSIONINFO
|
||||||
FILEVERSION 2,2,2,0
|
FILEVERSION 2,2,3,0
|
||||||
PRODUCTVERSION 2,2,2,0
|
PRODUCTVERSION 2,2,3,0
|
||||||
FILEFLAGSMASK 0x3fL
|
FILEFLAGSMASK 0x3fL
|
||||||
#ifdef _DEBUG
|
#ifdef _DEBUG
|
||||||
FILEFLAGS 0x21L
|
FILEFLAGS 0x21L
|
||||||
@ -76,10 +76,10 @@ BEGIN
|
|||||||
BEGIN
|
BEGIN
|
||||||
BLOCK "040904e4"
|
BLOCK "040904e4"
|
||||||
BEGIN
|
BEGIN
|
||||||
VALUE "FileVersion", "2.2.2"
|
VALUE "FileVersion", "2.2.3"
|
||||||
VALUE "LegalCopyright", "Copyright (C) 2017"
|
VALUE "LegalCopyright", "Copyright (C) 2017"
|
||||||
VALUE "ProductName", "ccminer"
|
VALUE "ProductName", "ccminer"
|
||||||
VALUE "ProductVersion", "2.2.2"
|
VALUE "ProductVersion", "2.2.3"
|
||||||
END
|
END
|
||||||
END
|
END
|
||||||
BLOCK "VarFileInfo"
|
BLOCK "VarFileInfo"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user