git.iko.soy/streamly
on master help sign in
Apply hlint suggesstion on array benchmark files
commit07df90e03a68f89c551bec2c57c2a27d82a15fab authoradithyaov <adithya@composewell.com> dateMon 29 Nov 2021, 01:11 (5 years ago) parent9f1144f
7 files changed+26−31
compare with master
unifiedsplit
benchmark/Streamly/Benchmark/Data/Array.hs+4−6 benchmark/Streamly/Benchmark/Data/Array/Common.hs+6−6 benchmark/Streamly/Benchmark/Data/Array/CommonImports.hs+2 benchmark/Streamly/Benchmark/Data/Array/Foreign.hs+4−6 benchmark/Streamly/Benchmark/Data/Array/Prim.hs+3−4 benchmark/Streamly/Benchmark/Data/Array/Prim/Pinned.hs+3−4 benchmark/Streamly/Benchmark/Data/Array/SmallArray.hs+4−5
benchmark/Streamly/Benchmark/Data/Array.hs+4−6
@@ -25,7 +25,7 @@ benchIOSrc name src = benchIO name src id
2525
2626{-# INLINE sourceIntFromToFromList #-}
2727sourceIntFromToFromList :: 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]
2929
3030
3131{-# INLINE readInstance #-}
@@ -62,7 +62,7 @@ o_1_space_generation value =
6262 "generation"
6363 [ benchIOSrc "write . intFromTo" (sourceIntFromToFromStream value)
6464 , let testStr = mkListString value
65− in testStr `deepseq` (bench "read" $ nf readInstance testStr)
65+ in testStr `deepseq` bench "read" (nf readInstance testStr)
6666 ]
6767 ]
6868
@@ -104,10 +104,8 @@ main = runWithCLIOpts defStreamSize allBenchmarks
104104 where
105105
106106 allBenchmarks size =
107− [ bgroup (o_1_space_prefix moduleName) $ concat $
108− [ o_1_space_generation size
109− , o_1_space_elimination size
110− ]
107+ [ bgroup (o_1_space_prefix moduleName) $
108+ o_1_space_generation size ++ o_1_space_elimination size
111109 , bgroup (o_n_space_prefix moduleName) $
112110 o_n_heap_serial size
113111 ] ++ commonBenchmarks size
benchmark/Streamly/Benchmark/Data/Array/Common.hs+6−6
@@ -7,11 +7,11 @@
77{-# INLINE benchIO #-}
88benchIO :: NFData b => String -> (Int -> IO a) -> (a -> b) -> Benchmark
99benchIO name src f = bench name $ nfIO $
10− randomRIO (1,1) >>= src >>= return . f
10+ (randomRIO (1,1) >>= src) <&> f
1111
1212{-# INLINE benchPureSink #-}
1313benchPureSink :: 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)
1515
1616{-# INLINE benchIO' #-}
1717benchIO' :: NFData b => String -> (Int -> IO a) -> (a -> IO b) -> Benchmark
@@ -20,7 +20,7 @@ benchIO' name src f = bench name $ nfIO $
2020
2121{-# INLINE benchIOSink #-}
2222benchIOSink :: 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)
2424
2525-------------------------------------------------------------------------------
2626-- Bench Ops
@@ -33,7 +33,7 @@ sourceUnfoldr value n = S.fold (A.writeN value) $ S.unfoldr step n
3333 step cnt =
3434 if cnt > n + value
3535 then Nothing
36− else (Just (cnt, cnt + 1))
36+ else Just (cnt, cnt + 1)
3737
3838{-# INLINE sourceIntFromTo #-}
3939sourceIntFromTo :: MonadIO m => Int -> Int -> m (Stream Int)
@@ -71,7 +71,7 @@ onArray
7171 :: MonadIO m => Int -> (S.SerialT m Int -> S.SerialT m Int)
7272 -> Stream Int
7373 -> 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
7575
7676scanl' value n = composeN n $ onArray value $ S.scanl' (+) 0
7777scanl1' value n = composeN n $ onArray value $ S.scanl1' (+)
@@ -96,7 +96,7 @@ ordInstanceMin src = P.min src src
9696
9797{-# INLINE showInstance #-}
9898showInstance :: Stream Int -> P.String
99−showInstance src = P.show src
99+showInstance = P.show
100100
101101{-# INLINE pureFoldl' #-}
102102pureFoldl' :: 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
1313import Control.Monad.IO.Class (MonadIO)
1414
1515import 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
3333
3434{-# INLINE sourceIntFromToFromList #-}
3535sourceIntFromToFromList :: 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]
3737
3838{-# INLINE readInstance #-}
3939readInstance :: P.String -> Stream Int
@@ -77,7 +77,7 @@ o_1_space_generation value =
7777 "generation"
7878 [ benchIOSrc "write . intFromTo" (sourceIntFromToFromStream value)
7979 , let testStr = mkListString value
80− in testStr `deepseq` (bench "read" $ nf readInstance testStr)
80+ in testStr `deepseq` bench "read" (nf readInstance testStr)
8181 , benchPureSrc "writeN . IsList.fromList" (sourceIsList value)
8282 , benchPureSrc
8383 "writeN . IsString.fromString"
@@ -125,10 +125,8 @@ main = runWithCLIOpts defStreamSize allBenchmarks
125125 where
126126
127127 allBenchmarks size =
128− [ bgroup (o_1_space_prefix moduleName) $ concat $
129− [ o_1_space_generation size
130− , o_1_space_elimination size
131− ]
128+ [ bgroup (o_1_space_prefix moduleName) $
129+ o_1_space_generation size ++ o_1_space_elimination size
132130 , bgroup (o_n_space_prefix moduleName) $
133131 o_n_heap_serial size
134132 ] ++ commonBenchmarks size
benchmark/Streamly/Benchmark/Data/Array/Prim.hs+3−4
@@ -22,7 +22,7 @@ benchIOSrc name src = benchIO name src id
2222
2323{-# INLINE sourceIntFromToFromList #-}
2424sourceIntFromToFromList :: 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]
2626
2727-- CPP:
2828{-# INLINE sourceIntFromToFromStream #-}
@@ -53,6 +53,5 @@ main = runWithCLIOpts defStreamSize allBenchmarks
5353 where
5454
5555 allBenchmarks size =
56− [ bgroup (o_1_space_prefix moduleName) $
57− o_1_space_generation size
58− ] ++ commonBenchmarks size
56+ bgroup (o_1_space_prefix moduleName) (o_1_space_generation 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
2222
2323{-# INLINE sourceIntFromToFromList #-}
2424sourceIntFromToFromList :: 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]
2626
2727-- CPP:
2828{-# INLINE sourceIntFromToFromStream #-}
@@ -53,6 +53,5 @@ main = runWithCLIOpts defStreamSize allBenchmarks
5353 where
5454
5555 allBenchmarks size =
56− [ bgroup (o_1_space_prefix moduleName) $
57− o_1_space_generation size
58− ] ++ commonBenchmarks size
56+ bgroup (o_1_space_prefix moduleName) (o_1_space_generation size)
57+ : commonBenchmarks size
benchmark/Streamly/Benchmark/Data/Array/SmallArray.hs+4−5
@@ -24,7 +24,7 @@ benchIOSrc name src = benchIO name src id
2424
2525{-# INLINE sourceIntFromToFromList #-}
2626sourceIntFromToFromList :: 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]
2828
2929{-# INLINE readInstance #-}
3030readInstance :: P.String -> Stream Int
@@ -58,7 +58,7 @@ o_1_space_generation value =
5858 "fromListN " ++
5959 show (value + 1) ++
6060 "[1" ++ concat (replicate value ",1") ++ "]"
61− in testStr `deepseq` (bench "read" $ nf readInstance testStr)
61+ in testStr `deepseq` bench "read" (nf readInstance testStr)
6262 ]
6363 ]
6464
@@ -89,6 +89,5 @@ main = runWithCLIOpts defStreamSize allBenchmarks
8989 where
9090
9191 allBenchmarks size =
92− [ bgroup (o_1_space_prefix moduleName) $
93− o_1_space_generation size
94− ] ++ commonBenchmarks size
92+ bgroup (o_1_space_prefix moduleName) (o_1_space_generation size)
93+ : commonBenchmarks size