diff --git a/include/bitcoin/explorer/commands/hardware.hpp b/include/bitcoin/explorer/commands/hardware.hpp index e8550610..b13ca0fe 100644 --- a/include/bitcoin/explorer/commands/hardware.hpp +++ b/include/bitcoin/explorer/commands/hardware.hpp @@ -59,7 +59,9 @@ namespace commands { #define BX_HARDWARE_INCOMPATIBLE \ "platform:{:d} compiled:{:d} (unsupported)." #define BX_HARDWARE_BUILD \ - "build....... platform:{} compiled:{}." + "build....... {}" +#define BX_HARDWARE_PLATFORM \ + "platform.... {}" #define BX_HARDWARE_SHA_UNCOMPILED \ "Available SHA hardware acceleration is not compiled into this build." #define BX_HARDWARE_AVX2_UNCOMPILED \ diff --git a/model/generate.xml b/model/generate.xml index a80aa08d..6415bf86 100644 --- a/model/generate.xml +++ b/model/generate.xml @@ -461,6 +461,8 @@ + + diff --git a/src/commands/hardware.cpp b/src/commands/hardware.cpp index d3df96b8..71d6cf58 100644 --- a/src/commands/hardware.cpp +++ b/src/commands/hardware.cpp @@ -41,9 +41,6 @@ console_result hardware::invoke(std::ostream& output, std::ostream&) output << std::format("{:.<12} " BX_HARDWARE_COMPILED, extension.name, extension.platform, extension.compiled) << std::endl; - output << std::format(BX_HARDWARE_BUILD, build_name("bx", detected_tags()), - build_name("bx", compiled_tags())) << std::endl; - const auto cuda = cuda_device(); const auto compiled = batched::compiled(); const auto unsupported = cuda && compiled && !batched::accelerated(); @@ -60,6 +57,12 @@ console_result hardware::invoke(std::ostream& output, std::ostream&) output << std::format("cuda ecc.... " BX_HARDWARE_ENABLED, cuda_ecc(), cuda_ecc_enabled()) << std::endl; } + const auto platform = build_name("bx", detected_tags()); + const auto build = build_name("bx", compiled_tags()); + output << std::format(BX_HARDWARE_BUILD, build) << std::endl; + if (build != platform) + output << std::format(BX_HARDWARE_PLATFORM, platform) << std::endl; + #if defined(HAVE_ARM) if (try_neon_sha2() && !have_neon_sha) output << BX_HARDWARE_SHA_UNCOMPILED << std::endl;