Skip to content

CI: benchmarking improvement #3310

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
RomarQ merged 8 commits into from
Jun 11, 2025
Merged

CI: benchmarking improvement #3310

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
8f7e437
ci(benchmarks): Unsure the runtimes compile after running the benchmarks
RomarQ Jun 9, 2025
e9be7a5
Merge branch 'master' into rq/ci-improvement
RomarQ Jun 9, 2025
ad04480
fix weight generation
RomarQ Jun 9, 2025
937de56
update bencher release
RomarQ Jun 9, 2025
9d3ce66
Merge branch 'rq/ci-improvement' of github.com:moonbeam-foundation/mo…
RomarQ Jun 9, 2025
8b22f69
revert moonbase weight changes
RomarQ Jun 9, 2025
6a8d22f
clean-up
RomarQ Jun 9, 2025
fd77e1a
update polkadot-sdk pin
RomarQ Jun 10, 2025
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
3 changes: 2 additions & 1 deletion .github/workflows/check-benchmarks.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
- cron: "0 5 * * 3" # Runs every Wednesday at 5:00 AM UTC

env:
FRAME_OMNI_BENCHER_RELEASE_VERSION: polkadot-stable2412
FRAME_OMNI_BENCHER_RELEASE_VERSION: polkadot-stable2503-5

jobs:
set-tags:
Expand Down Expand Up @@ -76,3 +76,4 @@ jobs:
cat benchmarking_errors.txt
exit 1
fi
cargo build -r -p ${{ matrix.runtime }}-runtime
588 changes: 294 additions & 294 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 4 additions & 2 deletions runtime/moonbase/src/governance/councils.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@ impl pallet_collective::Config<TreasuryCouncilInstance> for Runtime {
/// The maximum number of treasury council members.
type MaxMembers = ConstU32<9>;
type DefaultVote = pallet_collective::MoreThanMajorityThenPrimeDefaultVote;
type WeightInfo = moonbase_weights::pallet_collective_treasury_council::WeightInfo<Runtime>;
type WeightInfo =
moonbase_weights::pallet_collective_treasury_council_collective::WeightInfo<Runtime>;
type SetMembersOrigin = referenda::GeneralAdminOrRoot;
type MaxProposalWeight = MaxProposalWeight;
type DisapproveOrigin = FastGeneralAdminOrRoot;
Expand All @@ -60,7 +61,8 @@ impl pallet_collective::Config<OpenTechCommitteeInstance> for Runtime {
/// The maximum number of technical committee members.
type MaxMembers = ConstU32<100>;
type DefaultVote = pallet_collective::MoreThanMajorityThenPrimeDefaultVote;
type WeightInfo = moonbase_weights::pallet_collective_open_tech_committee::WeightInfo<Runtime>;
type WeightInfo =
moonbase_weights::pallet_collective_open_tech_committee_collective::WeightInfo<Runtime>;
type SetMembersOrigin = referenda::GeneralAdminOrRoot;
type MaxProposalWeight = MaxProposalWeight;
type DisapproveOrigin = FastGeneralAdminOrRoot;
Expand Down
10 changes: 2 additions & 8 deletions runtime/moonbase/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1536,12 +1536,6 @@ use moonbeam_runtime_common::deal_with_fees::{

#[cfg(feature = "runtime-benchmarks")]
mod benches {
// TODO: Temporary workaround before upgrading to latest polkadot-sdk - fix https://github.com/paritytech/polkadot-sdk/pull/6435
#[allow(unused_imports)]
use pallet_collective as pallet_collective_treasury_council;
#[allow(unused_imports)]
use pallet_collective as pallet_collective_open_tech_committee;

frame_support::parameter_types! {
pub const MaxBalance: crate::Balance = crate::Balance::max_value();
}
Expand Down Expand Up @@ -1585,8 +1579,8 @@ mod benches {
[pallet_precompile_benchmarks, PrecompileBenchmarks]
[pallet_parameters, Parameters]
[pallet_xcm_weight_trader, XcmWeightTrader]
[pallet_collective_treasury_council, TreasuryCouncilCollective]
[pallet_collective_open_tech_committee, OpenTechCommitteeCollective]
[pallet_collective, TreasuryCouncilCollective]
[pallet_collective, OpenTechCommitteeCollective]
);
}

Expand Down
4 changes: 2 additions & 2 deletions runtime/moonbase/src/weights/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ pub mod pallet_author_inherent;
pub mod pallet_author_mapping;
pub mod pallet_author_slot_filter;
pub mod pallet_balances;
pub mod pallet_collective_open_tech_committee;
pub mod pallet_collective_treasury_council;
pub mod pallet_collective_open_tech_committee_collective;
pub mod pallet_collective_treasury_council_collective;
pub mod pallet_conviction_voting;
pub mod pallet_crowdloan_rewards;
pub mod pallet_evm;
Expand Down
10 changes: 4 additions & 6 deletions .../pallet_collective_open_tech_committee.rs → ...lective_open_tech_committee_collective.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
// along with Moonbeam. If not, see <http://www.gnu.org/licenses/>.


//! Autogenerated weights for `pallet_collective_open_tech_committee`
//! Autogenerated weights for `pallet_collective`
//!
//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
//! DATE: 2025-05-13, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
Expand All @@ -33,7 +33,7 @@
// --genesis-builder-preset=development
// --steps=50
// --repeat=20
// --pallet=pallet_collective_open_tech_committee
// --pallet=pallet_collective
// --extrinsic=*
// --wasm-execution=compiled
// --header=./file_header.txt
Expand All @@ -47,11 +47,9 @@
use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
use sp_std::marker::PhantomData;

use pallet_collective as pallet_collective_open_tech_committee;

/// Weights for `pallet_collective_open_tech_committee`.
/// Weights for `pallet_collective`.
pub struct WeightInfo<T>(PhantomData<T>);
impl<T: frame_system::Config> pallet_collective_open_tech_committee::WeightInfo for WeightInfo<T> {
impl<T: frame_system::Config> pallet_collective::WeightInfo for WeightInfo<T> {
/// Storage: `OpenTechCommitteeCollective::Members` (r:1 w:1)
/// Proof: `OpenTechCommitteeCollective::Members` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
/// Storage: `OpenTechCommitteeCollective::Proposals` (r:1 w:0)
Expand Down
10 changes: 4 additions & 6 deletions ...hts/pallet_collective_treasury_council.rs → ...collective_treasury_council_collective.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
// along with Moonbeam. If not, see <http://www.gnu.org/licenses/>.


//! Autogenerated weights for `pallet_collective_treasury_council`
//! Autogenerated weights for `pallet_collective`
//!
//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
//! DATE: 2025-05-13, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
Expand All @@ -33,7 +33,7 @@
// --genesis-builder-preset=development
// --steps=50
// --repeat=20
// --pallet=pallet_collective_treasury_council
// --pallet=pallet_collective
// --extrinsic=*
// --wasm-execution=compiled
// --header=./file_header.txt
Expand All @@ -47,11 +47,9 @@
use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
use sp_std::marker::PhantomData;

use pallet_collective as pallet_collective_treasury_council;

/// Weights for `pallet_collective_treasury_council`.
/// Weights for `pallet_collective`.
pub struct WeightInfo<T>(PhantomData<T>);
impl<T: frame_system::Config> pallet_collective_treasury_council::WeightInfo for WeightInfo<T> {
impl<T: frame_system::Config> pallet_collective::WeightInfo for WeightInfo<T> {
/// Storage: `TreasuryCouncilCollective::Members` (r:1 w:1)
/// Proof: `TreasuryCouncilCollective::Members` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
/// Storage: `TreasuryCouncilCollective::Proposals` (r:1 w:0)
Expand Down
6 changes: 4 additions & 2 deletions runtime/moonbeam/src/governance/councils.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,8 @@ impl pallet_collective::Config<TreasuryCouncilInstance> for Runtime {
/// The maximum number of treasury council members.
type MaxMembers = ConstU32<9>;
type DefaultVote = pallet_collective::MoreThanMajorityThenPrimeDefaultVote;
type WeightInfo = moonbeam_weights::pallet_collective_treasury_council::WeightInfo<Runtime>;
type WeightInfo =
moonbeam_weights::pallet_collective_treasury_council_collective::WeightInfo<Runtime>;
type SetMembersOrigin = referenda::GeneralAdminOrRoot;
type MaxProposalWeight = MaxProposalWeight;
type KillOrigin = FastGeneralAdminOrRoot;
Expand All @@ -59,7 +60,8 @@ impl pallet_collective::Config<OpenTechCommitteeInstance> for Runtime {
/// The maximum number of technical committee members.
type MaxMembers = ConstU32<100>;
type DefaultVote = pallet_collective::MoreThanMajorityThenPrimeDefaultVote;
type WeightInfo = moonbeam_weights::pallet_collective_open_tech_committee::WeightInfo<Runtime>;
type WeightInfo =
moonbeam_weights::pallet_collective_open_tech_committee_collective::WeightInfo<Runtime>;
type SetMembersOrigin = referenda::GeneralAdminOrRoot;
type MaxProposalWeight = MaxProposalWeight;
type KillOrigin = FastGeneralAdminOrRoot;
Expand Down
10 changes: 2 additions & 8 deletions runtime/moonbeam/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1505,12 +1505,6 @@ use moonbeam_runtime_common::deal_with_fees::{

#[cfg(feature = "runtime-benchmarks")]
mod benches {
// TODO: Temporary workaround before upgrading to latest polkadot-sdk - fix https://github.com/paritytech/polkadot-sdk/pull/6435
#[allow(unused_imports)]
use pallet_collective as pallet_collective_treasury_council;
#[allow(unused_imports)]
use pallet_collective as pallet_collective_open_tech_committee;

frame_support::parameter_types! {
pub const MaxBalance: crate::Balance = crate::Balance::max_value();
}
Expand Down Expand Up @@ -1553,8 +1547,8 @@ mod benches {
[pallet_precompile_benchmarks, PrecompileBenchmarks]
[pallet_parameters, Parameters]
[pallet_xcm_weight_trader, XcmWeightTrader]
[pallet_collective_treasury_council, TreasuryCouncilCollective]
[pallet_collective_open_tech_committee, OpenTechCommitteeCollective]
[pallet_collective, TreasuryCouncilCollective]
[pallet_collective, OpenTechCommitteeCollective]
);
}

Expand Down
4 changes: 2 additions & 2 deletions runtime/moonbeam/src/weights/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ pub mod pallet_author_inherent;
pub mod pallet_author_mapping;
pub mod pallet_author_slot_filter;
pub mod pallet_balances;
pub mod pallet_collective_open_tech_committee;
pub mod pallet_collective_treasury_council;
pub mod pallet_collective_open_tech_committee_collective;
pub mod pallet_collective_treasury_council_collective;
pub mod pallet_conviction_voting;
pub mod pallet_crowdloan_rewards;
pub mod pallet_evm;
Expand Down
10 changes: 4 additions & 6 deletions .../pallet_collective_open_tech_committee.rs → ...lective_open_tech_committee_collective.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
// along with Moonbeam. If not, see <http://www.gnu.org/licenses/>.


//! Autogenerated weights for `pallet_collective_open_tech_committee`
//! Autogenerated weights for `pallet_collective`
//!
//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
//! DATE: 2025-05-14, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
Expand All @@ -33,7 +33,7 @@
// --genesis-builder-preset=development
// --steps=50
// --repeat=20
// --pallet=pallet_collective_open_tech_committee
// --pallet=pallet_collective
// --extrinsic=*
// --wasm-execution=compiled
// --header=./file_header.txt
Expand All @@ -47,11 +47,9 @@
use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
use sp_std::marker::PhantomData;

use pallet_collective as pallet_collective_open_tech_committee;

/// Weights for `pallet_collective_open_tech_committee`.
/// Weights for `pallet_collective`.
pub struct WeightInfo<T>(PhantomData<T>);
impl<T: frame_system::Config> pallet_collective_open_tech_committee::WeightInfo for WeightInfo<T> {
impl<T: frame_system::Config> pallet_collective::WeightInfo for WeightInfo<T> {
/// Storage: `OpenTechCommitteeCollective::Members` (r:1 w:1)
/// Proof: `OpenTechCommitteeCollective::Members` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
/// Storage: `OpenTechCommitteeCollective::Proposals` (r:1 w:0)
Expand Down
10 changes: 4 additions & 6 deletions ...hts/pallet_collective_treasury_council.rs → ...collective_treasury_council_collective.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
// along with Moonbeam. If not, see <http://www.gnu.org/licenses/>.


//! Autogenerated weights for `pallet_collective_treasury_council`
//! Autogenerated weights for `pallet_collective`
//!
//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
//! DATE: 2025-05-14, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
Expand All @@ -33,7 +33,7 @@
// --genesis-builder-preset=development
// --steps=50
// --repeat=20
// --pallet=pallet_collective_treasury_council
// --pallet=pallet_collective
// --extrinsic=*
// --wasm-execution=compiled
// --header=./file_header.txt
Expand All @@ -47,11 +47,9 @@
use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
use sp_std::marker::PhantomData;

use pallet_collective as pallet_collective_treasury_council;

/// Weights for `pallet_collective_treasury_council`.
/// Weights for `pallet_collective`.
pub struct WeightInfo<T>(PhantomData<T>);
impl<T: frame_system::Config> pallet_collective_treasury_council::WeightInfo for WeightInfo<T> {
impl<T: frame_system::Config> pallet_collective::WeightInfo for WeightInfo<T> {
/// Storage: `TreasuryCouncilCollective::Members` (r:1 w:1)
/// Proof: `TreasuryCouncilCollective::Members` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
/// Storage: `TreasuryCouncilCollective::Proposals` (r:1 w:0)
Expand Down
6 changes: 4 additions & 2 deletions runtime/moonriver/src/governance/councils.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,8 @@ impl pallet_collective::Config<TreasuryCouncilInstance> for Runtime {
/// The maximum number of treasury council members.
type MaxMembers = ConstU32<9>;
type DefaultVote = pallet_collective::MoreThanMajorityThenPrimeDefaultVote;
type WeightInfo = moonriver_weights::pallet_collective_treasury_council::WeightInfo<Runtime>;
type WeightInfo =
moonriver_weights::pallet_collective_treasury_council_collective::WeightInfo<Runtime>;
type SetMembersOrigin = referenda::GeneralAdminOrRoot;
type MaxProposalWeight = MaxProposalWeight;
type DisapproveOrigin = FastGeneralAdminOrRoot;
Expand All @@ -59,7 +60,8 @@ impl pallet_collective::Config<OpenTechCommitteeInstance> for Runtime {
/// The maximum number of technical committee members.
type MaxMembers = ConstU32<100>;
type DefaultVote = pallet_collective::MoreThanMajorityThenPrimeDefaultVote;
type WeightInfo = moonriver_weights::pallet_collective_open_tech_committee::WeightInfo<Runtime>;
type WeightInfo =
moonriver_weights::pallet_collective_open_tech_committee_collective::WeightInfo<Runtime>;
type SetMembersOrigin = referenda::GeneralAdminOrRoot;
type MaxProposalWeight = MaxProposalWeight;
type DisapproveOrigin = FastGeneralAdminOrRoot;
Expand Down
10 changes: 2 additions & 8 deletions runtime/moonriver/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1508,12 +1508,6 @@ construct_runtime! {
use moonbeam_runtime_common::benchmarking::BenchmarkHelper;
#[cfg(feature = "runtime-benchmarks")]
mod benches {
// TODO: Temporary workaround before upgrading to latest polkadot-sdk - fix https://github.com/paritytech/polkadot-sdk/pull/6435
#[allow(unused_imports)]
use pallet_collective as pallet_collective_treasury_council;
#[allow(unused_imports)]
use pallet_collective as pallet_collective_open_tech_committee;

frame_support::parameter_types! {
pub const MaxBalance: crate::Balance = crate::Balance::max_value();
}
Expand Down Expand Up @@ -1556,8 +1550,8 @@ mod benches {
[pallet_precompile_benchmarks, PrecompileBenchmarks]
[pallet_parameters, Parameters]
[pallet_xcm_weight_trader, XcmWeightTrader]
[pallet_collective_treasury_council, TreasuryCouncilCollective]
[pallet_collective_open_tech_committee, OpenTechCommitteeCollective]
[pallet_collective, TreasuryCouncilCollective]
[pallet_collective, OpenTechCommitteeCollective]
);
}

Expand Down
4 changes: 2 additions & 2 deletions runtime/moonriver/src/weights/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ pub mod pallet_author_inherent;
pub mod pallet_author_mapping;
pub mod pallet_author_slot_filter;
pub mod pallet_balances;
pub mod pallet_collective_open_tech_committee;
pub mod pallet_collective_treasury_council;
pub mod pallet_collective_open_tech_committee_collective;
pub mod pallet_collective_treasury_council_collective;
pub mod pallet_conviction_voting;
pub mod pallet_crowdloan_rewards;
pub mod pallet_evm;
Expand Down
10 changes: 4 additions & 6 deletions .../pallet_collective_open_tech_committee.rs → ...lective_open_tech_committee_collective.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
// along with Moonbeam. If not, see <http://www.gnu.org/licenses/>.


//! Autogenerated weights for `pallet_collective_open_tech_committee`
//! Autogenerated weights for `pallet_collective`
//!
//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
//! DATE: 2025-05-13, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
Expand All @@ -33,7 +33,7 @@
// --genesis-builder-preset=development
// --steps=50
// --repeat=20
// --pallet=pallet_collective_open_tech_committee
// --pallet=pallet_collective
// --extrinsic=*
// --wasm-execution=compiled
// --header=./file_header.txt
Expand All @@ -47,11 +47,9 @@
use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
use sp_std::marker::PhantomData;

use pallet_collective as pallet_collective_open_tech_committee;

/// Weights for `pallet_collective_open_tech_committee`.
/// Weights for `pallet_collective`.
pub struct WeightInfo<T>(PhantomData<T>);
impl<T: frame_system::Config> pallet_collective_open_tech_committee::WeightInfo for WeightInfo<T> {
impl<T: frame_system::Config> pallet_collective::WeightInfo for WeightInfo<T> {
/// Storage: `OpenTechCommitteeCollective::Members` (r:1 w:1)
/// Proof: `OpenTechCommitteeCollective::Members` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
/// Storage: `OpenTechCommitteeCollective::Proposals` (r:1 w:0)
Expand Down
10 changes: 4 additions & 6 deletions ...hts/pallet_collective_treasury_council.rs → ...collective_treasury_council_collective.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
// along with Moonbeam. If not, see <http://www.gnu.org/licenses/>.


//! Autogenerated weights for `pallet_collective_treasury_council`
//! Autogenerated weights for `pallet_collective`
//!
//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
//! DATE: 2025-05-13, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
Expand All @@ -33,7 +33,7 @@
// --genesis-builder-preset=development
// --steps=50
// --repeat=20
// --pallet=pallet_collective_treasury_council
// --pallet=pallet_collective
// --extrinsic=*
// --wasm-execution=compiled
// --header=./file_header.txt
Expand All @@ -47,11 +47,9 @@
use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
use sp_std::marker::PhantomData;

use pallet_collective as pallet_collective_treasury_council;

/// Weights for `pallet_collective_treasury_council`.
/// Weights for `pallet_collective`.
pub struct WeightInfo<T>(PhantomData<T>);
impl<T: frame_system::Config> pallet_collective_treasury_council::WeightInfo for WeightInfo<T> {
impl<T: frame_system::Config> pallet_collective::WeightInfo for WeightInfo<T> {
/// Storage: `TreasuryCouncilCollective::Members` (r:1 w:1)
/// Proof: `TreasuryCouncilCollective::Members` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
/// Storage: `TreasuryCouncilCollective::Proposals` (r:1 w:0)
Expand Down
Loading