[compiler-v2] Making v2 the basis of the prover (step #1) #12462
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
rahxephon89
approved these changes
Mar 11, 2024
| @@ -119,6 +119,8 @@ pub enum Constraint { | |||
| /// The type variable must be instantiated with a struct which has the given fields with | |||
| /// types. | |||
| SomeStruct(BTreeMap<Symbol, Type>), | |||
| /// The type variable must be instanted with a type which has the given ability | |||
There was a problem hiding this comment.
typo: instanted => instantiated?
There was a problem hiding this comment.
Done in the next commit
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #12462 +/- ##
========================================
Coverage 63.9% 63.9%
========================================
Files 812 816 +4
Lines 180090 180664 +574
========================================
+ Hits 115116 115548 +432
- Misses 64974 65116 +142 ☔ View full report in Codecov by Sentry. |
Yes, there is a bug linked with those TODOs and its related to that first the receiver style PR needs to land. #12437 |
wrwg
force-pushed
the
wrwg/fun-in-spec
branch
2 times, most recently
from
565d7f1 to
447f486
Compare
vineethk
approved these changes
Mar 13, 2024
There was a problem hiding this comment.
Did a shallow review to unblock, as a detailed review would take time. Mainly looked at if there was anything majorly affecting the current compiler pipeline. Might be worth coming back and looking at some of the code once the prover is fully integrated.
I only have minor comments, but feel free to merge without addressing those (and then address them later in a followup commit).
|
|
||
| /// Represents the state of a rewriting target. | ||
| #[derive(Debug, Clone, Eq, PartialEq)] | ||
| pub enum RewriteState { |
There was a problem hiding this comment.
Please add documentation for the enums.
| impure_action: F, | ||
| /// Map from functions to their known pureness status | ||
| pureness: BTreeMap<QualifiedId<FunId>, bool>, | ||
| /// Stack of functions currently visting |
There was a problem hiding this comment.
Suggested change
| /// Stack of functions currently visting | |
| /// Stack of functions currently visiting |
| @@ -1,15 +0,0 @@ | |||
| module 0x42::DuplicateFunction { | |||
There was a problem hiding this comment.
Is this test deleted intentionally?
There was a problem hiding this comment.
Thanks for catching, fixed.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This adds the missing parts to let compiler v2 fully support the specification language, and switches the prover to use v2 as the basis for verification of v1 bytecode. There is one further step needed to run the prover also on the code generated by v2 but that one is smaller than here. Notice that with this, we are dogfooding the v2 compiler frontend in production with the Move prover. There is no switching back and forth, code for the v1 prover integration has been removed. In more detail this does the following:
- There are two new env processors, the spec_checker and the spec_rewriter:
- `spec_checker` checks the correct use of Move functions in the specification language. Those functions must be 'pure' and not depend on state or use certain other constructs. The checker is to be run as part of the regular compiler chain.
- `spec_rewriter` rewrites specification expressions by converting used Move functions into specification functions, and doing other transformations to lift a Move expression into the specification language. This is only run by the prover itself.
- Inlining has been extended to deal with specification constructs.
- To support the inlining refactoring and the new processors, a new module `rewrite_target` is introduced which allows to collect functions and specification elements in a program in a unified fashion, rewriting them, and writing back to the environment. This new data structure has been inspired by the current design of the inliner and naturally extends it.
- A lot of ugliness has been ripped out of the model builder infrastructure (e.g. `TryImplAsSpec` mode is gone, as this is now handled by the `spec_rewriter`). More should come in step #2.
- Multiple test cases have been added.
- The prover driver has been adapted to use the new components.
- Adding tuple support to the specification language as they are created by the inliner. - Fixing an issue in memory usage calculation - Adding a flag `--aptos` to the prover command line for easier debugging, avoiding the CLI.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
✅ Forge suite
|
✅ Forge suite
|
brmataptos
reviewed
Mar 14, 2024
| check_and_rewrite_pipeline(options, false, RewritingScope::CompilationTarget); | ||
| // Add the specification rewriter for testing here as well, even though it is not run | ||
| // as part of regular compilation, but only as part of a prover run. | ||
| env_pipeline.add("specification rewriter", spec_rewriter::run_spec_rewriter); |
There was a problem hiding this comment.
This path is part of the compiler testing, not the prover testing.
| ); | ||
| // The transformation pipeline on the GlobalEnv | ||
| let mut env_pipeline = | ||
| check_and_rewrite_pipeline(options, false, RewritingScope::CompilationTarget); |
There was a problem hiding this comment.
This has broken the no-simplification tests below. Please fix it.
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.
This adds the missing parts to let compiler v2 fully support the specification language, and switches the prover to use v2 as the basis for verification of v1 bytecode. There is one further step needed to run the prover also on the code generated by v2 but that one is smaller than here. Notice that with this, we are dogfooding the v2 compiler frontend in production with the Move prover. There is no switching back and forth, code for the v1 prover integration has been removed. In more detail this does the following:
spec_checkerchecks the correct use of Move functions in the specification language. Those functions must be 'pure' and not depend on state or use certain other constructs. The checker is to be run as part of the regular compiler chain.spec_rewriterrewrites specification expressions by converting used Move functions into specification functions, and doing other transformations to lift a Move expression into the specification language. This is only run by the prover itself.rewrite_targetis introduced which allows to collect functions and specification elements in a program in a unified fashion, rewriting them, and writing back to the environment. This new data structure has been inspired by the current design of the inliner and naturally extends it.TryImplAsSpecmode is gone, as this is now handled by thespec_rewriter). More should come in step 2.