Build "src/base" as static library.

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 3.1)
 project(xmrig)
 
 option(WITH_HWLOC           "Enable hwloc support" ON)
@@ -33,22 +33,25 @@ option(BUILD_STATIC         "Build static binary" OFF)
 option(ARM_TARGET           "Force use specific ARM target 8 or 7" 0)
 option(HWLOC_DEBUG          "Enable hwloc debug helpers and log" OFF)
 
+add_definitions(-DXMRIG_MINER_PROJECT)
 
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake")
+set(WITH_SODIUM     OFF)
+set(WITH_CRYPTONOTE ON)
+set(WITH_CRYPTO_OPS ON)
 
+set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/src/base/cmake" "${CMAKE_SOURCE_DIR}/cmake")
+set(LIBS base)
 
-include (CheckIncludeFile)
-include (cmake/cpu.cmake)
-include (cmake/os.cmake)
-include (src/base/base.cmake)
-include (src/backend/backend.cmake)
+include(base)
+add_subdirectory(src/base)
+
+include(src/backend/backend.cmake)
 
 
 set(HEADERS
-    "${HEADERS_BASE}"
-    "${HEADERS_BASE_HTTP}"
     "${HEADERS_BACKEND}"
     src/App.h
+    src/backend/common/interfaces/IMemoryPool.h
     src/core/config/Config_default.h
     src/core/config/Config_platform.h
     src/core/config/Config.h
@@ -56,17 +59,6 @@ set(HEADERS
     src/core/config/usage.h
     src/core/Controller.h
     src/core/Miner.h
-    src/net/interfaces/IJobResultListener.h
-    src/net/JobResult.h
-    src/net/JobResults.h
-    src/net/Network.h
-    src/net/strategies/DonateStrategy.h
-    src/Summary.h
-    src/version.h
-   )
-
-set(HEADERS_CRYPTO
-    src/backend/common/interfaces/IMemoryPool.h
     src/crypto/cn/asm/CryptonightR_template.h
     src/crypto/cn/c_blake256.h
     src/crypto/cn/c_groestl.h
@@ -87,31 +79,28 @@ set(HEADERS_CRYPTO
     src/crypto/common/Nonce.h
     src/crypto/common/portable/mm_malloc.h
     src/crypto/common/VirtualMemory.h
+    src/net/interfaces/IJobResultListener.h
+    src/net/JobResult.h
+    src/net/JobResults.h
+    src/net/Network.h
+    src/net/strategies/DonateStrategy.h
+    src/Summary.h
+    src/version.h
    )
 
 if (XMRIG_ARM)
-    set(HEADERS_CRYPTO "${HEADERS_CRYPTO}" src/crypto/cn/CryptoNight_arm.h)
+    list(APPEND HEADERS src/crypto/cn/CryptoNight_arm.h)
 else()
-    set(HEADERS_CRYPTO "${HEADERS_CRYPTO}" src/crypto/cn/CryptoNight_x86.h)
+    list(APPEND HEADERS src/crypto/cn/CryptoNight_x86.h)
 endif()
 
 set(SOURCES
-    "${SOURCES_BASE}"
-    "${SOURCES_BASE_HTTP}"
     "${SOURCES_BACKEND}"
     src/App.cpp
     src/core/config/Config.cpp
     src/core/config/ConfigTransform.cpp
     src/core/Controller.cpp
     src/core/Miner.cpp
-    src/net/JobResults.cpp
-    src/net/Network.cpp
-    src/net/strategies/DonateStrategy.cpp
-    src/Summary.cpp
-    src/xmrig.cpp
-   )
-
-set(SOURCES_CRYPTO
     src/crypto/cn/c_blake256.c
     src/crypto/cn/c_groestl.c
     src/crypto/cn/c_jh.c
@@ -122,102 +111,67 @@ set(SOURCES_CRYPTO
     src/crypto/common/MemoryPool.cpp
     src/crypto/common/Nonce.cpp
     src/crypto/common/VirtualMemory.cpp
+    src/net/JobResults.cpp
+    src/net/Network.cpp
+    src/net/strategies/DonateStrategy.cpp
+    src/Summary.cpp
+    src/xmrig.cpp
    )
 
 if (WITH_HWLOC)
-    list(APPEND HEADERS_CRYPTO
+    list(APPEND HEADERS
         src/crypto/common/NUMAMemoryPool.h
         )
 
-    list(APPEND SOURCES_CRYPTO
+    list(APPEND SOURCES
         src/crypto/common/NUMAMemoryPool.cpp
         src/crypto/common/VirtualMemory_hwloc.cpp
         )
 endif()
 
 if (XMRIG_OS_WIN)
-    list(APPEND SOURCES_OS
+    list(APPEND SOURCES
         res/app.rc
         src/App_win.cpp
         src/crypto/common/VirtualMemory_win.cpp
         )
-
-    set(EXTRA_LIBS ws2_32 psapi iphlpapi userenv)
 elseif (XMRIG_OS_APPLE)
-    list(APPEND SOURCES_OS
+    list(APPEND SOURCES
         src/App_unix.cpp
         src/crypto/common/VirtualMemory_unix.cpp
         )
-
-    find_library(IOKIT_LIBRARY IOKit)
-    find_library(CORESERVICES_LIBRARY CoreServices)
-    set(EXTRA_LIBS ${IOKIT_LIBRARY} ${CORESERVICES_LIBRARY})
 else()
-    list(APPEND SOURCES_OS
+    list(APPEND SOURCES
         src/App_unix.cpp
         src/crypto/common/VirtualMemory_unix.cpp
         )
 
-    if (XMRIG_OS_ANDROID)
-        set(EXTRA_LIBS pthread rt dl log)
-    elseif (XMRIG_OS_LINUX)
-        list(APPEND SOURCES_OS
+    if (XMRIG_OS_LINUX AND NOT XMRIG_OS_ANDROID)
+        list(APPEND SOURCES
             src/crypto/common/LinuxMemory.h
             src/crypto/common/LinuxMemory.cpp
             )
-
-        set(EXTRA_LIBS pthread rt dl)
-    elseif (XMRIG_OS_FREEBSD)
-        set(EXTRA_LIBS kvm pthread)
     endif()
 endif()
 
-add_definitions(-DXMRIG_MINER_PROJECT -DXMRIG_JSON_SINGLE_LINE_ARRAY)
-add_definitions(-D__STDC_FORMAT_MACROS -DUNICODE -D_FILE_OFFSET_BITS=64)
+include_directories(src)
+include_directories(src/3rdparty)
 
-find_package(UV REQUIRED)
-
-include(cmake/flags.cmake)
-include(cmake/randomx.cmake)
-include(cmake/argon2.cmake)
-include(cmake/astrobwt.cmake)
-include(cmake/kawpow.cmake)
-include(cmake/OpenSSL.cmake)
-include(cmake/asm.cmake)
-
-if (WITH_CN_LITE)
-    add_definitions(/DXMRIG_ALGO_CN_LITE)
-endif()
-
-if (WITH_CN_HEAVY)
-    add_definitions(/DXMRIG_ALGO_CN_HEAVY)
-endif()
-
-if (WITH_CN_PICO)
-    add_definitions(/DXMRIG_ALGO_CN_PICO)
-endif()
-
-if (WITH_CN_FEMTO)
-    add_definitions(/DXMRIG_ALGO_CN_FEMTO)
-endif()
+include(randomx)
+include(argon2)
+include(astrobwt)
+include(kawpow)
+include(asm)
 
 if (WITH_EMBEDDED_CONFIG)
-    add_definitions(/DXMRIG_FEATURE_EMBEDDED_CONFIG)
+    add_definitions(-DXMRIG_FEATURE_EMBEDDED_CONFIG)
 endif()
 
 include(src/hw/api/api.cmake)
 include(src/hw/dmi/dmi.cmake)
 
-include_directories(src)
-include_directories(src/3rdparty)
-include_directories(${UV_INCLUDE_DIR})
-
-if (WITH_DEBUG_LOG)
-    add_definitions(/DAPP_DEBUG)
-endif()
-
-add_executable(${CMAKE_PROJECT_NAME} ${HEADERS} ${SOURCES} ${SOURCES_OS} ${HEADERS_CRYPTO} ${SOURCES_CRYPTO} ${SOURCES_SYSLOG} ${TLS_SOURCES} ${XMRIG_ASM_SOURCES})
-target_link_libraries(${CMAKE_PROJECT_NAME} ${XMRIG_ASM_LIBRARY} ${OPENSSL_LIBRARIES} ${UV_LIBRARIES} ${EXTRA_LIBS} ${CPUID_LIB} ${ARGON2_LIBRARY} ${ETHASH_LIBRARY})
+add_executable(${CMAKE_PROJECT_NAME} ${HEADERS} ${SOURCES})
+target_link_libraries(${CMAKE_PROJECT_NAME} ${LIBS})
 
 if (WIN32)
     add_custom_command(TARGET ${CMAKE_PROJECT_NAME} POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_SOURCE_DIR}/bin/WinRing0/WinRing0x64.sys" $<TARGET_FILE_DIR:${CMAKE_PROJECT_NAME}>)

cmake/OpenSSL.cmake

@@ -1,64 +0,0 @@
-if (WITH_TLS)
-    set(OPENSSL_ROOT_DIR ${XMRIG_DEPS})
-
-    if (WIN32)
-        set(OPENSSL_USE_STATIC_LIBS TRUE)
-        set(OPENSSL_MSVC_STATIC_RT TRUE)
-
-        set(EXTRA_LIBS ${EXTRA_LIBS} crypt32)
-    elseif (APPLE)
-        set(OPENSSL_USE_STATIC_LIBS TRUE)
-    endif()
-
-    if (BUILD_STATIC)
-        set(OPENSSL_USE_STATIC_LIBS TRUE)
-    endif()
-
-
-    find_package(OpenSSL)
-
-    if (OPENSSL_FOUND)
-        set(TLS_SOURCES
-            src/base/net/stratum/Tls.cpp
-            src/base/net/stratum/Tls.h
-            src/base/net/tls/ServerTls.cpp
-            src/base/net/tls/ServerTls.h
-            src/base/net/tls/TlsConfig.cpp
-            src/base/net/tls/TlsConfig.h
-            src/base/net/tls/TlsContext.cpp
-            src/base/net/tls/TlsContext.h
-            src/base/net/tls/TlsGen.cpp
-            src/base/net/tls/TlsGen.h
-            )
-
-        include_directories(${OPENSSL_INCLUDE_DIR})
-
-        if (WITH_HTTP)
-            set(TLS_SOURCES ${TLS_SOURCES}
-                src/base/net/https/HttpsClient.cpp
-                src/base/net/https/HttpsClient.h
-                src/base/net/https/HttpsContext.cpp
-                src/base/net/https/HttpsContext.h
-                src/base/net/https/HttpsServer.cpp
-                src/base/net/https/HttpsServer.h
-                )
-        endif()
-    else()
-        message(FATAL_ERROR "OpenSSL NOT found: use `-DWITH_TLS=OFF` to build without TLS support")
-    endif()
-
-    add_definitions(/DXMRIG_FEATURE_TLS)
-else()
-    set(TLS_SOURCES "")
-    set(OPENSSL_LIBRARIES "")
-    remove_definitions(/DXMRIG_FEATURE_TLS)
-
-    if (WITH_HTTP)
-        set(TLS_SOURCES ${TLS_SOURCES}
-            src/base/net/http/HttpServer.cpp
-            src/base/net/http/HttpServer.h
-            )
-    endif()
-
-    set(CMAKE_PROJECT_NAME "${CMAKE_PROJECT_NAME}-notls")
-endif()

cmake/argon2.cmake

@@ -1,18 +1,13 @@
 if (WITH_ARGON2)
-    add_definitions(/DXMRIG_ALGO_ARGON2)
-
-    list(APPEND HEADERS_CRYPTO
+    list(APPEND HEADERS
         src/crypto/argon2/Hash.h
         src/crypto/argon2/Impl.h
     )
 
-    list(APPEND SOURCES_CRYPTO
+    list(APPEND SOURCES
         src/crypto/argon2/Impl.cpp
     )
 
     add_subdirectory(src/3rdparty/argon2)
-    set(ARGON2_LIBRARY argon2)
-else()
-    remove_definitions(/DXMRIG_ALGO_ARGON2)
-    set(ARGON2_LIBRARY "")
+    list(APPEND LIBS argon2)
 endif()

cmake/asm.cmake

@@ -36,17 +36,16 @@ if (WITH_ASM AND NOT XMRIG_ARM AND CMAKE_SIZEOF_VOID_P EQUAL 8)
     endif()
 
     add_library(${XMRIG_ASM_LIBRARY} STATIC ${XMRIG_ASM_FILES})
-    set(XMRIG_ASM_SOURCES
-        src/crypto/common/Assembly.h
+    list(APPEND HEADERS src/crypto/common/Assembly.h)
+
+    list(APPEND SOURCES
         src/crypto/common/Assembly.cpp
         src/crypto/cn/r/CryptonightR_gen.cpp
         )
     set_property(TARGET ${XMRIG_ASM_LIBRARY} PROPERTY LINKER_LANGUAGE C)
 
-    add_definitions(/DXMRIG_FEATURE_ASM)
+    list(APPEND LIBS ${XMRIG_ASM_LIBRARY})
+    add_definitions(-DXMRIG_FEATURE_ASM)
 else()
-    set(XMRIG_ASM_SOURCES "")
-    set(XMRIG_ASM_LIBRARY "")
-
-    remove_definitions(/DXMRIG_FEATURE_ASM)
+    set(WITH_ASM OFF)
 endif()

cmake/astrobwt.cmake

@@ -1,29 +1,22 @@
 if (WITH_ASTROBWT)
-    add_definitions(/DXMRIG_ALGO_ASTROBWT)
-
-    list(APPEND HEADERS_CRYPTO
-        src/crypto/astrobwt/AstroBWT.h
-    )
-
-    list(APPEND SOURCES_CRYPTO
-        src/crypto/astrobwt/AstroBWT.cpp
-    )
+    list(APPEND HEADERS src/crypto/astrobwt/AstroBWT.h)
+    list(APPEND SOURCES src/crypto/astrobwt/AstroBWT.cpp)
 
     if (XMRIG_ARM)
-        list(APPEND HEADERS_CRYPTO
+        list(APPEND HEADERS
             src/crypto/astrobwt/salsa20_ref/ecrypt-config.h
             src/crypto/astrobwt/salsa20_ref/ecrypt-machine.h
             src/crypto/astrobwt/salsa20_ref/ecrypt-portable.h
             src/crypto/astrobwt/salsa20_ref/ecrypt-sync.h
         )
 
-        list(APPEND SOURCES_CRYPTO
+        list(APPEND SOURCES
             src/crypto/astrobwt/salsa20_ref/salsa20.c
         )
     else()
         if (CMAKE_SIZEOF_VOID_P EQUAL 8)
             add_definitions(/DASTROBWT_AVX2)
-            list(APPEND SOURCES_CRYPTO src/crypto/astrobwt/xmm6int/salsa20_xmm6int-avx2.c)
+            list(APPEND SOURCES src/crypto/astrobwt/xmm6int/salsa20_xmm6int-avx2.c)
 
             if (CMAKE_C_COMPILER_ID MATCHES GNU OR CMAKE_C_COMPILER_ID MATCHES Clang)
                 set_source_files_properties(src/crypto/astrobwt/xmm6int/salsa20_xmm6int-avx2.c PROPERTIES COMPILE_FLAGS -mavx2)
@@ -31,21 +24,14 @@ if (WITH_ASTROBWT)
 
             if (CMAKE_C_COMPILER_ID MATCHES MSVC)
                 enable_language(ASM_MASM)
-                list(APPEND SOURCES_CRYPTO src/crypto/astrobwt/sha3_256_avx2.asm)
+                list(APPEND SOURCES src/crypto/astrobwt/sha3_256_avx2.asm)
             else()
                 enable_language(ASM)
-                list(APPEND SOURCES_CRYPTO src/crypto/astrobwt/sha3_256_avx2.S)
+                list(APPEND SOURCES src/crypto/astrobwt/sha3_256_avx2.S)
             endif()
         endif()
 
-        list(APPEND HEADERS_CRYPTO
-            src/crypto/astrobwt/Salsa20.hpp
-        )
-
-        list(APPEND SOURCES_CRYPTO
-            src/crypto/astrobwt/Salsa20.cpp
-        )
+        list(APPEND HEADERS src/crypto/astrobwt/Salsa20.hpp)
+        list(APPEND SOURCES src/crypto/astrobwt/Salsa20.cpp)
     endif()
-else()
-    remove_definitions(/DXMRIG_ALGO_ASTROBWT)
 endif()

cmake/kawpow.cmake

@@ -1,19 +1,14 @@
 if (WITH_KAWPOW)
-    add_definitions(/DXMRIG_ALGO_KAWPOW)
-
-    list(APPEND HEADERS_CRYPTO
+    list(APPEND HEADERS
         src/crypto/kawpow/KPCache.h
         src/crypto/kawpow/KPHash.h
     )
 
-    list(APPEND SOURCES_CRYPTO
+    list(APPEND SOURCES
         src/crypto/kawpow/KPCache.cpp
         src/crypto/kawpow/KPHash.cpp
     )
 
-    add_subdirectory(src/3rdparty/libethash)
-    set(ETHASH_LIBRARY ethash)
-else()
-    remove_definitions(/DXMRIG_ALGO_KAWPOW)
-    set(ETHASH_LIBRARY "")
+    add_subdirectory(src/base/3rdparty/libethash)
+    list(APPEND LIBS ethash)
 endif()

cmake/randomx.cmake

@@ -1,8 +1,5 @@
 if (WITH_RANDOMX)
-    add_definitions(/DXMRIG_ALGO_RANDOMX)
-    set(WITH_ARGON2 ON)
-
-    list(APPEND HEADERS_CRYPTO
+    list(APPEND HEADERS
         src/crypto/rx/Rx.h
         src/crypto/rx/RxAlgo.h
         src/crypto/rx/RxBasicStorage.h
@@ -14,7 +11,7 @@ if (WITH_RANDOMX)
         src/crypto/rx/RxVm.h
     )
 
-    list(APPEND SOURCES_CRYPTO
+    list(APPEND SOURCES
         src/crypto/randomx/aes_hash.cpp
         src/crypto/randomx/allocator.cpp
         src/crypto/randomx/blake2_generator.cpp
@@ -44,19 +41,19 @@ if (WITH_RANDOMX)
 
     if (WITH_ASM AND CMAKE_C_COMPILER_ID MATCHES MSVC)
         enable_language(ASM_MASM)
-        list(APPEND SOURCES_CRYPTO
+        list(APPEND SOURCES
              src/crypto/randomx/jit_compiler_x86_static.asm
              src/crypto/randomx/jit_compiler_x86.cpp
             )
     elseif (WITH_ASM AND NOT XMRIG_ARM AND CMAKE_SIZEOF_VOID_P EQUAL 8)
-        list(APPEND SOURCES_CRYPTO
+        list(APPEND SOURCES
              src/crypto/randomx/jit_compiler_x86_static.S
              src/crypto/randomx/jit_compiler_x86.cpp
             )
         # cheat because cmake and ccache hate each other
         set_property(SOURCE src/crypto/randomx/jit_compiler_x86_static.S PROPERTY LANGUAGE C)
     elseif (XMRIG_ARM AND CMAKE_SIZEOF_VOID_P EQUAL 8)
-        list(APPEND SOURCES_CRYPTO
+        list(APPEND SOURCES
              src/crypto/randomx/jit_compiler_a64_static.S
              src/crypto/randomx/jit_compiler_a64.cpp
             )
@@ -67,13 +64,11 @@ if (WITH_RANDOMX)
             set_property(SOURCE src/crypto/randomx/jit_compiler_a64_static.S PROPERTY LANGUAGE C)
         endif()
     else()
-        list(APPEND SOURCES_CRYPTO
-             src/crypto/randomx/jit_compiler_fallback.cpp
-            )
+        list(APPEND SOURCES src/crypto/randomx/jit_compiler_fallback.cpp)
     endif()
 
     if (WITH_SSE4_1)
-        list(APPEND SOURCES_CRYPTO src/crypto/randomx/blake2/blake2b_sse41.c)
+        list(APPEND SOURCES src/crypto/randomx/blake2/blake2b_sse41.c)
 
         if (CMAKE_C_COMPILER_ID MATCHES GNU OR CMAKE_C_COMPILER_ID MATCHES Clang)
             set_source_files_properties(src/crypto/randomx/blake2/blake2b_sse41.c PROPERTIES COMPILE_FLAGS -msse4.1)
@@ -85,56 +80,49 @@ if (WITH_RANDOMX)
     endif()
 
     if (WITH_HWLOC)
-        list(APPEND HEADERS_CRYPTO
-             src/crypto/rx/RxNUMAStorage.h
-            )
-
-        list(APPEND SOURCES_CRYPTO
-             src/crypto/rx/RxNUMAStorage.cpp
-            )
+        list(APPEND HEADERS src/crypto/rx/RxNUMAStorage.h)
+        list(APPEND SOURCES src/crypto/rx/RxNUMAStorage.cpp)
     endif()
 
     if (WITH_MSR AND NOT XMRIG_ARM AND CMAKE_SIZEOF_VOID_P EQUAL 8 AND (XMRIG_OS_WIN OR XMRIG_OS_LINUX))
-        add_definitions(/DXMRIG_FEATURE_MSR)
-        add_definitions(/DXMRIG_FIX_RYZEN)
-        message("-- WITH_MSR=ON")
+        add_definitions(-DXMRIG_FEATURE_MSR -DXMRIG_FIX_RYZEN)
 
         if (XMRIG_OS_WIN)
-            list(APPEND SOURCES_CRYPTO
+            list(APPEND SOURCES
                 src/crypto/rx/RxFix_win.cpp
                 src/hw/msr/Msr_win.cpp
                 )
         elseif (XMRIG_OS_LINUX)
-            list(APPEND SOURCES_CRYPTO
+            list(APPEND SOURCES
                 src/crypto/rx/RxFix_linux.cpp
                 src/hw/msr/Msr_linux.cpp
                 )
         endif()
 
-        list(APPEND HEADERS_CRYPTO
+        list(APPEND HEADERS
             src/crypto/rx/RxFix.h
             src/crypto/rx/RxMsr.h
             src/hw/msr/Msr.h
             src/hw/msr/MsrItem.h
             )
 
-        list(APPEND SOURCES_CRYPTO
+        list(APPEND SOURCES
             src/crypto/rx/RxMsr.cpp
             src/hw/msr/Msr.cpp
             src/hw/msr/MsrItem.cpp
             )
     else()
-        remove_definitions(/DXMRIG_FEATURE_MSR)
-        remove_definitions(/DXMRIG_FIX_RYZEN)
-        message("-- WITH_MSR=OFF")
+        set(WITH_MSR OFF)
     endif()
 
     if (WITH_PROFILING)
-        add_definitions(/DXMRIG_FEATURE_PROFILING)
+        add_definitions(-DXMRIG_FEATURE_PROFILING)
 
-        list(APPEND HEADERS_CRYPTO src/crypto/rx/Profiler.h)
-        list(APPEND SOURCES_CRYPTO src/crypto/rx/Profiler.cpp)
+        list(APPEND HEADERS src/crypto/rx/Profiler.h)
+        list(APPEND SOURCES src/crypto/rx/Profiler.cpp)
     endif()
-else()
-    remove_definitions(/DXMRIG_ALGO_RANDOMX)
 endif()
+
+
+message(STATUS "WITH_MSR\t= ${WITH_MSR}")
+message(STATUS "WITH_PROFILING\t= ${WITH_PROFILING}")

src/3rdparty/fmt/posix.h

@@ -1,2 +0,0 @@
-#include "os.h"
-#warning "fmt/posix.h is deprecated; use fmt/os.h instead"

src/backend/cpu/CpuBackend.cpp

@@ -27,7 +27,6 @@
 #include "backend/common/Workers.h"
 #include "backend/cpu/Cpu.h"
 #include "base/io/log/Log.h"
-#include "base/io/log/Tags.h"
 #include "base/net/stratum/Job.h"
 #include "base/tools/Chrono.h"
 #include "base/tools/String.h"
@@ -104,13 +103,13 @@ public:
     inline void print() const
     {
         if (m_started == 0) {
-            LOG_ERR("%s " RED_BOLD("disabled") YELLOW(" (failed to start threads)"), Tags::cpu());
+            LOG_ERR("%s " RED_BOLD("disabled") YELLOW(" (failed to start threads)"), cpu_tag());
 
             return;
         }
 
         LOG_INFO("%s" GREEN_BOLD(" READY") " threads %s%zu/%zu (%zu)" CLEAR " huge pages %s%1.0f%% %zu/%zu" CLEAR " memory " CYAN_BOLD("%zu KB") BLACK_BOLD(" (%" PRIu64 " ms)"),
-                 Tags::cpu(),
+                 cpu_tag(),
                  m_errors == 0 ? CYAN_BOLD_S : YELLOW_BOLD_S,
                  m_started, m_threads, m_ways,
                  (m_hugePages.isFullyAllocated() ? GREEN_BOLD_S : (m_hugePages.allocated == 0 ? RED_BOLD_S : YELLOW_BOLD_S)),
@@ -142,7 +141,7 @@ public:
     inline void start()
     {
         LOG_INFO("%s use profile " BLUE_BG(WHITE_BOLD_S " %s ") WHITE_BOLD_S " (" CYAN_BOLD("%zu") WHITE_BOLD(" thread%s)") " scratchpad " CYAN_BOLD("%zu KB"),
-                 Tags::cpu(),
+                 cpu_tag(),
                  profileName.data(),
                  threads.size(),
                  threads.size() > 1 ? "s" : "",
@@ -228,13 +227,15 @@ const char *xmrig::backend_tag(uint32_t backend)
     }
 #   endif
 
-    return Tags::cpu();
+    return cpu_tag();
 }
 
 
 const char *xmrig::cpu_tag()
 {
-    return Tags::cpu();
+    static const char *tag = CYAN_BG_BOLD(WHITE_BOLD_S " cpu     ");
+
+    return tag;
 }
 
 
@@ -294,7 +295,7 @@ void xmrig::CpuBackend::prepare(const Job &nextJob)
     if ((f == Algorithm::ARGON2) || (f == Algorithm::RANDOM_X)) {
         if (argon2::Impl::select(d_ptr->controller->config()->cpu().argon2Impl())) {
             LOG_INFO("%s use " WHITE_BOLD("argon2") " implementation " CSI "1;%dm" "%s",
-                     Tags::cpu(),
+                     cpu_tag(),
                      argon2::Impl::name() == "default" ? 33 : 32,
                      argon2::Impl::name().data()
                      );
@@ -357,7 +358,7 @@ void xmrig::CpuBackend::setJob(const Job &job)
     d_ptr->profileName  = cpu.threads().profileName(job.algorithm());
 
     if (d_ptr->profileName.isNull() || threads.empty()) {
-        LOG_WARN("%s " RED_BOLD("disabled") YELLOW(" (no suitable configuration found)"), Tags::cpu());
+        LOG_WARN("%s " RED_BOLD("disabled") YELLOW(" (no suitable configuration found)"), cpu_tag());
 
         return stop();
     }
@@ -402,7 +403,7 @@ void xmrig::CpuBackend::stop()
     d_ptr->workers.stop();
     d_ptr->threads.clear();
 
-    LOG_INFO("%s" YELLOW(" stopped") BLACK_BOLD(" (%" PRIu64 " ms)"), Tags::cpu(), Chrono::steadyMSecs() - ts);
+    LOG_INFO("%s" YELLOW(" stopped") BLACK_BOLD(" (%" PRIu64 " ms)"), cpu_tag(), Chrono::steadyMSecs() - ts);
 }
 
 

src/backend/cuda/CudaBackend.cpp

@@ -32,7 +32,6 @@
 #include "backend/cuda/wrappers/CudaDevice.h"
 #include "backend/cuda/wrappers/CudaLib.h"
 #include "base/io/log/Log.h"
-#include "base/io/log/Tags.h"
 #include "base/net/stratum/Job.h"
 #include "base/tools/Chrono.h"
 #include "base/tools/String.h"
@@ -106,13 +105,13 @@ public:
     inline void print() const
     {
         if (m_started == 0) {
-            LOG_ERR("%s " RED_BOLD("disabled") YELLOW(" (failed to start threads)"), Tags::nvidia());
+            LOG_ERR("%s " RED_BOLD("disabled") YELLOW(" (failed to start threads)"), cuda_tag());
 
             return;
         }
 
         LOG_INFO("%s" GREEN_BOLD(" READY") " threads " "%s%zu/%zu" BLACK_BOLD(" (%" PRIu64 " ms)"),
-                 Tags::nvidia(),
+                 cuda_tag(),
                  m_errors == 0 ? CYAN_BOLD_S : YELLOW_BOLD_S,
                  m_started,
                  m_threads,
@@ -209,7 +208,7 @@ public:
     inline void start(const Job &job)
     {
         LOG_INFO("%s use profile " BLUE_BG(WHITE_BOLD_S " %s ") WHITE_BOLD_S " (" CYAN_BOLD("%zu") WHITE_BOLD(" thread%s)") " scratchpad " CYAN_BOLD("%zu KB"),
-                 Tags::nvidia(),
+                 cuda_tag(),
                  profileName.data(),
                  threads.size(),
                  threads.size() > 1 ? "s" : "",
@@ -278,7 +277,7 @@ public:
             }
 
             LOG_INFO("%s" CYAN_BOLD(" #%u") YELLOW(" %s") MAGENTA_BOLD("%4uW") CSI "1;%um %2uC" CLEAR WHITE_BOLD("%s") "%s",
-                     Tags::nvidia(),
+                     cuda_tag(),
                      device.index(),
                      device.topology().toString().data(),
                      health.power,
@@ -309,7 +308,9 @@ public:
 
 const char *xmrig::cuda_tag()
 {
-    return Tags::nvidia();
+    static const char *tag = GREEN_BG_BOLD(WHITE_BOLD_S " nvidia  ");
+
+    return tag;
 }
 
 
@@ -449,7 +450,7 @@ void xmrig::CudaBackend::setJob(const Job &job)
     d_ptr->profileName  = cuda.threads().profileName(job.algorithm());
 
     if (d_ptr->profileName.isNull() || threads.empty()) {
-        LOG_WARN("%s " RED_BOLD("disabled") YELLOW(" (no suitable configuration found)"), Tags::nvidia());
+        LOG_WARN("%s " RED_BOLD("disabled") YELLOW(" (no suitable configuration found)"), cuda_tag());
 
         return stop();
     }
@@ -490,7 +491,7 @@ void xmrig::CudaBackend::stop()
     d_ptr->workers.stop();
     d_ptr->threads.clear();
 
-    LOG_INFO("%s" YELLOW(" stopped") BLACK_BOLD(" (%" PRIu64 " ms)"), Tags::nvidia(), Chrono::steadyMSecs() - ts);
+    LOG_INFO("%s" YELLOW(" stopped") BLACK_BOLD(" (%" PRIu64 " ms)"), cuda_tag(), Chrono::steadyMSecs() - ts);
 }
 
 

src/backend/cuda/runners/CudaKawPowRunner.cpp

@@ -18,10 +18,10 @@
 
 #include "backend/cuda/runners/CudaKawPowRunner.h"
 #include "3rdparty/libethash/data_sizes.h"
+#include "backend/common/Tags.h"
 #include "backend/cuda/CudaLaunchData.h"
 #include "backend/cuda/wrappers/CudaLib.h"
 #include "base/io/log/Log.h"
-#include "base/io/log/Tags.h"
 #include "base/net/stratum/Job.h"
 #include "base/tools/Chrono.h"
 #include "crypto/kawpow/KPCache.h"
@@ -61,12 +61,12 @@ bool xmrig::CudaKawPowRunner::set(const Job &job, uint8_t *blob)
 
     const bool result = CudaLib::kawPowPrepare(m_ctx, cache.data(), cache.size(), cache.l1_cache(), KPCache::dag_size(epoch), height, dag_sizes);
     if (!result) {
-        LOG_ERR("%s " YELLOW("KawPow") RED(" failed to initialize DAG: ") RED_BOLD("%s"), Tags::nvidia(), CudaLib::lastError(m_ctx));
+        LOG_ERR("%s " YELLOW("KawPow") RED(" failed to initialize DAG: ") RED_BOLD("%s"), cuda_tag(), CudaLib::lastError(m_ctx));
     }
     else {
         const int64_t dt = Chrono::steadyMSecs() - start_ms;
         if (dt > 1000) {
-            LOG_INFO("%s " YELLOW("KawPow") " DAG for epoch " WHITE_BOLD("%u") " calculated " BLACK_BOLD("(%" PRIu64 "ms)"), Tags::nvidia(), epoch, dt);
+            LOG_INFO("%s " YELLOW("KawPow") " DAG for epoch " WHITE_BOLD("%u") " calculated " BLACK_BOLD("(%" PRIu64 "ms)"), cuda_tag(), epoch, dt);
         }
     }
 

src/backend/opencl/OclBackend.cpp

@@ -34,7 +34,6 @@
 #include "backend/opencl/wrappers/OclContext.h"
 #include "backend/opencl/wrappers/OclLib.h"
 #include "base/io/log/Log.h"
-#include "base/io/log/Tags.h"
 #include "base/net/stratum/Job.h"
 #include "base/tools/Chrono.h"
 #include "base/tools/String.h"
@@ -102,13 +101,13 @@ public:
     inline void print() const
     {
         if (m_started == 0) {
-            LOG_ERR("%s " RED_BOLD("disabled") YELLOW(" (failed to start threads)"), Tags::opencl());
+            LOG_ERR("%s " RED_BOLD("disabled") YELLOW(" (failed to start threads)"), ocl_tag());
 
             return;
         }
 
         LOG_INFO("%s" GREEN_BOLD(" READY") " threads " "%s%zu/%zu" BLACK_BOLD(" (%" PRIu64 " ms)"),
-                 Tags::opencl(),
+                 ocl_tag(),
                  m_errors == 0 ? CYAN_BOLD_S : YELLOW_BOLD_S,
                  m_started,
                  m_threads,
@@ -193,7 +192,7 @@ public:
     inline void start(const Job &job)
     {
         LOG_INFO("%s use profile " BLUE_BG(WHITE_BOLD_S " %s ") WHITE_BOLD_S " (" CYAN_BOLD("%zu") WHITE_BOLD(" thread%s)") " scratchpad " CYAN_BOLD("%zu KB"),
-                 Tags::opencl(),
+                 ocl_tag(),
                  profileName.data(),
                  threads.size(),
                  threads.size() > 1 ? "s" : "",
@@ -253,7 +252,7 @@ public:
             const auto health = AdlLib::health(device);
 
             LOG_INFO("%s" CYAN_BOLD(" #%u") YELLOW(" %s") MAGENTA_BOLD("%4uW") CSI "1;%um %2uC" CYAN_BOLD(" %4u") CYAN("RPM") WHITE_BOLD(" %u/%u") "MHz",
-                     Tags::opencl(),
+                     ocl_tag(),
                      device.index(),
                      device.topology().toString().data(),
                      health.power,
@@ -285,7 +284,9 @@ public:
 
 const char *xmrig::ocl_tag()
 {
-    return Tags::opencl();
+    static const char *tag = MAGENTA_BG_BOLD(WHITE_BOLD_S " opencl  ");
+
+    return tag;
 }
 
 
@@ -425,13 +426,13 @@ void xmrig::OclBackend::setJob(const Job &job)
     d_ptr->profileName  = cl.threads().profileName(job.algorithm());
 
     if (d_ptr->profileName.isNull() || threads.empty()) {
-        LOG_WARN("%s " RED_BOLD("disabled") YELLOW(" (no suitable configuration found)"), Tags::opencl());
+        LOG_WARN("%s " RED_BOLD("disabled") YELLOW(" (no suitable configuration found)"), ocl_tag());
 
         return stop();
     }
 
     if (!d_ptr->context.init(d_ptr->devices, threads)) {
-        LOG_WARN("%s " RED_BOLD("disabled") YELLOW(" (OpenCL context unavailable)"), Tags::opencl());
+        LOG_WARN("%s " RED_BOLD("disabled") YELLOW(" (OpenCL context unavailable)"), ocl_tag());
 
         return stop();
     }
@@ -474,7 +475,7 @@ void xmrig::OclBackend::stop()
 
     OclSharedState::release();
 
-    LOG_INFO("%s" YELLOW(" stopped") BLACK_BOLD(" (%" PRIu64 " ms)"), Tags::opencl(), Chrono::steadyMSecs() - ts);
+    LOG_INFO("%s" YELLOW(" stopped") BLACK_BOLD(" (%" PRIu64 " ms)"), ocl_tag(), Chrono::steadyMSecs() - ts);
 }
 
 

src/backend/opencl/runners/OclKawPowRunner.cpp

@@ -26,7 +26,6 @@
 #include "backend/opencl/wrappers/OclLib.h"
 #include "base/io/log/Log.h"
 #include "base/io/log/Log.h"
-#include "base/io/log/Tags.h"
 #include "base/net/stratum/Job.h"
 #include "base/tools/Chrono.h"
 #include "crypto/common/VirtualMemory.h"
@@ -159,7 +158,7 @@ void OclKawPowRunner::set(const Job &job, uint8_t *blob)
 
         OclLib::finish(m_queue);
 
-        LOG_INFO("%s " YELLOW("KawPow") " DAG for epoch " WHITE_BOLD("%u") " calculated " BLACK_BOLD("(%" PRIu64 "ms)"), Tags::opencl(), epoch, Chrono::steadyMSecs() - start_ms);
+        LOG_INFO("%s " YELLOW("KawPow") " DAG for epoch " WHITE_BOLD("%u") " calculated " BLACK_BOLD("(%" PRIu64 "ms)"), ocl_tag(), epoch, Chrono::steadyMSecs() - start_ms);
     }
 
     const uint64_t target = job.target();

src/backend/opencl/runners/tools/OclKawPow.cpp

@@ -19,6 +19,7 @@
 #include "backend/opencl/runners/tools/OclKawPow.h"
 #include "3rdparty/libethash/data_sizes.h"
 #include "3rdparty/libethash/ethash_internal.h"
+#include "backend/common/Tags.h"
 #include "backend/opencl/cl/kawpow/kawpow_cl.h"
 #include "backend/opencl/interfaces/IOclRunner.h"
 #include "backend/opencl/OclCache.h"
@@ -27,7 +28,6 @@
 #include "backend/opencl/wrappers/OclError.h"
 #include "backend/opencl/wrappers/OclLib.h"
 #include "base/io/log/Log.h"
-#include "base/io/log/Tags.h"
 #include "base/tools/Baton.h"
 #include "base/tools/Chrono.h"
 #include "crypto/kawpow/KPHash.h"
@@ -202,7 +202,7 @@ public:
             return nullptr;
         }
 
-        LOG_INFO("%s " YELLOW("KawPow") " program for period " WHITE_BOLD("%" PRIu64) " compiled " BLACK_BOLD("(%" PRIu64 "ms)"), Tags::opencl(), period, Chrono::steadyMSecs() - ts);
+        LOG_INFO("%s " YELLOW("KawPow") " program for period " WHITE_BOLD("%" PRIu64) " compiled " BLACK_BOLD("(%" PRIu64 "ms)"), ocl_tag(), period, Chrono::steadyMSecs() - ts);
 
         cache.add(runner.algorithm(), period, worksize, runner.deviceIndex(), program, kernel);