Consider known predicates in Booster's simplifier API #3953
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -101,7 +101,7 @@ computeCeilRule :: | |
| computeCeilRule mllvm def [email protected]{lhs, requires, rhs, attributes, computedAttributes} | ||
| | null computedAttributes.notPreservesDefinednessReasons = pure Nothing | ||
| | otherwise = do | ||
| (res, _) <- runEquationT def mllvm Nothing mempty mempty $ do | ||
| lhsCeils <- Set.fromList <$> computeCeil lhs | ||
| requiresCeils <- Set.fromList <$> concatMapM (computeCeil . coerce) (Set.toList requires) | ||
| let subtractLHSAndRequiresCeils = (Set.\\ (lhsCeils `Set.union` requiresCeils)) . Set.fromList | ||
|
|
||
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,54 @@ | ||
| module USE-PATH-CONDITION-IN-EQUATIONS | ||
| imports INT | ||
| imports BOOL | ||
|
|
||
| syntax State ::= test1Init() | ||
| | test1State1() | ||
| | test1State2() | ||
|
|
||
| | test2Init() | ||
| | test2State1() | ||
| | test2State2() | ||
|
|
||
| syntax Int ::= test1F ( Int ) [function, total, no-evaluators] | ||
| | test2F ( Int ) [function, total, no-evaluators] | ||
|
|
||
| configuration <k> $PGM:State ~> .K </k> | ||
| <int> 0:Int </int> | ||
|
|
||
| //////////////////////////////////////////////////////////////////////////////// | ||
| // Here the simplification's side condition is syntactically present // | ||
| // in the path condition and is not checked. // | ||
| // Result: Stuck at depth 2 in state test1State2() // | ||
| // after applying rules test1-init,test1-1-2 // | ||
| //////////////////////////////////////////////////////////////////////////////// | ||
| rule [test1-init]: <k> test1Init() => test1State1() ... </k> | ||
| <int> _ => ?X </int> | ||
| ensures ?X ==Int 42 | ||
|
|
||
| rule [test1-1-2]: <k> test1State1() => test1State2() ... </k> | ||
| <int> X </int> | ||
| requires test1F(X) >Int 0 | ||
|
|
||
| rule [test1F-simplify]: test1F(X:Int) => X requires X ==Int 42 [simplification] | ||
|
|
||
| //////////////////////////////////////////////////////////////////////////////// | ||
| // Here the simplification's side condition is implied by the path condition, // | ||
| // but we need an SMT solver to establish that. // | ||
| // Result: Aborted at depth 1 due to indeterminate condition of rule test2-1-2 // | ||
| //////////////////////////////////////////////////////////////////////////////// | ||
| rule [test2-init]: <k> test2Init() => test2State1() ... </k> | ||
| <int> _ => ?X </int> | ||
| ensures ?X ==Int 42 | ||
|
|
||
| rule [test2-1-2]: <k> test2State1() => test2State2() ... </k> | ||
| <int> X </int> | ||
| requires test2F(X) >Int 0 | ||
|
|
||
| rule [test2F-simplify]: test2F(X:Int) => X requires X >Int 0 [simplification] | ||
|
|
||
| // to produce input state: | ||
| // krun --output kore --depth 1 -cPGM='test1Init()' | kore-parser test-kompiled/definition.kore --module TEST --pattern /dev/stdin --print-pattern-json > state-test1Init.json | ||
| // then edit state-test1Init.json to substitute test1State1() for test1Init() | ||
|
|
||
| endmodule |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| echo "kompiling use-path-condition-in-equations.k" | ||
| kompile --backend haskell use-path-condition-in-equations.k | ||
| cp use-path-condition-in-equations-kompiled/definition.kore use-path-condition-in-equations.kore | ||
| rm -r use-path-condition-in-equations-kompiled |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| # Test the use of the known path condition when applying simplifications | ||
|
|
||
| See `../resourses/use-path-condition-in-equations.k`. |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,148 @@ | ||
| { | ||
| "jsonrpc": "2.0", | ||
| "id": 1, | ||
| "result": { | ||
| "reason": "stuck", | ||
| "depth": 2, | ||
| "state": { | ||
| "term": { | ||
| "format": "KORE", | ||
| "version": 1, | ||
| "term": { | ||
| "tag": "App", | ||
| "name": "Lbl'-LT-'generatedTop'-GT-'", | ||
| "sorts": [], | ||
| "args": [ | ||
| { | ||
| "tag": "App", | ||
| "name": "Lbl'-LT-'k'-GT-'", | ||
| "sorts": [], | ||
| "args": [ | ||
| { | ||
| "tag": "App", | ||
| "name": "kseq", | ||
| "sorts": [], | ||
| "args": [ | ||
| { | ||
| "tag": "App", | ||
| "name": "inj", | ||
| "sorts": [ | ||
| { | ||
| "tag": "SortApp", | ||
| "name": "SortState", | ||
| "args": [] | ||
| }, | ||
| { | ||
| "tag": "SortApp", | ||
| "name": "SortKItem", | ||
| "args": [] | ||
| } | ||
| ], | ||
| "args": [ | ||
| { | ||
| "tag": "App", | ||
| "name": "Lbltest1State2'LParRParUnds'USE-PATH-CONDITION-IN-EQUATIONS'Unds'State", | ||
| "sorts": [], | ||
| "args": [] | ||
| } | ||
| ] | ||
| }, | ||
| { | ||
| "tag": "App", | ||
| "name": "dotk", | ||
| "sorts": [], | ||
| "args": [] | ||
| } | ||
| ] | ||
| } | ||
| ] | ||
| }, | ||
| { | ||
| "tag": "App", | ||
| "name": "Lbl'-LT-'int'-GT-'", | ||
| "sorts": [], | ||
| "args": [ | ||
| { | ||
| "tag": "EVar", | ||
| "name": "Var'Ques'X", | ||
| "sort": { | ||
| "tag": "SortApp", | ||
| "name": "SortInt", | ||
| "args": [] | ||
| } | ||
| } | ||
| ] | ||
| }, | ||
| { | ||
| "tag": "App", | ||
| "name": "Lbl'-LT-'generatedCounter'-GT-'", | ||
| "sorts": [], | ||
| "args": [ | ||
| { | ||
| "tag": "DV", | ||
| "sort": { | ||
| "tag": "SortApp", | ||
| "name": "SortInt", | ||
| "args": [] | ||
| }, | ||
| "value": "0" | ||
| } | ||
| ] | ||
| } | ||
| ] | ||
| } | ||
| }, | ||
| "predicate": { | ||
| "format": "KORE", | ||
| "version": 1, | ||
| "term": { | ||
| "tag": "Equals", | ||
| "argSort": { | ||
| "tag": "SortApp", | ||
| "name": "SortBool", | ||
| "args": [] | ||
| }, | ||
| "sort": { | ||
| "tag": "SortApp", | ||
| "name": "SortGeneratedTopCell", | ||
| "args": [] | ||
| }, | ||
| "first": { | ||
| "tag": "DV", | ||
| "sort": { | ||
| "tag": "SortApp", | ||
| "name": "SortBool", | ||
| "args": [] | ||
| }, | ||
| "value": "true" | ||
| }, | ||
| "second": { | ||
| "tag": "App", | ||
| "name": "Lbl'UndsEqlsEqls'Int'Unds'", | ||
| "sorts": [], | ||
| "args": [ | ||
| { | ||
| "tag": "EVar", | ||
| "name": "Var'Ques'X", | ||
| "sort": { | ||
| "tag": "SortApp", | ||
| "name": "SortInt", | ||
| "args": [] | ||
| } | ||
| }, | ||
| { | ||
| "tag": "DV", | ||
| "sort": { | ||
| "tag": "SortApp", | ||
| "name": "SortInt", | ||
| "args": [] | ||
| }, | ||
| "value": "42" | ||
| } | ||
| ] | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } |
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.
Maybe we should still start empty and push the path condition as the first step.
The code here returns all stored
predicatesas constraints of the pattern (in line 424) which may or may not be correct depending on how the function was called. This is correct for the current use of the function but might not be correct in all future use cases.Alternatively, how about we inline all of
evaluatedPattern'intoevaluatePattern(so no mistakes are possible).