Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion include/bitcoin/explorer/commands/hardware.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 2 additions & 0 deletions model/generate.xml
Original file line number Diff line number Diff line change
Expand Up @@ -461,6 +461,8 @@
<define name="BX_HARDWARE_COMPILED" value="platform:{:d} compiled:{:d}." />
<define name="BX_HARDWARE_ENABLED" value="platform:{:d} enabled:{:d}." />
<define name="BX_HARDWARE_INCOMPATIBLE" value="platform:{:d} compiled:{:d} (unsupported)." />
<define name="BX_HARDWARE_BUILD" value="build....... {}" />
<define name="BX_HARDWARE_PLATFORM" value="platform.... {}" />
<define name="BX_HARDWARE_SHA_UNCOMPILED" value="Available SHA hardware acceleration is not compiled into this build." />
<define name="BX_HARDWARE_AVX2_UNCOMPILED" value="Available AVX2 hardware acceleration is not compiled into this build." />
<define name="BX_HARDWARE_GPU_UNCOMPILED" value="Available cuda hardware acceleration is not compiled into this build." />
Expand Down
9 changes: 6 additions & 3 deletions src/commands/hardware.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand All @@ -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;
Expand Down
Loading