git.iko.soy/streamly
on master help sign in
Apply hlint suggesstion on array benchmark files
07df90eadithyaov
benchmark/Streamly/Benchmark/Data/Array.hs+4−6
compare with master
unifiedsplit
@@ -25,7 +25,7 @@ benchIOSrc name src = benchIO name src id
25
25
26{-# INLINE sourceIntFromToFromList #-}
26{-# INLINE sourceIntFromToFromList #-}
27sourceIntFromToFromList :: MonadIO m => Int -> Int -> m (Stream Int)
27sourceIntFromToFromList :: MonadIO m => Int -> Int -> m (Stream Int)
28−sourceIntFromToFromList value n = P.return $ A.fromListN value $ [n..n + value]
28+sourceIntFromToFromList value n = P.return $ A.fromListN value [n..n + value]
29
29
30
30
31{-# INLINE readInstance #-}
31{-# INLINE readInstance #-}
@@ -62,7 +62,7 @@ o_1_space_generation value =
62 "generation"
62 "generation"
63 [ benchIOSrc "write . intFromTo" (sourceIntFromToFromStream value)
63 [ benchIOSrc "write . intFromTo" (sourceIntFromToFromStream value)
64 , let testStr = mkListString value
64 , let testStr = mkListString value
65− in testStr `deepseq` (bench "read" $ nf readInstance testStr)
65+ in testStr `deepseq` bench "read" (nf readInstance testStr)
66 ]
66 ]
67 ]
67 ]
68
68
@@ -104,10 +104,8 @@ main = runWithCLIOpts defStreamSize allBenchmarks
104 where
104 where
105
105
106 allBenchmarks size =
106 allBenchmarks size =
107− [ bgroup (o_1_space_prefix moduleName) $ concat $
107+ [ bgroup (o_1_space_prefix moduleName) $
108− [ o_1_space_generation size
109− , o_1_space_elimination size
108+ o_1_space_generation size ++ o_1_space_elimination size
110− ]
111 , bgroup (o_n_space_prefix moduleName) $
109 , bgroup (o_n_space_prefix moduleName) $
112 o_n_heap_serial size
110 o_n_heap_serial size
113 ] ++ commonBenchmarks size
111 ] ++ commonBenchmarks size
benchmark/Streamly/Benchmark/Data/Array/Common.hs+6−6
@@ -7,11 +7,11 @@
7{-# INLINE benchIO #-}
7{-# INLINE benchIO #-}
8benchIO :: NFData b => String -> (Int -> IO a) -> (a -> b) -> Benchmark
8benchIO :: NFData b => String -> (Int -> IO a) -> (a -> b) -> Benchmark
9benchIO name src f = bench name $ nfIO $
9benchIO name src f = bench name $ nfIO $
10− randomRIO (1,1) >>= src >>= return . f
10+ (randomRIO (1,1) >>= src) <&> f
11
11
12{-# INLINE benchPureSink #-}
12{-# INLINE benchPureSink #-}
13benchPureSink :: NFData b => Int -> String -> (Stream Int -> b) -> Benchmark
13benchPureSink :: NFData b => Int -> String -> (Stream Int -> b) -> Benchmark
14−benchPureSink value name f = benchIO name (sourceIntFromTo value) f
14+benchPureSink value name = benchIO name (sourceIntFromTo value)
15
15
16{-# INLINE benchIO' #-}
16{-# INLINE benchIO' #-}
17benchIO' :: NFData b => String -> (Int -> IO a) -> (a -> IO b) -> Benchmark
17benchIO' :: NFData b => String -> (Int -> IO a) -> (a -> IO b) -> Benchmark
@@ -20,7 +20,7 @@ benchIO' name src f = bench name $ nfIO $
20
20
21{-# INLINE benchIOSink #-}
21{-# INLINE benchIOSink #-}
22benchIOSink :: NFData b => Int -> String -> (Stream Int -> IO b) -> Benchmark
22benchIOSink :: NFData b => Int -> String -> (Stream Int -> IO b) -> Benchmark
23−benchIOSink value name f = benchIO' name (sourceIntFromTo value) f
23+benchIOSink value name = benchIO' name (sourceIntFromTo value)
24
24
25-------------------------------------------------------------------------------
25-------------------------------------------------------------------------------
26-- Bench Ops
26-- Bench Ops
@@ -33,7 +33,7 @@ sourceUnfoldr value n = S.fold (A.writeN value) $ S.unfoldr step n
33 step cnt =
33 step cnt =
34 if cnt > n + value
34 if cnt > n + value
35 then Nothing
35 then Nothing
36− else (Just (cnt, cnt + 1))
36+ else Just (cnt, cnt + 1)
37
37
38{-# INLINE sourceIntFromTo #-}
38{-# INLINE sourceIntFromTo #-}
39sourceIntFromTo :: MonadIO m => Int -> Int -> m (Stream Int)
39sourceIntFromTo :: MonadIO m => Int -> Int -> m (Stream Int)
@@ -71,7 +71,7 @@ onArray
71 :: MonadIO m => Int -> (S.SerialT m Int -> S.SerialT m Int)
71 :: MonadIO m => Int -> (S.SerialT m Int -> S.SerialT m Int)
72 -> Stream Int
72 -> Stream Int
73 -> m (Stream Int)
73 -> m (Stream Int)
74−onArray value f arr = S.fold (A.writeN value) $ f $ (S.unfold A.read arr)
74+onArray value f arr = S.fold (A.writeN value) $ f $ S.unfold A.read arr
75
75
76scanl' value n = composeN n $ onArray value $ S.scanl' (+) 0
76scanl' value n = composeN n $ onArray value $ S.scanl' (+) 0
77scanl1' value n = composeN n $ onArray value $ S.scanl1' (+)
77scanl1' value n = composeN n $ onArray value $ S.scanl1' (+)
@@ -96,7 +96,7 @@ ordInstanceMin src = P.min src src
96
96
97{-# INLINE showInstance #-}
97{-# INLINE showInstance #-}
98showInstance :: Stream Int -> P.String
98showInstance :: Stream Int -> P.String
99−showInstance src = P.show src
99+showInstance = P.show
100
100
101{-# INLINE pureFoldl' #-}
101{-# INLINE pureFoldl' #-}
102pureFoldl' :: MonadIO m => Stream Int -> m Int
102pureFoldl' :: MonadIO m => Stream Int -> m Int
benchmark/Streamly/Benchmark/Data/Array/CommonImports.hs+2
@@ -13,3 +13,5 @@ import qualified Streamly.Benchmark.Prelude as P
13import Control.Monad.IO.Class (MonadIO)
13import Control.Monad.IO.Class (MonadIO)
14
14
15import Prelude as P hiding (map)
15import Prelude as P hiding (map)
16+
17+import Data.Functor ((<&>))
benchmark/Streamly/Benchmark/Data/Array/Foreign.hs+4−6
@@ -33,7 +33,7 @@ benchIOSrc name src = benchIO name src id
33
33
34{-# INLINE sourceIntFromToFromList #-}
34{-# INLINE sourceIntFromToFromList #-}
35sourceIntFromToFromList :: MonadIO m => Int -> Int -> m (Stream Int)
35sourceIntFromToFromList :: MonadIO m => Int -> Int -> m (Stream Int)
36−sourceIntFromToFromList value n = P.return $ A.fromListN value $ [n..n + value]
36+sourceIntFromToFromList value n = P.return $ A.fromListN value [n..n + value]
37
37
38{-# INLINE readInstance #-}
38{-# INLINE readInstance #-}
39readInstance :: P.String -> Stream Int
39readInstance :: P.String -> Stream Int
@@ -77,7 +77,7 @@ o_1_space_generation value =
77 "generation"
77 "generation"
78 [ benchIOSrc "write . intFromTo" (sourceIntFromToFromStream value)
78 [ benchIOSrc "write . intFromTo" (sourceIntFromToFromStream value)
79 , let testStr = mkListString value
79 , let testStr = mkListString value
80− in testStr `deepseq` (bench "read" $ nf readInstance testStr)
80+ in testStr `deepseq` bench "read" (nf readInstance testStr)
81 , benchPureSrc "writeN . IsList.fromList" (sourceIsList value)
81 , benchPureSrc "writeN . IsList.fromList" (sourceIsList value)
82 , benchPureSrc
82 , benchPureSrc
83 "writeN . IsString.fromString"
83 "writeN . IsString.fromString"
@@ -125,10 +125,8 @@ main = runWithCLIOpts defStreamSize allBenchmarks
125 where
125 where
126
126
127 allBenchmarks size =
127 allBenchmarks size =
128− [ bgroup (o_1_space_prefix moduleName) $ concat $
128+ [ bgroup (o_1_space_prefix moduleName) $
129− [ o_1_space_generation size
130− , o_1_space_elimination size
129+ o_1_space_generation size ++ o_1_space_elimination size
131− ]
132 , bgroup (o_n_space_prefix moduleName) $
130 , bgroup (o_n_space_prefix moduleName) $
133 o_n_heap_serial size
131 o_n_heap_serial size
134 ] ++ commonBenchmarks size
132 ] ++ commonBenchmarks size
benchmark/Streamly/Benchmark/Data/Array/Prim.hs+3−4
@@ -22,7 +22,7 @@ benchIOSrc name src = benchIO name src id
22
22
23{-# INLINE sourceIntFromToFromList #-}
23{-# INLINE sourceIntFromToFromList #-}
24sourceIntFromToFromList :: MonadIO m => Int -> Int -> m (Stream Int)
24sourceIntFromToFromList :: MonadIO m => Int -> Int -> m (Stream Int)
25−sourceIntFromToFromList value n = P.return $ A.fromListN value $ [n..n + value]
25+sourceIntFromToFromList value n = P.return $ A.fromListN value [n..n + value]
26
26
27-- CPP:
27-- CPP:
28{-# INLINE sourceIntFromToFromStream #-}
28{-# INLINE sourceIntFromToFromStream #-}
@@ -53,6 +53,5 @@ main = runWithCLIOpts defStreamSize allBenchmarks
53 where
53 where
54
54
55 allBenchmarks size =
55 allBenchmarks size =
56− [ bgroup (o_1_space_prefix moduleName) $
56+ bgroup (o_1_space_prefix moduleName) (o_1_space_generation size)
57− o_1_space_generation size
58− ] ++ commonBenchmarks size
57+ : commonBenchmarks size
benchmark/Streamly/Benchmark/Data/Array/Prim/Pinned.hs+3−4
@@ -22,7 +22,7 @@ benchIOSrc name src = benchIO name src id
22
22
23{-# INLINE sourceIntFromToFromList #-}
23{-# INLINE sourceIntFromToFromList #-}
24sourceIntFromToFromList :: MonadIO m => Int -> Int -> m (Stream Int)
24sourceIntFromToFromList :: MonadIO m => Int -> Int -> m (Stream Int)
25−sourceIntFromToFromList value n = P.return $ A.fromListN value $ [n..n + value]
25+sourceIntFromToFromList value n = P.return $ A.fromListN value [n..n + value]
26
26
27-- CPP:
27-- CPP:
28{-# INLINE sourceIntFromToFromStream #-}
28{-# INLINE sourceIntFromToFromStream #-}
@@ -53,6 +53,5 @@ main = runWithCLIOpts defStreamSize allBenchmarks
53 where
53 where
54
54
55 allBenchmarks size =
55 allBenchmarks size =
56− [ bgroup (o_1_space_prefix moduleName) $
56+ bgroup (o_1_space_prefix moduleName) (o_1_space_generation size)
57− o_1_space_generation size
58− ] ++ commonBenchmarks size
57+ : commonBenchmarks size
benchmark/Streamly/Benchmark/Data/Array/SmallArray.hs+4−5
@@ -24,7 +24,7 @@ benchIOSrc name src = benchIO name src id
24
24
25{-# INLINE sourceIntFromToFromList #-}
25{-# INLINE sourceIntFromToFromList #-}
26sourceIntFromToFromList :: MonadIO m => Int -> Int -> m (Stream Int)
26sourceIntFromToFromList :: MonadIO m => Int -> Int -> m (Stream Int)
27−sourceIntFromToFromList value n = P.return $ A.fromListN value $ [n..n + value]
27+sourceIntFromToFromList value n = P.return $ A.fromListN value [n..n + value]
28
28
29{-# INLINE readInstance #-}
29{-# INLINE readInstance #-}
30readInstance :: P.String -> Stream Int
30readInstance :: P.String -> Stream Int
@@ -58,7 +58,7 @@ o_1_space_generation value =
58 "fromListN " ++
58 "fromListN " ++
59 show (value + 1) ++
59 show (value + 1) ++
60 "[1" ++ concat (replicate value ",1") ++ "]"
60 "[1" ++ concat (replicate value ",1") ++ "]"
61− in testStr `deepseq` (bench "read" $ nf readInstance testStr)
61+ in testStr `deepseq` bench "read" (nf readInstance testStr)
62 ]
62 ]
63 ]
63 ]
64
64
@@ -89,6 +89,5 @@ main = runWithCLIOpts defStreamSize allBenchmarks
89 where
89 where
90
90
91 allBenchmarks size =
91 allBenchmarks size =
92− [ bgroup (o_1_space_prefix moduleName) $
92+ bgroup (o_1_space_prefix moduleName) (o_1_space_generation size)
93− o_1_space_generation size
94− ] ++ commonBenchmarks size
93+ : commonBenchmarks size