From 39f79659a85cf22e6a9384df4712f11c5f87b885 Mon Sep 17 00:00:00 2001
From: Squirrel <gilescope@gmail.com>
Date: Wed, 1 Jun 2022 08:40:03 +0100
Subject: [PATCH] Fixup benches after dir re-org (#1300)
* Fixup after dir re-org
* Update scripts/benchmarks-ci.sh
Co-authored-by: Chevdor <chevdor@users.noreply.github.com>
* Update scripts/benchmarks-ci.sh
Co-authored-by: Chevdor <chevdor@users.noreply.github.com>
* Update scripts/benchmarks-ci.sh
Co-authored-by: Chevdor <chevdor@users.noreply.github.com>
* fix typo
Co-authored-by: Chevdor <chevdor@users.noreply.github.com>
---
cumulus/.gitlab-ci.yml | 6 +++---
cumulus/scripts/benchmarks-ci.sh | 11 ++++++-----
cumulus/scripts/benchmarks.sh | 6 +++---
3 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/cumulus/.gitlab-ci.yml b/cumulus/.gitlab-ci.yml
index 60e07f918d1..9b5b5df4f09 100644
--- a/cumulus/.gitlab-ci.yml
+++ b/cumulus/.gitlab-ci.yml
@@ -211,9 +211,9 @@ benchmarks:
<<: *collect-artifacts
<<: *benchmarks-refs
script:
- - ./scripts/benchmarks-ci.sh statemine > ./artifacts/bench-statemine.log
- - ./scripts/benchmarks-ci.sh statemint > ./artifacts/bench-statemint.log
- - ./scripts/benchmarks-ci.sh westmint > ./artifacts/bench-westmint.log
+ - ./scripts/benchmarks-ci.sh assets statemine > ./artifacts/bench-statemine.log
+ - ./scripts/benchmarks-ci.sh assets statemint > ./artifacts/bench-statemint.log
+ - ./scripts/benchmarks-ci.sh assets westmint > ./artifacts/bench-westmint.log
- git status
- export BRANCHNAME="weights-${CI_COMMIT_BRANCH}"
# Set git config
diff --git a/cumulus/scripts/benchmarks-ci.sh b/cumulus/scripts/benchmarks-ci.sh
index e74842868ee..8b6afbebd17 100755
--- a/cumulus/scripts/benchmarks-ci.sh
+++ b/cumulus/scripts/benchmarks-ci.sh
@@ -2,10 +2,11 @@
steps=50
repeat=20
-chainName=$1
+category=$1
+runtimeName=$2
-benhcmarkOutput=./parachains/runtimes/$chainName/src/weights
-benhcmarkChainName="$chainName-dev"
+benchmarkOutput=./parachains/runtimes/$category/$runtimeName/src/weights
+benchmarkRuntimeName="$runtimeName-dev"
pallets=(
pallet_assets
@@ -24,7 +25,7 @@ pallets=(
for p in ${pallets[@]}
do
./artifacts/polkadot-parachain benchmark pallet \
- --chain=$benhcmarkChainName \
+ --chain=$benchmarkRuntimeName \
--execution=wasm \
--wasm-execution=compiled \
--pallet=$p \
@@ -33,5 +34,5 @@ do
--repeat=$repeat \
--json \
--header=./file_header.txt \
- --output=$benhcmarkOutput
+ --output=$benchmarkOutput
done
diff --git a/cumulus/scripts/benchmarks.sh b/cumulus/scripts/benchmarks.sh
index eddd1e9215a..a83b8cbcbb6 100755
--- a/cumulus/scripts/benchmarks.sh
+++ b/cumulus/scripts/benchmarks.sh
@@ -3,9 +3,9 @@
steps=50
repeat=20
-statemineOutput=./parachains/runtimes/statemine/src/weights
-statemintOutput=./parachains/runtimes/statemint/src/weights
-westmintOutput=./parachains/runtimes/westmint/src/weights
+statemineOutput=./parachains/runtimes/assets/statemine/src/weights
+statemintOutput=./parachains/runtimes/assets/statemint/src/weights
+westmintOutput=./parachains/runtimes/assets/westmint/src/weights
statemineChain=statemine-dev
statemintChain=statemint-dev
--
GitLab