Update benchmarking macros (#3934)

Current benchmarking macro returns a closure with the captured
benchmarked code.
This can cause issues when the benchmarked code has complex lifetime
requirements.

This PR updates the existing macro by injecting the recording parameter
and invoking the start / stop method around the benchmarked block
instead of returning a closure

One other added benefit is that you can write this kind of code now as
well:

```rust
let v;
#[block]
{ v = func.call(); }
dbg!(v); // or assert something on v
```


[Weights compare
link](https://weights.tasty.limo/compare?unit=weight&ignore_errors=true&threshold=10&method=asymptotic&repo=polkadot-sdk&old=pg/fix-weights&new=pg/bench_update&path_pattern=substrate/frame/**/src/weights.rs,polkadot/runtime/*/src/weights/**/*.rs,polkadot/bridges/modules/*/src/weights.rs,cumulus/**/weights/*.rs,cumulus/**/weights/xcm/*.rs,cumulus/**/src/weights.rs)

---------

Co-authored-by: command-bot <>
Co-authored-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>
Co-authored-by: Alexander Theißen <alex.theissen@me.com>
This commit is contained in:
PG Herveou
2024-04-10 08:44:46 +02:00
committed by GitHub
parent ddb53c87f5
commit d38f6e6728
65 changed files with 11402 additions and 10551 deletions
+60 -58
View File
@@ -17,26 +17,28 @@
//! Autogenerated weights for `pallet_state_trie_migration`
//!
//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
//! DATE: 2024-01-24, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
//! DATE: 2024-04-09, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
//! WORST CASE MAP SIZE: `1000000`
//! HOSTNAME: `runner-grjcggob-project-674-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
//! HOSTNAME: `runner-anb7yjbi-project-674-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: `1024`
// Executed Command:
// target/production/substrate-node
// ./target/production/substrate-node
// benchmark
// pallet
// --chain=dev
// --steps=50
// --repeat=20
// --pallet=pallet_state_trie_migration
// --no-storage-info
// --no-median-slopes
// --no-min-squares
// --extrinsic=*
// --wasm-execution=compiled
// --heap-pages=4096
// --json-file=/builds/parity/mirrors/polkadot-sdk/.git/.artifacts/bench.json
// --pallet=pallet_state_trie_migration
// --chain=dev
// --header=./substrate/HEADER-APACHE2
// --output=./substrate/frame/state-trie-migration/src/weights.rs
// --header=./substrate/HEADER-APACHE2
// --template=./substrate/.maintain/frame-weight-template.hbs
#![cfg_attr(rustfmt, rustfmt_skip)]
@@ -64,15 +66,15 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
/// Storage: `StateTrieMigration::SignedMigrationMaxLimits` (r:1 w:0)
/// Proof: `StateTrieMigration::SignedMigrationMaxLimits` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `MaxEncodedLen`)
/// Storage: `Balances::Holds` (r:1 w:0)
/// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(175), added: 2650, mode: `MaxEncodedLen`)
/// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(193), added: 2668, mode: `MaxEncodedLen`)
/// Storage: `StateTrieMigration::MigrationProcess` (r:1 w:1)
/// Proof: `StateTrieMigration::MigrationProcess` (`max_values`: Some(1), `max_size`: Some(1042), added: 1537, mode: `MaxEncodedLen`)
fn continue_migrate() -> Weight {
// Proof Size summary in bytes:
// Measured: `108`
// Estimated: `3640`
// Minimum execution time: 18_520_000 picoseconds.
Weight::from_parts(19_171_000, 3640)
// Estimated: `3658`
// Minimum execution time: 18_293_000 picoseconds.
Weight::from_parts(18_577_000, 3658)
.saturating_add(T::DbWeight::get().reads(3_u64))
.saturating_add(T::DbWeight::get().writes(1_u64))
}
@@ -82,53 +84,53 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
// Proof Size summary in bytes:
// Measured: `76`
// Estimated: `1493`
// Minimum execution time: 3_786_000 picoseconds.
Weight::from_parts(4_038_000, 1493)
// Minimum execution time: 4_240_000 picoseconds.
Weight::from_parts(4_369_000, 1493)
.saturating_add(T::DbWeight::get().reads(1_u64))
}
/// Storage: `Balances::Holds` (r:1 w:0)
/// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(175), added: 2650, mode: `MaxEncodedLen`)
/// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(193), added: 2668, mode: `MaxEncodedLen`)
fn migrate_custom_top_success() -> Weight {
// Proof Size summary in bytes:
// Measured: `0`
// Estimated: `3640`
// Minimum execution time: 11_144_000 picoseconds.
Weight::from_parts(11_556_000, 3640)
// Estimated: `3658`
// Minimum execution time: 11_909_000 picoseconds.
Weight::from_parts(12_453_000, 3658)
.saturating_add(T::DbWeight::get().reads(1_u64))
}
/// Storage: `Balances::Holds` (r:1 w:1)
/// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(175), added: 2650, mode: `MaxEncodedLen`)
/// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(193), added: 2668, mode: `MaxEncodedLen`)
/// Storage: UNKNOWN KEY `0x666f6f` (r:1 w:1)
/// Proof: UNKNOWN KEY `0x666f6f` (r:1 w:1)
fn migrate_custom_top_fail() -> Weight {
// Proof Size summary in bytes:
// Measured: `113`
// Estimated: `3640`
// Minimum execution time: 59_288_000 picoseconds.
Weight::from_parts(60_276_000, 3640)
// Estimated: `3658`
// Minimum execution time: 65_631_000 picoseconds.
Weight::from_parts(66_506_000, 3658)
.saturating_add(T::DbWeight::get().reads(2_u64))
.saturating_add(T::DbWeight::get().writes(2_u64))
}
/// Storage: `Balances::Holds` (r:1 w:0)
/// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(175), added: 2650, mode: `MaxEncodedLen`)
/// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(193), added: 2668, mode: `MaxEncodedLen`)
fn migrate_custom_child_success() -> Weight {
// Proof Size summary in bytes:
// Measured: `0`
// Estimated: `3640`
// Minimum execution time: 11_258_000 picoseconds.
Weight::from_parts(11_626_000, 3640)
// Estimated: `3658`
// Minimum execution time: 12_208_000 picoseconds.
Weight::from_parts(12_690_000, 3658)
.saturating_add(T::DbWeight::get().reads(1_u64))
}
/// Storage: `Balances::Holds` (r:1 w:1)
/// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(175), added: 2650, mode: `MaxEncodedLen`)
/// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(193), added: 2668, mode: `MaxEncodedLen`)
/// Storage: UNKNOWN KEY `0x666f6f` (r:1 w:1)
/// Proof: UNKNOWN KEY `0x666f6f` (r:1 w:1)
fn migrate_custom_child_fail() -> Weight {
// Proof Size summary in bytes:
// Measured: `106`
// Estimated: `3640`
// Minimum execution time: 61_575_000 picoseconds.
Weight::from_parts(63_454_000, 3640)
// Estimated: `3658`
// Minimum execution time: 66_988_000 picoseconds.
Weight::from_parts(68_616_000, 3658)
.saturating_add(T::DbWeight::get().reads(2_u64))
.saturating_add(T::DbWeight::get().writes(2_u64))
}
@@ -139,10 +141,10 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
// Proof Size summary in bytes:
// Measured: `197 + v * (1 ±0)`
// Estimated: `3662 + v * (1 ±0)`
// Minimum execution time: 5_259_000 picoseconds.
Weight::from_parts(5_433_000, 3662)
// Minimum execution time: 5_365_000 picoseconds.
Weight::from_parts(5_460_000, 3662)
// Standard Error: 1
.saturating_add(Weight::from_parts(1_159, 0).saturating_mul(v.into()))
.saturating_add(Weight::from_parts(1_150, 0).saturating_mul(v.into()))
.saturating_add(T::DbWeight::get().reads(1_u64))
.saturating_add(T::DbWeight::get().writes(1_u64))
.saturating_add(Weight::from_parts(0, 1).saturating_mul(v.into()))
@@ -154,15 +156,15 @@ impl WeightInfo for () {
/// Storage: `StateTrieMigration::SignedMigrationMaxLimits` (r:1 w:0)
/// Proof: `StateTrieMigration::SignedMigrationMaxLimits` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `MaxEncodedLen`)
/// Storage: `Balances::Holds` (r:1 w:0)
/// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(175), added: 2650, mode: `MaxEncodedLen`)
/// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(193), added: 2668, mode: `MaxEncodedLen`)
/// Storage: `StateTrieMigration::MigrationProcess` (r:1 w:1)
/// Proof: `StateTrieMigration::MigrationProcess` (`max_values`: Some(1), `max_size`: Some(1042), added: 1537, mode: `MaxEncodedLen`)
fn continue_migrate() -> Weight {
// Proof Size summary in bytes:
// Measured: `108`
// Estimated: `3640`
// Minimum execution time: 18_520_000 picoseconds.
Weight::from_parts(19_171_000, 3640)
// Estimated: `3658`
// Minimum execution time: 18_293_000 picoseconds.
Weight::from_parts(18_577_000, 3658)
.saturating_add(RocksDbWeight::get().reads(3_u64))
.saturating_add(RocksDbWeight::get().writes(1_u64))
}
@@ -172,53 +174,53 @@ impl WeightInfo for () {
// Proof Size summary in bytes:
// Measured: `76`
// Estimated: `1493`
// Minimum execution time: 3_786_000 picoseconds.
Weight::from_parts(4_038_000, 1493)
// Minimum execution time: 4_240_000 picoseconds.
Weight::from_parts(4_369_000, 1493)
.saturating_add(RocksDbWeight::get().reads(1_u64))
}
/// Storage: `Balances::Holds` (r:1 w:0)
/// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(175), added: 2650, mode: `MaxEncodedLen`)
/// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(193), added: 2668, mode: `MaxEncodedLen`)
fn migrate_custom_top_success() -> Weight {
// Proof Size summary in bytes:
// Measured: `0`
// Estimated: `3640`
// Minimum execution time: 11_144_000 picoseconds.
Weight::from_parts(11_556_000, 3640)
// Estimated: `3658`
// Minimum execution time: 11_909_000 picoseconds.
Weight::from_parts(12_453_000, 3658)
.saturating_add(RocksDbWeight::get().reads(1_u64))
}
/// Storage: `Balances::Holds` (r:1 w:1)
/// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(175), added: 2650, mode: `MaxEncodedLen`)
/// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(193), added: 2668, mode: `MaxEncodedLen`)
/// Storage: UNKNOWN KEY `0x666f6f` (r:1 w:1)
/// Proof: UNKNOWN KEY `0x666f6f` (r:1 w:1)
fn migrate_custom_top_fail() -> Weight {
// Proof Size summary in bytes:
// Measured: `113`
// Estimated: `3640`
// Minimum execution time: 59_288_000 picoseconds.
Weight::from_parts(60_276_000, 3640)
// Estimated: `3658`
// Minimum execution time: 65_631_000 picoseconds.
Weight::from_parts(66_506_000, 3658)
.saturating_add(RocksDbWeight::get().reads(2_u64))
.saturating_add(RocksDbWeight::get().writes(2_u64))
}
/// Storage: `Balances::Holds` (r:1 w:0)
/// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(175), added: 2650, mode: `MaxEncodedLen`)
/// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(193), added: 2668, mode: `MaxEncodedLen`)
fn migrate_custom_child_success() -> Weight {
// Proof Size summary in bytes:
// Measured: `0`
// Estimated: `3640`
// Minimum execution time: 11_258_000 picoseconds.
Weight::from_parts(11_626_000, 3640)
// Estimated: `3658`
// Minimum execution time: 12_208_000 picoseconds.
Weight::from_parts(12_690_000, 3658)
.saturating_add(RocksDbWeight::get().reads(1_u64))
}
/// Storage: `Balances::Holds` (r:1 w:1)
/// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(175), added: 2650, mode: `MaxEncodedLen`)
/// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(193), added: 2668, mode: `MaxEncodedLen`)
/// Storage: UNKNOWN KEY `0x666f6f` (r:1 w:1)
/// Proof: UNKNOWN KEY `0x666f6f` (r:1 w:1)
fn migrate_custom_child_fail() -> Weight {
// Proof Size summary in bytes:
// Measured: `106`
// Estimated: `3640`
// Minimum execution time: 61_575_000 picoseconds.
Weight::from_parts(63_454_000, 3640)
// Estimated: `3658`
// Minimum execution time: 66_988_000 picoseconds.
Weight::from_parts(68_616_000, 3658)
.saturating_add(RocksDbWeight::get().reads(2_u64))
.saturating_add(RocksDbWeight::get().writes(2_u64))
}
@@ -229,10 +231,10 @@ impl WeightInfo for () {
// Proof Size summary in bytes:
// Measured: `197 + v * (1 ±0)`
// Estimated: `3662 + v * (1 ±0)`
// Minimum execution time: 5_259_000 picoseconds.
Weight::from_parts(5_433_000, 3662)
// Minimum execution time: 5_365_000 picoseconds.
Weight::from_parts(5_460_000, 3662)
// Standard Error: 1
.saturating_add(Weight::from_parts(1_159, 0).saturating_mul(v.into()))
.saturating_add(Weight::from_parts(1_150, 0).saturating_mul(v.into()))
.saturating_add(RocksDbWeight::get().reads(1_u64))
.saturating_add(RocksDbWeight::get().writes(1_u64))
.saturating_add(Weight::from_parts(0, 1).saturating_mul(v.into()))