From 762f2d9032dda7251617b8ec56aa23ce8285e3d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Olivier=20Ch=C3=A9ron?= <olivier.cheron@gmail.com>
Date: Wed, 22 Mar 2017 19:14:45 +0100
Subject: [PATCH] Consolidate cryptonite benchmark code

Enables `cabal bench' or `stack bench' to run benchmarks
that depend only on cryptonite.
---
 benchs/Bench.hs      | 28 ++++++++++++++--------------
 benchs/Number/F2m.hs | 10 +++++-----
 cryptonite.cabal     | 14 ++++++++++++++
 3 files changed, 33 insertions(+), 19 deletions(-)

diff --git a/benchs/Bench.hs b/benchs/Bench.hs
index 2be6c95..55de704 100644
--- a/benchs/Bench.hs
+++ b/benchs/Bench.hs
@@ -4,23 +4,22 @@ module Main where
 
 import Criterion.Main
 
-import "cryptonite" Crypto.Hash
-import "cryptonite" Crypto.Error
-import "cryptonite" Crypto.Cipher.DES
-import "cryptonite" Crypto.Cipher.AES
-import "cryptonite" Crypto.Cipher.Blowfish
-import "cryptonite" Crypto.Cipher.Types
-import qualified "cryptonite" Crypto.Cipher.ChaChaPoly1305 as CP
-
-import qualified "cryptonite" Crypto.KDF.PBKDF2 as PBKDF2
-
-import qualified "cryptonite" Crypto.PubKey.ECC.Types as ECC
-import qualified "cryptonite" Crypto.PubKey.ECC.Prim as ECC
-
-import Data.ByteArray (ByteArray)
+import           Crypto.Cipher.AES
+import           Crypto.Cipher.Blowfish
+import qualified Crypto.Cipher.ChaChaPoly1305 as CP
+import           Crypto.Cipher.DES
+import           Crypto.Cipher.Types
+import           Crypto.Error
+import           Crypto.Hash
+import qualified Crypto.KDF.PBKDF2 as PBKDF2
+import qualified Crypto.PubKey.ECC.Types as ECC
+import qualified Crypto.PubKey.ECC.Prim as ECC
 
+import           Data.ByteArray (ByteArray)
 import qualified Data.ByteString as B
 
+import Number.F2m
+
 benchHash =
     [ 
     ]
@@ -127,4 +126,5 @@ main = defaultMain
     , bgroup "AE" benchAE
     , bgroup "pbkdf2" benchPBKDF2
     , bgroup "ECC" benchECC
+    , bgroup "F2m" benchF2m
     ]
diff --git a/benchs/Number/F2m.hs b/benchs/Number/F2m.hs
index 408a192..15a9f04 100644
--- a/benchs/Number/F2m.hs
+++ b/benchs/Number/F2m.hs
@@ -1,18 +1,18 @@
 {-# LANGUAGE PackageImports #-}
 
-module Main where
+module Number.F2m (benchF2m) where
 
 import Criterion.Main
 import System.Random
 
-import "cryptonite" Crypto.Number.Basic (log2)
-import "cryptonite" Crypto.Number.F2m
+import Crypto.Number.Basic (log2)
+import Crypto.Number.F2m
 
 genInteger :: Int -> Int -> Integer
 genInteger salt bits
     = head
     . dropWhile ((< bits) . log2)
-    . scanl (\a r -> a * 2^31 + abs r) 0
+    . scanl (\a r -> a * 2^(31 :: Int) + abs r) 0
     . randoms
     . mkStdGen
     $ salt + bits
@@ -45,7 +45,7 @@ benchInv bits = bench (show bits) $ nf (invF2m m) a
 bitsList :: [Int]
 bitsList = [64, 128, 256, 512, 1024, 2048]
 
-main = defaultMain
+benchF2m =
     [ bgroup    "modF2m" $ map benchMod    bitsList
     , bgroup    "mulF2m" $ map benchMul    bitsList
     , bgroup "squareF2m" $ map benchSquare bitsList
diff --git a/cryptonite.cabal b/cryptonite.cabal
index f074eb3..be8eef6 100644
--- a/cryptonite.cabal
+++ b/cryptonite.cabal
@@ -382,3 +382,17 @@ Test-Suite test-cryptonite
                    , cryptonite
   ghc-options:       -Wall -fno-warn-orphans -fno-warn-missing-signatures -fno-warn-unused-imports -rtsopts
   default-language:  Haskell2010
+
+Benchmark bench-cryptonite
+  type:              exitcode-stdio-1.0
+  hs-source-dirs:    benchs
+  Main-is:           Bench.hs
+  Other-modules:     Number.F2m
+  Build-Depends:     base >= 3 && < 5
+                   , bytestring
+                   , memory
+                   , criterion
+                   , random
+                   , cryptonite
+  ghc-options:       -Wall -fno-warn-missing-signatures
+  default-language:  Haskell2010