Skip to content

Feature: Extend Defer Queue #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
apopiak merged 15 commits into from
Oct 13, 2023
Merged

Feature: Extend Defer Queue #4

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
6cd5993
suspension also suspsends deferred execution
apopiak Sep 7, 2023
35e75bf
implement new deferred queue concept allowing many more messages per …
apopiak Sep 12, 2023
74e2ad4
improve benchmarking to use worst case
apopiak Sep 15, 2023
adfc423
formatting
apopiak Sep 15, 2023
9f80070
add another assert to benchmark verify
apopiak Sep 15, 2023
a677138
add benchmark for placing a message in the deferred queue
apopiak Sep 15, 2023
36f2a40
add xcmp queue config changes to rococo parachain
apopiak Sep 19, 2023
d971df0
fix more build issues with weights and config
apopiak Sep 19, 2023
4bb38c8
fix build
apopiak Sep 19, 2023
e099718
check in rust toolchain file
apopiak Sep 19, 2023
11e30c2
update weights in xcmp pallet
apopiak Oct 3, 2023
46a21b6
update parachain weights
apopiak Oct 3, 2023
2ae6c05
use new benchmark weights
apopiak Oct 3, 2023
0f24a0a
add separate suspension flag specific to deferred queue
apopiak Oct 3, 2023
fe8b340
implement deferral of all messages with flag
apopiak Oct 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
update parachain weights
  • Loading branch information
@apopiak
apopiak committed Oct 3, 2023
commit 46a21b66e91f70480d2eacb98b959d1e00307cfd
110 changes: 61 additions & 49 deletions parachains/runtimes/assets/statemine/src/weights/cumulus_pallet_xcmp_queue.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2021 Parity Technologies (UK) Ltd.
// Copyright 2022 Parity Technologies (UK) Ltd.
// This file is part of Cumulus.

// Cumulus is free software: you can redistribute it and/or modify
Expand All @@ -14,28 +14,28 @@
// You should have received a copy of the GNU General Public License
// along with Cumulus. If not, see <http://www.gnu.org/licenses/>.


//! Autogenerated weights for `cumulus_pallet_xcmp_queue`
//!
//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
//! DATE: 2023-02-27, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
//! WORST CASE MAP SIZE: `1000000`
//! HOSTNAME: `runner-9fxy16xz-project-238-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("statemine-dev"), DB CACHE: 1024
//! DATE: 2023-09-19, STEPS: `20`, REPEAT: 40, LOW RANGE: `[]`, HIGH RANGE: `[]`
//! HOSTNAME: `bench-bot`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz`
//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("westmint-dev"), DB CACHE: 1024

// Executed Command:
// ./artifacts/polkadot-parachain
// target/release/polkadot-parachain
// benchmark
// pallet
// --chain=statemine-dev
// --chain=westmint-dev
// --steps=20
// --repeat=40
// --execution=wasm
// --wasm-execution=compiled
// --heap-pages=4096
// --template=templates/xcm-bench-template.hbs
// --pallet=cumulus_pallet_xcmp_queue
// --output=weights.rs
// --extrinsic=*
// --steps=50
// --repeat=20
// --json
// --header=./file_header.txt
// --output=./parachains/runtimes/assets/statemine/src/weights/cumulus_pallet_xcmp_queue.rs

#![cfg_attr(rustfmt, rustfmt_skip)]
#![allow(unused_parens)]
Expand All @@ -44,53 +44,65 @@
use frame_support::{traits::Get, weights::Weight};
use sp_std::marker::PhantomData;

/// Weight functions for `cumulus_pallet_xcmp_queue`.
/// Weights for `cumulus_pallet_xcmp_queue`.
pub struct WeightInfo<T>(PhantomData<T>);
impl<T: frame_system::Config> cumulus_pallet_xcmp_queue::WeightInfo for WeightInfo<T> {
/// Storage: XcmpQueue QueueConfig (r:1 w:1)
/// Proof Skipped: XcmpQueue QueueConfig (max_values: Some(1), max_size: None, mode: Measured)
fn set_config_with_u32() -> Weight {
// Proof Size summary in bytes:
// Measured: `76`
// Estimated: `571`
// Minimum execution time: 4_840 nanoseconds.
Weight::from_parts(5_169_000, 571)
.saturating_add(T::DbWeight::get().reads(1))
.saturating_add(T::DbWeight::get().writes(1))
impl<T: frame_system::Config> WeightInfo<T> {
// Storage: XcmpQueue QueueConfig (r:1 w:1)
// Proof Skipped: XcmpQueue QueueConfig (max_values: Some(1), max_size: None, mode: Measured)
pub(crate) fn set_config_with_u32() -> Weight {
Weight::from_ref_time(8_036_000 as u64)
.saturating_add(T::DbWeight::get().reads(1 as u64))
.saturating_add(T::DbWeight::get().writes(1 as u64))
}
/// Storage: XcmpQueue QueueConfig (r:1 w:1)
/// Proof Skipped: XcmpQueue QueueConfig (max_values: Some(1), max_size: None, mode: Measured)
fn set_config_with_weight() -> Weight {
// Proof Size summary in bytes:
// Measured: `76`
// Estimated: `571`
// Minimum execution time: 4_743 nanoseconds.
Weight::from_parts(5_184_000, 571)
.saturating_add(T::DbWeight::get().reads(1))
.saturating_add(T::DbWeight::get().writes(1))
// Storage: XcmpQueue QueueConfig (r:1 w:1)
// Proof Skipped: XcmpQueue QueueConfig (max_values: Some(1), max_size: None, mode: Measured)
pub(crate) fn set_config_with_weight() -> Weight {
Weight::from_ref_time(8_038_000 as u64)
.saturating_add(T::DbWeight::get().reads(1 as u64))
.saturating_add(T::DbWeight::get().writes(1 as u64))
}
// Storage: ParachainSystem ValidationData (r:1 w:0)
// Proof Skipped: ParachainSystem ValidationData (max_values: Some(1), max_size: None, mode: Measured)
// Storage: XcmpQueue QueueConfig (r:1 w:0)
// Proof Skipped: XcmpQueue QueueConfig (max_values: Some(1), max_size: None, mode: Measured)
// Storage: XcmpQueue DeferredXcmMessages (r:1 w:1)
// Proof Skipped: XcmpQueue DeferredXcmMessages (max_values: None, max_size: None, mode: Measured)
// Storage: XcmpQueue QueueSuspended (r:1 w:0)
// Proof Skipped: XcmpQueue QueueSuspended (max_values: Some(1), max_size: None, mode: Measured)
// Storage: XcmpQueue DeferredIndices (r:1 w:1)
// Proof Skipped: XcmpQueue DeferredIndices (max_values: None, max_size: None, mode: Measured)
// Storage: XcmpQueue DeferredMessageBuckets (r:1 w:1)
// Proof Skipped: XcmpQueue DeferredMessageBuckets (max_values: None, max_size: None, mode: Measured)
// Storage: XcmpQueue CounterForOverweight (r:1 w:1)
// Proof: XcmpQueue CounterForOverweight (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
// Storage: XcmpQueue OverweightCount (r:1 w:1)
// Proof Skipped: XcmpQueue OverweightCount (max_values: Some(1), max_size: None, mode: Measured)
// Storage: XcmpQueue Overweight (r:100 w:100)
// Proof Skipped: XcmpQueue Overweight (max_values: None, max_size: None, mode: Measured)
fn service_deferred() -> Weight {
// Minimum execution time: 90_934_683 nanoseconds.
Weight::from_ref_time(91_491_151_000)
.saturating_add(T::DbWeight::get().reads(104))
.saturating_add(T::DbWeight::get().writes(103))
pub(crate) fn service_deferred() -> Weight {
Weight::from_ref_time(221_105_465_000 as u64)
.saturating_add(T::DbWeight::get().reads(107 as u64))
.saturating_add(T::DbWeight::get().writes(104 as u64))
}
// Storage: XcmpQueue DeferredMessageBuckets (r:1 w:1)
// Proof Skipped: XcmpQueue DeferredMessageBuckets (max_values: None, max_size: None, mode: Measured)
pub(crate) fn discard_deferred_bucket() -> Weight {
Weight::from_ref_time(149_864_999_000 as u64)
.saturating_add(T::DbWeight::get().reads(1 as u64))
.saturating_add(T::DbWeight::get().writes(1 as u64))
}
// Storage: XcmpQueue DeferredMessageBuckets (r:1 w:1)
// Proof Skipped: XcmpQueue DeferredMessageBuckets (max_values: None, max_size: None, mode: Measured)
pub(crate) fn discard_deferred_individual() -> Weight {
Weight::from_ref_time(161_216_156_000 as u64)
.saturating_add(T::DbWeight::get().reads(1 as u64))
.saturating_add(T::DbWeight::get().writes(1 as u64))
}
// Storage: XcmpQueue DeferredXcmMessages (r:1 w:1)
// Proof Skipped: XcmpQueue DeferredXcmMessages (max_values: None, max_size: None, mode: Measured)
fn discard_deferred() -> Weight {
// Minimum execution time: 62_131_073 nanoseconds.
Weight::from_ref_time(63_092_826_000)
.saturating_add(T::DbWeight::get().reads(1))
.saturating_add(T::DbWeight::get().writes(1))
// Storage: XcmpQueue DeferredIndices (r:1 w:1)
// Proof Skipped: XcmpQueue DeferredIndices (max_values: None, max_size: None, mode: Measured)
// Storage: XcmpQueue DeferredMessageBuckets (r:1 w:1)
// Proof Skipped: XcmpQueue DeferredMessageBuckets (max_values: None, max_size: None, mode: Measured)
pub(crate) fn try_place_in_deferred_queue() -> Weight {
Weight::from_ref_time(510_298_000 as u64)
.saturating_add(T::DbWeight::get().reads(2 as u64))
.saturating_add(T::DbWeight::get().writes(2 as u64))
}
}
}
110 changes: 61 additions & 49 deletions parachains/runtimes/assets/statemint/src/weights/cumulus_pallet_xcmp_queue.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2021 Parity Technologies (UK) Ltd.
// Copyright 2022 Parity Technologies (UK) Ltd.
// This file is part of Cumulus.

// Cumulus is free software: you can redistribute it and/or modify
Expand All @@ -14,28 +14,28 @@
// You should have received a copy of the GNU General Public License
// along with Cumulus. If not, see <http://www.gnu.org/licenses/>.


//! Autogenerated weights for `cumulus_pallet_xcmp_queue`
//!
//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
//! DATE: 2023-02-27, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
//! WORST CASE MAP SIZE: `1000000`
//! HOSTNAME: `runner-9fxy16xz-project-238-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("statemint-dev"), DB CACHE: 1024
//! DATE: 2023-09-19, STEPS: `20`, REPEAT: 40, LOW RANGE: `[]`, HIGH RANGE: `[]`
//! HOSTNAME: `bench-bot`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz`
//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("westmint-dev"), DB CACHE: 1024

// Executed Command:
// ./artifacts/polkadot-parachain
// target/release/polkadot-parachain
// benchmark
// pallet
// --chain=statemint-dev
// --chain=westmint-dev
// --steps=20
// --repeat=40
// --execution=wasm
// --wasm-execution=compiled
// --heap-pages=4096
// --template=templates/xcm-bench-template.hbs
// --pallet=cumulus_pallet_xcmp_queue
// --output=weights.rs
// --extrinsic=*
// --steps=50
// --repeat=20
// --json
// --header=./file_header.txt
// --output=./parachains/runtimes/assets/statemint/src/weights/cumulus_pallet_xcmp_queue.rs

#![cfg_attr(rustfmt, rustfmt_skip)]
#![allow(unused_parens)]
Expand All @@ -44,53 +44,65 @@
use frame_support::{traits::Get, weights::Weight};
use sp_std::marker::PhantomData;

/// Weight functions for `cumulus_pallet_xcmp_queue`.
/// Weights for `cumulus_pallet_xcmp_queue`.
pub struct WeightInfo<T>(PhantomData<T>);
impl<T: frame_system::Config> cumulus_pallet_xcmp_queue::WeightInfo for WeightInfo<T> {
/// Storage: XcmpQueue QueueConfig (r:1 w:1)
/// Proof Skipped: XcmpQueue QueueConfig (max_values: Some(1), max_size: None, mode: Measured)
fn set_config_with_u32() -> Weight {
// Proof Size summary in bytes:
// Measured: `76`
// Estimated: `571`
// Minimum execution time: 4_700 nanoseconds.
Weight::from_parts(4_964_000, 571)
.saturating_add(T::DbWeight::get().reads(1))
.saturating_add(T::DbWeight::get().writes(1))
impl<T: frame_system::Config> WeightInfo<T> {
// Storage: XcmpQueue QueueConfig (r:1 w:1)
// Proof Skipped: XcmpQueue QueueConfig (max_values: Some(1), max_size: None, mode: Measured)
pub(crate) fn set_config_with_u32() -> Weight {
Weight::from_ref_time(8_036_000 as u64)
.saturating_add(T::DbWeight::get().reads(1 as u64))
.saturating_add(T::DbWeight::get().writes(1 as u64))
}
/// Storage: XcmpQueue QueueConfig (r:1 w:1)
/// Proof Skipped: XcmpQueue QueueConfig (max_values: Some(1), max_size: None, mode: Measured)
fn set_config_with_weight() -> Weight {
// Proof Size summary in bytes:
// Measured: `76`
// Estimated: `571`
// Minimum execution time: 4_769 nanoseconds.
Weight::from_parts(5_131_000, 571)
.saturating_add(T::DbWeight::get().reads(1))
.saturating_add(T::DbWeight::get().writes(1))
// Storage: XcmpQueue QueueConfig (r:1 w:1)
// Proof Skipped: XcmpQueue QueueConfig (max_values: Some(1), max_size: None, mode: Measured)
pub(crate) fn set_config_with_weight() -> Weight {
Weight::from_ref_time(8_038_000 as u64)
.saturating_add(T::DbWeight::get().reads(1 as u64))
.saturating_add(T::DbWeight::get().writes(1 as u64))
}
// Storage: ParachainSystem ValidationData (r:1 w:0)
// Proof Skipped: ParachainSystem ValidationData (max_values: Some(1), max_size: None, mode: Measured)
// Storage: XcmpQueue QueueConfig (r:1 w:0)
// Proof Skipped: XcmpQueue QueueConfig (max_values: Some(1), max_size: None, mode: Measured)
// Storage: XcmpQueue DeferredXcmMessages (r:1 w:1)
// Proof Skipped: XcmpQueue DeferredXcmMessages (max_values: None, max_size: None, mode: Measured)
// Storage: XcmpQueue QueueSuspended (r:1 w:0)
// Proof Skipped: XcmpQueue QueueSuspended (max_values: Some(1), max_size: None, mode: Measured)
// Storage: XcmpQueue DeferredIndices (r:1 w:1)
// Proof Skipped: XcmpQueue DeferredIndices (max_values: None, max_size: None, mode: Measured)
// Storage: XcmpQueue DeferredMessageBuckets (r:1 w:1)
// Proof Skipped: XcmpQueue DeferredMessageBuckets (max_values: None, max_size: None, mode: Measured)
// Storage: XcmpQueue CounterForOverweight (r:1 w:1)
// Proof: XcmpQueue CounterForOverweight (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
// Storage: XcmpQueue OverweightCount (r:1 w:1)
// Proof Skipped: XcmpQueue OverweightCount (max_values: Some(1), max_size: None, mode: Measured)
// Storage: XcmpQueue Overweight (r:100 w:100)
// Proof Skipped: XcmpQueue Overweight (max_values: None, max_size: None, mode: Measured)
fn service_deferred() -> Weight {
// Minimum execution time: 90_934_683 nanoseconds.
Weight::from_ref_time(91_491_151_000)
.saturating_add(T::DbWeight::get().reads(104))
.saturating_add(T::DbWeight::get().writes(103))
pub(crate) fn service_deferred() -> Weight {
Weight::from_ref_time(221_105_465_000 as u64)
.saturating_add(T::DbWeight::get().reads(107 as u64))
.saturating_add(T::DbWeight::get().writes(104 as u64))
}
// Storage: XcmpQueue DeferredMessageBuckets (r:1 w:1)
// Proof Skipped: XcmpQueue DeferredMessageBuckets (max_values: None, max_size: None, mode: Measured)
pub(crate) fn discard_deferred_bucket() -> Weight {
Weight::from_ref_time(149_864_999_000 as u64)
.saturating_add(T::DbWeight::get().reads(1 as u64))
.saturating_add(T::DbWeight::get().writes(1 as u64))
}
// Storage: XcmpQueue DeferredMessageBuckets (r:1 w:1)
// Proof Skipped: XcmpQueue DeferredMessageBuckets (max_values: None, max_size: None, mode: Measured)
pub(crate) fn discard_deferred_individual() -> Weight {
Weight::from_ref_time(161_216_156_000 as u64)
.saturating_add(T::DbWeight::get().reads(1 as u64))
.saturating_add(T::DbWeight::get().writes(1 as u64))
}
// Storage: XcmpQueue DeferredXcmMessages (r:1 w:1)
// Proof Skipped: XcmpQueue DeferredXcmMessages (max_values: None, max_size: None, mode: Measured)
fn discard_deferred() -> Weight {
// Minimum execution time: 62_131_073 nanoseconds.
Weight::from_ref_time(63_092_826_000)
.saturating_add(T::DbWeight::get().reads(1))
.saturating_add(T::DbWeight::get().writes(1))
// Storage: XcmpQueue DeferredIndices (r:1 w:1)
// Proof Skipped: XcmpQueue DeferredIndices (max_values: None, max_size: None, mode: Measured)
// Storage: XcmpQueue DeferredMessageBuckets (r:1 w:1)
// Proof Skipped: XcmpQueue DeferredMessageBuckets (max_values: None, max_size: None, mode: Measured)
pub(crate) fn try_place_in_deferred_queue() -> Weight {
Weight::from_ref_time(510_298_000 as u64)
.saturating_add(T::DbWeight::get().reads(2 as u64))
.saturating_add(T::DbWeight::get().writes(2 as u64))
}
}
}
Loading