Unverified Commit 89529740 authored by Zeke Mostov's avatar Zeke Mostov Committed by GitHub
Browse files

Inherent filtering follow up (#4305)



* Add feature more feature gating for benchmarking + tests

* New line

* cargo run --quiet --release --features=runtime-benchmarks -- benchmark --chain=kusama-dev --steps=50 --repeat=20 --pallet=runtime_parachains::paras_inherent --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --header=./file_header.txt --output=./runtime/kusama/src/weights/runtime_parachains_paras_inherent.rs

* cargo run --quiet --release --features=runtime-benchmarks -- benchmark --chain=polkadot-dev --steps=50 --repeat=20 --pallet=runtime_parachains::paras_inherent --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --header=./file_header.txt --output=./runtime/polkadot/src/weights/runtime_parachains_paras_inherent.rs

* Do not assume we use max validators per core

* Use kusama weights for rococo (hopefully temp)

* cargo run --quiet --release --features=runtime-benchmarks -- benchmark --chain=westend-dev --steps=50 --repeat=20 --pallet=runtime_parachains::paras_inherent --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --header=./file_header.txt --output=./runtime/westend/src/weights/runtime_parachains_paras_inherent.rs

* Add more validity votes when neccesary

* Some fixes for the last commit

* Restore westend weights

* cargo run --quiet --release --features=runtime-benchmarks -- benchmark --chain=westend-dev --steps=50 --repeat=20 --pallet=runtime_parachains::paras_inherent --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --header=./file_header.txt --output=./runtime/westend/src/weights/runtime_parachains_paras_inherent.rs

* Revert bad westend weights write

* Make sure to update val idx before skipping

* Fix validity vote range to max at group size'

* Temp setup for rococo

* cargo run --quiet --release --features runtime-benchmarks -- benchmark --chain=rococo-dev --steps=50 --repeat=20 --pallet=runtime_parachains::paras_inherent --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./runtime/rococo/src/weights/runtime_parachains_paras_inherent.rs --header=./file_header.txt

* Augment generated Rococo weights

* Make it compile

* Revert range for enter_backed_candidates_variable

* Delete runtime/kusama/src/weights/runtime_paras_paras_inherent.rs
Co-authored-by: default avatarParity Bot <admin@parity.io>
parent 6fa464b9
Pipeline #167626 canceled with stages
in 30 minutes and 8 seconds
...@@ -56,3 +56,4 @@ std = [ ...@@ -56,3 +56,4 @@ std = [
"bitvec/std", "bitvec/std",
"frame-system/std", "frame-system/std",
] ]
runtime-benchmarks = []
...@@ -262,9 +262,7 @@ impl<Payload: EncodeAs<RealPayload>, RealPayload: Encode> UncheckedSigned<Payloa ...@@ -262,9 +262,7 @@ impl<Payload: EncodeAs<RealPayload>, RealPayload: Encode> UncheckedSigned<Payloa
} }
/// Sign this payload with the given context and pair. /// Sign this payload with the given context and pair.
/// #[cfg(any(feature = "runtime-benchmarks", feature = "std"))]
/// # WARNING
/// Only meant for usage in tests and and benchmarks.
pub fn benchmark_sign<H: Encode>( pub fn benchmark_sign<H: Encode>(
public: &crate::v0::ValidatorId, public: &crate::v0::ValidatorId,
payload: Payload, payload: Payload,
...@@ -279,9 +277,7 @@ impl<Payload: EncodeAs<RealPayload>, RealPayload: Encode> UncheckedSigned<Payloa ...@@ -279,9 +277,7 @@ impl<Payload: EncodeAs<RealPayload>, RealPayload: Encode> UncheckedSigned<Payloa
} }
/// Immutably access the signature. /// Immutably access the signature.
/// #[cfg(any(feature = "runtime-benchmarks", feature = "std"))]
/// # WARNING
/// Only meant for usage in tests and and benchmarks.
pub fn benchmark_signature(&self) -> ValidatorSignature { pub fn benchmark_signature(&self) -> ValidatorSignature {
self.signature.clone() self.signature.clone()
} }
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
//! Autogenerated weights for `runtime_parachains::paras_inherent` //! Autogenerated weights for `runtime_parachains::paras_inherent`
//! //!
//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
//! DATE: 2021-11-14, STEPS: `50`, REPEAT: 3, LOW RANGE: `[]`, HIGH RANGE: `[]` //! DATE: 2021-11-16, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("kusama-dev"), DB CACHE: 128 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("kusama-dev"), DB CACHE: 128
// Executed Command: // Executed Command:
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
// benchmark // benchmark
// --chain=kusama-dev // --chain=kusama-dev
// --steps=50 // --steps=50
// --repeat=3 // --repeat=20
// --pallet=runtime_parachains::paras_inherent // --pallet=runtime_parachains::paras_inherent
// --extrinsic=* // --extrinsic=*
// --execution=wasm // --execution=wasm
...@@ -70,9 +70,9 @@ impl<T: frame_system::Config> runtime_parachains::paras_inherent::WeightInfo for ...@@ -70,9 +70,9 @@ impl<T: frame_system::Config> runtime_parachains::paras_inherent::WeightInfo for
// Storage: Hrmp HrmpWatermarks (r:0 w:1) // Storage: Hrmp HrmpWatermarks (r:0 w:1)
// Storage: Paras Heads (r:0 w:1) // Storage: Paras Heads (r:0 w:1)
fn enter_variable_disputes(v: u32, ) -> Weight { fn enter_variable_disputes(v: u32, ) -> Weight {
(316_331_000 as Weight) (202_257_000 as Weight)
// Standard Error: 112_000 // Standard Error: 2_000
.saturating_add((325_000 as Weight).saturating_mul(v as Weight)) .saturating_add((311_000 as Weight).saturating_mul(v as Weight))
.saturating_add(T::DbWeight::get().reads(23 as Weight)) .saturating_add(T::DbWeight::get().reads(23 as Weight))
.saturating_add(T::DbWeight::get().writes(14 as Weight)) .saturating_add(T::DbWeight::get().writes(14 as Weight))
} }
...@@ -103,7 +103,7 @@ impl<T: frame_system::Config> runtime_parachains::paras_inherent::WeightInfo for ...@@ -103,7 +103,7 @@ impl<T: frame_system::Config> runtime_parachains::paras_inherent::WeightInfo for
// Storage: Hrmp HrmpWatermarks (r:0 w:1) // Storage: Hrmp HrmpWatermarks (r:0 w:1)
// Storage: Paras Heads (r:0 w:1) // Storage: Paras Heads (r:0 w:1)
fn enter_bitfields() -> Weight { fn enter_bitfields() -> Weight {
(352_749_000 as Weight) (247_226_000 as Weight)
.saturating_add(T::DbWeight::get().reads(23 as Weight)) .saturating_add(T::DbWeight::get().reads(23 as Weight))
.saturating_add(T::DbWeight::get().writes(15 as Weight)) .saturating_add(T::DbWeight::get().writes(15 as Weight))
} }
...@@ -136,9 +136,9 @@ impl<T: frame_system::Config> runtime_parachains::paras_inherent::WeightInfo for ...@@ -136,9 +136,9 @@ impl<T: frame_system::Config> runtime_parachains::paras_inherent::WeightInfo for
// Storage: Hrmp HrmpWatermarks (r:0 w:1) // Storage: Hrmp HrmpWatermarks (r:0 w:1)
// Storage: Paras Heads (r:0 w:1) // Storage: Paras Heads (r:0 w:1)
fn enter_backed_candidates_variable(v: u32, ) -> Weight { fn enter_backed_candidates_variable(v: u32, ) -> Weight {
(88_047_000 as Weight) (322_535_000 as Weight)
// Standard Error: 3_275_000 // Standard Error: 24_000
.saturating_add((68_499_000 as Weight).saturating_mul(v as Weight)) .saturating_add((49_098_000 as Weight).saturating_mul(v as Weight))
.saturating_add(T::DbWeight::get().reads(26 as Weight)) .saturating_add(T::DbWeight::get().reads(26 as Weight))
.saturating_add(T::DbWeight::get().writes(14 as Weight)) .saturating_add(T::DbWeight::get().writes(14 as Weight))
} }
...@@ -171,7 +171,7 @@ impl<T: frame_system::Config> runtime_parachains::paras_inherent::WeightInfo for ...@@ -171,7 +171,7 @@ impl<T: frame_system::Config> runtime_parachains::paras_inherent::WeightInfo for
// Storage: Hrmp HrmpWatermarks (r:0 w:1) // Storage: Hrmp HrmpWatermarks (r:0 w:1)
// Storage: Paras Heads (r:0 w:1) // Storage: Paras Heads (r:0 w:1)
fn enter_backed_candidate_code_upgrade() -> Weight { fn enter_backed_candidate_code_upgrade() -> Weight {
(53_728_168_000 as Weight) (41_671_398_000 as Weight)
.saturating_add(T::DbWeight::get().reads(26 as Weight)) .saturating_add(T::DbWeight::get().reads(26 as Weight))
.saturating_add(T::DbWeight::get().writes(14 as Weight)) .saturating_add(T::DbWeight::get().writes(14 as Weight))
} }
......
...@@ -86,6 +86,7 @@ runtime-benchmarks = [ ...@@ -86,6 +86,7 @@ runtime-benchmarks = [
"frame-benchmarking", "frame-benchmarking",
"frame-support/runtime-benchmarks", "frame-support/runtime-benchmarks",
"frame-system/runtime-benchmarks", "frame-system/runtime-benchmarks",
"primitives/runtime-benchmarks",
] ]
try-runtime = [ try-runtime = [
"frame-support/try-runtime", "frame-support/try-runtime",
......
...@@ -74,7 +74,7 @@ pub(crate) struct BenchBuilder<T: paras_inherent::Config> { ...@@ -74,7 +74,7 @@ pub(crate) struct BenchBuilder<T: paras_inherent::Config> {
} }
/// Paras inherent `enter` benchmark scenario. /// Paras inherent `enter` benchmark scenario.
#[allow(dead_code)] #[cfg(any(feature = "runtime-benchmarks", test))]
pub(crate) struct Bench<T: paras_inherent::Config> { pub(crate) struct Bench<T: paras_inherent::Config> {
pub(crate) data: ParachainsInherentData<T::Header>, pub(crate) data: ParachainsInherentData<T::Header>,
pub(crate) _session: u32, pub(crate) _session: u32,
...@@ -133,7 +133,7 @@ impl<T: paras_inherent::Config> BenchBuilder<T> { ...@@ -133,7 +133,7 @@ impl<T: paras_inherent::Config> BenchBuilder<T> {
self.max_validators.unwrap_or(Self::fallback_max_validators()) self.max_validators.unwrap_or(Self::fallback_max_validators())
} }
#[allow(dead_code)] #[cfg(not(feature = "runtime-benchmarks"))]
pub(crate) fn set_max_validators(mut self, n: u32) -> Self { pub(crate) fn set_max_validators(mut self, n: u32) -> Self {
self.max_validators = Some(n); self.max_validators = Some(n);
self self
...@@ -149,7 +149,7 @@ impl<T: paras_inherent::Config> BenchBuilder<T> { ...@@ -149,7 +149,7 @@ impl<T: paras_inherent::Config> BenchBuilder<T> {
/// corresponding dispute statement set. Note that if the number of disputes is not specified it fallbacks /// corresponding dispute statement set. Note that if the number of disputes is not specified it fallbacks
/// to having a dispute per every validator. Additionally, an entry is not guaranteed to have a dispute - it /// to having a dispute per every validator. Additionally, an entry is not guaranteed to have a dispute - it
/// must line up with the cores marked as disputed as defined in `Self::Build`. /// must line up with the cores marked as disputed as defined in `Self::Build`.
#[allow(dead_code)] #[cfg(not(feature = "runtime-benchmarks"))]
pub(crate) fn set_dispute_statements(mut self, m: BTreeMap<u32, u32>) -> Self { pub(crate) fn set_dispute_statements(mut self, m: BTreeMap<u32, u32>) -> Self {
self.dispute_statements = m; self.dispute_statements = m;
self self
...@@ -160,7 +160,7 @@ impl<T: paras_inherent::Config> BenchBuilder<T> { ...@@ -160,7 +160,7 @@ impl<T: paras_inherent::Config> BenchBuilder<T> {
} }
/// Set maximum number of validators per core. /// Set maximum number of validators per core.
#[allow(dead_code)] #[cfg(not(feature = "runtime-benchmarks"))]
pub(crate) fn set_max_validators_per_core(mut self, n: u32) -> Self { pub(crate) fn set_max_validators_per_core(mut self, n: u32) -> Self {
self.max_validators_per_core = Some(n); self.max_validators_per_core = Some(n);
self self
...@@ -172,7 +172,7 @@ impl<T: paras_inherent::Config> BenchBuilder<T> { ...@@ -172,7 +172,7 @@ impl<T: paras_inherent::Config> BenchBuilder<T> {
} }
/// Minimum number of validity votes in order for a backed candidate to be included. /// Minimum number of validity votes in order for a backed candidate to be included.
#[allow(dead_code)] #[cfg(feature = "runtime-benchmarks")]
pub(crate) fn fallback_min_validity_votes() -> u32 { pub(crate) fn fallback_min_validity_votes() -> u32 {
(Self::fallback_max_validators() / 2) + 1 (Self::fallback_max_validators() / 2) + 1
} }
...@@ -322,7 +322,6 @@ impl<T: paras_inherent::Config> BenchBuilder<T> { ...@@ -322,7 +322,6 @@ impl<T: paras_inherent::Config> BenchBuilder<T> {
Default::default(), Default::default(),
); );
assert_eq!(scheduler::ValidatorGroups::<T>::get().len(), total_cores as usize);
assert_eq!(<shared::Pallet<T>>::session_index(), target_session); assert_eq!(<shared::Pallet<T>>::session_index(), target_session);
// We need to refetch validators since they have been shuffled. // We need to refetch validators since they have been shuffled.
......
...@@ -85,11 +85,18 @@ benchmarks! { ...@@ -85,11 +85,18 @@ benchmarks! {
// Variant over `v`, the amount of validity votes for a backed candidate. This gives the weight // Variant over `v`, the amount of validity votes for a backed candidate. This gives the weight
// of a single backed candidate. // of a single backed candidate.
enter_backed_candidates_variable { enter_backed_candidates_variable {
// NOTE: the starting value must be over half of `max_validators` so the backed candidate is // NOTE: the starting value must be over half of the max validators per group so the backed
// not rejected. // candidate is not rejected. Also, we cannot have more validity votes than validators in
let v // the group.
in (BenchBuilder::<T>::fallback_min_validity_votes())
..BenchBuilder::<T>::fallback_max_validators(); // Do not use this range for Rococo because it only has 1 validator per backing group,
// which causes issues when trying to create slopes with the benchmarking analysis. Instead
// use v = 1 for running Rococo benchmarks
let v in (BenchBuilder::<T>::fallback_min_validity_votes())
..(BenchBuilder::<T>::fallback_max_validators());
// Comment in for running rococo benchmarks
// let v = 1;
let cores_with_backed: BTreeMap<_, _> let cores_with_backed: BTreeMap<_, _>
= vec![(0, v)] // The backed candidate will have `v` validity votes. = vec![(0, v)] // The backed candidate will have `v` validity votes.
......
...@@ -16,22 +16,22 @@ ...@@ -16,22 +16,22 @@
//! Autogenerated weights for `runtime_parachains::paras_inherent` //! Autogenerated weights for `runtime_parachains::paras_inherent`
//! //!
//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
//! DATE: 2021-11-14, STEPS: `50`, REPEAT: 3, LOW RANGE: `[]`, HIGH RANGE: `[]` //! DATE: 2021-11-17, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("kusama-dev"), DB CACHE: 128 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("polkadot-dev"), DB CACHE: 128
// Executed Command: // Executed Command:
// target/release/polkadot // target/release/polkadot
// benchmark // benchmark
// --chain=kusama-dev // --chain=polkadot-dev
// --steps=50 // --steps=50
// --repeat=3 // --repeat=20
// --pallet=runtime_parachains::paras_inherent // --pallet=runtime_parachains::paras_inherent
// --extrinsic=* // --extrinsic=*
// --execution=wasm // --execution=wasm
// --wasm-execution=compiled // --wasm-execution=compiled
// --heap-pages=4096 // --heap-pages=4096
// --header=./file_header.txt // --header=./file_header.txt
// --output=./runtime/kusama/src/weights/runtime_parachains_paras_inherent.rs // --output=./runtime/polkadot/src/weights/runtime_parachains_paras_inherent.rs
#![cfg_attr(rustfmt, rustfmt_skip)] #![cfg_attr(rustfmt, rustfmt_skip)]
...@@ -70,9 +70,9 @@ impl<T: frame_system::Config> runtime_parachains::paras_inherent::WeightInfo for ...@@ -70,9 +70,9 @@ impl<T: frame_system::Config> runtime_parachains::paras_inherent::WeightInfo for
// Storage: Hrmp HrmpWatermarks (r:0 w:1) // Storage: Hrmp HrmpWatermarks (r:0 w:1)
// Storage: Paras Heads (r:0 w:1) // Storage: Paras Heads (r:0 w:1)
fn enter_variable_disputes(v: u32, ) -> Weight { fn enter_variable_disputes(v: u32, ) -> Weight {
(316_331_000 as Weight) (201_282_000 as Weight)
// Standard Error: 112_000 // Standard Error: 2_000
.saturating_add((325_000 as Weight).saturating_mul(v as Weight)) .saturating_add((309_000 as Weight).saturating_mul(v as Weight))
.saturating_add(T::DbWeight::get().reads(23 as Weight)) .saturating_add(T::DbWeight::get().reads(23 as Weight))
.saturating_add(T::DbWeight::get().writes(14 as Weight)) .saturating_add(T::DbWeight::get().writes(14 as Weight))
} }
...@@ -103,7 +103,7 @@ impl<T: frame_system::Config> runtime_parachains::paras_inherent::WeightInfo for ...@@ -103,7 +103,7 @@ impl<T: frame_system::Config> runtime_parachains::paras_inherent::WeightInfo for
// Storage: Hrmp HrmpWatermarks (r:0 w:1) // Storage: Hrmp HrmpWatermarks (r:0 w:1)
// Storage: Paras Heads (r:0 w:1) // Storage: Paras Heads (r:0 w:1)
fn enter_bitfields() -> Weight { fn enter_bitfields() -> Weight {
(352_749_000 as Weight) (245_511_000 as Weight)
.saturating_add(T::DbWeight::get().reads(23 as Weight)) .saturating_add(T::DbWeight::get().reads(23 as Weight))
.saturating_add(T::DbWeight::get().writes(15 as Weight)) .saturating_add(T::DbWeight::get().writes(15 as Weight))
} }
...@@ -136,9 +136,9 @@ impl<T: frame_system::Config> runtime_parachains::paras_inherent::WeightInfo for ...@@ -136,9 +136,9 @@ impl<T: frame_system::Config> runtime_parachains::paras_inherent::WeightInfo for
// Storage: Hrmp HrmpWatermarks (r:0 w:1) // Storage: Hrmp HrmpWatermarks (r:0 w:1)
// Storage: Paras Heads (r:0 w:1) // Storage: Paras Heads (r:0 w:1)
fn enter_backed_candidates_variable(v: u32, ) -> Weight { fn enter_backed_candidates_variable(v: u32, ) -> Weight {
(88_047_000 as Weight) (318_776_000 as Weight)
// Standard Error: 3_275_000 // Standard Error: 24_000
.saturating_add((68_499_000 as Weight).saturating_mul(v as Weight)) .saturating_add((49_071_000 as Weight).saturating_mul(v as Weight))
.saturating_add(T::DbWeight::get().reads(26 as Weight)) .saturating_add(T::DbWeight::get().reads(26 as Weight))
.saturating_add(T::DbWeight::get().writes(14 as Weight)) .saturating_add(T::DbWeight::get().writes(14 as Weight))
} }
...@@ -171,7 +171,7 @@ impl<T: frame_system::Config> runtime_parachains::paras_inherent::WeightInfo for ...@@ -171,7 +171,7 @@ impl<T: frame_system::Config> runtime_parachains::paras_inherent::WeightInfo for
// Storage: Hrmp HrmpWatermarks (r:0 w:1) // Storage: Hrmp HrmpWatermarks (r:0 w:1)
// Storage: Paras Heads (r:0 w:1) // Storage: Paras Heads (r:0 w:1)
fn enter_backed_candidate_code_upgrade() -> Weight { fn enter_backed_candidate_code_upgrade() -> Weight {
(53_728_168_000 as Weight) (42_284_487_000 as Weight)
.saturating_add(T::DbWeight::get().reads(26 as Weight)) .saturating_add(T::DbWeight::get().reads(26 as Weight))
.saturating_add(T::DbWeight::get().writes(14 as Weight)) .saturating_add(T::DbWeight::get().writes(14 as Weight))
} }
......
...@@ -16,23 +16,22 @@ ...@@ -16,23 +16,22 @@
//! Autogenerated weights for `runtime_parachains::paras_inherent` //! Autogenerated weights for `runtime_parachains::paras_inherent`
//! //!
//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
//! DATE: 2021-11-14, STEPS: `50`, REPEAT: 3, LOW RANGE: `[]`, HIGH RANGE: `[]` //! DATE: 2021-11-20, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("kusama-dev"), DB CACHE: 128 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("rococo-dev"), DB CACHE: 128
// Executed Command: // Executed Command:
// target/release/polkadot // target/release/polkadot
// benchmark // benchmark
// --chain=kusama-dev // --chain=rococo-dev
// --steps=50 // --steps=50
// --repeat=3 // --repeat=20
// --pallet=runtime_parachains::paras_inherent // --pallet=runtime_parachains::paras_inherent
// --extrinsic=* // --extrinsic=*
// --execution=wasm // --execution=wasm
// --wasm-execution=compiled // --wasm-execution=compiled
// --heap-pages=4096 // --heap-pages=4096
// --output=./runtime/rococo/src/weights/runtime_parachains_paras_inherent.rs
// --header=./file_header.txt // --header=./file_header.txt
// --output=./runtime/kusama/src/weights/runtime_parachains_paras_inherent.rs
#![cfg_attr(rustfmt, rustfmt_skip)] #![cfg_attr(rustfmt, rustfmt_skip)]
#![allow(unused_parens)] #![allow(unused_parens)]
...@@ -48,15 +47,16 @@ impl<T: frame_system::Config> runtime_parachains::paras_inherent::WeightInfo for ...@@ -48,15 +47,16 @@ impl<T: frame_system::Config> runtime_parachains::paras_inherent::WeightInfo for
// Storage: System ParentHash (r:1 w:0) // Storage: System ParentHash (r:1 w:0)
// Storage: ParaScheduler AvailabilityCores (r:1 w:1) // Storage: ParaScheduler AvailabilityCores (r:1 w:1)
// Storage: ParasShared CurrentSessionIndex (r:1 w:0) // Storage: ParasShared CurrentSessionIndex (r:1 w:0)
// Storage: Configuration ActiveConfig (r:1 w:0)
// Storage: ParaSessionInfo Sessions (r:1 w:0)
// Storage: ParasDisputes Disputes (r:1 w:1)
// Storage: ParasDisputes Included (r:1 w:1)
// Storage: ParasDisputes SpamSlots (r:1 w:1)
// Storage: ParasDisputes Frozen (r:1 w:0)
// Storage: ParaInclusion PendingAvailability (r:2 w:1) // Storage: ParaInclusion PendingAvailability (r:2 w:1)
// Storage: ParasShared ActiveValidatorKeys (r:1 w:0) // Storage: ParasShared ActiveValidatorKeys (r:1 w:0)
// Storage: Paras Parachains (r:1 w:0) // Storage: Paras Parachains (r:1 w:0)
// Storage: ParaInclusion PendingAvailabilityCommitments (r:1 w:1) // Storage: ParaInclusion PendingAvailabilityCommitments (r:1 w:1)
// Storage: Configuration ActiveConfig (r:1 w:0)
// Storage: Session Validators (r:1 w:0)
// Storage: ParasShared ActiveValidatorIndices (r:1 w:0)
// Storage: Staking ActiveEra (r:1 w:0)
// Storage: Staking ErasRewardPoints (r:1 w:1)
// Storage: Dmp DownwardMessageQueues (r:1 w:1) // Storage: Dmp DownwardMessageQueues (r:1 w:1)
// Storage: Hrmp HrmpChannelDigests (r:1 w:1) // Storage: Hrmp HrmpChannelDigests (r:1 w:1)
// Storage: Paras FutureCodeUpgrades (r:1 w:0) // Storage: Paras FutureCodeUpgrades (r:1 w:0)
...@@ -70,28 +70,26 @@ impl<T: frame_system::Config> runtime_parachains::paras_inherent::WeightInfo for ...@@ -70,28 +70,26 @@ impl<T: frame_system::Config> runtime_parachains::paras_inherent::WeightInfo for
// Storage: Hrmp HrmpWatermarks (r:0 w:1) // Storage: Hrmp HrmpWatermarks (r:0 w:1)
// Storage: Paras Heads (r:0 w:1) // Storage: Paras Heads (r:0 w:1)
fn enter_variable_disputes(v: u32, ) -> Weight { fn enter_variable_disputes(v: u32, ) -> Weight {
(316_331_000 as Weight) (352_590_000 as Weight)
// Standard Error: 112_000 // Standard Error: 13_000
.saturating_add((325_000 as Weight).saturating_mul(v as Weight)) .saturating_add((49_254_000 as Weight).saturating_mul(v as Weight))
.saturating_add(T::DbWeight::get().reads(23 as Weight)) .saturating_add(T::DbWeight::get().reads(24 as Weight))
.saturating_add(T::DbWeight::get().writes(14 as Weight)) .saturating_add(T::DbWeight::get().writes(16 as Weight))
} }
// Storage: ParaInherent Included (r:1 w:1) // Storage: ParaInherent Included (r:1 w:1)
// Storage: System ParentHash (r:1 w:0) // Storage: System ParentHash (r:1 w:0)
// Storage: ParaScheduler AvailabilityCores (r:1 w:1) // Storage: ParaScheduler AvailabilityCores (r:1 w:1)
// Storage: ParasShared CurrentSessionIndex (r:1 w:0) // Storage: ParasShared CurrentSessionIndex (r:1 w:0)
// Storage: Configuration ActiveConfig (r:1 w:0)
// Storage: ParasDisputes Frozen (r:1 w:0)
// Storage: ParasShared ActiveValidatorKeys (r:1 w:0) // Storage: ParasShared ActiveValidatorKeys (r:1 w:0)
// Storage: Paras Parachains (r:1 w:0) // Storage: Paras Parachains (r:1 w:0)
// Storage: ParaInclusion PendingAvailability (r:2 w:1) // Storage: ParaInclusion PendingAvailability (r:2 w:1)
// Storage: ParaInclusion PendingAvailabilityCommitments (r:1 w:1) // Storage: ParaInclusion PendingAvailabilityCommitments (r:1 w:1)
// Storage: Configuration ActiveConfig (r:1 w:0)
// Storage: Session Validators (r:1 w:0)
// Storage: ParasShared ActiveValidatorIndices (r:1 w:0)
// Storage: Staking ActiveEra (r:1 w:0)
// Storage: Staking ErasRewardPoints (r:1 w:1)
// Storage: Dmp DownwardMessageQueues (r:1 w:1) // Storage: Dmp DownwardMessageQueues (r:1 w:1)
// Storage: Hrmp HrmpChannelDigests (r:1 w:1) // Storage: Hrmp HrmpChannelDigests (r:1 w:1)
// Storage: Paras FutureCodeUpgrades (r:1 w:0) // Storage: Paras FutureCodeUpgrades (r:1 w:0)
// Storage: ParasDisputes Disputes (r:1 w:0)
// Storage: ParaScheduler SessionStartBlock (r:1 w:0) // Storage: ParaScheduler SessionStartBlock (r:1 w:0)
// Storage: ParaScheduler ParathreadQueue (r:1 w:1) // Storage: ParaScheduler ParathreadQueue (r:1 w:1)
// Storage: ParaScheduler Scheduled (r:1 w:1) // Storage: ParaScheduler Scheduled (r:1 w:1)
...@@ -100,29 +98,28 @@ impl<T: frame_system::Config> runtime_parachains::paras_inherent::WeightInfo for ...@@ -100,29 +98,28 @@ impl<T: frame_system::Config> runtime_parachains::paras_inherent::WeightInfo for
// Storage: Ump NextDispatchRoundStartWith (r:1 w:1) // Storage: Ump NextDispatchRoundStartWith (r:1 w:1)
// Storage: ParaInclusion AvailabilityBitfields (r:0 w:1) // Storage: ParaInclusion AvailabilityBitfields (r:0 w:1)
// Storage: ParaInherent OnChainVotes (r:0 w:1) // Storage: ParaInherent OnChainVotes (r:0 w:1)
// Storage: ParasDisputes Included (r:0 w:1)
// Storage: Hrmp HrmpWatermarks (r:0 w:1) // Storage: Hrmp HrmpWatermarks (r:0 w:1)
// Storage: Paras Heads (r:0 w:1) // Storage: Paras Heads (r:0 w:1)
fn enter_bitfields() -> Weight { fn enter_bitfields() -> Weight {
(352_749_000 as Weight) (299_878_000 as Weight)
.saturating_add(T::DbWeight::get().reads(23 as Weight)) .saturating_add(T::DbWeight::get().reads(21 as Weight))
.saturating_add(T::DbWeight::get().writes(15 as Weight)) .saturating_add(T::DbWeight::get().writes(15 as Weight))
} }
// Storage: ParaInherent Included (r:1 w:1) // Storage: ParaInherent Included (r:1 w:1)
// Storage: System ParentHash (r:1 w:0) // Storage: System ParentHash (r:1 w:0)
// Storage: ParaScheduler AvailabilityCores (r:1 w:1) // Storage: ParaScheduler AvailabilityCores (r:1 w:1)
// Storage: ParasShared CurrentSessionIndex (r:1 w:0) // Storage: ParasShared CurrentSessionIndex (r:1 w:0)
// Storage: Configuration ActiveConfig (r:1 w:0)
// Storage: ParasDisputes Frozen (r:1 w:0)
// Storage: ParasShared ActiveValidatorKeys (r:1 w:0) // Storage: ParasShared ActiveValidatorKeys (r:1 w:0)
// Storage: Paras Parachains (r:1 w:0) // Storage: Paras Parachains (r:1 w:0)
// Storage: ParaInclusion PendingAvailability (r:2 w:1) // Storage: ParaInclusion PendingAvailability (r:2 w:1)
// Storage: ParaInclusion PendingAvailabilityCommitments (r:1 w:1) // Storage: ParaInclusion PendingAvailabilityCommitments (r:1 w:1)
// Storage: Configuration ActiveConfig (r:1 w:0)
// Storage: Session Validators (r:1 w:0)
// Storage: ParasShared ActiveValidatorIndices (r:1 w:0)
// Storage: Staking ActiveEra (r:1 w:0)
// Storage: Staking ErasRewardPoints (r:1 w:1)
// Storage: Dmp DownwardMessageQueues (r:1 w:1) // Storage: Dmp DownwardMessageQueues (r:1 w:1)
// Storage: Hrmp HrmpChannelDigests (r:1 w:1) // Storage: Hrmp HrmpChannelDigests (r:1 w:1)
// Storage: Paras FutureCodeUpgrades (r:1 w:0) // Storage: Paras FutureCodeUpgrades (r:1 w:0)
// Storage: ParasDisputes Disputes (r:2 w:0)
// Storage: ParaScheduler SessionStartBlock (r:1 w:0) // Storage: ParaScheduler SessionStartBlock (r:1 w:0)
// Storage: ParaScheduler ParathreadQueue (r:1 w:1) // Storage: ParaScheduler ParathreadQueue (r:1 w:1)
// Storage: ParaScheduler Scheduled (r:1 w:1) // Storage: ParaScheduler Scheduled (r:1 w:1)
...@@ -133,31 +130,28 @@ impl<T: frame_system::Config> runtime_parachains::paras_inherent::WeightInfo for ...@@ -133,31 +130,28 @@ impl<T: frame_system::Config> runtime_parachains::paras_inherent::WeightInfo for
// Storage: Ump NeedsDispatch (r:1 w:1) // Storage: Ump NeedsDispatch (r:1 w:1)
// Storage: Ump NextDispatchRoundStartWith (r:1 w:1) // Storage: Ump NextDispatchRoundStartWith (r:1 w:1)
// Storage: ParaInherent OnChainVotes (r:0 w:1) // Storage: ParaInherent OnChainVotes (r:0 w:1)
// Storage: ParasDisputes Included (r:0 w:1)
// Storage: Hrmp HrmpWatermarks (r:0 w:1) // Storage: Hrmp HrmpWatermarks (r:0 w:1)
// Storage: Paras Heads (r:0 w:1) // Storage: Paras Heads (r:0 w:1)
fn enter_backed_candidates_variable(v: u32, ) -> Weight { fn enter_backed_candidates_variable(_v: u32) -> Weight {
(88_047_000 as Weight) (442_472_000 as Weight)
// Standard Error: 3_275_000 .saturating_add(T::DbWeight::get().reads(25 as Weight))
.saturating_add((68_499_000 as Weight).saturating_mul(v as Weight))
.saturating_add(T::DbWeight::get().reads(26 as Weight))
.saturating_add(T::DbWeight::get().writes(14 as Weight)) .saturating_add(T::DbWeight::get().writes(14 as Weight))
} }
// Storage: ParaInherent Included (r:1 w:1) // Storage: ParaInherent Included (r:1 w:1)
// Storage: System ParentHash (r:1 w:0) // Storage: System ParentHash (r:1 w:0)
// Storage: ParaScheduler AvailabilityCores (r:1 w:1) // Storage: ParaScheduler AvailabilityCores (r:1 w:1)
// Storage: ParasShared CurrentSessionIndex (r:1 w:0) // Storage: ParasShared CurrentSessionIndex (r:1 w:0)
// Storage: Configuration ActiveConfig (r:1 w:0)
// Storage: ParasDisputes Frozen (r:1 w:0)
// Storage: ParasShared ActiveValidatorKeys (r:1 w:0) // Storage: ParasShared ActiveValidatorKeys (r:1 w:0)
// Storage: Paras Parachains (r:1 w:0) // Storage: Paras Parachains (r:1 w:0)
// Storage: ParaInclusion PendingAvailability (r:2 w:1) // Storage: ParaInclusion PendingAvailability (r:2 w:1)
// Storage: ParaInclusion PendingAvailabilityCommitments (r:1 w:1) // Storage: ParaInclusion PendingAvailabilityCommitments (r:1 w:1)
// Storage: Configuration ActiveConfig (r:1 w:0)
// Storage: Session Validators (r:1 w:0)
// Storage: ParasShared ActiveValidatorIndices (r:1 w:0)
// Storage: Staking ActiveEra (r:1 w:0)
// Storage: Staking ErasRewardPoints (r:1 w:1)
// Storage: Dmp DownwardMessageQueues (r:1 w:1) // Storage: Dmp DownwardMessageQueues (r:1 w:1)
// Storage: Hrmp HrmpChannelDigests (r:1 w:1) // Storage: Hrmp HrmpChannelDigests (r:1 w:1)
// Storage: Paras FutureCodeUpgrades (r:1 w:0) // Storage: Paras FutureCodeUpgrades (r:1 w:0)
// Storage: ParasDisputes Disputes (r:2 w:0)
// Storage: ParaScheduler SessionStartBlock (r:1 w:0) // Storage: ParaScheduler SessionStartBlock (r:1 w:0)
// Storage: ParaScheduler ParathreadQueue (r:1 w:1) // Storage: ParaScheduler ParathreadQueue (r:1 w:1)
// Storage: ParaScheduler Scheduled (r:1 w:1) // Storage: ParaScheduler Scheduled (r:1 w:1)
...@@ -168,11 +162,12 @@ impl<T: frame_system::Config> runtime_parachains::paras_inherent::WeightInfo for ...@@ -168,11 +162,12 @@ impl<T: frame_system::Config> runtime_parachains::paras_inherent::WeightInfo for
// Storage: Ump NeedsDispatch (r:1 w:1) // Storage: Ump NeedsDispatch (r:1 w:1)
// Storage: Ump NextDispatchRoundStartWith (r:1 w:1) // Storage: Ump NextDispatchRoundStartWith (r:1 w:1)
// Storage: ParaInherent OnChainVotes (r:0 w:1) // Storage: ParaInherent OnChainVotes (r:0 w:1)
// Storage: ParasDisputes Included (r:0 w:1)
// Storage: Hrmp HrmpWatermarks (r:0 w:1) // Storage: Hrmp HrmpWatermarks (r:0 w:1)
// Storage: Paras Heads (r:0 w:1) // Storage: Paras Heads