Fix benchmarks

Author: rockbmb

benchmarks/Benchmarks.hs

@@ -55,10 +55,10 @@ data Env = Env {
     elemsDupBS :: ![(BS.ByteString, Int)],
     elemsDupI  :: ![(Int, Int)],
 
-    hm    :: !(HM.HashMap String Int),
-    hmbs  :: !(HM.HashMap BS.ByteString Int),
-    hmi   :: !(HM.HashMap Int Int),
-    hmi2  :: !(HM.HashMap Int Int),
+    hm    :: !(HM.HashMapW String Int),
+    hmbs  :: !(HM.HashMapW BS.ByteString Int),
+    hmi   :: !(HM.HashMapW Int Int),
+    hmi2  :: !(HM.HashMapW Int Int),
     m     :: !(M.Map String Int),
     mbs   :: !(M.Map BS.ByteString Int),
     im    :: !(IM.IntMap Int),
@@ -195,7 +195,7 @@ main = do
           ]
 
         , env setupEnv $ \ ~(Env{..}) ->
-          bgroup "HashMap"
+          bgroup "HashMapW"
           [ -- * Basic interface
             bgroup "lookup"
             [ bench "String" $ whnf (lookup keys) hm
@@ -283,32 +283,32 @@ main = do
         ]
 
 ------------------------------------------------------------------------
--- * HashMap
+-- * HashMapW
 
-lookup :: (Eq k, Hashable k) => [k] -> HM.HashMap k Int -> Int
+lookup :: (Eq k, Hashable k) => [k] -> HM.HashMapW k Int -> Int
 lookup xs m = foldl' (\z k -> fromMaybe z (HM.lookup k m)) 0 xs
-{-# SPECIALIZE lookup :: [Int] -> HM.HashMap Int Int -> Int #-}
-{-# SPECIALIZE lookup :: [String] -> HM.HashMap String Int -> Int #-}
-{-# SPECIALIZE lookup :: [BS.ByteString] -> HM.HashMap BS.ByteString Int
+{-# SPECIALIZE lookup :: [Int] -> HM.HashMapW Int Int -> Int #-}
+{-# SPECIALIZE lookup :: [String] -> HM.HashMapW String Int -> Int #-}
+{-# SPECIALIZE lookup :: [BS.ByteString] -> HM.HashMapW BS.ByteString Int
                       -> Int #-}
 
-insert :: (Eq k, Hashable k) => [(k, Int)] -> HM.HashMap k Int
-       -> HM.HashMap k Int
+insert :: (Eq k, Hashable k) => [(k, Int)] -> HM.HashMapW k Int
+       -> HM.HashMapW k Int
 insert xs m0 = foldl' (\m (k, v) -> HM.insert k v m) m0 xs
-{-# SPECIALIZE insert :: [(Int, Int)] -> HM.HashMap Int Int
-                      -> HM.HashMap Int Int #-}
-{-# SPECIALIZE insert :: [(String, Int)] -> HM.HashMap String Int
-                      -> HM.HashMap String Int #-}
-{-# SPECIALIZE insert :: [(BS.ByteString, Int)] -> HM.HashMap BS.ByteString Int
-                      -> HM.HashMap BS.ByteString Int #-}
-
-delete :: (Eq k, Hashable k) => [k] -> HM.HashMap k Int -> HM.HashMap k Int
+{-# SPECIALIZE insert :: [(Int, Int)] -> HM.HashMapW Int Int
+                      -> HM.HashMapW Int Int #-}
+{-# SPECIALIZE insert :: [(String, Int)] -> HM.HashMapW String Int
+                      -> HM.HashMapW String Int #-}
+{-# SPECIALIZE insert :: [(BS.ByteString, Int)] -> HM.HashMapW BS.ByteString Int
+                      -> HM.HashMapW BS.ByteString Int #-}
+
+delete :: (Eq k, Hashable k) => [k] -> HM.HashMapW k Int -> HM.HashMapW k Int
 delete xs m0 = foldl' (\m k -> HM.delete k m) m0 xs
-{-# SPECIALIZE delete :: [Int] -> HM.HashMap Int Int -> HM.HashMap Int Int #-}
-{-# SPECIALIZE delete :: [String] -> HM.HashMap String Int
-                      -> HM.HashMap String Int #-}
-{-# SPECIALIZE delete :: [BS.ByteString] -> HM.HashMap BS.ByteString Int
-                      -> HM.HashMap BS.ByteString Int #-}
+{-# SPECIALIZE delete :: [Int] -> HM.HashMapW Int Int -> HM.HashMapW Int Int #-}
+{-# SPECIALIZE delete :: [String] -> HM.HashMapW String Int
+                      -> HM.HashMapW String Int #-}
+{-# SPECIALIZE delete :: [BS.ByteString] -> HM.HashMapW BS.ByteString Int
+                      -> HM.HashMapW BS.ByteString Int #-}
 
 ------------------------------------------------------------------------
 -- * Map

benchmarks/unordered-containers-benchmarks.cabal

@@ -7,15 +7,12 @@ cabal-version: >=1.2
 executable unordered-containers-benchmarks
   ghc-options: -Wall -O2
   cc-options: -msse4.1
-  c-sources:
-    ../cbits/popc.c
   hs-source-dirs: .. .
   main-is: Benchmarks.hs
   other-modules:
     Data.HashMap.Array
     Data.HashMap.Base
     Data.HashMap.Lazy
-    Data.HashMap.PopCount
     Data.HashMap.Strict
     Data.HashMap.Unsafe
     Data.HashMap.UnsafeShift