diff --git a/src/Makefile.test.include b/src/Makefile.test.include index dd6dda7178c3..383f4d80fd28 100644 --- a/src/Makefile.test.include +++ b/src/Makefile.test.include @@ -417,7 +417,7 @@ if TARGET_WINDOWS else if ENABLE_BENCH @echo "Running bench/bench_dash (one iteration sanity check, only high priority)..." - $(BENCH_BINARY) -sanity-check -priority-level=high + $(BENCH_BINARY) -sanity-check -priority-level=high > /dev/null endif endif $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C secp256k1 check diff --git a/src/bench/addrman.cpp b/src/bench/addrman.cpp index b17e508e36da..e6eeb0301107 100644 --- a/src/bench/addrman.cpp +++ b/src/bench/addrman.cpp @@ -167,9 +167,9 @@ static void AddrManAddThenGood(benchmark::Bench& bench) }); } -BENCHMARK(AddrManAdd); -BENCHMARK(AddrManSelect); -BENCHMARK(AddrManSelectFromAlmostEmpty); -BENCHMARK(AddrManSelectByNetwork); -BENCHMARK(AddrManGetAddr); -BENCHMARK(AddrManAddThenGood); +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); diff --git a/src/bench/base58.cpp b/src/bench/base58.cpp index 6f6b4e3bfa9c..3d08b7201b71 100644 --- a/src/bench/base58.cpp +++ b/src/bench/base58.cpp @@ -50,6 +50,6 @@ static void Base58Decode(benchmark::Bench& bench) } -BENCHMARK(Base58Encode); -BENCHMARK(Base58CheckEncode); -BENCHMARK(Base58Decode); +BENCHMARK(Base58Encode, benchmark::PriorityLevel::HIGH); +BENCHMARK(Base58CheckEncode, benchmark::PriorityLevel::HIGH); +BENCHMARK(Base58Decode, benchmark::PriorityLevel::HIGH); diff --git a/src/bench/bech32.cpp b/src/bench/bech32.cpp index 7af4b3fea390..59bafb65fd7a 100644 --- a/src/bench/bech32.cpp +++ b/src/bench/bech32.cpp @@ -32,5 +32,5 @@ static void Bech32Decode(benchmark::Bench& bench) } -BENCHMARK(Bech32Encode); -BENCHMARK(Bech32Decode); +BENCHMARK(Bech32Encode, benchmark::PriorityLevel::HIGH); +BENCHMARK(Bech32Decode, benchmark::PriorityLevel::HIGH); diff --git a/src/bench/bench.h b/src/bench/bench.h index 1f412c9aecbe..5a05e74092da 100644 --- a/src/bench/bench.h +++ b/src/bench/bench.h @@ -75,8 +75,8 @@ class BenchRunner }; } // namespace benchmark -// BENCHMARK(foo) expands to: benchmark::BenchRunner bench_11foo("foo", foo, priority_level); -#define BENCHMARK(n) \ - benchmark::BenchRunner PASTE2(bench_, PASTE2(__LINE__, n))(STRINGIZE(n), n, benchmark::PriorityLevel::HIGH); +// BENCHMARK(foo, priority_level) 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); #endif // BITCOIN_BENCH_BENCH_H diff --git a/src/bench/bench_bitcoin.cpp b/src/bench/bench_bitcoin.cpp index 4db5412e16d6..a977c7eef293 100644 --- a/src/bench/bench_bitcoin.cpp +++ b/src/bench/bench_bitcoin.cpp @@ -33,7 +33,7 @@ static void SetupBenchArgs(ArgsManager& argsman) argsman.AddArg("-min-time=", strprintf("Minimum runtime per benchmark, in milliseconds (default: %d)", DEFAULT_MIN_TIME_MS), ArgsManager::ALLOW_ANY | ArgsManager::DISALLOW_NEGATION, OptionsCategory::OPTIONS); 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("-sanity-check", "Run benchmarks for only one iteration", 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); } diff --git a/src/bench/bip324_ecdh.cpp b/src/bench/bip324_ecdh.cpp index b3ac57f8b287..659da0f08e60 100644 --- a/src/bench/bip324_ecdh.cpp +++ b/src/bench/bip324_ecdh.cpp @@ -48,4 +48,4 @@ static void BIP324_ECDH(benchmark::Bench& bench) ECC_Stop(); } -BENCHMARK(BIP324_ECDH); +BENCHMARK(BIP324_ECDH, benchmark::PriorityLevel::HIGH); diff --git a/src/bench/block_assemble.cpp b/src/bench/block_assemble.cpp index 01832712b706..c34e7b3c7b42 100644 --- a/src/bench/block_assemble.cpp +++ b/src/bench/block_assemble.cpp @@ -52,4 +52,4 @@ static void AssembleBlock(benchmark::Bench& bench) }); } -BENCHMARK(AssembleBlock); +BENCHMARK(AssembleBlock, benchmark::PriorityLevel::HIGH); diff --git a/src/bench/bls.cpp b/src/bench/bls.cpp index e6206d241d9f..4c090afeab23 100644 --- a/src/bench/bls.cpp +++ b/src/bench/bls.cpp @@ -358,17 +358,17 @@ static void BLS_Verify_BatchedParallel(benchmark::Bench& bench) blsWorker.Stop(); } -BENCHMARK(BLS_PubKeyAggregate_Normal) -BENCHMARK(BLS_SecKeyAggregate_Normal) -BENCHMARK(BLS_SignatureAggregate_Normal) -BENCHMARK(BLS_Sign_Normal) -BENCHMARK(BLS_Verify_Normal) -BENCHMARK(BLS_Verify_LargeBlock100) -BENCHMARK(BLS_Verify_LargeBlock1000) -BENCHMARK(BLS_Verify_LargeBlockSelfAggregated100) -BENCHMARK(BLS_Verify_LargeBlockSelfAggregated1000) -BENCHMARK(BLS_Verify_LargeAggregatedBlock100) -BENCHMARK(BLS_Verify_LargeAggregatedBlock1000) -BENCHMARK(BLS_Verify_LargeAggregatedBlock1000PreVerified) -BENCHMARK(BLS_Verify_Batched) -BENCHMARK(BLS_Verify_BatchedParallel) +BENCHMARK(BLS_PubKeyAggregate_Normal, benchmark::PriorityLevel::HIGH); +BENCHMARK(BLS_SecKeyAggregate_Normal, benchmark::PriorityLevel::HIGH); +BENCHMARK(BLS_SignatureAggregate_Normal, benchmark::PriorityLevel::HIGH); +BENCHMARK(BLS_Sign_Normal, benchmark::PriorityLevel::HIGH); +BENCHMARK(BLS_Verify_Normal, benchmark::PriorityLevel::HIGH); +BENCHMARK(BLS_Verify_LargeBlock100, benchmark::PriorityLevel::HIGH); +BENCHMARK(BLS_Verify_LargeBlock1000, benchmark::PriorityLevel::HIGH); +BENCHMARK(BLS_Verify_LargeBlockSelfAggregated100, benchmark::PriorityLevel::HIGH); +BENCHMARK(BLS_Verify_LargeBlockSelfAggregated1000, benchmark::PriorityLevel::HIGH); +BENCHMARK(BLS_Verify_LargeAggregatedBlock100, benchmark::PriorityLevel::HIGH); +BENCHMARK(BLS_Verify_LargeAggregatedBlock1000, benchmark::PriorityLevel::HIGH); +BENCHMARK(BLS_Verify_LargeAggregatedBlock1000PreVerified, benchmark::PriorityLevel::HIGH); +BENCHMARK(BLS_Verify_Batched, benchmark::PriorityLevel::HIGH); +BENCHMARK(BLS_Verify_BatchedParallel, benchmark::PriorityLevel::HIGH); diff --git a/src/bench/bls_dkg.cpp b/src/bench/bls_dkg.cpp index 14e83810a100..c2f45045418c 100644 --- a/src/bench/bls_dkg.cpp +++ b/src/bench/bls_dkg.cpp @@ -136,7 +136,7 @@ static void BLSDKG_GenerateContributions(benchmark::Bench& bench, uint32_t epoch { \ BLSDKG_GenerateContributions(bench, epoch_iters, quorumSize); \ } \ - BENCHMARK(BLSDKG_GenerateContributions_##name##_##quorumSize) + BENCHMARK(BLSDKG_GenerateContributions_##name##_##quorumSize, benchmark::PriorityLevel::HIGH) static void BLSDKG_InitDKG(benchmark::Bench& bench, uint32_t epoch_iters, int quorumSize) { @@ -154,7 +154,7 @@ static void BLSDKG_InitDKG(benchmark::Bench& bench, uint32_t epoch_iters, int qu { \ BLSDKG_InitDKG(bench, epoch_iters, quorumSize); \ } \ - BENCHMARK(BLSDKG_InitDKG_##name##_##quorumSize) + BENCHMARK(BLSDKG_InitDKG_##name##_##quorumSize, benchmark::PriorityLevel::HIGH) #define BENCH_BuildQuorumVerificationVectors(name, quorumSize, epoch_iters) \ static void BLSDKG_BuildQuorumVerificationVectors_##name##_##quorumSize(benchmark::Bench& bench) \ @@ -169,7 +169,7 @@ static void BLSDKG_InitDKG(benchmark::Bench& bench, uint32_t epoch_iters, int qu ptr->Bench_BuildQuorumVerificationVectors(bench, epoch_iters); \ ptr.reset(); \ } \ - BENCHMARK(BLSDKG_BuildQuorumVerificationVectors_##name##_##quorumSize) + BENCHMARK(BLSDKG_BuildQuorumVerificationVectors_##name##_##quorumSize, benchmark::PriorityLevel::HIGH) #define BENCH_VerifyContributionShares(name, quorumSize, invalidCount, aggregated, epoch_iters) \ static void BLSDKG_VerifyContributionShares_##name##_##quorumSize(benchmark::Bench& bench) \ @@ -184,7 +184,7 @@ static void BLSDKG_InitDKG(benchmark::Bench& bench, uint32_t epoch_iters, int qu ptr->Bench_VerifyContributionShares(bench, invalidCount, aggregated, epoch_iters); \ ptr.reset(); \ } \ - BENCHMARK(BLSDKG_VerifyContributionShares_##name##_##quorumSize) + BENCHMARK(BLSDKG_VerifyContributionShares_##name##_##quorumSize, benchmark::PriorityLevel::HIGH) BENCH_GenerateContributions(simple, 50, 50); BENCH_GenerateContributions(simple, 100, 5); diff --git a/src/bench/bls_pubkey_agg.cpp b/src/bench/bls_pubkey_agg.cpp index ab732e93806a..e0506535f568 100644 --- a/src/bench/bls_pubkey_agg.cpp +++ b/src/bench/bls_pubkey_agg.cpp @@ -87,13 +87,13 @@ static void BLS_PubKeyAggregate_Iterative_200(benchmark::Bench& bench) { BLS_Pub static void BLS_PubKeyAggregate_Batch_200(benchmark::Bench& bench) { BLS_PubKeyAggregate_Batch(200, bench); } // Register all benchmarks -BENCHMARK(BLS_PubKeyAggregate_Iterative_5) -BENCHMARK(BLS_PubKeyAggregate_Batch_5) -BENCHMARK(BLS_PubKeyAggregate_Iterative_25) -BENCHMARK(BLS_PubKeyAggregate_Batch_25) -BENCHMARK(BLS_PubKeyAggregate_Iterative_50) -BENCHMARK(BLS_PubKeyAggregate_Batch_50) -BENCHMARK(BLS_PubKeyAggregate_Iterative_100) -BENCHMARK(BLS_PubKeyAggregate_Batch_100) -BENCHMARK(BLS_PubKeyAggregate_Iterative_200) -BENCHMARK(BLS_PubKeyAggregate_Batch_200) +BENCHMARK(BLS_PubKeyAggregate_Iterative_5, benchmark::PriorityLevel::HIGH); +BENCHMARK(BLS_PubKeyAggregate_Batch_5, benchmark::PriorityLevel::HIGH); +BENCHMARK(BLS_PubKeyAggregate_Iterative_25, benchmark::PriorityLevel::HIGH); +BENCHMARK(BLS_PubKeyAggregate_Batch_25, benchmark::PriorityLevel::HIGH); +BENCHMARK(BLS_PubKeyAggregate_Iterative_50, benchmark::PriorityLevel::HIGH); +BENCHMARK(BLS_PubKeyAggregate_Batch_50, benchmark::PriorityLevel::HIGH); +BENCHMARK(BLS_PubKeyAggregate_Iterative_100, benchmark::PriorityLevel::HIGH); +BENCHMARK(BLS_PubKeyAggregate_Batch_100, benchmark::PriorityLevel::HIGH); +BENCHMARK(BLS_PubKeyAggregate_Iterative_200, benchmark::PriorityLevel::HIGH); +BENCHMARK(BLS_PubKeyAggregate_Batch_200, benchmark::PriorityLevel::HIGH); diff --git a/src/bench/ccoins_caching.cpp b/src/bench/ccoins_caching.cpp index 727665dce58f..ad4d5e131231 100644 --- a/src/bench/ccoins_caching.cpp +++ b/src/bench/ccoins_caching.cpp @@ -50,4 +50,4 @@ static void CCoinsCaching(benchmark::Bench& bench) ECC_Stop(); } -BENCHMARK(CCoinsCaching); +BENCHMARK(CCoinsCaching, benchmark::PriorityLevel::HIGH); diff --git a/src/bench/chacha20.cpp b/src/bench/chacha20.cpp index 42aceeea24b2..a577a2756f34 100644 --- a/src/bench/chacha20.cpp +++ b/src/bench/chacha20.cpp @@ -66,9 +66,9 @@ static void FSCHACHA20POLY1305_1MB(benchmark::Bench& bench) FSCHACHA20POLY1305(bench, BUFFER_SIZE_LARGE); } -BENCHMARK(CHACHA20_64BYTES); -BENCHMARK(CHACHA20_256BYTES); -BENCHMARK(CHACHA20_1MB); -BENCHMARK(FSCHACHA20POLY1305_64BYTES); -BENCHMARK(FSCHACHA20POLY1305_256BYTES); -BENCHMARK(FSCHACHA20POLY1305_1MB); +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); diff --git a/src/bench/checkblock.cpp b/src/bench/checkblock.cpp index b5e866d3a1b7..48bdb5418a62 100644 --- a/src/bench/checkblock.cpp +++ b/src/bench/checkblock.cpp @@ -56,5 +56,5 @@ static void DeserializeAndCheckBlockTest(benchmark::Bench& bench) }); } -BENCHMARK(DeserializeBlockTest); -BENCHMARK(DeserializeAndCheckBlockTest); +BENCHMARK(DeserializeBlockTest, benchmark::PriorityLevel::HIGH); +BENCHMARK(DeserializeAndCheckBlockTest, benchmark::PriorityLevel::HIGH); diff --git a/src/bench/checkqueue.cpp b/src/bench/checkqueue.cpp index d861faac243f..8591bb958b0b 100644 --- a/src/bench/checkqueue.cpp +++ b/src/bench/checkqueue.cpp @@ -70,4 +70,4 @@ static void CCheckQueueSpeedPrevectorJob(benchmark::Bench& bench) queue.StopWorkerThreads(); ECC_Stop(); } -BENCHMARK(CCheckQueueSpeedPrevectorJob); +BENCHMARK(CCheckQueueSpeedPrevectorJob, benchmark::PriorityLevel::HIGH); diff --git a/src/bench/coin_selection.cpp b/src/bench/coin_selection.cpp index 7b44f5425bdc..aeaa8e9264e8 100644 --- a/src/bench/coin_selection.cpp +++ b/src/bench/coin_selection.cpp @@ -118,5 +118,5 @@ static void BnBExhaustion(benchmark::Bench& bench) }); } -BENCHMARK(CoinSelection); -BENCHMARK(BnBExhaustion); +BENCHMARK(CoinSelection, benchmark::PriorityLevel::HIGH); +BENCHMARK(BnBExhaustion, benchmark::PriorityLevel::HIGH); diff --git a/src/bench/crypto_hash.cpp b/src/bench/crypto_hash.cpp index 9db0703c6d1e..9e8d7d8bd0a5 100644 --- a/src/bench/crypto_hash.cpp +++ b/src/bench/crypto_hash.cpp @@ -258,31 +258,31 @@ static void MuHashPrecompute(benchmark::Bench& bench) }); } -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(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(FastRandom_32bit); -BENCHMARK(FastRandom_1bit); - -BENCHMARK(MuHash); -BENCHMARK(MuHashMul); -BENCHMARK(MuHashDiv); -BENCHMARK(MuHashPrecompute); +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(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(FastRandom_32bit, benchmark::PriorityLevel::HIGH); +BENCHMARK(FastRandom_1bit, benchmark::PriorityLevel::HIGH); + +BENCHMARK(MuHash, benchmark::PriorityLevel::HIGH); +BENCHMARK(MuHashMul, benchmark::PriorityLevel::HIGH); +BENCHMARK(MuHashDiv, benchmark::PriorityLevel::HIGH); +BENCHMARK(MuHashPrecompute, benchmark::PriorityLevel::HIGH); /* --------------------------- Dash-specific tests start here --------------------------- */ @@ -350,11 +350,11 @@ static void DSHA256_2048b_single(benchmark::Bench& bench) }); } -BENCHMARK(DSHA256_1M); +BENCHMARK(DSHA256_1M, benchmark::PriorityLevel::HIGH); -BENCHMARK(DSHA256_0032b_single); -BENCHMARK(DSHA256_0080b_single); -BENCHMARK(DSHA256_0128b_single); -BENCHMARK(DSHA256_0512b_single); -BENCHMARK(DSHA256_1024b_single); -BENCHMARK(DSHA256_2048b_single); +BENCHMARK(DSHA256_0032b_single, benchmark::PriorityLevel::HIGH); +BENCHMARK(DSHA256_0080b_single, benchmark::PriorityLevel::HIGH); +BENCHMARK(DSHA256_0128b_single, benchmark::PriorityLevel::HIGH); +BENCHMARK(DSHA256_0512b_single, benchmark::PriorityLevel::HIGH); +BENCHMARK(DSHA256_1024b_single, benchmark::PriorityLevel::HIGH); +BENCHMARK(DSHA256_2048b_single, benchmark::PriorityLevel::HIGH); diff --git a/src/bench/duplicate_inputs.cpp b/src/bench/duplicate_inputs.cpp index fbb24445be4d..6ce1552cee35 100644 --- a/src/bench/duplicate_inputs.cpp +++ b/src/bench/duplicate_inputs.cpp @@ -61,4 +61,4 @@ static void DuplicateInputs(benchmark::Bench& bench) }); } -BENCHMARK(DuplicateInputs); +BENCHMARK(DuplicateInputs, benchmark::PriorityLevel::HIGH); diff --git a/src/bench/ecdsa.cpp b/src/bench/ecdsa.cpp index 0b63d4621ebc..7d34b9549f5d 100644 --- a/src/bench/ecdsa.cpp +++ b/src/bench/ecdsa.cpp @@ -84,6 +84,6 @@ static void ECDSAVerify_LargeBlock(benchmark::Bench& bench) ECC_Stop(); } -BENCHMARK(ECDSASign) -BENCHMARK(ECDSAVerify) -BENCHMARK(ECDSAVerify_LargeBlock) +BENCHMARK(ECDSASign, benchmark::PriorityLevel::HIGH); +BENCHMARK(ECDSAVerify, benchmark::PriorityLevel::HIGH); +BENCHMARK(ECDSAVerify_LargeBlock, benchmark::PriorityLevel::HIGH); diff --git a/src/bench/ellswift.cpp b/src/bench/ellswift.cpp index 3cf9ae489d17..f0348421b38e 100644 --- a/src/bench/ellswift.cpp +++ b/src/bench/ellswift.cpp @@ -28,4 +28,4 @@ static void EllSwiftCreate(benchmark::Bench& bench) ECC_Stop(); } -BENCHMARK(EllSwiftCreate); +BENCHMARK(EllSwiftCreate, benchmark::PriorityLevel::HIGH); diff --git a/src/bench/examples.cpp b/src/bench/examples.cpp index 72a9922e94e5..abef69cc42df 100644 --- a/src/bench/examples.cpp +++ b/src/bench/examples.cpp @@ -18,4 +18,4 @@ static void Trig(benchmark::Bench& bench) }); } -BENCHMARK(Trig); +BENCHMARK(Trig, benchmark::PriorityLevel::HIGH); diff --git a/src/bench/gcs_filter.cpp b/src/bench/gcs_filter.cpp index c9bccbc50233..5be1e3165c67 100644 --- a/src/bench/gcs_filter.cpp +++ b/src/bench/gcs_filter.cpp @@ -81,8 +81,8 @@ static void GCSFilterMatch(benchmark::Bench& bench) filter.Match(GCSFilter::Element()); }); } -BENCHMARK(GCSBlockFilterGetHash); -BENCHMARK(GCSFilterConstruct); -BENCHMARK(GCSFilterDecode); -BENCHMARK(GCSFilterDecodeSkipCheck); -BENCHMARK(GCSFilterMatch); +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); diff --git a/src/bench/hashpadding.cpp b/src/bench/hashpadding.cpp index 753c8c288119..ac5aeebe51d3 100644 --- a/src/bench/hashpadding.cpp +++ b/src/bench/hashpadding.cpp @@ -26,7 +26,7 @@ static void PrePadded(benchmark::Bench& bench) }); } -BENCHMARK(PrePadded); +BENCHMARK(PrePadded, benchmark::PriorityLevel::HIGH); static void RegularPadded(benchmark::Bench& bench) { @@ -44,4 +44,4 @@ static void RegularPadded(benchmark::Bench& bench) }); } -BENCHMARK(RegularPadded); +BENCHMARK(RegularPadded, benchmark::PriorityLevel::HIGH); diff --git a/src/bench/load_external.cpp b/src/bench/load_external.cpp index 2d691484a3bd..150654a095ca 100644 --- a/src/bench/load_external.cpp +++ b/src/bench/load_external.cpp @@ -60,4 +60,4 @@ static void LoadExternalBlockFile(benchmark::Bench& bench) fs::remove(blkfile); } -BENCHMARK(LoadExternalBlockFile); +BENCHMARK(LoadExternalBlockFile, benchmark::PriorityLevel::HIGH); diff --git a/src/bench/lockedpool.cpp b/src/bench/lockedpool.cpp index b6d8824abae5..ac8262654c1f 100644 --- a/src/bench/lockedpool.cpp +++ b/src/bench/lockedpool.cpp @@ -39,4 +39,4 @@ static void BenchLockedPool(benchmark::Bench& bench) addr.clear(); } -BENCHMARK(BenchLockedPool); +BENCHMARK(BenchLockedPool, benchmark::PriorityLevel::HIGH); diff --git a/src/bench/logging.cpp b/src/bench/logging.cpp index d28777df9e20..49a9e59893ab 100644 --- a/src/bench/logging.cpp +++ b/src/bench/logging.cpp @@ -41,8 +41,8 @@ static void LoggingNoFile(benchmark::Bench& bench) }); } -BENCHMARK(LoggingYoThreadNames); -BENCHMARK(LoggingNoThreadNames); -BENCHMARK(LoggingYoCategory); -BENCHMARK(LoggingNoCategory); -BENCHMARK(LoggingNoFile); +BENCHMARK(LoggingYoThreadNames, benchmark::PriorityLevel::HIGH); +BENCHMARK(LoggingNoThreadNames, benchmark::PriorityLevel::HIGH); +BENCHMARK(LoggingYoCategory, benchmark::PriorityLevel::HIGH); +BENCHMARK(LoggingNoCategory, benchmark::PriorityLevel::HIGH); +BENCHMARK(LoggingNoFile, benchmark::PriorityLevel::HIGH); diff --git a/src/bench/mempool_eviction.cpp b/src/bench/mempool_eviction.cpp index b9cfdf3914f9..a1fea6f7419f 100644 --- a/src/bench/mempool_eviction.cpp +++ b/src/bench/mempool_eviction.cpp @@ -122,4 +122,4 @@ static void MempoolEviction(benchmark::Bench& bench) }); } -BENCHMARK(MempoolEviction); +BENCHMARK(MempoolEviction, benchmark::PriorityLevel::HIGH); diff --git a/src/bench/mempool_stress.cpp b/src/bench/mempool_stress.cpp index 4c35b6592fcf..0cf4e83ef8ce 100644 --- a/src/bench/mempool_stress.cpp +++ b/src/bench/mempool_stress.cpp @@ -112,5 +112,5 @@ static void MempoolCheck(benchmark::Bench& bench) }); } -BENCHMARK(ComplexMemPool); -BENCHMARK(MempoolCheck); +BENCHMARK(ComplexMemPool, benchmark::PriorityLevel::HIGH); +BENCHMARK(MempoolCheck, benchmark::PriorityLevel::HIGH); diff --git a/src/bench/merkle_root.cpp b/src/bench/merkle_root.cpp index ba6629b9f0a5..4140d67bc7ab 100644 --- a/src/bench/merkle_root.cpp +++ b/src/bench/merkle_root.cpp @@ -23,4 +23,4 @@ static void MerkleRoot(benchmark::Bench& bench) }); } -BENCHMARK(MerkleRoot); +BENCHMARK(MerkleRoot, benchmark::PriorityLevel::HIGH); diff --git a/src/bench/peer_eviction.cpp b/src/bench/peer_eviction.cpp index f05f5e8f6464..c3e3670de735 100644 --- a/src/bench/peer_eviction.cpp +++ b/src/bench/peer_eviction.cpp @@ -141,15 +141,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(EvictionProtection0Networks250Candidates, benchmark::PriorityLevel::HIGH); // 1 disadvantaged network (Tor) with 250 eviction candidates. -BENCHMARK(EvictionProtection1Networks250Candidates); +BENCHMARK(EvictionProtection1Networks250Candidates, benchmark::PriorityLevel::HIGH); // 2 disadvantaged networks (I2P, Tor) with 250 eviction candidates. -BENCHMARK(EvictionProtection2Networks250Candidates); +BENCHMARK(EvictionProtection2Networks250Candidates, benchmark::PriorityLevel::HIGH); // 3 disadvantaged networks (I2P/localhost/Tor) with 50/100/250 eviction candidates. -BENCHMARK(EvictionProtection3Networks050Candidates); -BENCHMARK(EvictionProtection3Networks100Candidates); -BENCHMARK(EvictionProtection3Networks250Candidates); +BENCHMARK(EvictionProtection3Networks050Candidates, benchmark::PriorityLevel::HIGH); +BENCHMARK(EvictionProtection3Networks100Candidates, benchmark::PriorityLevel::HIGH); +BENCHMARK(EvictionProtection3Networks250Candidates, benchmark::PriorityLevel::HIGH); diff --git a/src/bench/poly1305.cpp b/src/bench/poly1305.cpp index 746f2f62e894..4719db8cc993 100644 --- a/src/bench/poly1305.cpp +++ b/src/bench/poly1305.cpp @@ -39,6 +39,6 @@ static void POLY1305_1MB(benchmark::Bench& bench) POLY1305(bench, BUFFER_SIZE_LARGE); } -BENCHMARK(POLY1305_64BYTES); -BENCHMARK(POLY1305_256BYTES); -BENCHMARK(POLY1305_1MB); +BENCHMARK(POLY1305_64BYTES, benchmark::PriorityLevel::HIGH); +BENCHMARK(POLY1305_256BYTES, benchmark::PriorityLevel::HIGH); +BENCHMARK(POLY1305_1MB, benchmark::PriorityLevel::HIGH); diff --git a/src/bench/pool.cpp b/src/bench/pool.cpp index 0ce3b952f870..b2a5f8debf9d 100644 --- a/src/bench/pool.cpp +++ b/src/bench/pool.cpp @@ -45,5 +45,5 @@ static void PoolAllocator_StdUnorderedMapWithPoolResource(benchmark::Bench& benc BenchFillClearMap(bench, map); } -BENCHMARK(PoolAllocator_StdUnorderedMap); -BENCHMARK(PoolAllocator_StdUnorderedMapWithPoolResource); +BENCHMARK(PoolAllocator_StdUnorderedMap, benchmark::PriorityLevel::HIGH); +BENCHMARK(PoolAllocator_StdUnorderedMapWithPoolResource, benchmark::PriorityLevel::HIGH); diff --git a/src/bench/pow_hash.cpp b/src/bench/pow_hash.cpp index 79859966ac95..a4feedbb1544 100644 --- a/src/bench/pow_hash.cpp +++ b/src/bench/pow_hash.cpp @@ -262,98 +262,98 @@ static void Pow_Skein512_1024b(benchmark::Bench& bench) { return Pow_Skein512(be static void Pow_Skein512_2048b(benchmark::Bench& bench) { return Pow_Skein512(bench, 2048); } static void Pow_Skein512_1M(benchmark::Bench& bench) { return Pow_Skein512(bench, BUFFER_SIZE); } -BENCHMARK(Pow_X11_0032b); -BENCHMARK(Pow_X11_0080b); -BENCHMARK(Pow_X11_0128b); -BENCHMARK(Pow_X11_0512b); -BENCHMARK(Pow_X11_1024b); -BENCHMARK(Pow_X11_2048b); -BENCHMARK(Pow_X11_1M); - -BENCHMARK(Pow_Blake512_0032b); -BENCHMARK(Pow_Blake512_0080b); -BENCHMARK(Pow_Blake512_0128b); -BENCHMARK(Pow_Blake512_0512b); -BENCHMARK(Pow_Blake512_1024b); -BENCHMARK(Pow_Blake512_2048b); -BENCHMARK(Pow_Blake512_1M); - -BENCHMARK(Pow_Bmw512_0032b); -BENCHMARK(Pow_Bmw512_0080b); -BENCHMARK(Pow_Bmw512_0128b); -BENCHMARK(Pow_Bmw512_0512b); -BENCHMARK(Pow_Bmw512_1024b); -BENCHMARK(Pow_Bmw512_2048b); -BENCHMARK(Pow_Bmw512_1M); - -BENCHMARK(Pow_Cubehash512_0032b); -BENCHMARK(Pow_Cubehash512_0080b); -BENCHMARK(Pow_Cubehash512_0128b); -BENCHMARK(Pow_Cubehash512_0512b); -BENCHMARK(Pow_Cubehash512_1024b); -BENCHMARK(Pow_Cubehash512_2048b); -BENCHMARK(Pow_Cubehash512_1M); - -BENCHMARK(Pow_Echo512_0032b); -BENCHMARK(Pow_Echo512_0080b); -BENCHMARK(Pow_Echo512_0128b); -BENCHMARK(Pow_Echo512_0512b); -BENCHMARK(Pow_Echo512_1024b); -BENCHMARK(Pow_Echo512_2048b); -BENCHMARK(Pow_Echo512_1M); - -BENCHMARK(Pow_Groestl512_0032b); -BENCHMARK(Pow_Groestl512_0080b); -BENCHMARK(Pow_Groestl512_0128b); -BENCHMARK(Pow_Groestl512_0512b); -BENCHMARK(Pow_Groestl512_1024b); -BENCHMARK(Pow_Groestl512_2048b); -BENCHMARK(Pow_Groestl512_1M); - -BENCHMARK(Pow_Jh512_0032b); -BENCHMARK(Pow_Jh512_0080b); -BENCHMARK(Pow_Jh512_0128b); -BENCHMARK(Pow_Jh512_0512b); -BENCHMARK(Pow_Jh512_1024b); -BENCHMARK(Pow_Jh512_2048b); -BENCHMARK(Pow_Jh512_1M); - -BENCHMARK(Pow_Keccak512_0032b); -BENCHMARK(Pow_Keccak512_0080b); -BENCHMARK(Pow_Keccak512_0128b); -BENCHMARK(Pow_Keccak512_0512b); -BENCHMARK(Pow_Keccak512_1024b); -BENCHMARK(Pow_Keccak512_2048b); -BENCHMARK(Pow_Keccak512_1M); - -BENCHMARK(Pow_Luffa512_0032b); -BENCHMARK(Pow_Luffa512_0080b); -BENCHMARK(Pow_Luffa512_0128b); -BENCHMARK(Pow_Luffa512_0512b); -BENCHMARK(Pow_Luffa512_1024b); -BENCHMARK(Pow_Luffa512_2048b); -BENCHMARK(Pow_Luffa512_1M); - -BENCHMARK(Pow_Shavite512_0032b); -BENCHMARK(Pow_Shavite512_0080b); -BENCHMARK(Pow_Shavite512_0128b); -BENCHMARK(Pow_Shavite512_0512b); -BENCHMARK(Pow_Shavite512_1024b); -BENCHMARK(Pow_Shavite512_2048b); -BENCHMARK(Pow_Shavite512_1M); - -BENCHMARK(Pow_Simd512_0032b); -BENCHMARK(Pow_Simd512_0080b); -BENCHMARK(Pow_Simd512_0128b); -BENCHMARK(Pow_Simd512_0512b); -BENCHMARK(Pow_Simd512_1024b); -BENCHMARK(Pow_Simd512_2048b); -BENCHMARK(Pow_Simd512_1M); - -BENCHMARK(Pow_Skein512_0032b); -BENCHMARK(Pow_Skein512_0080b); -BENCHMARK(Pow_Skein512_0128b); -BENCHMARK(Pow_Skein512_0512b); -BENCHMARK(Pow_Skein512_1024b); -BENCHMARK(Pow_Skein512_2048b); -BENCHMARK(Pow_Skein512_1M); +BENCHMARK(Pow_X11_0032b, benchmark::PriorityLevel::HIGH); +BENCHMARK(Pow_X11_0080b, benchmark::PriorityLevel::HIGH); +BENCHMARK(Pow_X11_0128b, benchmark::PriorityLevel::HIGH); +BENCHMARK(Pow_X11_0512b, benchmark::PriorityLevel::HIGH); +BENCHMARK(Pow_X11_1024b, benchmark::PriorityLevel::HIGH); +BENCHMARK(Pow_X11_2048b, benchmark::PriorityLevel::HIGH); +BENCHMARK(Pow_X11_1M, benchmark::PriorityLevel::HIGH); + +BENCHMARK(Pow_Blake512_0032b, benchmark::PriorityLevel::HIGH); +BENCHMARK(Pow_Blake512_0080b, benchmark::PriorityLevel::HIGH); +BENCHMARK(Pow_Blake512_0128b, benchmark::PriorityLevel::HIGH); +BENCHMARK(Pow_Blake512_0512b, benchmark::PriorityLevel::HIGH); +BENCHMARK(Pow_Blake512_1024b, benchmark::PriorityLevel::HIGH); +BENCHMARK(Pow_Blake512_2048b, benchmark::PriorityLevel::HIGH); +BENCHMARK(Pow_Blake512_1M, benchmark::PriorityLevel::HIGH); + +BENCHMARK(Pow_Bmw512_0032b, benchmark::PriorityLevel::HIGH); +BENCHMARK(Pow_Bmw512_0080b, benchmark::PriorityLevel::HIGH); +BENCHMARK(Pow_Bmw512_0128b, benchmark::PriorityLevel::HIGH); +BENCHMARK(Pow_Bmw512_0512b, benchmark::PriorityLevel::HIGH); +BENCHMARK(Pow_Bmw512_1024b, benchmark::PriorityLevel::HIGH); +BENCHMARK(Pow_Bmw512_2048b, benchmark::PriorityLevel::HIGH); +BENCHMARK(Pow_Bmw512_1M, benchmark::PriorityLevel::HIGH); + +BENCHMARK(Pow_Cubehash512_0032b, benchmark::PriorityLevel::HIGH); +BENCHMARK(Pow_Cubehash512_0080b, benchmark::PriorityLevel::HIGH); +BENCHMARK(Pow_Cubehash512_0128b, benchmark::PriorityLevel::HIGH); +BENCHMARK(Pow_Cubehash512_0512b, benchmark::PriorityLevel::HIGH); +BENCHMARK(Pow_Cubehash512_1024b, benchmark::PriorityLevel::HIGH); +BENCHMARK(Pow_Cubehash512_2048b, benchmark::PriorityLevel::HIGH); +BENCHMARK(Pow_Cubehash512_1M, benchmark::PriorityLevel::HIGH); + +BENCHMARK(Pow_Echo512_0032b, benchmark::PriorityLevel::HIGH); +BENCHMARK(Pow_Echo512_0080b, benchmark::PriorityLevel::HIGH); +BENCHMARK(Pow_Echo512_0128b, benchmark::PriorityLevel::HIGH); +BENCHMARK(Pow_Echo512_0512b, benchmark::PriorityLevel::HIGH); +BENCHMARK(Pow_Echo512_1024b, benchmark::PriorityLevel::HIGH); +BENCHMARK(Pow_Echo512_2048b, benchmark::PriorityLevel::HIGH); +BENCHMARK(Pow_Echo512_1M, benchmark::PriorityLevel::HIGH); + +BENCHMARK(Pow_Groestl512_0032b, benchmark::PriorityLevel::HIGH); +BENCHMARK(Pow_Groestl512_0080b, benchmark::PriorityLevel::HIGH); +BENCHMARK(Pow_Groestl512_0128b, benchmark::PriorityLevel::HIGH); +BENCHMARK(Pow_Groestl512_0512b, benchmark::PriorityLevel::HIGH); +BENCHMARK(Pow_Groestl512_1024b, benchmark::PriorityLevel::HIGH); +BENCHMARK(Pow_Groestl512_2048b, benchmark::PriorityLevel::HIGH); +BENCHMARK(Pow_Groestl512_1M, benchmark::PriorityLevel::HIGH); + +BENCHMARK(Pow_Jh512_0032b, benchmark::PriorityLevel::HIGH); +BENCHMARK(Pow_Jh512_0080b, benchmark::PriorityLevel::HIGH); +BENCHMARK(Pow_Jh512_0128b, benchmark::PriorityLevel::HIGH); +BENCHMARK(Pow_Jh512_0512b, benchmark::PriorityLevel::HIGH); +BENCHMARK(Pow_Jh512_1024b, benchmark::PriorityLevel::HIGH); +BENCHMARK(Pow_Jh512_2048b, benchmark::PriorityLevel::HIGH); +BENCHMARK(Pow_Jh512_1M, benchmark::PriorityLevel::HIGH); + +BENCHMARK(Pow_Keccak512_0032b, benchmark::PriorityLevel::HIGH); +BENCHMARK(Pow_Keccak512_0080b, benchmark::PriorityLevel::HIGH); +BENCHMARK(Pow_Keccak512_0128b, benchmark::PriorityLevel::HIGH); +BENCHMARK(Pow_Keccak512_0512b, benchmark::PriorityLevel::HIGH); +BENCHMARK(Pow_Keccak512_1024b, benchmark::PriorityLevel::HIGH); +BENCHMARK(Pow_Keccak512_2048b, benchmark::PriorityLevel::HIGH); +BENCHMARK(Pow_Keccak512_1M, benchmark::PriorityLevel::HIGH); + +BENCHMARK(Pow_Luffa512_0032b, benchmark::PriorityLevel::HIGH); +BENCHMARK(Pow_Luffa512_0080b, benchmark::PriorityLevel::HIGH); +BENCHMARK(Pow_Luffa512_0128b, benchmark::PriorityLevel::HIGH); +BENCHMARK(Pow_Luffa512_0512b, benchmark::PriorityLevel::HIGH); +BENCHMARK(Pow_Luffa512_1024b, benchmark::PriorityLevel::HIGH); +BENCHMARK(Pow_Luffa512_2048b, benchmark::PriorityLevel::HIGH); +BENCHMARK(Pow_Luffa512_1M, benchmark::PriorityLevel::HIGH); + +BENCHMARK(Pow_Shavite512_0032b, benchmark::PriorityLevel::HIGH); +BENCHMARK(Pow_Shavite512_0080b, benchmark::PriorityLevel::HIGH); +BENCHMARK(Pow_Shavite512_0128b, benchmark::PriorityLevel::HIGH); +BENCHMARK(Pow_Shavite512_0512b, benchmark::PriorityLevel::HIGH); +BENCHMARK(Pow_Shavite512_1024b, benchmark::PriorityLevel::HIGH); +BENCHMARK(Pow_Shavite512_2048b, benchmark::PriorityLevel::HIGH); +BENCHMARK(Pow_Shavite512_1M, benchmark::PriorityLevel::HIGH); + +BENCHMARK(Pow_Simd512_0032b, benchmark::PriorityLevel::HIGH); +BENCHMARK(Pow_Simd512_0080b, benchmark::PriorityLevel::HIGH); +BENCHMARK(Pow_Simd512_0128b, benchmark::PriorityLevel::HIGH); +BENCHMARK(Pow_Simd512_0512b, benchmark::PriorityLevel::HIGH); +BENCHMARK(Pow_Simd512_1024b, benchmark::PriorityLevel::HIGH); +BENCHMARK(Pow_Simd512_2048b, benchmark::PriorityLevel::HIGH); +BENCHMARK(Pow_Simd512_1M, benchmark::PriorityLevel::HIGH); + +BENCHMARK(Pow_Skein512_0032b, benchmark::PriorityLevel::HIGH); +BENCHMARK(Pow_Skein512_0080b, benchmark::PriorityLevel::HIGH); +BENCHMARK(Pow_Skein512_0128b, benchmark::PriorityLevel::HIGH); +BENCHMARK(Pow_Skein512_0512b, benchmark::PriorityLevel::HIGH); +BENCHMARK(Pow_Skein512_1024b, benchmark::PriorityLevel::HIGH); +BENCHMARK(Pow_Skein512_2048b, benchmark::PriorityLevel::HIGH); +BENCHMARK(Pow_Skein512_1M, benchmark::PriorityLevel::HIGH); diff --git a/src/bench/prevector.cpp b/src/bench/prevector.cpp index 8de8e05c067f..c995c2cf9860 100644 --- a/src/bench/prevector.cpp +++ b/src/bench/prevector.cpp @@ -138,19 +138,19 @@ static void PrevectorFillVectorIndirect(benchmark::Bench& bench) { \ Prevector##name(bench); \ } \ - BENCHMARK(Prevector##name##Nontrivial); \ + BENCHMARK(Prevector##name##Nontrivial, benchmark::PriorityLevel::HIGH); \ static void Prevector##name##Trivial(benchmark::Bench& bench) \ { \ Prevector##name(bench); \ } \ - BENCHMARK(Prevector##name##Trivial); + BENCHMARK(Prevector##name##Trivial, benchmark::PriorityLevel::HIGH); PREVECTOR_TEST(Clear) PREVECTOR_TEST(Destructor) PREVECTOR_TEST(Resize) PREVECTOR_TEST(Deserialize) -BENCHMARK(PrevectorAssign) -BENCHMARK(PrevectorAssignTo) +BENCHMARK(PrevectorAssign, benchmark::PriorityLevel::HIGH); +BENCHMARK(PrevectorAssignTo, benchmark::PriorityLevel::HIGH); PREVECTOR_TEST(FillVectorDirect) PREVECTOR_TEST(FillVectorIndirect) diff --git a/src/bench/rollingbloom.cpp b/src/bench/rollingbloom.cpp index 8f05e3bad01d..865d99f9e84f 100644 --- a/src/bench/rollingbloom.cpp +++ b/src/bench/rollingbloom.cpp @@ -32,5 +32,5 @@ static void RollingBloomReset(benchmark::Bench& bench) }); } -BENCHMARK(RollingBloom); -BENCHMARK(RollingBloomReset); +BENCHMARK(RollingBloom, benchmark::PriorityLevel::HIGH); +BENCHMARK(RollingBloomReset, benchmark::PriorityLevel::HIGH); diff --git a/src/bench/rpc_blockchain.cpp b/src/bench/rpc_blockchain.cpp index 9ed1fffb2f78..d593aced02f6 100644 --- a/src/bench/rpc_blockchain.cpp +++ b/src/bench/rpc_blockchain.cpp @@ -50,7 +50,7 @@ static void BlockToJsonVerbose(benchmark::Bench& bench) }); } -BENCHMARK(BlockToJsonVerbose); +BENCHMARK(BlockToJsonVerbose, benchmark::PriorityLevel::HIGH); static void BlockToJsonVerboseWrite(benchmark::Bench& bench) { @@ -63,4 +63,4 @@ static void BlockToJsonVerboseWrite(benchmark::Bench& bench) }); } -BENCHMARK(BlockToJsonVerboseWrite); +BENCHMARK(BlockToJsonVerboseWrite, benchmark::PriorityLevel::HIGH); diff --git a/src/bench/rpc_mempool.cpp b/src/bench/rpc_mempool.cpp index ef989b286d20..dbfd187c07b0 100644 --- a/src/bench/rpc_mempool.cpp +++ b/src/bench/rpc_mempool.cpp @@ -39,4 +39,4 @@ static void RpcMempool(benchmark::Bench& bench) }); } -BENCHMARK(RpcMempool); +BENCHMARK(RpcMempool, benchmark::PriorityLevel::HIGH); diff --git a/src/bench/strencodings.cpp b/src/bench/strencodings.cpp index 4be7cd6d6f68..00354617a51a 100644 --- a/src/bench/strencodings.cpp +++ b/src/bench/strencodings.cpp @@ -15,4 +15,4 @@ static void HexStrBench(benchmark::Bench& bench) }); } -BENCHMARK(HexStrBench); +BENCHMARK(HexStrBench, benchmark::PriorityLevel::HIGH); diff --git a/src/bench/string_cast.cpp b/src/bench/string_cast.cpp index d358e2a7ced8..e63ac4308a37 100644 --- a/src/bench/string_cast.cpp +++ b/src/bench/string_cast.cpp @@ -67,9 +67,9 @@ static void strings_2_strptintf(benchmark::Bench& bench) }); } -BENCHMARK(int_atoi); -BENCHMARK(strings_1_numberToString); -BENCHMARK(strings_1_tostring); -BENCHMARK(strings_2_multi_numberToString); -BENCHMARK(strings_2_multi_tostring); -BENCHMARK(strings_2_strptintf); +BENCHMARK(int_atoi, benchmark::PriorityLevel::HIGH); +BENCHMARK(strings_1_numberToString, benchmark::PriorityLevel::HIGH); +BENCHMARK(strings_1_tostring, benchmark::PriorityLevel::HIGH); +BENCHMARK(strings_2_multi_numberToString, benchmark::PriorityLevel::HIGH); +BENCHMARK(strings_2_multi_tostring, benchmark::PriorityLevel::HIGH); +BENCHMARK(strings_2_strptintf, benchmark::PriorityLevel::HIGH); diff --git a/src/bench/util_time.cpp b/src/bench/util_time.cpp index c45584988d9a..f12ce3b3f541 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(BenchTimeMillis); -BENCHMARK(BenchTimeMillisSys); -BENCHMARK(BenchTimeMock); +BENCHMARK(BenchTimeDeprecated, benchmark::PriorityLevel::HIGH); +BENCHMARK(BenchTimeMillis, benchmark::PriorityLevel::HIGH); +BENCHMARK(BenchTimeMillisSys, benchmark::PriorityLevel::HIGH); +BENCHMARK(BenchTimeMock, benchmark::PriorityLevel::HIGH); diff --git a/src/bench/verify_script.cpp b/src/bench/verify_script.cpp index 9fb95e9116fd..40e55529db79 100644 --- a/src/bench/verify_script.cpp +++ b/src/bench/verify_script.cpp @@ -29,5 +29,4 @@ static void VerifyNestedIfScript(benchmark::Bench& bench) { }); } - -BENCHMARK(VerifyNestedIfScript); +BENCHMARK(VerifyNestedIfScript, benchmark::PriorityLevel::HIGH); diff --git a/src/bench/wallet_balance.cpp b/src/bench/wallet_balance.cpp index 7c8db6187d55..36a95f5765a0 100644 --- a/src/bench/wallet_balance.cpp +++ b/src/bench/wallet_balance.cpp @@ -55,7 +55,7 @@ static void WalletBalanceClean(benchmark::Bench& bench) {WalletBalance(bench, /* static void WalletBalanceMine(benchmark::Bench& bench) { WalletBalance(bench, /*set_dirty=*/false, /*add_mine=*/true, 16000); } static void WalletBalanceWatch(benchmark::Bench& bench) { WalletBalance(bench, /*set_dirty=*/false, /*add_mine=*/false, 8000); } -BENCHMARK(WalletBalanceDirty); -BENCHMARK(WalletBalanceClean); -BENCHMARK(WalletBalanceMine); -BENCHMARK(WalletBalanceWatch); +BENCHMARK(WalletBalanceDirty, benchmark::PriorityLevel::HIGH); +BENCHMARK(WalletBalanceClean, benchmark::PriorityLevel::HIGH); +BENCHMARK(WalletBalanceMine, benchmark::PriorityLevel::HIGH); +BENCHMARK(WalletBalanceWatch, benchmark::PriorityLevel::HIGH); diff --git a/src/bench/wallet_create.cpp b/src/bench/wallet_create.cpp index 046dc29a804f..f900a7e90edb 100644 --- a/src/bench/wallet_create.cpp +++ b/src/bench/wallet_create.cpp @@ -49,8 +49,8 @@ static void WalletCreatePlain(benchmark::Bench& bench) { WalletCreate(bench, /*e static void WalletCreateEncrypted(benchmark::Bench& bench) { WalletCreate(bench, /*encrypted=*/true); } #ifdef USE_SQLITE -BENCHMARK(WalletCreatePlain); -BENCHMARK(WalletCreateEncrypted); +BENCHMARK(WalletCreatePlain, benchmark::PriorityLevel::HIGH); +BENCHMARK(WalletCreateEncrypted, benchmark::PriorityLevel::HIGH); #endif } // namespace wallet diff --git a/src/bench/wallet_loading.cpp b/src/bench/wallet_loading.cpp index 1a2bd7eceb32..a81d79936e5b 100644 --- a/src/bench/wallet_loading.cpp +++ b/src/bench/wallet_loading.cpp @@ -118,10 +118,10 @@ static void WalletLoading(benchmark::Bench& bench, bool legacy_wallet) #ifdef USE_BDB static void WalletLoadingLegacy(benchmark::Bench& bench) { WalletLoading(bench, /*legacy_wallet=*/true); } -BENCHMARK(WalletLoadingLegacy); +BENCHMARK(WalletLoadingLegacy, benchmark::PriorityLevel::HIGH); #endif #ifdef USE_SQLITE static void WalletLoadingDescriptors(benchmark::Bench& bench) { WalletLoading(bench, /*legacy_wallet=*/false); } -BENCHMARK(WalletLoadingDescriptors); +BENCHMARK(WalletLoadingDescriptors, benchmark::PriorityLevel::HIGH); #endif