merge Benchmark-Collection into Benchmark

Author: linerlock

benchmark/Benchmark-Collection.hs

@@ -6,22 +6,22 @@ import Control.Applicative
 import Control.DeepSeq (NFData(rnf))
 import Criterion.Main
 import Criterion.Config
-import Text.Parsec
-import Text.Parsec.ByteString
-
 import Language.Egison
 
 runEgisonFile :: String -> IO (Either EgisonError Env)
-runEgisonFile path = do
-  env <- loadPrimitives nullEnv >>= loadLibraries
-  evalEgisonTopExpr env $ LoadFile path
+runEgisonFile path = loadPrimitives nullEnv >>= loadLibraries >>= flip loadEgisonFile path
 
 config :: Config
 config = defaultConfig { cfgSamples   = ljust 3 
                        , cfgPerformGC = ljust True }
 
 main :: IO ()
-main = defaultMainWith config (return ()) [
-    bgroup "fact" [ bench "30000" $ runEgisonFile "benchmark/fact-30000.egi" ]
-  ]
+main = defaultMainWith config (return ()) 
+       [ bgroup "fact" [ bench "30000" $ runEgisonFile "benchmark/fact-30000.egi" ]
+       , bgroup "collection"  
+         [ bench "cons-bench" $ runEgisonFile "benchmark/collection-bench-cons.egi"
+         , bench "cons-bench-large" $ runEgisonFile "benchmark/collection-bench-cons-large.egi"
+         , bench "snoc-bench" $ runEgisonFile "benchmark/collection-bench-snoc.egi"
+         ]
+       ]
 

benchmark/Benchmark.hs

@@ -46,13 +46,7 @@ Benchmark benchmark
   Type: exitcode-stdio-1.0
   Hs-Source-Dirs:  benchmark
   Main-Is: Benchmark.hs
-  Build-Depends: egison, base >= 4.0 && < 5, deepseq, criterion >= 0.5, transformers, mtl, parsec >= 3.0
-
-Benchmark benchmark-collection
-  Type: exitcode-stdio-1.0
-  Hs-Source-Dirs:  benchmark
-  Main-Is: Benchmark-Collection.hs
-  Build-Depends: egison, base >= 4.0 && < 5, deepseq, criterion >= 0.5, transformers, mtl, parsec >= 3.0
+  Build-Depends: egison, base >= 4.0 && < 5, deepseq, criterion >= 0.5, transformers, mtl
 
 Executable egison
   Main-is:             egisoni.hs