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
18 changes: 9 additions & 9 deletions src/chasers/chaser_validate_batch.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -124,10 +124,10 @@ code chaser_validate::do_process_batch(bool bank, bool startup) NOEXCEPT
const auto ecdsa = query.ecdsa_records(bank);
if (is_nonzero(ecdsa))
{
bool use_gpu{ gpu_ };
bool used_gpu{};
header_links fails{};
const auto start = network::logger::now();
if (!query.verify_ecdsa_signatures(cancel, use_gpu, fails, bank))
if (!query.verify_ecdsa_signatures(cancel, used_gpu, fails, bank))
{
LOGN("Batch verify ecdsa canceled (" << ecdsa << ").");
return network::error::operation_canceled;
Expand All @@ -139,7 +139,7 @@ code chaser_validate::do_process_batch(bool bank, bool startup) NOEXCEPT
fire(events::ecdsa_secs, duration);
if (!startup)
{
LOGN(log_rate("Verify ecdsa.....", ecdsa, duration, use_gpu));
LOGN(log_rate("Verify ecdsa.....", ecdsa, duration, used_gpu));
}

if (!mark_invalids(prevalids, fails, startup))
Expand All @@ -149,10 +149,10 @@ code chaser_validate::do_process_batch(bool bank, bool startup) NOEXCEPT
const auto schnorr = query.schnorr_records(bank);
if (is_nonzero(schnorr))
{
bool use_gpu{ gpu_ };
bool used_gpu{};
header_links fails{};
const auto start = network::logger::now();
if (!query.verify_schnorr_signatures(cancel, use_gpu, fails, bank))
if (!query.verify_schnorr_signatures(cancel, used_gpu, fails, bank))
{
LOGN("Batch verify schnorr canceled (" << schnorr << ").");
return network::error::operation_canceled;
Expand All @@ -164,7 +164,7 @@ code chaser_validate::do_process_batch(bool bank, bool startup) NOEXCEPT
fire(events::schnorr_secs, duration);
if (!startup)
{
LOGN(log_rate("Verify schnorr...", schnorr, duration, use_gpu));
LOGN(log_rate("Verify schnorr...", schnorr, duration, used_gpu));
}

if (!mark_invalids(prevalids, fails, startup))
Expand Down Expand Up @@ -389,10 +389,10 @@ void chaser_validate::process_silent_batch(bool residual) NOEXCEPT
code chaser_validate::do_process_silent_batch(bool bank) NOEXCEPT
{
auto& query = archive();
bool use_gpu{ gpu_ };
bool used_gpu{};
const auto rows = query.silent_records(bank);
const auto start = network::logger::now();
const auto ec = query.compute_silents(stopping_, use_gpu, bank);
const auto ec = query.compute_silents(stopping_, used_gpu, bank);
if (ec == database::error::query_canceled)
{
LOGN("Batch silent canceled (" << rows << ").");
Expand All @@ -408,7 +408,7 @@ code chaser_validate::do_process_silent_batch(bool bank) NOEXCEPT
const auto count = duration_cast<seconds>(elapsed).count();
const auto duration = limit<size_t>(count);
fire(events::silent_secs, duration);
LOGN(log_rate("Compute silent...", rows, duration, use_gpu));
LOGN(log_rate("Compute silent...", rows, duration, used_gpu));
}

// Purge presilents before silents.
Expand Down
2 changes: 2 additions & 0 deletions src/configuration.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@ code configuration::initialize() NOEXCEPT
if (filter && node.limited_blocks)
return error::filter_pruned;

system::batched::accelerate(node.use_gpu);

// Batch tables are unused when their batching cannot run.
const auto gpu = node.use_gpu && system::batched::compiled() &&
system::cuda_device();
Expand Down
2 changes: 2 additions & 0 deletions test/chasers/chaser_validate.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -421,6 +421,8 @@ struct validate_setup_fixture
if (configurer)
configurer(config);

system::batched::accelerate(config.node.use_gpu);

// The store envelope is derived from the configured chain.
config.database.initialize(config.bitcoin, config.node.limited_blocks,
config.node.silent_start_height);
Expand Down
19 changes: 17 additions & 2 deletions test/configuration.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,9 @@ BC_AUTO_TEST_CASE(configuration__initialize__cpu_batching_without_gpu__tables_si
instance.database.silent.size = 42;
instance.database.prevalid.size = 42;
instance.database.presilent.size = 42;
BC_REQUIRE(!instance.initialize());
const auto ec = instance.initialize();
system::batched::accelerate(true);
BC_REQUIRE(!ec);
BC_REQUIRE_EQUAL(instance.database.ecdsa.size, 42u);
BC_REQUIRE_EQUAL(instance.database.schnorr.size, 42u);
BC_REQUIRE_EQUAL(instance.database.silent.size, 42u);
Expand All @@ -161,7 +163,9 @@ BC_AUTO_TEST_CASE(configuration__initialize__no_batching_without_gpu__tables_zer
instance.database.silent.size = 42;
instance.database.prevalid.size = 42;
instance.database.presilent.size = 42;
BC_REQUIRE(!instance.initialize());
const auto ec = instance.initialize();
system::batched::accelerate(true);
BC_REQUIRE(!ec);
BC_REQUIRE_EQUAL(instance.database.ecdsa.size, 0u);
BC_REQUIRE_EQUAL(instance.database.schnorr.size, 0u);
BC_REQUIRE_EQUAL(instance.database.silent.size, 0u);
Expand All @@ -170,4 +174,15 @@ BC_AUTO_TEST_CASE(configuration__initialize__no_batching_without_gpu__tables_zer
BC_REQUIRE_EQUAL(instance.database.gpu_scan_minimum, max_uint32);
}

BC_AUTO_TEST_CASE(configuration__initialize__without_gpu__not_accelerated)
{
node::configuration instance(test::node_configuration());
instance.node.use_gpu = false;
const auto ec = instance.initialize();
const auto accelerated = system::batched::accelerated();
system::batched::accelerate(true);
BC_REQUIRE(!ec);
BC_REQUIRE(!accelerated);
}

BC_AUTO_TEST_SUITE_END()
Loading