Make benchmarks compile again.

Additionally, fix the problem which caused one failing benchmark
to stop other benchmarks from running.
This commit is contained in:
Artyom Kazak 2014-08-01 15:32:13 +04:00
parent 143d5b7328
commit 857c63f77e

View file

@ -20,19 +20,20 @@ import Criterion.Main
import Criterion.Config import Criterion.Config
import System.Environment (getArgs) import System.Environment (getArgs)
import Data.Monoid import Data.Monoid
import Data.Maybe (mapMaybe)
import Debug.Trace (trace)
readerBench :: Pandoc readerBench :: Pandoc
-> (String, ReaderOptions -> String -> IO Pandoc) -> (String, ReaderOptions -> String -> IO Pandoc)
-> Benchmark -> Maybe Benchmark
readerBench doc (name, reader) = readerBench doc (name, reader) = case lookup name writers of
let writer = case lookup name writers of Just (PureStringWriter writer) ->
Just (PureStringWriter w) -> w let inp = writer def{ writerWrapText = True} doc
_ -> error $ "Could not find writer for " ++ name -- we compute the length to force full evaluation
inp = writer def{ writerWrapText = True } doc getLength (Pandoc (Meta _) d) = length d
-- we compute the length to force full evaluation in return $ bench (name ++ " reader") $ whnfIO $ getLength `fmap`
getLength (Pandoc (Meta _) d) = length d (reader def{ readerSmart = True }) inp
in bench (name ++ " reader") $ whnfIO $ getLength `fmap` _ -> trace ("\nCould not find writer for " ++ name ++ "\n") Nothing
(reader def{ readerSmart = True }) inp
writerBench :: Pandoc writerBench :: Pandoc
-> (String, WriterOptions -> Pandoc -> String) -> (String, WriterOptions -> Pandoc -> String)
@ -43,13 +44,17 @@ writerBench doc (name, writer) = bench (name ++ " writer") $ nf
main :: IO () main :: IO ()
main = do main = do
args <- getArgs args <- getArgs
(conf,_) <- parseArgs defaultConfig{ cfgSamples = Last $ Just 20 } defaultOptions args (conf,_) <- parseArgs defaultConfig{ cfgSamples = Last $ Just 20 }
inp <- readFile "README" defaultOptions args
inp <- readFile "README"
inp2 <- readFile "tests/testsuite.txt" inp2 <- readFile "tests/testsuite.txt"
let opts = def{ readerSmart = True } let opts = def{ readerSmart = True }
let doc = readMarkdown opts $ inp ++ unlines (drop 3 $ lines inp2) let doc = readMarkdown opts $ inp ++ unlines (drop 3 $ lines inp2)
let readerBs = map (readerBench doc) let readers' = [(n,r) | (n, StringReader r) <- readers]
$ filter (\(n,_) -> n /="haddock") readers let readerBs = mapMaybe (readerBench doc)
$ filter (\(n,_) -> n /="haddock") readers'
let writers' = [(n,w) | (n, PureStringWriter w) <- writers] let writers' = [(n,w) | (n, PureStringWriter w) <- writers]
let writerBs = map (writerBench doc)
$ writers'
defaultMainWith conf (return ()) $ defaultMainWith conf (return ()) $
map (writerBench doc) writers' ++ readerBs writerBs ++ readerBs