v24.1

Makefile.am

@@ -16,6 +16,7 @@ bin_PROGRAMS	= cpuminer
 dist_man_MANS	= cpuminer.1
 
 cpuminer_SOURCES = \
+  dummy.cpp \
   cpu-miner.c \
   util.c \
   api.c \
@@ -113,7 +114,6 @@ cpuminer_SOURCES = \
   algo/lyra2/phi2-4way.c \
   algo/lyra2/phi2.c \
   algo/m7m/m7m.c \
-  algo/m7m/magimath.cpp \
   algo/nist5/nist5-gate.c \
   algo/nist5/nist5-4way.c \
   algo/nist5/nist5.c \
@@ -289,7 +289,7 @@ if HAVE_WINDOWS
 endif
 
 cpuminer_LDFLAGS	= @LDFLAGS@
-cpuminer_LDADD	= @LIBCURL@ @JANSSON_LIBS@ @PTHREAD_LIBS@ @WS2_LIBS@  -lgmp
+cpuminer_LDADD	= @LIBCURL@ @JANSSON_LIBS@ @PTHREAD_LIBS@ @WS2_LIBS@ -lgmp
 cpuminer_CPPFLAGS = @LIBCURL_CPPFLAGS@ $(ALL_INCLUDES)
 cpuminer_CFLAGS   = -Wno-pointer-sign -Wno-pointer-to-int-cast $(disable_flags)
 

RELEASE_NOTES

@@ -75,6 +75,15 @@ If not what makes it happen or not happen?
 Change Log
 ----------
 
+v24.1
+
+#414: fix bug in merkle error handling.
+#416: change $nproc to $(nproc) in build scripts.
+#420: change some inline function definitions to static inline. 
+#413: Fix formatting error for share result log when using no-color.
+Faster 2 way interleaving.
+Cleanup sha256 architecture targetting.
+
 v23.15
 
 Fixed x11gost (sib) algo for all architectures, broken in v3.23.4.

algo-gate-api.h

@@ -107,16 +107,16 @@ typedef  uint32_t set_t;
 //  AVX10_256 is compatible with AVX2 + VAES
 
 // return set containing all elements from sets a & b
-inline set_t set_union ( set_t a, set_t b ) { return a | b; }
+static inline set_t set_union ( set_t a, set_t b ) { return a | b; }
 
 // return set contained common elements from sets a & b
-inline set_t set_intsec ( set_t a, set_t b) { return a & b; }
+static inline set_t set_intsec ( set_t a, set_t b) { return a & b; }
 
 // all elements in set a are included in set b
-inline bool set_incl ( set_t a, set_t b ) { return (a & b) == a; }
+static inline bool set_incl ( set_t a, set_t b ) { return (a & b) == a; }
 
 // no elements in set a are included in set b
-inline bool set_excl ( set_t a, set_t b ) { return (a & b) == 0; }
+static inline bool set_excl ( set_t a, set_t b ) { return (a & b) == 0; }
 
 typedef struct
 {

algo/m7m/m7m.c

@@ -21,7 +21,7 @@
 #define EPS1 DBL_EPSILON
 #define EPS2 3.0e-11
 
-inline double exp_n( double xt )
+static inline double exp_n( double xt )
 {
     if ( xt < -700.0 )
         return 0;
@@ -33,7 +33,7 @@ inline double exp_n( double xt )
         return exp( xt );
 }
 
-inline double exp_n2( double x1, double x2 )
+static inline double exp_n2( double x1, double x2 )
 {
     double p1 = -700., p2 = -37., p3 = -0.8e-8, p4 = 0.8e-8,
            p5 = 37., p6 = 700.;

algo/sha/sha1-hash.c

@@ -205,7 +205,7 @@ void sha1_x86_sha_transform_be( uint32_t *state_out, const void *input,
 
 #endif
 
-#if defined(__aarch64__) && defined(__ARM_FEATURE_SHA2)
+#if defined(__ARM_NEON) && defined(__ARM_FEATURE_SHA2)
 
 #define sha1_neon_rounds( state_out, data, state_in ) \
 { \

algo/sha/sha256-hash.c

@@ -1,6 +1,6 @@
 #include "sha256-hash.h"
 
-#if ( defined(__x86_64__) && defined(__SHA__) ) || defined(__ARM_NEON) && defined(__ARM_FEATURE_SHA2)
+#if ( defined(__x86_64__) && defined(__SHA__) ) || ( defined(__ARM_NEON) && defined(__ARM_FEATURE_SHA2) )
 
 static const uint32_t SHA256_IV[8] =
 {
@@ -189,15 +189,15 @@ static const uint32_t SHA256_IV[8] =
     _mm_store_si128( (__m128i*) &state_out[4], STATE1 ); \
 }
 
-void sha256_opt_transform_le( uint32_t *state_out, const void *input,
+void sha256_x86_sha_transform_le( uint32_t *state_out, const void *input,
                               const uint32_t *state_in )
 {
 #define load_msg( m, i ) casti_v128( m, i )
    sha256_opt_rounds( state_out, input, state_in );
 #undef load_msg
 }
 
-void sha256_opt_transform_be( uint32_t *state_out, const void *input,
+void sha256_x86_sha_transform_be( uint32_t *state_out, const void *input,
                               const uint32_t *state_in )
 {
 #define load_msg( m, i ) v128_bswap32( casti_v128( m, i ) )
@@ -517,7 +517,7 @@ void sha256_opt_transform_be( uint32_t *state_out, const void *input,
     _mm_store_si128( (__m128i*) &out_Y[4], STATE1_Y ); \
 }
 
-void sha256_ni2x_transform_le( uint32_t *out_X, uint32_t*out_Y,
+void sha256_x86_x2sha_transform_le( uint32_t *out_X, uint32_t*out_Y,
                                  const void *msg_X, const void *msg_Y,
                                  const uint32_t *in_X, const uint32_t *in_Y )
 {
@@ -526,7 +526,7 @@ void sha256_ni2x_transform_le( uint32_t *out_X, uint32_t*out_Y,
 #undef load_msg
 }
 
-void sha256_ni2x_transform_be( uint32_t *out_X, uint32_t*out_Y,
+void sha256_x86_x2sha_transform_be( uint32_t *out_X, uint32_t*out_Y,
                               const void *msg_X, const void *msg_Y,
                               const uint32_t *in_X, const uint32_t *in_Y )
 {
@@ -541,7 +541,7 @@ void sha256_ni2x_transform_be( uint32_t *out_X, uint32_t*out_Y,
 // The goal is to avoid any redundant processing in final. Prehash is almost
 // 4 rounds total, only missing the final addition of the nonce.
 // Nonce must be set to zero for prehash.
-void sha256_ni_prehash_3rounds( uint32_t *ostate, const void *msg,
+void sha256_x86_sha_prehash_3rounds( uint32_t *ostate, const void *msg,
                                 uint32_t *sstate, const uint32_t *istate )
 {
    __m128i STATE0, STATE1, MSG, TMP;
@@ -569,7 +569,7 @@ void sha256_ni_prehash_3rounds( uint32_t *ostate, const void *msg,
    casti_m128i( ostate, 1 ) = STATE1;
 }
 
-void sha256_ni2x_final_rounds( uint32_t *out_X, uint32_t *out_Y,
+void sha256_x86_x2sha_final_rounds( uint32_t *out_X, uint32_t *out_Y,
                  const void *msg_X, const void *msg_Y,
                  const uint32_t *state_mid_X, const uint32_t *state_mid_Y,
                  const uint32_t *state_save_X, const uint32_t *state_save_Y )