Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

v2.1: SIMD-0207: Raise block limit to 50M (backport of #4112) #4145

Open
wants to merge 2 commits into
base: v2.1
Choose a base branch
from

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Dec 16, 2024

Problem

Summary of Changes

  • Bank initialization and on epoch boundaries will set limits from feature-set
    • override for u64::MAX in tests/benches

Fixes #


This is an automatic backport of pull request #4112 done by [Mergify](https://mergify.com).

* SIMD-0207: Raise block limit to 50M (#4026)

* Fix loading from snapshots/genesis

(cherry picked from commit 9e59baa)

# Conflicts:
#	cost-model/src/block_cost_limits.rs
#	runtime/src/bank.rs
#	sdk/feature-set/src/lib.rs
@mergify mergify bot requested a review from a team as a code owner December 16, 2024 17:34
@mergify mergify bot added the conflicts label Dec 16, 2024
Copy link
Author

mergify bot commented Dec 16, 2024

Cherry-pick of 9e59baa has failed:

On branch mergify/bp/v2.1/pr-4112
Your branch is up to date with 'origin/v2.1'.

You are currently cherry-picking commit 9e59baae7.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   cost-model/src/cost_tracker.rs
	modified:   runtime/src/bank/tests.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   cost-model/src/block_cost_limits.rs
	both modified:   runtime/src/bank.rs
	both modified:   sdk/feature-set/src/lib.rs

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

Copy link

@bw-solana bw-solana left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@apfitzge apfitzge requested a review from t-nelson December 17, 2024 17:51
@@ -38,6 +38,7 @@ pub const MAX_BLOCK_UNITS: u64 =

#[cfg(test)]
static_assertions::const_assert_eq!(MAX_BLOCK_UNITS, 48_000_000);
pub const MAX_BLOCK_UNITS_SIMD_0207: u64 = 50_000_000;
Copy link

@t-nelson t-nelson Dec 18, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this should be behind #[feature("dev-only-context-utils")] the only external place it's used is a test. though perhaps the test can simply be in this crate

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants