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.

Sign up for GitHub

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

Jump to bottom

Split on unique conditions. #2010

Merged
merged 3 commits into from
Jan 16, 2024
Merged

Split on unique conditions. #2010

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ebfbe8e
Split on unique conditions.
andreistefanescu Jan 14, 2024
451338f
Address comments.
andreistefanescu Jan 16, 2024
0894c61
Merge remote-tracking branch 'origin/master' into split-cond
andreistefanescu Jan 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions saw-core/saw-core.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ library
data-inttrie,
data-ref,
directory,
extra,
filepath,
hashable >= 1.3.4,
lens >= 3.8,
Expand Down
6 changes: 5 additions & 1 deletion saw-core/src/Verifier/SAW/Rewriter.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ import Data.IORef
import qualified Data.Foldable as Foldable
import Data.Map (Map)
import qualified Data.List as List
import Data.List.Extra (nubOrd)
import qualified Data.Map as Map
import Data.Set (Set)
import qualified Data.Set as Set
Expand Down Expand Up @@ -936,7 +937,10 @@ hoistIfs sc t = do
let ss :: Simpset () = addRules rules emptySimpset

(t', conds) <- doHoistIfs sc ss cache itePat . snd =<< rewriteSharedTerm sc ss t
splitConds sc ss (map fst conds) t'

-- remove duplicate conditions from the list, as muxing in SAW can result in
-- many copies of the same condition, which cause a performance issue
splitConds sc ss (nubOrd $ map fst conds) t'


splitConds :: Ord a => SharedContext -> Simpset a -> [Term] -> Term -> IO Term
Expand Down
Loading