Merge pull request #834 from phadej/issue-678-bench

Integrate issue #678 benchmark into suite

Author: phadej

benchmarks/aeson-benchmarks.cabal

@@ -100,12 +100,14 @@ executable aeson-benchmark-suite
   ghc-options:      -Wall -O2 -rtsopts
   build-depends:
       aeson-benchmarks
+    , attoparsec
     , base
     , base-compat-batteries
     , bytestring
     , criterion
     , deepseq
     , filepath
+    , scientific
     , template-haskell
     , text
     , time
@@ -115,6 +117,7 @@ executable aeson-benchmark-suite
     GitHub
     Twitter
     Twitter.Manual
+    Issue673
 
 -- Benchmarks below are haven't been worked out yet
 
@@ -332,20 +335,3 @@ executable aeson-benchmark-foldable
     , text
     , unordered-containers
     , vector
-
-executable aeson-issue-673
-  default-language: Haskell2010
-  main-is:          Issue673.hs
-  hs-source-dirs:   bench
-  ghc-options:      -Wall -O1 -rtsopts
-  build-depends:
-      aeson-benchmarks
-    , attoparsec
-    , base
-    , base-compat-batteries
-    , bytestring
-    , criterion              >=1.0
-    , scientific
-
-  if impl(ghc <8.0)
-    build-depends: semigroups

benchmarks/bench/Issue673.hs

@@ -1,24 +1,12 @@
 {-# LANGUAGE NoImplicitPrelude #-}
 {-# LANGUAGE OverloadedStrings #-}
 
-module Main (
-    main,
-    input17,
-    input32,
-    input64,
-    input128,
-    input256,
-    input2048,
-    input4096,
-    input8192,
-    input16384,
-  ) where
+module Issue673 where
 
 import Criterion.Main
 import Prelude.Compat
 import Data.Int (Int64)
 import Data.Scientific (Scientific)
-import Data.Semigroup ((<>))
 import Data.Aeson.Parser (scientific)
 
 import qualified Data.Attoparsec.ByteString.Lazy as AttoL
@@ -87,29 +75,31 @@ input16384 :: LBS.ByteString
 input16384 = generate 16384
 
 
-main :: IO ()
-main =  defaultMain
+benchmark :: Benchmark
+benchmark = bgroup "Integer-decoder"
     -- works on 64bit
     [ benchPair "17" input17
     -- , benchPair "32" input32
     -- , benchPair "64" input64
     -- , benchPair "128" input128
     -- , benchPair "256" input256
     , benchPair "2048" input2048
-    , benchPair "4096" input4096
-    , benchPair "8192" input8192
+    -- , benchPair "4096" input4096
+    -- , benchPair "8192" input8192
     , benchPair "16384" input16384
     ]
   where
     benchPair name input = bgroup name
         [ bench "Int"        $ whnf decodeInt input
         , bench "Simple"     $ whnf bsToIntegerSimple (LBS.toStrict input)
-        , bench "Optim"      $ whnf bsToInteger (LBS.toStrict input)
-        , bench "Read"       $ whnf decodeViaRead input
-        , bench "Scientific" $ whnf decodeScientific input
-        , bench "parserA"    $ whnf decodeAtto  input
-        , bench "parserS"    $ whnf decodeAtto8  input
-        , bench "String"     $ whnf decodeString $ "\"" <> input <> "\""
+
+        -- other disabled, they are interesting for comparison only.
+        -- , bench "Optim"      $ whnf bsToInteger (LBS.toStrict input)
+        -- , bench "Read"       $ whnf decodeViaRead input
+        -- , bench "Scientific" $ whnf decodeScientific input
+        -- , bench "parserA"    $ whnf decodeAtto  input
+        -- , bench "parserS"    $ whnf decodeAtto8  input
+        -- , bench "String"     $ whnf decodeString $ "\"" <> input <> "\""
         ]
 
 -------------------------------------------------------------------------------

benchmarks/bench/Suite.hs

@@ -20,16 +20,16 @@ import qualified Data.Aeson.Encoding.Builder    as Aeson.EB
 import qualified Data.Aeson.Parser.UnescapeFFI  as FFI
 import qualified Data.Aeson.Parser.UnescapePure as Pure
 import qualified Data.ByteString                as BS
+import qualified Data.ByteString.Builder        as B
 import qualified Data.ByteString.Char8          as BS8
 import qualified Data.ByteString.Lazy           as LBS
 import qualified Data.Text                      as T
-import qualified Data.ByteString.Builder as B
 
+import qualified GitHub
+import qualified Issue673
 import qualified Twitter
 import qualified Twitter.Manual                 ()
 
-import qualified GitHub
-
 -------------------------------------------------------------------------------
 -- Decode bench
 -------------------------------------------------------------------------------
@@ -104,4 +104,5 @@ main = defaultMain
       ]
     ]
   , escapeBench
+  , Issue673.benchmark
   ]