Delegs: optimise the rewards calculation #1779
Merged
Conversation
This file contains 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
|
With this PR, IntersectMBO/ouroboros-network#2512, and #1775, the remaining hotspots in my microbenchmark (validate/reapply the first Shelley epoch) are:
|
mrBliss
commented
Aug 13, 2020
| Map.fromList | ||
| [ (cred, coin) | ||
| | (RewardAcnt network' cred, coin) <- Map.toList wdrls_, | ||
| network' == network |
There was a problem hiding this comment.
Can the network in wdrls_ actually differ from liftSTS $ asks networkId?
There was a problem hiding this comment.
I don't believe so. The network stuff is just in here because it's needed to serialise as a reward account. So I think it's fine to completely ignore it with this change.
nc6
approved these changes
Aug 13, 2020
| Map.fromList | ||
| [ (cred, coin) | ||
| | (RewardAcnt network' cred, coin) <- Map.toList wdrls_, | ||
| network' == network |
There was a problem hiding this comment.
I don't believe so. The network stuff is just in here because it's needed to serialise as a reward account. So I think it's fine to completely ignore it with this change.
From my profiling report of the validation of the first Shelley epoch (excluding the epoch transition): ``` TOT INH IND 35.7 28.1 .4 Control.State.Transition.Extended liftSTS (7553) 13.0 9.8 7.8 Shelley.Spec.Ledger.STS.Delegs delegsTransition.rewards (8136) 4.4 1.2 .6 Shelley.Spec.Ledger.Address >= (8607184) 3.8 .6 .6 Shelley.Spec.Ledger.Address < (8607184) 3.2 - - Shelley.Spec.Ledger.Credential < (8607184) .8 .8 .8 Shelley.Spec.Ledger.Address mkRwdAcnt (8615225) 11.3 9.0 8.6 Shelley.Spec.Ledger.STS.Delegs delegsTransition.rewards' (8136) 2.7 .4 .3 Shelley.Spec.Ledger.Credential >= (8607184) 2.3 - - Shelley.Spec.Ledger.Credential < (8607184) ``` The conversions (`Map.mapKeys`) of the rewards accounts is very costly, and we're doing it twice. Instead, convert the `wdrls`, which is a much smaller map. After this change, `rewards` and `rewards'` are no longer hotspots (0.0 time!).
nc6
force-pushed
the
optimise-delegstransition
branch
from
b815f4d
to
5caedcb
Compare
mrBliss
added a commit
to IntersectMBO/cardano-node
that referenced
this pull request
Aug 14, 2020
mrBliss
added a commit
to IntersectMBO/cardano-node
that referenced
this pull request
Aug 17, 2020
erikd
pushed a commit
to IntersectMBO/cardano-node
that referenced
this pull request
Aug 18, 2020
Highlights: * IntersectMBO/cardano-ledger#1784 * IntersectMBO/cardano-ledger#1785 * IntersectMBO/cardano-ledger#1779 * IntersectMBO/ouroboros-network#2512 * Remove unused source-repository-package cardano-sl-x509 (this package required the `ip < 1.5` constraint which conflicted with the `primitive >= 0.7.1.0` lower bound in `cardano-ledger-specs`). * Remove unused http-client dependency from stack.yaml * Remove duplicate from cabal.project
mrBliss
added a commit
to IntersectMBO/cardano-node
that referenced
this pull request
Aug 18, 2020
Highlights: * IntersectMBO/cardano-ledger#1784 * IntersectMBO/cardano-ledger#1785 * IntersectMBO/cardano-ledger#1779 * IntersectMBO/cardano-ledger#1785 * IntersectMBO/cardano-ledger#1742 * IntersectMBO/ouroboros-network#2512 * Remove unused source-repository-package cardano-sl-x509 (this package required the `ip < 1.5` constraint which conflicted with the `primitive >= 0.7.1.0` lower bound in `cardano-ledger-specs`). * Remove unused http-client dependency from stack.yaml * Remove duplicate from cabal.project
iohk-bors bot
added a commit
to IntersectMBO/cardano-node
that referenced
this pull request
Aug 18, 2020
1696: Update dependencies r=mrBliss a=mrBliss Highlights: * IntersectMBO/cardano-ledger#1784 * IntersectMBO/cardano-ledger#1785 * IntersectMBO/cardano-ledger#1779 * IntersectMBO/cardano-ledger#1785 * IntersectMBO/cardano-ledger#1742 * IntersectMBO/ouroboros-network#2512 Co-authored-by: Thomas Winant <thomas@well-typed.com> Co-authored-by: Samuel Leathers <samuel.leathers@iohk.io>
newhoggy
pushed a commit
to IntersectMBO/cardano-cli
that referenced
this pull request
May 24, 2023
1696: Update dependencies r=mrBliss a=mrBliss Highlights: * IntersectMBO/cardano-ledger#1784 * IntersectMBO/cardano-ledger#1785 * IntersectMBO/cardano-ledger#1779 * IntersectMBO/cardano-ledger#1785 * IntersectMBO/cardano-ledger#1742 * IntersectMBO/ouroboros-network#2512 Co-authored-by: Thomas Winant <thomas@well-typed.com> Co-authored-by: Samuel Leathers <samuel.leathers@iohk.io>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
From my profiling report of the validation of the first Shelley epoch (excluding the epoch transition):
The conversions (
Map.mapKeys) of the rewards accounts is very costly, andwe're doing it twice. Instead, convert the
wdrls, which is a much smaller map.After this change,
rewardsandrewards'are no longer hotspots (0.0 time!).