From d2416d6157e46fe16cb4e10dedbe56054922aeb1 Mon Sep 17 00:00:00 2001 From: fuwa Date: Tue, 5 Nov 2019 21:15:02 +0800 Subject: [PATCH] rx-wow-fix-2: Revert "Decrease the frequency of FADD/FSUB in favor of FMUL (#77)" This reverts commit 91cd35ff13aa3c8fa77ebe6cd863708ea6c6add3. --- src/asm/configuration.asm | 12 ++++++------ src/common.hpp | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/asm/configuration.asm b/src/asm/configuration.asm index 794d7ad..3ae2b25 100644 --- a/src/asm/configuration.asm +++ b/src/asm/configuration.asm @@ -29,16 +29,16 @@ RANDOMX_FREQ_IMUL_RCP EQU 8t RANDOMX_FREQ_INEG_R EQU 2t RANDOMX_FREQ_IXOR_R EQU 15t RANDOMX_FREQ_IXOR_M EQU 5t -RANDOMX_FREQ_IROR_R EQU 8t -RANDOMX_FREQ_IROL_R EQU 2t +RANDOMX_FREQ_IROR_R EQU 10t +RANDOMX_FREQ_IROL_R EQU 0t RANDOMX_FREQ_ISWAP_R EQU 4t -RANDOMX_FREQ_FSWAP_R EQU 4t -RANDOMX_FREQ_FADD_R EQU 16t +RANDOMX_FREQ_FSWAP_R EQU 8t +RANDOMX_FREQ_FADD_R EQU 20t RANDOMX_FREQ_FADD_M EQU 5t -RANDOMX_FREQ_FSUB_R EQU 16t +RANDOMX_FREQ_FSUB_R EQU 20t RANDOMX_FREQ_FSUB_M EQU 5t RANDOMX_FREQ_FSCAL_R EQU 6t -RANDOMX_FREQ_FMUL_R EQU 32t +RANDOMX_FREQ_FMUL_R EQU 20t RANDOMX_FREQ_FDIV_M EQU 4t RANDOMX_FREQ_FSQRT_R EQU 6t RANDOMX_FREQ_CBRANCH EQU 25t diff --git a/src/common.hpp b/src/common.hpp index a77feb3..67081a1 100644 --- a/src/common.hpp +++ b/src/common.hpp @@ -67,7 +67,7 @@ namespace randomx { constexpr int wtSum = RANDOMX_FREQ_IADD_RS + RANDOMX_FREQ_IADD_M + RANDOMX_FREQ_ISUB_R + \ RANDOMX_FREQ_ISUB_M + RANDOMX_FREQ_IMUL_R + RANDOMX_FREQ_IMUL_M + RANDOMX_FREQ_IMULH_R + \ RANDOMX_FREQ_IMULH_M + RANDOMX_FREQ_ISMULH_R + RANDOMX_FREQ_ISMULH_M + RANDOMX_FREQ_IMUL_RCP + \ - RANDOMX_FREQ_INEG_R + RANDOMX_FREQ_IXOR_R + RANDOMX_FREQ_IXOR_M + RANDOMX_FREQ_IROR_R + RANDOMX_FREQ_IROL_R + RANDOMX_FREQ_ISWAP_R + \ + RANDOMX_FREQ_INEG_R + RANDOMX_FREQ_IXOR_R + RANDOMX_FREQ_IXOR_M + RANDOMX_FREQ_IROR_R + RANDOMX_FREQ_ISWAP_R + \ RANDOMX_FREQ_FSWAP_R + RANDOMX_FREQ_FADD_R + RANDOMX_FREQ_FADD_M + RANDOMX_FREQ_FSUB_R + RANDOMX_FREQ_FSUB_M + \ RANDOMX_FREQ_FSCAL_R + RANDOMX_FREQ_FMUL_R + RANDOMX_FREQ_FDIV_M + RANDOMX_FREQ_FSQRT_R + RANDOMX_FREQ_CBRANCH + \ RANDOMX_FREQ_CFROUND + RANDOMX_FREQ_ISTORE + RANDOMX_FREQ_NOP;