Clamp benchmark ranks to respect MaxRank#7720
Merged
ggwpez merged 13 commits intoparitytech:masterfrom Apr 15, 2025
Merged
Conversation
added 2 commits
March 2, 2025 14:58
bkchr
reviewed
Mar 4, 2025
Member
bkchr
left a comment
bkchr
left a comment
There was a problem hiding this comment.
The general logic looks good, just some nit improvements to make this better :)
Doordashcon
commented
Mar 9, 2025
bkchr
approved these changes
Mar 10, 2025
ggwpez
reviewed
Apr 2, 2025
ggwpez
reviewed
Apr 2, 2025
acatangiu
reviewed
Apr 12, 2025
Contributor
acatangiu
left a comment
acatangiu
left a comment
There was a problem hiding this comment.
I like the benchmark fix, I personally don’t like the u32->u16 type change because it adds more complexity with some custom converters types and is a breaking change for runtime builders, for no strong reason/benefit.
Not blocking the PR for this, but want to get your opinion on above.
Member
The core fellowship is only used by the collectives chain. The user base of this isn't that big and also given the required change I think that the change is reasonable. |
ggwpez
approved these changes
Apr 15, 2025
Merged
via the queue into
paritytech:master
with commit Apr 15, 2025
4bbcf42
234 of 243 checks passed
Krayt78
pushed a commit
to Krayt78/polkadot-sdk
that referenced
this pull request
Apr 18, 2025
resolves paritytech#7517 ### Issues #### 1. Compile-Time vs Runtime Rank Mismatch - **`promote_fast` Benchmark** uses mock runtime's `MaxRank` during benchmark generation while allowing runtime overrides. Creating potential parameter mismatch between benchmark metadata(i.e. generated `r` values) and runtime configuration(i.e. `T::MaxRank`). #### 2. Static Rank Assumptions - **`bump_demote` Benchmark** initialized members at rank 2, making it incompatible with `MaxRank=1` configurations - **`promote` Benchmark** contained hardcoded rank values (1 → 2) which fails for `MaxRank=1` ## Changes #### Dynamic Rank Clamping ```rust // promote_fast // Get target rank for promotion. let max_rank = T::MaxRank::get(); let target_rank = (r as u16).min(max_rank); // promote // Set `to_rank` dynamically based on `max_rank`. let to_rank = (current_rank + 1).min(max_rank); --------- Co-authored-by: Bastian Köcher <git@kchr.de> Co-authored-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>
castillax
pushed a commit
that referenced
this pull request
May 12, 2025
resolves #7517 ### Issues #### 1. Compile-Time vs Runtime Rank Mismatch - **`promote_fast` Benchmark** uses mock runtime's `MaxRank` during benchmark generation while allowing runtime overrides. Creating potential parameter mismatch between benchmark metadata(i.e. generated `r` values) and runtime configuration(i.e. `T::MaxRank`). #### 2. Static Rank Assumptions - **`bump_demote` Benchmark** initialized members at rank 2, making it incompatible with `MaxRank=1` configurations - **`promote` Benchmark** contained hardcoded rank values (1 → 2) which fails for `MaxRank=1` ## Changes #### Dynamic Rank Clamping ```rust // promote_fast // Get target rank for promotion. let max_rank = T::MaxRank::get(); let target_rank = (r as u16).min(max_rank); // promote // Set `to_rank` dynamically based on `max_rank`. let to_rank = (current_rank + 1).min(max_rank); --------- Co-authored-by: Bastian Köcher <git@kchr.de> Co-authored-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>
bkontur
reviewed
Aug 19, 2025
| fn induct() -> Weight; | ||
| fn promote() -> Weight; | ||
| fn promote_fast(r: u32, ) -> Weight; | ||
| fn promote_fast(r: u16, ) -> Weight; |
Contributor
There was a problem hiding this comment.
@Doordashcon Changed this back to u32 because Linear currently supports only u32. Using u16 here caused a compilation issue when generating weights, more info and fix: #9516.
github-project-automation
bot
moved this from Todo
to Done
in [preview] release tracker
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
resolves #7517
Issues
1. Compile-Time vs Runtime Rank Mismatch
promote_fastBenchmark uses mock runtime'sMaxRankduring benchmark generation while allowing runtime overrides. Creating potential parameter mismatch between benchmark metadata(i.e. generatedrvalues) and runtime configuration(i.e.T::MaxRank).2. Static Rank Assumptions
bump_demoteBenchmark initialized members at rank 2, making it incompatible withMaxRank=1configurationspromoteBenchmark contained hardcoded rank values (1 → 2) which fails forMaxRank=1Changes
Dynamic Rank Clamping