Remove SAWCore.Simulator.TermModel #2660
Merged
Conversation
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
brianhuffman
force-pushed
the
bh/no-term-model
branch
from
fe02a9b to
c2fe216
Compare
brianhuffman
force-pushed
the
bh/no-term-model
branch
2 times, most recently
from
7d0218f to
ffac933
Compare
brianhuffman
requested review from
RyanGlScott and
sauclovian-g
and removed request for
RyanGlScott
RyanGlScott
reviewed
Sep 29, 2025
| , "for the function." | ||
| ] | ||
|
|
||
| , prim "extract_uninterp" "[String] -> [String] -> Term -> TopLevel (Term, [(String,[(Term, Term)])])" |
Contributor
There was a problem hiding this comment.
Please note this function's removal in the SAW changelog.
Comment on lines
573
to
+584
| normalize_term_opaque :: [Text] -> TypedTerm -> TopLevel TypedTerm | ||
| normalize_term_opaque opaque tt = | ||
| do sc <- getSharedContext | ||
| modmap <- io (scGetModuleMap sc) | ||
| idxs <- mconcat <$> mapM (resolveName sc) opaque | ||
| let opaqueSet = Set.fromList idxs | ||
| tm' <- io (TM.normalizeSharedTerm sc modmap mempty mempty opaqueSet (ttTerm tt)) | ||
| tm' <- io (scTypeCheckWHNF sc =<< scUnfoldConstantSet sc False opaqueSet (ttTerm tt)) | ||
| pure tt{ ttTerm = tm' } | ||
|
|
||
| goal_normalize :: [Text] -> ProofScript () | ||
| goal_normalize opaque = | ||
| execTactic $ tacticChange $ \goal -> | ||
| do sc <- getSharedContext | ||
| idxs <- mconcat <$> mapM (resolveName sc) opaque | ||
| modmap <- io (scGetModuleMap sc) | ||
| let opaqueSet = Set.fromList idxs | ||
| sqt' <- io $ traverseSequentWithFocus (normalizeProp sc modmap opaqueSet) (goalSequent goal) | ||
| sqt' <- io $ traverseSequentWithFocus (normalizeProp sc opaqueSet) (goalSequent goal) |
Contributor
There was a problem hiding this comment.
Do you expect there to be any subtle differences in behavior in the normalize_term_opaque/goal_normalize functions as a result of these changes?
Contributor
Author
There was a problem hiding this comment.
Yes, there will be differences. The new implementation will (by definition) always return a normalized term that is convertible (according to the type checker) with the input term. This was not the case with normalizeSharedTerm (see #2552).
Contributor
There was a problem hiding this comment.
Gotcha. To be on the safe side, it would be worth mentioning this in the changelog as well.
RyanGlScott
approved these changes
Sep 29, 2025
This was referenced Sep 29, 2025
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 PR removes the
TermModelbackend from the SAWCore simulator. This was a backend that used the SAWCoreTermtype itself as the value type, implementing a sort of partial evaluator for SAWCore terms.TermModelprimarily existed to support the MRSolver tactic, which has now been removed (#2576).As it turns out, a lot of extra plumbing within the SAWCore simulator was only there to support
TermModel, so the removal enables much simplification of SAWCore code. In particular, removing the extra type information from the simulator unblocks further reforms to the recursor implementation (which will be a follow-on to #2429 to solve #2358).Removing
TermModelnecessitated the removal of the experimental SAWScriptextract_uninterpcommand, which was not used in any of our regression tests or examples. Commandsnormalize_term_opaque(also unused in our tests/examples) andgoal_normalizewere previously implemented usingTermModel; these are still in place but are now implemented instead usingscUnfoldConstantSetandscTypeCheckWHNF.