diff --git a/src/chasers/chaser_validate_batch.cpp b/src/chasers/chaser_validate_batch.cpp index 0ba040c6..32a5860e 100644 --- a/src/chasers/chaser_validate_batch.cpp +++ b/src/chasers/chaser_validate_batch.cpp @@ -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; @@ -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)) @@ -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; @@ -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)) @@ -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 << ")."); @@ -408,7 +408,7 @@ code chaser_validate::do_process_silent_batch(bool bank) NOEXCEPT const auto count = duration_cast(elapsed).count(); const auto duration = limit(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. diff --git a/src/configuration.cpp b/src/configuration.cpp index f7f4500c..cf8763ed 100644 --- a/src/configuration.cpp +++ b/src/configuration.cpp @@ -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(); diff --git a/test/chasers/chaser_validate.cpp b/test/chasers/chaser_validate.cpp index ded2d88d..26ccf23c 100644 --- a/test/chasers/chaser_validate.cpp +++ b/test/chasers/chaser_validate.cpp @@ -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); diff --git a/test/configuration.cpp b/test/configuration.cpp index 98dfece3..1862dc51 100644 --- a/test/configuration.cpp +++ b/test/configuration.cpp @@ -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); @@ -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); @@ -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()