@@ -24,7 +24,7 @@ import Control.Monad (when)
2424import Data.Maybe (isJust)
2525import System.Random (randomRIO)
2626import Prelude hiding
27− (tail, mapM_, foldl, last, map, mapM, concatMap, zip, init)
27+ (tail, mapM_, foldl, last, map, mapM, concatMap, zipWith, init)
2828
2929import qualified Prelude as P
3030import qualified Data.List as List
@@ -40,37 +40,111 @@ import Streamly.Benchmark.Common
4040import Test.Inspection
4141#endif
4242
43+{-
44+
45+Benchmarks that need to be added
46+
47+-- repeat
48+-- repeatM
49+-- replicate
50+-- replicateM
51+-- iterate
52+-- iterateM
53+-- fromList
54+
55+-- bindWith
56+-- concatPairsWith
57+-- apWith
58+-- apSerial
59+-- apSerialDiscardFst
60+-- apSerialDiscardSnd
61+
62+-- the
63+-- serial
64+-- consMStream
65+-- withLocal
66+-- mfix
67+
68+-- elem
69+-- notElem
70+-- all
71+-- any
72+-- minimum
73+-- minimumBy
74+-- maximum
75+-- maximumBy
76+-- findIndices
77+-- lookup
78+-- findM
79+-- find
80+-- (!!)
81+
82+-- foldlM'
83+-- foldlT
84+-- foldlx'
85+-- foldlMx'
86+-- fold
87+
88+-- sequence
89+
90+-- foldrSM
91+-- buildS
92+-- buildM
93+-- augmentS
94+-- augmentSM
95+-- foldr
96+-- foldr1
97+-- foldrM
98+-- foldrT
99+
100+-- intersperseM
101+-- insertBy
102+-- deleteBy
103+-- reverse
104+-- mapMaybe
105+
106+-- zipWithM
107+-- mergeBy
108+-- mergeByM
109+
110+-- toStreamK (Probably can be skipped)
111+-- hoist
112+
113+-- scanlx'
114+
115+-}
116+
43117-------------------------------------------------------------------------------
44118-- Stream generation and elimination
45119-------------------------------------------------------------------------------
46120
47121type Stream m a = S.Stream m a
48122
49−{-# INLINE sourceUnfoldr #-}
50−sourceUnfoldr :: Int -> Int -> Stream m Int
51−sourceUnfoldr streamLen n = S.unfoldr step n
123+{-# INLINE unfoldr #-}
124+unfoldr :: Int -> Int -> Stream m Int
125+unfoldr streamLen n = S.unfoldr step n
52126 where
53127 step cnt =
54128 if cnt > n + streamLen
55129 then Nothing
56130 else Just (cnt, cnt + 1)
57131
58−{-# INLINE sourceUnfoldrM #-}
59−sourceUnfoldrM :: S.MonadAsync m => Int -> Int -> Stream m Int
60−sourceUnfoldrM streamLen n = S.unfoldrM step n
132+{-# INLINE unfoldrM #-}
133+unfoldrM :: S.MonadAsync m => Int -> Int -> Stream m Int
134+unfoldrM streamLen n = S.unfoldrM step n
61135 where
62136 step cnt =
63137 if cnt > n + streamLen
64138 then return Nothing
65139 else return (Just (cnt, cnt + 1))
66140
67−{-# INLINE sourceFromFoldable #-}
68−sourceFromFoldable :: Int -> Int -> Stream m Int
69−sourceFromFoldable streamLen n = S.fromFoldable [n..n+streamLen]
141+{-# INLINE fromFoldable #-}
142+fromFoldable :: Int -> Int -> Stream m Int
143+fromFoldable streamLen n = S.fromFoldable [n..n+streamLen]
70144
71−{-# INLINE sourceFromFoldableM #-}
72−sourceFromFoldableM :: S.MonadAsync m => Int -> Int -> Stream m Int
73−sourceFromFoldableM streamLen n =
145+{-# INLINE fromFoldableM #-}
146+fromFoldableM :: S.MonadAsync m => Int -> Int -> Stream m Int
147+fromFoldableM streamLen n =
74148 Prelude.foldr S.consM S.nil (Prelude.fmap return [n..n+streamLen])
75149
76150{-# INLINABLE concatMapFoldableWith #-}
@@ -78,32 +152,27 @@ concatMapFoldableWith :: (S.IsStream t, Foldable f)
78152 => (t m b -> t m b -> t m b) -> (a -> t m b) -> f a -> t m b
79153concatMapFoldableWith f g = Prelude.foldr (f . g) S.nil
80154
81−{-# INLINE sourceFoldMapWith #-}
82−sourceFoldMapWith :: Int -> Int -> Stream m Int
83−sourceFoldMapWith streamLen n = concatMapFoldableWith S.serial S.yield [n..n+streamLen]
155+{-# INLINE concatMapFoldableSerial #-}
156+concatMapFoldableSerial :: Int -> Int -> Stream m Int
157+concatMapFoldableSerial streamLen n = concatMapFoldableWith S.serial S.yield [n..n+streamLen]
84158
85−{-# INLINE sourceFoldMapWithM #-}
86−sourceFoldMapWithM :: Monad m => Int -> Int -> Stream m Int
87−sourceFoldMapWithM streamLen n =
159+{-# INLINE concatMapFoldableSerialM #-}
160+concatMapFoldableSerialM :: Monad m => Int -> Int -> Stream m Int
161+concatMapFoldableSerialM streamLen n =
88162 concatMapFoldableWith S.serial (S.yieldM . return) [n..n+streamLen]
89163
90164-------------------------------------------------------------------------------
91165-- Elimination
92166-------------------------------------------------------------------------------
93167
94−{-# INLINE runStream #-}
95−runStream :: Monad m => Stream m a -> m ()
96−runStream = S.drain
97−-- runStream = S.mapM_ (\_ -> return ())
168+{-# INLINE drain #-}
169+drain :: Monad m => Stream m a -> m ()
170+drain = S.drain
98171
99172{-# INLINE mapM_ #-}
100173mapM_ :: Monad m => Stream m a -> m ()
101174mapM_ = S.mapM_ (\_ -> return ())
102175
103−{-# INLINE toNull #-}
104−toNull :: Monad m => Stream m Int -> m ()
105−toNull = runStream
106−
107176{-# INLINE uncons #-}
108177uncons :: Monad m => Stream m Int -> m ()
109178uncons s = do
@@ -138,9 +207,9 @@ headTail s = do
138207toList :: Monad m => Stream m Int -> m [Int]
139208toList = S.toList
140209
141−{-# INLINE foldl #-}
142−foldl :: Monad m => Stream m Int -> m Int
143−foldl = S.foldl' (+) 0
210+{-# INLINE foldl' #-}
211+foldl' :: Monad m => Stream m Int -> m Int
212+foldl' = S.foldl' (+) 0
144213
145214{-# INLINE last #-}
146215last :: Monad m => Stream m Int -> m (Maybe Int)
@@ -150,29 +219,25 @@ last = S.last
150219-- Transformation
151220-------------------------------------------------------------------------------
152221
153−{-# INLINE transform #-}
154−transform :: Monad m => Stream m a -> m ()
155−transform = runStream
156−
157222{-# INLINE composeN #-}
158223composeN
159224 :: Monad m
160225 => Int -> (Stream m Int -> Stream m Int) -> Stream m Int -> m ()
161226composeN n f =
162227 case n of
163− 1 -> transform . f
164− 2 -> transform . f . f
165− 3 -> transform . f . f . f
166− 4 -> transform . f . f . f . f
228+ 1 -> drain . f
229+ 2 -> drain . f . f
230+ 3 -> drain . f . f . f
231+ 4 -> drain . f . f . f . f
167232 _ -> undefined
168233
169−{-# INLINE scan #-}
170−scan :: Monad m => Int -> Stream m Int -> m ()
171−scan n = composeN n $ S.scanl' (+) 0
234+{-# INLINE scanl' #-}
235+scanl' :: Monad m => Int -> Stream m Int -> m ()
236+scanl' n = composeN n $ S.scanl' (+) 0
172237
173238{-# INLINE map #-}
174239map :: Monad m => Int -> Stream m Int -> m ()
175−map n = composeN n $ P.fmap (+ 1)
240+map n = composeN n $ S.map (+ 1)
176241
177242{-# INLINE fmapK #-}
178243fmapK :: Monad m => Int -> Stream m Int -> m ()
@@ -246,7 +311,7 @@ intersperse streamLen n = composeN n $ S.intersperse streamLen
246311iterateSource
247312 :: S.MonadAsync m
248313 => Int -> (Stream m Int -> Stream m Int) -> Int -> Int -> Stream m Int
249−iterateSource iterStreamLen g i n = f i (sourceUnfoldrM iterStreamLen n)
314+iterateSource iterStreamLen g i n = f i (unfoldrM iterStreamLen n)
250315 where
251316 f (0 :: Int) m = g m
252317 f x m = g (f (x P.- 1) m)
@@ -286,9 +351,9 @@ iterateDropWhileTrue streamLen iterStreamLen maxIters = iterateSource iterStream
286351-- Zipping
287352-------------------------------------------------------------------------------
288353
289−{-# INLINE zip #-}
290−zip :: Monad m => Stream m Int -> m ()
291−zip src = transform $ S.zipWith (,) src src
354+{-# INLINE zipWith #-}
355+zipWith :: Monad m => Stream m Int -> m ()
356+zipWith src = drain $ S.zipWith (,) src src
292357
293358-------------------------------------------------------------------------------
294359-- Mixed Composition
@@ -344,8 +409,8 @@ filterMap streamLen n = composeN n $ S.map (subtract 1) . S.filter (<= streamLen
344409concatMap :: Int -> Int -> Int -> IO ()
345410concatMap outer inner n =
346411 S.drain $ S.concatMap
347− (\_ -> sourceUnfoldrM inner n)
348− (sourceUnfoldrM outer n)
412+ (\_ -> unfoldrM inner n)
413+ (unfoldrM outer n)
349414
350415#ifdef INSPECTION
351416inspect $ hasNoTypeClasses 'concatMap
@@ -357,8 +422,8 @@ inspect $ hasNoTypeClasses 'concatMap
357422concatMapPure :: Int -> Int -> Int -> IO ()
358423concatMapPure outer inner n =
359424 S.drain $ S.concatMap
360− (\_ -> sourceUnfoldr inner n)
361− (sourceUnfoldr outer n)
425+ (\_ -> unfoldr inner n)
426+ (unfoldr outer n)
362427
363428#ifdef INSPECTION
364429inspect $ hasNoTypeClasses 'concatMapPure
@@ -369,7 +434,7 @@ inspect $ hasNoTypeClasses 'concatMapPure
369434{-# INLINE concatMapRepl #-}
370435concatMapRepl :: Int -> Int -> Int -> IO ()
371436concatMapRepl outer inner n =
372− S.drain $ S.concatMap (S.replicate inner) (sourceUnfoldrM outer n)
437+ S.drain $ S.concatMap (S.replicate inner) (unfoldrM outer n)
373438
374439#ifdef INSPECTION
375440inspect $ hasNoTypeClasses 'concatMapRepl
@@ -383,42 +448,42 @@ sourceConcatMapId :: Monad m
383448sourceConcatMapId val n =
384449 S.fromFoldable $ fmap (S.yieldM . return) [n..n+val]
385450
386−{-# INLINE concatStreamsWith #-}
387−concatStreamsWith :: Int -> Int -> Int -> IO ()
388−concatStreamsWith outer inner n =
451+{-# INLINE concatMapBySerial #-}
452+concatMapBySerial :: Int -> Int -> Int -> IO ()
453+concatMapBySerial outer inner n =
389454 S.drain $ S.concatMapBy S.serial
390− (sourceUnfoldrM inner)
391− (sourceUnfoldrM outer n)
455+ (unfoldrM inner)
456+ (unfoldrM outer n)
392457
393458-------------------------------------------------------------------------------
394459-- Nested Composition
395460-------------------------------------------------------------------------------
396461
397−{-# INLINE toNullApNested #-}
398−toNullApNested :: Monad m => Stream m Int -> m ()
399−toNullApNested s = runStream $ do
462+{-# INLINE drainApplicative #-}
463+drainApplicative :: Monad m => Stream m Int -> m ()
464+drainApplicative s = drain $ do
400465 (+) <$> s <*> s
401466
402−{-# INLINE toNullNested #-}
403−toNullNested :: Monad m => Stream m Int -> m ()
404−toNullNested s = runStream $ do
467+{-# INLINE drainMonad #-}
468+drainMonad :: Monad m => Stream m Int -> m ()
469+drainMonad s = drain $ do
405470 x <- s
406471 y <- s
407472 return $ x + y
408473
409−{-# INLINE toNullNested3 #-}
410−toNullNested3 :: Monad m => Stream m Int -> m ()
411−toNullNested3 s = runStream $ do
474+{-# INLINE drainMonad3 #-}
475+drainMonad3 :: Monad m => Stream m Int -> m ()
476+drainMonad3 s = drain $ do
412477 x <- s
413478 y <- s
414479 z <- s
415480 return $ x + y + z
416481
417−{-# INLINE filterAllOutNested #-}
418−filterAllOutNested
482+{-# INLINE filterAllOutMonad #-}
483+filterAllOutMonad
419484 :: Monad m
420485 => Stream m Int -> m ()
421−filterAllOutNested str = runStream $ do
486+filterAllOutMonad str = drain $ do
422487 x <- str
423488 y <- str
424489 let s = x + y
@@ -426,11 +491,11 @@ filterAllOutNested str = runStream $ do
426491 then return s
427492 else S.nil
428493
429−{-# INLINE filterAllInNested #-}
430−filterAllInNested
494+{-# INLINE filterAllInMonad #-}
495+filterAllInMonad
431496 :: Monad m
432497 => Stream m Int -> m ()
433−filterAllInNested str = runStream $ do
498+filterAllInMonad str = drain $ do
434499 x <- str
435500 y <- str
436501 let s = x + y
@@ -442,9 +507,14 @@ filterAllInNested str = runStream $ do
442507-- Nested Composition Pure lists
443508-------------------------------------------------------------------------------
444509
445−{-# INLINE sourceUnfoldrList #-}
446−sourceUnfoldrList :: Int -> Int -> [Int]
447−sourceUnfoldrList maxval n = List.unfoldr step n
510+-- There are several list benchmarks here for comparison with lists. It is easy
511+-- and convenient to see the comparisons when they are here, otherwise we'll
512+-- have to add a separate module for list benchmarks with the same names and
513+-- then add a comparison in bench.sh.
514+
515+{-# INLINE unfoldrList #-}
516+unfoldrList :: Int -> Int -> [Int]
517+unfoldrList maxval n = List.unfoldr step n
448518 where
449519 step cnt =
450520 if cnt > n + maxval
@@ -500,41 +570,41 @@ moduleName = "Data.Stream.StreamK"
500570o_1_space_generation :: Int -> Benchmark
501571o_1_space_generation streamLen =
502572 bgroup "generation"
503− [ benchFold "unfoldr" toNull (sourceUnfoldr streamLen)
504− , benchFold "unfoldrM" toNull (sourceUnfoldrM streamLen)
573+ [ benchFold "unfoldr" drain (unfoldr streamLen)
574+ , benchFold "unfoldrM" drain (unfoldrM streamLen)
505575
506− , benchFold "fromFoldable" toNull (sourceFromFoldable streamLen)
507− , benchFold "fromFoldableM" toNull (sourceFromFoldableM streamLen)
576+ , benchFold "fromFoldable" drain (fromFoldable streamLen)
577+ , benchFold "fromFoldableM" drain (fromFoldableM streamLen)
508578
509579 -- appends
510− , benchFold "concatMapFoldableWith" toNull (sourceFoldMapWith streamLen)
511− , benchFold "concatMapFoldableWithM" toNull (sourceFoldMapWithM streamLen)
580+ , benchFold "concatMapFoldableWith" drain (concatMapFoldableSerial streamLen)
581+ , benchFold "concatMapFoldableWithM" drain (concatMapFoldableSerialM streamLen)
512582 ]
513583
514584o_1_space_elimination :: Int -> Benchmark
515585o_1_space_elimination streamLen =
516586 bgroup "elimination"
517− [ benchFold "toNull" toNull (sourceUnfoldrM streamLen)
518− , benchFold "mapM_" mapM_ (sourceUnfoldrM streamLen)
519− , benchFold "uncons" uncons (sourceUnfoldrM streamLen)
520− , benchFold "init" init (sourceUnfoldrM streamLen)
521− , benchFold "foldl'" foldl (sourceUnfoldrM streamLen)
522− , benchFold "last" last (sourceUnfoldrM streamLen)
587+ [ benchFold "toNull" drain (unfoldrM streamLen)
588+ , benchFold "mapM_" mapM_ (unfoldrM streamLen)
589+ , benchFold "uncons" uncons (unfoldrM streamLen)
590+ , benchFold "init" init (unfoldrM streamLen)
591+ , benchFold "foldl'" foldl' (unfoldrM streamLen)
592+ , benchFold "last" last (unfoldrM streamLen)
523593 ]
524594
525595o_1_space_nested :: Int -> Benchmark
526596o_1_space_nested streamLen =
527597 bgroup "nested"
528− [ benchFold "toNullAp" toNullApNested (sourceUnfoldrM streamLen2)
529− , benchFold "toNull" toNullNested (sourceUnfoldrM streamLen2)
530− , benchFold "toNull3" toNullNested3 (sourceUnfoldrM streamLen3)
531− , benchFold "filterAllIn" filterAllInNested (sourceUnfoldrM streamLen2)
532− , benchFold "filterAllOut" filterAllOutNested (sourceUnfoldrM streamLen2)
533− , benchFold "toNullApPure" toNullApNested (sourceUnfoldr streamLen2)
534− , benchFold "toNullPure" toNullNested (sourceUnfoldr streamLen2)
535− , benchFold "toNull3Pure" toNullNested3 (sourceUnfoldr streamLen3)
536− , benchFold "filterAllInPure" filterAllInNested (sourceUnfoldr streamLen2)
537− , benchFold "filterAllOutPure" filterAllOutNested (sourceUnfoldr streamLen2)
598+ [ benchFold "drainApplicative" drainApplicative (unfoldrM streamLen2)
599+ , benchFold "drainMonad" drainMonad (unfoldrM streamLen2)
600+ , benchFold "drainMonad3" drainMonad3 (unfoldrM streamLen3)
601+ , benchFold "filterAllInMonad" filterAllInMonad (unfoldrM streamLen2)
602+ , benchFold "filterAllOutMonad" filterAllOutMonad (unfoldrM streamLen2)
603+ , benchFold "drainApplicative (pure)" drainApplicative (unfoldr streamLen2)
604+ , benchFold "drainMonad (pure)" drainMonad (unfoldr streamLen2)
605+ , benchFold "drainMonad3 (pure)" drainMonad3 (unfoldr streamLen3)
606+ , benchFold "filterAllInMonad (pure)" filterAllInMonad (unfoldr streamLen2)
607+ , benchFold "filterAllOutMonad (pure)" filterAllOutMonad (unfoldr streamLen2)
538608 ]
539609 where
540610 streamLen2 = round (P.fromIntegral streamLen**(1/2::P.Double)) -- double nested loop
@@ -543,24 +613,24 @@ o_1_space_nested streamLen =
543613o_1_space_transformation :: Int -> Benchmark
544614o_1_space_transformation streamLen =
545615 bgroup "transformation"
546− [ benchFold "foldrS" (foldrS 1) (sourceUnfoldrM streamLen)
547− , benchFold "scan" (scan 1) (sourceUnfoldrM streamLen)
548− , benchFold "map" (map 1) (sourceUnfoldrM streamLen)
549− , benchFold "fmap" (fmapK 1) (sourceUnfoldrM streamLen)
550− , benchFold "mapM" (mapM 1) (sourceUnfoldrM streamLen)
551− , benchFold "mapMSerial" (mapMSerial 1) (sourceUnfoldrM streamLen)
616+ [ benchFold "foldrS" (foldrS 1) (unfoldrM streamLen)
617+ , benchFold "scanl'" (scanl' 1) (unfoldrM streamLen)
618+ , benchFold "map" (map 1) (unfoldrM streamLen)
619+ , benchFold "fmap" (fmapK 1) (unfoldrM streamLen)
620+ , benchFold "mapM" (mapM 1) (unfoldrM streamLen)
621+ , benchFold "mapMSerial" (mapMSerial 1) (unfoldrM streamLen)
552622 ]
553623
554624o_1_space_transformationX4 :: Int -> Benchmark
555625o_1_space_transformationX4 streamLen =
556626 bgroup "transformationX4"
557− [ benchFold "scan" (scan 4) (sourceUnfoldrM streamLen)
558− , benchFold "map" (map 4) (sourceUnfoldrM streamLen)
559− , benchFold "fmap" (fmapK 4) (sourceUnfoldrM streamLen)
560− , benchFold "mapM" (mapM 4) (sourceUnfoldrM streamLen)
561− , benchFold "mapMSerial" (mapMSerial 4) (sourceUnfoldrM streamLen)
627+ [ benchFold "scanl'" (scanl' 4) (unfoldrM streamLen)
628+ , benchFold "map" (map 4) (unfoldrM streamLen)
629+ , benchFold "fmap" (fmapK 4) (unfoldrM streamLen)
630+ , benchFold "mapM" (mapM 4) (unfoldrM streamLen)
631+ , benchFold "mapMSerial" (mapMSerial 4) (unfoldrM streamLen)
562632 -- XXX this is horribly slow
563− -- , benchFold "concatMap" (concatMap 4) (sourceUnfoldrM streamLen16)
633+ -- , benchFold "concatMap" (concatMap 4) (unfoldrM streamLen16)
564634 ]
565635
566636o_1_space_concat :: Int -> Benchmark
@@ -587,12 +657,12 @@ o_1_space_concat streamLen =
587657 , benchIOSrc1 "concatMapWithId (n of 1) (fromFoldable)"
588658 (S.drain . S.concatMapBy S.serial id . sourceConcatMapId streamLen)
589659
590− , benchIOSrc1 "concatMapWith (n of 1)"
591− (concatStreamsWith streamLen 1)
592− , benchIOSrc1 "concatMapWith (sqrt n of sqrt n)"
593− (concatStreamsWith streamLen2 streamLen2)
594− , benchIOSrc1 "concatMapWith (1 of n)"
595− (concatStreamsWith 1 streamLen)
660+ , benchIOSrc1 "concatMapBy serial (n of 1)"
661+ (concatMapBySerial streamLen 1)
662+ , benchIOSrc1 "concatMapBy serial (sqrt n of sqrt n)"
663+ (concatMapBySerial streamLen2 streamLen2)
664+ , benchIOSrc1 "concatMapBy serial (1 of n)"
665+ (concatMapBySerial 1 streamLen)
596666 ]
597667 where
598668 streamLen2 = round (P.fromIntegral streamLen**(1/2::P.Double)) -- double nested loop
@@ -600,94 +670,94 @@ o_1_space_concat streamLen =
600670o_1_space_filtering :: Int -> Benchmark
601671o_1_space_filtering streamLen =
602672 bgroup "filtering"
603− [ benchFold "filter-even" (filterEven 1) (sourceUnfoldrM streamLen)
604− , benchFold "filter-all-out" (filterAllOut streamLen 1) (sourceUnfoldrM streamLen)
605− , benchFold "filter-all-in" (filterAllIn streamLen 1) (sourceUnfoldrM streamLen)
606− , benchFold "take-all" (takeAll streamLen 1) (sourceUnfoldrM streamLen)
607− , benchFold "takeWhile-true" (takeWhileTrue streamLen 1) (sourceUnfoldrM streamLen)
608− , benchFold "drop-one" (dropOne 1) (sourceUnfoldrM streamLen)
609− , benchFold "drop-all" (dropAll streamLen 1) (sourceUnfoldrM streamLen)
610− , benchFold "dropWhile-true" (dropWhileTrue streamLen 1) (sourceUnfoldrM streamLen)
611− , benchFold "dropWhile-false" (dropWhileFalse 1) (sourceUnfoldrM streamLen)
673+ [ benchFold "filter-even" (filterEven 1) (unfoldrM streamLen)
674+ , benchFold "filter-all-out" (filterAllOut streamLen 1) (unfoldrM streamLen)
675+ , benchFold "filter-all-in" (filterAllIn streamLen 1) (unfoldrM streamLen)
676+ , benchFold "take-all" (takeAll streamLen 1) (unfoldrM streamLen)
677+ , benchFold "takeWhile-true" (takeWhileTrue streamLen 1) (unfoldrM streamLen)
678+ , benchFold "drop-one" (dropOne 1) (unfoldrM streamLen)
679+ , benchFold "drop-all" (dropAll streamLen 1) (unfoldrM streamLen)
680+ , benchFold "dropWhile-true" (dropWhileTrue streamLen 1) (unfoldrM streamLen)
681+ , benchFold "dropWhile-false" (dropWhileFalse 1) (unfoldrM streamLen)
612682 ]
613683
614684o_1_space_filteringX4 :: Int -> Benchmark
615685o_1_space_filteringX4 streamLen =
616686 bgroup "filteringX4"
617− [ benchFold "filter-even" (filterEven 4) (sourceUnfoldrM streamLen)
618− , benchFold "filter-all-out" (filterAllOut streamLen 4) (sourceUnfoldrM streamLen)
619− , benchFold "filter-all-in" (filterAllIn streamLen 4) (sourceUnfoldrM streamLen)
620− , benchFold "take-all" (takeAll streamLen 4) (sourceUnfoldrM streamLen)
621− , benchFold "takeWhile-true" (takeWhileTrue streamLen 4) (sourceUnfoldrM streamLen)
622− , benchFold "drop-one" (dropOne 4) (sourceUnfoldrM streamLen)
623− , benchFold "drop-all" (dropAll streamLen 4) (sourceUnfoldrM streamLen)
624− , benchFold "dropWhile-true" (dropWhileTrue streamLen 4) (sourceUnfoldrM streamLen)
625− , benchFold "dropWhile-false" (dropWhileFalse 4) (sourceUnfoldrM streamLen)
687+ [ benchFold "filter-even" (filterEven 4) (unfoldrM streamLen)
688+ , benchFold "filter-all-out" (filterAllOut streamLen 4) (unfoldrM streamLen)
689+ , benchFold "filter-all-in" (filterAllIn streamLen 4) (unfoldrM streamLen)
690+ , benchFold "take-all" (takeAll streamLen 4) (unfoldrM streamLen)
691+ , benchFold "takeWhile-true" (takeWhileTrue streamLen 4) (unfoldrM streamLen)
692+ , benchFold "drop-one" (dropOne 4) (unfoldrM streamLen)
693+ , benchFold "drop-all" (dropAll streamLen 4) (unfoldrM streamLen)
694+ , benchFold "dropWhile-true" (dropWhileTrue streamLen 4) (unfoldrM streamLen)
695+ , benchFold "dropWhile-false" (dropWhileFalse 4) (unfoldrM streamLen)
626696 ]
627697
628698o_1_space_zipping :: Int -> Benchmark
629699o_1_space_zipping streamLen =
630700 bgroup "zipping"
631− [ benchFold "zip" zip (sourceUnfoldrM streamLen)
701+ [ benchFold "zipWith" zipWith (unfoldrM streamLen)
632702 ]
633703
634704o_1_space_mixed :: Int -> Benchmark
635705o_1_space_mixed streamLen =
636706 bgroup "mixed"
637− [ benchFold "scan-map" (scanMap 1) (sourceUnfoldrM streamLen)
638− , benchFold "drop-map" (dropMap 1) (sourceUnfoldrM streamLen)
639− , benchFold "drop-scan" (dropScan 1) (sourceUnfoldrM streamLen)
640− , benchFold "take-drop" (takeDrop streamLen 1) (sourceUnfoldrM streamLen)
641− , benchFold "take-scan" (takeScan streamLen 1) (sourceUnfoldrM streamLen)
642− , benchFold "take-map" (takeMap streamLen 1) (sourceUnfoldrM streamLen)
643− , benchFold "filter-drop" (filterDrop streamLen 1) (sourceUnfoldrM streamLen)
644− , benchFold "filter-take" (filterTake streamLen 1) (sourceUnfoldrM streamLen)
645− , benchFold "filter-scan" (filterScan 1) (sourceUnfoldrM streamLen)
646− , benchFold "filter-map" (filterMap streamLen 1) (sourceUnfoldrM streamLen)
707+ [ benchFold "scan-map" (scanMap 1) (unfoldrM streamLen)
708+ , benchFold "drop-map" (dropMap 1) (unfoldrM streamLen)
709+ , benchFold "drop-scan" (dropScan 1) (unfoldrM streamLen)
710+ , benchFold "take-drop" (takeDrop streamLen 1) (unfoldrM streamLen)
711+ , benchFold "take-scan" (takeScan streamLen 1) (unfoldrM streamLen)
712+ , benchFold "take-map" (takeMap streamLen 1) (unfoldrM streamLen)
713+ , benchFold "filter-drop" (filterDrop streamLen 1) (unfoldrM streamLen)
714+ , benchFold "filter-take" (filterTake streamLen 1) (unfoldrM streamLen)
715+ , benchFold "filter-scan" (filterScan 1) (unfoldrM streamLen)
716+ , benchFold "filter-map" (filterMap streamLen 1) (unfoldrM streamLen)
647717 ]
648718
649719o_1_space_mixedX2 :: Int -> Benchmark
650720o_1_space_mixedX2 streamLen =
651721 bgroup "mixedX2"
652− [ benchFold "scan-map" (scanMap 2) (sourceUnfoldrM streamLen)
653− , benchFold "drop-map" (dropMap 2) (sourceUnfoldrM streamLen)
654− , benchFold "drop-scan" (dropScan 2) (sourceUnfoldrM streamLen)
655− , benchFold "take-drop" (takeDrop streamLen 2) (sourceUnfoldrM streamLen)
656− , benchFold "take-scan" (takeScan streamLen 2) (sourceUnfoldrM streamLen)
657− , benchFold "take-map" (takeMap streamLen 2) (sourceUnfoldrM streamLen)
658− , benchFold "filter-drop" (filterDrop streamLen 2) (sourceUnfoldrM streamLen)
659− , benchFold "filter-take" (filterTake streamLen 2) (sourceUnfoldrM streamLen)
660− , benchFold "filter-scan" (filterScan 2) (sourceUnfoldrM streamLen)
661− , benchFold "filter-map" (filterMap streamLen 2) (sourceUnfoldrM streamLen)
722+ [ benchFold "scan-map" (scanMap 2) (unfoldrM streamLen)
723+ , benchFold "drop-map" (dropMap 2) (unfoldrM streamLen)
724+ , benchFold "drop-scan" (dropScan 2) (unfoldrM streamLen)
725+ , benchFold "take-drop" (takeDrop streamLen 2) (unfoldrM streamLen)
726+ , benchFold "take-scan" (takeScan streamLen 2) (unfoldrM streamLen)
727+ , benchFold "take-map" (takeMap streamLen 2) (unfoldrM streamLen)
728+ , benchFold "filter-drop" (filterDrop streamLen 2) (unfoldrM streamLen)
729+ , benchFold "filter-take" (filterTake streamLen 2) (unfoldrM streamLen)
730+ , benchFold "filter-scan" (filterScan 2) (unfoldrM streamLen)
731+ , benchFold "filter-map" (filterMap streamLen 2) (unfoldrM streamLen)
662732 ]
663733
664734o_1_space_mixedX4 :: Int -> Benchmark
665735o_1_space_mixedX4 streamLen =
666736 bgroup "mixedX4"
667− [ benchFold "scan-map" (scanMap 4) (sourceUnfoldrM streamLen)
668− , benchFold "drop-map" (dropMap 4) (sourceUnfoldrM streamLen)
669− , benchFold "drop-scan" (dropScan 4) (sourceUnfoldrM streamLen)
670− , benchFold "take-drop" (takeDrop streamLen 4) (sourceUnfoldrM streamLen)
671− , benchFold "take-scan" (takeScan streamLen 4) (sourceUnfoldrM streamLen)
672− , benchFold "take-map" (takeMap streamLen 4) (sourceUnfoldrM streamLen)
673− , benchFold "filter-drop" (filterDrop streamLen 4) (sourceUnfoldrM streamLen)
674− , benchFold "filter-take" (filterTake streamLen 4) (sourceUnfoldrM streamLen)
675− , benchFold "filter-scan" (filterScan 4) (sourceUnfoldrM streamLen)
676− , benchFold "filter-map" (filterMap streamLen 4) (sourceUnfoldrM streamLen)
737+ [ benchFold "scan-map" (scanMap 4) (unfoldrM streamLen)
738+ , benchFold "drop-map" (dropMap 4) (unfoldrM streamLen)
739+ , benchFold "drop-scan" (dropScan 4) (unfoldrM streamLen)
740+ , benchFold "take-drop" (takeDrop streamLen 4) (unfoldrM streamLen)
741+ , benchFold "take-scan" (takeScan streamLen 4) (unfoldrM streamLen)
742+ , benchFold "take-map" (takeMap streamLen 4) (unfoldrM streamLen)
743+ , benchFold "filter-drop" (filterDrop streamLen 4) (unfoldrM streamLen)
744+ , benchFold "filter-take" (filterTake streamLen 4) (unfoldrM streamLen)
745+ , benchFold "filter-scan" (filterScan 4) (unfoldrM streamLen)
746+ , benchFold "filter-map" (filterMap streamLen 4) (unfoldrM streamLen)
677747 ]
678748
679749o_1_space_list :: Int -> Benchmark
680750o_1_space_list streamLen =
681751 bgroup "list"
682752 [ bgroup "elimination"
683− [ benchList "last" (\xs -> [List.last xs]) (sourceUnfoldrList streamLen)
753+ [ benchList "last" (\xs -> [List.last xs]) (unfoldrList streamLen)
684754 ]
685755 , bgroup "nested"
686− [ benchList "toNullAp" toNullApNestedList (sourceUnfoldrList streamLen2)
687− , benchList "toNull" toNullNestedList (sourceUnfoldrList streamLen2)
688− , benchList "toNull3" toNullNestedList3 (sourceUnfoldrList streamLen3)
689− , benchList "filterAllIn" filterAllInNestedList (sourceUnfoldrList streamLen2)
690− , benchList "filterAllOut" filterAllOutNestedList (sourceUnfoldrList streamLen2)
756+ [ benchList "toNullAp" toNullApNestedList (unfoldrList streamLen2)
757+ , benchList "toNull" toNullNestedList (unfoldrList streamLen2)
758+ , benchList "toNull3" toNullNestedList3 (unfoldrList streamLen3)
759+ , benchList "filterAllIn" filterAllInNestedList (unfoldrList streamLen2)
760+ , benchList "filterAllOut" filterAllOutNestedList (unfoldrList streamLen2)
691761 ]
692762 ]
693763 where
@@ -717,31 +787,31 @@ o_n_heap :: Int -> Benchmark
717787o_n_heap streamLen =
718788 bgroup (o_n_heap_prefix moduleName)
719789 [ bgroup "transformation"
720− [ benchFold "foldlS" (foldlS 1) (sourceUnfoldrM streamLen)
790+ [ benchFold "foldlS" (foldlS 1) (unfoldrM streamLen)
721791 ]
722792 ]
723793
724794{-# INLINE benchK #-}
725795benchK :: P.String -> (Int -> Stream P.IO Int) -> Benchmark
726−benchK name f = bench name $ nfIO $ randomRIO (1,1) >>= toNull . f
796+benchK name f = bench name $ nfIO $ randomRIO (1,1) >>= drain . f
727797
728798o_n_stack :: Int -> Int -> Int -> Benchmark
729799o_n_stack streamLen iterStreamLen maxIters =
730800 bgroup (o_n_stack_prefix moduleName)
731801 [ bgroup "elimination"
732− [ benchFold "tail" tail (sourceUnfoldrM streamLen)
733− , benchFold "nullTail" nullTail (sourceUnfoldrM streamLen)
734− , benchFold "headTail" headTail (sourceUnfoldrM streamLen)
802+ [ benchFold "tail" tail (unfoldrM streamLen)
803+ , benchFold "nullTail" nullTail (unfoldrM streamLen)
804+ , benchFold "headTail" headTail (unfoldrM streamLen)
735805 ]
736806 , bgroup "transformation"
737807 [
738808 -- XXX why do these need so much stack
739− benchFold "intersperse" (intersperse streamLen 1) (sourceUnfoldrM streamLen2)
740− , benchFold "interspersePure" (intersperse streamLen 1) (sourceUnfoldr streamLen2)
809+ benchFold "intersperse" (intersperse streamLen 1) (unfoldrM streamLen2)
810+ , benchFold "interspersePure" (intersperse streamLen 1) (unfoldr streamLen2)
741811 ]
742812 , bgroup "transformationX4"
743813 [
744− benchFold "intersperse" (intersperse streamLen 4) (sourceUnfoldrM streamLen16)
814+ benchFold "intersperse" (intersperse streamLen 4) (unfoldrM streamLen16)
745815 ]
746816 , bgroup "iterated"
747817 [ benchK "mapM" (iterateMapM iterStreamLen maxIters)
@@ -761,7 +831,7 @@ o_n_space :: Int -> Benchmark
761831o_n_space streamLen =
762832 bgroup (o_n_space_prefix moduleName)
763833 [ bgroup "elimination"
764− [ benchFold "toList" toList (sourceUnfoldrM streamLen)
834+ [ benchFold "toList" toList (unfoldrM streamLen)
765835 ]
766836 ]
767837