diff --git a/src/bench/addrman.cpp b/src/bench/addrman.cpp index 4ba02242e9b..907c7d2e22b 100644 --- a/src/bench/addrman.cpp +++ b/src/bench/addrman.cpp @@ -175,9 +175,9 @@ static void AddrManAddThenGood(benchmark::Bench& bench) }); } -BENCHMARK(AddrManAdd, benchmark::PriorityLevel::HIGH); -BENCHMARK(AddrManSelect, benchmark::PriorityLevel::HIGH); -BENCHMARK(AddrManSelectFromAlmostEmpty, benchmark::PriorityLevel::HIGH); -BENCHMARK(AddrManSelectByNetwork, benchmark::PriorityLevel::HIGH); -BENCHMARK(AddrManGetAddr, benchmark::PriorityLevel::HIGH); -BENCHMARK(AddrManAddThenGood, benchmark::PriorityLevel::HIGH); +BENCHMARK(AddrManAdd); +BENCHMARK(AddrManSelect); +BENCHMARK(AddrManSelectFromAlmostEmpty); +BENCHMARK(AddrManSelectByNetwork); +BENCHMARK(AddrManGetAddr); +BENCHMARK(AddrManAddThenGood); diff --git a/src/bench/base58.cpp b/src/bench/base58.cpp index bc82d739713..0be16439c3c 100644 --- a/src/bench/base58.cpp +++ b/src/bench/base58.cpp @@ -51,6 +51,6 @@ static void Base58Decode(benchmark::Bench& bench) } -BENCHMARK(Base58Encode, benchmark::PriorityLevel::HIGH); -BENCHMARK(Base58CheckEncode, benchmark::PriorityLevel::HIGH); -BENCHMARK(Base58Decode, benchmark::PriorityLevel::HIGH); +BENCHMARK(Base58Encode); +BENCHMARK(Base58CheckEncode); +BENCHMARK(Base58Decode); diff --git a/src/bench/bech32.cpp b/src/bench/bech32.cpp index 065ee9e7e8c..c5e864aed03 100644 --- a/src/bench/bech32.cpp +++ b/src/bench/bech32.cpp @@ -31,5 +31,5 @@ static void Bech32Decode(benchmark::Bench& bench) } -BENCHMARK(Bech32Encode, benchmark::PriorityLevel::HIGH); -BENCHMARK(Bech32Decode, benchmark::PriorityLevel::HIGH); +BENCHMARK(Bech32Encode); +BENCHMARK(Bech32Decode); diff --git a/src/bench/bench.cpp b/src/bench/bench.cpp index 3eb99ab57f5..0b2ee6e30d1 100644 --- a/src/bench/bench.cpp +++ b/src/bench/bench.cpp @@ -5,25 +5,20 @@ #include #include // IWYU pragma: keep -#include +#include #include -#include #include #include #include #include #include -#include -#include #include -#include -#include #include +#include #include using namespace std::chrono_literals; -using util::Join; const std::function G_TEST_LOG_FUN{}; @@ -69,37 +64,15 @@ void GenerateTemplateResults(const std::vector& bench namespace benchmark { -// map a label to one or multiple priority levels -std::map map_label_priority = { - {"high", PriorityLevel::HIGH}, - {"low", PriorityLevel::LOW}, - {"all", 0xff} -}; - -std::string ListPriorities() -{ - using item_t = std::pair; - auto sort_by_priority = [](item_t a, item_t b){ return a.second < b.second; }; - std::set sorted_priorities(map_label_priority.begin(), map_label_priority.end(), sort_by_priority); - return Join(sorted_priorities, ',', [](const auto& entry){ return entry.first; }); -} - -uint8_t StringToPriority(const std::string& str) -{ - auto it = map_label_priority.find(str); - if (it == map_label_priority.end()) throw std::runtime_error(strprintf("Unknown priority level %s", str)); - return it->second; -} - BenchRunner::BenchmarkMap& BenchRunner::benchmarks() { static BenchmarkMap benchmarks_map; return benchmarks_map; } -BenchRunner::BenchRunner(std::string name, BenchFunction func, PriorityLevel level) +BenchRunner::BenchRunner(std::string name, BenchFunction func) { - benchmarks().insert(std::make_pair(name, std::make_pair(func, level))); + Assert(benchmarks().try_emplace(std::move(name), std::move(func)).second); } void BenchRunner::RunAll(const Args& args) @@ -120,12 +93,7 @@ void BenchRunner::RunAll(const Args& args) }; std::vector benchmarkResults; - for (const auto& [name, bench_func] : benchmarks()) { - const auto& [func, priority_level] = bench_func; - - if (!(priority_level & args.priority)) { - continue; - } + for (const auto& [name, func] : benchmarks()) { if (!std::regex_match(name, baseMatch, reFilter)) { continue; diff --git a/src/bench/bench.h b/src/bench/bench.h index f6c41486643..f7df42a3038 100644 --- a/src/bench/bench.h +++ b/src/bench/bench.h @@ -10,11 +10,9 @@ #include #include -#include #include #include #include -#include #include /* @@ -40,17 +38,7 @@ namespace benchmark { using ankerl::nanobench::Bench; -typedef std::function BenchFunction; - -enum PriorityLevel : uint8_t -{ - LOW = 1 << 0, - HIGH = 1 << 2, -}; - -// List priority labels, comma-separated and sorted by increasing priority -std::string ListPriorities(); -uint8_t StringToPriority(const std::string& str); +using BenchFunction = std::function; struct Args { bool is_list_only; @@ -60,25 +48,24 @@ struct Args { fs::path output_csv; fs::path output_json; std::string regex_filter; - uint8_t priority; std::vector setup_args; }; class BenchRunner { - // maps from "name" -> (function, priority_level) - typedef std::map> BenchmarkMap; + // maps from "name" -> function + using BenchmarkMap = std::map; static BenchmarkMap& benchmarks(); public: - BenchRunner(std::string name, BenchFunction func, PriorityLevel level); + BenchRunner(std::string name, BenchFunction func); static void RunAll(const Args& args); }; } // namespace benchmark -// BENCHMARK(foo) expands to: benchmark::BenchRunner bench_11foo("foo", foo, priority_level); -#define BENCHMARK(n, priority_level) \ - benchmark::BenchRunner PASTE2(bench_, PASTE2(__LINE__, n))(STRINGIZE(n), n, priority_level); +// BENCHMARK(foo); expands to: benchmark::BenchRunner bench_runner_foo{"foo", foo}; +#define BENCHMARK(n) \ + benchmark::BenchRunner PASTE2(bench_runner_, n) { STRINGIZE(n), n } #endif // BITCOIN_BENCH_BENCH_H diff --git a/src/bench/bench_bitcoin.cpp b/src/bench/bench_bitcoin.cpp index 841d6258df8..987523a128b 100644 --- a/src/bench/bench_bitcoin.cpp +++ b/src/bench/bench_bitcoin.cpp @@ -18,12 +18,8 @@ #include #include -using util::SplitString; - static const char* DEFAULT_BENCH_FILTER = ".*"; static constexpr int64_t DEFAULT_MIN_TIME_MS{10}; -/** Priority level default value, run "all" priority levels */ -static const std::string DEFAULT_PRIORITY{"all"}; static void SetupBenchArgs(ArgsManager& argsman) { @@ -37,8 +33,6 @@ static void SetupBenchArgs(ArgsManager& argsman) argsman.AddArg("-output-csv=", "Generate CSV file with the most important benchmark results", ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS); argsman.AddArg("-output-json=", "Generate JSON file with all benchmark results", ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS); argsman.AddArg("-sanity-check", "Run benchmarks for only one iteration with no output", ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS); - argsman.AddArg("-priority-level=", strprintf("Run benchmarks of one or multiple priority level(s) (%s), default: '%s'", - benchmark::ListPriorities(), DEFAULT_PRIORITY), ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS); } // parses a comma separated list like "10,20,30,50" @@ -54,14 +48,6 @@ static std::vector parseAsymptote(const std::string& str) { return numbers; } -static uint8_t parsePriorityLevel(const std::string& str) { - uint8_t levels{0}; - for (const auto& level: SplitString(str, ',')) { - levels |= benchmark::StringToPriority(level); - } - return levels; -} - static std::vector parseTestSetupArgs(const ArgsManager& argsman) { // Parses unit test framework arguments supported by the benchmark framework. @@ -144,7 +130,6 @@ int main(int argc, char** argv) args.output_json = argsman.GetPathArg("-output-json"); args.regex_filter = argsman.GetArg("-filter", DEFAULT_BENCH_FILTER); args.sanity_check = argsman.GetBoolArg("-sanity-check", false); - args.priority = parsePriorityLevel(argsman.GetArg("-priority-level", DEFAULT_PRIORITY)); args.setup_args = parseTestSetupArgs(argsman); benchmark::BenchRunner::RunAll(args); diff --git a/src/bench/bip324_ecdh.cpp b/src/bench/bip324_ecdh.cpp index b94c2bd231a..65deb8b74e9 100644 --- a/src/bench/bip324_ecdh.cpp +++ b/src/bench/bip324_ecdh.cpp @@ -46,4 +46,4 @@ static void BIP324_ECDH(benchmark::Bench& bench) }); } -BENCHMARK(BIP324_ECDH, benchmark::PriorityLevel::HIGH); +BENCHMARK(BIP324_ECDH); diff --git a/src/bench/block_assemble.cpp b/src/bench/block_assemble.cpp index 4214d635ba6..297465be80f 100644 --- a/src/bench/block_assemble.cpp +++ b/src/bench/block_assemble.cpp @@ -69,5 +69,5 @@ static void BlockAssemblerAddPackageTxns(benchmark::Bench& bench) }); } -BENCHMARK(AssembleBlock, benchmark::PriorityLevel::HIGH); -BENCHMARK(BlockAssemblerAddPackageTxns, benchmark::PriorityLevel::LOW); +BENCHMARK(AssembleBlock); +BENCHMARK(BlockAssemblerAddPackageTxns); diff --git a/src/bench/blockencodings.cpp b/src/bench/blockencodings.cpp index f12d22fae80..3f6be56b464 100644 --- a/src/bench/blockencodings.cpp +++ b/src/bench/blockencodings.cpp @@ -126,6 +126,6 @@ static void BlockEncodingLargeExtra(benchmark::Bench& bench) BlockEncodingBench(bench, 50000, 5000); } -BENCHMARK(BlockEncodingNoExtra, benchmark::PriorityLevel::HIGH); -BENCHMARK(BlockEncodingStdExtra, benchmark::PriorityLevel::HIGH); -BENCHMARK(BlockEncodingLargeExtra, benchmark::PriorityLevel::HIGH); +BENCHMARK(BlockEncodingNoExtra); +BENCHMARK(BlockEncodingStdExtra); +BENCHMARK(BlockEncodingLargeExtra); diff --git a/src/bench/ccoins_caching.cpp b/src/bench/ccoins_caching.cpp index 26d15fc2020..2b7315f4c16 100644 --- a/src/bench/ccoins_caching.cpp +++ b/src/bench/ccoins_caching.cpp @@ -54,4 +54,4 @@ static void CCoinsCaching(benchmark::Bench& bench) }); } -BENCHMARK(CCoinsCaching, benchmark::PriorityLevel::HIGH); +BENCHMARK(CCoinsCaching); diff --git a/src/bench/chacha20.cpp b/src/bench/chacha20.cpp index cc029b1b0c3..371651771f7 100644 --- a/src/bench/chacha20.cpp +++ b/src/bench/chacha20.cpp @@ -71,9 +71,9 @@ static void FSCHACHA20POLY1305_1MB(benchmark::Bench& bench) FSCHACHA20POLY1305(bench, BUFFER_SIZE_LARGE); } -BENCHMARK(CHACHA20_64BYTES, benchmark::PriorityLevel::HIGH); -BENCHMARK(CHACHA20_256BYTES, benchmark::PriorityLevel::HIGH); -BENCHMARK(CHACHA20_1MB, benchmark::PriorityLevel::HIGH); -BENCHMARK(FSCHACHA20POLY1305_64BYTES, benchmark::PriorityLevel::HIGH); -BENCHMARK(FSCHACHA20POLY1305_256BYTES, benchmark::PriorityLevel::HIGH); -BENCHMARK(FSCHACHA20POLY1305_1MB, benchmark::PriorityLevel::HIGH); +BENCHMARK(CHACHA20_64BYTES); +BENCHMARK(CHACHA20_256BYTES); +BENCHMARK(CHACHA20_1MB); +BENCHMARK(FSCHACHA20POLY1305_64BYTES); +BENCHMARK(FSCHACHA20POLY1305_256BYTES); +BENCHMARK(FSCHACHA20POLY1305_1MB); diff --git a/src/bench/checkblock.cpp b/src/bench/checkblock.cpp index acf297679b1..765b8b0dadc 100644 --- a/src/bench/checkblock.cpp +++ b/src/bench/checkblock.cpp @@ -60,5 +60,5 @@ static void DeserializeAndCheckBlockTest(benchmark::Bench& bench) }); } -BENCHMARK(DeserializeBlockTest, benchmark::PriorityLevel::HIGH); -BENCHMARK(DeserializeAndCheckBlockTest, benchmark::PriorityLevel::HIGH); +BENCHMARK(DeserializeBlockTest); +BENCHMARK(DeserializeAndCheckBlockTest); diff --git a/src/bench/checkblockindex.cpp b/src/bench/checkblockindex.cpp index a5c152b3877..78e70a8d6a6 100644 --- a/src/bench/checkblockindex.cpp +++ b/src/bench/checkblockindex.cpp @@ -19,4 +19,4 @@ static void CheckBlockIndex(benchmark::Bench& bench) } -BENCHMARK(CheckBlockIndex, benchmark::PriorityLevel::HIGH); +BENCHMARK(CheckBlockIndex); diff --git a/src/bench/checkqueue.cpp b/src/bench/checkqueue.cpp index 2aa715cb0e1..2c9126dd662 100644 --- a/src/bench/checkqueue.cpp +++ b/src/bench/checkqueue.cpp @@ -65,4 +65,4 @@ static void CCheckQueueSpeedPrevectorJob(benchmark::Bench& bench) control.Complete(); }); } -BENCHMARK(CCheckQueueSpeedPrevectorJob, benchmark::PriorityLevel::HIGH); +BENCHMARK(CCheckQueueSpeedPrevectorJob); diff --git a/src/bench/cluster_linearize.cpp b/src/bench/cluster_linearize.cpp index a856d2475c0..88f8bf28350 100644 --- a/src/bench/cluster_linearize.cpp +++ b/src/bench/cluster_linearize.cpp @@ -150,12 +150,12 @@ static void LinearizeOptimallyPerCost(benchmark::Bench& bench) BenchLinearizeOptimallyPerCost(bench, "LinearizeOptimallySyntheticPerCost", CLUSTERS_SYNTHETIC); } -BENCHMARK(PostLinearize16TxWorstCase, benchmark::PriorityLevel::HIGH); -BENCHMARK(PostLinearize32TxWorstCase, benchmark::PriorityLevel::HIGH); -BENCHMARK(PostLinearize48TxWorstCase, benchmark::PriorityLevel::HIGH); -BENCHMARK(PostLinearize64TxWorstCase, benchmark::PriorityLevel::HIGH); -BENCHMARK(PostLinearize75TxWorstCase, benchmark::PriorityLevel::HIGH); -BENCHMARK(PostLinearize99TxWorstCase, benchmark::PriorityLevel::HIGH); +BENCHMARK(PostLinearize16TxWorstCase); +BENCHMARK(PostLinearize32TxWorstCase); +BENCHMARK(PostLinearize48TxWorstCase); +BENCHMARK(PostLinearize64TxWorstCase); +BENCHMARK(PostLinearize75TxWorstCase); +BENCHMARK(PostLinearize99TxWorstCase); -BENCHMARK(LinearizeOptimallyTotal, benchmark::PriorityLevel::HIGH); -BENCHMARK(LinearizeOptimallyPerCost, benchmark::PriorityLevel::HIGH); +BENCHMARK(LinearizeOptimallyTotal); +BENCHMARK(LinearizeOptimallyPerCost); diff --git a/src/bench/coin_selection.cpp b/src/bench/coin_selection.cpp index 41d01dfcdd0..186e16718c0 100644 --- a/src/bench/coin_selection.cpp +++ b/src/bench/coin_selection.cpp @@ -137,5 +137,5 @@ static void BnBExhaustion(benchmark::Bench& bench) }); } -BENCHMARK(CoinSelection, benchmark::PriorityLevel::HIGH); -BENCHMARK(BnBExhaustion, benchmark::PriorityLevel::HIGH); +BENCHMARK(CoinSelection); +BENCHMARK(BnBExhaustion); diff --git a/src/bench/connectblock.cpp b/src/bench/connectblock.cpp index cc97296651d..434bcdcbfe2 100644 --- a/src/bench/connectblock.cpp +++ b/src/bench/connectblock.cpp @@ -126,6 +126,6 @@ static void ConnectBlockAllEcdsa(benchmark::Bench& bench) BenchmarkConnectBlock(bench, keys, outputs, *test_setup); } -BENCHMARK(ConnectBlockAllSchnorr, benchmark::PriorityLevel::HIGH); -BENCHMARK(ConnectBlockMixedEcdsaSchnorr, benchmark::PriorityLevel::HIGH); -BENCHMARK(ConnectBlockAllEcdsa, benchmark::PriorityLevel::HIGH); +BENCHMARK(ConnectBlockAllSchnorr); +BENCHMARK(ConnectBlockMixedEcdsaSchnorr); +BENCHMARK(ConnectBlockAllEcdsa); diff --git a/src/bench/crypto_hash.cpp b/src/bench/crypto_hash.cpp index 0fd7245bbb4..666ff3c053c 100644 --- a/src/bench/crypto_hash.cpp +++ b/src/bench/crypto_hash.cpp @@ -260,27 +260,27 @@ static void MuHashFinalize(benchmark::Bench& bench) }); } -BENCHMARK(BenchRIPEMD160, benchmark::PriorityLevel::HIGH); -BENCHMARK(SHA1, benchmark::PriorityLevel::HIGH); -BENCHMARK(SHA256_STANDARD, benchmark::PriorityLevel::HIGH); -BENCHMARK(SHA256_SSE4, benchmark::PriorityLevel::HIGH); -BENCHMARK(SHA256_AVX2, benchmark::PriorityLevel::HIGH); -BENCHMARK(SHA256_SHANI, benchmark::PriorityLevel::HIGH); -BENCHMARK(SHA512, benchmark::PriorityLevel::HIGH); -BENCHMARK(SHA3_256_1M, benchmark::PriorityLevel::HIGH); +BENCHMARK(BenchRIPEMD160); +BENCHMARK(SHA1); +BENCHMARK(SHA256_STANDARD); +BENCHMARK(SHA256_SSE4); +BENCHMARK(SHA256_AVX2); +BENCHMARK(SHA256_SHANI); +BENCHMARK(SHA512); +BENCHMARK(SHA3_256_1M); -BENCHMARK(SHA256_32b_STANDARD, benchmark::PriorityLevel::HIGH); -BENCHMARK(SHA256_32b_SSE4, benchmark::PriorityLevel::HIGH); -BENCHMARK(SHA256_32b_AVX2, benchmark::PriorityLevel::HIGH); -BENCHMARK(SHA256_32b_SHANI, benchmark::PriorityLevel::HIGH); -BENCHMARK(SipHash_32b, benchmark::PriorityLevel::HIGH); -BENCHMARK(SHA256D64_1024_STANDARD, benchmark::PriorityLevel::HIGH); -BENCHMARK(SHA256D64_1024_SSE4, benchmark::PriorityLevel::HIGH); -BENCHMARK(SHA256D64_1024_AVX2, benchmark::PriorityLevel::HIGH); -BENCHMARK(SHA256D64_1024_SHANI, benchmark::PriorityLevel::HIGH); +BENCHMARK(SHA256_32b_STANDARD); +BENCHMARK(SHA256_32b_SSE4); +BENCHMARK(SHA256_32b_AVX2); +BENCHMARK(SHA256_32b_SHANI); +BENCHMARK(SipHash_32b); +BENCHMARK(SHA256D64_1024_STANDARD); +BENCHMARK(SHA256D64_1024_SSE4); +BENCHMARK(SHA256D64_1024_AVX2); +BENCHMARK(SHA256D64_1024_SHANI); -BENCHMARK(MuHash, benchmark::PriorityLevel::HIGH); -BENCHMARK(MuHashMul, benchmark::PriorityLevel::HIGH); -BENCHMARK(MuHashDiv, benchmark::PriorityLevel::HIGH); -BENCHMARK(MuHashPrecompute, benchmark::PriorityLevel::HIGH); -BENCHMARK(MuHashFinalize, benchmark::PriorityLevel::HIGH); +BENCHMARK(MuHash); +BENCHMARK(MuHashMul); +BENCHMARK(MuHashDiv); +BENCHMARK(MuHashPrecompute); +BENCHMARK(MuHashFinalize); diff --git a/src/bench/descriptors.cpp b/src/bench/descriptors.cpp index 719e69e319e..c375d31211b 100644 --- a/src/bench/descriptors.cpp +++ b/src/bench/descriptors.cpp @@ -35,4 +35,4 @@ static void ExpandDescriptor(benchmark::Bench& bench) }); } -BENCHMARK(ExpandDescriptor, benchmark::PriorityLevel::HIGH); +BENCHMARK(ExpandDescriptor); diff --git a/src/bench/disconnected_transactions.cpp b/src/bench/disconnected_transactions.cpp index e4c72aa59cd..4dd5de42ca2 100644 --- a/src/bench/disconnected_transactions.cpp +++ b/src/bench/disconnected_transactions.cpp @@ -134,6 +134,6 @@ static void AddAndRemoveDisconnectedBlockTransactions10(benchmark::Bench& bench) }); } -BENCHMARK(AddAndRemoveDisconnectedBlockTransactionsAll, benchmark::PriorityLevel::HIGH); -BENCHMARK(AddAndRemoveDisconnectedBlockTransactions90, benchmark::PriorityLevel::HIGH); -BENCHMARK(AddAndRemoveDisconnectedBlockTransactions10, benchmark::PriorityLevel::HIGH); +BENCHMARK(AddAndRemoveDisconnectedBlockTransactionsAll); +BENCHMARK(AddAndRemoveDisconnectedBlockTransactions90); +BENCHMARK(AddAndRemoveDisconnectedBlockTransactions10); diff --git a/src/bench/duplicate_inputs.cpp b/src/bench/duplicate_inputs.cpp index 9bd7551d0bc..b59d14af892 100644 --- a/src/bench/duplicate_inputs.cpp +++ b/src/bench/duplicate_inputs.cpp @@ -76,4 +76,4 @@ static void DuplicateInputs(benchmark::Bench& bench) }); } -BENCHMARK(DuplicateInputs, benchmark::PriorityLevel::HIGH); +BENCHMARK(DuplicateInputs); diff --git a/src/bench/ellswift.cpp b/src/bench/ellswift.cpp index 21868fb86e8..2daf1a9e9e8 100644 --- a/src/bench/ellswift.cpp +++ b/src/bench/ellswift.cpp @@ -29,4 +29,4 @@ static void EllSwiftCreate(benchmark::Bench& bench) }); } -BENCHMARK(EllSwiftCreate, benchmark::PriorityLevel::HIGH); +BENCHMARK(EllSwiftCreate); diff --git a/src/bench/examples.cpp b/src/bench/examples.cpp index 0769b80da0a..07c0eabd849 100644 --- a/src/bench/examples.cpp +++ b/src/bench/examples.cpp @@ -18,4 +18,4 @@ static void Trig(benchmark::Bench& bench) }); } -BENCHMARK(Trig, benchmark::PriorityLevel::HIGH); +BENCHMARK(Trig); diff --git a/src/bench/gcs_filter.cpp b/src/bench/gcs_filter.cpp index d66402dab50..ea48592ac8f 100644 --- a/src/bench/gcs_filter.cpp +++ b/src/bench/gcs_filter.cpp @@ -86,8 +86,8 @@ static void GCSFilterMatch(benchmark::Bench& bench) filter.Match(GCSFilter::Element()); }); } -BENCHMARK(GCSBlockFilterGetHash, benchmark::PriorityLevel::HIGH); -BENCHMARK(GCSFilterConstruct, benchmark::PriorityLevel::HIGH); -BENCHMARK(GCSFilterDecode, benchmark::PriorityLevel::HIGH); -BENCHMARK(GCSFilterDecodeSkipCheck, benchmark::PriorityLevel::HIGH); -BENCHMARK(GCSFilterMatch, benchmark::PriorityLevel::HIGH); +BENCHMARK(GCSBlockFilterGetHash); +BENCHMARK(GCSFilterConstruct); +BENCHMARK(GCSFilterDecode); +BENCHMARK(GCSFilterDecodeSkipCheck); +BENCHMARK(GCSFilterMatch); diff --git a/src/bench/hashpadding.cpp b/src/bench/hashpadding.cpp index 74047a0cc49..4825c5f6652 100644 --- a/src/bench/hashpadding.cpp +++ b/src/bench/hashpadding.cpp @@ -26,7 +26,7 @@ static void PrePadded(benchmark::Bench& bench) }); } -BENCHMARK(PrePadded, benchmark::PriorityLevel::HIGH); +BENCHMARK(PrePadded); static void RegularPadded(benchmark::Bench& bench) { @@ -44,4 +44,4 @@ static void RegularPadded(benchmark::Bench& bench) }); } -BENCHMARK(RegularPadded, benchmark::PriorityLevel::HIGH); +BENCHMARK(RegularPadded); diff --git a/src/bench/index_blockfilter.cpp b/src/bench/index_blockfilter.cpp index eac09688c8a..ea40b1320e1 100644 --- a/src/bench/index_blockfilter.cpp +++ b/src/bench/index_blockfilter.cpp @@ -56,4 +56,4 @@ static void BlockFilterIndexSync(benchmark::Bench& bench) }); } -BENCHMARK(BlockFilterIndexSync, benchmark::PriorityLevel::HIGH); +BENCHMARK(BlockFilterIndexSync); diff --git a/src/bench/load_external.cpp b/src/bench/load_external.cpp index 18f21be4c48..3350d16ac02 100644 --- a/src/bench/load_external.cpp +++ b/src/bench/load_external.cpp @@ -71,4 +71,4 @@ static void LoadExternalBlockFile(benchmark::Bench& bench) fs::remove(blkfile); } -BENCHMARK(LoadExternalBlockFile, benchmark::PriorityLevel::HIGH); +BENCHMARK(LoadExternalBlockFile); diff --git a/src/bench/lockedpool.cpp b/src/bench/lockedpool.cpp index 5f8834f5e05..27fd609a52d 100644 --- a/src/bench/lockedpool.cpp +++ b/src/bench/lockedpool.cpp @@ -38,4 +38,4 @@ static void BenchLockedPool(benchmark::Bench& bench) addr.clear(); } -BENCHMARK(BenchLockedPool, benchmark::PriorityLevel::HIGH); +BENCHMARK(BenchLockedPool); diff --git a/src/bench/logging.cpp b/src/bench/logging.cpp index 487ddcf3132..498469dc236 100644 --- a/src/bench/logging.cpp +++ b/src/bench/logging.cpp @@ -57,8 +57,8 @@ static void LogWithoutWriteToFile(benchmark::Bench& bench) }); } -BENCHMARK(LogWithDebug, benchmark::PriorityLevel::HIGH); -BENCHMARK(LogWithoutDebug, benchmark::PriorityLevel::HIGH); -BENCHMARK(LogWithThreadNames, benchmark::PriorityLevel::HIGH); -BENCHMARK(LogWithoutThreadNames, benchmark::PriorityLevel::HIGH); -BENCHMARK(LogWithoutWriteToFile, benchmark::PriorityLevel::HIGH); +BENCHMARK(LogWithDebug); +BENCHMARK(LogWithoutDebug); +BENCHMARK(LogWithThreadNames); +BENCHMARK(LogWithoutThreadNames); +BENCHMARK(LogWithoutWriteToFile); diff --git a/src/bench/mempool_ephemeral_spends.cpp b/src/bench/mempool_ephemeral_spends.cpp index a572d945f46..2f89f0da208 100644 --- a/src/bench/mempool_ephemeral_spends.cpp +++ b/src/bench/mempool_ephemeral_spends.cpp @@ -84,4 +84,4 @@ static void MempoolCheckEphemeralSpends(benchmark::Bench& bench) }); } -BENCHMARK(MempoolCheckEphemeralSpends, benchmark::PriorityLevel::HIGH); +BENCHMARK(MempoolCheckEphemeralSpends); diff --git a/src/bench/mempool_eviction.cpp b/src/bench/mempool_eviction.cpp index 7e64592d73f..ad3ab08a994 100644 --- a/src/bench/mempool_eviction.cpp +++ b/src/bench/mempool_eviction.cpp @@ -144,4 +144,4 @@ static void MempoolEviction(benchmark::Bench& bench) }); } -BENCHMARK(MempoolEviction, benchmark::PriorityLevel::HIGH); +BENCHMARK(MempoolEviction); diff --git a/src/bench/mempool_stress.cpp b/src/bench/mempool_stress.cpp index 946bd1fcc17..768913ac12a 100644 --- a/src/bench/mempool_stress.cpp +++ b/src/bench/mempool_stress.cpp @@ -208,7 +208,7 @@ static void MempoolCheck(benchmark::Bench& bench) }); } -BENCHMARK(MemPoolAncestorsDescendants, benchmark::PriorityLevel::HIGH); -BENCHMARK(MemPoolAddTransactions, benchmark::PriorityLevel::HIGH); -BENCHMARK(ComplexMemPool, benchmark::PriorityLevel::HIGH); -BENCHMARK(MempoolCheck, benchmark::PriorityLevel::HIGH); +BENCHMARK(MemPoolAncestorsDescendants); +BENCHMARK(MemPoolAddTransactions); +BENCHMARK(ComplexMemPool); +BENCHMARK(MempoolCheck); diff --git a/src/bench/merkle_root.cpp b/src/bench/merkle_root.cpp index f9c933ec282..b27bbd461d5 100644 --- a/src/bench/merkle_root.cpp +++ b/src/bench/merkle_root.cpp @@ -24,4 +24,4 @@ static void MerkleRoot(benchmark::Bench& bench) }); } -BENCHMARK(MerkleRoot, benchmark::PriorityLevel::HIGH); +BENCHMARK(MerkleRoot); diff --git a/src/bench/obfuscation.cpp b/src/bench/obfuscation.cpp index 178be56a5d5..c7392e03854 100644 --- a/src/bench/obfuscation.cpp +++ b/src/bench/obfuscation.cpp @@ -22,4 +22,4 @@ static void ObfuscationBench(benchmark::Bench& bench) }); } -BENCHMARK(ObfuscationBench, benchmark::PriorityLevel::HIGH); +BENCHMARK(ObfuscationBench); diff --git a/src/bench/parse_hex.cpp b/src/bench/parse_hex.cpp index fa08f5d84a1..928176bdc1c 100644 --- a/src/bench/parse_hex.cpp +++ b/src/bench/parse_hex.cpp @@ -34,4 +34,4 @@ static void HexParse(benchmark::Bench& bench) }); } -BENCHMARK(HexParse, benchmark::PriorityLevel::HIGH); +BENCHMARK(HexParse); diff --git a/src/bench/peer_eviction.cpp b/src/bench/peer_eviction.cpp index 43d819ccec6..2360fb49de7 100644 --- a/src/bench/peer_eviction.cpp +++ b/src/bench/peer_eviction.cpp @@ -140,15 +140,15 @@ static void EvictionProtection3Networks250Candidates(benchmark::Bench& bench) // - 250 candidates is the number of peers reported by operators of busy nodes // No disadvantaged networks, with 250 eviction candidates. -BENCHMARK(EvictionProtection0Networks250Candidates, benchmark::PriorityLevel::HIGH); +BENCHMARK(EvictionProtection0Networks250Candidates); // 1 disadvantaged network (Tor) with 250 eviction candidates. -BENCHMARK(EvictionProtection1Networks250Candidates, benchmark::PriorityLevel::HIGH); +BENCHMARK(EvictionProtection1Networks250Candidates); // 2 disadvantaged networks (I2P, Tor) with 250 eviction candidates. -BENCHMARK(EvictionProtection2Networks250Candidates, benchmark::PriorityLevel::HIGH); +BENCHMARK(EvictionProtection2Networks250Candidates); // 3 disadvantaged networks (I2P/localhost/Tor) with 50/100/250 eviction candidates. -BENCHMARK(EvictionProtection3Networks050Candidates, benchmark::PriorityLevel::HIGH); -BENCHMARK(EvictionProtection3Networks100Candidates, benchmark::PriorityLevel::HIGH); -BENCHMARK(EvictionProtection3Networks250Candidates, benchmark::PriorityLevel::HIGH); +BENCHMARK(EvictionProtection3Networks050Candidates); +BENCHMARK(EvictionProtection3Networks100Candidates); +BENCHMARK(EvictionProtection3Networks250Candidates); diff --git a/src/bench/poly1305.cpp b/src/bench/poly1305.cpp index eaa7857f2b8..e782164ad93 100644 --- a/src/bench/poly1305.cpp +++ b/src/bench/poly1305.cpp @@ -41,6 +41,6 @@ static void POLY1305_1MB(benchmark::Bench& bench) POLY1305(bench, BUFFER_SIZE_LARGE); } -BENCHMARK(POLY1305_64BYTES, benchmark::PriorityLevel::HIGH); -BENCHMARK(POLY1305_256BYTES, benchmark::PriorityLevel::HIGH); -BENCHMARK(POLY1305_1MB, benchmark::PriorityLevel::HIGH); +BENCHMARK(POLY1305_64BYTES); +BENCHMARK(POLY1305_256BYTES); +BENCHMARK(POLY1305_1MB); diff --git a/src/bench/pool.cpp b/src/bench/pool.cpp index b31046cfce5..cf4ba132bf4 100644 --- a/src/bench/pool.cpp +++ b/src/bench/pool.cpp @@ -49,5 +49,5 @@ static void PoolAllocator_StdUnorderedMapWithPoolResource(benchmark::Bench& benc BenchFillClearMap(bench, map); } -BENCHMARK(PoolAllocator_StdUnorderedMap, benchmark::PriorityLevel::HIGH); -BENCHMARK(PoolAllocator_StdUnorderedMapWithPoolResource, benchmark::PriorityLevel::HIGH); +BENCHMARK(PoolAllocator_StdUnorderedMap); +BENCHMARK(PoolAllocator_StdUnorderedMapWithPoolResource); diff --git a/src/bench/prevector.cpp b/src/bench/prevector.cpp index 85ef196ea4a..8d386ec2c44 100644 --- a/src/bench/prevector.cpp +++ b/src/bench/prevector.cpp @@ -116,12 +116,12 @@ static void PrevectorFillVectorIndirect(benchmark::Bench& bench) { \ Prevector##name(bench); \ } \ - BENCHMARK(Prevector##name##Nontrivial, benchmark::PriorityLevel::HIGH); \ + BENCHMARK(Prevector##name##Nontrivial); \ static void Prevector##name##Trivial(benchmark::Bench& bench) \ { \ Prevector##name(bench); \ } \ - BENCHMARK(Prevector##name##Trivial, benchmark::PriorityLevel::HIGH); + BENCHMARK(Prevector##name##Trivial); PREVECTOR_TEST(Clear) PREVECTOR_TEST(Destructor) diff --git a/src/bench/random.cpp b/src/bench/random.cpp index c2aa66850ad..c3ac72ea415 100644 --- a/src/bench/random.cpp +++ b/src/bench/random.cpp @@ -86,20 +86,20 @@ void InsecureRandom_stdshuffle100(benchmark::Bench& bench) { BenchRandom_stdshuf } // namespace -BENCHMARK(FastRandom_rand64, benchmark::PriorityLevel::HIGH); -BENCHMARK(FastRandom_rand32, benchmark::PriorityLevel::HIGH); -BENCHMARK(FastRandom_randbool, benchmark::PriorityLevel::HIGH); -BENCHMARK(FastRandom_randbits, benchmark::PriorityLevel::HIGH); -BENCHMARK(FastRandom_randrange100, benchmark::PriorityLevel::HIGH); -BENCHMARK(FastRandom_randrange1000, benchmark::PriorityLevel::HIGH); -BENCHMARK(FastRandom_randrange1000000, benchmark::PriorityLevel::HIGH); -BENCHMARK(FastRandom_stdshuffle100, benchmark::PriorityLevel::HIGH); +BENCHMARK(FastRandom_rand64); +BENCHMARK(FastRandom_rand32); +BENCHMARK(FastRandom_randbool); +BENCHMARK(FastRandom_randbits); +BENCHMARK(FastRandom_randrange100); +BENCHMARK(FastRandom_randrange1000); +BENCHMARK(FastRandom_randrange1000000); +BENCHMARK(FastRandom_stdshuffle100); -BENCHMARK(InsecureRandom_rand64, benchmark::PriorityLevel::HIGH); -BENCHMARK(InsecureRandom_rand32, benchmark::PriorityLevel::HIGH); -BENCHMARK(InsecureRandom_randbool, benchmark::PriorityLevel::HIGH); -BENCHMARK(InsecureRandom_randbits, benchmark::PriorityLevel::HIGH); -BENCHMARK(InsecureRandom_randrange100, benchmark::PriorityLevel::HIGH); -BENCHMARK(InsecureRandom_randrange1000, benchmark::PriorityLevel::HIGH); -BENCHMARK(InsecureRandom_randrange1000000, benchmark::PriorityLevel::HIGH); -BENCHMARK(InsecureRandom_stdshuffle100, benchmark::PriorityLevel::HIGH); +BENCHMARK(InsecureRandom_rand64); +BENCHMARK(InsecureRandom_rand32); +BENCHMARK(InsecureRandom_randbool); +BENCHMARK(InsecureRandom_randbits); +BENCHMARK(InsecureRandom_randrange100); +BENCHMARK(InsecureRandom_randrange1000); +BENCHMARK(InsecureRandom_randrange1000000); +BENCHMARK(InsecureRandom_stdshuffle100); diff --git a/src/bench/readwriteblock.cpp b/src/bench/readwriteblock.cpp index d756789b712..e1372a26b73 100644 --- a/src/bench/readwriteblock.cpp +++ b/src/bench/readwriteblock.cpp @@ -63,6 +63,6 @@ static void ReadRawBlockBench(benchmark::Bench& bench) }); } -BENCHMARK(WriteBlockBench, benchmark::PriorityLevel::HIGH); -BENCHMARK(ReadBlockBench, benchmark::PriorityLevel::HIGH); -BENCHMARK(ReadRawBlockBench, benchmark::PriorityLevel::HIGH); +BENCHMARK(WriteBlockBench); +BENCHMARK(ReadBlockBench); +BENCHMARK(ReadRawBlockBench); diff --git a/src/bench/rollingbloom.cpp b/src/bench/rollingbloom.cpp index a9b7806e5be..8331eb6a7c9 100644 --- a/src/bench/rollingbloom.cpp +++ b/src/bench/rollingbloom.cpp @@ -34,5 +34,5 @@ static void RollingBloomReset(benchmark::Bench& bench) }); } -BENCHMARK(RollingBloom, benchmark::PriorityLevel::HIGH); -BENCHMARK(RollingBloomReset, benchmark::PriorityLevel::HIGH); +BENCHMARK(RollingBloom); +BENCHMARK(RollingBloomReset); diff --git a/src/bench/rpc_blockchain.cpp b/src/bench/rpc_blockchain.cpp index 0dc217ea499..0e89ac78a13 100644 --- a/src/bench/rpc_blockchain.cpp +++ b/src/bench/rpc_blockchain.cpp @@ -70,9 +70,9 @@ static void BlockToJsonVerbosity3(benchmark::Bench& bench) BlockToJson(bench, TxVerbosity::SHOW_DETAILS_AND_PREVOUT); } -BENCHMARK(BlockToJsonVerbosity1, benchmark::PriorityLevel::HIGH); -BENCHMARK(BlockToJsonVerbosity2, benchmark::PriorityLevel::HIGH); -BENCHMARK(BlockToJsonVerbosity3, benchmark::PriorityLevel::HIGH); +BENCHMARK(BlockToJsonVerbosity1); +BENCHMARK(BlockToJsonVerbosity2); +BENCHMARK(BlockToJsonVerbosity3); static void BlockToJsonVerboseWrite(benchmark::Bench& bench) { @@ -85,4 +85,4 @@ static void BlockToJsonVerboseWrite(benchmark::Bench& bench) }); } -BENCHMARK(BlockToJsonVerboseWrite, benchmark::PriorityLevel::HIGH); +BENCHMARK(BlockToJsonVerboseWrite); diff --git a/src/bench/rpc_mempool.cpp b/src/bench/rpc_mempool.cpp index c710c2c88c3..b27a7e72cc4 100644 --- a/src/bench/rpc_mempool.cpp +++ b/src/bench/rpc_mempool.cpp @@ -48,4 +48,4 @@ static void RpcMempool(benchmark::Bench& bench) }); } -BENCHMARK(RpcMempool, benchmark::PriorityLevel::HIGH); +BENCHMARK(RpcMempool); diff --git a/src/bench/sign_transaction.cpp b/src/bench/sign_transaction.cpp index f4294389e3a..96af48c5724 100644 --- a/src/bench/sign_transaction.cpp +++ b/src/bench/sign_transaction.cpp @@ -100,7 +100,7 @@ static void SignSchnorrWithNullMerkleRoot(benchmark::Bench& bench) SignSchnorrTapTweakBenchmark(bench, /*use_null_merkle_root=*/true); } -BENCHMARK(SignTransactionECDSA, benchmark::PriorityLevel::HIGH); -BENCHMARK(SignTransactionSchnorr, benchmark::PriorityLevel::HIGH); -BENCHMARK(SignSchnorrWithMerkleRoot, benchmark::PriorityLevel::HIGH); -BENCHMARK(SignSchnorrWithNullMerkleRoot, benchmark::PriorityLevel::HIGH); +BENCHMARK(SignTransactionECDSA); +BENCHMARK(SignTransactionSchnorr); +BENCHMARK(SignSchnorrWithMerkleRoot); +BENCHMARK(SignSchnorrWithNullMerkleRoot); diff --git a/src/bench/streams_findbyte.cpp b/src/bench/streams_findbyte.cpp index 9c52a72a699..45e93d777d8 100644 --- a/src/bench/streams_findbyte.cpp +++ b/src/bench/streams_findbyte.cpp @@ -30,4 +30,4 @@ static void FindByte(benchmark::Bench& bench) assert(file.fclose() == 0); } -BENCHMARK(FindByte, benchmark::PriorityLevel::HIGH); +BENCHMARK(FindByte); diff --git a/src/bench/strencodings.cpp b/src/bench/strencodings.cpp index 38af7ad7308..a0767b495fe 100644 --- a/src/bench/strencodings.cpp +++ b/src/bench/strencodings.cpp @@ -18,4 +18,4 @@ static void HexStrBench(benchmark::Bench& bench) }); } -BENCHMARK(HexStrBench, benchmark::PriorityLevel::HIGH); +BENCHMARK(HexStrBench); diff --git a/src/bench/txgraph.cpp b/src/bench/txgraph.cpp index 70824c2a51e..078f77b4256 100644 --- a/src/bench/txgraph.cpp +++ b/src/bench/txgraph.cpp @@ -123,4 +123,4 @@ void BenchTxGraphTrim(benchmark::Bench& bench) static void TxGraphTrim(benchmark::Bench& bench) { BenchTxGraphTrim(bench); } -BENCHMARK(TxGraphTrim, benchmark::PriorityLevel::HIGH); +BENCHMARK(TxGraphTrim); diff --git a/src/bench/txorphanage.cpp b/src/bench/txorphanage.cpp index dd614fa3f9d..1f94553bc4d 100644 --- a/src/bench/txorphanage.cpp +++ b/src/bench/txorphanage.cpp @@ -262,7 +262,7 @@ static void OrphanageEraseForPeer(benchmark::Bench& bench) OrphanageEraseAll(bench, /*block_or_disconnect=*/false); } -BENCHMARK(OrphanageSinglePeerEviction, benchmark::PriorityLevel::LOW); -BENCHMARK(OrphanageMultiPeerEviction, benchmark::PriorityLevel::LOW); -BENCHMARK(OrphanageEraseForBlock, benchmark::PriorityLevel::LOW); -BENCHMARK(OrphanageEraseForPeer, benchmark::PriorityLevel::LOW); +BENCHMARK(OrphanageSinglePeerEviction); +BENCHMARK(OrphanageMultiPeerEviction); +BENCHMARK(OrphanageEraseForBlock); +BENCHMARK(OrphanageEraseForPeer); diff --git a/src/bench/util_time.cpp b/src/bench/util_time.cpp index a4f305163a1..bc3e3892f1f 100644 --- a/src/bench/util_time.cpp +++ b/src/bench/util_time.cpp @@ -36,7 +36,7 @@ static void BenchTimeMillisSys(benchmark::Bench& bench) }); } -BENCHMARK(BenchTimeDeprecated, benchmark::PriorityLevel::HIGH); -BENCHMARK(BenchTimeMillis, benchmark::PriorityLevel::HIGH); -BENCHMARK(BenchTimeMillisSys, benchmark::PriorityLevel::HIGH); -BENCHMARK(BenchTimeMock, benchmark::PriorityLevel::HIGH); +BENCHMARK(BenchTimeDeprecated); +BENCHMARK(BenchTimeMillis); +BENCHMARK(BenchTimeMillisSys); +BENCHMARK(BenchTimeMock); diff --git a/src/bench/verify_script.cpp b/src/bench/verify_script.cpp index 1266f6dd454..e740f86ce03 100644 --- a/src/bench/verify_script.cpp +++ b/src/bench/verify_script.cpp @@ -87,5 +87,5 @@ static void VerifyNestedIfScript(benchmark::Bench& bench) }); } -BENCHMARK(VerifyScriptBench, benchmark::PriorityLevel::HIGH); -BENCHMARK(VerifyNestedIfScript, benchmark::PriorityLevel::HIGH); +BENCHMARK(VerifyScriptBench); +BENCHMARK(VerifyNestedIfScript); diff --git a/src/bench/wallet_balance.cpp b/src/bench/wallet_balance.cpp index 5f3711ad066..03774ef54ac 100644 --- a/src/bench/wallet_balance.cpp +++ b/src/bench/wallet_balance.cpp @@ -64,8 +64,8 @@ static void WalletBalanceClean(benchmark::Bench& bench) { WalletBalance(bench, / static void WalletBalanceMine(benchmark::Bench& bench) { WalletBalance(bench, /*set_dirty=*/false, /*add_mine=*/true); } static void WalletBalanceWatch(benchmark::Bench& bench) { WalletBalance(bench, /*set_dirty=*/false, /*add_mine=*/false); } -BENCHMARK(WalletBalanceDirty, benchmark::PriorityLevel::HIGH); -BENCHMARK(WalletBalanceClean, benchmark::PriorityLevel::HIGH); -BENCHMARK(WalletBalanceMine, benchmark::PriorityLevel::HIGH); -BENCHMARK(WalletBalanceWatch, benchmark::PriorityLevel::HIGH); +BENCHMARK(WalletBalanceDirty); +BENCHMARK(WalletBalanceClean); +BENCHMARK(WalletBalanceMine); +BENCHMARK(WalletBalanceWatch); } // namespace wallet diff --git a/src/bench/wallet_create.cpp b/src/bench/wallet_create.cpp index 9d3527e7434..1c92beddec2 100644 --- a/src/bench/wallet_create.cpp +++ b/src/bench/wallet_create.cpp @@ -60,7 +60,7 @@ static void WalletCreate(benchmark::Bench& bench, bool encrypted) static void WalletCreatePlain(benchmark::Bench& bench) { WalletCreate(bench, /*encrypted=*/false); } static void WalletCreateEncrypted(benchmark::Bench& bench) { WalletCreate(bench, /*encrypted=*/true); } -BENCHMARK(WalletCreatePlain, benchmark::PriorityLevel::LOW); -BENCHMARK(WalletCreateEncrypted, benchmark::PriorityLevel::LOW); +BENCHMARK(WalletCreatePlain); +BENCHMARK(WalletCreateEncrypted); } // namespace wallet diff --git a/src/bench/wallet_create_tx.cpp b/src/bench/wallet_create_tx.cpp index cd9ffd10c3e..8ff1e39a2f8 100644 --- a/src/bench/wallet_create_tx.cpp +++ b/src/bench/wallet_create_tx.cpp @@ -215,6 +215,6 @@ static void WalletCreateTxUsePresetInputsAndCoinSelection(benchmark::Bench& benc static void WalletAvailableCoins(benchmark::Bench& bench) { AvailableCoins(bench, {OutputType::BECH32M}); } -BENCHMARK(WalletCreateTxUseOnlyPresetInputs, benchmark::PriorityLevel::LOW) -BENCHMARK(WalletCreateTxUsePresetInputsAndCoinSelection, benchmark::PriorityLevel::LOW) -BENCHMARK(WalletAvailableCoins, benchmark::PriorityLevel::LOW); +BENCHMARK(WalletCreateTxUseOnlyPresetInputs); +BENCHMARK(WalletCreateTxUsePresetInputsAndCoinSelection); +BENCHMARK(WalletAvailableCoins); diff --git a/src/bench/wallet_ismine.cpp b/src/bench/wallet_ismine.cpp index aa0fd27697a..d26f893b98c 100644 --- a/src/bench/wallet_ismine.cpp +++ b/src/bench/wallet_ismine.cpp @@ -66,6 +66,6 @@ static void WalletIsMine(benchmark::Bench& bench, int num_combo = 0) static void WalletIsMineDescriptors(benchmark::Bench& bench) { WalletIsMine(bench); } static void WalletIsMineMigratedDescriptors(benchmark::Bench& bench) { WalletIsMine(bench, /*num_combo=*/2000); } -BENCHMARK(WalletIsMineDescriptors, benchmark::PriorityLevel::LOW); -BENCHMARK(WalletIsMineMigratedDescriptors, benchmark::PriorityLevel::LOW); +BENCHMARK(WalletIsMineDescriptors); +BENCHMARK(WalletIsMineMigratedDescriptors); } // namespace wallet diff --git a/src/bench/wallet_loading.cpp b/src/bench/wallet_loading.cpp index dffc76e1fd3..f7c78806867 100644 --- a/src/bench/wallet_loading.cpp +++ b/src/bench/wallet_loading.cpp @@ -64,5 +64,5 @@ static void WalletLoadingDescriptors(benchmark::Bench& bench) }); } -BENCHMARK(WalletLoadingDescriptors, benchmark::PriorityLevel::HIGH); +BENCHMARK(WalletLoadingDescriptors); } // namespace wallet diff --git a/src/bench/wallet_migration.cpp b/src/bench/wallet_migration.cpp index f38f2165727..910ad1e906c 100644 --- a/src/bench/wallet_migration.cpp +++ b/src/bench/wallet_migration.cpp @@ -74,6 +74,6 @@ static void WalletMigration(benchmark::Bench& bench) }); } -BENCHMARK(WalletMigration, benchmark::PriorityLevel::LOW); +BENCHMARK(WalletMigration); } // namespace wallet