GaloisInc/cryptol
1
1
Fork 0
mirror of https://github.com/GaloisInc/cryptol.git synced 2024-11-24 15:08:58 +03:00
Code Issues Projects Releases Wiki Activity

Memoize result of binary logic operators on LargeBitsVal arguments.

Browse Source 
Fixes #446.

This fix is very similar to the one for #514, which added memoization
for symbolic if-then-else on sequences. This is another instance where
a SeqMap is created where each lookup triggers two further lookups,
causing exponential runtime behavior in the worst case.
This commit is contained in:
Brian Huffman 2018-07-18 23:02:27 -07:00
parent ec7c44d36e
commit a66338293a
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/Cryptol/Prims/Eval.hs
View File

@ -1049,18 +1049,19 @@ wordValLogicOp :: BitWord b w i
-> (w -> w -> w) -> (w -> w -> w)
-> WordValue b w i -> WordValue b w i
-> WordValue b w i -> WordValue b w i
-> WordValue b w i -> Eval (WordValue b w i)
wordValLogicOp _ wop (WordVal w1) (WordVal w2) = WordVal (wop w1 w2) wordValLogicOp _ wop (WordVal w1) (WordVal w2) = return $ WordVal (wop w1 w2)
wordValLogicOp bop _ (BitsVal xs) (BitsVal ys) = wordValLogicOp bop _ (BitsVal xs) (BitsVal ys) =
BitsVal $ Seq.zipWith (\x y -> bop <$> x <*> y) xs ys ready $ BitsVal $ Seq.zipWith (\x y -> bop <$> x <*> y) xs ys
wordValLogicOp bop _ (WordVal w1) (BitsVal ys) = wordValLogicOp bop _ (WordVal w1) (BitsVal ys) =
BitsVal $ Seq.zipWith (\x y -> bop <$> x <*> y) (Seq.fromList $ map ready $ unpackWord w1) ys ready $ BitsVal $ Seq.zipWith (\x y -> bop <$> x <*> y) (Seq.fromList $ map ready $ unpackWord w1) ys
wordValLogicOp bop _ (BitsVal xs) (WordVal w2) = wordValLogicOp bop _ (BitsVal xs) (WordVal w2) =
BitsVal $ Seq.zipWith (\x y -> bop <$> x <*> y) xs (Seq.fromList $ map ready $ unpackWord w2) ready $ BitsVal $ Seq.zipWith (\x y -> bop <$> x <*> y) xs (Seq.fromList $ map ready $ unpackWord w2)
wordValLogicOp bop _ w1 w2 = LargeBitsVal (wordValueSize w1) zs wordValLogicOp bop _ w1 w2 = LargeBitsVal (wordValueSize w1) <$> zs
where zs = IndexSeqMap $ \i -> VBit <$> (bop <$> (fromBit =<< lookupSeqMap xs i) <*> (fromBit =<< lookupSeqMap ys i)) where zs = memoMap $ IndexSeqMap $ \i -> op <$> (lookupSeqMap xs i) <*> (lookupSeqMap ys i)
xs = asBitsMap w1 xs = asBitsMap w1
ys = asBitsMap w2 ys = asBitsMap w2
op x y = VBit (bop (fromVBit x) (fromVBit y))
-- | Merge two values given a binop. This is used for and, or and xor. -- | Merge two values given a binop. This is used for and, or and xor.
logicBinary :: forall b w i logicBinary :: forall b w i
@ -1088,7 +1089,7 @@ logicBinary opb opw = loop
TVSeq w aty TVSeq w aty
-- words -- words
| isTBit aty | isTBit aty
-> do v <- delay Nothing -> do v <- delay Nothing $ join
(wordValLogicOp opb opw <$> (wordValLogicOp opb opw <$>
fromWordVal "logicBinary l" l <*> fromWordVal "logicBinary l" l <*>
fromWordVal "logicBinary r" r) fromWordVal "logicBinary r" r)