Unverified Commit 211a4fca authored by Keith Yeung's avatar Keith Yeung Committed by GitHub
Browse files

Add benchmarking for parachain runtime initializer pallet (#3913)



* Add benchmarking for parachain runtime initializer pallet

* Fix default impl for initializer pallet WeightInfo

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

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

* Use real weights and use max_block as default weight

* Add variable for digest vec length for initializer benchmark

* Fix compilation errors

* Add WeightInfo to parachains_initializer config in polkadot runtime

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

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

* Appease spellchecker

* Use kusama weights in polkadot runtime for parachain initializer pallet

Co-authored-by: default avatarParity Bot <admin@parity.io>
parent 1d05f779
Pipeline #159473 passed with stages
in 32 minutes and 2 seconds
...@@ -1181,6 +1181,7 @@ impl parachains_scheduler::Config for Runtime {} ...@@ -1181,6 +1181,7 @@ impl parachains_scheduler::Config for Runtime {}
impl parachains_initializer::Config for Runtime { impl parachains_initializer::Config for Runtime {
type Randomness = pallet_babe::RandomnessFromOneEpochAgo<Runtime>; type Randomness = pallet_babe::RandomnessFromOneEpochAgo<Runtime>;
type ForceOrigin = EnsureRoot<AccountId>; type ForceOrigin = EnsureRoot<AccountId>;
type WeightInfo = weights::runtime_parachains_initializer::WeightInfo<Runtime>;
} }
parameter_types! { parameter_types! {
...@@ -2054,6 +2055,7 @@ sp_api::impl_runtime_apis! { ...@@ -2054,6 +2055,7 @@ sp_api::impl_runtime_apis! {
list_benchmark!(list, extra, runtime_common::slots, Slots); list_benchmark!(list, extra, runtime_common::slots, Slots);
list_benchmark!(list, extra, runtime_common::paras_registrar, Registrar); list_benchmark!(list, extra, runtime_common::paras_registrar, Registrar);
list_benchmark!(list, extra, runtime_parachains::configuration, Configuration); list_benchmark!(list, extra, runtime_parachains::configuration, Configuration);
list_benchmark!(list, extra, runtime_parachains::initializer, Initializer);
list_benchmark!(list, extra, runtime_parachains::paras, Paras); list_benchmark!(list, extra, runtime_parachains::paras, Paras);
// Substrate // Substrate
list_benchmark!(list, extra, pallet_bags_list, BagsList); list_benchmark!(list, extra, pallet_bags_list, BagsList);
...@@ -2130,6 +2132,7 @@ sp_api::impl_runtime_apis! { ...@@ -2130,6 +2132,7 @@ sp_api::impl_runtime_apis! {
add_benchmark!(params, batches, runtime_common::slots, Slots); add_benchmark!(params, batches, runtime_common::slots, Slots);
add_benchmark!(params, batches, runtime_common::paras_registrar, Registrar); add_benchmark!(params, batches, runtime_common::paras_registrar, Registrar);
add_benchmark!(params, batches, runtime_parachains::configuration, Configuration); add_benchmark!(params, batches, runtime_parachains::configuration, Configuration);
add_benchmark!(params, batches, runtime_parachains::initializer, Initializer);
add_benchmark!(params, batches, runtime_parachains::paras, Paras); add_benchmark!(params, batches, runtime_parachains::paras, Paras);
// Substrate // Substrate
add_benchmark!(params, batches, pallet_balances, Balances); add_benchmark!(params, batches, pallet_balances, Balances);
......
...@@ -45,4 +45,5 @@ pub mod runtime_common_crowdloan; ...@@ -45,4 +45,5 @@ pub mod runtime_common_crowdloan;
pub mod runtime_common_paras_registrar; pub mod runtime_common_paras_registrar;
pub mod runtime_common_slots; pub mod runtime_common_slots;
pub mod runtime_parachains_configuration; pub mod runtime_parachains_configuration;
pub mod runtime_parachains_initializer;
pub mod runtime_parachains_paras; pub mod runtime_parachains_paras;
// Copyright 2017-2021 Parity Technologies (UK) Ltd.
// This file is part of Polkadot.
// Polkadot is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
// Polkadot is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
// You should have received a copy of the GNU General Public License
// along with Polkadot. If not, see <http://www.gnu.org/licenses/>.
//! Autogenerated weights for `runtime_parachains::initializer`
//!
//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
//! DATE: 2021-09-25, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("kusama-dev"), DB CACHE: 128
// Executed Command:
// target/release/polkadot
// benchmark
// --chain=kusama-dev
// --steps=50
// --repeat=20
// --pallet=runtime_parachains::initializer
// --extrinsic=*
// --execution=wasm
// --wasm-execution=compiled
// --heap-pages=4096
// --header=./file_header.txt
// --output=./runtime/kusama/src/weights/runtime_parachains_initializer.rs
#![cfg_attr(rustfmt, rustfmt_skip)]
#![allow(unused_parens)]
#![allow(unused_imports)]
use frame_support::{traits::Get, weights::Weight};
use sp_std::marker::PhantomData;
/// Weight functions for `runtime_parachains::initializer`.
pub struct WeightInfo<T>(PhantomData<T>);
impl<T: frame_system::Config> runtime_parachains::initializer::WeightInfo for WeightInfo<T> {
// Storage: System Digest (r:1 w:1)
fn force_approve(d: u32, ) -> Weight {
(5_156_000 as Weight)
// Standard Error: 0
.saturating_add((2_000 as Weight).saturating_mul(d as Weight))
.saturating_add(T::DbWeight::get().reads(1 as Weight))
.saturating_add(T::DbWeight::get().writes(1 as Weight))
}
}
...@@ -24,12 +24,19 @@ use crate::{ ...@@ -24,12 +24,19 @@ use crate::{
disputes::DisputesHandler, disputes::DisputesHandler,
dmp, hrmp, inclusion, paras, scheduler, session_info, shared, ump, dmp, hrmp, inclusion, paras, scheduler, session_info, shared, ump,
}; };
use frame_support::traits::{OneSessionHandler, Randomness}; use frame_support::{
traits::{OneSessionHandler, Randomness},
weights::Weight,
};
use frame_system::limits::BlockWeights;
use parity_scale_codec::{Decode, Encode}; use parity_scale_codec::{Decode, Encode};
use primitives::v1::{BlockNumber, ConsensusLog, SessionIndex, ValidatorId}; use primitives::v1::{BlockNumber, ConsensusLog, SessionIndex, ValidatorId};
use scale_info::TypeInfo; use scale_info::TypeInfo;
use sp_std::prelude::*; use sp_std::prelude::*;
#[cfg(feature = "runtime-benchmarks")]
mod benchmarking;
pub use pallet::*; pub use pallet::*;
/// Information about a session change that has just occurred. /// Information about a session change that has just occurred.
...@@ -69,6 +76,16 @@ struct BufferedSessionChange { ...@@ -69,6 +76,16 @@ struct BufferedSessionChange {
session_index: SessionIndex, session_index: SessionIndex,
} }
pub trait WeightInfo {
fn force_approve(d: u32) -> Weight;
}
impl WeightInfo for () {
fn force_approve(_: u32) -> Weight {
BlockWeights::default().max_block
}
}
#[frame_support::pallet] #[frame_support::pallet]
pub mod pallet { pub mod pallet {
use super::*; use super::*;
...@@ -96,6 +113,8 @@ pub mod pallet { ...@@ -96,6 +113,8 @@ pub mod pallet {
type Randomness: Randomness<Self::Hash, Self::BlockNumber>; type Randomness: Randomness<Self::Hash, Self::BlockNumber>;
/// An origin which is allowed to force updates to parachains. /// An origin which is allowed to force updates to parachains.
type ForceOrigin: EnsureOrigin<<Self as frame_system::Config>::Origin>; type ForceOrigin: EnsureOrigin<<Self as frame_system::Config>::Origin>;
/// Weight information for extrinsics in this pallet.
type WeightInfo: WeightInfo;
} }
/// Whether the parachains modules have been initialized within this block. /// Whether the parachains modules have been initialized within this block.
...@@ -181,7 +200,12 @@ pub mod pallet { ...@@ -181,7 +200,12 @@ pub mod pallet {
/// Issue a signal to the consensus engine to forcibly act as though all parachain /// Issue a signal to the consensus engine to forcibly act as though all parachain
/// blocks in all relay chain blocks up to and including the given number in the current /// blocks in all relay chain blocks up to and including the given number in the current
/// chain are valid and should be finalized. /// chain are valid and should be finalized.
#[pallet::weight((0, DispatchClass::Operational))] #[pallet::weight((
<T as Config>::WeightInfo::force_approve(
frame_system::Pallet::<T>::digest().logs.len() as u32,
),
DispatchClass::Operational,
))]
pub fn force_approve(origin: OriginFor<T>, up_to: BlockNumber) -> DispatchResult { pub fn force_approve(origin: OriginFor<T>, up_to: BlockNumber) -> DispatchResult {
T::ForceOrigin::ensure_origin(origin)?; T::ForceOrigin::ensure_origin(origin)?;
......
// Copyright 2021 Parity Technologies (UK) Ltd.
// This file is part of Polkadot.
// Polkadot is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
// Polkadot is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
// You should have received a copy of the GNU General Public License
// along with Polkadot. If not, see <http://www.gnu.org/licenses/>.
use super::*;
use frame_benchmarking::{benchmarks, impl_benchmark_test_suite};
use frame_system::{DigestItemOf, RawOrigin};
use primitives::v1::ConsensusLog;
// Random large number for the digest
const DIGEST_MAX_LEN: u32 = 65536;
benchmarks! {
force_approve {
let d in 0 .. DIGEST_MAX_LEN;
for _ in 0 .. d {
<frame_system::Pallet<T>>::deposit_log(ConsensusLog::ForceApprove(d).into());
}
}: _(RawOrigin::Root, d + 1)
verify {
assert_eq!(
<frame_system::Pallet<T>>::digest().logs.last().unwrap(),
&<DigestItemOf<T>>::from(ConsensusLog::ForceApprove(d + 1)),
);
}
}
impl_benchmark_test_suite!(
Pallet,
crate::mock::new_test_ext(Default::default()),
crate::mock::Test
);
...@@ -112,6 +112,7 @@ impl pallet_balances::Config for Test { ...@@ -112,6 +112,7 @@ impl pallet_balances::Config for Test {
impl crate::initializer::Config for Test { impl crate::initializer::Config for Test {
type Randomness = TestRandomness<Self>; type Randomness = TestRandomness<Self>;
type ForceOrigin = frame_system::EnsureRoot<u64>; type ForceOrigin = frame_system::EnsureRoot<u64>;
type WeightInfo = ();
} }
impl crate::configuration::Config for Test { impl crate::configuration::Config for Test {
......
...@@ -1146,6 +1146,7 @@ impl parachains_scheduler::Config for Runtime {} ...@@ -1146,6 +1146,7 @@ impl parachains_scheduler::Config for Runtime {}
impl parachains_initializer::Config for Runtime { impl parachains_initializer::Config for Runtime {
type Randomness = pallet_babe::RandomnessFromOneEpochAgo<Runtime>; type Randomness = pallet_babe::RandomnessFromOneEpochAgo<Runtime>;
type ForceOrigin = EnsureRoot<AccountId>; type ForceOrigin = EnsureRoot<AccountId>;
type WeightInfo = weights::runtime_parachains_initializer::WeightInfo<Runtime>;
} }
parameter_types! { parameter_types! {
......
...@@ -43,4 +43,5 @@ pub mod runtime_common_crowdloan; ...@@ -43,4 +43,5 @@ pub mod runtime_common_crowdloan;
pub mod runtime_common_paras_registrar; pub mod runtime_common_paras_registrar;
pub mod runtime_common_slots; pub mod runtime_common_slots;
pub mod runtime_parachains_configuration; pub mod runtime_parachains_configuration;
pub mod runtime_parachains_initializer;
pub mod runtime_parachains_paras; pub mod runtime_parachains_paras;
// Copyright 2017-2021 Parity Technologies (UK) Ltd.
// This file is part of Polkadot.
// Polkadot is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
// Polkadot is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
// You should have received a copy of the GNU General Public License
// along with Polkadot. If not, see <http://www.gnu.org/licenses/>.
//! Autogenerated weights for `runtime_parachains::initializer`
//!
//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
//! DATE: 2021-09-25, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("kusama-dev"), DB CACHE: 128
// Executed Command:
// target/release/polkadot
// benchmark
// --chain=kusama-dev
// --steps=50
// --repeat=20
// --pallet=runtime_parachains::initializer
// --extrinsic=*
// --execution=wasm
// --wasm-execution=compiled
// --heap-pages=4096
// --header=./file_header.txt
// --output=./runtime/kusama/src/weights/runtime_parachains_initializer.rs
#![cfg_attr(rustfmt, rustfmt_skip)]
#![allow(unused_parens)]
#![allow(unused_imports)]
use frame_support::{traits::Get, weights::Weight};
use sp_std::marker::PhantomData;
/// Weight functions for `runtime_parachains::initializer`.
pub struct WeightInfo<T>(PhantomData<T>);
impl<T: frame_system::Config> runtime_parachains::initializer::WeightInfo for WeightInfo<T> {
// Storage: System Digest (r:1 w:1)
fn force_approve(d: u32, ) -> Weight {
(5_156_000 as Weight)
// Standard Error: 0
.saturating_add((2_000 as Weight).saturating_mul(d as Weight))
.saturating_add(T::DbWeight::get().reads(1 as Weight))
.saturating_add(T::DbWeight::get().writes(1 as Weight))
}
}
...@@ -753,6 +753,7 @@ impl parachains_scheduler::Config for Runtime {} ...@@ -753,6 +753,7 @@ impl parachains_scheduler::Config for Runtime {}
impl parachains_initializer::Config for Runtime { impl parachains_initializer::Config for Runtime {
type Randomness = pallet_babe::RandomnessFromOneEpochAgo<Runtime>; type Randomness = pallet_babe::RandomnessFromOneEpochAgo<Runtime>;
type ForceOrigin = EnsureRoot<AccountId>; type ForceOrigin = EnsureRoot<AccountId>;
type WeightInfo = ();
} }
impl paras_sudo_wrapper::Config for Runtime {} impl paras_sudo_wrapper::Config for Runtime {}
......
...@@ -480,6 +480,7 @@ impl parachains_paras_inherent::Config for Runtime {} ...@@ -480,6 +480,7 @@ impl parachains_paras_inherent::Config for Runtime {}
impl parachains_initializer::Config for Runtime { impl parachains_initializer::Config for Runtime {
type Randomness = pallet_babe::RandomnessFromOneEpochAgo<Runtime>; type Randomness = pallet_babe::RandomnessFromOneEpochAgo<Runtime>;
type ForceOrigin = frame_system::EnsureRoot<AccountId>; type ForceOrigin = frame_system::EnsureRoot<AccountId>;
type WeightInfo = ();
} }
impl parachains_session_info::Config for Runtime {} impl parachains_session_info::Config for Runtime {}
......
...@@ -805,7 +805,7 @@ impl pallet_proxy::Config for Runtime { ...@@ -805,7 +805,7 @@ impl pallet_proxy::Config for Runtime {
impl parachains_origin::Config for Runtime {} impl parachains_origin::Config for Runtime {}
impl parachains_configuration::Config for Runtime { impl parachains_configuration::Config for Runtime {
type WeightInfo = parachains_configuration::weights::WeightInfo<Runtime>; type WeightInfo = weights::runtime_parachains_configuration::WeightInfo<Runtime>;
} }
impl parachains_shared::Config for Runtime {} impl parachains_shared::Config for Runtime {}
...@@ -850,6 +850,7 @@ impl parachains_scheduler::Config for Runtime {} ...@@ -850,6 +850,7 @@ impl parachains_scheduler::Config for Runtime {}
impl parachains_initializer::Config for Runtime { impl parachains_initializer::Config for Runtime {
type Randomness = pallet_babe::RandomnessFromOneEpochAgo<Runtime>; type Randomness = pallet_babe::RandomnessFromOneEpochAgo<Runtime>;
type ForceOrigin = EnsureRoot<AccountId>; type ForceOrigin = EnsureRoot<AccountId>;
type WeightInfo = weights::runtime_parachains_initializer::WeightInfo<Runtime>;
} }
impl paras_sudo_wrapper::Config for Runtime {} impl paras_sudo_wrapper::Config for Runtime {}
...@@ -1477,6 +1478,7 @@ sp_api::impl_runtime_apis! { ...@@ -1477,6 +1478,7 @@ sp_api::impl_runtime_apis! {
list_benchmark!(list, extra, runtime_common::paras_registrar, Registrar); list_benchmark!(list, extra, runtime_common::paras_registrar, Registrar);
list_benchmark!(list, extra, runtime_common::slots, Slots); list_benchmark!(list, extra, runtime_common::slots, Slots);
list_benchmark!(list, extra, runtime_parachains::configuration, Configuration); list_benchmark!(list, extra, runtime_parachains::configuration, Configuration);
list_benchmark!(list, extra, runtime_parachains::initializer, Initializer);
list_benchmark!(list, extra, runtime_parachains::paras, Paras); list_benchmark!(list, extra, runtime_parachains::paras, Paras);
// Substrate // Substrate
...@@ -1588,6 +1590,7 @@ sp_api::impl_runtime_apis! { ...@@ -1588,6 +1590,7 @@ sp_api::impl_runtime_apis! {
add_benchmark!(params, batches, runtime_common::paras_registrar, Registrar); add_benchmark!(params, batches, runtime_common::paras_registrar, Registrar);
add_benchmark!(params, batches, runtime_common::slots, Slots); add_benchmark!(params, batches, runtime_common::slots, Slots);
add_benchmark!(params, batches, runtime_parachains::configuration, Configuration); add_benchmark!(params, batches, runtime_parachains::configuration, Configuration);
add_benchmark!(params, batches, runtime_parachains::initializer, Initializer);
add_benchmark!(params, batches, runtime_parachains::paras, Paras); add_benchmark!(params, batches, runtime_parachains::paras, Paras);
// Substrate // Substrate
......
...@@ -35,5 +35,6 @@ pub mod runtime_common_crowdloan; ...@@ -35,5 +35,6 @@ pub mod runtime_common_crowdloan;
pub mod runtime_common_paras_registrar; pub mod runtime_common_paras_registrar;
pub mod runtime_common_slots; pub mod runtime_common_slots;
pub mod runtime_parachains_configuration; pub mod runtime_parachains_configuration;
pub mod runtime_parachains_initializer;
pub mod runtime_parachains_paras; pub mod runtime_parachains_paras;
pub mod xcm; pub mod xcm;
// Copyright 2017-2021 Parity Technologies (UK) Ltd.
// This file is part of Polkadot.
// Polkadot is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
// Polkadot is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
// You should have received a copy of the GNU General Public License
// along with Polkadot. If not, see <http://www.gnu.org/licenses/>.
//! Autogenerated weights for `runtime_parachains::initializer`
//!
//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
//! DATE: 2021-09-25, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("westend-dev"), DB CACHE: 128
// Executed Command:
// target/release/polkadot
// benchmark
// --chain=westend-dev
// --steps=50
// --repeat=20
// --pallet=runtime_parachains::initializer
// --extrinsic=*
// --execution=wasm
// --wasm-execution=compiled
// --heap-pages=4096
// --header=./file_header.txt
// --output=./runtime/westend/src/weights/runtime_parachains_initializer.rs
#![cfg_attr(rustfmt, rustfmt_skip)]
#![allow(unused_parens)]
#![allow(unused_imports)]
use frame_support::{traits::Get, weights::Weight};
use sp_std::marker::PhantomData;
/// Weight functions for `runtime_parachains::initializer`.
pub struct WeightInfo<T>(PhantomData<T>);
impl<T: frame_system::Config> runtime_parachains::initializer::WeightInfo for WeightInfo<T> {
// Storage: System Digest (r:1 w:1)
fn force_approve(d: u32, ) -> Weight {
(6_607_000 as Weight)
// Standard Error: 0
.saturating_add((1_000 as Weight).saturating_mul(d as Weight))
.saturating_add(T::DbWeight::get().reads(1 as Weight))
.saturating_add(T::DbWeight::get().writes(1 as Weight))
}
}
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment