From 7605c4241f56d4316fd297584f154a10f2b5e1a2 Mon Sep 17 00:00:00 2001 From: XMRig Date: Sat, 2 Feb 2019 01:33:25 +0700 Subject: [PATCH 01/17] v2.10.1-dev --- src/version.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/version.h b/src/version.h index 92fda09b7..313d04b99 100644 --- a/src/version.h +++ b/src/version.h @@ -28,7 +28,7 @@ #define APP_ID "xmrig" #define APP_NAME "XMRig" #define APP_DESC "XMRig CPU miner" -#define APP_VERSION "2.10.0" +#define APP_VERSION "2.10.1-dev" #define APP_DOMAIN "xmrig.com" #define APP_SITE "www.xmrig.com" #define APP_COPYRIGHT "Copyright (C) 2016-2019 xmrig.com" @@ -36,7 +36,7 @@ #define APP_VER_MAJOR 2 #define APP_VER_MINOR 10 -#define APP_VER_PATCH 0 +#define APP_VER_PATCH 1 #ifdef _MSC_VER # if (_MSC_VER >= 1910) From bd4bc9ba4df68eb4c9928a445f2f5c60faf8b40f Mon Sep 17 00:00:00 2001 From: XMRig Date: Sun, 3 Feb 2019 14:44:23 +0700 Subject: [PATCH 02/17] Added reference implementation for cn/gpu (cn-gpu). --- CMakeLists.txt | 4 +- cmake/cn-gpu.cmake | 13 ++ src/Summary.cpp | 21 ++- src/common/cpu/BasicCpuInfo.cpp | 21 ++- src/common/cpu/BasicCpuInfo.h | 9 +- src/common/crypto/Algorithm.cpp | 7 +- src/common/interfaces/ICpuInfo.h | 5 +- src/common/net/Pool.cpp | 3 +- src/common/xmrig.h | 1 + src/core/cpu/AdvancedCpuInfo.cpp | 9 +- src/core/cpu/AdvancedCpuInfo.h | 7 +- src/crypto/CryptoNight_constants.h | 10 +- src/crypto/CryptoNight_test.h | 17 +++ src/crypto/CryptoNight_x86.h | 66 ++++++++- src/crypto/cn_gpu_avx.cpp | 203 ++++++++++++++++++++++++++++ src/crypto/cn_gpu_ssse3.cpp | 210 +++++++++++++++++++++++++++++ src/workers/CpuThread.cpp | 22 +++ src/workers/MultiWorker.cpp | 17 ++- 18 files changed, 614 insertions(+), 31 deletions(-) create mode 100644 cmake/cn-gpu.cmake create mode 100644 src/crypto/cn_gpu_avx.cpp create mode 100644 src/crypto/cn_gpu_ssse3.cpp diff --git a/CMakeLists.txt b/CMakeLists.txt index 99a19bfdf..3d0042afe 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,6 +5,7 @@ option(WITH_LIBCPUID "Use Libcpuid" ON) option(WITH_AEON "CryptoNight-Lite support" ON) option(WITH_SUMO "CryptoNight-Heavy support" ON) option(WITH_CN_PICO "CryptoNight-Pico support" ON) +option(WITH_CN_GPU "CryptoNight-GPU support" ON) option(WITH_HTTPD "HTTP REST API" ON) option(WITH_DEBUG_LOG "Enable debug log output" OFF) option(WITH_TLS "Enable OpenSSL support" ON) @@ -200,6 +201,7 @@ endif() include(cmake/OpenSSL.cmake) include(cmake/asm.cmake) +include(cmake/cn-gpu.cmake) CHECK_INCLUDE_FILE (syslog.h HAVE_SYSLOG_H) if (HAVE_SYSLOG_H) @@ -262,5 +264,5 @@ if (WITH_DEBUG_LOG) add_definitions(/DAPP_DEBUG) endif() -add_executable(${CMAKE_PROJECT_NAME} ${HEADERS} ${SOURCES} ${SOURCES_OS} ${SOURCES_CPUID} ${HEADERS_CRYPTO} ${SOURCES_CRYPTO} ${SOURCES_SYSLOG} ${HTTPD_SOURCES} ${TLS_SOURCES} ${XMRIG_ASM_SOURCES}) +add_executable(${CMAKE_PROJECT_NAME} ${HEADERS} ${SOURCES} ${SOURCES_OS} ${SOURCES_CPUID} ${HEADERS_CRYPTO} ${SOURCES_CRYPTO} ${SOURCES_SYSLOG} ${HTTPD_SOURCES} ${TLS_SOURCES} ${XMRIG_ASM_SOURCES} ${CN_GPU_SOURCES}) target_link_libraries(${CMAKE_PROJECT_NAME} ${XMRIG_ASM_LIBRARY} ${OPENSSL_LIBRARIES} ${UV_LIBRARIES} ${MHD_LIBRARY} ${EXTRA_LIBS} ${CPUID_LIB}) diff --git a/cmake/cn-gpu.cmake b/cmake/cn-gpu.cmake new file mode 100644 index 000000000..0e580c565 --- /dev/null +++ b/cmake/cn-gpu.cmake @@ -0,0 +1,13 @@ +if (WITH_CN_GPU) + set(CN_GPU_SOURCES src/crypto/cn_gpu_avx.cpp src/crypto/cn_gpu_ssse3.cpp) + + if (CMAKE_CXX_COMPILER_ID MATCHES GNU OR CMAKE_CXX_COMPILER_ID MATCHES Clang) + set_source_files_properties(src/crypto/cn_gpu_avx.cpp PROPERTIES COMPILE_FLAGS "-mavx2") + elseif (CMAKE_CXX_COMPILER_ID MATCHES MSVC) + set_source_files_properties(src/crypto/cn_gpu_avx.cpp PROPERTIES COMPILE_FLAGS "/arch:AVX") + endif() +else() + set(CN_GPU_SOURCES "") + + add_definitions(/DXMRIG_NO_CN_GPU) +endif() diff --git a/src/Summary.cpp b/src/Summary.cpp index f010d70ba..dc671438e 100644 --- a/src/Summary.cpp +++ b/src/Summary.cpp @@ -4,9 +4,9 @@ * Copyright 2014 Lucas Jones * Copyright 2014-2016 Wolf9466 * Copyright 2016 Jay D Dee - * Copyright 2017-2018 XMR-Stak , - * Copyright 2018 SChernykh - * Copyright 2016-2018 XMRig , + * Copyright 2017-2019 XMR-Stak , + * Copyright 2018-2019 SChernykh + * Copyright 2016-2019 XMRig * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -74,18 +74,25 @@ static void print_cpu(xmrig::Config *config) using namespace xmrig; if (config->isColors()) { - Log::i()->text(GREEN_BOLD(" * ") WHITE_BOLD("%-13s%s (%d)") " %sx64 %sAES", + Log::i()->text(GREEN_BOLD(" * ") WHITE_BOLD("%-13s%s (%d)") " %sx64 %sAES %sAVX2", "CPU", Cpu::info()->brand(), Cpu::info()->sockets(), - Cpu::info()->isX64() ? "\x1B[1;32m" : "\x1B[1;31m-", - Cpu::info()->hasAES() ? "\x1B[1;32m" : "\x1B[1;31m-"); + Cpu::info()->isX64() ? "\x1B[1;32m" : "\x1B[1;31m-", + Cpu::info()->hasAES() ? "\x1B[1;32m" : "\x1B[1;31m-", + Cpu::info()->hasAVX2() ? "\x1B[1;32m" : "\x1B[1;31m-"); # ifndef XMRIG_NO_LIBCPUID Log::i()->text(GREEN_BOLD(" * ") WHITE_BOLD("%-13s%.1f MB/%.1f MB"), "CPU L2/L3", Cpu::info()->L2() / 1024.0, Cpu::info()->L3() / 1024.0); # endif } else { - Log::i()->text(" * %-13s%s (%d) %sx64 %sAES", "CPU", Cpu::info()->brand(), Cpu::info()->sockets(), Cpu::info()->isX64() ? "" : "-", Cpu::info()->hasAES() ? "" : "-"); + Log::i()->text(" * %-13s%s (%d) %sx64 %sAES %sAVX2", + "CPU", + Cpu::info()->brand(), + Cpu::info()->sockets(), + Cpu::info()->isX64() ? "" : "-", + Cpu::info()->hasAES() ? "" : "-", + Cpu::info()->hasAVX2() ? "" : "-"); # ifndef XMRIG_NO_LIBCPUID Log::i()->text(" * %-13s%.1f MB/%.1f MB", "CPU L2/L3", Cpu::info()->L2() / 1024.0, Cpu::info()->L3() / 1024.0); # endif diff --git a/src/common/cpu/BasicCpuInfo.cpp b/src/common/cpu/BasicCpuInfo.cpp index cb1e6d1de..0e6ff94aa 100644 --- a/src/common/cpu/BasicCpuInfo.cpp +++ b/src/common/cpu/BasicCpuInfo.cpp @@ -4,8 +4,9 @@ * Copyright 2014 Lucas Jones * Copyright 2014-2016 Wolf9466 * Copyright 2016 Jay D Dee - * Copyright 2017-2018 XMR-Stak , - * Copyright 2016-2018 XMRig , + * Copyright 2017-2019 XMR-Stak , + * Copyright 2018-2019 SChernykh + * Copyright 2016-2019 XMRig * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -35,6 +36,10 @@ # define bit_AES (1 << 25) #endif +#ifndef bit_AVX2 +# define bit_AVX2 (1 << 5) +#endif + #include "common/cpu/BasicCpuInfo.h" @@ -93,10 +98,20 @@ static inline bool has_aes_ni() } +static inline bool has_avx2() +{ + int32_t cpu_info[4] = { 0 }; + cpuid(EXTENDED_FEATURES, cpu_info); + + return (cpu_info[EBX_Reg] & bit_AVX2) != 0; +} + + xmrig::BasicCpuInfo::BasicCpuInfo() : m_assembly(ASM_NONE), - m_aes(has_aes_ni()), m_brand(), + m_aes(has_aes_ni()), + m_avx2(has_avx2()), m_threads(std::thread::hardware_concurrency()) { cpu_brand_string(m_brand); diff --git a/src/common/cpu/BasicCpuInfo.h b/src/common/cpu/BasicCpuInfo.h index 911674ea1..2e0b3d0de 100644 --- a/src/common/cpu/BasicCpuInfo.h +++ b/src/common/cpu/BasicCpuInfo.h @@ -4,8 +4,9 @@ * Copyright 2014 Lucas Jones * Copyright 2014-2016 Wolf9466 * Copyright 2016 Jay D Dee - * Copyright 2017-2018 XMR-Stak , - * Copyright 2016-2018 XMRig , + * Copyright 2017-2019 XMR-Stak , + * Copyright 2018-2019 SChernykh + * Copyright 2016-2019 XMRig * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -41,6 +42,7 @@ protected: inline Assembly assembly() const override { return m_assembly; } inline bool hasAES() const override { return m_aes; } + inline bool hasAVX2() const override { return m_avx2; } inline bool isSupported() const override { return true; } inline const char *brand() const override { return m_brand; } inline int32_t cores() const override { return -1; } @@ -58,8 +60,9 @@ protected: private: Assembly m_assembly; - bool m_aes; char m_brand[64]; + const bool m_aes; + const bool m_avx2; int32_t m_threads; }; diff --git a/src/common/crypto/Algorithm.cpp b/src/common/crypto/Algorithm.cpp index 6d408cd2f..9d424c575 100644 --- a/src/common/crypto/Algorithm.cpp +++ b/src/common/crypto/Algorithm.cpp @@ -86,6 +86,10 @@ static AlgoData const algorithms[] = { { "cryptonight-ultralite", "cn-ultralite", xmrig::CRYPTONIGHT_PICO, xmrig::VARIANT_TRTL }, { "cryptonight_turtle", "cn_turtle", xmrig::CRYPTONIGHT_PICO, xmrig::VARIANT_TRTL }, # endif + +# ifndef XMRIG_NO_CN_GPU + { "cryptonight/gpu", "cn/gpu", xmrig::CRYPTONIGHT, xmrig::VARIANT_GPU }, +# endif }; @@ -120,7 +124,8 @@ static const char *variants[] = { "rto", "2", "half", - "trtl" + "trtl", + "gpu" }; diff --git a/src/common/interfaces/ICpuInfo.h b/src/common/interfaces/ICpuInfo.h index 267616d0a..dd4034b33 100644 --- a/src/common/interfaces/ICpuInfo.h +++ b/src/common/interfaces/ICpuInfo.h @@ -4,7 +4,9 @@ * Copyright 2014 Lucas Jones * Copyright 2014-2016 Wolf9466 * Copyright 2016 Jay D Dee - * Copyright 2016-2018 XMRig + * Copyright 2017-2019 XMR-Stak , + * Copyright 2018-2019 SChernykh + * Copyright 2016-2019 XMRig * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -40,6 +42,7 @@ public: virtual ~ICpuInfo() {} virtual bool hasAES() const = 0; + virtual bool hasAVX2() const = 0; virtual bool isSupported() const = 0; virtual bool isX64() const = 0; virtual const char *brand() const = 0; diff --git a/src/common/net/Pool.cpp b/src/common/net/Pool.cpp index 7e8fa1dc1..2010aade6 100644 --- a/src/common/net/Pool.cpp +++ b/src/common/net/Pool.cpp @@ -4,7 +4,7 @@ * Copyright 2014 Lucas Jones * Copyright 2014-2016 Wolf9466 * Copyright 2016 Jay D Dee - * Copyright 2017-2018 XMR-Stak , + * Copyright 2017-2019 XMR-Stak , * Copyright 2018-2019 SChernykh * Copyright 2016-2019 XMRig , * @@ -419,6 +419,7 @@ void Pool::rebuild() addVariant(xmrig::VARIANT_XHV); addVariant(xmrig::VARIANT_XAO); addVariant(xmrig::VARIANT_RTO); + addVariant(xmrig::VARIANT_GPU); addVariant(xmrig::VARIANT_AUTO); # endif } diff --git a/src/common/xmrig.h b/src/common/xmrig.h index b20513318..d738028f0 100644 --- a/src/common/xmrig.h +++ b/src/common/xmrig.h @@ -73,6 +73,7 @@ enum Variant { VARIANT_2 = 8, // CryptoNight variant 2 VARIANT_HALF = 9, // CryptoNight variant 2 with half iterations (Masari/Stellite) VARIANT_TRTL = 10, // CryptoNight Turtle (TRTL) + VARIANT_GPU = 11, // CryptoNight-GPU (Ryo) VARIANT_MAX }; diff --git a/src/core/cpu/AdvancedCpuInfo.cpp b/src/core/cpu/AdvancedCpuInfo.cpp index a91521361..c41378e53 100644 --- a/src/core/cpu/AdvancedCpuInfo.cpp +++ b/src/core/cpu/AdvancedCpuInfo.cpp @@ -4,9 +4,9 @@ * Copyright 2014 Lucas Jones * Copyright 2014-2016 Wolf9466 * Copyright 2016 Jay D Dee - * Copyright 2017-2018 XMR-Stak , - * Copyright 2018 SChernykh - * Copyright 2016-2018 XMRig , + * Copyright 2017-2019 XMR-Stak , + * Copyright 2018-2019 SChernykh + * Copyright 2016-2019 XMRig * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -33,6 +33,7 @@ xmrig::AdvancedCpuInfo::AdvancedCpuInfo() : m_assembly(ASM_NONE), m_aes(false), + m_avx2(false), m_L2_exclusive(false), m_brand(), m_cores(0), @@ -83,6 +84,8 @@ xmrig::AdvancedCpuInfo::AdvancedCpuInfo() : m_assembly = ASM_INTEL; } } + + m_avx2 = data.flags[CPU_FEATURE_AVX2]; } diff --git a/src/core/cpu/AdvancedCpuInfo.h b/src/core/cpu/AdvancedCpuInfo.h index 5e8967ad2..0765da339 100644 --- a/src/core/cpu/AdvancedCpuInfo.h +++ b/src/core/cpu/AdvancedCpuInfo.h @@ -4,8 +4,9 @@ * Copyright 2014 Lucas Jones * Copyright 2014-2016 Wolf9466 * Copyright 2016 Jay D Dee - * Copyright 2017-2018 XMR-Stak , - * Copyright 2016-2018 XMRig , + * Copyright 2017-2019 XMR-Stak , + * Copyright 2018-2019 SChernykh + * Copyright 2016-2019 XMRig * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -41,6 +42,7 @@ protected: inline Assembly assembly() const override { return m_assembly; } inline bool hasAES() const override { return m_aes; } + inline bool hasAVX2() const override { return m_avx2; } inline bool isSupported() const override { return true; } inline const char *brand() const override { return m_brand; } inline int32_t cores() const override { return m_cores; } @@ -59,6 +61,7 @@ protected: private: Assembly m_assembly; bool m_aes; + bool m_avx2; bool m_L2_exclusive; char m_brand[64]; int32_t m_cores; diff --git a/src/crypto/CryptoNight_constants.h b/src/crypto/CryptoNight_constants.h index 654e37409..3feb5697f 100644 --- a/src/crypto/CryptoNight_constants.h +++ b/src/crypto/CryptoNight_constants.h @@ -4,7 +4,7 @@ * Copyright 2014 Lucas Jones * Copyright 2014-2016 Wolf9466 * Copyright 2016 Jay D Dee - * Copyright 2017-2018 XMR-Stak , + * Copyright 2017-2019 XMR-Stak , * Copyright 2018 Lee Clagett * Copyright 2018-2019 SChernykh * Copyright 2016-2019 XMRig , @@ -42,6 +42,9 @@ constexpr const uint32_t CRYPTONIGHT_ITER = 0x80000; constexpr const uint32_t CRYPTONIGHT_HALF_ITER = 0x40000; constexpr const uint32_t CRYPTONIGHT_XAO_ITER = 0x100000; +constexpr const uint32_t CRYPTONIGHT_GPU_ITER = 0xC000; +constexpr const uint32_t CRYPTONIGHT_GPU_MASK = 0x1FFFC0; + constexpr const size_t CRYPTONIGHT_LITE_MEMORY = 1 * 1024 * 1024; constexpr const uint32_t CRYPTONIGHT_LITE_MASK = 0xFFFF0; constexpr const uint32_t CRYPTONIGHT_LITE_ITER = 0x40000; @@ -127,6 +130,7 @@ template<> inline constexpr uint32_t cn_select_iter() template<> inline constexpr uint32_t cn_select_iter() { return CRYPTONIGHT_HALF_ITER; } template<> inline constexpr uint32_t cn_select_iter() { return CRYPTONIGHT_XAO_ITER; } template<> inline constexpr uint32_t cn_select_iter() { return CRYPTONIGHT_ITER; } +template<> inline constexpr uint32_t cn_select_iter() { return CRYPTONIGHT_GPU_ITER; } template<> inline constexpr uint32_t cn_select_iter() { return CRYPTONIGHT_LITE_ITER; } template<> inline constexpr uint32_t cn_select_iter() { return CRYPTONIGHT_LITE_ITER; } template<> inline constexpr uint32_t cn_select_iter() { return CRYPTONIGHT_HEAVY_ITER; } @@ -142,6 +146,9 @@ inline uint32_t cn_select_iter(Algo algorithm, Variant variant) case VARIANT_HALF: return CRYPTONIGHT_HALF_ITER; + case VARIANT_GPU: + return CRYPTONIGHT_GPU_ITER; + case VARIANT_RTO: return CRYPTONIGHT_XAO_ITER; @@ -183,6 +190,7 @@ template<> inline constexpr Variant cn_base_variant() { return VA template<> inline constexpr Variant cn_base_variant() { return VARIANT_2; } template<> inline constexpr Variant cn_base_variant() { return VARIANT_2; } template<> inline constexpr Variant cn_base_variant() { return VARIANT_2; } +template<> inline constexpr Variant cn_base_variant() { return VARIANT_GPU; } } /* namespace xmrig */ diff --git a/src/crypto/CryptoNight_test.h b/src/crypto/CryptoNight_test.h index ed2c9e0ad..aadddc2eb 100644 --- a/src/crypto/CryptoNight_test.h +++ b/src/crypto/CryptoNight_test.h @@ -272,4 +272,21 @@ const static uint8_t test_output_pico_trtl[160] = { #endif +#ifndef XMRIG_NO_CN_GPU +// "cn/gpu" +const static uint8_t test_output_gpu[160] = { + 0xE5, 0x5C, 0xB2, 0x3E, 0x51, 0x64, 0x9A, 0x59, 0xB1, 0x27, 0xB9, 0x6B, 0x51, 0x5F, 0x2B, 0xF7, + 0xBF, 0xEA, 0x19, 0x97, 0x41, 0xA0, 0x21, 0x6C, 0xF8, 0x38, 0xDE, 0xD0, 0x6E, 0xFF, 0x82, 0xDF, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +}; +#endif + + #endif /* XMRIG_CRYPTONIGHT_TEST_H */ diff --git a/src/crypto/CryptoNight_x86.h b/src/crypto/CryptoNight_x86.h index a8c2c309c..2d1aef0d6 100644 --- a/src/crypto/CryptoNight_x86.h +++ b/src/crypto/CryptoNight_x86.h @@ -4,7 +4,7 @@ * Copyright 2014 Lucas Jones * Copyright 2014-2016 Wolf9466 * Copyright 2016 Jay D Dee - * Copyright 2017-2018 XMR-Stak , + * Copyright 2017-2019 XMR-Stak , * Copyright 2018 Lee Clagett * Copyright 2018-2019 SChernykh * Copyright 2016-2019 XMRig , @@ -35,6 +35,7 @@ #endif +#include "common/cpu/Cpu.h" #include "common/crypto/keccak.h" #include "crypto/CryptoNight.h" #include "crypto/CryptoNight_constants.h" @@ -289,6 +290,34 @@ static inline void cn_explode_scratchpad(const __m128i *input, __m128i *output) } +#ifndef XMRIG_NO_CN_GPU +template +void cn_explode_scratchpad_gpu(const uint8_t *input, uint8_t *output) +{ + constexpr size_t hash_size = 200; // 25x8 bytes + alignas(16) uint64_t hash[25]; + + for (uint64_t i = 0; i < MEM / 512; i++) + { + memcpy(hash, input, hash_size); + hash[0] ^= i; + + xmrig::keccakf(hash, 24); + memcpy(output, hash, 160); + output += 160; + + xmrig::keccakf(hash, 24); + memcpy(output, hash, 176); + output += 176; + + xmrig::keccakf(hash, 24); + memcpy(output, hash, 176); + output += 176; + } +} +#endif + + template static inline void cn_implode_scratchpad(const __m128i *input, __m128i *output) { @@ -566,6 +595,41 @@ inline void cryptonight_single_hash(const uint8_t *__restrict__ input, size_t si } +#ifndef XMRIG_NO_CN_GPU +template +void cn_gpu_inner_avx(const uint8_t *spad, uint8_t *lpad); + + +template +void cn_gpu_inner_ssse3(const uint8_t *spad, uint8_t *lpad); + + +template +inline void cryptonight_single_hash_gpu(const uint8_t *__restrict__ input, size_t size, uint8_t *__restrict__ output, cryptonight_ctx **__restrict__ ctx) +{ + constexpr size_t MASK = xmrig::CRYPTONIGHT_GPU_MASK; + constexpr size_t ITERATIONS = xmrig::cn_select_iter(); + constexpr size_t MEM = xmrig::cn_select_memory(); + + static_assert(MASK > 0 && ITERATIONS > 0 && MEM > 0, "unsupported algorithm/variant"); + + xmrig::keccak(input, size, ctx[0]->state); + cn_explode_scratchpad_gpu(ctx[0]->state, ctx[0]->memory); + + if (xmrig::Cpu::info()->hasAVX2()) { + cn_gpu_inner_avx(ctx[0]->state, ctx[0]->memory); + } else { + cn_gpu_inner_ssse3(ctx[0]->state, ctx[0]->memory); + } + + cn_implode_scratchpad((__m128i*) ctx[0]->memory, (__m128i*) ctx[0]->state); + + xmrig::keccakf((uint64_t*) ctx[0]->state, 24); + memcpy(output, ctx[0]->state, 32); +} +#endif + + #ifndef XMRIG_NO_ASM extern "C" void cnv2_mainloop_ivybridge_asm(cryptonight_ctx *ctx); extern "C" void cnv2_mainloop_ryzen_asm(cryptonight_ctx *ctx); diff --git a/src/crypto/cn_gpu_avx.cpp b/src/crypto/cn_gpu_avx.cpp new file mode 100644 index 000000000..a808e34ce --- /dev/null +++ b/src/crypto/cn_gpu_avx.cpp @@ -0,0 +1,203 @@ +/* XMRig + * Copyright 2010 Jeff Garzik + * Copyright 2012-2014 pooler + * Copyright 2014 Lucas Jones + * Copyright 2014-2016 Wolf9466 + * Copyright 2016 Jay D Dee + * Copyright 2017-2019 XMR-Stak , + * Copyright 2018-2019 SChernykh + * Copyright 2016-2019 XMRig + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include "crypto/CryptoNight_constants.h" + +#ifdef __GNUC__ +# include +#else +# include +# define __restrict__ __restrict +#endif + +inline void prep_dv_avx(__m256i* idx, __m256i& v, __m256& n01) +{ + v = _mm256_load_si256(idx); + n01 = _mm256_cvtepi32_ps(v); +} + +inline __m256 fma_break(const __m256& x) +{ + // Break the dependency chain by setitng the exp to ?????01 + __m256 xx = _mm256_and_ps(_mm256_castsi256_ps(_mm256_set1_epi32(0xFEFFFFFF)), x); + return _mm256_or_ps(_mm256_castsi256_ps(_mm256_set1_epi32(0x00800000)), xx); +} + +// 14 +inline void sub_round(const __m256& n0, const __m256& n1, const __m256& n2, const __m256& n3, const __m256& rnd_c, __m256& n, __m256& d, __m256& c) +{ + __m256 nn = _mm256_mul_ps(n0, c); + nn = _mm256_mul_ps(_mm256_add_ps(n1, c), _mm256_mul_ps(nn, nn)); + nn = fma_break(nn); + n = _mm256_add_ps(n, nn); + + __m256 dd = _mm256_mul_ps(n2, c); + dd = _mm256_mul_ps(_mm256_sub_ps(n3, c), _mm256_mul_ps(dd, dd)); + dd = fma_break(dd); + d = _mm256_add_ps(d, dd); + + //Constant feedback + c = _mm256_add_ps(c, rnd_c); + c = _mm256_add_ps(c, _mm256_set1_ps(0.734375f)); + __m256 r = _mm256_add_ps(nn, dd); + r = _mm256_and_ps(_mm256_castsi256_ps(_mm256_set1_epi32(0x807FFFFF)), r); + r = _mm256_or_ps(_mm256_castsi256_ps(_mm256_set1_epi32(0x40000000)), r); + c = _mm256_add_ps(c, r); +} + +// 14*8 + 2 = 112 +inline void round_compute(const __m256& n0, const __m256& n1, const __m256& n2, const __m256& n3, const __m256& rnd_c, __m256& c, __m256& r) +{ + __m256 n = _mm256_setzero_ps(), d = _mm256_setzero_ps(); + + sub_round(n0, n1, n2, n3, rnd_c, n, d, c); + sub_round(n1, n2, n3, n0, rnd_c, n, d, c); + sub_round(n2, n3, n0, n1, rnd_c, n, d, c); + sub_round(n3, n0, n1, n2, rnd_c, n, d, c); + sub_round(n3, n2, n1, n0, rnd_c, n, d, c); + sub_round(n2, n1, n0, n3, rnd_c, n, d, c); + sub_round(n1, n0, n3, n2, rnd_c, n, d, c); + sub_round(n0, n3, n2, n1, rnd_c, n, d, c); + + // Make sure abs(d) > 2.0 - this prevents division by zero and accidental overflows by division by < 1.0 + d = _mm256_and_ps(_mm256_castsi256_ps(_mm256_set1_epi32(0xFF7FFFFF)), d); + d = _mm256_or_ps(_mm256_castsi256_ps(_mm256_set1_epi32(0x40000000)), d); + r = _mm256_add_ps(r, _mm256_div_ps(n, d)); +} + +// 112×4 = 448 +template +inline __m256i double_comupte(const __m256& n0, const __m256& n1, const __m256& n2, const __m256& n3, + float lcnt, float hcnt, const __m256& rnd_c, __m256& sum) +{ + __m256 c = _mm256_insertf128_ps(_mm256_castps128_ps256(_mm_set1_ps(lcnt)), _mm_set1_ps(hcnt), 1); + __m256 r = _mm256_setzero_ps(); + + round_compute(n0, n1, n2, n3, rnd_c, c, r); + round_compute(n0, n1, n2, n3, rnd_c, c, r); + round_compute(n0, n1, n2, n3, rnd_c, c, r); + round_compute(n0, n1, n2, n3, rnd_c, c, r); + + // do a quick fmod by setting exp to 2 + r = _mm256_and_ps(_mm256_castsi256_ps(_mm256_set1_epi32(0x807FFFFF)), r); + r = _mm256_or_ps(_mm256_castsi256_ps(_mm256_set1_epi32(0x40000000)), r); + + if(add) + sum = _mm256_add_ps(sum, r); + else + sum = r; + + r = _mm256_mul_ps(r, _mm256_set1_ps(536870880.0f)); // 35 + return _mm256_cvttps_epi32(r); +} + +template +inline void double_comupte_wrap(const __m256& n0, const __m256& n1, const __m256& n2, const __m256& n3, + float lcnt, float hcnt, const __m256& rnd_c, __m256& sum, __m256i& out) +{ + __m256i r = double_comupte(n0, n1, n2, n3, lcnt, hcnt, rnd_c, sum); + if(rot != 0) + r = _mm256_or_si256(_mm256_bslli_epi128(r, 16 - rot), _mm256_bsrli_epi128(r, rot)); + + out = _mm256_xor_si256(out, r); +} + +template +inline __m256i* scratchpad_ptr(uint8_t* lpad, uint32_t idx, size_t n) { return reinterpret_cast<__m256i*>(lpad + (idx & MASK) + n*16); } + +template +void cn_gpu_inner_avx(const uint8_t* spad, uint8_t* lpad) +{ + uint32_t s = reinterpret_cast(spad)[0] >> 8; + __m256i* idx0 = scratchpad_ptr(lpad, s, 0); + __m256i* idx2 = scratchpad_ptr(lpad, s, 2); + __m256 sum0 = _mm256_setzero_ps(); + + for(size_t i = 0; i < ITER; i++) + { + __m256i v01, v23; + __m256 suma, sumb, sum1; + __m256 rc = sum0; + + __m256 n01, n23; + prep_dv_avx(idx0, v01, n01); + prep_dv_avx(idx2, v23, n23); + + __m256i out, out2; + __m256 n10, n22, n33; + n10 = _mm256_permute2f128_ps(n01, n01, 0x01); + n22 = _mm256_permute2f128_ps(n23, n23, 0x00); + n33 = _mm256_permute2f128_ps(n23, n23, 0x11); + + out = _mm256_setzero_si256(); + double_comupte_wrap<0>(n01, n10, n22, n33, 1.3437500f, 1.4296875f, rc, suma, out); + double_comupte_wrap<1>(n01, n22, n33, n10, 1.2812500f, 1.3984375f, rc, suma, out); + double_comupte_wrap<2>(n01, n33, n10, n22, 1.3593750f, 1.3828125f, rc, sumb, out); + double_comupte_wrap<3>(n01, n33, n22, n10, 1.3671875f, 1.3046875f, rc, sumb, out); + _mm256_store_si256(idx0, _mm256_xor_si256(v01, out)); + sum0 = _mm256_add_ps(suma, sumb); + out2 = out; + + __m256 n11, n02, n30; + n11 = _mm256_permute2f128_ps(n01, n01, 0x11); + n02 = _mm256_permute2f128_ps(n01, n23, 0x20); + n30 = _mm256_permute2f128_ps(n01, n23, 0x03); + + out = _mm256_setzero_si256(); + double_comupte_wrap<0>(n23, n11, n02, n30, 1.4140625f, 1.3203125f, rc, suma, out); + double_comupte_wrap<1>(n23, n02, n30, n11, 1.2734375f, 1.3515625f, rc, suma, out); + double_comupte_wrap<2>(n23, n30, n11, n02, 1.2578125f, 1.3359375f, rc, sumb, out); + double_comupte_wrap<3>(n23, n30, n02, n11, 1.2890625f, 1.4609375f, rc, sumb, out); + _mm256_store_si256(idx2, _mm256_xor_si256(v23, out)); + sum1 = _mm256_add_ps(suma, sumb); + + out2 = _mm256_xor_si256(out2, out); + out2 = _mm256_xor_si256(_mm256_permute2x128_si256(out2,out2,0x41), out2); + suma = _mm256_permute2f128_ps(sum0, sum1, 0x30); + sumb = _mm256_permute2f128_ps(sum0, sum1, 0x21); + sum0 = _mm256_add_ps(suma, sumb); + sum0 = _mm256_add_ps(sum0, _mm256_permute2f128_ps(sum0, sum0, 0x41)); + + // Clear the high 128 bits + __m128 sum = _mm256_castps256_ps128(sum0); + + sum = _mm_and_ps(_mm_castsi128_ps(_mm_set1_epi32(0x7fffffff)), sum); // take abs(va) by masking the float sign bit + // vs range 0 - 64 + __m128i v0 = _mm_cvttps_epi32(_mm_mul_ps(sum, _mm_set1_ps(16777216.0f))); + v0 = _mm_xor_si128(v0, _mm256_castsi256_si128(out2)); + __m128i v1 = _mm_shuffle_epi32(v0, _MM_SHUFFLE(0, 1, 2, 3)); + v0 = _mm_xor_si128(v0, v1); + v1 = _mm_shuffle_epi32(v0, _MM_SHUFFLE(0, 1, 0, 1)); + v0 = _mm_xor_si128(v0, v1); + + // vs is now between 0 and 1 + sum = _mm_div_ps(sum, _mm_set1_ps(64.0f)); + sum0 = _mm256_insertf128_ps(_mm256_castps128_ps256(sum), sum, 1); + uint32_t n = _mm_cvtsi128_si32(v0); + idx0 = scratchpad_ptr(lpad, n, 0); + idx2 = scratchpad_ptr(lpad, n, 2); + } +} + +template void cn_gpu_inner_avx(const uint8_t* spad, uint8_t* lpad); diff --git a/src/crypto/cn_gpu_ssse3.cpp b/src/crypto/cn_gpu_ssse3.cpp new file mode 100644 index 000000000..d986752cb --- /dev/null +++ b/src/crypto/cn_gpu_ssse3.cpp @@ -0,0 +1,210 @@ +/* XMRig + * Copyright 2010 Jeff Garzik + * Copyright 2012-2014 pooler + * Copyright 2014 Lucas Jones + * Copyright 2014-2016 Wolf9466 + * Copyright 2016 Jay D Dee + * Copyright 2017-2019 XMR-Stak , + * Copyright 2018-2019 SChernykh + * Copyright 2016-2019 XMRig + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include "crypto/CryptoNight_constants.h" + +#ifdef __GNUC__ +# include +#else +# include +# define __restrict__ __restrict +#endif + +inline void prep_dv(__m128i* idx, __m128i& v, __m128& n) +{ + v = _mm_load_si128(idx); + n = _mm_cvtepi32_ps(v); +} + +inline __m128 fma_break(__m128 x) +{ + // Break the dependency chain by setitng the exp to ?????01 + x = _mm_and_ps(_mm_castsi128_ps(_mm_set1_epi32(0xFEFFFFFF)), x); + return _mm_or_ps(_mm_castsi128_ps(_mm_set1_epi32(0x00800000)), x); +} + +// 14 +inline void sub_round(__m128 n0, __m128 n1, __m128 n2, __m128 n3, __m128 rnd_c, __m128& n, __m128& d, __m128& c) +{ + n1 = _mm_add_ps(n1, c); + __m128 nn = _mm_mul_ps(n0, c); + nn = _mm_mul_ps(n1, _mm_mul_ps(nn,nn)); + nn = fma_break(nn); + n = _mm_add_ps(n, nn); + + n3 = _mm_sub_ps(n3, c); + __m128 dd = _mm_mul_ps(n2, c); + dd = _mm_mul_ps(n3, _mm_mul_ps(dd,dd)); + dd = fma_break(dd); + d = _mm_add_ps(d, dd); + + //Constant feedback + c = _mm_add_ps(c, rnd_c); + c = _mm_add_ps(c, _mm_set1_ps(0.734375f)); + __m128 r = _mm_add_ps(nn, dd); + r = _mm_and_ps(_mm_castsi128_ps(_mm_set1_epi32(0x807FFFFF)), r); + r = _mm_or_ps(_mm_castsi128_ps(_mm_set1_epi32(0x40000000)), r); + c = _mm_add_ps(c, r); +} + +// 14*8 + 2 = 112 +inline void round_compute(__m128 n0, __m128 n1, __m128 n2, __m128 n3, __m128 rnd_c, __m128& c, __m128& r) +{ + __m128 n = _mm_setzero_ps(), d = _mm_setzero_ps(); + + sub_round(n0, n1, n2, n3, rnd_c, n, d, c); + sub_round(n1, n2, n3, n0, rnd_c, n, d, c); + sub_round(n2, n3, n0, n1, rnd_c, n, d, c); + sub_round(n3, n0, n1, n2, rnd_c, n, d, c); + sub_round(n3, n2, n1, n0, rnd_c, n, d, c); + sub_round(n2, n1, n0, n3, rnd_c, n, d, c); + sub_round(n1, n0, n3, n2, rnd_c, n, d, c); + sub_round(n0, n3, n2, n1, rnd_c, n, d, c); + + // Make sure abs(d) > 2.0 - this prevents division by zero and accidental overflows by division by < 1.0 + d = _mm_and_ps(_mm_castsi128_ps(_mm_set1_epi32(0xFF7FFFFF)), d); + d = _mm_or_ps(_mm_castsi128_ps(_mm_set1_epi32(0x40000000)), d); + r =_mm_add_ps(r, _mm_div_ps(n,d)); +} + +// 112×4 = 448 +template +inline __m128i single_comupte(__m128 n0, __m128 n1, __m128 n2, __m128 n3, float cnt, __m128 rnd_c, __m128& sum) +{ + __m128 c = _mm_set1_ps(cnt); + __m128 r = _mm_setzero_ps(); + + round_compute(n0, n1, n2, n3, rnd_c, c, r); + round_compute(n0, n1, n2, n3, rnd_c, c, r); + round_compute(n0, n1, n2, n3, rnd_c, c, r); + round_compute(n0, n1, n2, n3, rnd_c, c, r); + + // do a quick fmod by setting exp to 2 + r = _mm_and_ps(_mm_castsi128_ps(_mm_set1_epi32(0x807FFFFF)), r); + r = _mm_or_ps(_mm_castsi128_ps(_mm_set1_epi32(0x40000000)), r); + + if(add) + sum = _mm_add_ps(sum, r); + else + sum = r; + + r = _mm_mul_ps(r, _mm_set1_ps(536870880.0f)); // 35 + return _mm_cvttps_epi32(r); +} + +template +inline void single_comupte_wrap(__m128 n0, __m128 n1, __m128 n2, __m128 n3, float cnt, __m128 rnd_c, __m128& sum, __m128i& out) +{ + __m128i r = single_comupte(n0, n1, n2, n3, cnt, rnd_c, sum); + if(rot != 0) + r = _mm_or_si128(_mm_slli_si128(r, 16 - rot), _mm_srli_si128(r, rot)); + out = _mm_xor_si128(out, r); +} + +template +inline __m128i* scratchpad_ptr(uint8_t* lpad, uint32_t idx, size_t n) { return reinterpret_cast<__m128i*>(lpad + (idx & MASK) + n*16); } + +template +void cn_gpu_inner_ssse3(const uint8_t* spad, uint8_t* lpad) +{ + uint32_t s = reinterpret_cast(spad)[0] >> 8; + __m128i* idx0 = scratchpad_ptr(lpad, s, 0); + __m128i* idx1 = scratchpad_ptr(lpad, s, 1); + __m128i* idx2 = scratchpad_ptr(lpad, s, 2); + __m128i* idx3 = scratchpad_ptr(lpad, s, 3); + __m128 sum0 = _mm_setzero_ps(); + + for(size_t i = 0; i < ITER; i++) + { + __m128 n0, n1, n2, n3; + __m128i v0, v1, v2, v3; + __m128 suma, sumb, sum1, sum2, sum3; + + prep_dv(idx0, v0, n0); + prep_dv(idx1, v1, n1); + prep_dv(idx2, v2, n2); + prep_dv(idx3, v3, n3); + __m128 rc = sum0; + + __m128i out, out2; + out = _mm_setzero_si128(); + single_comupte_wrap<0>(n0, n1, n2, n3, 1.3437500f, rc, suma, out); + single_comupte_wrap<1>(n0, n2, n3, n1, 1.2812500f, rc, suma, out); + single_comupte_wrap<2>(n0, n3, n1, n2, 1.3593750f, rc, sumb, out); + single_comupte_wrap<3>(n0, n3, n2, n1, 1.3671875f, rc, sumb, out); + sum0 = _mm_add_ps(suma, sumb); + _mm_store_si128(idx0, _mm_xor_si128(v0, out)); + out2 = out; + + out = _mm_setzero_si128(); + single_comupte_wrap<0>(n1, n0, n2, n3, 1.4296875f, rc, suma, out); + single_comupte_wrap<1>(n1, n2, n3, n0, 1.3984375f, rc, suma, out); + single_comupte_wrap<2>(n1, n3, n0, n2, 1.3828125f, rc, sumb, out); + single_comupte_wrap<3>(n1, n3, n2, n0, 1.3046875f, rc, sumb, out); + sum1 = _mm_add_ps(suma, sumb); + _mm_store_si128(idx1, _mm_xor_si128(v1, out)); + out2 = _mm_xor_si128(out2, out); + + out = _mm_setzero_si128(); + single_comupte_wrap<0>(n2, n1, n0, n3, 1.4140625f, rc, suma, out); + single_comupte_wrap<1>(n2, n0, n3, n1, 1.2734375f, rc, suma, out); + single_comupte_wrap<2>(n2, n3, n1, n0, 1.2578125f, rc, sumb, out); + single_comupte_wrap<3>(n2, n3, n0, n1, 1.2890625f, rc, sumb, out); + sum2 = _mm_add_ps(suma, sumb); + _mm_store_si128(idx2, _mm_xor_si128(v2, out)); + out2 = _mm_xor_si128(out2, out); + + out = _mm_setzero_si128(); + single_comupte_wrap<0>(n3, n1, n2, n0, 1.3203125f, rc, suma, out); + single_comupte_wrap<1>(n3, n2, n0, n1, 1.3515625f, rc, suma, out); + single_comupte_wrap<2>(n3, n0, n1, n2, 1.3359375f, rc, sumb, out); + single_comupte_wrap<3>(n3, n0, n2, n1, 1.4609375f, rc, sumb, out); + sum3 = _mm_add_ps(suma, sumb); + _mm_store_si128(idx3, _mm_xor_si128(v3, out)); + out2 = _mm_xor_si128(out2, out); + sum0 = _mm_add_ps(sum0, sum1); + sum2 = _mm_add_ps(sum2, sum3); + sum0 = _mm_add_ps(sum0, sum2); + + sum0 = _mm_and_ps(_mm_castsi128_ps(_mm_set1_epi32(0x7fffffff)), sum0); // take abs(va) by masking the float sign bit + // vs range 0 - 64 + n0 = _mm_mul_ps(sum0, _mm_set1_ps(16777216.0f)); + v0 = _mm_cvttps_epi32(n0); + v0 = _mm_xor_si128(v0, out2); + v1 = _mm_shuffle_epi32(v0, _MM_SHUFFLE(0, 1, 2, 3)); + v0 = _mm_xor_si128(v0, v1); + v1 = _mm_shuffle_epi32(v0, _MM_SHUFFLE(0, 1, 0, 1)); + v0 = _mm_xor_si128(v0, v1); + + // vs is now between 0 and 1 + sum0 = _mm_div_ps(sum0, _mm_set1_ps(64.0f)); + uint32_t n = _mm_cvtsi128_si32(v0); + idx0 = scratchpad_ptr(lpad, n, 0); + idx1 = scratchpad_ptr(lpad, n, 1); + idx2 = scratchpad_ptr(lpad, n, 2); + idx3 = scratchpad_ptr(lpad, n, 3); + } +} + +template void cn_gpu_inner_ssse3(const uint8_t* spad, uint8_t* lpad); diff --git a/src/workers/CpuThread.cpp b/src/workers/CpuThread.cpp index af55b0dac..d709fc6ef 100644 --- a/src/workers/CpuThread.cpp +++ b/src/workers/CpuThread.cpp @@ -250,6 +250,21 @@ xmrig::CpuThread::cn_hash_fun xmrig::CpuThread::fn(Algo algorithm, AlgoVariant a nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, // VARIANT_TRTL +# ifndef XMRIG_NO_CN_GPU + cryptonight_single_hash_gpu, + nullptr, + cryptonight_single_hash_gpu, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, +# else + nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, // VARIANT_GPU +# endif + # ifndef XMRIG_NO_AEON cryptonight_single_hash, cryptonight_double_hash, @@ -282,6 +297,7 @@ xmrig::CpuThread::cn_hash_fun xmrig::CpuThread::fn(Algo algorithm, AlgoVariant a nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, // VARIANT_2 nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, // VARIANT_HALF nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, // VARIANT_TRTL + nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, // VARIANT_GPU # else nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, // VARIANT_0 nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, // VARIANT_1 @@ -294,6 +310,7 @@ xmrig::CpuThread::cn_hash_fun xmrig::CpuThread::fn(Algo algorithm, AlgoVariant a nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, // VARIANT_2 nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, // VARIANT_HALF nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, // VARIANT_TRTL + nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, // VARIANT_GPU # endif # ifndef XMRIG_NO_SUMO @@ -340,6 +357,7 @@ xmrig::CpuThread::cn_hash_fun xmrig::CpuThread::fn(Algo algorithm, AlgoVariant a nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, // VARIANT_2 nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, // VARIANT_HALF nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, // VARIANT_TRTL + nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, // VARIANT_GPU # else nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, // VARIANT_0 nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, // VARIANT_1 @@ -352,6 +370,7 @@ xmrig::CpuThread::cn_hash_fun xmrig::CpuThread::fn(Algo algorithm, AlgoVariant a nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, // VARIANT_2 nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, // VARIANT_HALF nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, // VARIANT_TRTL + nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, // VARIANT_GPU # endif # ifndef XMRIG_NO_CN_PICO nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, // VARIANT_0 @@ -375,6 +394,8 @@ xmrig::CpuThread::cn_hash_fun xmrig::CpuThread::fn(Algo algorithm, AlgoVariant a cryptonight_triple_hash, cryptonight_quad_hash, cryptonight_penta_hash, + + nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, // VARIANT_GPU # else nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, // VARIANT_0 nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, // VARIANT_1 @@ -387,6 +408,7 @@ xmrig::CpuThread::cn_hash_fun xmrig::CpuThread::fn(Algo algorithm, AlgoVariant a nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, // VARIANT_2 nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, // VARIANT_HALF nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, // VARIANT_TRTL + nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, // VARIANT_GPU # endif # ifndef XMRIG_NO_ASM cryptonight_single_hash_asm, diff --git a/src/workers/MultiWorker.cpp b/src/workers/MultiWorker.cpp index eff330624..a25665df6 100644 --- a/src/workers/MultiWorker.cpp +++ b/src/workers/MultiWorker.cpp @@ -54,13 +54,16 @@ bool MultiWorker::selfTest() using namespace xmrig; if (m_thread->algorithm() == CRYPTONIGHT) { - return verify(VARIANT_0, test_output_v0) && - verify(VARIANT_1, test_output_v1) && - verify(VARIANT_2, test_output_v2) && - verify(VARIANT_XTL, test_output_xtl) && - verify(VARIANT_MSR, test_output_msr) && - verify(VARIANT_XAO, test_output_xao) && - verify(VARIANT_RTO, test_output_rto) && + return verify(VARIANT_0, test_output_v0) && + verify(VARIANT_1, test_output_v1) && + verify(VARIANT_2, test_output_v2) && + verify(VARIANT_XTL, test_output_xtl) && + verify(VARIANT_MSR, test_output_msr) && + verify(VARIANT_XAO, test_output_xao) && + verify(VARIANT_RTO, test_output_rto) && +# ifndef XMRIG_NO_CN_GPU + verify(VARIANT_GPU, test_output_gpu) && +# endif verify(VARIANT_HALF, test_output_half); } From eac6a97a2e65d97e6c44abb5692707eaca1e1c45 Mon Sep 17 00:00:00 2001 From: XMRig Date: Sun, 3 Feb 2019 14:48:11 +0700 Subject: [PATCH 03/17] Fix Linux build. --- src/crypto/CryptoNight_constants.h | 1 + 1 file changed, 1 insertion(+) diff --git a/src/crypto/CryptoNight_constants.h b/src/crypto/CryptoNight_constants.h index 3feb5697f..f7a9542bf 100644 --- a/src/crypto/CryptoNight_constants.h +++ b/src/crypto/CryptoNight_constants.h @@ -27,6 +27,7 @@ #define XMRIG_CRYPTONIGHT_CONSTANTS_H +#include #include From ca18622ad09e3b6faba0743d41975145f970c117 Mon Sep 17 00:00:00 2001 From: XMRig Date: Sun, 3 Feb 2019 16:00:06 +0700 Subject: [PATCH 04/17] Disable -Ofast for gcc and cn/gpu. --- cmake/cn-gpu.cmake | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cmake/cn-gpu.cmake b/cmake/cn-gpu.cmake index 0e580c565..db60fc0b1 100644 --- a/cmake/cn-gpu.cmake +++ b/cmake/cn-gpu.cmake @@ -1,7 +1,10 @@ if (WITH_CN_GPU) set(CN_GPU_SOURCES src/crypto/cn_gpu_avx.cpp src/crypto/cn_gpu_ssse3.cpp) - if (CMAKE_CXX_COMPILER_ID MATCHES GNU OR CMAKE_CXX_COMPILER_ID MATCHES Clang) + if (CMAKE_CXX_COMPILER_ID MATCHES GNU) + set_source_files_properties(src/crypto/cn_gpu_avx.cpp PROPERTIES COMPILE_FLAGS "-O3 -mavx2") + set_source_files_properties(src/crypto/cn_gpu_ssse3.cpp PROPERTIES COMPILE_FLAGS "-O3") + elseif (CMAKE_CXX_COMPILER_ID MATCHES Clang) set_source_files_properties(src/crypto/cn_gpu_avx.cpp PROPERTIES COMPILE_FLAGS "-mavx2") elseif (CMAKE_CXX_COMPILER_ID MATCHES MSVC) set_source_files_properties(src/crypto/cn_gpu_avx.cpp PROPERTIES COMPILE_FLAGS "/arch:AVX") From e9069a381e1d665366ca0765e9d8550f129ad4d2 Mon Sep 17 00:00:00 2001 From: XMRig Date: Sun, 3 Feb 2019 16:49:17 +0700 Subject: [PATCH 05/17] Disable cn/gpu for 32bit builds. --- cmake/cn-gpu.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/cn-gpu.cmake b/cmake/cn-gpu.cmake index db60fc0b1..0fc048f56 100644 --- a/cmake/cn-gpu.cmake +++ b/cmake/cn-gpu.cmake @@ -1,4 +1,4 @@ -if (WITH_CN_GPU) +if (WITH_CN_GPU AND CMAKE_SIZEOF_VOID_P EQUAL 8) set(CN_GPU_SOURCES src/crypto/cn_gpu_avx.cpp src/crypto/cn_gpu_ssse3.cpp) if (CMAKE_CXX_COMPILER_ID MATCHES GNU) From f4170ec7bc6382154d6a7d7718bb9a794b34abea Mon Sep 17 00:00:00 2001 From: XMRig Date: Sun, 3 Feb 2019 20:28:13 +0700 Subject: [PATCH 06/17] Add ARM support for cn/gpu. --- cmake/cn-gpu.cmake | 25 ++- src/common/cpu/BasicCpuInfo.cpp | 2 +- src/common/cpu/BasicCpuInfo.h | 4 +- src/common/cpu/BasicCpuInfo_arm.cpp | 6 +- src/crypto/CryptoNight_arm.h | 59 ++++++- src/crypto/cn_gpu_arm.cpp | 240 ++++++++++++++++++++++++++++ 6 files changed, 321 insertions(+), 15 deletions(-) create mode 100644 src/crypto/cn_gpu_arm.cpp diff --git a/cmake/cn-gpu.cmake b/cmake/cn-gpu.cmake index 0fc048f56..804f657b6 100644 --- a/cmake/cn-gpu.cmake +++ b/cmake/cn-gpu.cmake @@ -1,13 +1,22 @@ if (WITH_CN_GPU AND CMAKE_SIZEOF_VOID_P EQUAL 8) - set(CN_GPU_SOURCES src/crypto/cn_gpu_avx.cpp src/crypto/cn_gpu_ssse3.cpp) - if (CMAKE_CXX_COMPILER_ID MATCHES GNU) - set_source_files_properties(src/crypto/cn_gpu_avx.cpp PROPERTIES COMPILE_FLAGS "-O3 -mavx2") - set_source_files_properties(src/crypto/cn_gpu_ssse3.cpp PROPERTIES COMPILE_FLAGS "-O3") - elseif (CMAKE_CXX_COMPILER_ID MATCHES Clang) - set_source_files_properties(src/crypto/cn_gpu_avx.cpp PROPERTIES COMPILE_FLAGS "-mavx2") - elseif (CMAKE_CXX_COMPILER_ID MATCHES MSVC) - set_source_files_properties(src/crypto/cn_gpu_avx.cpp PROPERTIES COMPILE_FLAGS "/arch:AVX") + if (XMRIG_ARM) + set(CN_GPU_SOURCES src/crypto/cn_gpu_arm.cpp) + + if (CMAKE_CXX_COMPILER_ID MATCHES GNU) + set_source_files_properties(src/crypto/cn_gpu_arm.cpp PROPERTIES COMPILE_FLAGS "-O3") + endif() + else() + set(CN_GPU_SOURCES src/crypto/cn_gpu_avx.cpp src/crypto/cn_gpu_ssse3.cpp) + + if (CMAKE_CXX_COMPILER_ID MATCHES GNU) + set_source_files_properties(src/crypto/cn_gpu_avx.cpp PROPERTIES COMPILE_FLAGS "-O3 -mavx2") + set_source_files_properties(src/crypto/cn_gpu_ssse3.cpp PROPERTIES COMPILE_FLAGS "-O3") + elseif (CMAKE_CXX_COMPILER_ID MATCHES Clang) + set_source_files_properties(src/crypto/cn_gpu_avx.cpp PROPERTIES COMPILE_FLAGS "-mavx2") + elseif (CMAKE_CXX_COMPILER_ID MATCHES MSVC) + set_source_files_properties(src/crypto/cn_gpu_avx.cpp PROPERTIES COMPILE_FLAGS "/arch:AVX") + endif() endif() else() set(CN_GPU_SOURCES "") diff --git a/src/common/cpu/BasicCpuInfo.cpp b/src/common/cpu/BasicCpuInfo.cpp index 0e6ff94aa..e9018c98a 100644 --- a/src/common/cpu/BasicCpuInfo.cpp +++ b/src/common/cpu/BasicCpuInfo.cpp @@ -109,9 +109,9 @@ static inline bool has_avx2() xmrig::BasicCpuInfo::BasicCpuInfo() : m_assembly(ASM_NONE), - m_brand(), m_aes(has_aes_ni()), m_avx2(has_avx2()), + m_brand(), m_threads(std::thread::hardware_concurrency()) { cpu_brand_string(m_brand); diff --git a/src/common/cpu/BasicCpuInfo.h b/src/common/cpu/BasicCpuInfo.h index 2e0b3d0de..95857ed27 100644 --- a/src/common/cpu/BasicCpuInfo.h +++ b/src/common/cpu/BasicCpuInfo.h @@ -60,9 +60,9 @@ protected: private: Assembly m_assembly; + bool m_aes; + bool m_avx2; char m_brand[64]; - const bool m_aes; - const bool m_avx2; int32_t m_threads; }; diff --git a/src/common/cpu/BasicCpuInfo_arm.cpp b/src/common/cpu/BasicCpuInfo_arm.cpp index c1c127db6..e1df86df4 100644 --- a/src/common/cpu/BasicCpuInfo_arm.cpp +++ b/src/common/cpu/BasicCpuInfo_arm.cpp @@ -4,8 +4,9 @@ * Copyright 2014 Lucas Jones * Copyright 2014-2016 Wolf9466 * Copyright 2016 Jay D Dee - * Copyright 2017-2018 XMR-Stak , - * Copyright 2016-2018 XMRig , + * Copyright 2017-2019 XMR-Stak , + * Copyright 2018-2019 SChernykh + * Copyright 2016-2019 XMRig * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -30,6 +31,7 @@ xmrig::BasicCpuInfo::BasicCpuInfo() : m_aes(false), + m_avx2(false), m_brand(), m_threads(std::thread::hardware_concurrency()) { diff --git a/src/crypto/CryptoNight_arm.h b/src/crypto/CryptoNight_arm.h index b8c5092f1..456b5d744 100644 --- a/src/crypto/CryptoNight_arm.h +++ b/src/crypto/CryptoNight_arm.h @@ -5,9 +5,9 @@ * Copyright 2014-2016 Wolf9466 * Copyright 2016 Jay D Dee * Copyright 2016 Imran Yusuff - * Copyright 2017-2018 XMR-Stak , + * Copyright 2017-2019 XMR-Stak , * Copyright 2018 Lee Clagett - * Copyright 2018 SChernykh + * Copyright 2018-2019 SChernykh * Copyright 2016-2019 XMRig , * * This program is free software: you can redistribute it and/or modify @@ -284,6 +284,34 @@ static inline void cn_explode_scratchpad(const __m128i *input, __m128i *output) } +#ifndef XMRIG_NO_CN_GPU +template +void cn_explode_scratchpad_gpu(const uint8_t *input, uint8_t *output) +{ + constexpr size_t hash_size = 200; // 25x8 bytes + alignas(16) uint64_t hash[25]; + + for (uint64_t i = 0; i < MEM / 512; i++) + { + memcpy(hash, input, hash_size); + hash[0] ^= i; + + xmrig::keccakf(hash, 24); + memcpy(output, hash, 160); + output += 160; + + xmrig::keccakf(hash, 24); + memcpy(output, hash, 176); + output += 176; + + xmrig::keccakf(hash, 24); + memcpy(output, hash, 176); + output += 176; + } +} +#endif + + template static inline void cn_implode_scratchpad(const __m128i *input, __m128i *output) { @@ -541,6 +569,33 @@ inline void cryptonight_single_hash(const uint8_t *__restrict__ input, size_t si } +#ifndef XMRIG_NO_CN_GPU +template +void cn_gpu_inner_arm(const uint8_t *spad, uint8_t *lpad); + + +template +inline void cryptonight_single_hash_gpu(const uint8_t *__restrict__ input, size_t size, uint8_t *__restrict__ output, cryptonight_ctx **__restrict__ ctx) +{ + constexpr size_t MASK = xmrig::CRYPTONIGHT_GPU_MASK; + constexpr size_t ITERATIONS = xmrig::cn_select_iter(); + constexpr size_t MEM = xmrig::cn_select_memory(); + + static_assert(MASK > 0 && ITERATIONS > 0 && MEM > 0, "unsupported algorithm/variant"); + + xmrig::keccak(input, size, ctx[0]->state); + cn_explode_scratchpad_gpu(ctx[0]->state, ctx[0]->memory); + + cn_gpu_inner_arm(ctx[0]->state, ctx[0]->memory); + + cn_implode_scratchpad((__m128i*) ctx[0]->memory, (__m128i*) ctx[0]->state); + + xmrig::keccakf((uint64_t*) ctx[0]->state, 24); + memcpy(output, ctx[0]->state, 32); +} +#endif + + template inline void cryptonight_double_hash(const uint8_t *__restrict__ input, size_t size, uint8_t *__restrict__ output, struct cryptonight_ctx **__restrict__ ctx) { diff --git a/src/crypto/cn_gpu_arm.cpp b/src/crypto/cn_gpu_arm.cpp new file mode 100644 index 000000000..b463dd2ec --- /dev/null +++ b/src/crypto/cn_gpu_arm.cpp @@ -0,0 +1,240 @@ +/* XMRig + * Copyright 2010 Jeff Garzik + * Copyright 2012-2014 pooler + * Copyright 2014 Lucas Jones + * Copyright 2014-2016 Wolf9466 + * Copyright 2016 Jay D Dee + * Copyright 2017-2019 XMR-Stak , + * Copyright 2018-2019 SChernykh + * Copyright 2016-2019 XMRig + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + + +#include + + +#include "crypto/CryptoNight_constants.h" + + +inline void vandq_f32(float32x4_t &v, uint32_t v2) +{ + uint32x4_t vc = vdupq_n_u32(v2); + v = (float32x4_t)vandq_u32((uint32x4_t)v, vc); +} + + +inline void vorq_f32(float32x4_t &v, uint32_t v2) +{ + uint32x4_t vc = vdupq_n_u32(v2); + v = (float32x4_t)vorrq_u32((uint32x4_t)v, vc); +} + + +template +inline void vrot_si32(int32x4_t &r) +{ + r = (int32x4_t)vextq_s8((int8x16_t)r, (int8x16_t)r, v); +} + +template <> +inline void vrot_si32<0>(int32x4_t &r) +{ +} + + +inline uint32_t vheor_s32(const int32x4_t &v) +{ + int32x4_t v0 = veorq_s32(v, vrev64q_s32(v)); + int32x2_t vf = veor_s32(vget_high_s32(v0), vget_low_s32(v0)); + return (uint32_t)vget_lane_s32(vf, 0); +} + + +inline void prep_dv(int32_t *idx, int32x4_t &v, float32x4_t &n) +{ + v = vld1q_s32(idx); + n = vcvtq_f32_s32(v); +} + + +inline void sub_round(const float32x4_t &n0, const float32x4_t &n1, const float32x4_t &n2, const float32x4_t &n3, const float32x4_t &rnd_c, float32x4_t &n, float32x4_t &d, float32x4_t &c) +{ + float32x4_t ln1 = vaddq_f32(n1, c); + float32x4_t nn = vmulq_f32(n0, c); + nn = vmulq_f32(ln1, vmulq_f32(nn, nn)); + vandq_f32(nn, 0xFEFFFFFF); + vorq_f32(nn, 0x00800000); + n = vaddq_f32(n, nn); + + float32x4_t ln3 = vsubq_f32(n3, c); + float32x4_t dd = vmulq_f32(n2, c); + dd = vmulq_f32(ln3, vmulq_f32(dd, dd)); + vandq_f32(dd, 0xFEFFFFFF); + vorq_f32(dd, 0x00800000); + d = vaddq_f32(d, dd); + + //Constant feedback + c = vaddq_f32(c, rnd_c); + c = vaddq_f32(c, vdupq_n_f32(0.734375f)); + float32x4_t r = vaddq_f32(nn, dd); + vandq_f32(r, 0x807FFFFF); + vorq_f32(r, 0x40000000); + c = vaddq_f32(c, r); +} + + +inline void round_compute(const float32x4_t &n0, const float32x4_t &n1, const float32x4_t &n2, const float32x4_t &n3, const float32x4_t &rnd_c, float32x4_t &c, float32x4_t &r) +{ + float32x4_t n = vdupq_n_f32(0.0f), d = vdupq_n_f32(0.0f); + + sub_round(n0, n1, n2, n3, rnd_c, n, d, c); + sub_round(n1, n2, n3, n0, rnd_c, n, d, c); + sub_round(n2, n3, n0, n1, rnd_c, n, d, c); + sub_round(n3, n0, n1, n2, rnd_c, n, d, c); + sub_round(n3, n2, n1, n0, rnd_c, n, d, c); + sub_round(n2, n1, n0, n3, rnd_c, n, d, c); + sub_round(n1, n0, n3, n2, rnd_c, n, d, c); + sub_round(n0, n3, n2, n1, rnd_c, n, d, c); + + // Make sure abs(d) > 2.0 - this prevents division by zero and accidental overflows by division by < 1.0 + vandq_f32(d, 0xFF7FFFFF); + vorq_f32(d, 0x40000000); + r = vaddq_f32(r, vdivq_f32(n, d)); +} + + +// 112×4 = 448 +template +inline int32x4_t single_compute(const float32x4_t &n0, const float32x4_t &n1, const float32x4_t &n2, const float32x4_t &n3, float cnt, const float32x4_t &rnd_c, float32x4_t &sum) +{ + float32x4_t c = vdupq_n_f32(cnt); + float32x4_t r = vdupq_n_f32(0.0f); + + round_compute(n0, n1, n2, n3, rnd_c, c, r); + round_compute(n0, n1, n2, n3, rnd_c, c, r); + round_compute(n0, n1, n2, n3, rnd_c, c, r); + round_compute(n0, n1, n2, n3, rnd_c, c, r); + + // do a quick fmod by setting exp to 2 + vandq_f32(r, 0x807FFFFF); + vorq_f32(r, 0x40000000); + + if (add) { + sum = vaddq_f32(sum, r); + } else { + sum = r; + } + + const float32x4_t cc2 = vdupq_n_f32(536870880.0f); + r = vmulq_f32(r, cc2); // 35 + return vcvtq_s32_f32(r); +} + + +template +inline void single_compute_wrap(const float32x4_t &n0, const float32x4_t &n1, const float32x4_t &n2, const float32x4_t &n3, float cnt, const float32x4_t &rnd_c, float32x4_t &sum, int32x4_t &out) +{ + int32x4_t r = single_compute(n0, n1, n2, n3, cnt, rnd_c, sum); + vrot_si32(r); + out = veorq_s32(out, r); +} + + +template +inline int32_t *scratchpad_ptr(uint8_t* lpad, uint32_t idx, size_t n) { return reinterpret_cast(lpad + (idx & MASK) + n * 16); } + + +template +void cn_gpu_inner_arm(const uint8_t *spad, uint8_t *lpad) +{ + uint32_t s = reinterpret_cast(spad)[0] >> 8; + int32_t *idx0 = scratchpad_ptr(lpad, s, 0); + int32_t *idx1 = scratchpad_ptr(lpad, s, 1); + int32_t *idx2 = scratchpad_ptr(lpad, s, 2); + int32_t *idx3 = scratchpad_ptr(lpad, s, 3); + float32x4_t sum0 = vdupq_n_f32(0.0f); + + for (size_t i = 0; i < ITER; i++) { + float32x4_t n0, n1, n2, n3; + int32x4_t v0, v1, v2, v3; + float32x4_t suma, sumb, sum1, sum2, sum3; + + prep_dv(idx0, v0, n0); + prep_dv(idx1, v1, n1); + prep_dv(idx2, v2, n2); + prep_dv(idx3, v3, n3); + float32x4_t rc = sum0; + + int32x4_t out, out2; + out = vdupq_n_s32(0); + single_compute_wrap<0>(n0, n1, n2, n3, 1.3437500f, rc, suma, out); + single_compute_wrap<1>(n0, n2, n3, n1, 1.2812500f, rc, suma, out); + single_compute_wrap<2>(n0, n3, n1, n2, 1.3593750f, rc, sumb, out); + single_compute_wrap<3>(n0, n3, n2, n1, 1.3671875f, rc, sumb, out); + sum0 = vaddq_f32(suma, sumb); + vst1q_s32(idx0, veorq_s32(v0, out)); + out2 = out; + + out = vdupq_n_s32(0); + single_compute_wrap<0>(n1, n0, n2, n3, 1.4296875f, rc, suma, out); + single_compute_wrap<1>(n1, n2, n3, n0, 1.3984375f, rc, suma, out); + single_compute_wrap<2>(n1, n3, n0, n2, 1.3828125f, rc, sumb, out); + single_compute_wrap<3>(n1, n3, n2, n0, 1.3046875f, rc, sumb, out); + sum1 = vaddq_f32(suma, sumb); + vst1q_s32(idx1, veorq_s32(v1, out)); + out2 = veorq_s32(out2, out); + + out = vdupq_n_s32(0); + single_compute_wrap<0>(n2, n1, n0, n3, 1.4140625f, rc, suma, out); + single_compute_wrap<1>(n2, n0, n3, n1, 1.2734375f, rc, suma, out); + single_compute_wrap<2>(n2, n3, n1, n0, 1.2578125f, rc, sumb, out); + single_compute_wrap<3>(n2, n3, n0, n1, 1.2890625f, rc, sumb, out); + sum2 = vaddq_f32(suma, sumb); + vst1q_s32(idx2, veorq_s32(v2, out)); + out2 = veorq_s32(out2, out); + + out = vdupq_n_s32(0); + single_compute_wrap<0>(n3, n1, n2, n0, 1.3203125f, rc, suma, out); + single_compute_wrap<1>(n3, n2, n0, n1, 1.3515625f, rc, suma, out); + single_compute_wrap<2>(n3, n0, n1, n2, 1.3359375f, rc, sumb, out); + single_compute_wrap<3>(n3, n0, n2, n1, 1.4609375f, rc, sumb, out); + sum3 = vaddq_f32(suma, sumb); + vst1q_s32(idx3, veorq_s32(v3, out)); + out2 = veorq_s32(out2, out); + + sum0 = vaddq_f32(sum0, sum1); + sum2 = vaddq_f32(sum2, sum3); + sum0 = vaddq_f32(sum0, sum2); + + const float32x4_t cc1 = vdupq_n_f32(16777216.0f); + const float32x4_t cc2 = vdupq_n_f32(64.0f); + vandq_f32(sum0, 0x7fffffff); // take abs(va) by masking the float sign bit + // vs range 0 - 64 + n0 = vmulq_f32(sum0, cc1); + v0 = vcvtq_s32_f32(n0); + v0 = veorq_s32(v0, out2); + uint32_t n = vheor_s32(v0); + + // vs is now between 0 and 1 + sum0 = vdivq_f32(sum0, cc2); + idx0 = scratchpad_ptr(lpad, n, 0); + idx1 = scratchpad_ptr(lpad, n, 1); + idx2 = scratchpad_ptr(lpad, n, 2); + idx3 = scratchpad_ptr(lpad, n, 3); + } +} + +template void cn_gpu_inner_arm(const uint8_t* spad, uint8_t* lpad); From 5f113a47cfadda64242d340721d1cf1e6ed45d89 Mon Sep 17 00:00:00 2001 From: XMRig Date: Sun, 3 Feb 2019 20:34:24 +0700 Subject: [PATCH 07/17] Fix typo. --- src/crypto/cn_gpu_avx.cpp | 22 ++++++++++----------- src/crypto/cn_gpu_ssse3.cpp | 38 ++++++++++++++++++------------------- 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/src/crypto/cn_gpu_avx.cpp b/src/crypto/cn_gpu_avx.cpp index a808e34ce..3dc7cacb7 100644 --- a/src/crypto/cn_gpu_avx.cpp +++ b/src/crypto/cn_gpu_avx.cpp @@ -88,7 +88,7 @@ inline void round_compute(const __m256& n0, const __m256& n1, const __m256& n2, // 112×4 = 448 template -inline __m256i double_comupte(const __m256& n0, const __m256& n1, const __m256& n2, const __m256& n3, +inline __m256i double_compute(const __m256& n0, const __m256& n1, const __m256& n2, const __m256& n3, float lcnt, float hcnt, const __m256& rnd_c, __m256& sum) { __m256 c = _mm256_insertf128_ps(_mm256_castps128_ps256(_mm_set1_ps(lcnt)), _mm_set1_ps(hcnt), 1); @@ -113,10 +113,10 @@ inline __m256i double_comupte(const __m256& n0, const __m256& n1, const __m256& } template -inline void double_comupte_wrap(const __m256& n0, const __m256& n1, const __m256& n2, const __m256& n3, +inline void double_compute_wrap(const __m256& n0, const __m256& n1, const __m256& n2, const __m256& n3, float lcnt, float hcnt, const __m256& rnd_c, __m256& sum, __m256i& out) { - __m256i r = double_comupte(n0, n1, n2, n3, lcnt, hcnt, rnd_c, sum); + __m256i r = double_compute(n0, n1, n2, n3, lcnt, hcnt, rnd_c, sum); if(rot != 0) r = _mm256_or_si256(_mm256_bslli_epi128(r, 16 - rot), _mm256_bsrli_epi128(r, rot)); @@ -151,10 +151,10 @@ void cn_gpu_inner_avx(const uint8_t* spad, uint8_t* lpad) n33 = _mm256_permute2f128_ps(n23, n23, 0x11); out = _mm256_setzero_si256(); - double_comupte_wrap<0>(n01, n10, n22, n33, 1.3437500f, 1.4296875f, rc, suma, out); - double_comupte_wrap<1>(n01, n22, n33, n10, 1.2812500f, 1.3984375f, rc, suma, out); - double_comupte_wrap<2>(n01, n33, n10, n22, 1.3593750f, 1.3828125f, rc, sumb, out); - double_comupte_wrap<3>(n01, n33, n22, n10, 1.3671875f, 1.3046875f, rc, sumb, out); + double_compute_wrap<0>(n01, n10, n22, n33, 1.3437500f, 1.4296875f, rc, suma, out); + double_compute_wrap<1>(n01, n22, n33, n10, 1.2812500f, 1.3984375f, rc, suma, out); + double_compute_wrap<2>(n01, n33, n10, n22, 1.3593750f, 1.3828125f, rc, sumb, out); + double_compute_wrap<3>(n01, n33, n22, n10, 1.3671875f, 1.3046875f, rc, sumb, out); _mm256_store_si256(idx0, _mm256_xor_si256(v01, out)); sum0 = _mm256_add_ps(suma, sumb); out2 = out; @@ -165,10 +165,10 @@ void cn_gpu_inner_avx(const uint8_t* spad, uint8_t* lpad) n30 = _mm256_permute2f128_ps(n01, n23, 0x03); out = _mm256_setzero_si256(); - double_comupte_wrap<0>(n23, n11, n02, n30, 1.4140625f, 1.3203125f, rc, suma, out); - double_comupte_wrap<1>(n23, n02, n30, n11, 1.2734375f, 1.3515625f, rc, suma, out); - double_comupte_wrap<2>(n23, n30, n11, n02, 1.2578125f, 1.3359375f, rc, sumb, out); - double_comupte_wrap<3>(n23, n30, n02, n11, 1.2890625f, 1.4609375f, rc, sumb, out); + double_compute_wrap<0>(n23, n11, n02, n30, 1.4140625f, 1.3203125f, rc, suma, out); + double_compute_wrap<1>(n23, n02, n30, n11, 1.2734375f, 1.3515625f, rc, suma, out); + double_compute_wrap<2>(n23, n30, n11, n02, 1.2578125f, 1.3359375f, rc, sumb, out); + double_compute_wrap<3>(n23, n30, n02, n11, 1.2890625f, 1.4609375f, rc, sumb, out); _mm256_store_si256(idx2, _mm256_xor_si256(v23, out)); sum1 = _mm256_add_ps(suma, sumb); diff --git a/src/crypto/cn_gpu_ssse3.cpp b/src/crypto/cn_gpu_ssse3.cpp index d986752cb..ce3d19add 100644 --- a/src/crypto/cn_gpu_ssse3.cpp +++ b/src/crypto/cn_gpu_ssse3.cpp @@ -90,7 +90,7 @@ inline void round_compute(__m128 n0, __m128 n1, __m128 n2, __m128 n3, __m128 rnd // 112×4 = 448 template -inline __m128i single_comupte(__m128 n0, __m128 n1, __m128 n2, __m128 n3, float cnt, __m128 rnd_c, __m128& sum) +inline __m128i single_compute(__m128 n0, __m128 n1, __m128 n2, __m128 n3, float cnt, __m128 rnd_c, __m128& sum) { __m128 c = _mm_set1_ps(cnt); __m128 r = _mm_setzero_ps(); @@ -114,9 +114,9 @@ inline __m128i single_comupte(__m128 n0, __m128 n1, __m128 n2, __m128 n3, floa } template -inline void single_comupte_wrap(__m128 n0, __m128 n1, __m128 n2, __m128 n3, float cnt, __m128 rnd_c, __m128& sum, __m128i& out) +inline void single_compute_wrap(__m128 n0, __m128 n1, __m128 n2, __m128 n3, float cnt, __m128 rnd_c, __m128& sum, __m128i& out) { - __m128i r = single_comupte(n0, n1, n2, n3, cnt, rnd_c, sum); + __m128i r = single_compute(n0, n1, n2, n3, cnt, rnd_c, sum); if(rot != 0) r = _mm_or_si128(_mm_slli_si128(r, 16 - rot), _mm_srli_si128(r, rot)); out = _mm_xor_si128(out, r); @@ -149,37 +149,37 @@ void cn_gpu_inner_ssse3(const uint8_t* spad, uint8_t* lpad) __m128i out, out2; out = _mm_setzero_si128(); - single_comupte_wrap<0>(n0, n1, n2, n3, 1.3437500f, rc, suma, out); - single_comupte_wrap<1>(n0, n2, n3, n1, 1.2812500f, rc, suma, out); - single_comupte_wrap<2>(n0, n3, n1, n2, 1.3593750f, rc, sumb, out); - single_comupte_wrap<3>(n0, n3, n2, n1, 1.3671875f, rc, sumb, out); + single_compute_wrap<0>(n0, n1, n2, n3, 1.3437500f, rc, suma, out); + single_compute_wrap<1>(n0, n2, n3, n1, 1.2812500f, rc, suma, out); + single_compute_wrap<2>(n0, n3, n1, n2, 1.3593750f, rc, sumb, out); + single_compute_wrap<3>(n0, n3, n2, n1, 1.3671875f, rc, sumb, out); sum0 = _mm_add_ps(suma, sumb); _mm_store_si128(idx0, _mm_xor_si128(v0, out)); out2 = out; out = _mm_setzero_si128(); - single_comupte_wrap<0>(n1, n0, n2, n3, 1.4296875f, rc, suma, out); - single_comupte_wrap<1>(n1, n2, n3, n0, 1.3984375f, rc, suma, out); - single_comupte_wrap<2>(n1, n3, n0, n2, 1.3828125f, rc, sumb, out); - single_comupte_wrap<3>(n1, n3, n2, n0, 1.3046875f, rc, sumb, out); + single_compute_wrap<0>(n1, n0, n2, n3, 1.4296875f, rc, suma, out); + single_compute_wrap<1>(n1, n2, n3, n0, 1.3984375f, rc, suma, out); + single_compute_wrap<2>(n1, n3, n0, n2, 1.3828125f, rc, sumb, out); + single_compute_wrap<3>(n1, n3, n2, n0, 1.3046875f, rc, sumb, out); sum1 = _mm_add_ps(suma, sumb); _mm_store_si128(idx1, _mm_xor_si128(v1, out)); out2 = _mm_xor_si128(out2, out); out = _mm_setzero_si128(); - single_comupte_wrap<0>(n2, n1, n0, n3, 1.4140625f, rc, suma, out); - single_comupte_wrap<1>(n2, n0, n3, n1, 1.2734375f, rc, suma, out); - single_comupte_wrap<2>(n2, n3, n1, n0, 1.2578125f, rc, sumb, out); - single_comupte_wrap<3>(n2, n3, n0, n1, 1.2890625f, rc, sumb, out); + single_compute_wrap<0>(n2, n1, n0, n3, 1.4140625f, rc, suma, out); + single_compute_wrap<1>(n2, n0, n3, n1, 1.2734375f, rc, suma, out); + single_compute_wrap<2>(n2, n3, n1, n0, 1.2578125f, rc, sumb, out); + single_compute_wrap<3>(n2, n3, n0, n1, 1.2890625f, rc, sumb, out); sum2 = _mm_add_ps(suma, sumb); _mm_store_si128(idx2, _mm_xor_si128(v2, out)); out2 = _mm_xor_si128(out2, out); out = _mm_setzero_si128(); - single_comupte_wrap<0>(n3, n1, n2, n0, 1.3203125f, rc, suma, out); - single_comupte_wrap<1>(n3, n2, n0, n1, 1.3515625f, rc, suma, out); - single_comupte_wrap<2>(n3, n0, n1, n2, 1.3359375f, rc, sumb, out); - single_comupte_wrap<3>(n3, n0, n2, n1, 1.4609375f, rc, sumb, out); + single_compute_wrap<0>(n3, n1, n2, n0, 1.3203125f, rc, suma, out); + single_compute_wrap<1>(n3, n2, n0, n1, 1.3515625f, rc, suma, out); + single_compute_wrap<2>(n3, n0, n1, n2, 1.3359375f, rc, sumb, out); + single_compute_wrap<3>(n3, n0, n2, n1, 1.4609375f, rc, sumb, out); sum3 = _mm_add_ps(suma, sumb); _mm_store_si128(idx3, _mm_xor_si128(v3, out)); out2 = _mm_xor_si128(out2, out); From 3337f5ac43d0070127d635df6e230cb9a553bfc1 Mon Sep 17 00:00:00 2001 From: XMRig Date: Sun, 3 Feb 2019 20:43:49 +0700 Subject: [PATCH 08/17] Fix ARM builds with clang. --- cmake/cn-gpu.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/cn-gpu.cmake b/cmake/cn-gpu.cmake index 804f657b6..81092519b 100644 --- a/cmake/cn-gpu.cmake +++ b/cmake/cn-gpu.cmake @@ -3,7 +3,7 @@ if (WITH_CN_GPU AND CMAKE_SIZEOF_VOID_P EQUAL 8) if (XMRIG_ARM) set(CN_GPU_SOURCES src/crypto/cn_gpu_arm.cpp) - if (CMAKE_CXX_COMPILER_ID MATCHES GNU) + if (CMAKE_CXX_COMPILER_ID MATCHES GNU OR CMAKE_CXX_COMPILER_ID MATCHES Clang) set_source_files_properties(src/crypto/cn_gpu_arm.cpp PROPERTIES COMPILE_FLAGS "-O3") endif() else() From 7e4858db2a537b4777073814157ce17a90740fab Mon Sep 17 00:00:00 2001 From: XMRig Date: Mon, 4 Feb 2019 02:23:05 +0700 Subject: [PATCH 09/17] Allow override ARM arch detection and support for ARMv8 without crypto extension. --- CMakeLists.txt | 1 + cmake/cpu.cmake | 48 ++++++++++++++++++++++++++++++++--------------- cmake/flags.cmake | 8 ++++---- 3 files changed, 38 insertions(+), 19 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3d0042afe..cd5530188 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,6 +11,7 @@ option(WITH_DEBUG_LOG "Enable debug log output" OFF) option(WITH_TLS "Enable OpenSSL support" ON) option(WITH_ASM "Enable ASM PoW implementations" ON) option(BUILD_STATIC "Build static binary" OFF) +option(ARM_TARGET "Force use specific ARM target 8 or 7" 0) include (CheckIncludeFile) include (cmake/cpu.cmake) diff --git a/cmake/cpu.cmake b/cmake/cpu.cmake index 96e61e2b6..2fdebad81 100644 --- a/cmake/cpu.cmake +++ b/cmake/cpu.cmake @@ -7,19 +7,37 @@ if (CMAKE_SYSTEM_PROCESSOR MATCHES "^(x86_64|AMD64)$") add_definitions(/DRAPIDJSON_SSE2) endif() - -if (CMAKE_SYSTEM_PROCESSOR MATCHES "^(aarch64)$") - set(XMRIG_ARM ON) - set(XMRIG_ARMv8 ON) - set(WITH_LIBCPUID OFF) - - add_definitions(/DXMRIG_ARM) - add_definitions(/DXMRIG_ARMv8) -elseif (CMAKE_SYSTEM_PROCESSOR MATCHES "^(armv7|armv7f|armv7s|armv7k|armv7-a|armv7l)$") - set(XMRIG_ARM ON) - set(XMRIG_ARMv7 ON) - set(WITH_LIBCPUID OFF) - - add_definitions(/DXMRIG_ARM) - add_definitions(/DXMRIG_ARMv7) +if (NOT ARM_TARGET) + if (CMAKE_SYSTEM_PROCESSOR MATCHES "^(aarch64|arm64|armv8-a)$") + set(ARM_TARGET 8) + elseif (CMAKE_SYSTEM_PROCESSOR MATCHES "^(armv7|armv7f|armv7s|armv7k|armv7-a|armv7l)$") + set(ARM_TARGET 7) + endif() +endif() + +if (ARM_TARGET AND ARM_TARGET GREATER 6) + set(XMRIG_ARM ON) + set(WITH_LIBCPUID OFF) + add_definitions(/DXMRIG_ARM) + + message(STATUS "Use ARM_TARGET=${ARM_TARGET} (${CMAKE_SYSTEM_PROCESSOR})") + + include(CheckCXXCompilerFlag) + + if (ARM_TARGET EQUAL 8) + set(XMRIG_ARMv8 ON) + add_definitions(/DXMRIG_ARMv8) + + CHECK_CXX_COMPILER_FLAG(-march=armv8-a+crypto XMRIG_ARM_CRYPTO) + + if (XMRIG_ARM_CRYPTO) + add_definitions(/DXMRIG_ARM_CRYPTO) + set(ARM8_CXX_FLAGS "-march=armv8-a+crypto") + else() + set(ARM8_CXX_FLAGS "-march=armv8-a") + endif() + elseif (ARM_TARGET EQUAL 7) + set(XMRIG_ARMv7 ON) + add_definitions(/DXMRIG_ARMv7) + endif() endif() diff --git a/cmake/flags.cmake b/cmake/flags.cmake index 8bc148042..3989cb71b 100644 --- a/cmake/flags.cmake +++ b/cmake/flags.cmake @@ -19,8 +19,8 @@ if (CMAKE_CXX_COMPILER_ID MATCHES GNU) set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -Ofast -s") if (XMRIG_ARMv8) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -march=armv8-a+crypto") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=armv8-a+crypto -flax-vector-conversions") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${ARM8_CXX_FLAGS}") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${ARM8_CXX_FLAGS} -flax-vector-conversions") elseif (XMRIG_ARMv7) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mfpu=neon") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mfpu=neon -flax-vector-conversions") @@ -60,8 +60,8 @@ elseif (CMAKE_CXX_COMPILER_ID MATCHES Clang) set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -Ofast -funroll-loops -fmerge-all-constants") if (XMRIG_ARMv8) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -march=armv8-a+crypto") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=armv8-a+crypto") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${ARM8_CXX_FLAGS}") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${ARM8_CXX_FLAGS}") elseif (XMRIG_ARMv7) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mfpu=neon -march=${CMAKE_SYSTEM_PROCESSOR}") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mfpu=neon -march=${CMAKE_SYSTEM_PROCESSOR}") From ab60add9d50584968bc656da638750fe9ae3c811 Mon Sep 17 00:00:00 2001 From: XMRig Date: Mon, 4 Feb 2019 03:03:10 +0700 Subject: [PATCH 10/17] #749 Use HWCAP to detect AES feature on ARMv8, thanks @lhirlimann. --- CMakeLists.txt | 2 +- src/common/cpu/BasicCpuInfo_arm.cpp | 13 +++++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index cd5530188..95cb12a3b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,7 +11,7 @@ option(WITH_DEBUG_LOG "Enable debug log output" OFF) option(WITH_TLS "Enable OpenSSL support" ON) option(WITH_ASM "Enable ASM PoW implementations" ON) option(BUILD_STATIC "Build static binary" OFF) -option(ARM_TARGET "Force use specific ARM target 8 or 7" 0) +option(ARM_TARGET "Force use specific ARM target 8 or 7" 0) include (CheckIncludeFile) include (cmake/cpu.cmake) diff --git a/src/common/cpu/BasicCpuInfo_arm.cpp b/src/common/cpu/BasicCpuInfo_arm.cpp index e1df86df4..339613466 100644 --- a/src/common/cpu/BasicCpuInfo_arm.cpp +++ b/src/common/cpu/BasicCpuInfo_arm.cpp @@ -25,6 +25,11 @@ #include #include +#if __ARM_FEATURE_CRYPTO +# include +# include +#endif + #include "common/cpu/BasicCpuInfo.h" @@ -35,10 +40,14 @@ xmrig::BasicCpuInfo::BasicCpuInfo() : m_brand(), m_threads(std::thread::hardware_concurrency()) { - memcpy(m_brand, "Unknown", 7); +# ifdef XMRIG_ARMv8 + memcpy(m_brand, "ARMv8", 5); +# else + memcpy(m_brand, "ARMv7", 5); +# endif # if __ARM_FEATURE_CRYPTO - m_aes = true; + m_aes = getauxval(AT_HWCAP) & HWCAP_AES; # endif } From 3f8898f22836a65311be39fddc3c6a00c7df0c6c Mon Sep 17 00:00:00 2001 From: XMRig Date: Tue, 5 Feb 2019 18:47:54 +0700 Subject: [PATCH 11/17] Sync changes. --- src/common/crypto/Algorithm.cpp | 2 ++ src/common/log/Log.h | 1 + src/common/xmrig.h | 2 +- src/crypto/CryptoNight_test.h | 3 +++ src/workers/CpuThread.cpp | 6 +++--- 5 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/common/crypto/Algorithm.cpp b/src/common/crypto/Algorithm.cpp index 9d424c575..7bd013648 100644 --- a/src/common/crypto/Algorithm.cpp +++ b/src/common/crypto/Algorithm.cpp @@ -109,6 +109,8 @@ static AlgoData const xmrStakAlgorithms[] = { { "cryptonight_masari", nullptr, xmrig::CRYPTONIGHT, xmrig::VARIANT_MSR }, { "cryptonight-bittube2", nullptr, xmrig::CRYPTONIGHT_HEAVY, xmrig::VARIANT_TUBE }, // bittube-miner { "cryptonight_alloy", nullptr, xmrig::CRYPTONIGHT, xmrig::VARIANT_XAO }, // xmr-stak-alloy + { "cryptonight_turtle", nullptr, xmrig::CRYPTONIGHT_PICO, xmrig::VARIANT_TRTL }, + { "cryptonight_gpu", nullptr, xmrig::CRYPTONIGHT, xmrig::VARIANT_GPU }, }; #endif diff --git a/src/common/log/Log.h b/src/common/log/Log.h index 788ad2631..aa03a7435 100644 --- a/src/common/log/Log.h +++ b/src/common/log/Log.h @@ -77,6 +77,7 @@ private: #define CYAN(x) "\x1B[0;36m" x "\x1B[0m" #define WHITE_BOLD(x) "\x1B[1;37m" x "\x1B[0m" #define WHITE(x) "\x1B[0;37m" x "\x1B[0m" +#define GRAY(x) "\x1B[1;30m" x "\x1B[0m" #define LOG_ERR(x, ...) Log::i()->message(ILogBackend::ERR, x, ##__VA_ARGS__) diff --git a/src/common/xmrig.h b/src/common/xmrig.h index d738028f0..09bba08bb 100644 --- a/src/common/xmrig.h +++ b/src/common/xmrig.h @@ -36,7 +36,7 @@ enum Algo { CRYPTONIGHT_LITE, /* CryptoNight (1 MB) */ CRYPTONIGHT_HEAVY, /* CryptoNight (4 MB) */ CRYPTONIGHT_PICO, /* CryptoNight (256 KB) */ - CRYPTONIGHT_MAX + ALGO_MAX }; diff --git a/src/crypto/CryptoNight_test.h b/src/crypto/CryptoNight_test.h index aadddc2eb..31a52dc5c 100644 --- a/src/crypto/CryptoNight_test.h +++ b/src/crypto/CryptoNight_test.h @@ -27,6 +27,9 @@ #define XMRIG_CRYPTONIGHT_TEST_H +#include + + const static uint8_t test_input[380] = { 0x03, 0x05, 0xA0, 0xDB, 0xD6, 0xBF, 0x05, 0xCF, 0x16, 0xE5, 0x03, 0xF3, 0xA6, 0x6F, 0x78, 0x00, 0x7C, 0xBF, 0x34, 0x14, 0x43, 0x32, 0xEC, 0xBF, 0xC2, 0x2E, 0xD9, 0x5C, 0x87, 0x00, 0x38, 0x3B, diff --git a/src/workers/CpuThread.cpp b/src/workers/CpuThread.cpp index d709fc6ef..e60267225 100644 --- a/src/workers/CpuThread.cpp +++ b/src/workers/CpuThread.cpp @@ -150,9 +150,9 @@ xmrig::CpuThread::cn_hash_fun xmrig::CpuThread::fn(Algo algorithm, AlgoVariant a assert(variant >= VARIANT_0 && variant < VARIANT_MAX); # ifndef XMRIG_NO_ASM - constexpr const size_t count = VARIANT_MAX * 10 * CRYPTONIGHT_MAX + 12; + constexpr const size_t count = VARIANT_MAX * 10 * ALGO_MAX + 12; # else - constexpr const size_t count = VARIANT_MAX * 10 * CRYPTONIGHT_MAX; + constexpr const size_t count = VARIANT_MAX * 10 * ALGO_MAX; # endif static const cn_hash_fun func_table[] = { @@ -617,7 +617,7 @@ size_t xmrig::CpuThread::fnIndex(Algo algorithm, AlgoVariant av, Variant variant return index; } - constexpr const size_t offset = VARIANT_MAX * 10 * CRYPTONIGHT_MAX; + constexpr const size_t offset = VARIANT_MAX * 10 * ALGO_MAX; size_t extra_offset = 0; if (algorithm == CRYPTONIGHT && (variant == VARIANT_2 || variant == VARIANT_HALF)) { From aabdff2cc9b21e71ac15c972d9d4ffebc8db0210 Mon Sep 17 00:00:00 2001 From: XMRig Date: Wed, 6 Feb 2019 00:38:55 +0700 Subject: [PATCH 12/17] Fixed floating-point rounding, resolved conflict between cn/2 and cn/gpu. Thanks @SChernykh. --- src/crypto/CryptoNight_arm.h | 2 ++ src/crypto/CryptoNight_x86.h | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/src/crypto/CryptoNight_arm.h b/src/crypto/CryptoNight_arm.h index 456b5d744..add7f7464 100644 --- a/src/crypto/CryptoNight_arm.h +++ b/src/crypto/CryptoNight_arm.h @@ -586,6 +586,8 @@ inline void cryptonight_single_hash_gpu(const uint8_t *__restrict__ input, size_ xmrig::keccak(input, size, ctx[0]->state); cn_explode_scratchpad_gpu(ctx[0]->state, ctx[0]->memory); + fesetround(FE_TONEAREST); + cn_gpu_inner_arm(ctx[0]->state, ctx[0]->memory); cn_implode_scratchpad((__m128i*) ctx[0]->memory, (__m128i*) ctx[0]->state); diff --git a/src/crypto/CryptoNight_x86.h b/src/crypto/CryptoNight_x86.h index 2d1aef0d6..1ae7b795b 100644 --- a/src/crypto/CryptoNight_x86.h +++ b/src/crypto/CryptoNight_x86.h @@ -616,6 +616,12 @@ inline void cryptonight_single_hash_gpu(const uint8_t *__restrict__ input, size_ xmrig::keccak(input, size, ctx[0]->state); cn_explode_scratchpad_gpu(ctx[0]->state, ctx[0]->memory); +# ifdef _MSC_VER + _control87(RC_NEAR, MCW_RC); +# else + fesetround(FE_TONEAREST); +# endif + if (xmrig::Cpu::info()->hasAVX2()) { cn_gpu_inner_avx(ctx[0]->state, ctx[0]->memory); } else { From a6a0fb965a8fde9aaeeca103f26255f9951d2e7d Mon Sep 17 00:00:00 2001 From: XMRig Date: Wed, 6 Feb 2019 01:27:50 +0700 Subject: [PATCH 13/17] Fixed self test, cn/gpu not support multihash mode. --- src/workers/MultiWorker.cpp | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/src/workers/MultiWorker.cpp b/src/workers/MultiWorker.cpp index a25665df6..9b0877b80 100644 --- a/src/workers/MultiWorker.cpp +++ b/src/workers/MultiWorker.cpp @@ -54,17 +54,24 @@ bool MultiWorker::selfTest() using namespace xmrig; if (m_thread->algorithm() == CRYPTONIGHT) { - return verify(VARIANT_0, test_output_v0) && - verify(VARIANT_1, test_output_v1) && - verify(VARIANT_2, test_output_v2) && - verify(VARIANT_XTL, test_output_xtl) && - verify(VARIANT_MSR, test_output_msr) && - verify(VARIANT_XAO, test_output_xao) && - verify(VARIANT_RTO, test_output_rto) && -# ifndef XMRIG_NO_CN_GPU - verify(VARIANT_GPU, test_output_gpu) && -# endif - verify(VARIANT_HALF, test_output_half); + const bool rc = verify(VARIANT_0, test_output_v0) && + verify(VARIANT_1, test_output_v1) && + verify(VARIANT_2, test_output_v2) && + verify(VARIANT_XTL, test_output_xtl) && + verify(VARIANT_MSR, test_output_msr) && + verify(VARIANT_XAO, test_output_xao) && + verify(VARIANT_RTO, test_output_rto) && + verify(VARIANT_HALF, test_output_half); + +# ifndef XMRIG_NO_CN_GPU + if (!rc || N > 1) { + return rc; + } + + return verify(VARIANT_GPU, test_output_gpu); +# else + return rc; +# endif } # ifndef XMRIG_NO_AEON From 1a2aaf210c263e51b2e81263883572ce62a37f5f Mon Sep 17 00:00:00 2001 From: XMRig Date: Fri, 8 Feb 2019 16:55:21 +0700 Subject: [PATCH 14/17] Sync changes. --- src/common/interfaces/IStrategy.h | 27 ++++++++++------- src/common/net/Pool.cpp | 15 ++++++---- .../net/strategies/FailoverStrategy.cpp | 11 ++++++- src/common/net/strategies/FailoverStrategy.h | 12 ++++---- .../net/strategies/SinglePoolStrategy.cpp | 9 +++++- .../net/strategies/SinglePoolStrategy.h | 14 +++++---- src/net/Network.cpp | 11 +++++-- src/net/Network.h | 11 +++---- src/net/strategies/DonateStrategy.cpp | 30 ++++++++++++++++--- src/net/strategies/DonateStrategy.h | 12 +++++--- 10 files changed, 107 insertions(+), 45 deletions(-) diff --git a/src/common/interfaces/IStrategy.h b/src/common/interfaces/IStrategy.h index 9f2795f9a..b3ac7f9cb 100644 --- a/src/common/interfaces/IStrategy.h +++ b/src/common/interfaces/IStrategy.h @@ -5,7 +5,8 @@ * Copyright 2014-2016 Wolf9466 * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , - * Copyright 2016-2018 XMRig , + * Copyright 2018-2019 SChernykh + * Copyright 2016-2019 XMRig , * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -21,8 +22,8 @@ * along with this program. If not, see . */ -#ifndef __ISTRATEGY_H__ -#define __ISTRATEGY_H__ +#ifndef XMRIG_ISTRATEGY_H +#define XMRIG_ISTRATEGY_H #include @@ -31,18 +32,24 @@ class JobResult; +namespace xmrig { + class Algorithm; +} + + class IStrategy { public: virtual ~IStrategy() {} - virtual bool isActive() const = 0; - virtual int64_t submit(const JobResult &result) = 0; - virtual void connect() = 0; - virtual void resume() = 0; - virtual void stop() = 0; - virtual void tick(uint64_t now) = 0; + virtual bool isActive() const = 0; + virtual int64_t submit(const JobResult &result) = 0; + virtual void connect() = 0; + virtual void resume() = 0; + virtual void setAlgo(const xmrig::Algorithm &algo) = 0; + virtual void stop() = 0; + virtual void tick(uint64_t now) = 0; }; -#endif // __ISTRATEGY_H__ +#endif // XMRIG_ISTRATEGY_H diff --git a/src/common/net/Pool.cpp b/src/common/net/Pool.cpp index 2010aade6..ad1ac6637 100644 --- a/src/common/net/Pool.cpp +++ b/src/common/net/Pool.cpp @@ -203,10 +203,10 @@ rapidjson::Value Pool::toJSON(rapidjson::Document &doc) const Value obj(kObjectType); - obj.AddMember("url", StringRef(url()), allocator); - obj.AddMember("user", StringRef(user()), allocator); - obj.AddMember("pass", StringRef(password()), allocator); - obj.AddMember("rig-id", rigId() ? Value(StringRef(rigId())).Move() : Value(kNullType).Move(), allocator); + obj.AddMember("url", m_url.toJSON(), allocator); + obj.AddMember("user", m_user.toJSON(), allocator); + obj.AddMember("pass", m_password.toJSON(), allocator); + obj.AddMember("rig-id", m_rigId.toJSON(), allocator); # ifndef XMRIG_PROXY_PROJECT obj.AddMember("nicehash", isNicehash(), allocator); @@ -223,17 +223,20 @@ rapidjson::Value Pool::toJSON(rapidjson::Document &doc) const case xmrig::VARIANT_AUTO: case xmrig::VARIANT_0: case xmrig::VARIANT_1: - case xmrig::VARIANT_2: obj.AddMember("variant", m_algorithm.variant(), allocator); break; + case xmrig::VARIANT_2: + obj.AddMember("variant", 2, allocator); + break; + default: obj.AddMember("variant", StringRef(m_algorithm.variantName()), allocator); break; } obj.AddMember("tls", isTLS(), allocator); - obj.AddMember("tls-fingerprint", fingerprint() ? Value(StringRef(fingerprint())).Move() : Value(kNullType).Move(), allocator); + obj.AddMember("tls-fingerprint", m_fingerprint.toJSON(), allocator); return obj; } diff --git a/src/common/net/strategies/FailoverStrategy.cpp b/src/common/net/strategies/FailoverStrategy.cpp index fab785906..3be3687d6 100644 --- a/src/common/net/strategies/FailoverStrategy.cpp +++ b/src/common/net/strategies/FailoverStrategy.cpp @@ -5,7 +5,8 @@ * Copyright 2014-2016 Wolf9466 * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , - * Copyright 2016-2018 XMRig , + * Copyright 2018-2019 SChernykh + * Copyright 2016-2019 XMRig , * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -76,6 +77,14 @@ void FailoverStrategy::resume() } +void FailoverStrategy::setAlgo(const xmrig::Algorithm &algo) +{ + for (Client *client : m_pools) { + client->setAlgo(algo); + } +} + + void FailoverStrategy::stop() { for (size_t i = 0; i < m_pools.size(); ++i) { diff --git a/src/common/net/strategies/FailoverStrategy.h b/src/common/net/strategies/FailoverStrategy.h index 07095b3b1..9fe9f9d8f 100644 --- a/src/common/net/strategies/FailoverStrategy.h +++ b/src/common/net/strategies/FailoverStrategy.h @@ -5,7 +5,8 @@ * Copyright 2014-2016 Wolf9466 * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , - * Copyright 2016-2018 XMRig , + * Copyright 2018-2019 SChernykh + * Copyright 2016-2019 XMRig , * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -21,8 +22,8 @@ * along with this program. If not, see . */ -#ifndef __FAILOVERSTRATEGY_H__ -#define __FAILOVERSTRATEGY_H__ +#ifndef XMRIG_FAILOVERSTRATEGY_H +#define XMRIG_FAILOVERSTRATEGY_H #include @@ -42,7 +43,7 @@ class FailoverStrategy : public IStrategy, public IClientListener { public: FailoverStrategy(const std::vector &urls, int retryPause, int retries, IStrategyListener *listener, bool quiet = false); - ~FailoverStrategy(); + ~FailoverStrategy() override; public: inline bool isActive() const override { return m_active >= 0; } @@ -50,6 +51,7 @@ public: int64_t submit(const JobResult &result) override; void connect() override; void resume() override; + void setAlgo(const xmrig::Algorithm &algo) override; void stop() override; void tick(uint64_t now) override; @@ -71,4 +73,4 @@ private: std::vector m_pools; }; -#endif /* __FAILOVERSTRATEGY_H__ */ +#endif /* XMRIG_FAILOVERSTRATEGY_H */ diff --git a/src/common/net/strategies/SinglePoolStrategy.cpp b/src/common/net/strategies/SinglePoolStrategy.cpp index 2cfc0976b..354bf6d6a 100644 --- a/src/common/net/strategies/SinglePoolStrategy.cpp +++ b/src/common/net/strategies/SinglePoolStrategy.cpp @@ -5,7 +5,8 @@ * Copyright 2014-2016 Wolf9466 * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , - * Copyright 2016-2018 XMRig , + * Copyright 2018-2019 SChernykh + * Copyright 2016-2019 XMRig , * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -68,6 +69,12 @@ void SinglePoolStrategy::resume() } +void SinglePoolStrategy::setAlgo(const xmrig::Algorithm &algo) +{ + m_client->setAlgo(algo); +} + + void SinglePoolStrategy::stop() { m_client->disconnect(); diff --git a/src/common/net/strategies/SinglePoolStrategy.h b/src/common/net/strategies/SinglePoolStrategy.h index 1a48d6786..f258d9cd3 100644 --- a/src/common/net/strategies/SinglePoolStrategy.h +++ b/src/common/net/strategies/SinglePoolStrategy.h @@ -5,7 +5,8 @@ * Copyright 2014-2016 Wolf9466 * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , - * Copyright 2016-2018 XMRig , + * Copyright 2018-2019 SChernykh + * Copyright 2016-2019 XMRig , * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -21,8 +22,8 @@ * along with this program. If not, see . */ -#ifndef __SINGLEPOOLSTRATEGY_H__ -#define __SINGLEPOOLSTRATEGY_H__ +#ifndef XMRIG_SINGLEPOOLSTRATEGY_H +#define XMRIG_SINGLEPOOLSTRATEGY_H #include "common/interfaces/IClientListener.h" @@ -31,14 +32,14 @@ class Client; class IStrategyListener; -class Url; +class Pool; class SinglePoolStrategy : public IStrategy, public IClientListener { public: SinglePoolStrategy(const Pool &pool, int retryPause, int retries, IStrategyListener *listener, bool quiet = false); - ~SinglePoolStrategy(); + ~SinglePoolStrategy() override; public: inline bool isActive() const override { return m_active; } @@ -46,6 +47,7 @@ public: int64_t submit(const JobResult &result) override; void connect() override; void resume() override; + void setAlgo(const xmrig::Algorithm &algo) override; void stop() override; void tick(uint64_t now) override; @@ -61,4 +63,4 @@ private: IStrategyListener *m_listener; }; -#endif /* __SINGLEPOOLSTRATEGY_H__ */ +#endif /* XMRIG_SINGLEPOOLSTRATEGY_H */ diff --git a/src/net/Network.cpp b/src/net/Network.cpp index 828203a14..b17242d6f 100644 --- a/src/net/Network.cpp +++ b/src/net/Network.cpp @@ -5,7 +5,8 @@ * Copyright 2014-2016 Wolf9466 * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , - * Copyright 2016-2018 XMRig , + * Copyright 2018-2019 SChernykh + * Copyright 2016-2019 XMRig , * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -154,12 +155,12 @@ void Network::onResultAccepted(IStrategy *strategy, Client *client, const Submit m_state.add(result, error); if (error) { - LOG_INFO(isColors() ? "\x1B[01;31mrejected\x1B[0m (%" PRId64 "/%" PRId64 ") diff \x1B[01;37m%u\x1B[0m \x1B[31m\"%s\"\x1B[0m \x1B[01;30m(%" PRIu64 " ms)" + LOG_INFO(isColors() ? "\x1B[1;31mrejected\x1B[0m (%" PRId64 "/%" PRId64 ") diff \x1B[1;37m%u\x1B[0m \x1B[31m\"%s\"\x1B[0m \x1B[1;30m(%" PRIu64 " ms)" : "rejected (%" PRId64 "/%" PRId64 ") diff %u \"%s\" (%" PRIu64 " ms)", m_state.accepted, m_state.rejected, result.diff, error, result.elapsed); } else { - LOG_INFO(isColors() ? "\x1B[01;32maccepted\x1B[0m (%" PRId64 "/%" PRId64 ") diff \x1B[01;37m%u\x1B[0m \x1B[01;30m(%" PRIu64 " ms)" + LOG_INFO(isColors() ? "\x1B[1;32maccepted\x1B[0m (%" PRId64 "/%" PRId64 ") diff \x1B[1;37m%u\x1B[0m \x1B[1;30m(%" PRIu64 " ms)" : "accepted (%" PRId64 "/%" PRId64 ") diff %u (%" PRIu64 " ms)", m_state.accepted, m_state.rejected, result.diff, result.elapsed); } @@ -178,6 +179,10 @@ void Network::setJob(Client *client, const Job &job, bool donate) : "new job from %s:%d diff %d algo %s", client->host(), client->port(), job.diff(), job.algorithm().shortName()); + if (!donate && m_donate) { + m_donate->setAlgo(job.algorithm()); + } + m_state.diff = job.diff(); Workers::setJob(job, donate); } diff --git a/src/net/Network.h b/src/net/Network.h index 51e95d6d2..aac4010bd 100644 --- a/src/net/Network.h +++ b/src/net/Network.h @@ -5,7 +5,8 @@ * Copyright 2014-2016 Wolf9466 * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , - * Copyright 2016-2018 XMRig , + * Copyright 2018-2019 SChernykh + * Copyright 2016-2019 XMRig , * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -21,8 +22,8 @@ * along with this program. If not, see . */ -#ifndef __NETWORK_H__ -#define __NETWORK_H__ +#ifndef XMRIG_NETWORK_H +#define XMRIG_NETWORK_H #include @@ -47,7 +48,7 @@ class Network : public IJobResultListener, public IStrategyListener { public: Network(xmrig::Controller *controller); - ~Network(); + ~Network() override; void connect(); void stop(); @@ -76,4 +77,4 @@ private: }; -#endif /* __NETWORK_H__ */ +#endif /* XMRIG_NETWORK_H */ diff --git a/src/net/strategies/DonateStrategy.cpp b/src/net/strategies/DonateStrategy.cpp index 6fc90842e..417a31fbf 100644 --- a/src/net/strategies/DonateStrategy.cpp +++ b/src/net/strategies/DonateStrategy.cpp @@ -5,7 +5,8 @@ * Copyright 2014-2016 Wolf9466 * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , - * Copyright 2016-2018 XMRig , + * Copyright 2018-2019 SChernykh + * Copyright 2016-2019 XMRig , * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -43,7 +44,9 @@ DonateStrategy::DonateStrategy(int level, const char *user, xmrig::Algo algo, IS m_donateTime(level * 60 * 1000), m_idleTime((100 - level) * 60 * 1000), m_strategy(nullptr), - m_listener(listener) + m_listener(listener), + m_now(0), + m_stop(0) { uint8_t hash[200]; char userId[65] = { 0 }; @@ -93,6 +96,12 @@ void DonateStrategy::connect() } +void DonateStrategy::setAlgo(const xmrig::Algorithm &algo) +{ + m_strategy->setAlgo(algo); +} + + void DonateStrategy::stop() { uv_timer_stop(&m_timer); @@ -102,7 +111,14 @@ void DonateStrategy::stop() void DonateStrategy::tick(uint64_t now) { + m_now = now; + m_strategy->tick(now); + + if (m_stop && now > m_stop) { + m_strategy->stop(); + m_stop = 0; + } } @@ -119,7 +135,9 @@ void DonateStrategy::onActive(IStrategy *strategy, Client *client) void DonateStrategy::onJob(IStrategy *strategy, Client *client, const Job &job) { - m_listener->onJob(this, client, job); + if (isActive()) { + m_listener->onJob(this, client, job); + } } @@ -142,7 +160,11 @@ void DonateStrategy::idle(uint64_t timeout) void DonateStrategy::suspend() { - m_strategy->stop(); +# if defined(XMRIG_AMD_PROJECT) || defined(XMRIG_NVIDIA_PROJECT) + m_stop = m_now + 5000; +# else + m_stop = m_now + 500; +# endif m_active = false; m_listener->onPause(this); diff --git a/src/net/strategies/DonateStrategy.h b/src/net/strategies/DonateStrategy.h index e75e41a4b..d012c1b9d 100644 --- a/src/net/strategies/DonateStrategy.h +++ b/src/net/strategies/DonateStrategy.h @@ -5,7 +5,8 @@ * Copyright 2014-2016 Wolf9466 * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , - * Copyright 2016-2018 XMRig , + * Copyright 2018-2019 SChernykh + * Copyright 2016-2019 XMRig , * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -44,7 +45,7 @@ class DonateStrategy : public IStrategy, public IStrategyListener { public: DonateStrategy(int level, const char *user, xmrig::Algo algo, IStrategyListener *listener); - ~DonateStrategy(); + ~DonateStrategy() override; public: inline bool isActive() const override { return m_active; } @@ -52,6 +53,7 @@ public: int64_t submit(const JobResult &result) override; void connect() override; + void setAlgo(const xmrig::Algorithm &algo) override; void stop() override; void tick(uint64_t now) override; @@ -68,11 +70,13 @@ private: static void onTimer(uv_timer_t *handle); bool m_active; - const int m_donateTime; - const int m_idleTime; + const uint64_t m_donateTime; + const uint64_t m_idleTime; IStrategy *m_strategy; IStrategyListener *m_listener; std::vector m_pools; + uint64_t m_now; + uint64_t m_stop; uv_timer_t m_timer; }; From 5b3ad39a9e548196bd57961da231097a49431e56 Mon Sep 17 00:00:00 2001 From: XMRig Date: Fri, 8 Feb 2019 17:25:09 +0700 Subject: [PATCH 15/17] v2.11.0-dev --- src/version.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/version.h b/src/version.h index 313d04b99..800eb4e7b 100644 --- a/src/version.h +++ b/src/version.h @@ -28,15 +28,15 @@ #define APP_ID "xmrig" #define APP_NAME "XMRig" #define APP_DESC "XMRig CPU miner" -#define APP_VERSION "2.10.1-dev" +#define APP_VERSION "2.11.0-dev" #define APP_DOMAIN "xmrig.com" #define APP_SITE "www.xmrig.com" #define APP_COPYRIGHT "Copyright (C) 2016-2019 xmrig.com" #define APP_KIND "cpu" #define APP_VER_MAJOR 2 -#define APP_VER_MINOR 10 -#define APP_VER_PATCH 1 +#define APP_VER_MINOR 11 +#define APP_VER_PATCH 0 #ifdef _MSC_VER # if (_MSC_VER >= 1910) From a5f77eb16ade0194165e8d7e977a636767293525 Mon Sep 17 00:00:00 2001 From: XMRig Date: Sat, 9 Feb 2019 03:48:24 +0700 Subject: [PATCH 16/17] #925 Fixed self test on recent macOS. --- cmake/cn-gpu.cmake | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/cmake/cn-gpu.cmake b/cmake/cn-gpu.cmake index 81092519b..b529f0b2d 100644 --- a/cmake/cn-gpu.cmake +++ b/cmake/cn-gpu.cmake @@ -9,11 +9,9 @@ if (WITH_CN_GPU AND CMAKE_SIZEOF_VOID_P EQUAL 8) else() set(CN_GPU_SOURCES src/crypto/cn_gpu_avx.cpp src/crypto/cn_gpu_ssse3.cpp) - if (CMAKE_CXX_COMPILER_ID MATCHES GNU) + if (CMAKE_CXX_COMPILER_ID MATCHES GNU OR CMAKE_CXX_COMPILER_ID MATCHES Clang) set_source_files_properties(src/crypto/cn_gpu_avx.cpp PROPERTIES COMPILE_FLAGS "-O3 -mavx2") set_source_files_properties(src/crypto/cn_gpu_ssse3.cpp PROPERTIES COMPILE_FLAGS "-O3") - elseif (CMAKE_CXX_COMPILER_ID MATCHES Clang) - set_source_files_properties(src/crypto/cn_gpu_avx.cpp PROPERTIES COMPILE_FLAGS "-mavx2") elseif (CMAKE_CXX_COMPILER_ID MATCHES MSVC) set_source_files_properties(src/crypto/cn_gpu_avx.cpp PROPERTIES COMPILE_FLAGS "/arch:AVX") endif() From a1fec1c7975d8023c10be4d4d5e18667a62809fe Mon Sep 17 00:00:00 2001 From: xmrig Date: Sat, 9 Feb 2019 16:36:28 +0700 Subject: [PATCH 17/17] Update CHANGELOG.md --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2c64497a9..171b9c04d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +# v2.11.0 +- [#928](https://github.com/xmrig/xmrig/issues/928) Added support for new algorithm `cryptonight/gpu`, short alias `cn/gpu` (original name `cryptonight-gpu`), for upcoming [Ryo currency](https://ryo-currency.com) fork on February 14. +- [#749](https://github.com/xmrig/xmrig/issues/749) Added support for detect hardware AES in runtime on ARMv8 platforms. +- [#292](https://github.com/xmrig/xmrig/issues/292) Fixed build on ARMv8 platforms if compiler not support hardware AES. + # v2.10.0 - [#904](https://github.com/xmrig/xmrig/issues/904) Added new algorithm `cn-pico/trtl` (aliases `cryptonight-turtle`, `cn-trtl`) for upcoming TurtleCoin (TRTL) fork. - Default value for option `max-cpu-usage` changed to `100` also this option now deprecated.