mirror of
https://github.com/pezkuwichain/pezkuwi-subxt.git
synced 2026-05-30 18:41:03 +00:00
Add benchmarking for parachain runtime ump pallet (#3889)
* Claim grounds, not working yet. * still wip, nothing to see * Module visibility problem * Add benchmarks for all parachain-enabled chains * Add missing mock weights * Fix mock weight info * Add max-weight to extrinsic weight * cargo run --quiet --release --features=runtime-benchmarks -- benchmark --chain=kusama-dev --steps=50 --repeat=20 --pallet=runtime_parachains::ump --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --header=./file_header.txt --output=./runtime/kusama/src/weights/runtime_parachains_ump.rs * sorting declarations * Use a maximum size message to benchmark worst-case * remove warning * Fix msg size overflow in tests * Use benchmarked weight in PostInfo * Update runtime/parachains/src/ump.rs Co-authored-by: Alexander Popiak <alexander.popiak@gmail.com> * Delete obsolete file * Compile fix * Fix spelling * Add benchmark for `UmpSink::process_upward_message` It benchmarks the time to process a message, mainly the size-dependent decoding time. This is used interally for refunding weight from `service_overweight` * Fix warning * cargo run --quiet --release --features=runtime-benchmarks -- benchmark --chain=kusama-dev --steps=50 --repeat=20 --pallet=runtime_parachains::ump --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --header=./file_header.txt --output=./runtime/kusama/src/weights/runtime_parachains_ump.rs * cargo run --quiet --release --features=runtime-benchmarks -- benchmark --chain=westend-dev --steps=50 --repeat=20 --pallet=runtime_parachains::ump --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --header=./file_header.txt --output=./runtime/westend/src/weights/runtime_parachains_ump.rs * Update runtime/parachains/src/ump.rs Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com> * Give mock weights for tests a name instead of () * Add benchmark for `initializer_on_new_session` aka. `perform_outgoing_para_cleanup` * Remove unnescessary pub specifier and change folding to a for loop suggestions by @pepyakin * Update runtime/parachains/src/ump.rs Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com> * Update runtime/parachains/src/ump.rs Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com> * Add comment on weight calculation and expected slight overestimation * Introduce a size bound constant for upward messages * Use KiB not kB for message size bound * Enforce max-message size bound * Use a const for upward message size bound. * Decrease max_upward_message_sizes to 50KiB as suggested by @pepyakin * Fix creating overweight messages * cargo run --quiet --profile=production --features=runtime-benchmarks -- benchmark --chain=rococo-dev --steps=50 --repeat=20 --pallet=runtime_parachains::ump --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --header=./file_header.txt --output=./runtime/rococo/src/weights/runtime_parachains_ump.rs * cargo run --quiet --profile=production --features=runtime-benchmarks -- benchmark --chain=westend-dev --steps=50 --repeat=20 --pallet=runtime_parachains::ump --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --header=./file_header.txt --output=./runtime/westend/src/weights/runtime_parachains_ump.rs * cargo run --quiet --profile=production --features=runtime-benchmarks -- benchmark --chain=kusama-dev --steps=50 --repeat=20 --pallet=runtime_parachains::ump --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --header=./file_header.txt --output=./runtime/kusama/src/weights/runtime_parachains_ump.rs * Remove unused variable * Rename benchmark function to the function actually benchmarked and some code cleanup * cargo run --quiet --profile=production --features=runtime-benchmarks -- benchmark --chain=kusama-dev --steps=50 --repeat=20 --pallet=runtime_parachains::ump --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --header=./file_header.txt --output=./runtime/kusama/src/weights/runtime_parachains_ump.rs * cargo run --quiet --profile=production --features=runtime-benchmarks -- benchmark --chain=rococo-dev --steps=50 --repeat=20 --pallet=runtime_parachains::ump --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --header=./file_header.txt --output=./runtime/rococo/src/weights/runtime_parachains_ump.rs * cargo run --quiet --profile=production --features=runtime-benchmarks -- benchmark --chain=westend-dev --steps=50 --repeat=20 --pallet=runtime_parachains::ump --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --header=./file_header.txt --output=./runtime/westend/src/weights/runtime_parachains_ump.rs * Better variable naming * Fix build * Fix build * Fix some remarks from @pepyakin Co-authored-by: Parity Bot <admin@parity.io> Co-authored-by: Alexander Popiak <alexander.popiak@gmail.com> Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com> Co-authored-by: emostov <32168567+emostov@users.noreply.github.com>
This commit is contained in:
committed by
GitHub
parent
2771f18391
commit
fc919376ba
@@ -322,6 +322,8 @@ pub enum InconsistentError<BlockNumber> {
|
||||
},
|
||||
/// `validation_upgrade_delay` is less than or equal 1.
|
||||
ValidationUpgradeDelayIsTooLow { validation_upgrade_delay: BlockNumber },
|
||||
/// Maximum UMP message size (`MAX_UPWARD_MESSAGE_SIZE_BOUND`) exceeded.
|
||||
MaxUpwardMessageSizeExceeded { max_message_size: u32 },
|
||||
/// Maximum number of HRMP outbound channels exceeded.
|
||||
MaxHrmpOutboundChannelsExceeded,
|
||||
/// Maximum number of HRMP inbound channels exceeded.
|
||||
@@ -388,6 +390,12 @@ where
|
||||
})
|
||||
}
|
||||
|
||||
if self.max_upward_message_size > crate::ump::MAX_UPWARD_MESSAGE_SIZE_BOUND {
|
||||
return Err(MaxUpwardMessageSizeExceeded {
|
||||
max_message_size: self.max_upward_message_size,
|
||||
})
|
||||
}
|
||||
|
||||
if self.hrmp_max_parachain_outbound_channels > crate::hrmp::HRMP_MAX_OUTBOUND_CHANNELS_BOUND
|
||||
{
|
||||
return Err(MaxHrmpOutboundChannelsExceeded)
|
||||
|
||||
@@ -230,6 +230,7 @@ impl crate::ump::Config for Test {
|
||||
type UmpSink = TestUmpSink;
|
||||
type FirstMessageFactorPercent = FirstMessageFactorPercent;
|
||||
type ExecuteOverweightOrigin = frame_system::EnsureRoot<AccountId>;
|
||||
type WeightInfo = crate::ump::TestWeightInfo;
|
||||
}
|
||||
|
||||
impl crate::hrmp::Config for Test {
|
||||
|
||||
@@ -28,6 +28,15 @@ use xcm::latest::Outcome;
|
||||
|
||||
pub use pallet::*;
|
||||
|
||||
/// Maximum value that `config.max_upward_message_size` can be set to
|
||||
///
|
||||
/// This is used for benchmarking sanely bounding relevant storate items. It is expected from the `configurations`
|
||||
/// pallet to check these values before setting.
|
||||
pub const MAX_UPWARD_MESSAGE_SIZE_BOUND: u32 = 50 * 1024;
|
||||
|
||||
#[cfg(feature = "runtime-benchmarks")]
|
||||
mod benchmarking;
|
||||
|
||||
#[cfg(test)]
|
||||
pub(crate) mod tests;
|
||||
|
||||
@@ -99,29 +108,38 @@ impl<XcmExecutor: xcm::latest::ExecuteXcm<C::Call>, C: Config> UmpSink for XcmSi
|
||||
};
|
||||
|
||||
let id = upward_message_id(&data[..]);
|
||||
let maybe_msg = VersionedXcm::<C::Call>::decode_all_with_depth_limit(
|
||||
let maybe_msg_and_weight = VersionedXcm::<C::Call>::decode_all_with_depth_limit(
|
||||
xcm::MAX_XCM_DECODE_DEPTH,
|
||||
&mut data,
|
||||
)
|
||||
.map(Xcm::<C::Call>::try_from);
|
||||
match maybe_msg {
|
||||
.map(|xcm| {
|
||||
(
|
||||
Xcm::<C::Call>::try_from(xcm),
|
||||
// NOTE: We are overestimating slightly here.
|
||||
// The benchmark is timing this whole function with different message sizes and a NOOP extrinsic to
|
||||
// measure the size-dependent weight. But as we use the weight funtion **in** the benchmarked funtion we
|
||||
// are taking call and control-flow overhead into account twice.
|
||||
<C as Config>::WeightInfo::sink_process_upward_message(data.len() as u32),
|
||||
)
|
||||
});
|
||||
match maybe_msg_and_weight {
|
||||
Err(_) => {
|
||||
Pallet::<C>::deposit_event(Event::InvalidFormat(id));
|
||||
Ok(0)
|
||||
},
|
||||
Ok(Err(())) => {
|
||||
Ok((Err(()), weight_used)) => {
|
||||
Pallet::<C>::deposit_event(Event::UnsupportedVersion(id));
|
||||
Ok(0)
|
||||
Ok(weight_used)
|
||||
},
|
||||
Ok(Ok(xcm_message)) => {
|
||||
Ok((Ok(xcm_message), weight_used)) => {
|
||||
let xcm_junction = Junction::Parachain(origin.into());
|
||||
let outcome = XcmExecutor::execute_xcm(xcm_junction, xcm_message, max_weight);
|
||||
match outcome {
|
||||
Outcome::Error(XcmError::WeightLimitReached(required)) => Err((id, required)),
|
||||
outcome => {
|
||||
let weight_used = outcome.weight_used();
|
||||
let outcome_weight = outcome.weight_used();
|
||||
Pallet::<C>::deposit_event(Event::ExecutedUpward(id, outcome));
|
||||
Ok(weight_used)
|
||||
Ok(weight_used.saturating_add(outcome_weight))
|
||||
},
|
||||
}
|
||||
},
|
||||
@@ -165,6 +183,29 @@ impl fmt::Debug for AcceptanceCheckErr {
|
||||
}
|
||||
}
|
||||
|
||||
/// Weight information of this pallet.
|
||||
pub trait WeightInfo {
|
||||
fn service_overweight() -> Weight;
|
||||
fn sink_process_upward_message(s: u32) -> Weight;
|
||||
fn clean_ump_after_outgoing() -> Weight;
|
||||
}
|
||||
|
||||
/// fallback implementation
|
||||
pub struct TestWeightInfo;
|
||||
impl WeightInfo for TestWeightInfo {
|
||||
fn service_overweight() -> Weight {
|
||||
Weight::MAX
|
||||
}
|
||||
|
||||
fn sink_process_upward_message(_msg_size: u32) -> Weight {
|
||||
Weight::MAX
|
||||
}
|
||||
|
||||
fn clean_ump_after_outgoing() -> Weight {
|
||||
Weight::MAX
|
||||
}
|
||||
}
|
||||
|
||||
#[frame_support::pallet]
|
||||
pub mod pallet {
|
||||
use super::*;
|
||||
@@ -192,6 +233,9 @@ pub mod pallet {
|
||||
|
||||
/// Origin which is allowed to execute overweight messages.
|
||||
type ExecuteOverweightOrigin: EnsureOrigin<Self::Origin>;
|
||||
|
||||
/// Weight information for extrinsics in this pallet.
|
||||
type WeightInfo: WeightInfo;
|
||||
}
|
||||
|
||||
#[pallet::event]
|
||||
@@ -303,7 +347,7 @@ pub mod pallet {
|
||||
///
|
||||
/// Events:
|
||||
/// - `OverweightServiced`: On success.
|
||||
#[pallet::weight(weight_limit.saturating_add(1_000_000))]
|
||||
#[pallet::weight(weight_limit.saturating_add(<T as Config>::WeightInfo::service_overweight()))]
|
||||
pub fn service_overweight(
|
||||
origin: OriginFor<T>,
|
||||
index: OverweightIndex,
|
||||
@@ -317,7 +361,7 @@ pub mod pallet {
|
||||
.map_err(|_| Error::<T>::WeightOverLimit)?;
|
||||
Overweight::<T>::remove(index);
|
||||
Self::deposit_event(Event::OverweightServiced(index, used));
|
||||
Ok(Some(used.saturating_add(1_000_000)).into())
|
||||
Ok(Some(used.saturating_add(<T as Config>::WeightInfo::service_overweight())).into())
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -336,20 +380,22 @@ impl<T: Config> Pallet<T> {
|
||||
pub(crate) fn initializer_on_new_session(
|
||||
_notification: &initializer::SessionChangeNotification<T::BlockNumber>,
|
||||
outgoing_paras: &[ParaId],
|
||||
) {
|
||||
Self::perform_outgoing_para_cleanup(outgoing_paras);
|
||||
) -> Weight {
|
||||
Self::perform_outgoing_para_cleanup(outgoing_paras)
|
||||
}
|
||||
|
||||
/// Iterate over all paras that were noted for offboarding and remove all the data
|
||||
/// associated with them.
|
||||
fn perform_outgoing_para_cleanup(outgoing: &[ParaId]) {
|
||||
fn perform_outgoing_para_cleanup(outgoing: &[ParaId]) -> Weight {
|
||||
let mut weight: Weight = 0;
|
||||
for outgoing_para in outgoing {
|
||||
Self::clean_ump_after_outgoing(outgoing_para);
|
||||
weight = weight.saturating_add(Self::clean_ump_after_outgoing(outgoing_para));
|
||||
}
|
||||
weight
|
||||
}
|
||||
|
||||
/// Remove all relevant storage items for an outgoing parachain.
|
||||
fn clean_ump_after_outgoing(outgoing_para: &ParaId) {
|
||||
pub(crate) fn clean_ump_after_outgoing(outgoing_para: &ParaId) -> Weight {
|
||||
<Self as Store>::RelayDispatchQueueSize::remove(outgoing_para);
|
||||
<Self as Store>::RelayDispatchQueues::remove(outgoing_para);
|
||||
|
||||
@@ -366,6 +412,8 @@ impl<T: Config> Pallet<T> {
|
||||
<Self as Store>::NextDispatchRoundStartWith::mutate(|v| {
|
||||
*v = v.filter(|p| p == outgoing_para)
|
||||
});
|
||||
|
||||
<T as Config>::WeightInfo::clean_ump_after_outgoing()
|
||||
}
|
||||
|
||||
/// Check that all the upward messages sent by a candidate pass the acceptance criteria. Returns
|
||||
|
||||
@@ -0,0 +1,139 @@
|
||||
// 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::{Pallet as Ump, *};
|
||||
use frame_system::RawOrigin;
|
||||
use xcm::prelude::*;
|
||||
|
||||
fn assert_last_event_type<T: Config>(generic_event: <T as Config>::Event) {
|
||||
let events = frame_system::Pallet::<T>::events();
|
||||
let system_event: <T as frame_system::Config>::Event = generic_event.into();
|
||||
// compare to the last event record
|
||||
let frame_system::EventRecord { event, .. } = &events[events.len() - 1];
|
||||
assert_eq!(sp_std::mem::discriminant(event), sp_std::mem::discriminant(&system_event));
|
||||
}
|
||||
|
||||
fn queue_upward_msg<T: Config>(
|
||||
host_conf: &HostConfiguration<T::BlockNumber>,
|
||||
para: ParaId,
|
||||
msg: UpwardMessage,
|
||||
) {
|
||||
let len = msg.len() as u32;
|
||||
let msgs = vec![msg];
|
||||
Ump::<T>::check_upward_messages(host_conf, para, &msgs).unwrap();
|
||||
let _ = Ump::<T>::receive_upward_messages(para, msgs);
|
||||
assert_last_event_type::<T>(Event::UpwardMessagesReceived(para, 1, len).into());
|
||||
}
|
||||
|
||||
// Create a message with at least `size` bytes encoded length
|
||||
fn create_message_min_size<T: Config>(size: u32) -> Vec<u8> {
|
||||
// Create a message with an empty remark call to determine the encoding overhead
|
||||
let msg_size_empty_transact = VersionedXcm::<T>::from(Xcm::<T>(vec![Transact {
|
||||
origin_type: OriginKind::SovereignAccount,
|
||||
require_weight_at_most: Weight::MAX,
|
||||
call: frame_system::Call::<T>::remark_with_event { remark: vec![] }.encode().into(),
|
||||
}]))
|
||||
.encode()
|
||||
.len();
|
||||
|
||||
// Create a message with a remark call of just the size required to make the whole encoded message the requested size
|
||||
let size = size.saturating_sub(msg_size_empty_transact as u32) as usize;
|
||||
let mut remark = Vec::new();
|
||||
remark.resize(size, 0u8);
|
||||
let msg = VersionedXcm::<T>::from(Xcm::<T>(vec![Transact {
|
||||
origin_type: OriginKind::SovereignAccount,
|
||||
require_weight_at_most: Weight::MAX,
|
||||
call: frame_system::Call::<T>::remark_with_event { remark }.encode().into(),
|
||||
}]))
|
||||
.encode();
|
||||
|
||||
assert!(msg.len() >= size);
|
||||
msg
|
||||
}
|
||||
|
||||
fn create_message_overweight<T: Config>() -> Vec<u8> {
|
||||
let max_block_weight = T::BlockWeights::get().max_block;
|
||||
// We use a `set_code` Call because it
|
||||
let call = frame_system::Call::<T>::set_code { code: vec![] };
|
||||
VersionedXcm::<T>::from(Xcm::<T>(vec![Transact {
|
||||
origin_type: OriginKind::Superuser,
|
||||
require_weight_at_most: max_block_weight,
|
||||
call: call.encode().into(),
|
||||
}]))
|
||||
.encode()
|
||||
}
|
||||
|
||||
frame_benchmarking::benchmarks! {
|
||||
// NOTE: We are overestimating slightly here.
|
||||
// The benchmark is timing this whole function with different message sizes and a NOOP extrinsic to
|
||||
// measure the size-dependent weight. But as we use the weight function **in** the benchmarked function we
|
||||
// are taking call and control-flow overhead into account twice.
|
||||
process_upward_message {
|
||||
let s in 0..MAX_UPWARD_MESSAGE_SIZE_BOUND;
|
||||
let para = ParaId::from(1978);
|
||||
let data = create_message_min_size::<T>(s);
|
||||
}: {
|
||||
assert!(T::UmpSink::process_upward_message(para, &data[..], Weight::MAX).is_ok());
|
||||
}
|
||||
|
||||
clean_ump_after_outgoing {
|
||||
// max number of queued messages.
|
||||
let count = configuration::ActiveConfig::<T>::get().max_upward_queue_count;
|
||||
let host_conf = configuration::ActiveConfig::<T>::get();
|
||||
let msg = create_message_min_size::<T>(0);
|
||||
// Start with the block number 1. This is needed because should an event be
|
||||
// emitted during the genesis block they will be implicitly wiped.
|
||||
frame_system::Pallet::<T>::set_block_number(1u32.into());
|
||||
// fill the queue, each message has it's own para-id.
|
||||
for id in 0..count {
|
||||
queue_upward_msg::<T>(&host_conf, ParaId::from(id), msg.clone());
|
||||
}
|
||||
}: {
|
||||
Ump::<T>::clean_ump_after_outgoing(&ParaId::from(0));
|
||||
}
|
||||
|
||||
service_overweight {
|
||||
let host_conf = configuration::ActiveConfig::<T>::get();
|
||||
let weight = host_conf.ump_max_individual_weight + host_conf.ump_max_individual_weight + 1000000;
|
||||
let para = ParaId::from(1978);
|
||||
// The message's weight does not really matter here, as we add service_overweight's
|
||||
// max_weight parameter to the extrinsic's weight in the weight calculation.
|
||||
// The size of the message influences decoding time, so we create a min-sized message here
|
||||
// and take the decoding weight into account by adding it to the extrinsic execution weight
|
||||
// in the process_upward_message function.
|
||||
let msg = create_message_overweight::<T>();
|
||||
|
||||
// This just makes sure that 0 is not a valid index and we can use it later on.
|
||||
let _ = Ump::<T>::service_overweight(RawOrigin::Root.into(), 0, 1000);
|
||||
// Start with the block number 1. This is needed because should an event be
|
||||
// emitted during the genesis block they will be implicitly wiped.
|
||||
frame_system::Pallet::<T>::set_block_number(1u32.into());
|
||||
queue_upward_msg::<T>(&host_conf, para, msg.clone());
|
||||
Ump::<T>::process_pending_upward_messages();
|
||||
assert_last_event_type::<T>(
|
||||
Event::OverweightEnqueued(para, upward_message_id(&msg), 0, 0).into()
|
||||
);
|
||||
}: _(RawOrigin::Root, 0, Weight::MAX)
|
||||
verify {
|
||||
assert_last_event_type::<T>(Event::OverweightServiced(0, 0).into());
|
||||
}
|
||||
}
|
||||
|
||||
frame_benchmarking::impl_benchmark_test_suite!(
|
||||
Ump,
|
||||
crate::mock::new_test_ext(crate::ump::tests::GenesisConfigBuilder::default().build()),
|
||||
crate::mock::Test
|
||||
);
|
||||
@@ -22,7 +22,7 @@ use crate::mock::{
|
||||
use frame_support::{assert_noop, assert_ok, weights::Weight};
|
||||
use std::collections::HashSet;
|
||||
|
||||
struct GenesisConfigBuilder {
|
||||
pub(super) struct GenesisConfigBuilder {
|
||||
max_upward_message_size: u32,
|
||||
max_upward_message_num_per_candidate: u32,
|
||||
max_upward_queue_count: u32,
|
||||
@@ -45,7 +45,7 @@ impl Default for GenesisConfigBuilder {
|
||||
}
|
||||
|
||||
impl GenesisConfigBuilder {
|
||||
fn build(self) -> crate::mock::MockGenesisConfig {
|
||||
pub(super) fn build(self) -> crate::mock::MockGenesisConfig {
|
||||
let mut genesis = default_genesis_config();
|
||||
let config = &mut genesis.configuration.config;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user