avx uop fusing

Author: floodyberry

src/scryptjane/scrypt-jane-mix_chacha-avx.h

@@ -91,7 +91,6 @@ asm_naked_fn(scrypt_ChunkMix_avx)
 			a3(vpsrld xmm6,xmm1,25)
 			a3(vpslld xmm1,xmm1,7)
 			a3(vpxor xmm1,xmm1,xmm6)
-			a2(sub eax,2)
 			a3(vpaddd xmm0,xmm0,xmm1)
 			a3(vpxor  xmm3,xmm3,xmm0)
 			a3(vpshufb xmm3,xmm3,xmm4)
@@ -111,6 +110,7 @@ asm_naked_fn(scrypt_ChunkMix_avx)
 			a3(vpsrld xmm6,xmm1,25)
 			a3(vpslld xmm1,xmm1,7)
 			a3(vpxor  xmm1,xmm1,xmm6)
+			a2(sub eax,2)
 			aj(ja scrypt_chacha_avx_loop)
 		a3(vpaddd xmm0,xmm0,[esp+0])
 		a3(vpaddd xmm1,xmm1,[esp+16])
@@ -213,7 +213,6 @@ asm_naked_fn(scrypt_ChunkMix_avx)
 			a3(vpsrld xmm12,xmm1,25)
 			a3(vpslld xmm1,xmm1,7)
 			a3(vpxor xmm1,xmm1,xmm12)
-			a2(sub rax,2)
 			a3(vpaddd xmm0,xmm0,xmm1)
 			a3(vpxor  xmm3,xmm3,xmm0)
 			a3(vpshufb xmm3,xmm3,xmm4)
@@ -233,6 +232,7 @@ asm_naked_fn(scrypt_ChunkMix_avx)
 			a3(vpsrld xmm12,xmm1,25)
 			a3(vpslld xmm1,xmm1,7)
 			a3(vpxor  xmm1,xmm1,xmm12)
+			a2(sub rax,2)
 			aj(ja scrypt_chacha_avx_loop)
 		a3(vpaddd xmm0,xmm0,xmm8)
 		a3(vpaddd xmm1,xmm1,xmm9)

src/scryptjane/scrypt-jane-mix_salsa-avx.h

@@ -72,7 +72,6 @@ asm_naked_fn(scrypt_ChunkMix_avx)
 			a3(vpxor xmm0, xmm0, xmm5)
 			a3(pshufd xmm2, xmm2, 0x4e)
 			a3(vpxor xmm0, xmm0, xmm4)
-			a2(sub eax, 2)
 			a3(vpaddd xmm4, xmm3, xmm0)
 			a3(pshufd xmm1, xmm1, 0x39)
 			a3(vpsrld xmm5, xmm4, 25)
@@ -97,6 +96,7 @@ asm_naked_fn(scrypt_ChunkMix_avx)
 			a3(pshufd xmm2, xmm2, 0x4e)
 			a3(vpxor xmm0, xmm0, xmm4)
 			a3(pshufd xmm3, xmm3, 0x39)
+			a2(sub eax, 2)
 			aj(ja scrypt_salsa_avx_loop)
 		a3(vpaddd xmm0,xmm0,[esp+0])
 		a3(vpaddd xmm1,xmm1,[esp+16])
@@ -192,7 +192,6 @@ asm_naked_fn(scrypt_ChunkMix_avx)
 			a3(vpxor xmm0, xmm0, xmm5)
 			a3(pshufd xmm2, xmm2, 0x4e)
 			a3(vpxor xmm0, xmm0, xmm4)
-			a2(sub rax, 2)
 			a3(vpaddd xmm4, xmm3, xmm0)
 			a3(pshufd xmm1, xmm1, 0x39)
 			a3(vpsrld xmm5, xmm4, 25)
@@ -217,6 +216,7 @@ asm_naked_fn(scrypt_ChunkMix_avx)
 			a3(pshufd xmm2, xmm2, 0x4e)
 			a3(vpxor xmm0, xmm0, xmm4)
 			a3(pshufd xmm3, xmm3, 0x39)
+			a2(sub rax, 2)
 			aj(ja scrypt_salsa_avx_loop)
 		a3(vpaddd xmm0,xmm0,xmm8)
 		a3(vpaddd xmm1,xmm1,xmm9)

src/scryptjane/scrypt-jane-mix_salsa64-avx.h

@@ -103,7 +103,6 @@ asm_naked_fn(scrypt_ChunkMix_avx)
 			a4(vpalignr xmm3, xmm7, xmm6, 8)
 			a4(vpalignr xmm6, xmm9, xmm8, 8)
 			a4(vpalignr xmm7, xmm8, xmm9, 8)
-			a2(sub rax, 2)
 			a3(vpaddq xmm10, xmm0, xmm2)
 			a3(vpaddq xmm11, xmm1, xmm3)
 			a3(vpshufd xmm10, xmm10, 0xb1)
@@ -142,6 +141,7 @@ asm_naked_fn(scrypt_ChunkMix_avx)
 			a4(vpalignr xmm3, xmm7, xmm6, 8)
 			a4(vpalignr xmm6, xmm11, xmm10, 8)
 			a4(vpalignr xmm7, xmm10, xmm11, 8)
+			a2(sub rax, 2)
 			aj(ja scrypt_salsa64_avx_loop)
 		a3(vpaddq xmm0,xmm0,[rsp+0])
 		a3(vpaddq xmm1,xmm1,[rsp+16])