[AHM] Report the weights of epmb pallet to expose kusama and polkadot weights

substrate/frame/election-provider-multi-block/src/lib.rs

@@ -247,7 +247,7 @@ pub mod weights;
 
 pub use pallet::*;
 pub use types::*;
-pub use weights::measured::pallet_election_provider_multi_block::WeightInfo;
+pub use weights::traits::pallet_election_provider_multi_block::WeightInfo;
 
 /// A fallback implementation that transitions the pallet to the emergency phase.
 pub struct InitiateEmergencyPhase<T>(sp_std::marker::PhantomData<T>);

substrate/frame/election-provider-multi-block/src/signed/mod.rs

@@ -83,7 +83,7 @@ use sp_runtime::{traits::Saturating, Perbill};
 use sp_std::prelude::*;
 
 /// Explore all weights
-pub use crate::weights::measured::pallet_election_provider_multi_block_signed::*;
+pub use crate::weights::traits::pallet_election_provider_multi_block_signed::*;
 /// Exports of this pallet
 pub use pallet::*;
 
@@ -232,7 +232,7 @@ impl<Balance: From<u32> + Saturating, G: Get<Balance>> CalculatePageDeposit<Bala
 
 #[frame_support::pallet]
 pub mod pallet {
-	use super::{WeightInfo, *};
+	use super::*;
 
 	#[pallet::config]
 	#[pallet::disable_frame_system_supertrait_check]

substrate/frame/election-provider-multi-block/src/template.hbs

@@ -0,0 +1,88 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+{{header}}
+//! Autogenerated weights for `{{pallet}}`
+//!
+//! (THIS IS A SPECIAL TEMPLATE FOR `election-provider-multi-block` PALLET)
+//!
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION {{version}}
+//! DATE: {{date}}, STEPS: `{{cmd.steps}}`, REPEAT: `{{cmd.repeat}}`, LOW RANGE: `{{cmd.lowest_range_values}}`, HIGH RANGE: `{{cmd.highest_range_values}}`
+//! WORST CASE MAP SIZE: `{{cmd.worst_case_map_values}}`
+//! HOSTNAME: `{{hostname}}`, CPU: `{{cpuname}}`
+//! WASM-EXECUTION: `{{cmd.wasm_execution}}`, CHAIN: `{{cmd.chain}}`, DB CACHE: `{{cmd.db_cache}}`
+
+// Executed Command:
+{{#each args as |arg|}}
+// {{arg}}
+{{/each}}
+
+#![cfg_attr(rustfmt, rustfmt_skip)]
+#![allow(unused_parens)]
+#![allow(unused_imports)]
+#![allow(missing_docs)]
+#![allow(dead_code)]
+
+use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
+use core::marker::PhantomData;
+
+/// Weights for `{{pallet}}`.
+pub struct WeightInfo<T>(PhantomData<T>);
+{{#if (or (eq pallet "frame_system") (eq pallet "frame_system_extensions"))}}
+impl<T: crate::Config> WeightInfo for WeightInfo<T> {
+{{else}}
+impl<T: frame_system::Config> crate::weights::traits::{{pallet}}::WeightInfo for WeightInfo<T> {
+{{/if}}
+	{{#each benchmarks as |benchmark|}}
+	{{#each benchmark.comments as |comment|}}
+	/// {{comment}}
+	{{/each}}
+	{{#each benchmark.component_ranges as |range|}}
+	/// The range of component `{{range.name}}` is `[{{range.min}}, {{range.max}}]`.
+	{{/each}}
+	fn {{benchmark.name~}}
+	(
+		{{~#each benchmark.components as |c| ~}}
+		{{~#if (not c.is_used)}}_{{/if}}{{c.name}}: u32, {{/each~}}
+	) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `{{benchmark.base_recorded_proof_size}}{{#each benchmark.component_recorded_proof_size as |cp|}} + {{cp.name}} * ({{cp.slope}} ±{{underscore cp.error}}){{/each}}`
+		//  Estimated: `{{benchmark.base_calculated_proof_size}}{{#each benchmark.component_calculated_proof_size as |cp|}} + {{cp.name}} * ({{cp.slope}} ±{{underscore cp.error}}){{/each}}`
+		// Minimum execution time: {{underscore benchmark.min_execution_time}}_000 picoseconds.
+		Weight::from_parts({{underscore benchmark.base_weight}}, {{benchmark.base_calculated_proof_size}})
+			{{#each benchmark.component_weight as |cw|}}
+			// Standard Error: {{underscore cw.error}}
+			.saturating_add(Weight::from_parts({{underscore cw.slope}}, 0).saturating_mul({{cw.name}}.into()))
+			{{/each}}
+			{{#if (ne benchmark.base_reads "0")}}
+			.saturating_add(T::DbWeight::get().reads({{benchmark.base_reads}}_u64))
+			{{/if}}
+			{{#each benchmark.component_reads as |cr|}}
+			.saturating_add(T::DbWeight::get().reads(({{cr.slope}}_u64).saturating_mul({{cr.name}}.into())))
+			{{/each}}
+			{{#if (ne benchmark.base_writes "0")}}
+			.saturating_add(T::DbWeight::get().writes({{benchmark.base_writes}}_u64))
+			{{/if}}
+			{{#each benchmark.component_writes as |cw|}}
+			.saturating_add(T::DbWeight::get().writes(({{cw.slope}}_u64).saturating_mul({{cw.name}}.into())))
+			{{/each}}
+			{{#each benchmark.component_calculated_proof_size as |cp|}}
+			.saturating_add(Weight::from_parts(0, {{cp.slope}}).saturating_mul({{cp.name}}.into()))
+			{{/each}}
+	}
+	{{/each}}
+}

substrate/frame/election-provider-multi-block/src/unsigned/mod.rs

@@ -70,7 +70,7 @@
 //! the signed process is bullet-proof, we can be okay with the status quo.
 
 /// Export weights
-pub use crate::weights::measured::pallet_election_provider_multi_block_unsigned::*;
+pub use crate::weights::traits::pallet_election_provider_multi_block_unsigned::*;
 /// Exports of this pallet
 pub use pallet::*;
 #[cfg(feature = "runtime-benchmarks")]

substrate/frame/election-provider-multi-block/src/verifier/impls.rs

@@ -47,7 +47,7 @@ pub(crate) type SupportsOfVerifier<V> = frame_election_provider_support::Bounded
 	<V as Verifier>::MaxBackersPerWinner,
 >;
 
-pub(crate) type VerifierWeightsOf<T> = <T as Config>::WeightInfo;
+pub(crate) type VerifierWeightsOf<T> = <T as super::Config>::WeightInfo;
 
 /// The status of this pallet.
 #[derive(

substrate/frame/election-provider-multi-block/src/verifier/mod.rs

@@ -74,7 +74,7 @@ mod impls;
 mod tests;
 
 // internal imports
-pub use crate::weights::measured::pallet_election_provider_multi_block_verifier::*;
+pub use crate::weights::traits::pallet_election_provider_multi_block_verifier::*;
 
 use frame_election_provider_support::PageIndex;
 use impls::SupportsOfVerifier;

substrate/frame/election-provider-multi-block/src/weights/comp_weights.sh

@@ -1,28 +1,21 @@
 
 function display {
+  echo "comparing $1 -> $2"
   subweight compare files \
     --method asymptotic \
     --new $1 \
     --old $2 \
     --unit proof --verbose --threshold 0
 
-  # subweight compare files \
-  #   --method asymptotic \
-  #   --new $1 \
-  #   --old $2 \
-  #   --unit time --verbose --threshold 0
+  subweight compare files \
+    --method asymptotic \
+    --new $1 \
+    --old $2 \
+    --unit time --verbose --threshold 0
 }
 
 ## Polkadot
-
-echo "#### new: polkadot/pallet_election_provider_multi_block.rs old: kusama"
-display "polkadot/measured/pallet_election_provider_multi_block.rs" "kusama/measured/pallet_election_provider_multi_block.rs"
-
-echo "#### new: polkadot/pallet_election_provider_multi_block_signed.rs old: kusama"
-display "polkadot/measured/pallet_election_provider_multi_block_signed.rs" "kusama/measured/pallet_election_provider_multi_block_signed.rs"
-
-echo "#### new: polkadot/pallet_election_provider_multi_block_unsigned.rs old: kusama"
-display "polkadot/measured/pallet_election_provider_multi_block_unsigned.rs" "kusama/measured/pallet_election_provider_multi_block_unsigned.rs"
-
-echo "#### new: polkadot/pallet_election_provider_multi_block_verifier.rs old: kusama"
-display "polkadot/measured/pallet_election_provider_multi_block_verifier.rs" "kusama/measured/pallet_election_provider_multi_block_verifier.rs"
+display "./pallet_election_provider_multi_block_dot_size.rs" "./pallet_election_provider_multi_block_ksm_size.rs"
+display "./pallet_election_provider_multi_block_signed_dot_size.rs" "./pallet_election_provider_multi_block_signed_ksm_size.rs"
+display "./pallet_election_provider_multi_block_unsigned_dot_size.rs" "./pallet_election_provider_multi_block_unsigned_ksm_size.rs"
+display "./pallet_election_provider_multi_block_verifier_dot_size.rs" "./pallet_election_provider_multi_block_verifier_ksm_size.rs"

substrate/frame/election-provider-multi-block/src/weights/display_weights.sh

@@ -1,5 +1,6 @@
 
 function display {
+  echo "displaying $1"
   subweight compare files \
     --method asymptotic \
     --new $1 \
@@ -8,39 +9,24 @@ function display {
     --verbose \
     --threshold 0
 
-  # subweight compare files \
-  #   --method asymptotic \
-  #   --new $1 \
-  #   --old $1 \
-  #   --unit time \
-  #   --verbose \
-  #   --threshold 0
+  subweight compare files \
+    --method asymptotic \
+    --new $1 \
+    --old $1 \
+    --unit time \
+    --verbose \
+    --threshold 0
 }
 
 ## Polkadot
 
-echo "#### polkadot/pallet_election_provider_multi_block.rs"
-display "polkadot/measured/pallet_election_provider_multi_block.rs"
-
-echo "#### polkadot/pallet_election_provider_multi_block_signed.rs"
-display "polkadot/measured/pallet_election_provider_multi_block_signed.rs"
-
-echo "#### polkadot/pallet_election_provider_multi_block_unsigned.rs"
-display "polkadot/measured/pallet_election_provider_multi_block_unsigned.rs"
-
-echo "#### polkadot/pallet_election_provider_multi_block_verifier.rs"
-display "polkadot/measured/pallet_election_provider_multi_block_verifier.rs"
+display "pallet_election_provider_multi_block_dot_size.rs"
+display "pallet_election_provider_multi_block_signed_dot_size.rs"
+display "pallet_election_provider_multi_block_unsigned_dot_size.rs"
+display "pallet_election_provider_multi_block_verifier_dot_size.rs"
 
 ## Kusama
-
-echo "#### kusama/pallet_election_provider_multi_block.rs"
-display "kusama/measured/pallet_election_provider_multi_block.rs"
-
-echo "#### kusama/pallet_election_provider_multi_block_signed.rs"
-display "kusama/measured/pallet_election_provider_multi_block_signed.rs"
-
-echo "#### kusama/pallet_election_provider_multi_block_unsigned.rs"
-display "kusama/measured/pallet_election_provider_multi_block_unsigned.rs"
-
-echo "#### kusama/pallet_election_provider_multi_block_verifier.rs"
-display "kusama/measured/pallet_election_provider_multi_block_verifier.rs"
+display "pallet_election_provider_multi_block_ksm_size.rs"
+display "pallet_election_provider_multi_block_signed_ksm_size.rs"
+display "pallet_election_provider_multi_block_unsigned_ksm_size.rs"
+display "pallet_election_provider_multi_block_verifier_ksm_size.rs"