git.iko.soy/streamly
on master help sign in
move the concatMap inspection test to benchmarks
commit6f06bdd7fecff23c9d5f0f77ba83852bd435f4f8 authorHarendra Kumar <harendra.kumar@gmail.com> dateTue 27 Aug 2019, 21:29 (7 years ago) parentf5614c7
4 files changed+32−63
compare with master
unifiedsplit
benchmark/Linear.hs+8−4 src/Streamly/Benchmark/Prelude.hs+24−10 streamly.cabal−16 test/inspection.hs−33
benchmark/Linear.hs+8−4
@@ -69,6 +69,10 @@ benchIOSrc
6969benchIOSrc t name f =
7070 bench name $ nfIO $ randomRIO (1,1) >>= Ops.toNull t . f
7171
72+{-# INLINE benchIOSrc1 #-}
73+benchIOSrc1 :: String -> (Int -> IO ()) -> Benchmark
74+benchIOSrc1 name f = bench name $ nfIO $ randomRIO (1,1) >>= f
75+
7276{-# INLINE benchPure #-}
7377benchPure :: NFData b => String -> (Int -> a) -> (a -> b) -> Benchmark
7478benchPure name src f = bench name $ nfIO $ randomRIO (1,1) >>= return . f . src
@@ -350,10 +354,10 @@ main =
350354 , benchIOSink "isPrefixOf" Ops.isPrefixOf
351355 , benchIOSink "isSubsequenceOf" Ops.isSubsequenceOf
352356 , benchIOSink "stripPrefix" Ops.stripPrefix
353− , benchIOSrc serially "concatMap1xN" Ops.concatMap
354− , benchIOSrc serially "concatMapPure1xN" Ops.concatMapPure1xN
355− , benchIOSrc serially "concatMapNxN" Ops.concatMapNxN
356− , benchIOSrc serially "concatMapRepl4xN" Ops.concatMapRepl4xN
357+ , benchIOSrc1 "concatMap1xN" Ops.concatMap
358+ , benchIOSrc1 "concatMapPure1xN" Ops.concatMapPure1xN
359+ , benchIOSrc1 "concatMapNxN" Ops.concatMapNxN
360+ , benchIOSrc1 "concatMapRepl4xN" Ops.concatMapRepl4xN
357361 ]
358362 -- scanl-map and foldl-map are equivalent to the scan and fold in the foldl
359363 -- library. If scan/fold followed by a map is efficient enough we may not
src/Streamly/Benchmark/Prelude.hs+24−10
@@ -595,7 +595,6 @@ inspect $ hasNoTypeClasses 'eqByPure
595595inspect $ 'eqByPure `hasNoType` ''Step
596596#endif
597597
598−
599598{-# INLINE cmpBy' #-}
600599cmpBy' :: (Monad m, P.Ord a) => Stream m a -> m P.Ordering
601600cmpBy' src = S.cmpBy P.compare src src
@@ -609,7 +608,6 @@ inspect $ hasNoTypeClasses 'cmpBy
609608inspect $ 'cmpBy `hasNoType` ''Step
610609#endif
611610
612−
613611{-# INLINE cmpByPure #-}
614612cmpByPure :: Int -> Identity P.Ordering
615613cmpByPure n = cmpBy' (sourceUnfoldr n)
@@ -621,28 +619,44 @@ inspect $ 'cmpByPure `hasNoType` ''Step
621619
622620-- The worst case for concatMap, concat a 1 element stream n times.
623621{-# INLINE concatMap #-}
624−concatMap :: S.MonadAsync m => Int -> Stream m Int
625−concatMap n = S.concatMap (\_ -> sourceUnfoldrMN 1 n)
622+concatMap :: Int -> IO ()
623+concatMap n = S.drain $ S.concatMap (\_ -> sourceUnfoldrMN 1 n)
626624 (sourceUnfoldrMN value n)
627625
626+#ifdef INSPECTION
627+inspect $ hasNoTypeClasses 'concatMap
628+#endif
629+
628630{-# INLINE concatMapPure1xN #-}
629−concatMapPure1xN :: S.MonadAsync m => Int -> Stream m Int
630−concatMapPure1xN n = S.concatMap (\_ -> sourceUnfoldrN 1 n)
631+concatMapPure1xN :: Int -> IO ()
632+concatMapPure1xN n = S.drain $ S.concatMap (\_ -> sourceUnfoldrN 1 n)
631633 (sourceUnfoldrN value n)
632634
635+#ifdef INSPECTION
636+inspect $ hasNoTypeClasses 'concatMapPure1xN
637+#endif
638+
633639-- We use a (sqrt n) element stream as source and then generate and concat a
634640-- (sqrt n) element stream for each element of the source to produce an n
635641-- element stream.
636642{-# INLINE concatMapNxN #-}
637−concatMapNxN :: S.MonadAsync m => Int -> Stream m Int
638−concatMapNxN n = S.concatMap (\_ -> sourceUnfoldrMN value2 n)
643+concatMapNxN :: Int -> IO ()
644+concatMapNxN n = S.drain $ S.concatMap (\_ -> sourceUnfoldrMN value2 n)
639645 (sourceUnfoldrMN value2 n)
640646
647+#ifdef INSPECTION
648+inspect $ hasNoTypeClasses 'concatMapNxN
649+#endif
650+
641651{-# INLINE concatMapRepl4xN #-}
642−concatMapRepl4xN :: S.MonadAsync m => Int -> Stream m Int
643−concatMapRepl4xN n = S.concatMap (S.replicate 4)
652+concatMapRepl4xN :: Int -> IO ()
653+concatMapRepl4xN n = S.drain $ S.concatMap (S.replicate 4)
644654 (sourceUnfoldrMN (value `div` 4) n)
645655
656+#ifdef INSPECTION
657+inspect $ hasNoTypeClasses 'concatMapRepl4xN
658+#endif
659+
646660-------------------------------------------------------------------------------
647661-- Mixed Composition
648662-------------------------------------------------------------------------------
streamly.cabal−16
@@ -507,22 +507,6 @@ test-suite parallel-loops
507507 , base >= 4.8 && < 5
508508 , random >= 1.0.0 && < 2
509509
510−test-suite inspection
511− import: test-options
512− type: exitcode-stdio-1.0
513− default-language: Haskell2010
514− main-is: inspection.hs
515− hs-source-dirs: test
516− build-Depends:
517− streamly
518− , base >= 4.8 && < 5
519− , inspection-testing >= 0.4 && < 0.5
520− if impl(ghc < 8.0)
521− buildable: False
522− -- On Windows we're getting "unknown symbol `clock_gettime'"
523− if os(windows)
524− buildable: False
525−
526510-------------------------------------------------------------------------------
527511-- Benchmarks
528512-------------------------------------------------------------------------------
test/inspection.hsdeleted−33
@@ -1,33 +0,0 @@
1−{-# LANGUAGE FlexibleContexts #-}
2−{-# LANGUAGE TemplateHaskell #-}
3−
4−{-# OPTIONS_GHC -O -fplugin Test.Inspection.Plugin #-}
5−
6−import Streamly
7−import qualified Streamly.Prelude as S
8−import Test.Inspection
9−
10−main :: IO ()
11−main = pure () -- If the test compiles, it passes
12−
13−-------------------------------------------------------------------------------
14−-- #214 regression test: 'concatMap (replicate n)' should be specialized
15−-------------------------------------------------------------------------------
16−
17−{-# INLINE concatMap1 #-}
18−concatMap1 :: MonadAsync m => SerialT m Int -> m ()
19−concatMap1 src = S.drain $ S.concatMap (S.replicate 3) src
20−
21−{-# INLINE sourceUnfoldrMN #-}
22−sourceUnfoldrMN :: MonadAsync m => Int -> Int -> SerialT m Int
23−sourceUnfoldrMN m n = S.unfoldrM step n
24− where
25− step cnt =
26− if cnt > n + m
27− then return Nothing
28− else return (Just (cnt, cnt + 1))
29−
30−test214 :: IO ()
31−test214 = concatMap1 (sourceUnfoldrMN 1000000 5)
32−
33−inspect $ hasNoTypeClasses 'test214