diff --git a/src/Summary.cpp b/src/Summary.cpp index 0d3f409f9..d27c6fa02 100644 --- a/src/Summary.cpp +++ b/src/Summary.cpp @@ -5,8 +5,8 @@ * Copyright 2014-2016 Wolf9466 * Copyright 2016 Jay D Dee * Copyright 2017-2019 XMR-Stak , - * Copyright 2018-2019 SChernykh - * Copyright 2016-2019 XMRig + * Copyright 2018-2020 SChernykh + * Copyright 2016-2020 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 @@ -88,34 +88,27 @@ static void print_cpu(Config *) { const auto info = Cpu::info(); - Log::print(GREEN_BOLD(" * ") WHITE_BOLD("%-13s%s (%zu)") " %sx64 %sAES%s", + Log::print(GREEN_BOLD(" * ") WHITE_BOLD("%-13s%s (%zu)") " %s %sAES%s", "CPU", info->brand(), info->packages(), - info->isX64() ? GREEN_BOLD_S : RED_BOLD_S "-", + ICpuInfo::is64bit() ? GREEN_BOLD("64-bit") : RED_BOLD("32-bit"), info->hasAES() ? GREEN_BOLD_S : RED_BOLD_S "-", info->isVM() ? RED_BOLD_S " VM" : "" ); # if defined(XMRIG_FEATURE_HWLOC) Log::print(WHITE_BOLD(" %-13s") BLACK_BOLD("L2:") WHITE_BOLD("%.1f MB") BLACK_BOLD(" L3:") WHITE_BOLD("%.1f MB") CYAN_BOLD(" %zu") "C" BLACK_BOLD("/") CYAN_BOLD("%zu") "T" -# ifdef XMRIG_FEATURE_HWLOC - BLACK_BOLD(" NUMA:") CYAN_BOLD("%zu") -# endif - , "", + BLACK_BOLD(" NUMA:") CYAN_BOLD("%zu"), + "", info->L2() / 1048576.0, info->L3() / 1048576.0, info->cores(), - info->threads() -# ifdef XMRIG_FEATURE_HWLOC - , info->nodes() -# endif + info->threads(), + info->nodes() ); # else - Log::print(WHITE_BOLD(" %-13s") BLACK_BOLD("threads:") CYAN_BOLD("%zu"), - "", - info->threads() - ); + Log::print(WHITE_BOLD(" %-13s") BLACK_BOLD("threads:") CYAN_BOLD("%zu"), "", info->threads()); # endif } diff --git a/src/backend/cpu/interfaces/ICpuInfo.h b/src/backend/cpu/interfaces/ICpuInfo.h index 3b83aecc8..7c08c103f 100644 --- a/src/backend/cpu/interfaces/ICpuInfo.h +++ b/src/backend/cpu/interfaces/ICpuInfo.h @@ -72,9 +72,9 @@ public: virtual ~ICpuInfo() = default; # if defined(__x86_64__) || defined(_M_AMD64) || defined (__arm64__) || defined (__aarch64__) - inline constexpr static bool isX64() { return true; } + inline constexpr static bool is64bit() { return true; } # else - inline constexpr static bool isX64() { return false; } + inline constexpr static bool is64bit() { return false; } # endif virtual Assembly::Id assembly() const = 0; diff --git a/src/backend/cpu/platform/BasicCpuInfo.cpp b/src/backend/cpu/platform/BasicCpuInfo.cpp index 1f1521ba1..177168148 100644 --- a/src/backend/cpu/platform/BasicCpuInfo.cpp +++ b/src/backend/cpu/platform/BasicCpuInfo.cpp @@ -346,7 +346,8 @@ rapidjson::Value xmrig::BasicCpuInfo::toJSON(rapidjson::Document &doc) const out.AddMember("proc_info", m_procInfo, allocator); out.AddMember("aes", hasAES(), allocator); out.AddMember("avx2", hasAVX2(), allocator); - out.AddMember("x64", isX64(), allocator); + out.AddMember("x64", is64bit(), allocator); // DEPRECATED will be removed in the next major release. + out.AddMember("64_bit", is64bit(), allocator); out.AddMember("l2", static_cast(L2()), allocator); out.AddMember("l3", static_cast(L3()), allocator); out.AddMember("cores", static_cast(cores()), allocator); diff --git a/src/backend/cpu/platform/BasicCpuInfo_arm.cpp b/src/backend/cpu/platform/BasicCpuInfo_arm.cpp index ea6db3f1e..84d2c57fa 100644 --- a/src/backend/cpu/platform/BasicCpuInfo_arm.cpp +++ b/src/backend/cpu/platform/BasicCpuInfo_arm.cpp @@ -100,7 +100,8 @@ rapidjson::Value xmrig::BasicCpuInfo::toJSON(rapidjson::Document &doc) const out.AddMember("brand", StringRef(brand()), allocator); out.AddMember("aes", hasAES(), allocator); out.AddMember("avx2", false, allocator); - out.AddMember("x64", isX64(), allocator); + out.AddMember("x64", is64bit(), allocator); // DEPRECATED will be removed in the next major release. + out.AddMember("64_bit", is64bit(), allocator); out.AddMember("l2", static_cast(L2()), allocator); out.AddMember("l3", static_cast(L3()), allocator); out.AddMember("cores", static_cast(cores()), allocator);