Skip to content
This repository has been archived by the owner on Nov 15, 2023. It is now read-only.

Companion for Weight v1.5 #1581

Merged
merged 23 commits into from
Aug 31, 2022
Merged

Companion for Weight v1.5 #1581

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
faddaac
cargo test -p cumulus-primitives-utility
shawntabrizi Aug 30, 2022
07d4973
cargo test -p cumulus-pallet-xcmp-queue
shawntabrizi Aug 30, 2022
4ad30ed
cargo test -p cumulus-pallet-xcm
shawntabrizi Aug 30, 2022
8ae0f99
cargo test -p cumulus-pallet-dmp-queue
shawntabrizi Aug 30, 2022
5837876
cargo test -p pallet-template
shawntabrizi Aug 30, 2022
b22d2f1
cargo test -p cumulus-test-runtime
shawntabrizi Aug 30, 2022
9b93e21
fix weights
shawntabrizi Aug 30, 2022
792f860
fix more weights
shawntabrizi Aug 30, 2022
0a3c84a
cargo test -p parachains-common
shawntabrizi Aug 30, 2022
ff009db
cargo test -p parachain-template-runtime
shawntabrizi Aug 30, 2022
0626153
fix weights import
shawntabrizi Aug 30, 2022
b5a952b
cargo test -p collectives-polkadot-runtime
shawntabrizi Aug 30, 2022
18355d7
cargo test -p contracts-rococo-runtime
shawntabrizi Aug 30, 2022
d520863
more
shawntabrizi Aug 30, 2022
88f1f5f
unused
shawntabrizi Aug 30, 2022
0eda911
fixes
shawntabrizi Aug 30, 2022
38cc726
Update benchmarking.rs
shawntabrizi Aug 30, 2022
15172b3
Update lib.rs
shawntabrizi Aug 30, 2022
dc62ed3
Update lib.rs
shawntabrizi Aug 31, 2022
8f29d35
fix
shawntabrizi Aug 31, 2022
aa40144
fix bug in conversion
shawntabrizi Aug 31, 2022
1fac5c1
Merge branch 'master' into shawntabrizi-weight-v1.5
shawntabrizi Aug 31, 2022
0751255
update lockfile for {"polkadot", "substrate"}
Aug 31, 2022
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
497 changes: 249 additions & 248 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

146 changes: 99 additions & 47 deletions pallets/collator-selection/src/weights.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

use frame_support::{
traits::Get,
weights::{constants::RocksDbWeight, Weight},
weights::{constants::RocksDbWeight, RefTimeWeight, Weight},
};
use sp_std::marker::PhantomData;

Expand All @@ -39,91 +39,143 @@ pub trait WeightInfo {
pub struct SubstrateWeight<T>(PhantomData<T>);
impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
fn set_invulnerables(b: u32) -> Weight {
(18_563_000 as Weight)
Weight::from_ref_time(18_563_000 as RefTimeWeight)
// Standard Error: 0
.saturating_add((68_000 as Weight).saturating_mul(b as Weight))
.saturating_add(T::DbWeight::get().writes(1 as Weight))
.saturating_add(
Weight::from_ref_time(68_000 as RefTimeWeight)
.scalar_saturating_mul(b as RefTimeWeight),
)
.saturating_add(T::DbWeight::get().writes(1 as RefTimeWeight))
}
fn set_desired_candidates() -> Weight {
(16_363_000 as Weight).saturating_add(T::DbWeight::get().writes(1 as Weight))
Weight::from_ref_time(16_363_000 as RefTimeWeight)
.saturating_add(T::DbWeight::get().writes(1 as RefTimeWeight))
}
fn set_candidacy_bond() -> Weight {
(16_840_000 as Weight).saturating_add(T::DbWeight::get().writes(1 as Weight))
Weight::from_ref_time(16_840_000 as RefTimeWeight)
.saturating_add(T::DbWeight::get().writes(1 as RefTimeWeight))
}
fn register_as_candidate(c: u32) -> Weight {
(71_196_000 as Weight)
Weight::from_ref_time(71_196_000 as RefTimeWeight)
// Standard Error: 0
.saturating_add((198_000 as Weight).saturating_mul(c as Weight))
.saturating_add(T::DbWeight::get().reads(4 as Weight))
.saturating_add(T::DbWeight::get().writes(2 as Weight))
.saturating_add(
Weight::from_ref_time(198_000 as RefTimeWeight)
.scalar_saturating_mul(c as RefTimeWeight),
)
.saturating_add(T::DbWeight::get().reads(4 as RefTimeWeight))
.saturating_add(T::DbWeight::get().writes(2 as RefTimeWeight))
}
fn leave_intent(c: u32) -> Weight {
(55_336_000 as Weight)
Weight::from_ref_time(55_336_000 as RefTimeWeight)
// Standard Error: 0
.saturating_add((151_000 as Weight).saturating_mul(c as Weight))
.saturating_add(T::DbWeight::get().reads(1 as Weight))
.saturating_add(T::DbWeight::get().writes(2 as Weight))
.saturating_add(
Weight::from_ref_time(151_000 as RefTimeWeight)
.scalar_saturating_mul(c as RefTimeWeight),
)
.saturating_add(T::DbWeight::get().reads(1 as RefTimeWeight))
.saturating_add(T::DbWeight::get().writes(2 as RefTimeWeight))
}
fn note_author() -> Weight {
(71_461_000 as Weight)
.saturating_add(T::DbWeight::get().reads(3 as Weight))
.saturating_add(T::DbWeight::get().writes(4 as Weight))
Weight::from_ref_time(71_461_000 as RefTimeWeight)
.saturating_add(T::DbWeight::get().reads(3 as RefTimeWeight))
.saturating_add(T::DbWeight::get().writes(4 as RefTimeWeight))
}
fn new_session(r: u32, c: u32) -> Weight {
(0 as Weight)
Weight::from_ref_time(0 as RefTimeWeight)
// Standard Error: 1_010_000
.saturating_add((109_961_000 as Weight).saturating_mul(r as Weight))
.saturating_add(
Weight::from_ref_time(109_961_000 as RefTimeWeight)
.scalar_saturating_mul(r as RefTimeWeight),
)
// Standard Error: 1_010_000
.saturating_add((151_952_000 as Weight).saturating_mul(c as Weight))
.saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(r as Weight)))
.saturating_add(T::DbWeight::get().reads((2 as Weight).saturating_mul(c as Weight)))
.saturating_add(T::DbWeight::get().writes((2 as Weight).saturating_mul(r as Weight)))
.saturating_add(T::DbWeight::get().writes((2 as Weight).saturating_mul(c as Weight)))
.saturating_add(
Weight::from_ref_time(151_952_000 as RefTimeWeight)
.scalar_saturating_mul(c as RefTimeWeight),
)
.saturating_add(
T::DbWeight::get().reads((1 as RefTimeWeight).saturating_mul(r as RefTimeWeight)),
)
.saturating_add(
T::DbWeight::get().reads((2 as RefTimeWeight).saturating_mul(c as RefTimeWeight)),
Copy link
Member

@ggwpez ggwpez Aug 31, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We could think about a DLS for the weight definitions in the long run.
This is starting to look really unreadable - at least for humans.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i think making the weight file structure into a rust macro is not such a bad idea

)
.saturating_add(
T::DbWeight::get().writes((2 as RefTimeWeight).saturating_mul(r as RefTimeWeight)),
)
.saturating_add(
T::DbWeight::get().writes((2 as RefTimeWeight).saturating_mul(c as RefTimeWeight)),
)
}
}

// For backwards compatibility and tests
impl WeightInfo for () {
fn set_invulnerables(b: u32) -> Weight {
(18_563_000 as Weight)
Weight::from_ref_time(18_563_000 as RefTimeWeight)
// Standard Error: 0
.saturating_add((68_000 as Weight).saturating_mul(b as Weight))
.saturating_add(RocksDbWeight::get().writes(1 as Weight))
.saturating_add(
Weight::from_ref_time(68_000 as RefTimeWeight)
.scalar_saturating_mul(b as RefTimeWeight),
)
.saturating_add(RocksDbWeight::get().writes(1 as RefTimeWeight))
}
fn set_desired_candidates() -> Weight {
(16_363_000 as Weight).saturating_add(RocksDbWeight::get().writes(1 as Weight))
Weight::from_ref_time(16_363_000 as RefTimeWeight)
.saturating_add(RocksDbWeight::get().writes(1 as RefTimeWeight))
}
fn set_candidacy_bond() -> Weight {
(16_840_000 as Weight).saturating_add(RocksDbWeight::get().writes(1 as Weight))
Weight::from_ref_time(16_840_000 as RefTimeWeight)
.saturating_add(RocksDbWeight::get().writes(1 as RefTimeWeight))
}
fn register_as_candidate(c: u32) -> Weight {
(71_196_000 as Weight)
Weight::from_ref_time(71_196_000 as RefTimeWeight)
// Standard Error: 0
.saturating_add((198_000 as Weight).saturating_mul(c as Weight))
.saturating_add(RocksDbWeight::get().reads(4 as Weight))
.saturating_add(RocksDbWeight::get().writes(2 as Weight))
.saturating_add(
Weight::from_ref_time(198_000 as RefTimeWeight)
.scalar_saturating_mul(c as RefTimeWeight),
)
.saturating_add(RocksDbWeight::get().reads(4 as RefTimeWeight))
.saturating_add(RocksDbWeight::get().writes(2 as RefTimeWeight))
}
fn leave_intent(c: u32) -> Weight {
(55_336_000 as Weight)
Weight::from_ref_time(55_336_000 as RefTimeWeight)
// Standard Error: 0
.saturating_add((151_000 as Weight).saturating_mul(c as Weight))
.saturating_add(RocksDbWeight::get().reads(1 as Weight))
.saturating_add(RocksDbWeight::get().writes(2 as Weight))
.saturating_add(
Weight::from_ref_time(151_000 as RefTimeWeight)
.scalar_saturating_mul(c as RefTimeWeight),
)
.saturating_add(RocksDbWeight::get().reads(1 as RefTimeWeight))
.saturating_add(RocksDbWeight::get().writes(2 as RefTimeWeight))
}
fn note_author() -> Weight {
(71_461_000 as Weight)
.saturating_add(RocksDbWeight::get().reads(3 as Weight))
.saturating_add(RocksDbWeight::get().writes(4 as Weight))
Weight::from_ref_time(71_461_000 as RefTimeWeight)
.saturating_add(RocksDbWeight::get().reads(3 as RefTimeWeight))
.saturating_add(RocksDbWeight::get().writes(4 as RefTimeWeight))
}
fn new_session(r: u32, c: u32) -> Weight {
(0 as Weight)
Weight::from_ref_time(0 as RefTimeWeight)
// Standard Error: 1_010_000
.saturating_add((109_961_000 as Weight).saturating_mul(r as Weight))
.saturating_add(
Weight::from_ref_time(109_961_000 as RefTimeWeight)
.scalar_saturating_mul(r as RefTimeWeight),
)
// Standard Error: 1_010_000
.saturating_add((151_952_000 as Weight).saturating_mul(c as Weight))
.saturating_add(RocksDbWeight::get().reads((1 as Weight).saturating_mul(r as Weight)))
.saturating_add(RocksDbWeight::get().reads((2 as Weight).saturating_mul(c as Weight)))
.saturating_add(RocksDbWeight::get().writes((2 as Weight).saturating_mul(r as Weight)))
.saturating_add(RocksDbWeight::get().writes((2 as Weight).saturating_mul(c as Weight)))
.saturating_add(
Weight::from_ref_time(151_952_000 as RefTimeWeight)
.scalar_saturating_mul(c as RefTimeWeight),
)
.saturating_add(
RocksDbWeight::get().reads((1 as RefTimeWeight).saturating_mul(r as RefTimeWeight)),
)
.saturating_add(
RocksDbWeight::get().reads((2 as RefTimeWeight).saturating_mul(c as RefTimeWeight)),
)
.saturating_add(
RocksDbWeight::get()
.writes((2 as RefTimeWeight).saturating_mul(r as RefTimeWeight)),
)
.saturating_add(
RocksDbWeight::get()
.writes((2 as RefTimeWeight).saturating_mul(c as RefTimeWeight)),
)
}
}
Loading