@@ -8,7 +8,6 @@
8{-# LANGUAGE CPP #-}
8{-# LANGUAGE CPP #-}
9{-# LANGUAGE FlexibleContexts #-}
9{-# LANGUAGE FlexibleContexts #-}
10{-# LANGUAGE ScopedTypeVariables #-}
10{-# LANGUAGE ScopedTypeVariables #-}
11−{-# OPTIONS_GHC -Wno-orphans #-}
13#ifdef __HADDOCK_VERSION__
12#ifdef __HADDOCK_VERSION__
14#undef INSPECTION
13#undef INSPECTION
@@ -21,23 +20,19 @@
22module Main (main) where
21module Main (main) where
24−#if !MIN_VERSION_base(4,18,0)
25−import Control.Applicative (liftA2)
27import Control.Monad (when)
23import Control.Monad (when)
28import Data.Maybe (isJust)
24import Data.Maybe (isJust)
29import System.Random (randomRIO)
25import System.Random (randomRIO)
30import Prelude hiding
26import Prelude hiding
31− ( Foldable(..), tail, mapM_, last, map, mapM, concatMap, zipWith, init, iterate
27+ (tail, mapM_, foldl, last, map, mapM, concatMap, zip, init)
35import qualified Prelude as P
29import qualified Prelude as P
36import qualified Data.List as List
30import qualified Data.List as List
38−import qualified Streamly.Internal.Data.StreamK as S
32+import qualified Streamly.Internal.Data.Stream.StreamK as S
33+import qualified Streamly.Internal.Data.SVar as S
40−import Test.Tasty.Bench (bench, nfIO, bgroup, Benchmark, defaultMain)
35+import Gauge (bench, nfIO, bgroup, Benchmark, defaultMain)
42import Streamly.Benchmark.Common
37import Streamly.Benchmark.Common
@@ -45,161 +40,70 @@ import Streamly.Benchmark.Common
45import Test.Inspection
40import Test.Inspection
50−Benchmarks that need to be added
109−-- toStreamK (Probably can be skipped)
116-------------------------------------------------------------------------------
43-------------------------------------------------------------------------------
117-- Stream generation and elimination
44-- Stream generation and elimination
118-------------------------------------------------------------------------------
45-------------------------------------------------------------------------------
120−type Stream m a = S.StreamK m a
47+type Stream m a = S.Stream m a
122−{-# INLINE unfoldr #-}
49+{-# INLINE sourceUnfoldr #-}
123−unfoldr :: Int -> Int -> Stream m Int
50+sourceUnfoldr :: Int -> Int -> Stream m Int
124−unfoldr streamLen n = S.unfoldr step n
51+sourceUnfoldr streamLen n = S.unfoldr step n
126 step cnt =
53 step cnt =
127 if cnt > n + streamLen
54 if cnt > n + streamLen
128 then Nothing
55 then Nothing
129 else Just (cnt, cnt + 1)
56 else Just (cnt, cnt + 1)
131−{-# INLINE unfoldrM #-}
58+{-# INLINE sourceUnfoldrM #-}
132−unfoldrM :: Monad m => Int -> Int -> Stream m Int
59+sourceUnfoldrM :: S.MonadAsync m => Int -> Int -> Stream m Int
133−unfoldrM streamLen n = S.unfoldrMWith S.consM step n
60+sourceUnfoldrM streamLen n = S.unfoldrM step n
135 step cnt =
62 step cnt =
136 if cnt > n + streamLen
63 if cnt > n + streamLen
137 then return Nothing
64 then return Nothing
138 else return (Just (cnt, cnt + 1))
65 else return (Just (cnt, cnt + 1))
140−{-# INLINE repeat #-}
67+{-# INLINE sourceFromFoldable #-}
141−repeat :: Int -> Int -> Stream m Int
68+sourceFromFoldable :: Int -> Int -> Stream m Int
142−repeat streamLen = S.take streamLen . S.repeat
69+sourceFromFoldable streamLen n = S.fromFoldable [n..n+streamLen]
144−{-# INLINE repeatM #-}
145−repeatM :: Monad m => Int -> Int -> Stream m Int
146−repeatM streamLen = S.take streamLen . S.repeatM . return
148−{-# INLINE replicate #-}
149−replicate :: Int -> Int -> Stream m Int
150−replicate = S.replicate
152−{-# INLINE replicateM #-}
71+{-# INLINE sourceFromFoldableM #-}
153−replicateM :: Monad m => Int -> Int -> Stream m Int
72+sourceFromFoldableM :: S.MonadAsync m => Int -> Int -> Stream m Int
154−replicateM streamLen = S.replicateMWith S.consM streamLen . return
73+sourceFromFoldableM streamLen n =
74+ Prelude.foldr S.consM S.nil (Prelude.fmap return [n..n+streamLen])
156−{-# INLINE iterate #-}
76+{-# INLINABLE concatMapFoldableWith #-}
157−iterate :: Int -> Int -> Stream m Int
77+concatMapFoldableWith :: (S.IsStream t, Foldable f)
158−iterate streamLen = S.take streamLen . S.iterate (+1)
78+ => (t m b -> t m b -> t m b) -> (a -> t m b) -> f a -> t m b
159−
79+concatMapFoldableWith f g = Prelude.foldr (f . g) S.nil
160−{-# INLINE iterateM #-}
161−iterateM :: Monad m => Int -> Int -> Stream m Int
162−iterateM streamLen = S.take streamLen . S.iterateM (return . (+1)) . return
164−{-# INLINE fromFoldable #-}
165−fromFoldable :: Int -> Int -> Stream m Int
166−fromFoldable streamLen n = S.fromFoldable [n..n+streamLen]
168−{-# INLINE fromFoldableM #-}
81+{-# INLINE sourceFoldMapWith #-}
169−fromFoldableM :: Monad m => Int -> Int -> Stream m Int
82+sourceFoldMapWith :: Int -> Int -> Stream m Int
170−fromFoldableM streamLen n =
83+sourceFoldMapWith streamLen n = concatMapFoldableWith S.serial S.yield [n..n+streamLen]
171− List.foldr S.consM S.nil (Prelude.fmap return [n..n+streamLen])
173−{-# INLINABLE concatMapFoldableWith #-}
85+{-# INLINE sourceFoldMapWithM #-}
174−concatMapFoldableWith :: P.Foldable f
175− => (Stream m b -> Stream m b -> Stream m b)
176− -> (a -> Stream m b)
179−concatMapFoldableWith f g = P.foldr (f . g) S.nil
181−{-# INLINE concatMapFoldableSerial #-}
182−concatMapFoldableSerial :: Int -> Int -> Stream m Int
183−concatMapFoldableSerial streamLen n =
184− concatMapFoldableWith S.append S.fromPure [n..n+streamLen]
186−{-# INLINE concatMapFoldableSerialM #-}
187−concatMapFoldableSerialM :: Monad m => Int -> Int -> Stream m Int
86+sourceFoldMapWithM :: Monad m => Int -> Int -> Stream m Int
188−concatMapFoldableSerialM streamLen n =
87+sourceFoldMapWithM streamLen n =
189− concatMapFoldableWith S.append (S.fromEffect . return) [n..n+streamLen]
88+ concatMapFoldableWith S.serial (S.yieldM . return) [n..n+streamLen]
191-------------------------------------------------------------------------------
90-------------------------------------------------------------------------------
192-- Elimination
91-- Elimination
193-------------------------------------------------------------------------------
92-------------------------------------------------------------------------------
195−{-# INLINE drain #-}
94+{-# INLINE runStream #-}
196−drain :: Monad m => Stream m a -> m ()
95+runStream :: Monad m => Stream m a -> m ()
197−drain = S.drain
96+runStream = S.drain
97+-- runStream = S.mapM_ (\_ -> return ())
199{-# INLINE mapM_ #-}
99{-# INLINE mapM_ #-}
200mapM_ :: Monad m => Stream m a -> m ()
100mapM_ :: Monad m => Stream m a -> m ()
201mapM_ = S.mapM_ (\_ -> return ())
101mapM_ = S.mapM_ (\_ -> return ())
103+{-# INLINE toNull #-}
104+toNull :: Monad m => Stream m Int -> m ()
203{-# INLINE uncons #-}
107{-# INLINE uncons #-}
204uncons :: Monad m => Stream m Int -> m ()
108uncons :: Monad m => Stream m Int -> m ()
205uncons s = do
109uncons s = do
@@ -209,13 +113,13 @@ uncons s = do
209 Just (_, t) -> uncons t
113 Just (_, t) -> uncons t
211{-# INLINE init #-}
115{-# INLINE init #-}
212−init :: Monad m => Stream m a -> m ()
116+init :: (Monad m, S.IsStream t) => t m a -> m ()
213init s = do
117init s = do
214 t <- S.init s
118 t <- S.init s
215 P.mapM_ S.drain t
119 P.mapM_ S.drain t
217{-# INLINE tail #-}
121{-# INLINE tail #-}
218−tail :: Monad m => Stream m a -> m ()
122+tail :: (Monad m, S.IsStream t) => t m a -> m ()
219tail s = S.tail s >>= P.mapM_ tail
123tail s = S.tail s >>= P.mapM_ tail
221{-# INLINE nullTail #-}
125{-# INLINE nullTail #-}
@@ -234,9 +138,9 @@ headTail s = do
234toList :: Monad m => Stream m Int -> m [Int]
138toList :: Monad m => Stream m Int -> m [Int]
235toList = S.toList
139toList = S.toList
237−{-# INLINE foldl' #-}
141+{-# INLINE foldl #-}
238−foldl' :: Monad m => Stream m Int -> m Int
142+foldl :: Monad m => Stream m Int -> m Int
239−foldl' = S.foldl' (+) 0
143+foldl = S.foldl' (+) 0
241{-# INLINE last #-}
145{-# INLINE last #-}
242last :: Monad m => Stream m Int -> m (Maybe Int)
146last :: Monad m => Stream m Int -> m (Maybe Int)
@@ -246,36 +150,40 @@ last = S.last
246-- Transformation
150-- Transformation
247-------------------------------------------------------------------------------
151-------------------------------------------------------------------------------
153+{-# INLINE transform #-}
154+transform :: Monad m => Stream m a -> m ()
155+transform = runStream
249{-# INLINE composeN #-}
157{-# INLINE composeN #-}
251 :: Monad m
159 :: Monad m
252 => Int -> (Stream m Int -> Stream m Int) -> Stream m Int -> m ()
160 => Int -> (Stream m Int -> Stream m Int) -> Stream m Int -> m ()
253composeN n f =
161composeN n f =
254 case n of
162 case n of
255− 1 -> drain . f
163+ 1 -> transform . f
256− 2 -> drain . f . f
164+ 2 -> transform . f . f
257− 3 -> drain . f . f . f
165+ 3 -> transform . f . f . f
258− 4 -> drain . f . f . f . f
166+ 4 -> transform . f . f . f . f
259 _ -> undefined
167 _ -> undefined
261−{-# INLINE scanl' #-}
169+{-# INLINE scan #-}
262−scanl' :: Monad m => Int -> Stream m Int -> m ()
170+scan :: Monad m => Int -> Stream m Int -> m ()
263−scanl' n = composeN n $ S.scanl' (+) 0
171+scan n = composeN n $ S.scanl' (+) 0
265{-# INLINE map #-}
173{-# INLINE map #-}
266map :: Monad m => Int -> Stream m Int -> m ()
174map :: Monad m => Int -> Stream m Int -> m ()
267−map n = composeN n $ S.map (+ 1)
175+map n = composeN n $ P.fmap (+ 1)
269{-# INLINE fmapK #-}
177{-# INLINE fmapK #-}
270fmapK :: Monad m => Int -> Stream m Int -> m ()
178fmapK :: Monad m => Int -> Stream m Int -> m ()
271fmapK n = composeN n $ P.fmap (+ 1)
179fmapK n = composeN n $ P.fmap (+ 1)
273{-# INLINE mapM #-}
181{-# INLINE mapM #-}
274−mapM :: Monad m => Int -> Stream m Int -> m ()
182+mapM :: S.MonadAsync m => Int -> Stream m Int -> m ()
275−mapM n = composeN n $ S.mapMWith S.consM return
183+mapM n = composeN n $ S.mapM return
277{-# INLINE mapMSerial #-}
185{-# INLINE mapMSerial #-}
278−mapMSerial :: Monad m => Int -> Stream m Int -> m ()
186+mapMSerial :: S.MonadAsync m => Int -> Stream m Int -> m ()
279mapMSerial n = composeN n $ S.mapMSerial return
187mapMSerial n = composeN n $ S.mapMSerial return
281{-# INLINE filterEven #-}
189{-# INLINE filterEven #-}
@@ -327,7 +235,7 @@ foldlS :: Monad m => Int -> Stream m Int -> m ()
327foldlS n = composeN n $ S.foldlS (flip S.cons) S.nil
235foldlS n = composeN n $ S.foldlS (flip S.cons) S.nil
329{-# INLINE intersperse #-}
237{-# INLINE intersperse #-}
330−intersperse :: Monad m => Int -> Int -> Stream m Int -> m ()
238+intersperse :: S.MonadAsync m => Int -> Int -> Stream m Int -> m ()
331intersperse streamLen n = composeN n $ S.intersperse streamLen
239intersperse streamLen n = composeN n $ S.intersperse streamLen
333-------------------------------------------------------------------------------
241-------------------------------------------------------------------------------
@@ -336,67 +244,51 @@ intersperse streamLen n = composeN n $ S.intersperse streamLen
337{-# INLINE iterateSource #-}
245{-# INLINE iterateSource #-}
338iterateSource
246iterateSource
339− :: Monad m => Int -> (Stream m Int -> Stream m Int) -> Int -> Int -> Stream m Int
248+ => Int -> (Stream m Int -> Stream m Int) -> Int -> Int -> Stream m Int
340−iterateSource iterStreamLen g i n = f i (unfoldrM iterStreamLen n)
249+iterateSource iterStreamLen g i n = f i (sourceUnfoldrM iterStreamLen n)
342 f (0 :: Int) m = g m
251 f (0 :: Int) m = g m
343 f x m = g (f (x P.- 1) m)
252 f x m = g (f (x P.- 1) m)
345-- this is quadratic
254-- this is quadratic
346{-# INLINE iterateScan #-}
255{-# INLINE iterateScan #-}
347−iterateScan :: Monad m => Int -> Int -> Int -> Stream m Int
256+iterateScan :: S.MonadAsync m => Int -> Int -> Int -> Stream m Int
348−iterateScan iterStreamLen maxIters =
349− iterateSource iterStreamLen (S.scanl' (+) 0) (maxIters `div` 10)
257+iterateScan iterStreamLen maxIters = iterateSource iterStreamLen (S.scanl' (+) 0) (maxIters `div` 10)
351-- this is quadratic
259-- this is quadratic
352{-# INLINE iterateDropWhileFalse #-}
260{-# INLINE iterateDropWhileFalse #-}
353−iterateDropWhileFalse :: Monad m => Int -> Int -> Int -> Int -> Stream m Int
261+iterateDropWhileFalse :: S.MonadAsync m => Int -> Int -> Int -> Int -> Stream m Int
354iterateDropWhileFalse streamLen iterStreamLen maxIters =
262iterateDropWhileFalse streamLen iterStreamLen maxIters =
355 iterateSource iterStreamLen (S.dropWhile (> streamLen)) (maxIters `div` 10)
263 iterateSource iterStreamLen (S.dropWhile (> streamLen)) (maxIters `div` 10)
357{-# INLINE iterateMapM #-}
265{-# INLINE iterateMapM #-}
358−iterateMapM :: Monad m => Int -> Int -> Int -> Stream m Int
266+iterateMapM :: S.MonadAsync m => Int -> Int -> Int -> Stream m Int
359−iterateMapM iterStreamLen =
360− iterateSource iterStreamLen (S.mapMWith S.consM return)
267+iterateMapM iterStreamLen maxIters = iterateSource iterStreamLen (S.mapM return) maxIters
362{-# INLINE iterateFilterEven #-}
269{-# INLINE iterateFilterEven #-}
363−iterateFilterEven :: Monad m => Int -> Int -> Int -> Stream m Int
270+iterateFilterEven :: S.MonadAsync m => Int -> Int -> Int -> Stream m Int
364−iterateFilterEven iterStreamLen = iterateSource iterStreamLen (S.filter even)
271+iterateFilterEven iterStreamLen maxIters = iterateSource iterStreamLen (S.filter even) maxIters
366{-# INLINE iterateTakeAll #-}
273{-# INLINE iterateTakeAll #-}
367−iterateTakeAll :: Monad m => Int -> Int -> Int -> Int -> Stream m Int
274+iterateTakeAll :: S.MonadAsync m => Int -> Int -> Int -> Int -> Stream m Int
368−iterateTakeAll streamLen iterStreamLen =
369− iterateSource iterStreamLen (S.take streamLen)
275+iterateTakeAll streamLen iterStreamLen maxIters = iterateSource iterStreamLen (S.take streamLen) maxIters
371{-# INLINE iterateDropOne #-}
277{-# INLINE iterateDropOne #-}
372−iterateDropOne :: Monad m => Int -> Int -> Int -> Stream m Int
278+iterateDropOne :: S.MonadAsync m => Int -> Int -> Int -> Stream m Int
373−iterateDropOne iterStreamLen = iterateSource iterStreamLen (S.drop 1)
279+iterateDropOne iterStreamLen maxIters = iterateSource iterStreamLen (S.drop 1) maxIters
375{-# INLINE iterateDropWhileTrue #-}
281{-# INLINE iterateDropWhileTrue #-}
376−iterateDropWhileTrue ::
377− Monad m => Int -> Int -> Int -> Int -> Stream m Int
282+iterateDropWhileTrue :: S.MonadAsync m => Int -> Int -> Int -> Int -> Stream m Int
378−iterateDropWhileTrue streamLen iterStreamLen =
379− iterateSource iterStreamLen (S.dropWhile (<= streamLen))
283+iterateDropWhileTrue streamLen iterStreamLen maxIters = iterateSource iterStreamLen (S.dropWhile (<= streamLen)) maxIters
381-------------------------------------------------------------------------------
285-------------------------------------------------------------------------------
382-- Zipping
286-- Zipping
383-------------------------------------------------------------------------------
287-------------------------------------------------------------------------------
385−{-# INLINE zipWith #-}
289+{-# INLINE zip #-}
386−zipWith :: Monad m => Stream m Int -> m ()
290+zip :: Monad m => Stream m Int -> m ()
387−zipWith src = drain $ S.zipWith (,) src src
291+zip src = transform $ S.zipWith (,) src src
389−{-# INLINE zipWithM #-}
390−zipWithM :: Monad m => Stream m Int -> m ()
391−zipWithM src = drain $ S.zipWithM (curry return) src src
393−{-# INLINE sortByK #-}
394−sortByK :: (a -> a -> Ordering) -> Stream m a -> Stream m a
395−sortByK f = S.mergeMapWith (S.mergeBy f) S.fromPure
397−{-# INLINE sortBy #-}
398−sortBy :: Monad m => Stream m Int -> m ()
399−sortBy = drain . sortByK compare
401-------------------------------------------------------------------------------
293-------------------------------------------------------------------------------
402-- Mixed Composition
294-- Mixed Composition
@@ -434,9 +326,10 @@ filterDrop streamLen n = composeN n $ S.drop 1 . S.filter (<= streamLen)
434filterTake :: Monad m => Int -> Int -> Stream m Int -> m ()
326filterTake :: Monad m => Int -> Int -> Stream m Int -> m ()
435filterTake streamLen n = composeN n $ S.take streamLen . S.filter (<= streamLen)
327filterTake streamLen n = composeN n $ S.take streamLen . S.filter (<= streamLen)
329+-- Initially, this used maxBound not streamLen
437{-# INLINE filterScan #-}
330{-# INLINE filterScan #-}
438−filterScan :: Monad m => Int -> Stream m Int -> m ()
331+filterScan :: Monad m => Int -> Int -> Stream m Int -> m ()
439−filterScan n = composeN n $ S.scanl' (+) 0 . S.filter (<= maxBound)
332+filterScan streamLen n = composeN n $ S.scanl' (+) 0 . S.filter (<= streamLen)
441{-# INLINE filterMap #-}
334{-# INLINE filterMap #-}
442filterMap :: Monad m => Int -> Int -> Stream m Int -> m ()
335filterMap :: Monad m => Int -> Int -> Stream m Int -> m ()
@@ -452,8 +345,8 @@ filterMap streamLen n = composeN n $ S.map (subtract 1) . S.filter (<= streamLen
452concatMap :: Int -> Int -> Int -> IO ()
345concatMap :: Int -> Int -> Int -> IO ()
453concatMap outer inner n =
346concatMap outer inner n =
454 S.drain $ S.concatMap
347 S.drain $ S.concatMap
455− (\_ -> unfoldrM inner n)
348+ (\_ -> sourceUnfoldrM inner n)
456− (unfoldrM outer n)
349+ (sourceUnfoldrM outer n)
458#ifdef INSPECTION
351#ifdef INSPECTION
459inspect $ hasNoTypeClasses 'concatMap
352inspect $ hasNoTypeClasses 'concatMap
@@ -465,8 +358,8 @@ inspect $ hasNoTypeClasses 'concatMap
465concatMapPure :: Int -> Int -> Int -> IO ()
358concatMapPure :: Int -> Int -> Int -> IO ()
466concatMapPure outer inner n =
359concatMapPure outer inner n =
467 S.drain $ S.concatMap
360 S.drain $ S.concatMap
468− (\_ -> unfoldr inner n)
361+ (\_ -> sourceUnfoldr inner n)
469− (unfoldr outer n)
362+ (sourceUnfoldr outer n)
471#ifdef INSPECTION
364#ifdef INSPECTION
472inspect $ hasNoTypeClasses 'concatMapPure
365inspect $ hasNoTypeClasses 'concatMapPure
@@ -477,7 +370,7 @@ inspect $ hasNoTypeClasses 'concatMapPure
477{-# INLINE concatMapRepl #-}
370{-# INLINE concatMapRepl #-}
478concatMapRepl :: Int -> Int -> Int -> IO ()
371concatMapRepl :: Int -> Int -> Int -> IO ()
479concatMapRepl outer inner n =
372concatMapRepl outer inner n =
480− S.drain $ S.concatMap (S.replicate inner) (unfoldrM outer n)
373+ S.drain $ S.concatMap (S.replicate inner) (sourceUnfoldrM outer n)
482#ifdef INSPECTION
375#ifdef INSPECTION
483inspect $ hasNoTypeClasses 'concatMapRepl
376inspect $ hasNoTypeClasses 'concatMapRepl
@@ -489,70 +382,44 @@ inspect $ hasNoTypeClasses 'concatMapRepl
489sourceConcatMapId :: Monad m
382sourceConcatMapId :: Monad m
490 => Int -> Int -> Stream m (Stream m Int)
383 => Int -> Int -> Stream m (Stream m Int)
491sourceConcatMapId val n =
384sourceConcatMapId val n =
492− S.fromFoldable $ fmap (S.fromEffect . return) [n..n+val]
385+ S.fromFoldable $ fmap (S.yieldM . return) [n..n+val]
494−{-# INLINE concatMapBySerial #-}
387+{-# INLINE concatStreamsWith #-}
495−concatMapBySerial :: Int -> Int -> Int -> IO ()
388+concatStreamsWith :: Int -> Int -> Int -> IO ()
496−concatMapBySerial outer inner n =
389+concatStreamsWith outer inner n =
497− S.drain $ S.concatMapWith S.append
390+ S.drain $ S.concatMapBy S.serial
498− (unfoldrM inner)
391+ (sourceUnfoldrM inner)
499− (unfoldrM outer n)
392+ (sourceUnfoldrM outer n)
501-------------------------------------------------------------------------------
394-------------------------------------------------------------------------------
502-- Nested Composition
395-- Nested Composition
503-------------------------------------------------------------------------------
396-------------------------------------------------------------------------------
505−instance Monad m => Applicative (S.StreamK m) where
506− {-# INLINE pure #-}
398+{-# INLINE toNullApNested #-}
509− {-# INLINE (<*>) #-}
510− (<*>) = S.crossApply
512− {-# INLINE liftA2 #-}
513− liftA2 f x = (<*>) (fmap f x)
516− (*>) = S.crossApplySnd
519− (<*) = S.crossApplyFst
521−-- NOTE: even though concatMap for StreamD is 3x faster compared to StreamK,
522−-- the monad instance of StreamD is slower than StreamK after foldr/build
524−instance Monad m => Monad (S.StreamK m) where
525− {-# INLINE return #-}
528− {-# INLINE (>>=) #-}
529− (>>=) = flip S.concatMap
531−{-# INLINE drainApplicative #-}
532−drainApplicative :: Monad m => Stream m Int -> m ()
399+toNullApNested :: Monad m => Stream m Int -> m ()
533−drainApplicative s = drain $ do
400+toNullApNested s = runStream $ do
534 (+) <$> s <*> s
401 (+) <$> s <*> s
536−{-# INLINE drainMonad #-}
403+{-# INLINE toNullNested #-}
537−drainMonad :: Monad m => Stream m Int -> m ()
404+toNullNested :: Monad m => Stream m Int -> m ()
538−drainMonad s = drain $ do
405+toNullNested s = runStream $ do
541 return $ x + y
408 return $ x + y
543−{-# INLINE drainMonad3 #-}
410+{-# INLINE toNullNested3 #-}
544−drainMonad3 :: Monad m => Stream m Int -> m ()
411+toNullNested3 :: Monad m => Stream m Int -> m ()
545−drainMonad3 s = drain $ do
412+toNullNested3 s = runStream $ do
549 return $ x + y + z
416 return $ x + y + z
551−{-# INLINE filterAllOutMonad #-}
418+{-# INLINE filterAllOutNested #-}
552−filterAllOutMonad
419+filterAllOutNested
553 :: Monad m
420 :: Monad m
554 => Stream m Int -> m ()
421 => Stream m Int -> m ()
555−filterAllOutMonad str = drain $ do
422+filterAllOutNested str = runStream $ do
558 let s = x + y
425 let s = x + y
@@ -560,11 +427,11 @@ filterAllOutMonad str = drain $ do
560 then return s
427 then return s
561 else S.nil
428 else S.nil
563−{-# INLINE filterAllInMonad #-}
430+{-# INLINE filterAllInNested #-}
564−filterAllInMonad
431+filterAllInNested
565 :: Monad m
432 :: Monad m
566 => Stream m Int -> m ()
433 => Stream m Int -> m ()
567−filterAllInMonad str = drain $ do
434+filterAllInNested str = runStream $ do
570 let s = x + y
437 let s = x + y
@@ -576,14 +443,9 @@ filterAllInMonad str = drain $ do
576-- Nested Composition Pure lists
443-- Nested Composition Pure lists
577-------------------------------------------------------------------------------
444-------------------------------------------------------------------------------
579−-- There are several list benchmarks here for comparison with lists. It is easy
446+{-# INLINE sourceUnfoldrList #-}
580−-- and convenient to see the comparisons when they are here, otherwise we'll
447+sourceUnfoldrList :: Int -> Int -> [Int]
581−-- have to add a separate module for list benchmarks with the same names and
582−-- then add a comparison in bench.sh.
584−{-# INLINE unfoldrList #-}
585−unfoldrList :: Int -> Int -> [Int]
586−unfoldrList maxval n = List.unfoldr step n
448+sourceUnfoldrList maxval n = List.unfoldr step n
588 step cnt =
450 step cnt =
589 if cnt > n + maxval
451 if cnt > n + maxval
@@ -634,52 +496,46 @@ filterAllInNestedList str = do
634-------------------------------------------------------------------------------
496-------------------------------------------------------------------------------
636moduleName :: String
498moduleName :: String
637−moduleName = "Data.StreamK"
499+moduleName = "Data.Stream.StreamK"
639o_1_space_generation :: Int -> Benchmark
501o_1_space_generation :: Int -> Benchmark
640o_1_space_generation streamLen =
502o_1_space_generation streamLen =
641 bgroup "generation"
503 bgroup "generation"
642− [ benchFold "unfoldr" drain (unfoldr streamLen)
504+ [ benchFold "unfoldr" toNull (sourceUnfoldr streamLen)
643− , benchFold "unfoldrM" drain (unfoldrM streamLen)
505+ , benchFold "unfoldrM" toNull (sourceUnfoldrM streamLen)
644− , benchFold "repeat" drain (repeat streamLen)
506+
645− , benchFold "repeatM" drain (repeatM streamLen)
646− , benchFold "replicate" drain (replicate streamLen)
647− , benchFold "replicateM" drain (replicateM streamLen)
648− , benchFold "iterate" drain (iterate streamLen)
649− , benchFold "iterateM" drain (iterateM streamLen)
651− , benchFold "fromFoldable" drain (fromFoldable streamLen)
507+ , benchFold "fromFoldable" toNull (sourceFromFoldable streamLen)
652− , benchFold "fromFoldableM" drain (fromFoldableM streamLen)
508+ , benchFold "fromFoldableM" toNull (sourceFromFoldableM streamLen)
654 -- appends
510 -- appends
655− , benchFold "concatMapFoldableWith" drain (concatMapFoldableSerial streamLen)
511+ , benchFold "concatMapFoldableWith" toNull (sourceFoldMapWith streamLen)
656− , benchFold "concatMapFoldableWithM" drain (concatMapFoldableSerialM streamLen)
512+ , benchFold "concatMapFoldableWithM" toNull (sourceFoldMapWithM streamLen)
659o_1_space_elimination :: Int -> Benchmark
515o_1_space_elimination :: Int -> Benchmark
660o_1_space_elimination streamLen =
516o_1_space_elimination streamLen =
661 bgroup "elimination"
517 bgroup "elimination"
662− [ benchFold "toNull" drain (unfoldrM streamLen)
518+ [ benchFold "toNull" toNull (sourceUnfoldrM streamLen)
663− , benchFold "mapM_" mapM_ (unfoldrM streamLen)
519+ , benchFold "mapM_" mapM_ (sourceUnfoldrM streamLen)
664− , benchFold "uncons" uncons (unfoldrM streamLen)
520+ , benchFold "uncons" uncons (sourceUnfoldrM streamLen)
665− , benchFold "init" init (unfoldrM streamLen)
521+ , benchFold "init" init (sourceUnfoldrM streamLen)
666− , benchFold "foldl'" foldl' (unfoldrM streamLen)
522+ , benchFold "foldl'" foldl (sourceUnfoldrM streamLen)
667− , benchFold "last" last (unfoldrM streamLen)
523+ , benchFold "last" last (sourceUnfoldrM streamLen)
670o_1_space_nested :: Int -> Benchmark
526o_1_space_nested :: Int -> Benchmark
671o_1_space_nested streamLen =
527o_1_space_nested streamLen =
672 bgroup "nested"
528 bgroup "nested"
673− [ benchFold "drainApplicative" drainApplicative (unfoldrM streamLen2)
529+ [ benchFold "toNullAp" toNullApNested (sourceUnfoldrM streamLen2)
674− , benchFold "drainMonad" drainMonad (unfoldrM streamLen2)
530+ , benchFold "toNull" toNullNested (sourceUnfoldrM streamLen2)
675− , benchFold "drainMonad3" drainMonad3 (unfoldrM streamLen3)
531+ , benchFold "toNull3" toNullNested3 (sourceUnfoldrM streamLen3)
676− , benchFold "filterAllInMonad" filterAllInMonad (unfoldrM streamLen2)
532+ , benchFold "filterAllIn" filterAllInNested (sourceUnfoldrM streamLen2)
677− , benchFold "filterAllOutMonad" filterAllOutMonad (unfoldrM streamLen2)
533+ , benchFold "filterAllOut" filterAllOutNested (sourceUnfoldrM streamLen2)
678− , benchFold "drainApplicative (pure)" drainApplicative (unfoldr streamLen2)
534+ , benchFold "toNullApPure" toNullApNested (sourceUnfoldr streamLen2)
679− , benchFold "drainMonad (pure)" drainMonad (unfoldr streamLen2)
535+ , benchFold "toNullPure" toNullNested (sourceUnfoldr streamLen2)
680− , benchFold "drainMonad3 (pure)" drainMonad3 (unfoldr streamLen3)
536+ , benchFold "toNull3Pure" toNullNested3 (sourceUnfoldr streamLen3)
681− , benchFold "filterAllInMonad (pure)" filterAllInMonad (unfoldr streamLen2)
537+ , benchFold "filterAllInPure" filterAllInNested (sourceUnfoldr streamLen2)
682− , benchFold "filterAllOutMonad (pure)" filterAllOutMonad (unfoldr streamLen2)
538+ , benchFold "filterAllOutPure" filterAllOutNested (sourceUnfoldr streamLen2)
685 streamLen2 = round (P.fromIntegral streamLen**(1/2::P.Double)) -- double nested loop
541 streamLen2 = round (P.fromIntegral streamLen**(1/2::P.Double)) -- double nested loop
@@ -688,25 +544,24 @@ o_1_space_nested streamLen =
688o_1_space_transformation :: Int -> Benchmark
544o_1_space_transformation :: Int -> Benchmark
689o_1_space_transformation streamLen =
545o_1_space_transformation streamLen =
690 bgroup "transformation"
546 bgroup "transformation"
691− [ benchFold "foldrS" (foldrS 1) (unfoldrM streamLen)
548+ [ benchFold "foldrS" (foldrS 1) (sourceUnfoldrM streamLen)
692− , benchFold "scanl'" (scanl' 1) (unfoldrM streamLen)
549+ , benchFold "scan" (scan 1) (sourceUnfoldrM streamLen)
693− , benchFold "map" (map 1) (unfoldrM streamLen)
550+ , benchFold "map" (map 1) (sourceUnfoldrM streamLen)
694− , benchFold "fmap" (fmapK 1) (unfoldrM streamLen)
551+ , benchFold "fmap" (fmapK 1) (sourceUnfoldrM streamLen)
695− , benchFold "mapM" (mapM 1) (unfoldrM streamLen)
552+ , benchFold "mapM" (mapM 1) (sourceUnfoldrM streamLen)
696− , benchFold "mapMSerial" (mapMSerial 1) (unfoldrM streamLen)
553+ , benchFold "mapMSerial" (mapMSerial 1) (sourceUnfoldrM streamLen)
699−o_1_space_transformationX4 :: Int -> Benchmark
700−o_1_space_transformationX4 streamLen =
701− bgroup "transformationX4"
555+ , bgroup "X4"
702− [ benchFold "scanl'" (scanl' 4) (unfoldrM streamLen)
556+ [ benchFold "scan" (scan 4) (sourceUnfoldrM streamLen)
703− , benchFold "map" (map 4) (unfoldrM streamLen)
557+ , benchFold "map" (map 4) (sourceUnfoldrM streamLen)
704− , benchFold "fmap" (fmapK 4) (unfoldrM streamLen)
558+ , benchFold "fmap" (fmapK 4) (sourceUnfoldrM streamLen)
705− , benchFold "mapM" (mapM 4) (unfoldrM streamLen)
559+ , benchFold "mapM" (mapM 4) (sourceUnfoldrM streamLen)
706− , benchFold "mapMSerial" (mapMSerial 4) (unfoldrM streamLen)
560+ , benchFold "mapMSerial" (mapMSerial 4) (sourceUnfoldrM streamLen)
707 -- XXX this is horribly slow
561 -- XXX this is horribly slow
708− -- , benchFold "concatMap" (concatMap 4) (unfoldrM streamLen16)
562+ -- , benchFold "concatMap" (concatMap 4) (sourceUnfoldrM streamLen16)
711o_1_space_concat :: Int -> Benchmark
566o_1_space_concat :: Int -> Benchmark
712o_1_space_concat streamLen =
567o_1_space_concat streamLen =
@@ -730,17 +585,14 @@ o_1_space_concat streamLen =
731 -- This is for comparison with concatMapFoldableWith
586 -- This is for comparison with concatMapFoldableWith
732 , benchIOSrc1 "concatMapWithId (n of 1) (fromFoldable)"
587 , benchIOSrc1 "concatMapWithId (n of 1) (fromFoldable)"
734− . S.concatMapWith S.append id
735− . sourceConcatMapId streamLen)
588+ (S.drain . S.concatMapBy S.serial id . sourceConcatMapId streamLen)
737− , benchIOSrc1 "concatMapBy serial (n of 1)"
590+ , benchIOSrc1 "concatMapWith (n of 1)"
738− (concatMapBySerial streamLen 1)
591+ (concatStreamsWith streamLen 1)
739− , benchIOSrc1 "concatMapBy serial (sqrt n of sqrt n)"
592+ , benchIOSrc1 "concatMapWith (sqrt n of sqrt n)"
740− (concatMapBySerial streamLen2 streamLen2)
593+ (concatStreamsWith streamLen2 streamLen2)
741− , benchIOSrc1 "concatMapBy serial (1 of n)"
594+ , benchIOSrc1 "concatMapWith (1 of n)"
742− (concatMapBySerial 1 streamLen)
595+ (concatStreamsWith 1 streamLen)
743− , benchFold "sortBy" sortBy (unfoldrM streamLen)
746 streamLen2 = round (P.fromIntegral streamLen**(1/2::P.Double)) -- double nested loop
598 streamLen2 = round (P.fromIntegral streamLen**(1/2::P.Double)) -- double nested loop
@@ -748,95 +600,89 @@ o_1_space_concat streamLen =
748o_1_space_filtering :: Int -> Benchmark
600o_1_space_filtering :: Int -> Benchmark
749o_1_space_filtering streamLen =
601o_1_space_filtering streamLen =
750 bgroup "filtering"
602 bgroup "filtering"
751− [ benchFold "filter-even" (filterEven 1) (unfoldrM streamLen)
604+ [ benchFold "filter-even" (filterEven 1) (sourceUnfoldrM streamLen)
752− , benchFold "filter-all-out" (filterAllOut streamLen 1) (unfoldrM streamLen)
605+ , benchFold "filter-all-out" (filterAllOut streamLen 1) (sourceUnfoldrM streamLen)
753− , benchFold "filter-all-in" (filterAllIn streamLen 1) (unfoldrM streamLen)
606+ , benchFold "filter-all-in" (filterAllIn streamLen 1) (sourceUnfoldrM streamLen)
754− , benchFold "take-all" (takeAll streamLen 1) (unfoldrM streamLen)
607+ , benchFold "take-all" (takeAll streamLen 1) (sourceUnfoldrM streamLen)
755− , benchFold "takeWhile-true" (takeWhileTrue streamLen 1) (unfoldrM streamLen)
608+ , benchFold "takeWhile-true" (takeWhileTrue streamLen 1) (sourceUnfoldrM streamLen)
756− , benchFold "drop-one" (dropOne 1) (unfoldrM streamLen)
609+ , benchFold "drop-one" (dropOne 1) (sourceUnfoldrM streamLen)
757− , benchFold "drop-all" (dropAll streamLen 1) (unfoldrM streamLen)
610+ , benchFold "drop-all" (dropAll streamLen 1) (sourceUnfoldrM streamLen)
758− , benchFold "dropWhile-true" (dropWhileTrue streamLen 1) (unfoldrM streamLen)
611+ , benchFold "dropWhile-true" (dropWhileTrue streamLen 1) (sourceUnfoldrM streamLen)
759− , benchFold "dropWhile-false" (dropWhileFalse 1) (unfoldrM streamLen)
612+ , benchFold "dropWhile-false" (dropWhileFalse 1) (sourceUnfoldrM streamLen)
762−o_1_space_filteringX4 :: Int -> Benchmark
763−o_1_space_filteringX4 streamLen =
764− bgroup "filteringX4"
614+ , bgroup "X4"
765− [ benchFold "filter-even" (filterEven 4) (unfoldrM streamLen)
615+ [ benchFold "filter-even" (filterEven 4) (sourceUnfoldrM streamLen)
766− , benchFold "filter-all-out" (filterAllOut streamLen 4) (unfoldrM streamLen)
616+ , benchFold "filter-all-out" (filterAllOut streamLen 4) (sourceUnfoldrM streamLen)
767− , benchFold "filter-all-in" (filterAllIn streamLen 4) (unfoldrM streamLen)
617+ , benchFold "filter-all-in" (filterAllIn streamLen 4) (sourceUnfoldrM streamLen)
768− , benchFold "take-all" (takeAll streamLen 4) (unfoldrM streamLen)
618+ , benchFold "take-all" (takeAll streamLen 4) (sourceUnfoldrM streamLen)
769− , benchFold "takeWhile-true" (takeWhileTrue streamLen 4) (unfoldrM streamLen)
619+ , benchFold "takeWhile-true" (takeWhileTrue streamLen 4) (sourceUnfoldrM streamLen)
770− , benchFold "drop-one" (dropOne 4) (unfoldrM streamLen)
620+ , benchFold "drop-one" (dropOne 4) (sourceUnfoldrM streamLen)
771− , benchFold "drop-all" (dropAll streamLen 4) (unfoldrM streamLen)
621+ , benchFold "drop-all" (dropAll streamLen 4) (sourceUnfoldrM streamLen)
772− , benchFold "dropWhile-true" (dropWhileTrue streamLen 4) (unfoldrM streamLen)
622+ , benchFold "dropWhile-true" (dropWhileTrue streamLen 4) (sourceUnfoldrM streamLen)
773− , benchFold "dropWhile-false" (dropWhileFalse 4) (unfoldrM streamLen)
623+ , benchFold "dropWhile-false" (dropWhileFalse 4) (sourceUnfoldrM streamLen)
776o_1_space_zipping :: Int -> Benchmark
627o_1_space_zipping :: Int -> Benchmark
777o_1_space_zipping streamLen =
628o_1_space_zipping streamLen =
778 bgroup "zipping"
629 bgroup "zipping"
779− [ benchFold "zipWith" zipWith (unfoldrM streamLen)
630+ [ benchFold "zip" zip (sourceUnfoldrM streamLen)
780− , benchFold "zipWithM" zipWithM (unfoldrM streamLen)
783o_1_space_mixed :: Int -> Benchmark
633o_1_space_mixed :: Int -> Benchmark
784o_1_space_mixed streamLen =
634o_1_space_mixed streamLen =
785 bgroup "mixed"
635 bgroup "mixed"
786− [ benchFold "scan-map" (scanMap 1) (unfoldrM streamLen)
637+ [ benchFold "scan-map" (scanMap 1) (sourceUnfoldrM streamLen)
787− , benchFold "drop-map" (dropMap 1) (unfoldrM streamLen)
638+ , benchFold "drop-map" (dropMap 1) (sourceUnfoldrM streamLen)
788− , benchFold "drop-scan" (dropScan 1) (unfoldrM streamLen)
639+ , benchFold "drop-scan" (dropScan 1) (sourceUnfoldrM streamLen)
789− , benchFold "take-drop" (takeDrop streamLen 1) (unfoldrM streamLen)
640+ , benchFold "take-drop" (takeDrop streamLen 1) (sourceUnfoldrM streamLen)
790− , benchFold "take-scan" (takeScan streamLen 1) (unfoldrM streamLen)
641+ , benchFold "take-scan" (takeScan streamLen 1) (sourceUnfoldrM streamLen)
791− , benchFold "take-map" (takeMap streamLen 1) (unfoldrM streamLen)
642+ , benchFold "take-map" (takeMap streamLen 1) (sourceUnfoldrM streamLen)
792− , benchFold "filter-drop" (filterDrop streamLen 1) (unfoldrM streamLen)
643+ , benchFold "filter-drop" (filterDrop streamLen 1) (sourceUnfoldrM streamLen)
793− , benchFold "filter-take" (filterTake streamLen 1) (unfoldrM streamLen)
644+ , benchFold "filter-take" (filterTake streamLen 1) (sourceUnfoldrM streamLen)
794− , benchFold "filter-scan" (filterScan 1) (unfoldrM streamLen)
645+ , benchFold "filter-scan" (filterScan streamLen 1) (sourceUnfoldrM streamLen)
795− , benchFold "filter-map" (filterMap streamLen 1) (unfoldrM streamLen)
646+ , benchFold "filter-map" (filterMap streamLen 1) (sourceUnfoldrM streamLen)
798−o_1_space_mixedX2 :: Int -> Benchmark
799−o_1_space_mixedX2 streamLen =
800− bgroup "mixedX2"
648+ , bgroup "X2"
801− [ benchFold "scan-map" (scanMap 2) (unfoldrM streamLen)
649+ [ benchFold "scan-map" (scanMap 2) (sourceUnfoldrM streamLen)
802− , benchFold "drop-map" (dropMap 2) (unfoldrM streamLen)
650+ , benchFold "drop-map" (dropMap 2) (sourceUnfoldrM streamLen)
803− , benchFold "drop-scan" (dropScan 2) (unfoldrM streamLen)
651+ , benchFold "drop-scan" (dropScan 2) (sourceUnfoldrM streamLen)
804− , benchFold "take-drop" (takeDrop streamLen 2) (unfoldrM streamLen)
652+ , benchFold "take-drop" (takeDrop streamLen 2) (sourceUnfoldrM streamLen)
805− , benchFold "take-scan" (takeScan streamLen 2) (unfoldrM streamLen)
653+ , benchFold "take-scan" (takeScan streamLen 2) (sourceUnfoldrM streamLen)
806− , benchFold "take-map" (takeMap streamLen 2) (unfoldrM streamLen)
654+ , benchFold "take-map" (takeMap streamLen 2) (sourceUnfoldrM streamLen)
807− , benchFold "filter-drop" (filterDrop streamLen 2) (unfoldrM streamLen)
655+ , benchFold "filter-drop" (filterDrop streamLen 2) (sourceUnfoldrM streamLen)
808− , benchFold "filter-take" (filterTake streamLen 2) (unfoldrM streamLen)
656+ , benchFold "filter-take" (filterTake streamLen 2) (sourceUnfoldrM streamLen)
809− , benchFold "filter-scan" (filterScan 2) (unfoldrM streamLen)
657+ , benchFold "filter-scan" (filterScan streamLen 2) (sourceUnfoldrM streamLen)
810− , benchFold "filter-map" (filterMap streamLen 2) (unfoldrM streamLen)
658+ , benchFold "filter-map" (filterMap streamLen 2) (sourceUnfoldrM streamLen)
813−o_1_space_mixedX4 :: Int -> Benchmark
814−o_1_space_mixedX4 streamLen =
815− bgroup "mixedX4"
660+ , bgroup "X4"
816− [ benchFold "scan-map" (scanMap 4) (unfoldrM streamLen)
661+ [ benchFold "scan-map" (scanMap 4) (sourceUnfoldrM streamLen)
817− , benchFold "drop-map" (dropMap 4) (unfoldrM streamLen)
662+ , benchFold "drop-map" (dropMap 4) (sourceUnfoldrM streamLen)
818− , benchFold "drop-scan" (dropScan 4) (unfoldrM streamLen)
663+ , benchFold "drop-scan" (dropScan 4) (sourceUnfoldrM streamLen)
819− , benchFold "take-drop" (takeDrop streamLen 4) (unfoldrM streamLen)
664+ , benchFold "take-drop" (takeDrop streamLen 4) (sourceUnfoldrM streamLen)
820− , benchFold "take-scan" (takeScan streamLen 4) (unfoldrM streamLen)
665+ , benchFold "take-scan" (takeScan streamLen 4) (sourceUnfoldrM streamLen)
821− , benchFold "take-map" (takeMap streamLen 4) (unfoldrM streamLen)
666+ , benchFold "take-map" (takeMap streamLen 4) (sourceUnfoldrM streamLen)
822− , benchFold "filter-drop" (filterDrop streamLen 4) (unfoldrM streamLen)
667+ , benchFold "filter-drop" (filterDrop streamLen 4) (sourceUnfoldrM streamLen)
823− , benchFold "filter-take" (filterTake streamLen 4) (unfoldrM streamLen)
668+ , benchFold "filter-take" (filterTake streamLen 4) (sourceUnfoldrM streamLen)
824− , benchFold "filter-scan" (filterScan 4) (unfoldrM streamLen)
669+ , benchFold "filter-scan" (filterScan streamLen 4) (sourceUnfoldrM streamLen)
825− , benchFold "filter-map" (filterMap streamLen 4) (unfoldrM streamLen)
670+ , benchFold "filter-map" (filterMap streamLen 4) (sourceUnfoldrM streamLen)
828o_1_space_list :: Int -> Benchmark
674o_1_space_list :: Int -> Benchmark
829o_1_space_list streamLen =
675o_1_space_list streamLen =
830 bgroup "list"
676 bgroup "list"
831 [ bgroup "elimination"
677 [ bgroup "elimination"
832− [ benchList "last" (\xs -> [List.last xs]) (unfoldrList streamLen)
678+ [ benchList "last" (\xs -> [List.last xs]) (sourceUnfoldrList streamLen)
834 , bgroup "nested"
680 , bgroup "nested"
835− [ benchList "toNullAp" toNullApNestedList (unfoldrList streamLen2)
681+ [ benchList "toNullAp" toNullApNestedList (sourceUnfoldrList streamLen2)
836− , benchList "toNull" toNullNestedList (unfoldrList streamLen2)
682+ , benchList "toNull" toNullNestedList (sourceUnfoldrList streamLen2)
837− , benchList "toNull3" toNullNestedList3 (unfoldrList streamLen3)
683+ , benchList "toNull3" toNullNestedList3 (sourceUnfoldrList streamLen3)
838− , benchList "filterAllIn" filterAllInNestedList (unfoldrList streamLen2)
684+ , benchList "filterAllIn" filterAllInNestedList (sourceUnfoldrList streamLen2)
839− , benchList "filterAllOut" filterAllOutNestedList (unfoldrList streamLen2)
685+ , benchList "filterAllOut" filterAllOutNestedList (sourceUnfoldrList streamLen2)
@@ -851,14 +697,10 @@ o_1_space streamLen =
851 , o_1_space_elimination streamLen
697 , o_1_space_elimination streamLen
852 , o_1_space_nested streamLen
698 , o_1_space_nested streamLen
853 , o_1_space_transformation streamLen
699 , o_1_space_transformation streamLen
854− , o_1_space_transformationX4 streamLen
855 , o_1_space_concat streamLen
700 , o_1_space_concat streamLen
856 , o_1_space_filtering streamLen
701 , o_1_space_filtering streamLen
857− , o_1_space_filteringX4 streamLen
858 , o_1_space_zipping streamLen
702 , o_1_space_zipping streamLen
859 , o_1_space_mixed streamLen
703 , o_1_space_mixed streamLen
860− , o_1_space_mixedX2 streamLen
861− , o_1_space_mixedX4 streamLen
862 , o_1_space_list streamLen
704 , o_1_space_list streamLen
@@ -866,31 +708,31 @@ o_n_heap :: Int -> Benchmark
866o_n_heap streamLen =
708o_n_heap streamLen =
867 bgroup (o_n_heap_prefix moduleName)
709 bgroup (o_n_heap_prefix moduleName)
868 [ bgroup "transformation"
710 [ bgroup "transformation"
869− [ benchFold "foldlS" (foldlS 1) (unfoldrM streamLen)
711+ [ benchFold "foldlS" (foldlS 1) (sourceUnfoldrM streamLen)
873{-# INLINE benchK #-}
715{-# INLINE benchK #-}
874benchK :: P.String -> (Int -> Stream P.IO Int) -> Benchmark
716benchK :: P.String -> (Int -> Stream P.IO Int) -> Benchmark
875−benchK name f = bench name $ nfIO $ randomRIO (1,1) >>= drain . f
717+benchK name f = bench name $ nfIO $ randomRIO (1,1) >>= toNull . f
877o_n_stack :: Int -> Int -> Int -> Benchmark
719o_n_stack :: Int -> Int -> Int -> Benchmark
878o_n_stack streamLen iterStreamLen maxIters =
720o_n_stack streamLen iterStreamLen maxIters =
879 bgroup (o_n_stack_prefix moduleName)
721 bgroup (o_n_stack_prefix moduleName)
880 [ bgroup "elimination"
722 [ bgroup "elimination"
881− [ benchFold "tail" tail (unfoldrM streamLen)
723+ [ benchFold "tail" tail (sourceUnfoldrM streamLen)
882− , benchFold "nullTail" nullTail (unfoldrM streamLen)
724+ , benchFold "nullTail" nullTail (sourceUnfoldrM streamLen)
883− , benchFold "headTail" headTail (unfoldrM streamLen)
725+ , benchFold "headTail" headTail (sourceUnfoldrM streamLen)
885 , bgroup "transformation"
727 , bgroup "transformation"
887 -- XXX why do these need so much stack
729 -- XXX why do these need so much stack
888− benchFold "intersperse" (intersperse streamLen 1) (unfoldrM streamLen2)
730+ benchFold "intersperse" (intersperse streamLen 1) (sourceUnfoldrM streamLen2)
889− , benchFold "interspersePure" (intersperse streamLen 1) (unfoldr streamLen2)
731+ , benchFold "interspersePure" (intersperse streamLen 1) (sourceUnfoldr streamLen2)
891 , bgroup "transformationX4"
733 , bgroup "transformationX4"
893− benchFold "intersperse" (intersperse streamLen 4) (unfoldrM streamLen16)
735+ benchFold "intersperse" (intersperse streamLen 4) (sourceUnfoldrM streamLen16)
895 , bgroup "iterated"
737 , bgroup "iterated"
896 [ benchK "mapM" (iterateMapM iterStreamLen maxIters)
738 [ benchK "mapM" (iterateMapM iterStreamLen maxIters)
@@ -910,7 +752,7 @@ o_n_space :: Int -> Benchmark
910o_n_space streamLen =
752o_n_space streamLen =
911 bgroup (o_n_space_prefix moduleName)
753 bgroup (o_n_space_prefix moduleName)
912 [ bgroup "elimination"
754 [ bgroup "elimination"
913− [ benchFold "toList" toList (unfoldrM streamLen)
755+ [ benchFold "toList" toList (sourceUnfoldrM streamLen)