Skip to content

Fix compilation in bench.hs #301

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

Closed
siraben wants to merge 1 commit into from
Closed

Fix compilation in bench.hs #301

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
31 changes: 17 additions & 14 deletions bench/bench.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@ import qualified Data.Text as T
import qualified System.FilePath.Find as Find
import qualified Data.ByteString.Lazy as LazyByteString

import EVM (StorageModel(..))
import EVM.SymExec
import EVM.Solidity
import EVM.Solvers
import EVM.ABI
import EVM.Dapp
import EVM.Types
import EVM.Types (StorageModel(..), Expr(AbstractStore))
import EVM.Format (hexByteString)
import qualified EVM.TTY as TTY
import qualified EVM.Stepper as Stepper
import qualified EVM.Fetch as Fetch
Expand All @@ -34,10 +34,10 @@ import EVM.Test.BlockchainTests qualified as BCTests

main :: IO ()
main = defaultMain
[ mkbench erc20 "erc20" Nothing [1]
, mkbench (pure vat) "vat" Nothing [4]
, mkbench (pure deposit) "deposit" (Just 32) [4]
, mkbench (pure uniV2Pair) "uniV2" (Just 10) [4]
[ mkbench erc20 "erc20" 0 [1]
, mkbench (pure vat) "vat" 0 [4]
, mkbench (pure deposit) "deposit" 32 [4]
, mkbench (pure uniV2Pair) "uniV2" 10 [4]
, withResource bcjsons (pure . const ()) blockchainTests
]

Expand Down Expand Up @@ -84,25 +84,28 @@ runBCTest :: BCTests.Case -> IO Bool
runBCTest x =
do
let vm0 = BCTests.vmForCase x
result <- execStateT (Stepper.interpret (Fetch.zero 0 (Just 0)) . void $ Stepper.execFully) vm0
maybeReason <- BCTests.checkExpectation False x result
pure $ isNothing maybeReason
result <- Stepper.interpret (Fetch.zero 0 Nothing) vm0 Stepper.execFully
case result of
Left _ -> pure False
Right _ -> pure True
-- maybeReason <- BCTests.checkExpectation False x (_ result)
-- pure $ isNothing maybeReason
Comment on lines +88 to +92
Copy link
Contributor Author

@siraben siraben Jul 10, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wrote this to satisfy the type checker. Needs edits.



--- Helpers ----------------------------------------------------------------------------------------


debugContract :: ByteString -> IO ()
debugContract c = withSolvers CVC5 4 Nothing $ \solvers -> do
let prestate = abstractVM (mkCalldata Nothing []) c Nothing SymbolicS
let prestate = abstractVM (mkCalldata Nothing []) c Nothing AbstractStore
void $ TTY.runFromVM solvers Nothing Nothing emptyDapp prestate

findPanics :: Solver -> Natural -> Maybe Integer -> ByteString -> IO ()
findPanics :: Solver -> Natural -> Integer -> ByteString -> IO ()
findPanics solver count iters c = do
(_, res) <- withSolvers solver count Nothing $ \s -> do
let opts = defaultVeriOpts
{ maxIter = iters
, askSmtIters = (+ 1) <$> iters
{ maxIter = Just iters
, askSmtIters = iters + 1
}
checkAssert s allPanicCodes c Nothing [] opts
putStrLn "done"
Expand All @@ -112,7 +115,7 @@ findPanics solver count iters c = do
-- assertion violations takes an iteration bound, as well as a list of solver
-- counts to benchmark, allowing us to construct benchmarks that compare the
-- performance impact of increasing solver parallelisation
mkbench :: IO ByteString -> String -> Maybe Integer -> [Natural] -> Benchmark
mkbench :: IO ByteString -> String -> Integer -> [Natural] -> Benchmark
mkbench c name iters counts = localOption WallTime $ env c (bgroup name . bmarks)
where
bmarks c' = concat $ [
Expand Down