v3.8.8

AUTHORS

@@ -29,3 +29,5 @@ Wolf0
 Optiminer
 
 Jay D Dee
+
+xcouiz@gmail.com

README.md

@@ -59,7 +59,8 @@ Supported Algorithms
                           bmw           BMW 256
                           c11           Chaincoin
                           cryptolight   Cryptonight-light
-                          cryptonight  cryptonote, Monero (XMR)
+                          cryptonight  
+                          cryptonightv7 Monero (XMR)
                           decred
                           deep          Deepcoin (DCN)
                           dmd-gr        Diamond-Groestl

README.txt

@@ -28,6 +28,7 @@ Exe name                Compile flags            Arch name
 
 cpuminer-sse2.exe      "-msse2"                  Core2, Nehalem   
 cpuminer-aes-sse42.exe "-march=westmere"         Westmere, Sandy-Ivybridge
+cpuminer-avx.exe       "-march=corei7-avx"       Sandy-Ivybridge
 cpuminer-avx2.exe      "-march=core-avx2"        Haswell, Sky-Kaby-Coffeelake
 cpuminer-avx2-sha.exe  "-march=core-avx2 -msha"  Ryzen
 

RELEASE_NOTES

@@ -160,6 +160,10 @@ Support for even older x86_64 without AES_NI or SSE2 is not availble.
 Change Log
 ----------
 
+v3.8.8
+
+Added cryptonightv7 for Monero.
+
 v3.8.7.2
 
 Fixed argon2d-dyn regression in v3.8.7.1.

algo-gate-api.c

@@ -160,7 +160,7 @@ bool register_algo_gate( int algo, algo_gate_t *gate )
      case ALGO_ALLIUM:       register_allium_algo       ( gate ); break;
      case ALGO_ANIME:        register_anime_algo        ( gate ); break;
      case ALGO_ARGON2:       register_argon2_algo       ( gate ); break;
-     case ALGO_ARGON2D250:   register_argon2d_crds_algo( gate ); break;
+     case ALGO_ARGON2D250:   register_argon2d_crds_algo ( gate ); break;
      case ALGO_ARGON2D500:   register_argon2d_dyn_algo  ( gate ); break;
      case ALGO_ARGON2D4096:  register_argon2d4096_algo  ( gate ); break;
      case ALGO_AXIOM:        register_axiom_algo        ( gate ); break;
@@ -172,6 +172,7 @@ bool register_algo_gate( int algo, algo_gate_t *gate )
      case ALGO_C11:          register_c11_algo          ( gate ); break;
      case ALGO_CRYPTOLIGHT:  register_cryptolight_algo  ( gate ); break;
      case ALGO_CRYPTONIGHT:  register_cryptonight_algo  ( gate ); break;
+     case ALGO_CRYPTONIGHTV7:register_cryptonightv7_algo( gate ); break;
      case ALGO_DECRED:       register_decred_algo       ( gate ); break;
      case ALGO_DEEP:         register_deep_algo         ( gate ); break;
      case ALGO_DMD_GR:       register_dmd_gr_algo       ( gate ); break;
@@ -210,7 +211,7 @@ bool register_algo_gate( int algo, algo_gate_t *gate )
      case ALGO_SKEIN2:       register_skein2_algo       ( gate ); break;
      case ALGO_SKUNK:        register_skunk_algo        ( gate ); break;
      case ALGO_TIMETRAVEL:   register_timetravel_algo   ( gate ); break;
-     case ALGO_TIMETRAVEL10: register_timetravel10_algo( gate ); break;
+     case ALGO_TIMETRAVEL10: register_timetravel10_algo ( gate ); break;
      case ALGO_TRIBUS:       register_tribus_algo       ( gate ); break;
      case ALGO_VANILLA:      register_vanilla_algo      ( gate ); break;
      case ALGO_VELTOR:       register_veltor_algo       ( gate ); break;

algo/cryptonight/cryptolight.c

@@ -325,7 +325,7 @@ int scanhash_cryptolight(int thr_id, struct work *work,
 
 	struct cryptonight_ctx *ctx = (struct cryptonight_ctx*)malloc(sizeof(struct cryptonight_ctx));
 
-#ifndef NO_AES_NI
+#if defined(__AES__)
 		do {
 			*nonceptr = ++n;
 			cryptolight_hash_ctx_aes_ni(hash, pdata, 76, ctx);

algo/cryptonight/cryptonight-aesni.c

@@ -1,14 +1,11 @@
+#if defined(__AES__)
+
 #include <x86intrin.h>
 #include <memory.h>
 #include "cryptonight.h"
 #include "miner.h"
 #include "crypto/c_keccak.h"
 #include <immintrin.h>
-//#include "avxdefs.h"
-
-void aesni_parallel_noxor(uint8_t *long_state, uint8_t *text, uint8_t *ExpandedKey);
-void aesni_parallel_xor(uint8_t *text, uint8_t *ExpandedKey, uint8_t *long_state);
-void that_fucking_loop(uint8_t a[16], uint8_t b[16], uint8_t *long_state);
 
 static inline void ExpandAESKey256_sub1(__m128i *tmp1, __m128i *tmp2)
 {
@@ -25,7 +22,6 @@ static inline void ExpandAESKey256_sub1(__m128i *tmp1, __m128i *tmp2)
 
 static inline void ExpandAESKey256_sub2(__m128i *tmp1, __m128i *tmp3)
 {
-#ifndef NO_AES_NI
 	__m128i tmp2, tmp4;
 	
 	tmp4 = _mm_aeskeygenassist_si128(*tmp1, 0x00);
@@ -37,14 +33,12 @@ static inline void ExpandAESKey256_sub2(__m128i *tmp1, __m128i *tmp3)
 	tmp4 = _mm_slli_si128(tmp4, 0x04);
 	*tmp3 = _mm_xor_si128(*tmp3, tmp4);
 	*tmp3 = _mm_xor_si128(*tmp3, tmp2);
-#endif
 }
 
 // Special thanks to Intel for helping me
 // with ExpandAESKey256() and its subroutines
 static inline void ExpandAESKey256(char *keybuf)
 {
-#ifndef NO_AES_NI
 	__m128i tmp1, tmp2, tmp3, *keys;
 	
 	keys = (__m128i *)keybuf;
@@ -91,7 +85,6 @@ static inline void ExpandAESKey256(char *keybuf)
 	tmp2 = _mm_aeskeygenassist_si128(tmp3, 0x40);
 	ExpandAESKey256_sub1(&tmp1, &tmp2);
 	keys[14] = tmp1;
-#endif
 }
 
 // align to 64 byte cache line
@@ -109,13 +102,19 @@ static __thread cryptonight_ctx ctx;
 
 void cryptonight_hash_aes( void *restrict output, const void *input, int len )
 {
-#ifndef NO_AES_NI
-
     uint8_t ExpandedKey[256] __attribute__((aligned(64)));
     __m128i *longoutput, *expkey, *xmminput;
     size_t i, j;
     
     keccak( (const uint8_t*)input, 76, (char*)&ctx.state.hs.b, 200 );
+
+    if ( cryptonightV7 && len < 43 )
+      return;
+
+    const uint64_t tweak = cryptonightV7 
+                         ? *((const uint64_t*) (((const uint8_t*)input) + 35))
+                           ^ ctx.state.hs.w[24] : 0; 
+
     memcpy( ExpandedKey, ctx.state.hs.b, AES_KEY_SIZE );
     ExpandAESKey256( ExpandedKey );
     memcpy( ctx.text, ctx.state.init, INIT_SIZE_BYTE );
@@ -215,6 +214,14 @@ void cryptonight_hash_aes( void *restrict output, const void *input, int len )
         b_x = _mm_xor_si128( b_x, c_x );
         nextblock = (uint64_t *)&ctx.long_state[c[0] & 0x1FFFF0];
         _mm_store_si128( lsa, b_x );
+
+        if ( cryptonightV7 )
+        {
+           const uint8_t tmp = ( (const uint8_t*)(lsa) )[11];
+           const uint8_t index = ( ( (tmp >> 3) & 6 ) | (tmp & 1) ) << 1;
+           ((uint8_t*)(lsa))[11] = tmp ^ ( ( 0x75310 >> index) & 0x30 );
+        } 
+
 	b[0] = nextblock[0];
 	b[1] = nextblock[1];
 
@@ -227,10 +234,14 @@ void cryptonight_hash_aes( void *restrict output, const void *input, int len )
 		 : "cc" );
 
         b_x = c_x;
-        nextblock[0] = a[0] + hi;
-        nextblock[1] = a[1] + lo;
-        a[0] = b[0] ^ nextblock[0];
-        a[1] = b[1] ^ nextblock[1];
+
+        a[0] += hi;
+        a[1] += lo;
+        nextblock[0] = a[0];
+        nextblock[1] = cryptonightV7 ? a[1] ^ tweak : a[1];
+        a[0] ^= b[0];
+        a[1] ^= b[1];
+
         lsa = (__m128i*)&ctx.long_state[ a[0] & 0x1FFFF0 ];
         a_x = _mm_load_si128( (__m128i*)a );
         c_x = _mm_load_si128( lsa );
@@ -241,6 +252,14 @@ void cryptonight_hash_aes( void *restrict output, const void *input, int len )
     b_x = _mm_xor_si128( b_x, c_x );
     nextblock = (uint64_t *)&ctx.long_state[c[0] & 0x1FFFF0];
     _mm_store_si128( lsa, b_x );
+
+    if ( cryptonightV7 )
+    {
+       const uint8_t tmp = ( (const uint8_t*)(lsa) )[11];
+       const uint8_t index = ( ( (tmp >> 3) & 6 ) | (tmp & 1) ) << 1;
+       ((uint8_t*)(lsa))[11] = tmp ^ ( ( 0x75310 >> index) & 0x30 );
+    }
+
     b[0] = nextblock[0];
     b[1] = nextblock[1];
 
@@ -251,8 +270,12 @@ void cryptonight_hash_aes( void *restrict output, const void *input, int len )
                "rm" ( b[0] )
              : "cc" );
 
-    nextblock[0] = a[0] + hi;
-    nextblock[1] = a[1] + lo;
+    a[0] += hi;
+    a[1] += lo;
+    nextblock[0] = a[0];
+    nextblock[1] = cryptonightV7 ? a[1] ^ tweak : a[1];
+    a[0] ^= b[0];
+    a[1] ^= b[1];
 
     memcpy( ExpandedKey, &ctx.state.hs.b[32], AES_KEY_SIZE );
     ExpandAESKey256( ExpandedKey );
@@ -330,5 +353,5 @@ void cryptonight_hash_aes( void *restrict output, const void *input, int len )
     keccakf( (uint64_t*)&ctx.state.hs.w, 24 );
     extra_hashes[ctx.state.hs.b[0] & 3](&ctx.state, 200, output);
 
-#endif
 }
+#endif

algo/cryptonight/cryptonight-common.c

@@ -7,11 +7,11 @@
 #include "cpuminer-config.h"
 #include "algo-gate-api.h"
 
-#ifndef NO_AES_NI
+#if defined(__AES__)
   #include "algo/groestl/aes_ni/hash-groestl256.h"
-#endif
-
+#else
 #include "crypto/c_groestl.h"
+#endif
 #include "crypto/c_blake256.h"
 #include "crypto/c_jh.h"
 #include "crypto/c_skein.h"
@@ -30,12 +30,12 @@ void do_blake_hash(const void* input, size_t len, char* output) {
 }
 
 void do_groestl_hash(const void* input, size_t len, char* output) {
-#ifdef NO_AES_NI
-    groestl(input, len * 8, (uint8_t*)output);
-#else
+#if defined(__AES__)
     hashState_groestl256 ctx;
     init_groestl256( &ctx, 32 );
     update_and_final_groestl256( &ctx, output, input, len * 8 );
+#else
+    groestl(input, len * 8, (uint8_t*)output);
 #endif
 }
 
@@ -52,23 +52,24 @@ void (* const extra_hashes[4])( const void *, size_t, char *) =
 
 void cryptonight_hash( void *restrict output, const void *input, int len )
 {
-
-#ifdef NO_AES_NI
-  cryptonight_hash_ctx ( output, input, len );
-#else 
+#if defined(__AES__)
   cryptonight_hash_aes( output, input, len );
+#else
+  cryptonight_hash_ctx ( output, input, len );
 #endif
 }
 
 void cryptonight_hash_suw( void *restrict output, const void *input )
 {
-#ifdef NO_AES_NI
-  cryptonight_hash_ctx ( output, input, 76 );
-#else
+#if defined(__AES__)
   cryptonight_hash_aes( output, input, 76 );
+#else
+  cryptonight_hash_ctx ( output, input, 76 );
 #endif
 }
 
+bool cryptonightV7 = false;
+
 int scanhash_cryptonight( int thr_id, struct work *work, uint32_t max_nonce,
                    uint64_t *hashes_done )
  {
@@ -80,6 +81,11 @@ int scanhash_cryptonight( int thr_id, struct work *work, uint32_t max_nonce,
     const uint32_t first_nonce = n + 1;
     const uint32_t Htarg = ptarget[7];
     uint32_t hash[32 / 4] __attribute__((aligned(32)));
+
+    if (  (  cryptonightV7 && ( *(uint8_t*)pdata <  7 ) )
+       || ( !cryptonightV7 && ( *(uint8_t*)pdata == 7 ) ) )
+          applog(LOG_WARNING,"Cryptonight variant mismatch, shares may be rejected.");
+
     do
     {
        *nonceptr = ++n;
@@ -97,6 +103,19 @@ int scanhash_cryptonight( int thr_id, struct work *work, uint32_t max_nonce,
 
 bool register_cryptonight_algo( algo_gate_t* gate )
 {
+  cryptonightV7 = false;
+  register_json_rpc2( gate );
+  gate->optimizations = SSE2_OPT | AES_OPT;
+  gate->scanhash         = (void*)&scanhash_cryptonight;
+  gate->hash             = (void*)&cryptonight_hash;
+  gate->hash_suw         = (void*)&cryptonight_hash_suw;  
+  gate->get_max64        = (void*)&get_max64_0x40LL;
+  return true;
+};
+
+bool register_cryptonightv7_algo( algo_gate_t* gate )
+{
+  cryptonightV7 = true;
   register_json_rpc2( gate );
   gate->optimizations = SSE2_OPT | AES_OPT;
   gate->scanhash      = (void*)&scanhash_cryptonight;

algo/cryptonight/cryptonight.c

@@ -20,8 +20,8 @@
 #include "crypto/c_jh.h"
 #include "crypto/c_skein.h"
 #include "crypto/int-util.h"
-#include "crypto/hash-ops.h"
-//#include "cryptonight.h"
+//#include "crypto/hash-ops.h"
+#include "cryptonight.h"
 
 #if USE_INT128
 
@@ -51,6 +51,7 @@ typedef __uint128_t uint128_t;
 #define INIT_SIZE_BLK   8
 #define INIT_SIZE_BYTE (INIT_SIZE_BLK * AES_BLOCK_SIZE)
 
+/*
 #pragma pack(push, 1)
 union cn_slow_hash_state {
 	union hash_state hs;
@@ -78,6 +79,7 @@ static void do_skein_hash(const void* input, size_t len, char* output) {
 	int r = skein_hash(8 * HASH_SIZE, input, 8 * len, (uint8_t*)output);
 	assert(likely(SKEIN_SUCCESS == r));
 }
+*/
 
 extern int aesb_single_round(const uint8_t *in, uint8_t*out, const uint8_t *expandedKey);
 extern int aesb_pseudo_round_mut(uint8_t *val, uint8_t *expandedKey);
@@ -120,9 +122,11 @@ static uint64_t mul128(uint64_t multiplier, uint64_t multiplicand, uint64_t* pro
 extern uint64_t mul128(uint64_t multiplier, uint64_t multiplicand, uint64_t* product_hi);
 #endif
 
+/*
 static void (* const extra_hashes[4])(const void *, size_t, char *) = {
 		do_blake_hash, do_groestl_hash, do_jh_hash, do_skein_hash
 };
+*/
 
 static inline size_t e2i(const uint8_t* a) {
 #if !LITE
@@ -132,14 +136,16 @@ static inline size_t e2i(const uint8_t* a) {
 #endif
 }
 
-static inline void mul_sum_xor_dst(const uint8_t* a, uint8_t* c, uint8_t* dst) {
+static inline void mul_sum_xor_dst( const uint8_t* a, uint8_t* c, uint8_t* dst, 
+         const uint64_t tweak )
+{
 	uint64_t hi, lo = mul128(((uint64_t*) a)[0], ((uint64_t*) dst)[0], &hi) + ((uint64_t*) c)[1];
 	hi += ((uint64_t*) c)[0];
 
 	((uint64_t*) c)[0] = ((uint64_t*) dst)[0] ^ hi;
 	((uint64_t*) c)[1] = ((uint64_t*) dst)[1] ^ lo;
 	((uint64_t*) dst)[0] = hi;
-	((uint64_t*) dst)[1] = lo;
+	((uint64_t*) dst)[1] = cryptonightV7 ? lo ^ tweak : lo;
 }
 
 static inline void xor_blocks(uint8_t* a, const uint8_t* b) {
@@ -174,7 +180,15 @@ static __thread cryptonight_ctx ctx;
 
 void cryptonight_hash_ctx(void* output, const void* input, int len)
 {
-	hash_process(&ctx.state.hs, (const uint8_t*) input, len);
+//    hash_process(&ctx.state.hs, (const uint8_t*) input, len);
+    keccak( (const uint8_t*)input, 76, (char*)&ctx.state.hs.b, 200 );
+
+    if ( cryptonightV7 && len < 43 )
+      return;
+    const uint64_t tweak = cryptonightV7
+                         ? *((const uint64_t*) (((const uint8_t*)input) + 35))
+                           ^ ctx.state.hs.w[24] : 0;
+
     ctx.aes_ctx = (oaes_ctx*) oaes_alloc();
 
     __builtin_prefetch( ctx.text,             0, 3 );
@@ -211,7 +225,8 @@ void cryptonight_hash_ctx(void* output, const void* input, int len)
 	xor_blocks_dst(&ctx.state.k[0], &ctx.state.k[32], ctx.a);
 	xor_blocks_dst(&ctx.state.k[16], &ctx.state.k[48], ctx.b);
 
-	for (i = 0; likely(i < ITER / 4); ++i) {
+	for (i = 0; likely(i < ITER / 4); ++i)
+        {
            /* Dependency chain: address -> read value ------+
             * written value <-+ hard function (AES or MUL) <+
             * next address  <-+
@@ -220,14 +235,34 @@ void cryptonight_hash_ctx(void* output, const void* input, int len)
            j = e2i(ctx.a);
            aesb_single_round(&ctx.long_state[j], ctx.c, ctx.a);
            xor_blocks_dst(ctx.c, ctx.b, &ctx.long_state[j]);
+
+           if ( cryptonightV7 )
+           {
+              uint8_t *lsa = (uint8_t*)&ctx.long_state[((uint64_t *)(ctx.a))[0] & 0x1FFFF0];
+              const uint8_t tmp = lsa[11];
+              const uint8_t index = ( ( (tmp >> 3) & 6 ) | (tmp & 1) ) << 1;
+              lsa[11] = tmp ^ ( ( 0x75310 >> index) & 0x30 );
+           }
+
            /* Iteration 2 */
-		mul_sum_xor_dst(ctx.c, ctx.a, &ctx.long_state[e2i(ctx.c)]);
+           mul_sum_xor_dst(ctx.c, ctx.a, &ctx.long_state[e2i(ctx.c)], tweak );
+
            /* Iteration 3 */
            j = e2i(ctx.a);
            aesb_single_round(&ctx.long_state[j], ctx.b, ctx.a);
            xor_blocks_dst(ctx.b, ctx.c, &ctx.long_state[j]);
+
+           if ( cryptonightV7 )
+           {
+              uint8_t *lsa = (uint8_t*)&ctx.long_state[((uint64_t *)(ctx.a))[0] & 0x1FFFF0];
+              const uint8_t tmp = lsa[11];
+              const uint8_t index = ( ( (tmp >> 3) & 6 ) | (tmp & 1) ) << 1;
+              lsa[11] = tmp ^ ( ( 0x75310 >> index) & 0x30 );
+           }
+
            /* Iteration 4 */
-		mul_sum_xor_dst(ctx.b, ctx.a, &ctx.long_state[e2i(ctx.b)]);
+           mul_sum_xor_dst(ctx.b, ctx.a, &ctx.long_state[e2i(ctx.b)], tweak );
+
 	}
 
     __builtin_prefetch( ctx.text,             0, 3 );
@@ -266,7 +301,8 @@ void cryptonight_hash_ctx(void* output, const void* input, int len)
 		aesb_pseudo_round_mut(&ctx.text[7 * AES_BLOCK_SIZE], ctx.aes_ctx->key->exp_data);
 	}
 	memcpy(ctx.state.init, ctx.text, INIT_SIZE_BYTE);
-	hash_permutation(&ctx.state.hs);
+//	hash_permutation(&ctx.state.hs);
+        keccakf( (uint64_t*)&ctx.state.hs.w, 24 );
 	/*memcpy(hash, &state, 32);*/
 	extra_hashes[ctx.state.hs.b[0] & 3](&ctx.state, 200, output);
 	oaes_free((OAES_CTX **) &ctx.aes_ctx);

algo/cryptonight/cryptonight.h

@@ -45,5 +45,7 @@ int scanhash_cryptonight( int thr_id, struct work *work, uint32_t max_nonce,
 
 void cryptonight_hash_aes( void *restrict output, const void *input, int len );
 
+extern bool cryptonightV7;
+
 #endif
 

configure

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

configure.ac

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

cpu-miner.c

@@ -3002,11 +3002,13 @@ bool check_cpu_capability ()
      bool cpu_has_sse2   = has_sse2();
      bool cpu_has_aes    = has_aes_ni();
      bool cpu_has_sse42  = has_sse42();
+     bool cpu_has_avx    = has_avx1();
      bool cpu_has_avx2   = has_avx2();
      bool cpu_has_sha    = has_sha();
      bool cpu_has_avx512 = has_avx512f();
      bool sw_has_aes    = false;
      bool sw_has_sse42  = false;
+     bool sw_has_avx    = false;
      bool sw_has_avx2   = false;
      bool sw_has_avx512 = false;
      bool sw_has_sha    = false;
@@ -3031,6 +3033,9 @@ bool check_cpu_capability ()
      #ifdef __SSE4_2__
          sw_has_sse42 = true;
      #endif
+     #ifdef __AVX__
+         sw_has_avx = true;
+     #endif
      #ifdef __AVX2__
          sw_has_avx2 = true;
      #endif
@@ -3062,6 +3067,7 @@ bool check_cpu_capability ()
      if ( cpu_has_sse2   )    printf( " SSE2"   );
      if ( cpu_has_aes    )    printf( " AES"    );
      if ( cpu_has_sse42  )    printf( " SSE4.2" );
+     if ( cpu_has_avx    )    printf( " AVX"    );
      if ( cpu_has_avx2   )    printf( " AVX2"   );
      if ( cpu_has_avx512 )    printf( " AVX512" );
      if ( cpu_has_sha    )    printf( " SHA"    );
@@ -3069,6 +3075,7 @@ bool check_cpu_capability ()
      printf(".\nSW features: SSE2");
      if ( sw_has_aes    )     printf( " AES"    );
      if ( sw_has_sse42  )     printf( " SSE4.2" );
+     if ( sw_has_avx    )     printf( " AVX"    );
      if ( sw_has_avx2   )     printf( " AVX2"   );
      if ( sw_has_avx512 )     printf( " AVX512" );
      if ( sw_has_sha    )     printf( " SHA"    );

miner.h

@@ -499,6 +499,7 @@ enum algos {
         ALGO_C11,         
         ALGO_CRYPTOLIGHT, 
         ALGO_CRYPTONIGHT,
+        ALGO_CRYPTONIGHTV7, 
         ALGO_DECRED,
         ALGO_DEEP,
         ALGO_DMD_GR,
@@ -580,6 +581,7 @@ static const char* const algo_names[] = {
         "c11",
         "cryptolight",
         "cryptonight",
+        "cryptonightv7",
         "decred",
         "deep",
         "dmd-gr",
@@ -718,7 +720,8 @@ Options:\n\
                           bmw           BMW 256\n\
                           c11           Chaincoin\n\
                           cryptolight   Cryptonight-light\n\
-                          cryptonight  cryptonote, Monero (XMR)\n\
+                          cryptonight   Cryptonote legacy\n\
+                          cryptonightv7 variant 7, Monero (XMR)\n\
                           decred        Blake256r14dcr\n\
                           deep          Deepcoin (DCN)\n\
                           dmd-gr        Diamond\n\

winbuild-cross.sh

@@ -46,12 +46,12 @@ mv cpuminer.exe release/cpuminer-avx2.exe
 #mv cpuminer.exe release/cpuminer-aes-sha.exe
 
 
-#make clean || echo clean
-#rm -f config.status
-#CFLAGS="-O3 -march=corei7-avx -Wall" ./configure $F 
-#make 
-#strip -s cpuminer.exe
-#mv cpuminer.exe release/cpuminer-aes-avx.exe
+make clean || echo clean
+rm -f config.status
+CFLAGS="-O3 -march=corei7-avx -Wall" ./configure $F 
+make 
+strip -s cpuminer.exe
+mv cpuminer.exe release/cpuminer-avx.exe
 
 # -march=westmere is supported in gcc5
 make clean || echo clean