popov/cpuminer-opt-gpu
1
0
Fork 0
mirror of https://github.com/JayDDee/cpuminer-opt.git synced 2025-09-17 23:44:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

v3.8.7.1

Browse Source
This commit is contained in:
Jay D Dee
2018-04-10 21:49:06 -04:00
parent 9ffce7bdb7
commit 218cef337a
7 changed files with 41 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
RELEASE_NOTES
View File

@@ -160,6 +160,11 @@ Support for even older x86_64 without AES_NI or SSE2 is not availble.
Change Log Change Log
---------- ----------
v3.8.7.1
Fixed argon2d-uis low difficulty rejects.
Fixed argon2d aliases.
v3.8.7 v3.8.7
Added argon2d4096 (alias argon2d-uis) for Unitus (UIS). Added argon2d4096 (alias argon2d-uis) for Unitus (UIS).

6
algo-gate-api.c
View File

@@ -289,9 +289,9 @@ void exec_hash_function( int algo, void *output, const void *pdata )
const char* const algo_alias_map[][2] = const char* const algo_alias_map[][2] =
{ {
// alias proper // alias proper
{ "argon2d-crds" "argon2d250" }, { "argon2d-crds", "argon2d250" },
{ "argon2d-dyn" "argon2d500" }, { "argon2d-dyn", "argon2d500" },
{ "argon2d-uis" "argon2d4096" }, { "argon2d-uis", "argon2d4096" },
{ "bitcore", "timetravel10" }, { "bitcore", "timetravel10" },
{ "bitzeny", "yescryptr8" }, { "bitzeny", "yescryptr8" },
{ "blake256r8", "blakecoin" }, { "blake256r8", "blakecoin" },

3
algo/argon2/argon2d/argon2d-gate.c
View File

@@ -71,6 +71,7 @@ bool register_argon2d_crds_algo( algo_gate_t* gate )
gate->hash = (void*)&argon2d_crds_hash; gate->hash = (void*)&argon2d_crds_hash;
gate->set_target = (void*)&scrypt_set_target; gate->set_target = (void*)&scrypt_set_target;
gate->optimizations = SSE2_OPT | AVX2_OPT | AVX512_OPT; gate->optimizations = SSE2_OPT | AVX2_OPT | AVX512_OPT;
ARGON2_VERSION_NUMBER = ARGON2_VERSION_10;
return true; return true;
} }
@@ -140,6 +141,7 @@ bool register_argon2d_dyn_algo( algo_gate_t* gate )
gate->hash = (void*)&argon2d_dyn_hash; gate->hash = (void*)&argon2d_dyn_hash;
gate->set_target = (void*)&scrypt_set_target; gate->set_target = (void*)&scrypt_set_target;
gate->optimizations = SSE2_OPT | AVX2_OPT | AVX512_OPT; gate->optimizations = SSE2_OPT | AVX2_OPT | AVX512_OPT;
ARGON2_VERSION_NUMBER = ARGON2_VERSION_10;
return true; return true;
} }
@@ -189,6 +191,7 @@ bool register_argon2d4096_algo( algo_gate_t* gate )
gate->set_target = (void*)&scrypt_set_target; gate->set_target = (void*)&scrypt_set_target;
gate->get_max64 = (void*)&get_max64_0x1ff; gate->get_max64 = (void*)&get_max64_0x1ff;
gate->optimizations = SSE2_OPT | AVX2_OPT | AVX512_OPT; gate->optimizations = SSE2_OPT | AVX2_OPT | AVX512_OPT;
ARGON2_VERSION_NUMBER = ARGON2_VERSION_13;
return true; return true;
} }

10
algo/argon2/argon2d/argon2d/argon2.h
View File

@@ -224,12 +224,22 @@ typedef enum Argon2_type {
Argon2_id = 2 Argon2_id = 2
} argon2_type; } argon2_type;
// Version implementation sucks, needs to be changed.
// It should be set in the ctx before calling the argon2_ctx.
// It should be a function arg of *hash_raw & *hash_encoded.
// Then remove initialization from gate register function.
/* Version of the algorithm */ /* Version of the algorithm */
/*
typedef enum Argon2_version { typedef enum Argon2_version {
ARGON2_VERSION_10 = 0x10, ARGON2_VERSION_10 = 0x10,
ARGON2_VERSION_13 = 0x13, ARGON2_VERSION_13 = 0x13,
ARGON2_VERSION_NUMBER = ARGON2_VERSION_10 ARGON2_VERSION_NUMBER = ARGON2_VERSION_10
} argon2_version; } argon2_version;
*/
#define ARGON2_VERSION_10 0x10
#define ARGON2_VERSION_13 0x13
uint32_t ARGON2_VERSION_NUMBER;
/* /*
* Function that gives the string representation of an argon2_type. * Function that gives the string representation of an argon2_type.

18
algo/argon2/argon2d/argon2d/opt.c
View File

@@ -345,15 +345,15 @@ void fill_segment(const argon2_instance_t *instance,
ref_block = ref_block =
instance->memory + instance->lane_length * ref_lane + ref_index; instance->memory + instance->lane_length * ref_lane + ref_index;
curr_block = instance->memory + curr_offset; curr_block = instance->memory + curr_offset;
// if (ARGON2_VERSION_10 == instance->version) { if (ARGON2_VERSION_10 == instance->version) {
// /* version 1.2.1 and earlier: overwrite, not XOR */ /* version 1.2.1 and earlier: overwrite, not XOR */
// fill_block(state, ref_block, curr_block, 0); fill_block(state, ref_block, curr_block, 0);
// } else { } else {
// if(0 == position.pass) { if(0 == position.pass) {
fill_block(state, ref_block, curr_block, 0); fill_block(state, ref_block, curr_block, 0);
// } else { } else {
// fill_block(state, ref_block, curr_block, 1); fill_block(state, ref_block, curr_block, 1);
// } }
// } }
} }
} }

20
configure vendored
View File

@@ -1,6 +1,6 @@
#! /bin/sh #! /bin/sh
# Guess values for system-dependent variables and create Makefiles. # Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for cpuminer-opt 3.8.7. # Generated by GNU Autoconf 2.69 for cpuminer-opt 3.8.7.1.
# #
# #
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -577,8 +577,8 @@ MAKEFLAGS=
# Identity of this package. # Identity of this package.
PACKAGE_NAME='cpuminer-opt' PACKAGE_NAME='cpuminer-opt'
PACKAGE_TARNAME='cpuminer-opt' PACKAGE_TARNAME='cpuminer-opt'
PACKAGE_VERSION='3.8.7' PACKAGE_VERSION='3.8.7.1'
PACKAGE_STRING='cpuminer-opt 3.8.7' PACKAGE_STRING='cpuminer-opt 3.8.7.1'
PACKAGE_BUGREPORT='' PACKAGE_BUGREPORT=''
PACKAGE_URL='' PACKAGE_URL=''
@@ -1321,7 +1321,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing. # Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh. # This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF cat <<_ACEOF
\`configure' configures cpuminer-opt 3.8.7 to adapt to many kinds of systems. \`configure' configures cpuminer-opt 3.8.7.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]... Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1392,7 +1392,7 @@ fi
if test -n "$ac_init_help"; then if test -n "$ac_init_help"; then
case $ac_init_help in case $ac_init_help in
short | recursive ) echo "Configuration of cpuminer-opt 3.8.7:";; short | recursive ) echo "Configuration of cpuminer-opt 3.8.7.1:";;
esac esac
cat <<\_ACEOF cat <<\_ACEOF
@@ -1497,7 +1497,7 @@ fi
test -n "$ac_init_help" && exit $ac_status test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then if $ac_init_version; then
cat <<\_ACEOF cat <<\_ACEOF
cpuminer-opt configure 3.8.7 cpuminer-opt configure 3.8.7.1
generated by GNU Autoconf 2.69 generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc. Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2000,7 +2000,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake. running configure, to aid debugging if configure makes a mistake.
It was created by cpuminer-opt $as_me 3.8.7, which was It was created by cpuminer-opt $as_me 3.8.7.1, which was
generated by GNU Autoconf 2.69. Invocation command line was generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@ $ $0 $@
@@ -2981,7 +2981,7 @@ fi
# Define the identity of the package. # Define the identity of the package.
PACKAGE='cpuminer-opt' PACKAGE='cpuminer-opt'
VERSION='3.8.7' VERSION='3.8.7.1'
cat >>confdefs.h <<_ACEOF cat >>confdefs.h <<_ACEOF
@@ -6677,7 +6677,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their # report actual input values of CONFIG_FILES etc. instead of their
# values after options handling. # values after options handling.
ac_log=" ac_log="
This file was extended by cpuminer-opt $as_me 3.8.7, which was This file was extended by cpuminer-opt $as_me 3.8.7.1, which was
generated by GNU Autoconf 2.69. Invocation command line was generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES CONFIG_FILES = $CONFIG_FILES
@@ -6743,7 +6743,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\ ac_cs_version="\\
cpuminer-opt config.status 3.8.7 cpuminer-opt config.status 3.8.7.1
configured by $0, generated by GNU Autoconf 2.69, configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\" with options \\"\$ac_cs_config\\"

2
configure.ac
View File

@@ -1,4 +1,4 @@
AC_INIT([cpuminer-opt], [3.8.7]) AC_INIT([cpuminer-opt], [3.8.7.1])
AC_PREREQ([2.59c]) AC_PREREQ([2.59c])
AC_CANONICAL_SYSTEM AC_CANONICAL_SYSTEM