[move-prover] Sharding feature + re-animate Prover.toml #15775
There are no files selected for viewing
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| [backend] | ||
| shards = 5 |
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -59,11 +59,15 @@ use move_stackless_bytecode::{ | |
| Operation, PropKind, | ||
| }, | ||
| }; | ||
| use std::{ | ||
| collections::{BTreeMap, BTreeSet}, | ||
| hash::{DefaultHasher, Hash, Hasher}, | ||
| }; | ||
|
|
||
| pub struct BoogieTranslator<'env> { | ||
| env: &'env GlobalEnv, | ||
| options: &'env BoogieOptions, | ||
| for_shard: Option<usize>, | ||
| writer: &'env CodeWriter, | ||
| spec_translator: SpecTranslator<'env>, | ||
| targets: &'env FunctionTargetsHolder, | ||
|
|
@@ -85,12 +89,14 @@ impl<'env> BoogieTranslator<'env> { | |
| pub fn new( | ||
| env: &'env GlobalEnv, | ||
| options: &'env BoogieOptions, | ||
| for_shard: Option<usize>, | ||
| targets: &'env FunctionTargetsHolder, | ||
| writer: &'env CodeWriter, | ||
| ) -> Self { | ||
| Self { | ||
| env, | ||
| options, | ||
| for_shard, | ||
| targets, | ||
| writer, | ||
| spec_translator: SpecTranslator::new(writer, env, options), | ||
|
|
@@ -113,7 +119,24 @@ impl<'env> BoogieTranslator<'env> { | |
| .unwrap_or(default_timeout) | ||
| } | ||
|
|
||
| /// Checks whether the given function is a verification target. | ||
| fn is_verified(&self, fun_variant: &FunctionVariant, fun_target: &FunctionTarget) -> bool { | ||
| if !fun_variant.is_verified() { | ||
| return false; | ||
| } | ||
| if let Some(shard) = self.for_shard { | ||
| // Check whether the shard is included. | ||
| if self.options.only_shard.is_some() && self.options.only_shard != Some(shard + 1) { | ||
|
There was a problem hiding this comment. nit: could use |
||
| return false; | ||
| } | ||
| // Check whether it is part of the shard. | ||
| let mut hasher = DefaultHasher::new(); | ||
|
There was a problem hiding this comment. I think this hasher is non-deterministic? Thus, if you decide to shard one by one, a target might fall into different shards each time? Thus, we may want to use a deterministic hasher. There was a problem hiding this comment. @wrwg Checking in to see if you missed this before merging. |
||
| fun_target.func_env.get_full_name_str().hash(&mut hasher); | ||
| if (hasher.finish() as usize) % self.options.shards != shard { | ||
| return false; | ||
| } | ||
| } | ||
| // Check whether the estimated duration is too large for configured timeout | ||
| let options = self.options; | ||
| let estimate_timeout_opt = fun_target | ||
| .func_env | ||
|
|
@@ -123,9 +146,9 @@ impl<'env> BoogieTranslator<'env> { | |
| .func_env | ||
| .get_num_pragma(TIMEOUT_PRAGMA) | ||
| .unwrap_or(options.vc_timeout); | ||
| estimate_timeout <= timeout | ||
| } else { | ||
| true | ||
| } | ||
| } | ||
|
|
||
|
|
@@ -279,7 +302,7 @@ impl<'env> BoogieTranslator<'env> { | |
| continue; | ||
| } | ||
| for (variant, ref fun_target) in self.targets.get_targets(fun_env) { | ||
| if self.is_verified(&variant, fun_target) { | ||
| verified_functions_count += 1; | ||
| debug!( | ||
| "will verify primary function `{}`", | ||
|
|
@@ -363,7 +386,15 @@ impl<'env> BoogieTranslator<'env> { | |
| } | ||
| // Emit any finalization items required by spec translation. | ||
| self.spec_translator.finalize(); | ||
| let shard_info = if let Some(shard) = self.for_shard { | ||
| format!(" (for shard #{} of {})", shard + 1, self.options.shards) | ||
| } else { | ||
| "".to_string() | ||
| }; | ||
| info!( | ||
| "{} verification conditions{}", | ||
| verified_functions_count, shard_info | ||
| ); | ||
| } | ||
| } | ||
|
|
||
|
|
@@ -1106,7 +1137,7 @@ impl<'env> FunctionTranslator<'env> { | |
| } | ||
|
|
||
| // Initial assumptions | ||
| if self.parent.is_verified(variant, fun_target) { | ||
| self.translate_verify_entry_assumptions(fun_target); | ||
| } | ||
|
|
||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This PR does not touch anything in the execution stack, so this most be from previous PRs. (Perhaps permissioned signers? @igor-aptos
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Seems like signer has indeed added noise - here it the recalibration PR - #15778
generated by doing:
note - this particular line didn't regress as much as you saw from the first run - you can see your second run much closer to the original value. But I assume all the changes create way too much noise anyways.