contracts: Use `proof_size` from benchmarks #13268

athei · 2023-01-29T21:50:57Z

We remove our ad-hoc injected proof_size and replace it by the benchmarking results. We also refactor wasm::code_cache::store to never load the code from storage if it was supplied via the extrinsic.

We use #[pov_mode = Measure] everywhere because the max encoded length of the used storage items is usually much bigger than the average. All benchmarks are already written in a way that the proof_size scales with the components just as the ref_time does.

We also fixed the deletion queue which wasn't honouring the proof_size. In the process we added a new associated function: Weight::checked_div_per_component.

athei · 2023-01-29T21:51:14Z

/cmd queue -c bench $ pallet runtime pallet_contracts

athei · 2023-01-29T22:38:26Z

/cmd queue -c bench $ pallet dev pallet_contracts

… HEAD

athei · 2023-01-30T17:55:05Z

frame/contracts/src/weights.rs

 			.saturating_add(T::DbWeight::get().reads(6_u64))
 			.saturating_add(T::DbWeight::get().writes(4_u64))
+			.saturating_add(Weight::from_proof_size(5).saturating_mul(c.into()))


Oof. 5 bytes per byte of code. That is bad. It is probably due to our instrumentation worst case. We really need to get rid of that and move that into wasmi.

frame/contracts/src/schedule.rs

frame/contracts/src/wasm/code_cache.rs

Co-authored-by: Cyrill Leutwiler <[email protected]>

xermicus

LGTM

athei · 2023-02-02T15:27:48Z

bot rebase

…size

athei · 2023-02-14T18:36:40Z

bot bench -v PIPELINE_SCRIPTS_REF=bm-fallback $ pallet dev pallet_contracts

command-bot · 2023-02-14T18:36:47Z

@athei https://gitlab.parity.io/parity/mirrors/substrate/-/jobs/2392639 was started for your command "$PIPELINE_SCRIPTS_DIR/commands/bench/bench.sh" pallet dev pallet_contracts. Check out https://gitlab.parity.io/parity/mirrors/substrate/-/pipelines?page=1&scope=all&username=group_605_bot to know what else is being executed currently.

Comment bot cancel 18-df94ff54-494a-48dd-b3a4-4e15bb294ee3 to cancel this command or bot cancel to cancel all commands in this pull request.

command-bot · 2023-02-14T20:26:55Z

@athei Command "$PIPELINE_SCRIPTS_DIR/commands/bench/bench.sh" pallet dev pallet_contracts has finished. Result: https://gitlab.parity.io/parity/mirrors/substrate/-/jobs/2392639 has finished. If any artifacts were generated, you can download them from https://gitlab.parity.io/parity/mirrors/substrate/-/jobs/2392639/artifacts/download.

frame/contracts/src/weights.rs

athei · 2023-02-15T17:50:13Z

bot bench -v PIPELINE_SCRIPTS_REF=bm-fallback $ pallet dev pallet_contracts

command-bot · 2023-02-15T17:50:18Z

@athei https://gitlab.parity.io/parity/mirrors/substrate/-/jobs/2398023 was started for your command "$PIPELINE_SCRIPTS_DIR/commands/bench/bench.sh" pallet dev pallet_contracts. Check out https://gitlab.parity.io/parity/mirrors/substrate/-/pipelines?page=1&scope=all&username=group_605_bot to know what else is being executed currently.

Comment bot cancel 28-09f09183-f16f-4bc5-85da-39a2e801b835 to cancel this command or bot cancel to cancel all commands in this pull request.

… HEAD

command-bot · 2023-02-15T19:55:40Z

@athei Command "$PIPELINE_SCRIPTS_DIR/commands/bench/bench.sh" pallet dev pallet_contracts has finished. Result: https://gitlab.parity.io/parity/mirrors/substrate/-/jobs/2398023 has finished. If any artifacts were generated, you can download them from https://gitlab.parity.io/parity/mirrors/substrate/-/jobs/2398023/artifacts/download.

* Avoid reading contract code when it is supplied in the extrinsic * Remove custom proof size injection from schedule * Set benchmarks pov_mode to Measure * Reduce overestimation of code size on re-instrument * ".git/.scripts/commands/bench/bench.sh" pallet dev pallet_contracts * Do not override proof size from benchmark * Do not charge proof size for basic block * Incrase gas limit for tests * Fix deletion queue to also use `proof_size` * Fix tests * Update frame/contracts/src/schedule.rs Co-authored-by: Cyrill Leutwiler <[email protected]> * Fix wrong schedule macro invocations * Remove stale docs * ".git/.scripts/commands/bench/bench.sh" pallet dev pallet_contracts * Handle zero components * ".git/.scripts/commands/bench/bench.sh" pallet dev pallet_contracts * Fix instruction weight --------- Co-authored-by: command-bot <> Co-authored-by: Cyrill Leutwiler <[email protected]>

This reverts commit fd458d6.

* Avoid reading contract code when it is supplied in the extrinsic * Remove custom proof size injection from schedule * Set benchmarks pov_mode to Measure * Reduce overestimation of code size on re-instrument * ".git/.scripts/commands/bench/bench.sh" pallet dev pallet_contracts * Do not override proof size from benchmark * Do not charge proof size for basic block * Incrase gas limit for tests * Fix deletion queue to also use `proof_size` * Fix tests * Update frame/contracts/src/schedule.rs Co-authored-by: Cyrill Leutwiler <[email protected]> * Fix wrong schedule macro invocations * Remove stale docs * ".git/.scripts/commands/bench/bench.sh" pallet dev pallet_contracts * Handle zero components * ".git/.scripts/commands/bench/bench.sh" pallet dev pallet_contracts * Fix instruction weight --------- Co-authored-by: command-bot <> Co-authored-by: Cyrill Leutwiler <[email protected]>

athei added 4 commits January 29, 2023 16:13

Avoid reading contract code when it is supplied in the extrinsic

76484a6

Remove custom proof size injection from schedule

f5825c8

Set benchmarks pov_mode to Measure

719a72e

Reduce overestimation of code size on re-instrument

5234f15

github-actions bot added the A3-in_progress Pull request is in progress. No review needed at this stage. label Jan 29, 2023

athei added B7-runtimenoteworthy C1-low PR touches the given topic and has a low impact on builders. D9-needsaudit 👮 PR contains changes to fund-managing logic that should be properly reviewed and externally audited labels Jan 29, 2023

command-bot and others added 6 commits January 29, 2023 22:38

Merge branch 'master' of https://github.com/paritytech/substrate into…

9631500

… HEAD

".git/.scripts/commands/bench/bench.sh" pallet dev pallet_contracts

ad417a2

Do not override proof size from benchmark

8954917

Do not charge proof size for basic block

1d76cb1

Incrase gas limit for tests

3cdf92a

Fix deletion queue to also use proof_size

a53f9de

athei marked this pull request as ready for review January 30, 2023 17:31

github-actions bot added A0-please_review Pull request needs code review. and removed A3-in_progress Pull request is in progress. No review needed at this stage. labels Jan 30, 2023

Fix tests

5003631

athei commented Jan 30, 2023

View reviewed changes

Merge branch 'master' into at/contracts-proof-size

c1083ca

athei requested review from agryaznov and xermicus February 1, 2023 12:55

xermicus reviewed Feb 1, 2023

View reviewed changes

frame/contracts/src/schedule.rs Outdated Show resolved Hide resolved

frame/contracts/src/wasm/code_cache.rs Show resolved Hide resolved

Update frame/contracts/src/schedule.rs

d81d8c2

Co-authored-by: Cyrill Leutwiler <[email protected]>

xermicus reviewed Feb 2, 2023

View reviewed changes

xermicus approved these changes Feb 2, 2023

View reviewed changes

Merge remote-tracking branch 'origin/master' into at/contracts-proof-…

e45af85

…size

paritytech deleted a comment from command-bot bot Feb 14, 2023

Merge branch 'master' into at/contracts-proof-size

6aff0d6

".git/.scripts/commands/bench/bench.sh" pallet dev pallet_contracts

f21fa90

athei commented Feb 15, 2023

View reviewed changes

frame/contracts/src/weights.rs Outdated Show resolved Hide resolved

Handle zero components

2e0818a

command-bot added 2 commits February 15, 2023 17:50

Merge branch 'master' of https://github.com/paritytech/substrate into…

9b43b15

… HEAD

".git/.scripts/commands/bench/bench.sh" pallet dev pallet_contracts

eef36ee

Fix instruction weight

606df89

athei merged commit 7732f88 into master Feb 15, 2023

athei deleted the at/contracts-proof-size branch February 15, 2023 21:56

rossbulat pushed a commit that referenced this pull request Feb 19, 2023

Revert "contracts: Use proof_size from benchmarks (#13268)"

afa987e

This reverts commit fd458d6.

jakoblell added D1-audited 👍 PR contains changes to fund-managing logic that has been properly reviewed and externally audited and removed D9-needsaudit 👮 PR contains changes to fund-managing logic that should be properly reviewed and externally audited labels Mar 2, 2023

This was referenced Mar 30, 2023

fix multisig_pure_proxy_stash.ts paritytech/capi#827

Closed

fix: multisig rune proof size paritytech/capi#829

Merged

kiltbot mentioned this pull request Apr 3, 2023

[AUTOMATIC] Update Polkadot dependencies from 0.9.38 to 0.9.39 KILTprotocol/kilt-node#495

Closed

librelois mentioned this pull request Apr 6, 2023

Update substrate/polkadot/cumulus from v0.9.38 to v0.9.40 moonbeam-foundation/moonbeam#2200

Closed

kacperzuk-neti mentioned this pull request Jun 23, 2023

Polkadot v0.9.43 liberland/liberland_substrate#295

Merged

15 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

contracts: Use `proof_size` from benchmarks #13268

contracts: Use `proof_size` from benchmarks #13268

athei commented Jan 29, 2023 •

edited

Loading

athei commented Jan 29, 2023

athei commented Jan 29, 2023

athei Jan 30, 2023

xermicus left a comment

athei commented Feb 2, 2023

athei commented Feb 14, 2023

command-bot bot commented Feb 14, 2023 •

edited

Loading

command-bot bot commented Feb 14, 2023

athei commented Feb 15, 2023

command-bot bot commented Feb 15, 2023 •

edited

Loading

command-bot bot commented Feb 15, 2023

contracts: Use proof_size from benchmarks #13268

contracts: Use proof_size from benchmarks #13268

Conversation

athei commented Jan 29, 2023 • edited Loading

athei commented Jan 29, 2023

athei commented Jan 29, 2023

athei Jan 30, 2023

Choose a reason for hiding this comment

xermicus left a comment

Choose a reason for hiding this comment

athei commented Feb 2, 2023

athei commented Feb 14, 2023

command-bot bot commented Feb 14, 2023 • edited Loading

command-bot bot commented Feb 14, 2023

athei commented Feb 15, 2023

command-bot bot commented Feb 15, 2023 • edited Loading

command-bot bot commented Feb 15, 2023

contracts: Use `proof_size` from benchmarks #13268

contracts: Use `proof_size` from benchmarks #13268

athei commented Jan 29, 2023 •

edited

Loading

command-bot bot commented Feb 14, 2023 •

edited

Loading

command-bot bot commented Feb 15, 2023 •

edited

Loading