diff --git a/parachains/runtimes/assets/statemine/src/weights/xcm/cumulus_pallet_xcmp_queue.rs b/parachains/runtimes/assets/statemine/src/weights/xcm/cumulus_pallet_xcmp_queue.rs
deleted file mode 100644
index 23bcd818b33..00000000000
--- a/parachains/runtimes/assets/statemine/src/weights/xcm/cumulus_pallet_xcmp_queue.rs
+++ /dev/null
@@ -1,63 +0,0 @@
-// Copyright 2022 Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
-
-// Cumulus 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.
-
-// Cumulus 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 Cumulus. If not, see .
-
-
-//! Autogenerated weights for `cumulus_pallet_xcmp_queue`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2022-09-21, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! HOSTNAME: `bm6`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("statemine-dev"), DB CACHE: 1024
-
-// Executed Command:
-// ./artifacts/polkadot-parachain
-// benchmark
-// pallet
-// --template=./templates/xcm-bench-template.hbs
-// --chain=statemine-dev
-// --execution=wasm
-// --wasm-execution=compiled
-// --pallet=cumulus_pallet_xcmp_queue
-// --extrinsic=*
-// --steps=50
-// --repeat=20
-// --json
-// --header=./file_header.txt
-// --output=./parachains/runtimes/assets/statemine/src/weights/xcm/cumulus_pallet_xcmp_queue.rs
-
-#![cfg_attr(rustfmt, rustfmt_skip)]
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-
-use frame_support::{traits::Get, weights::Weight};
-use sp_std::marker::PhantomData;
-
-/// Weights for `cumulus_pallet_xcmp_queue`.
-pub struct WeightInfo(PhantomData);
-impl WeightInfo {
- // Storage: XcmpQueue QueueConfig (r:1 w:1)
- pub(crate) fn set_config_with_u32() -> Weight {
- Weight::from_ref_time(7_552_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)
- pub(crate) fn set_config_with_weight() -> Weight {
- Weight::from_ref_time(7_568_000 as u64)
- .saturating_add(T::DbWeight::get().reads(1 as u64))
- .saturating_add(T::DbWeight::get().writes(1 as u64))
- }
-}
diff --git a/parachains/runtimes/assets/statemint/src/weights/xcm/cumulus_pallet_xcmp_queue.rs b/parachains/runtimes/assets/statemint/src/weights/xcm/cumulus_pallet_xcmp_queue.rs
deleted file mode 100644
index db40762b6f1..00000000000
--- a/parachains/runtimes/assets/statemint/src/weights/xcm/cumulus_pallet_xcmp_queue.rs
+++ /dev/null
@@ -1,63 +0,0 @@
-// Copyright 2022 Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
-
-// Cumulus 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.
-
-// Cumulus 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 Cumulus. If not, see .
-
-
-//! Autogenerated weights for `cumulus_pallet_xcmp_queue`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2022-09-21, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! HOSTNAME: `bm6`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("statemint-dev"), DB CACHE: 1024
-
-// Executed Command:
-// ./artifacts/polkadot-parachain
-// benchmark
-// pallet
-// --template=./templates/xcm-bench-template.hbs
-// --chain=statemint-dev
-// --execution=wasm
-// --wasm-execution=compiled
-// --pallet=cumulus_pallet_xcmp_queue
-// --extrinsic=*
-// --steps=50
-// --repeat=20
-// --json
-// --header=./file_header.txt
-// --output=./parachains/runtimes/assets/statemint/src/weights/xcm/cumulus_pallet_xcmp_queue.rs
-
-#![cfg_attr(rustfmt, rustfmt_skip)]
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-
-use frame_support::{traits::Get, weights::Weight};
-use sp_std::marker::PhantomData;
-
-/// Weights for `cumulus_pallet_xcmp_queue`.
-pub struct WeightInfo(PhantomData);
-impl WeightInfo {
- // Storage: XcmpQueue QueueConfig (r:1 w:1)
- pub(crate) fn set_config_with_u32() -> Weight {
- Weight::from_ref_time(7_362_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)
- pub(crate) fn set_config_with_weight() -> Weight {
- Weight::from_ref_time(7_234_000 as u64)
- .saturating_add(T::DbWeight::get().reads(1 as u64))
- .saturating_add(T::DbWeight::get().writes(1 as u64))
- }
-}
diff --git a/parachains/runtimes/assets/westmint/src/weights/xcm/cumulus_pallet_xcmp_queue.rs b/parachains/runtimes/assets/westmint/src/weights/xcm/cumulus_pallet_xcmp_queue.rs
deleted file mode 100644
index 8ba86157a1a..00000000000
--- a/parachains/runtimes/assets/westmint/src/weights/xcm/cumulus_pallet_xcmp_queue.rs
+++ /dev/null
@@ -1,63 +0,0 @@
-// Copyright 2022 Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
-
-// Cumulus 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.
-
-// Cumulus 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 Cumulus. If not, see .
-
-
-//! Autogenerated weights for `cumulus_pallet_xcmp_queue`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2022-09-21, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! HOSTNAME: `bm6`, 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
-// benchmark
-// pallet
-// --template=./templates/xcm-bench-template.hbs
-// --chain=westmint-dev
-// --execution=wasm
-// --wasm-execution=compiled
-// --pallet=cumulus_pallet_xcmp_queue
-// --extrinsic=*
-// --steps=50
-// --repeat=20
-// --json
-// --header=./file_header.txt
-// --output=./parachains/runtimes/assets/westmint/src/weights/xcm/cumulus_pallet_xcmp_queue.rs
-
-#![cfg_attr(rustfmt, rustfmt_skip)]
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-
-use frame_support::{traits::Get, weights::Weight};
-use sp_std::marker::PhantomData;
-
-/// Weights for `cumulus_pallet_xcmp_queue`.
-pub struct WeightInfo(PhantomData);
-impl WeightInfo {
- // Storage: XcmpQueue QueueConfig (r:1 w:1)
- pub(crate) fn set_config_with_u32() -> Weight {
- Weight::from_ref_time(7_499_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)
- pub(crate) fn set_config_with_weight() -> Weight {
- Weight::from_ref_time(7_493_000 as u64)
- .saturating_add(T::DbWeight::get().reads(1 as u64))
- .saturating_add(T::DbWeight::get().writes(1 as u64))
- }
-}
diff --git a/scripts/benchmarks-ci.sh b/scripts/benchmarks-ci.sh
index 72e1e2fbf5c..da4318a3519 100755
--- a/scripts/benchmarks-ci.sh
+++ b/scripts/benchmarks-ci.sh
@@ -46,10 +46,10 @@ fi
for pallet in ${pallets[@]}
do
- # a little hack for xcm benchmarks
output_file="${pallet//::/_}"
extra_args=""
- if [[ "$pallet" == *"xcm"* ]]; then
+ # a little hack for pallet_xcm_benchmarks - we want to force custom implementation for XcmWeightInfo
+ if [[ "$pallet" == "pallet_xcm_benchmarks::generic" ]] || [[ "$pallet" == "pallet_xcm_benchmarks::fungible" ]]; then
output_file="xcm/$output_file"
extra_args="--template=./templates/xcm-bench-template.hbs"
fi