v6.12.1

Merge branch 'dev'
Update CHANGELOG.md
2021-04-23 19:43:12 +07:00 · 2021-04-23 19:42:29 +07:00 · 2021-04-23 18:54:42 +07:00 · 2021-04-21 19:52:52 +07:00 · 2021-04-21 19:51:03 +07:00 · 2021-04-21 19:49:54 +07:00
5 changed files with 24 additions and 16 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,3 +1,6 @@
+# v6.12.1
+- [#2296](https://github.com/xmrig/xmrig/pull/2296) Fixed Zen3 assembly code for `cn/upx2` algorithm.
+
 # v6.12.0
 - [#2276](https://github.com/xmrig/xmrig/pull/2276) Added support for Uplexa (`cn/upx2` algorithm).
 - [#2261](https://github.com/xmrig/xmrig/pull/2261) Show total hashrate if compiled without OpenCL.
--- a/src/crypto/cn/CryptoNight_x86.h
+++ b/src/crypto/cn/CryptoNight_x86.h
@ -377,12 +377,15 @@ static inline void cn_explode_scratchpad(const __m128i *input, __m128i *output)
        _mm_store_si128(output + 1, xin1);
        _mm_store_si128(output + 2, xin2);
        _mm_store_si128(output + 3, xin3);
-        output += (64 << interleave) / sizeof(__m128i);
-        _mm_store_si128(output + 0, xin4);
-        _mm_store_si128(output + 1, xin5);
-        _mm_store_si128(output + 2, xin6);
-        _mm_store_si128(output + 3, xin7);
-        output += (64 << interleave) / sizeof(__m128i);
+
+        constexpr int output_increment = (64 << interleave) / sizeof(__m128i);
+
+        _mm_store_si128(output + output_increment + 0, xin4);
+        _mm_store_si128(output + output_increment + 1, xin5);
+        _mm_store_si128(output + output_increment + 2, xin6);
+        _mm_store_si128(output + output_increment + 3, xin7);
+
+        output += output_increment * 2;
    }
 }

@ -414,13 +417,15 @@ static inline void cn_implode_scratchpad(const __m128i *input, __m128i *output)
        xout1 = _mm_xor_si128(_mm_load_si128(input + 1), xout1);
        xout2 = _mm_xor_si128(_mm_load_si128(input + 2), xout2);
        xout3 = _mm_xor_si128(_mm_load_si128(input + 3), xout3);
-        input += (64 << interleave) / sizeof(__m128i);
-        xout4 = _mm_xor_si128(_mm_load_si128(input + 0), xout4);
-        xout5 = _mm_xor_si128(_mm_load_si128(input + 1), xout5);
-        xout6 = _mm_xor_si128(_mm_load_si128(input + 2), xout6);
-        xout7 = _mm_xor_si128(_mm_load_si128(input + 3), xout7);
-        input += (64 << interleave) / sizeof(__m128i);

+        constexpr int input_increment = (64 << interleave) / sizeof(__m128i);
+
+        xout4 = _mm_xor_si128(_mm_load_si128(input + input_increment + 0), xout4);
+        xout5 = _mm_xor_si128(_mm_load_si128(input + input_increment + 1), xout5);
+        xout6 = _mm_xor_si128(_mm_load_si128(input + input_increment + 2), xout6);
+        xout7 = _mm_xor_si128(_mm_load_si128(input + input_increment + 3), xout7);
+
+        input += input_increment * 2;
        i += 8;

        if ((interleave > 0) && (i < props.memory() / sizeof(__m128i))) {
--- a/src/crypto/cn/asm/cn2/cnv2_upx_double_mainloop_zen3.inc
+++ b/src/crypto/cn/asm/cn2/cnv2_upx_double_mainloop_zen3.inc
@ -34,7 +34,7 @@
 	movdqa	XMMWORD PTR [rsp+32], xmm0

 	stmxcsr DWORD PTR [rsp+24]
-	mov DWORD PTR [rsp+28], 24448
+	mov DWORD PTR [rsp+28], 16256
 	ldmxcsr DWORD PTR [rsp+28]

 	mov	rcx, QWORD PTR [rbx+56]
--- a/src/crypto/cn/asm/win64/cn2/cnv2_upx_double_mainloop_zen3.inc
+++ b/src/crypto/cn/asm/win64/cn2/cnv2_upx_double_mainloop_zen3.inc
@ -34,7 +34,7 @@
 	movdqa	XMMWORD PTR [rsp+32], xmm0

 	stmxcsr DWORD PTR [rsp+24]
-	mov DWORD PTR [rsp+28], 24448
+	mov DWORD PTR [rsp+28], 16256
 	ldmxcsr DWORD PTR [rsp+28]

 	mov	rcx, QWORD PTR [rbx+56]
--- a/src/version.h
+++ b/src/version.h
@ -28,7 +28,7 @@
 #define APP_ID        "xmrig"
 #define APP_NAME      "XMRig"
 #define APP_DESC      "XMRig miner"
-#define APP_VERSION   "6.12.0"
+#define APP_VERSION   "6.12.1"
 #define APP_DOMAIN    "xmrig.com"
 #define APP_SITE      "www.xmrig.com"
 #define APP_COPYRIGHT "Copyright (C) 2016-2021 xmrig.com"
@ -36,7 +36,7 @@

 #define APP_VER_MAJOR  6
 #define APP_VER_MINOR  12
-#define APP_VER_PATCH  0
+#define APP_VER_PATCH  1

 #ifdef _MSC_VER
 #   if (_MSC_VER >= 1920)
Author	SHA1	Message	Date
XMRig	d82e100e30	v6.12.1	2021-04-23 19:43:12 +07:00
XMRig	5f869a414c	Merge branch 'dev'	2021-04-23 19:42:29 +07:00
xmrig	7fd6be7d83	Update CHANGELOG.md	2021-04-23 18:54:42 +07:00
xmrig	ae6c536e98	Merge pull request #2296 from SChernykh/dev Fixed Zen3 asm for cn/upx2	2021-04-21 19:52:52 +07:00
XMRig	c66c593123	v6.12.1-dev	2021-04-21 19:51:03 +07:00
XMRig	b3788b2ba3	Merge branch 'master' into dev	2021-04-21 19:49:54 +07:00
SChernykh	b7adb34c37	Fixed Zen3 asm for cn/upx2 - Invalid rounding mode was used which caused rejected shares sometimes - Also optimized CN implode/explode functions a bit.	2021-04-21 13:22:25 +02:00