Improve compare-with-json benchmark

Author: phadej

benchmarks/AesonMap.hs

@@ -160,7 +160,7 @@ benchDecodeHM name val = bgroup name
     ,  bench "Identity"        $ nf (decodeHMB proxyT1)   val
     ,  bench "Coerce"          $ nf (decodeHMB proxyT2)   val
     ,  bench "Parser"          $ nf (decodeHMB proxyT3)   val
-    ,  bench "aeson-0.11"      $ nf (decodeHMA proxyText) val
+    ,  bench "aeson-hackage"   $ nf (decodeHMA proxyText) val
     ,  bench "Tagged Text"     $ nf (decodeHMB $ proxyTagged proxyText) val
     ,  bench "Tagged Identity" $ nf (decodeHMB $ proxyTagged proxyT1)   val
     ,  bench "Tagged Coerce"   $ nf (decodeHMB $ proxyTagged proxyT2)   val
@@ -172,11 +172,11 @@ benchDecodeMap
     -> LBS.ByteString
     -> Benchmark
 benchDecodeMap name val = bgroup name
-    [  bench "Text"        $ nf (decodeMapB proxyText) val
-    ,  bench "Identity"    $ nf (decodeMapB proxyT1)   val
-    ,  bench "Coerce"      $ nf (decodeMapB proxyT2)   val
-    ,  bench "Parser"      $ nf (decodeMapB proxyT3)   val
-    ,  bench "aeson-0.11"  $ nf (decodeMapA proxyText) val
+    [  bench "Text"           $ nf (decodeMapB proxyText) val
+    ,  bench "Identity"       $ nf (decodeMapB proxyT1)   val
+    ,  bench "Coerce"         $ nf (decodeMapB proxyT2)   val
+    ,  bench "Parser"         $ nf (decodeMapB proxyT3)   val
+    ,  bench "aeson-hackage"  $ nf (decodeMapA proxyText) val
     ]
 
 benchEncodeHM

benchmarks/CompareWithJSON.hs

@@ -1,3 +1,4 @@
+{-# LANGUAGE PackageImports #-}
 {-# OPTIONS_GHC -fno-warn-orphans #-}
 
 module Main (main) where
@@ -10,8 +11,11 @@ import Blaze.ByteString.Builder.Char.Utf8 (fromString)
 import Control.DeepSeq (NFData(rnf))
 import Criterion.Main
 import Data.Maybe (fromMaybe)
-import qualified Data.Aeson as A
-import qualified Data.Aeson.Text as A
+import qualified "aeson-benchmarks" Data.Aeson as A
+import qualified "aeson-benchmarks" Data.Aeson.Text as A
+import qualified "aeson-benchmarks" Data.Aeson.Parser.Internal as I
+import qualified "aeson" Data.Aeson as B
+import qualified Data.ByteString as BS
 import qualified Data.ByteString.Lazy as BL
 import qualified Data.Text.Lazy          as TL
 import qualified Data.Text.Lazy.Builder  as TLB
@@ -41,6 +45,19 @@ decodeA s = fromMaybe (error "fail to parse via Aeson") $ A.decode s
 decodeA' :: BL.ByteString -> A.Value
 decodeA' s = fromMaybe (error "fail to parse via Aeson") $ A.decode' s
 
+decodeAS :: BS.ByteString -> A.Value
+decodeAS s = fromMaybe (error "fail to parse via Aeson") $ A.decodeStrict' s
+
+decodeB :: BL.ByteString -> B.Value
+decodeB s = fromMaybe (error "fail to parse via Aeson") $ B.decode s
+
+decodeBS :: BS.ByteString -> B.Value
+decodeBS s = fromMaybe (error "fail to parse via Aeson") $ B.decodeStrict' s
+
+decodeIP :: BL.ByteString -> A.Value
+decodeIP s = fromMaybe (error "fail to parse via Parser.decodeWith") $
+    I.decodeWith I.jsonEOF A.fromJSON s
+
 encodeJ :: J.JSValue -> BL.ByteString
 encodeJ = toLazyByteString . fromString . J.encode
 
@@ -55,19 +72,27 @@ main = do
   let enFile = "json-data/twitter100.json"
       jpFile = "json-data/jp100.json"
   enA <- BL.readFile enFile
+  enS <- BS.readFile enFile
   enJ <- readFile enFile
   jpA <- BL.readFile jpFile
+  jpS <- BS.readFile jpFile
   jpJ <- readFile jpFile
   defaultMain [
       bgroup "decode" [
         bgroup "en" [
-          bench "aeson/lazy" $ nf decodeA enA
-        , bench "aeson/strict" $ nf decodeA' enA
-        , bench "json"  $ nf decodeJ enJ
+          bench "aeson/lazy"     $ nf decodeA enA
+        , bench "aeson/strict"   $ nf decodeA' enA
+        , bench "aeson/stricter" $ nf decodeAS enS
+        , bench "aeson/hackage"  $ nf decodeB enA
+        , bench "aeson/hackage'" $ nf decodeBS enS
+        , bench "aeson/parser"   $ nf decodeIP enA
+        , bench "json"           $ nf decodeJ enJ
         ]
       , bgroup "jp" [
-          bench "aeson" $ nf decodeA jpA
-        , bench "json"  $ nf decodeJ jpJ
+          bench "aeson"          $ nf decodeA jpA
+        , bench "aeson/stricter" $ nf decodeAS jpS
+        , bench "aeson/hackage"  $ nf decodeB jpA
+        , bench "json"           $ nf decodeJ jpJ
         ]
       ]
     , bgroup "encode" [

benchmarks/Dates.hs

@@ -1,3 +1,4 @@
+{-# OPTIONS_GHC -fsimpl-tick-factor=0 #-}
 module Main (main) where
 
 import Prelude ()

benchmarks/aeson-benchmarks.cabal

@@ -83,6 +83,13 @@ executable aeson-benchmark-compare
   main-is: Compare.hs
   hs-source-dirs: ../examples .
   ghc-options: -Wall -O2 -rtsopts
+  other-modules:
+    Compare.BufferBuilder
+    Compare.JsonBench
+    Compare.JsonBuilder
+    Twitter
+    Twitter.Manual
+    Typed.Common
   build-depends:
     aeson-benchmarks,
     base,
@@ -116,6 +123,14 @@ executable aeson-benchmark-typed
   -- We must help ourself in situations when there is both
   -- aeson and aeson-benchmakrs
   cpp-options: -DHAS_BOTH_AESON_AND_BENCHMARKS
+  other-modules:
+    Twitter
+    Twitter.Manual
+    Twitter.TH
+    Typed.Common
+    Typed.Generic
+    Typed.Manual
+    Typed.TH
   build-depends:
     aeson,
     aeson-benchmarks,
@@ -136,7 +151,9 @@ executable aeson-benchmark-typed
 executable aeson-benchmark-compare-with-json
   main-is: CompareWithJSON.hs
   ghc-options: -Wall -O2 -rtsopts
+  cpp-options: -DHAS_BOTH_AESON_AND_BENCHMARKS
   build-depends:
+    aeson,
     aeson-benchmarks,
     base,
     base-compat,

stack-bench.yaml

@@ -1,7 +1,12 @@
 resolver: lts-8.5
 packages:
-- '.'
+# We use aeson in the snapshot to
+# - avoid recompilation of criterion
+# - compare against it
+
+# - '.'
 - benchmarks
 extra-deps:
+- aeson-1.2.1.0
 - quickcheck-instances-0.3.14
 - th-abstraction-0.2.2.0