on master help sign in
502 files changed+82996−37273
since splitsnapshots
unifiedsplit
.circleci/config.yml+78−279 .github/workflows/haskell.yml+166−90 .github/workflows/packdiff.yml+39 .github/workflows/regression-check.yml+165 .gitignore+7−3 .hlint.ignore+12−24 .hlint.yaml+17−2 .packcheck.ignore+14−1 CHANGELOG.md+1 CONTRIBUTING.md+1−272 LICENSE−254 README.md+1−651 appveyor.yml+4−2 benchmark/NanoBenchmarks.hs+27−22 benchmark/README.md+1−313 benchmark/Streamly/Benchmark/Data/Array.hs+77−136 benchmark/Streamly/Benchmark/Data/Array/Common.hs+185 benchmark/Streamly/Benchmark/Data/Array/CommonImports.hs+16 benchmark/Streamly/Benchmark/Data/Array/Generic.hs+119 benchmark/Streamly/Benchmark/Data/Array/SmallArray.hs+95 benchmark/Streamly/Benchmark/Data/Array/Stream/Foreign.hs → benchmark/Streamly/Benchmark/Data/Array/Stream.hs+81−45 benchmark/Streamly/Benchmark/Data/ArrayOps.hs−242 benchmark/Streamly/Benchmark/Data/Fold.hs+297−138 benchmark/Streamly/Benchmark/Data/Fold/Window.hs+191 benchmark/Streamly/Benchmark/Data/MutArray.hs+300 benchmark/Streamly/Benchmark/Data/Parser.hs+641−181 benchmark/Streamly/Benchmark/Data/Parser/ParserD.hs−388 benchmark/Streamly/Benchmark/Data/Parser/ParserK.hs−163 benchmark/Streamly/Benchmark/Data/ParserK.hs+437 benchmark/Streamly/Benchmark/Data/Ring/Unboxed.hs+69 benchmark/Streamly/Benchmark/Data/Serialize.hs+591 benchmark/Streamly/Benchmark/Data/Serialize/RecCompatible.hs+24 benchmark/Streamly/Benchmark/Data/Serialize/RecNonCompatible.hs+21 benchmark/Streamly/Benchmark/Data/Serialize/TH.hs+76 benchmark/Streamly/Benchmark/Data/Stream.hs+114 benchmark/Streamly/Benchmark/Data/Stream/Common.hs+518 benchmark/Streamly/Benchmark/Data/Stream/Concurrent.hs+20 benchmark/Streamly/Benchmark/Data/Stream/ConcurrentCommon.hs+208 benchmark/Streamly/Benchmark/Data/Stream/ConcurrentEager.hs+25 benchmark/Streamly/Benchmark/Data/Stream/ConcurrentInterleaved.hs+25 benchmark/Streamly/Benchmark/Data/Stream/ConcurrentOrdered.hs+25 benchmark/Streamly/Benchmark/Prelude/Serial/Elimination.hs → benchmark/Streamly/Benchmark/Data/Stream/Eliminate.hs+183−121 benchmark/Streamly/Benchmark/Prelude/Serial/Exceptions.hs → benchmark/Streamly/Benchmark/Data/Stream/Exceptions.hs+124−70 benchmark/Streamly/Benchmark/Prelude/Serial/NestedStream.hs → benchmark/Streamly/Benchmark/Data/Stream/Expand.hs+263−131 benchmark/Streamly/Benchmark/Data/Stream/Generate.hs+278 benchmark/Streamly/Benchmark/Data/Stream/Lift.hs+146 benchmark/Streamly/Benchmark/Data/Stream/Reduce.hs+588 benchmark/Streamly/Benchmark/Prelude/Serial/Split.hs → benchmark/Streamly/Benchmark/Data/Stream/Split.hs+25−12 benchmark/Streamly/Benchmark/Data/Stream/StreamD.hs+46−5 benchmark/Streamly/Benchmark/Data/Stream/StreamK.hs+61−33 benchmark/Streamly/Benchmark/Data/Stream/StreamDK.hs → benchmark/Streamly/Benchmark/Data/Stream/StreamKAlt.hs+6−4 benchmark/Streamly/Benchmark/Data/Stream/ToStreamK.hs+938 benchmark/Streamly/Benchmark/Prelude/Serial/Transformation1.hs → benchmark/Streamly/Benchmark/Data/Stream/Transform.hs+284−164 benchmark/Streamly/Benchmark/Data/Unfold.hs+89−60 benchmark/Streamly/Benchmark/FileSystem/Handle.hs+1−5 benchmark/Streamly/Benchmark/FileSystem/Handle/Read.hs+66−62 benchmark/Streamly/Benchmark/FileSystem/Handle/ReadWrite.hs+45−48 benchmark/Streamly/Benchmark/Prelude/Adaptive.hs+11−6 benchmark/Streamly/Benchmark/Prelude/Ahead.hs+3−1 benchmark/Streamly/Benchmark/Prelude/Async.hs+5−3 benchmark/Streamly/Benchmark/Prelude/Concurrent.hs+2−1 benchmark/Streamly/Benchmark/Prelude/Merge.hs+25−2 benchmark/Streamly/Benchmark/Prelude/Parallel.hs+3−1 benchmark/Streamly/Benchmark/Prelude/Rate.hs+2−1 benchmark/Streamly/Benchmark/Prelude/Serial.hs−53 benchmark/Streamly/Benchmark/Prelude/Serial/Generation.hs−179 benchmark/Streamly/Benchmark/Prelude/Serial/Lift.hs−123 benchmark/Streamly/Benchmark/Prelude/Serial/NestedFold.hs−443 benchmark/Streamly/Benchmark/Prelude/WAsync.hs+3−1 benchmark/Streamly/Benchmark/Prelude/WSerial.hs+20−8 benchmark/Streamly/Benchmark/Prelude/ZipAsync.hs+17−1 benchmark/Streamly/Benchmark/Prelude/ZipSerial.hs+9−5 benchmark/Streamly/Benchmark/Unicode/Char.hs+18−10 benchmark/Streamly/Benchmark/Unicode/Parser.hs+107 benchmark/Streamly/Benchmark/Unicode/Stream.hs+78−31 benchmark/Streamly/Benchmark/Unicode/Utf8.hs+3−3 benchmark/bench-report/BenchReport.hs−273 benchmark/bench-report/bench-report.cabal−23 benchmark/bench-report/bin/bench-runner.sh−667 benchmark/bench-report/bin/build-lib.sh−213 benchmark/bench-report/default.nix−50 benchmark/bench-runner/Main.hs+183 benchmark/bench-runner/bench-runner.cabal+42 benchmark/bench-runner/cabal.project+4 benchmark/bench-runner/default.nix+164 benchmark/lib/Streamly/Benchmark/Common.hs+11−12 benchmark/lib/Streamly/Benchmark/Common/Handle.hs+15−4 benchmark/lib/Streamly/Benchmark/Prelude.hs+57−5 benchmark/streamly-benchmarks.cabal+424−179 bin/bench-config.sh−160 bin/bench.sh−15 bin/mk-hscope.sh+1−1 bin/repl+3 bin/run-ci.sh+45−36 bin/run-repl-quick.sh+113 bin/targets.sh−120 bin/test.sh−244 cabal.project+1 cabal.project.O0+8−3 cabal.project.Werror+4 cabal.project.Werror-nocode+8 cabal.project.coverage+4 cabal.project.doctest+14−3 cabal.project.ghc-head+21−41 cabal.project.packdiff+9 cabal.project.report+30 cabal.project.streamly+10 configure+9−237 configure.ac+1−5 core/Changelog.md+1 core/LICENSE+322 core/Setup.hs+6 core/configure+4349 core/configure.ac+17 core/docs/ApiChangelogs/0.1.0-0.2.0.txt+1471 core/docs/ApiChangelogs/0.1.0.txt+405 core/docs/ApiChangelogs/0.2.0-0.2.2.txt+306 core/docs/Changelog.md+97 core/docs/Readme.md+1 jsbits/clock.js → core/jsbits/clock.js core/src/DocTestDataArray.hs+22 core/src/DocTestDataFold.hs+27 core/src/DocTestDataMutArray.hs+10 core/src/DocTestDataMutArrayGeneric.hs+10 core/src/DocTestDataParser.hs+20 core/src/DocTestDataParserK.hs+15 core/src/DocTestDataStream.hs+39 core/src/DocTestDataStreamK.hs+21 core/src/DocTestDataUnfold.hs+12 core/src/DocTestFileSystemHandle.hs+15 core/src/DocTestUnicodeParser.hs+9 core/src/DocTestUnicodeStream.hs+12 core/src/DocTestUnicodeString.hs+5 src/Streamly/Console/Stdio.hs → core/src/Streamly/Console/Stdio.hs+3−4 core/src/Streamly/Data/Array.hs+167 core/src/Streamly/Data/Array/Generic.hs+51 core/src/Streamly/Data/Fold.hs+415 core/src/Streamly/Data/MutArray.hs+110 core/src/Streamly/Data/MutArray/Generic.hs+70 core/src/Streamly/Data/MutByteArray.hs+106 core/src/Streamly/Data/Parser.hs+247 core/src/Streamly/Data/ParserK.hs+139 core/src/Streamly/Data/Stream.hs+746 core/src/Streamly/Data/StreamK.hs+194 core/src/Streamly/Data/Unfold.hs+233 core/src/Streamly/FileSystem/Dir.hs+23 core/src/Streamly/FileSystem/File.hs+60 src/Streamly/FileSystem/Handle.hs → core/src/Streamly/FileSystem/Handle.hs+34−13 src/Streamly/Internal/BaseCompat.hs → core/src/Streamly/Internal/BaseCompat.hs+2−31 src/Streamly/Internal/Console/Stdio.hs → core/src/Streamly/Internal/Console/Stdio.hs+44−45 src/Streamly/Internal/Control/Exception.hs → core/src/Streamly/Internal/Control/Exception.hs+1−13 core/src/Streamly/Internal/Control/ForkIO.hs+50 src/Streamly/Internal/Control/Monad.hs → core/src/Streamly/Internal/Control/Monad.hs core/src/Streamly/Internal/Data/Array.hs+1018 core/src/Streamly/Internal/Data/Array/ArrayMacros.h+43 core/src/Streamly/Internal/Data/Array/Generic.hs+342 core/src/Streamly/Internal/Data/Array/Stream.hs+725 core/src/Streamly/Internal/Data/Array/Type.hs+1148 src/Streamly/Internal/Data/Binary/Decode.hs → core/src/Streamly/Internal/Data/Binary/Parser.hs+164−43 core/src/Streamly/Internal/Data/Binary/Stream.hs+383 core/src/Streamly/Internal/Data/Builder.hs+82 src/Streamly/Internal/Data/Either/Strict.hs → core/src/Streamly/Internal/Data/Either/Strict.hs+2 core/src/Streamly/Internal/Data/Fold.hs+33 src/Streamly/Internal/Data/Array/Stream/Fold/Foreign.hs → core/src/Streamly/Internal/Data/Fold/Chunked.hs+141−100 core/src/Streamly/Internal/Data/Fold/Combinators.hs+2452 core/src/Streamly/Internal/Data/Fold/Container.hs+783 src/Streamly/Internal/Data/Fold/Step.hs → core/src/Streamly/Internal/Data/Fold/Step.hs+2−2 src/Streamly/Internal/Data/Fold/Tee.hs → core/src/Streamly/Internal/Data/Fold/Tee.hs+33−6 core/src/Streamly/Internal/Data/Fold/Type.hs+2099 core/src/Streamly/Internal/Data/Fold/Window.hs+357 src/Streamly/Internal/Data/IOFinalizer.hs → core/src/Streamly/Internal/Data/IOFinalizer.hs+20−22 src/Streamly/Internal/Data/IORef/Prim.hs → core/src/Streamly/Internal/Data/IORef/Unboxed.hs+36−35 core/src/Streamly/Internal/Data/IsMap.hs+60 core/src/Streamly/Internal/Data/List.hs+234 src/Streamly/Internal/Data/Maybe/Strict.hs → core/src/Streamly/Internal/Data/Maybe/Strict.hs+12−3 core/src/Streamly/Internal/Data/MutArray.hs+207 core/src/Streamly/Internal/Data/MutArray/Generic.hs+947 core/src/Streamly/Internal/Data/MutArray/Stream.hs+145 core/src/Streamly/Internal/Data/MutArray/Type.hs+3318 core/src/Streamly/Internal/Data/MutByteArray.hs+251 core/src/Streamly/Internal/Data/MutByteArray/Type.hs+321 core/src/Streamly/Internal/Data/Parser.hs+3621 src/Streamly/Internal/Data/Parser/ParserD/Tee.hs → core/src/Streamly/Internal/Data/Parser/Tee.hs+10−6 src/Streamly/Internal/Data/Parser/ParserD/Type.hs → core/src/Streamly/Internal/Data/Parser/Type.hs+631−302 core/src/Streamly/Internal/Data/ParserK.hs+16 core/src/Streamly/Internal/Data/ParserK/Type.hs+752 core/src/Streamly/Internal/Data/Pipe.hs+273 src/Streamly/Internal/Data/Pipe/Type.hs → core/src/Streamly/Internal/Data/Pipe/Type.hs−3 src/Streamly/Internal/Data/Producer.hs → core/src/Streamly/Internal/Data/Producer.hs+6−13 src/Streamly/Internal/Data/Producer/Source.hs → core/src/Streamly/Internal/Data/Producer/Source.hs+101−36 src/Streamly/Internal/Data/Producer/Type.hs → core/src/Streamly/Internal/Data/Producer/Type.hs+1−1 core/src/Streamly/Internal/Data/Refold/Type.hs+251 core/src/Streamly/Internal/Data/Ring.hs+619 core/src/Streamly/Internal/Data/Ring/Generic.hs+185 src/Streamly/Internal/Data/SVar/Type.hs → core/src/Streamly/Internal/Data/SVar/Type.hs+10−1 core/src/Streamly/Internal/Data/Serialize/TH.hs+530 core/src/Streamly/Internal/Data/Serialize/TH/Bottom.hs+475 core/src/Streamly/Internal/Data/Serialize/TH/Common.hs+70 core/src/Streamly/Internal/Data/Serialize/TH/RecHeader.hs+411 core/src/Streamly/Internal/Data/Serialize/Type.hs+317 core/src/Streamly/Internal/Data/Stream.hs+42 core/src/Streamly/Internal/Data/Stream/Container.hs+310 core/src/Streamly/Internal/Data/Stream/Eliminate.hs+849 src/Streamly/Internal/Data/Stream/StreamD/Exception.hs → core/src/Streamly/Internal/Data/Stream/Exception.hs+228−141 core/src/Streamly/Internal/Data/Stream/Generate.hs+1191 core/src/Streamly/Internal/Data/Stream/Lift.hs+129 src/Streamly/Internal/Data/Stream/StreamD/Nesting.hs → core/src/Streamly/Internal/Data/Stream/Nesting.hs+923−290 src/Streamly/Internal/Data/Stream/StreamD/Step.hs → core/src/Streamly/Internal/Data/Stream/Step.hs+2−2 core/src/Streamly/Internal/Data/Stream/StreamD.hs+16 core/src/Streamly/Internal/Data/Stream/Top.hs+480 core/src/Streamly/Internal/Data/Stream/Transform.hs+1971 core/src/Streamly/Internal/Data/Stream/Transformer.hs+183 core/src/Streamly/Internal/Data/Stream/Type.hs+2220 core/src/Streamly/Internal/Data/StreamK.hs+1730 src/Streamly/Internal/Data/Stream/StreamDK/Type.hs → core/src/Streamly/Internal/Data/StreamK/Alt.hs+143−3 core/src/Streamly/Internal/Data/StreamK/Transformer.hs+79 core/src/Streamly/Internal/Data/StreamK/Type.hs+2153 core/src/Streamly/Internal/Data/Time/Clock.hs+180 src/Streamly/Internal/Data/Time/Clock/Darwin.c → core/src/Streamly/Internal/Data/Time/Clock/Darwin.c src/Streamly/Internal/Data/Time/Clock/Type.hsc → core/src/Streamly/Internal/Data/Time/Clock/Type.hsc+1−1 src/Streamly/Internal/Data/Time/Clock/Windows.c → core/src/Streamly/Internal/Data/Time/Clock/Windows.c src/Streamly/Internal/Data/Time/Clock/config-clock.h → core/src/Streamly/Internal/Data/Time/Clock/config-clock.h src/Streamly/Internal/Data/Time/TimeSpec.hsc → core/src/Streamly/Internal/Data/Time/TimeSpec.hsc−3 src/Streamly/Internal/Data/Time/Units.hs → core/src/Streamly/Internal/Data/Time/Units.hs+8−7 src/Streamly/Internal/Data/Tuple/Strict.hs → core/src/Streamly/Internal/Data/Tuple/Strict.hs+11 core/src/Streamly/Internal/Data/Unbox.hs+908 core/src/Streamly/Internal/Data/Unbox/TH.hs+498 src/Streamly/Internal/Data/Unfold.hs → core/src/Streamly/Internal/Data/Unfold.hs+275−327 src/Streamly/Internal/Data/Unfold/Enumeration.hs → core/src/Streamly/Internal/Data/Unfold/Enumeration.hs+4−34 src/Streamly/Internal/Data/Unfold/Type.hs → core/src/Streamly/Internal/Data/Unfold/Type.hs+302−80 src/Streamly/Internal/FileSystem/Dir.hs → core/src/Streamly/Internal/FileSystem/Dir.hs+191−84 src/Streamly/Internal/FileSystem/File.hs → core/src/Streamly/Internal/FileSystem/File.hs+216−148 src/Streamly/Internal/FileSystem/Handle.hs → core/src/Streamly/Internal/FileSystem/Handle.hs+232−235 core/src/Streamly/Internal/FileSystem/Path.hs+515 src/Streamly/Internal/System/IO.hs → core/src/Streamly/Internal/System/IO.hs+19−13 core/src/Streamly/Internal/Unicode/Array.hs+104 core/src/Streamly/Internal/Unicode/Parser.hs+627 src/Streamly/Internal/Unicode/Stream.hs → core/src/Streamly/Internal/Unicode/Stream.hs+384−292 core/src/Streamly/Internal/Unicode/String.hs+158 core/src/Streamly/Unicode/Parser.hs+69 src/Streamly/Unicode/Stream.hs → core/src/Streamly/Unicode/Stream.hs+20−17 core/src/Streamly/Unicode/String.hs+30 core/src/assert.hs+6 core/src/config.h.in+57 core/src/inline.hs+27 core/streamly-core.cabal+534 default.nix+28−14 docs/Developer/Benchmarks.md+342 docs/Developer/Contributing.md+271 docs/Developer/Github.link+1 dev/MAINTAINING.md → docs/Developer/MAINTAINING.md+154−46 docs/Developer/Tests.md+139 dev/ci-tests.md → docs/Developer/ci-tests.md+16−6 dev/container-api.md → docs/Developer/container-api.md dev/cps-vs-direct.rst → docs/Developer/cps-vs-direct.rst dev/dfa-bytes.png → docs/Developer/dfa-bytes.png dev/dfa-classes.png → docs/Developer/dfa-classes.png dev/dfa-rearr.png → docs/Developer/dfa-rearr.png dev/linked-lists.md → docs/Developer/linked-lists.md dev/module-organization.md → docs/Developer/module-organization.md+4−4 dev/optimization-guidelines.md → docs/Developer/optimization-guidelines.md+13−1 dev/overview.md → docs/Developer/overview.md dev/paths.rst → docs/Developer/paths.rst+25−2 dev/related-packages.md → docs/Developer/related-packages.md dev/resources.md → docs/Developer/resources.md dev/roadmap.md → docs/Developer/roadmap.md dev/unicode.md → docs/Developer/unicode.md dev/utf8-decoder.md → docs/Developer/utf8-decoder.md+3−3 docs/Documentation.md+5 docs/Overview.md → docs/User/Explanatory/Overview.md+2−2 docs/User/Explanatory/design.md+42 docs/monad-transformers.md → docs/User/Explanatory/monad-transformers.md docs/performance.md → docs/User/Explanatory/performance.md docs/streaming-pradigms.rst → docs/User/Explanatory/streaming-pradigms.rst docs/unified-abstractions.md → docs/User/Explanatory/unified-abstractions.md+12−9 docs/building.md → docs/User/HowTo/Compiling.md+54−45 docs/User/HowTo/Examples.link+1 docs/User/HowTo/faq.md+94 docs/interoperation.md → docs/User/HowTo/interoperation.md docs/optimizing.md → docs/User/HowTo/optimizing.md docs/streamly-vs-async.md → docs/User/HowTo/streamly-vs-async.md+3−1 docs/streamly-vs-list-time.svg → docs/User/HowTo/streamly-vs-list-time.svg docs/streamly-vs-lists.md → docs/User/HowTo/streamly-vs-lists.md+4−2 docs/User/Project/ApiChangelogs/0.8.3-0.9.0.txt+175 docs/API-changelog.txt → docs/User/Project/ApiChangelogs/0.8.3.txt+19−8 docs/User/Project/ApiChangelogs/0.9.0-0.10.0.txt+424 docs/CONTRIBUTORS.md → docs/User/Project/CONTRIBUTORS.md+37 Changelog.md → docs/User/Project/Changelog.md+159−10 docs/Credits.md → docs/User/Project/Credits.md docs/User/Project/Github.link+1 docs/User/Project/README.md+141 docs/User/Project/Roadmap.link+1 docs/User/Project/Upgrading-0.8-to-0.9.md+384 docs/ConcurrentStreams.hs → docs/User/Tutorials/ConcurrentStreams.hs+31−40 docs/User/Tutorials/Examples.link+1 docs/ReactiveProgramming.hs → docs/User/Tutorials/ReactiveProgramming.hs+5−3 docs/Tutorial.hs → docs/User/Tutorials/Tutorial.hs+49−81 docs/User/Tutorials/before-you-begin.md+77 docs/User/Tutorials/getting-started.md+225 docs/User/Tutorials/haskell-lazy-evaluation.md+215 docs/User/Tutorials/quick-overview.md+517 docs/User/Tutorials/why-haskell-streamly.md+91 docs/resources.md → docs/User/resources.md docs/faq.md−70 docs/getting-started.md−296 docs/streamly-docs.cabal+25−6 hie.yaml+89−38 src/Streamly.hs−690 src/Streamly/Data/Array.hs−43 src/Streamly/Data/Array/Foreign.hs+44−3 src/Streamly/Data/Fold.hs−289 src/Streamly/Data/Fold/Prelude.hs+65 src/Streamly/Data/Fold/Tee.hs+3−28 src/Streamly/Data/Prim/Array.hs−43 src/Streamly/Data/SmallArray.hs+2−2 src/Streamly/Data/Stream/MkType.hs+115 src/Streamly/Data/Stream/Prelude.hs+232 src/Streamly/Data/Unfold.hs−152 src/Streamly/Data/Unicode/Stream.hs−99 src/Streamly/Internal/Control/Concurrent.hs+44−67 src/Streamly/Internal/Control/ForkLifted.hs+66 src/Streamly/Internal/Data/Array.hs−250 src/Streamly/Internal/Data/Array/Foreign.hs−549 src/Streamly/Internal/Data/Array/Foreign/Mut.hs−146 src/Streamly/Internal/Data/Array/Foreign/Mut/Type.hs−1171 src/Streamly/Internal/Data/Array/Foreign/Type.hs−698 src/Streamly/Internal/Data/Array/Prim.hs−110 src/Streamly/Internal/Data/Array/Prim/Mut/Type.hs−94 src/Streamly/Internal/Data/Array/Prim/MutTypesInclude.hs−413 src/Streamly/Internal/Data/Array/Prim/Pinned.hs−108 src/Streamly/Internal/Data/Array/Prim/Pinned/Mut/Type.hs−176 src/Streamly/Internal/Data/Array/Prim/Pinned/Type.hs−127 src/Streamly/Internal/Data/Array/Prim/Type.hs−98 src/Streamly/Internal/Data/Array/Prim/TypesInclude.hs−703 src/Streamly/Internal/Data/Array/PrimInclude.hs−184 src/Streamly/Internal/Data/Array/Stream/Foreign.hs−860 src/Streamly/Internal/Data/Array/Stream/Mut/Foreign.hs−238 src/Streamly/Internal/Data/Channel.hs+19 src/Streamly/Internal/Data/Channel/Dispatcher.hs+294 src/Streamly/Internal/Data/Channel/Types.hs+817 src/Streamly/Internal/Data/Channel/Worker.hs+375 src/Streamly/Internal/Data/Consumer/Type.hs−120 src/Streamly/Internal/Data/Fold.hs−1717 src/Streamly/Internal/Data/Fold/Async.hs+23−10 src/Streamly/Internal/Data/Fold/Concurrent.hs+57 src/Streamly/Internal/Data/Fold/Concurrent/Channel.hs+112 src/Streamly/Internal/Data/Fold/Concurrent/Channel/Type.hs+331 src/Streamly/Internal/Data/Fold/Prelude.hs+19 src/Streamly/Internal/Data/Fold/SVar.hs+8−7 src/Streamly/Internal/Data/Fold/Type.hs−1412 src/Streamly/Internal/Data/IOFinalizer/Lifted.hs+74 src/Streamly/Internal/Data/IsMap/HashMap.hs+42 src/Streamly/Internal/Data/List.hs−193 src/Streamly/Internal/Data/Parser.hs−1170 src/Streamly/Internal/Data/Parser/ParserD.hs−1149 src/Streamly/Internal/Data/Parser/ParserK/Type.hs−471 src/Streamly/Internal/Data/Pipe.hs−1968 src/Streamly/Internal/Data/SVar.hs+4−4 src/Streamly/Internal/Data/SVar/Dispatch.hs+3−6 src/Streamly/Internal/Data/Sink.hs−245 src/Streamly/Internal/Data/Sink/Type.hs−24 src/Streamly/Internal/Data/SmallArray.hs+26−25 src/Streamly/Internal/Data/SmallArray/Type.hs+8−75 src/Streamly/Internal/Data/Stream/Ahead.hs+47−23 src/Streamly/Internal/Data/Stream/Async.hs+62−29 src/Streamly/Internal/Data/Stream/Common.hs+105 src/Streamly/Internal/Data/Stream/Concurrent.hs+903 src/Streamly/Internal/Data/Stream/Concurrent/Channel.hs+109 src/Streamly/Internal/Data/Stream/Concurrent/Channel/Append.hs+1046 src/Streamly/Internal/Data/Stream/Concurrent/Channel/Consumer.hs+127 src/Streamly/Internal/Data/Stream/Concurrent/Channel/Dispatcher.hs+417 src/Streamly/Internal/Data/Stream/Concurrent/Channel/Interleave.hs+252 src/Streamly/Internal/Data/Stream/Concurrent/Channel/Operations.hs+294 src/Streamly/Internal/Data/Stream/Concurrent/Channel/Type.hs+172 src/Streamly/Internal/Data/Stream/Instances.hs+9−16 src/Streamly/Internal/Data/Stream/IsStream.hs+25−5 src/Streamly/Internal/Data/Stream/IsStream/Combinators.hs+4−2 src/Streamly/Internal/Data/Stream/IsStream/Common.hs+102−46 src/Streamly/Internal/Data/Stream/IsStream/Eliminate.hs+71−81 src/Streamly/Internal/Data/Stream/IsStream/Enumeration.hs+15−2 src/Streamly/Internal/Data/Stream/IsStream/Exception.hs+31−19 src/Streamly/Internal/Data/Stream/IsStream/Expand.hs+87−98 src/Streamly/Internal/Data/Stream/IsStream/Generate.hs+33−73 src/Streamly/Internal/Data/Stream/IsStream/Lift.hs+8−10 src/Streamly/Internal/Data/Stream/IsStream/Reduce.hs+419−331 src/Streamly/Internal/Data/Stream/IsStream/Top.hs+249−110 src/Streamly/Internal/Data/Stream/IsStream/Transform.hs+111−187 src/Streamly/Internal/Data/Stream/IsStream/Type.hs+171−86 src/Streamly/Internal/Data/Stream/Lifted.hs+335 src/Streamly/Internal/Data/Stream/MkType.hs+641 src/Streamly/Internal/Data/Stream/Parallel.hs+60−32 src/Streamly/Internal/Data/Stream/Prelude.hs+7−45 src/Streamly/Internal/Data/Stream/PreludeCommon.hs−139 src/Streamly/Internal/Data/Stream/SVar.hs+18 src/Streamly/Internal/Data/Stream/SVar/Eliminate.hs+14−8 src/Streamly/Internal/Data/Stream/SVar/Generate.hs+15−12 src/Streamly/Internal/Data/Stream/Serial.hs+83−105 src/Streamly/Internal/Data/Stream/StreamD.hs−36 src/Streamly/Internal/Data/Stream/StreamD/Eliminate.hs−511 src/Streamly/Internal/Data/Stream/StreamD/Generate.hs−406 src/Streamly/Internal/Data/Stream/StreamD/Lift.hs−112 src/Streamly/Internal/Data/Stream/StreamD/Transform.hs−1218 src/Streamly/Internal/Data/Stream/StreamD/Type.hs−979 src/Streamly/Internal/Data/Stream/StreamDK.hs−156 src/Streamly/Internal/Data/Stream/StreamK.hs−967 src/Streamly/Internal/Data/Stream/StreamK/Type.hs−1320 src/Streamly/Internal/Data/Stream/Time.hs+950 src/Streamly/Internal/Data/Stream/Zip.hs+39−87 src/Streamly/Internal/Data/Stream/ZipAsync.hs+134 src/Streamly/Internal/Data/Time.hs−74 src/Streamly/Internal/Data/Time/Clock.hs−80 src/Streamly/Internal/Data/Unfold/Exception.hs+214 src/Streamly/Internal/Data/Unfold/Prelude.hs+17 src/Streamly/Internal/Data/Unfold/SVar.hs+3−6 src/Streamly/Internal/FileSystem/Event.hs+245 src/Streamly/Internal/FileSystem/Event/Darwin.hs+218−162 src/Streamly/Internal/FileSystem/Event/Linux.hs+281−221 src/Streamly/Internal/FileSystem/Event/Windows.hs+223−166 src/Streamly/Internal/FileSystem/FD.hs+74−64 src/Streamly/Internal/FileSystem/FDIO.hs−7 src/Streamly/Internal/Foreign/Malloc.hs−49 src/Streamly/Internal/Network/Inet/TCP.hs+166−128 src/Streamly/Internal/Network/Socket.hs+195−246 src/Streamly/Internal/Ring/Foreign.hs−252 src/Streamly/Internal/System/IOVec.hs+19−14 src/Streamly/Internal/Unicode/Array/Char.hs−92 src/Streamly/Internal/Unicode/Array/Prim/Pinned.hs−91 src/Streamly/Internal/Unicode/Char.hs+21−12 src/Streamly/Internal/Unicode/Utf8.hs+15−9 src/Streamly/Memory/Array.hs−74 src/Streamly/Network/Inet/TCP.hs+45−6 src/Streamly/Network/Socket.hs+84−51 src/Streamly/Prelude.hs+14−8 src/assert.hs+6 src/config.h.in−36 src/inline.hs+2−2 stack.yaml+9−2 streamly.cabal+294−287 targets/Targets.hs+213 benchmark/bench-report/cabal.project → targets/cabal.project targets/default.nix+163 targets/streamly-targets.cabal+12 test/README.md+1−158 test/Streamly/Test/Common/Array.hs−291 test/Streamly/Test/Data/Array.hs+268−3 test/Streamly/Test/Data/Array/Common.hs+101 test/Streamly/Test/Data/Array/CommonImports.hs+13 test/Streamly/Test/Data/Array/Foreign.hs−12 test/Streamly/Test/Data/Array/Generic.hs+65 test/Streamly/Test/Data/Array/Prim.hs−12 test/Streamly/Test/Data/Array/Prim/Pinned.hs−12 test/Streamly/Test/Data/Array/Stream.hs+113 test/Streamly/Test/Data/Array/Stream/Foreign.hs−72 test/Streamly/Test/Data/Fold.hs+205−161 test/Streamly/Test/Data/Fold/Window.hs+67 test/Streamly/Test/Data/List.hs+20−27 test/Streamly/Test/Data/MutArray.hs+152 test/Streamly/Test/Data/Parser.hs+767−182 test/Streamly/Test/Data/Parser/ParserD.hs → test/Streamly/Test/Data/ParserK.hs+156−92 test/Streamly/Test/Data/Ring/Unboxed.hs+53 test/Streamly/Test/Data/Serialize.hs+306 test/Streamly/Test/Data/Serialize/CompatV0.hs+46 test/Streamly/Test/Data/Serialize/CompatV1.hs+48 test/Streamly/Test/Data/Serialize/TH.hs+82 test/Streamly/Test/Data/SmallArray.hs+20−3 test/Streamly/Test/Data/Stream.hs+33 test/Streamly/Test/Data/Stream/Concurrent.hs+363 test/Streamly/Test/Data/Unbox.hs+347 test/Streamly/Test/Data/Unbox/TH.hs+146 test/Streamly/Test/Data/Unfold.hs+38−35 test/Streamly/Test/FileSystem/Event.hs+13−387 test/Streamly/Test/FileSystem/Event/Common.hs+422 test/Streamly/Test/FileSystem/Event/Darwin.hs+86 test/Streamly/Test/FileSystem/Event/Linux.hs+163 test/Streamly/Test/FileSystem/Event/Windows.hs+51 test/Streamly/Test/FileSystem/Handle.hs+31−35 test/Streamly/Test/Network/Inet/TCP.hs+25−18 test/Streamly/Test/Network/Socket.hs+36−27 test/Streamly/Test/Prelude.hs+2−3 test/Streamly/Test/Prelude/Ahead.hs+3−4 test/Streamly/Test/Prelude/Async.hs+39−5 test/Streamly/Test/Prelude/Concurrent.hs+3−4 test/Streamly/Test/Prelude/Fold.hs+3−1 test/Streamly/Test/Prelude/Parallel.hs+3−4 test/Streamly/Test/Prelude/Rate.hs+3−1 test/Streamly/Test/Prelude/Serial.hs+166−120 test/Streamly/Test/Prelude/Top.hs+224 test/Streamly/Test/Prelude/WAsync.hs+54−4 test/Streamly/Test/Prelude/WSerial.hs+3−4 test/Streamly/Test/Prelude/ZipAsync.hs+3−1 test/Streamly/Test/Prelude/ZipSerial.hs+3−4 test/Streamly/Test/Serialize/Serializable.hs+237 test/Streamly/Test/Unicode/Char.hs+13−16 test/Streamly/Test/Unicode/Parser.hs+231 test/Streamly/Test/Unicode/Stream.hs+34−30 test/lib/Streamly/Test/Common.hs+4−3 test/lib/Streamly/Test/Prelude/Common.hs+29−48 test/streamly-tests.cabal+233−40 test/test-runner/Main.hs+33 test/test-runner/cabal.project+4 test/test-runner/default.nix+164 test/test-runner/test-runner.cabal+41
.circleci/config.yml+78−279
@@ -1,7 +1,7 @@
11version: 2.1
22
33#-----------------------------------------------------------------------------
4−# packcheck-0.4.2
4+# packcheck-0.7.0
55# Packcheck global environment variables
66#-----------------------------------------------------------------------------
77
@@ -11,6 +11,8 @@ env: &env
1111 # Common options
1212 # ------------------------------------------------------------------------
1313 # GHC_OPTIONS: "-Werror"
14+ # For updating see: https://downloads.haskell.org/~ghcup/
15+ GHCUP_VERSION: 0.1.20.0
1416 CABAL_REINIT_CONFIG: "y"
1517 LC_ALL: "C.UTF-8"
1618
@@ -22,7 +24,6 @@ env: &env
2224 # DISABLE_DOCS: "y"
2325 # DISABLE_SDIST_BUILD: "y"
2426 # DISABLE_DIST_CHECKS: "y"
25− ENABLE_INSTALL: "y"
2627
2728 # ------------------------------------------------------------------------
2829 # stack options
@@ -38,15 +39,12 @@ env: &env
3839 # cabal options
3940 # ------------------------------------------------------------------------
4041 CABAL_CHECK_RELAX: "y"
41− CABAL_NO_SANDBOX: "y"
42− CABAL_HACKAGE_MIRROR: "hackage.haskell.org:http://hackage.fpcomplete.com"
43− CABAL_BUILD_OPTIONS: "--flag limit-build-mem"
42+ CABAL_BUILD_OPTIONS: "-j1 --flag limit-build-mem"
4443
4544 # ------------------------------------------------------------------------
4645 # Where to find the required tools
4746 # ------------------------------------------------------------------------
48− PATH: /opt/ghc/bin:/opt/ghcjs/bin:/sbin:/usr/sbin:/bin:/usr/bin
49− TOOLS_DIR: /opt
47+ PATH: /sbin:/usr/sbin:/bin:/usr/bin
5048
5149 # ------------------------------------------------------------------------
5250 # Location of packcheck.sh (the shell script invoked to perform CI tests ).
@@ -59,15 +57,15 @@ env: &env
5957 # If you have not committed packcheck.sh in your repo at PACKCHECK
6058 # then it is automatically pulled from this URL.
6159 PACKCHECK_GITHUB_URL: "https://raw.githubusercontent.com/composewell/packcheck"
62− PACKCHECK_GITHUB_COMMIT: "35efa99b2082d13722b8a0183ac6455df98e91b9"
60+ PACKCHECK_GITHUB_COMMIT: "f6cfd7b7a33b4bf6fd63cce6a3fb3d26f5031403"
6361
6462executors:
6563 amd64-executor:
6664 docker:
67− - image: ubuntu:xenial
65+ - image: ubuntu:latest
6866 x86-executor:
6967 docker:
70− - image: i386/ubuntu:eoan
68+ - image: i386/ubuntu:focal
7169
7270#-----------------------------------------------------------------------------
7371# Common utility stuff, not to be modified usually
@@ -79,38 +77,50 @@ preinstall: &preinstall
7977 # required for https/cache save and restore
8078 apt-get install -y ca-certificates
8179
82− # required to (re)generate the configure script
83− apt-get install -y autoconf
84−
85− # For ghc and cabal-install packages from hvr's ppa
80+ # Alternative way of installing ghc and cabal, directly from
81+ # haskell.org instead of using ghcup. NOTE: this is for Debian
82+ # only and is debian release specific.
8683 # gnupg is required for apt-key to work
87− apt-get install -y gnupg
88− apt-get install -y apt-transport-https
89− apt-key adv --keyserver keyserver.ubuntu.com --recv-keys BA3CBA3FFE22B574
90− apt-get install -y software-properties-common
91− add-apt-repository -y ppa:hvr/ghc
92− # echo "deb http://downloads.haskell.org/debian stretch main" >> /etc/apt/sources.list
93− echo "deb-src http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main" >> /etc/apt/sources.list
94− apt-get update
84+ #apt-get install -y gnupg
85+ #apt-key adv --keyserver keyserver.ubuntu.com --recv-keys BA3CBA3FFE22B574
86+ #echo "deb http://downloads.haskell.org/debian buster main" >> /etc/apt/sources.list
87+ #apt-get update
9588
96− # required for packcheck
97− apt-get install -y curl
89+ # required for outbound https for stack and for stack setup
90+ apt-get install -y netbase xz-utils make
91+ apt-get install -y zlib1g-dev
9892
99− # required for circleci.
100− apt-get install -y libcurl4-gnutls-dev
101− apt-get install -y git
93+ # For ghcup to install ghc
94+ if test -n "$GHCUP_VERSION"
95+ then
96+ apt-get install -y gcc
97+ apt-get install -y g++
98+ fi
99+
100+ # libgmp required by ghc for linking
101+ apt-get install -y libgmp-dev
102102 apt-get install -y libtinfo-dev
103103
104− # required for outbound https for stack and for stack setup
105− apt-get install -y netbase xz-utils make
104+ # Required by cabal when git URL is specified in project file
105+ apt-get install -y git
106+
107+ # Required for and by packcheck
108+ apt-get install -y curl
106109
107−project-preinstall: &project-preinstall
108− run: |
109110 # Get packcheck if needed
110− CURL=$(which curl)
111− PACKCHECK_URL=${PACKCHECK_GITHUB_URL}/${PACKCHECK_GITHUB_COMMIT}/packcheck.sh
112− if test ! -e "$PACKCHECK"; then $CURL -sL -o "$PACKCHECK" $PACKCHECK_URL; fi;
113− chmod +x $PACKCHECK
111+ if test ! -e "$PACKCHECK"
112+ then
113+ if test -z "$PACKCHECK_GITHUB_COMMIT"
114+ then
115+ die "PACKCHECK_GITHUB_COMMIT is not specified."
116+ fi
117+ PACKCHECK_URL=${PACKCHECK_GITHUB_URL}/${PACKCHECK_GITHUB_COMMIT}/packcheck.sh
118+ curl --fail -sL -o "$PACKCHECK" $PACKCHECK_URL || exit 1
119+ chmod +x $PACKCHECK
120+ elif test ! -x "$PACKCHECK"
121+ then
122+ chmod +x $PACKCHECK
123+ fi
114124
115125restore: &restore
116126 # Needs to happen after installing ca-certificates
@@ -126,269 +136,72 @@ save: &save
126136 save_cache:
127137 key: v1-{{ .Environment.CIRCLE_JOB }}-{{ .Branch }}
128138 paths:
129− - ~/.cabal
130− - ~/.ghc
131139 - ~/.local
140+ - ~/.cabal
132141 - ~/.stack
142+ - ~/.ghcup
133143
134144#-----------------------------------------------------------------------------
135145# Build matrix
136146#-----------------------------------------------------------------------------
137147
138148jobs:
139− cabal-ghc-8_10_4:
140− <<: *env
141− executor: amd64-executor
142− steps:
143− - *preinstall
144− - checkout
145− - *project-preinstall
146− - *restore
147− - run:
148− environment:
149− DISABLE_TEST: "yes"
150− DISABLE_BENCH: "yes"
151− DISABLE_DIST_CHECKS: "yes"
152− command: |
153− apt-get install -y ghc-8.10.4
154− apt-get install -y cabal-install-3.4
155− bash -c "$PACKCHECK cabal"
156− - *save
157− stack-ghc-8_8:
158− <<: *env
159− executor: amd64-executor
160− steps:
161− - *preinstall
162− - checkout
163− - *project-preinstall
164− - *restore
165− - run:
166− name: GHC 8.8 + stack lts-16.12
167− environment:
168− BUILD: "stack"
169− RESOLVER: "lts-16.12"
170− SDIST_OPTIONS: "--ignore-check"
171− STACK_BUILD_OPTIONS: "--flag streamly-benchmarks:-opt"
172− command: |
173− apt-get build-dep -y ghc-8.8.4
174− apt-get install -y cabal-install-3.2
175− bash -c "$PACKCHECK $BUILD"
176− - *save
177149 cabal-ghc-8_6_5:
178150 <<: *env
179151 executor: amd64-executor
180152 steps:
181− - *preinstall
182153 - checkout
183− - *project-preinstall
184154 - *restore
185− - run: |
186− apt-get install -y ghc-8.6.3
187− apt-get install -y cabal-install-2.4
188− bash -c "$PACKCHECK cabal-v2"
189− - *save
190− cabal-ghc-8_4_4:
191− <<: *env
192− executor: x86-executor
193− steps:
194155 - *preinstall
195− - checkout
196− - *project-preinstall
197− - *restore
198− - run:
199− name: GHC 8.4.4 + x86 + debug
200− environment:
201− BUILD: "cabal-v2"
202− GHCVER: "8.4.4"
203− CABAL_BUILD_OPTIONS: "--flag debug --flag limit-build-mem"
204− command: |
205− apt-get install -y ghc-8.4.4
206− apt-get install -y cabal-install-3.2
207− bash -c "$PACKCHECK $BUILD"
208− - *save
209− cabal-ghc-8_2_2:
210− <<: *env
211− executor: amd64-executor
212− steps:
213− - *preinstall
214− - checkout
215− - *project-preinstall
216− - *restore
217156 - run:
218157 environment:
219− BUILD: "cabal-v2"
220− DISABLE_TEST: "yes"
221− DISABLE_BENCH: "yes"
222− DISABLE_DOCS: "yes"
158+ GHCVER: "8.6.5"
159+ CABAL_VERSION: "3.6.2.0"
160+ CABAL_PROJECT: "cabal.project"
223161 DISABLE_SDIST_BUILD: "yes"
224− DISABLE_DIST_CHECKS: "yes"
162+ CABAL_BUILD_OPTIONS: "--flag debug --flag -opt"
225163 command: |
226− apt-get install -y ghc-8.2.2
227− apt-get install -y cabal-install-3.2
228− bash -c "$PACKCHECK $BUILD"
229− - *save
230− cabal-ghc-8_0_2:
231− <<: *env
232− executor: amd64-executor
233− steps:
234− - *preinstall
235− - checkout
236− - *project-preinstall
237− - *restore
238− - run:
239− environment:
240− BUILD: "cabal-v2"
241− DISABLE_TEST: "yes"
242− DISABLE_BENCH: "yes"
243− DISABLE_DOCS: "yes"
244− DISABLE_SDIST_BUILD: "yes"
245− DISABLE_DIST_CHECKS: "yes"
246− command: |
247− apt-get install -y ghc-8.0.2
248− apt-get install -y cabal-install-3.2
249− bash -c "$PACKCHECK $BUILD"
250− - *save
251− cabal-ghc-7_10_3:
252− <<: *env
253− executor: amd64-executor
254− steps:
255− - *preinstall
256− - checkout
257− - *project-preinstall
258− - *restore
259− - run: |
260− apt-get install -y ghc-7.10.3
261− apt-get install -y cabal-install-2.4
262− bash -c "$PACKCHECK cabal-v2"
263− - *save
264− stack-ghc-8_4:
265− <<: *env
266− executor: amd64-executor
267− steps:
268− - *preinstall
269− - checkout
270− - *project-preinstall
271− - *restore
272− - run: |
273− bash -c "$PACKCHECK stack RESOLVER=lts-12"
274− - *save
275− stack-ghc-8_2:
276− <<: *env
277− executor: amd64-executor
278− steps:
279− - *preinstall
280− - checkout
281− - *project-preinstall
282− - *restore
283− - run: |
284− bash -c "$PACKCHECK stack RESOLVER=lts-11"
285− - *save
286− cabal-ghcjs-8_4:
287− <<: *env
288− executor: amd64-executor
289− steps:
290− - *preinstall
291− - checkout
292− - *project-preinstall
293− - *restore
294− - run:
295− name: GHCJS 8.4+no-test+no-docs
296− environment:
297− BUILD: cabal-v2
298− ENABLE_GHCJS: "yes"
299− DISABLE_TEST: "yes"
300− ENABLE_INSTALL: ""
301− DISABLE_DOCS: "yes"
302− DISABLE_SDIST_BUILD: "yes"
303− command: |
304− add-apt-repository -y ppa:hvr/ghcjs
305− add-apt-repository -y 'deb https://deb.nodesource.com/node_11.x xenial main'
306− curl -sSL https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add -
307− apt-get update
308− apt-get install -y cabal-install-3.2
309− apt-get install -y nodejs
310− apt-get install -y ghcjs-8.4
311− cabal user-config update -a "jobs: 1"
312− bash -c "$PACKCHECK $BUILD"
164+ bash -c "$PACKCHECK cabal"
313165 - *save
314− coveralls-ghc-8_2_2:
166+ cabal-ghc-9_8_1-docspec:
315167 <<: *env
316168 executor: amd64-executor
317169 steps:
318− - *preinstall
319170 - checkout
320− - *project-preinstall
321171 - *restore
322− - run:
323− environment:
324− BUILD: cabal
325− COVERALLS_OPTIONS: "--repo-token=\"$REPO_TOKEN\" --coverage-mode=StrictlyFullLines --exclude-dir=test test"
326− GHC_OPTIONS: "-DCOVERAGE_BUILD"
327− command: |
328− apt-get install -y ghc-8.2.2
329− apt-get install -y cabal-install-2.4
330− bash -c "$PACKCHECK cabal-v1"
331− - *save
332− coveralls-ghc-8_8_3:
333− <<: *env
334− executor: amd64-executor
335− steps:
336172 - *preinstall
337− - checkout
338− - *project-preinstall
339− - *restore
340173 - run:
341174 environment:
342− BUILD: cabal-v2
343− COVERALLS_OPTIONS: "--repo-token=\"$REPO_TOKEN\" --coverage-mode=StrictlyFullLines --exclude-dir=test"
344− CABAL_PROJECT: "cabal.project.coverage"
345− CABAL_BUILD_TARGETS: ""
175+ GHCVER: "9.8.1"
176+ CABAL_VERSION: "3.10.1.0"
177+ CABAL_PROJECT: "cabal.project.doctest"
178+ DISABLE_SDIST_BUILD: "y"
179+ DISABLE_TEST: "y"
180+ DISABLE_BENCH: "y"
181+ DISABLE_DOCS: "y"
182+ ENABLE_DOCSPEC: "y"
183+ DOCSPEC_URL: https://github.com/phadej/cabal-extras/releases/download/cabal-docspec-0.0.0.20210111/cabal-docspec-0.0.0.20210111.xz
184+ DOCSPEC_OPTIONS: "--timeout 60 --check-properties --property-variables xs"
346185 command: |
347− apt-get install -y ghc-8.8.3
348− apt-get install -y cabal-install-3.0
349− bash -c "$PACKCHECK cabal-v2"
350− no_output_timeout: 25m
186+ bash -c "$PACKCHECK cabal"
351187 - *save
352− coveralls-ghc-8_10_2:
188+ hlint-trailing-spaces:
353189 <<: *env
354190 executor: amd64-executor
355191 steps:
356− - *preinstall
357192 - checkout
358− - *project-preinstall
359193 - *restore
360− - run:
361− name: Build and test with inspection, coverage, Werror
362− command: |
363− apt-get install -y ghc-8.10.2
364− apt-get install -y cabal-install-3.2
365− # Run tests with coverage
366− cabal update
367− cabal user-config update -a "jobs: 1"
368− bin/test.sh --coverage --raw
369− # Upload results to coveralls.io
370− PATH=$HOME/.cabal/bin:$PATH
371− export PATH
372− which hpc-coveralls 2>/dev/null || cabal install --project-file cabal.project.hpc-coveralls hpc-coveralls
373− hpc-coveralls --repo-token="$REPO_TOKEN" --coverage-mode=StrictlyFullLines
374− no_output_timeout: 25m
375− - *save
376− hlint-src:
377− <<: *env
378− executor: amd64-executor
379− steps:
380194 - *preinstall
381− - checkout
382− - *project-preinstall
383− - *restore
384195 - run:
385− name: Hlint src
196+ name: hlint and trailing spaces
386197 environment:
387− BUILD: cabal-v2
388− HLINT_OPTIONS: lint --cpp-include=src --cpp-include=test
389− HLINT_TARGETS: src test benchmark
198+ DISABLE_SDIST_BUILD: "yes"
199+ HLINT_VERSION: 3.6.1
200+ HLINT_OPTIONS: lint
201+ HLINT_TARGETS: core/src src test benchmark
390202 command: |
391− bash -c "$PACKCHECK $BUILD" || exit 1
203+ bash -c "$PACKCHECK hlint" || exit 1
204+ echo "Checking trailing spaces..."
392205 count=$(find . -name "*.hs" -exec grep -H '\ $' {} \; | tee /dev/tty | wc -l)
393206 exit $count
394207 - *save
@@ -397,23 +210,9 @@ workflows:
397210 version: 2
398211 build:
399212 jobs:
400− - cabal-ghc-8_10_4:
401− name: GHC 8.10.4 + sdist + no-test + no-bench
402− #- cabal-ghc-8.6.5
403− #- cabal-ghc-8_4_4:
404− # name: GHC 8.4.4 + x86 + debug
405− - cabal-ghc-8_2_2:
406− name: GHC 8.2.2 + no-test + no-bench + no-docs
407− - cabal-ghc-8_0_2:
408− name: GHC 8.0.2 + no-test + no-bench + no-docs
409− #- cabal-ghc-7.10.3
410− - cabal-ghcjs-8_4:
411− name: GHCJS 8.4 + no-test + no-docs
412− #- stack-ghc-8.4
413− #- stack-ghc-8.2
414− #- coveralls-ghc-8.2.2
415− #- coveralls-ghc-8.8.3
416− #- coveralls-ghc-8_10_2:
417− # name: GHC 8.10.2 + inspection + coverage + Werror
418− - hlint-src:
419− name: Hlint src + Trailing Spaces
213+ #- cabal-ghc-8_6_5:
214+ # name: 8.6.5-debug-unoptimized
215+ - cabal-ghc-9_8_1-docspec:
216+ name: ghc-9.8.1-docspec
217+ - hlint-trailing-spaces:
218+ name: hlint and trailing spaces
.github/workflows/haskell.yml+166−90
@@ -8,14 +8,22 @@ on:
88
99jobs:
1010 build:
11− name: GHC ${{ matrix.name }}
11+ name: GHC ${{matrix.name}}
1212 env:
1313 # packcheck environment variables
1414 LC_ALL: C.UTF-8
1515 BUILD: ${{ matrix.build }}
16+ # For updating see: https://downloads.haskell.org/~ghcup/
17+ GHCUP_VERSION: 0.1.20.0
18+ DOCSPEC_URL: https://github.com/phadej/cabal-extras/releases/download/cabal-docspec-0.0.0.20210111/cabal-docspec-0.0.0.20210111.xz
19+ DOCSPEC_OPTIONS: "--timeout 60 --check-properties --property-variables xs"
20+ GHCUP_GHC_OPTIONS: ${{ matrix.ghcup_ghc_options }}
1621 GHCVER: ${{ matrix.ghc_version }}
22+ CABALVER: ${{ matrix.cabal_version }}
1723 DISABLE_DOCS: ${{ matrix.disable_docs }}
24+ ENABLE_DOCSPEC: ${{ matrix.enable_docspec }}
1825 DISABLE_TEST: ${{ matrix.disable_test }}
26+ DISABLE_BENCH: ${{ matrix.disable_bench }}
1927 DISABLE_DIST_CHECKS: ${{ matrix.disable_dist_checks }}
2028 SDIST_OPTIONS: ${{ matrix.sdist_options }}
2129 DISABLE_SDIST_BUILD: ${{ matrix.disable_sdist_build }}
@@ -37,136 +45,192 @@ jobs:
3745 STACK_BUILD_OPTIONS: ${{ matrix.stack_build_options }}
3846
3947 # packcheck location and revision
40− PACKCHECK_LOCAL_PATH: "./packcheck.sh"
48+ PACKCHECK: "./packcheck.sh"
4149 PACKCHECK_GITHUB_URL: "https://raw.githubusercontent.com/composewell/packcheck"
42− PACKCHECK_GITHUB_COMMIT: "35efa99b2082d13722b8a0183ac6455df98e91b9"
50+ PACKCHECK_GITHUB_COMMIT: "v0.7.0"
4351
4452 # Pull token from "secrets" setting of the github repo
4553 COVERALLS_TOKEN: ${{ secrets.COVERALLS_TOKEN }}
4654 COVERAGE: ${{ matrix.coverage }}
47− DOCTEST: ${{ matrix.doctest }}
55+
56+ # hlint
57+ HLINT_VERSION: 3.6.1
58+ HLINT_OPTIONS: "lint"
59+ HLINT_TARGETS: "core/src src test benchmark"
60+
61+ # Subdir
62+ SUBDIR: ${{ matrix.subdir }}
4863
4964 runs-on: ${{ matrix.runner }}
65+ continue-on-error: ${{ matrix.ignore_error }}
5066 strategy:
51− fail-fast: false
67+ fail-fast: true
5268 matrix:
69+ # The order is important to optimize fail-fast.
5370 name:
54− - 9.0.1
55− - 8.10.4+stack
56− - 8.10.4+macOS
57− - 8.10.4+linux+coverage+cabal
58− - 8.10.4+docspec
59− - 8.8.4
60− - 8.8.4+inspection+fusion-plugin+Werror
61− - 8.6.5+fusion-plugin
62− - 8.6.5+streamk
63− - 8.4.4+debug
64− cabal_version: ["3.4"]
71+ - 9.8.1-Werror
72+ # - 9.8.1-docspec
73+ # - 8.10.7-coverage
74+
75+ # Note: if cabal.project is not specified benchmarks and tests won't
76+ # run. But we need at least one test where we test without
77+ # cabal.project because that is how hackage would build it.
6578 include:
66− - name: 9.0.1
67− ghc_version: 9.0.1
68− build: cabal-v2
69− cabal_build_options: "--allow-newer=hsc2hs"
70− disable_sdist_build: "y"
79+ - name: head
80+ ghc_version: head
81+ # The URL may change, to find a working URL go to https://gitlab.haskell.org/ghc/ghc/-/jobs/
82+ # Find a debian10/11/12 job, click on a passed/failed status, at the
83+ # end of the output you will find the tar.xz name, put that tar
84+ # name after "raw/", and put the job name after "job=".
85+ # Also see https://github.com/mpickering/ghc-artefact-nix/blob/master/gitlab-artifact.nix
86+ #
87+ # May also use ghcup for installing ghc head version, use the
88+ # version "LatestNightly", and the following config:
89+ # ghcup config add-release-channel https://ghc.gitlab.haskell.org/ghcup-metadata/ghcup-nightlies-0.0.7.yaml
90+ ghcup_ghc_options: "-u https://gitlab.haskell.org/ghc/ghc/-/jobs/artifacts/master/raw/ghc-x86_64-linux-deb10-int_native-validate.tar.xz?job=x86_64-linux-deb10-int_native-validate"
7191 runner: ubuntu-latest
72− - name: 8.10.4+stack
73− build: stack
74− resolver: lts-18.0
75− stack_yaml: stack.yaml
76− sdist_options: "--ignore-check"
77− stack_build_options: "--flag streamly-benchmarks:-opt"
78− runner: ubuntu-latest
79− - name: 8.10.4+macOS
80− ghc_version: 8.10.4
81− build: cabal-v2
92+ build: cabal
93+ cabal_version: 3.10.2.0
94+ cabal_project: cabal.project.ghc-head
8295 disable_sdist_build: "y"
83− runner: macos-latest
84− - name: 8.10.4+linux+coverage+cabal
85− ghc_version: 8.10.4
86− coverage: "y"
96+ ignore_error: true
97+ # Note: use linux for warning build for convenient dev testing
98+ - name: 9.8.1-Werror
99+ ghc_version: 9.8.1
87100 runner: ubuntu-latest
88− - name: 8.8.4+inspection+fusion-plugin+Werror
89− ghc_version: 8.8.4
90− build: cabal-v2
101+ build: cabal
102+ cabal_version: 3.10.1.0
103+ disable_sdist_build: "y"
91104 cabal_project: cabal.project.Werror
105+ ignore_error: false
106+ #- name: 9.8.1-docspec
107+ # ghc_version: 9.8.1
108+ # runner: ubuntu-latest
109+ # build: cabal
110+ # cabal_version: 3.10.1.0
111+ # cabal_project: cabal.project.doctest
112+ # disable_test: "y"
113+ # disable_bench: "y"
114+ # disable_docs: "y"
115+ # enable_docspec: "y"
116+ # disable_sdist_build: "y"
117+ # ignore_error: false
118+ - name: 9.8.1-fusion-inspection
119+ ghc_version: 9.8.1
120+ runner: ubuntu-latest
121+ build: cabal
122+ cabal_version: 3.10.1.0
123+ disable_sdist_build: "y"
124+ cabal_project: cabal.project
92125 cabal_build_options: "--flag fusion-plugin --flag inspection"
126+ ignore_error: false
127+ - name: 9.6.3-macos
128+ ghc_version: 9.6.3
129+ runner: macos-latest
130+ build: cabal
131+ cabal_version: 3.10.1.0
132+ disable_sdist_build: "y"
133+ cabal_project: cabal.project
134+ ignore_error: false
135+ - name: 9.4.7
136+ ghc_version: 9.4.7
93137 runner: ubuntu-latest
94− - name: 8.8.4
95− ghc_version: 8.8.4
96138 build: cabal
139+ cabal_version: 3.8.1.0
140+ disable_sdist_build: "y"
97141 cabal_project: cabal.project
98− cabal_build_options: "--flag -opt"
142+ ignore_error: false
143+ - name: 9.2.8
144+ ghc_version: 9.2.8
99145 runner: ubuntu-latest
100− - name: 8.6.5+streamk
101− ghc_version: 8.6.5
102− build: cabal-v2
146+ build: cabal
103147 cabal_project: cabal.project
104− cabal_build_options: "--flag streamk --flag -opt"
148+ cabal_version: 3.6.2.0
149+ disable_sdist_build: "y"
150+ ignore_error: false
151+ - name: 9.0.2-streamly-sdist
152+ ghc_version: 9.0.2
105153 runner: ubuntu-latest
106− - name: 8.6.5+fusion-plugin
107− ghc_version: 8.6.5
108− build: cabal-v2
154+ build: cabal
155+ cabal_version: 3.6.2.0
156+ cabal_project: cabal.project.streamly
157+ ignore_error: true
158+ - name: 9.0.2-streamly-core-sdist
159+ ghc_version: 9.0.2
160+ runner: ubuntu-latest
161+ build: cabal
162+ cabal_version: 3.6.2.0
163+ subdir: core
164+ ignore_error: false
165+ - name: 8.10.7-streamly-sdist-stack
166+ runner: ubuntu-latest
167+ build: stack
168+ resolver: lts-20.13
169+ stack_yaml: stack.yaml
170+ sdist_options: "--ignore-check"
171+ stack_build_options: "--flag streamly-benchmarks:-opt"
172+ cabal_version: 3.6.2.0
173+ ignore_error: false
174+ # - name: 8.10.7-coverage
175+ # ghc_version: 8.10.7
176+ # runner: ubuntu-latest
177+ # coverage: "y"
178+ # cabal_version: 3.6.2.0
179+ # ignore_error: false
180+ - name: 8.8.4
181+ ghc_version: 8.8.4
182+ runner: ubuntu-latest
183+ build: cabal
184+ cabal_version: 3.6.2.0
109185 cabal_project: cabal.project
110− cabal_build_options: "--flag fusion-plugin"
111− # haddock generation does not work with 8.6.5+fusion-plugin
112− disable_docs: "y"
186+ disable_sdist_build: "y"
187+ ignore_error: false
188+ - name: 8.6.5-debug-unoptimized
189+ ghc_version: 8.6.5
113190 runner: ubuntu-latest
114− - name: 8.4.4+debug
115− ghc_version: 8.4.4
116− build: cabal-v2
191+ build: cabal
192+ cabal_version: 3.6.2.0
117193 cabal_project: cabal.project
118194 cabal_build_options: "--flag debug --flag -opt"
195+ disable_sdist_build: "y"
196+ ignore_error: false
197+ - name: hlint
198+ build: hlint
119199 runner: ubuntu-latest
120− - name: 8.10.4+docspec
121− ghc_version: 8.10.4
122− doctest: "y"
123− runner: ubuntu-latest
200+ ignore_error: true
124201
125202 steps:
126203 - uses: actions/checkout@v2
127204
128− - uses: haskell/actions/setup@v1
129− with:
130− ghc-version: ${{ matrix.ghc_version }}
131− cabal-version: ${{ matrix.cabal_version }}
132−
133205 - uses: actions/cache@v1
134− name: Cache ~/.cabal
206+ name: Cache common directories
135207 with:
136− path: ~/.cabal
208+ path: |
209+ ~/.local
210+ ~/.cabal
211+ ~/.stack
212+ ~/.ghcup
137213 # Bump the key version to clear the cache
138− key: ${{ runner.os }}-${{ matrix.ghc_version }}-cabal-v1
214+ key: ${{ runner.os }}-${{ matrix.ghc_version }}-cabal-v2
139215
140216 - name: Download packcheck
141217 run: |
142− # Get packcheck if needed
143− CURL=$(which curl)
144− PACKCHECK_URL=${PACKCHECK_GITHUB_URL}/${PACKCHECK_GITHUB_COMMIT}/packcheck.sh
145− if test ! -e "$PACKCHECK_LOCAL_PATH"; then $CURL -sL -o "$PACKCHECK_LOCAL_PATH" $PACKCHECK_URL; fi;
146− chmod +x $PACKCHECK_LOCAL_PATH
147−
148− - name: Run tests
149− run: |
150− if test -n "$DOCTEST"
218+ if test ! -e "$PACKCHECK"
151219 then
152− mkdir -p $HOME/.cabal/bin
153− curl -sL https://github.com/phadej/cabal-extras/releases/download/cabal-docspec-0.0.0.20210111/cabal-docspec-0.0.0.20210111.xz > cabal-docspec.xz
154− echo '0829bd034fba901cbcfe491d98ed8b28fd54f9cb5c91fa8e1ac62dc4413c9562 cabal-docspec.xz' | sha256sum -c -
155− xz -d < cabal-docspec.xz > $HOME/.cabal/bin/cabal-docspec
156− rm -f cabal-docspec.xz
157− chmod a+x $HOME/.cabal/bin/cabal-docspec
158− cabal update
159− cabal build all
160− $HOME/.cabal/bin/cabal-docspec --version
161− $HOME/.cabal/bin/cabal-docspec --timeout 60 --check-properties --property-variables xs
162− elif test -z "$COVERAGE"
220+ if test -z "$PACKCHECK_GITHUB_COMMIT"
221+ then
222+ die "PACKCHECK_GITHUB_COMMIT is not specified."
223+ fi
224+ PACKCHECK_URL=${PACKCHECK_GITHUB_URL}/${PACKCHECK_GITHUB_COMMIT}/packcheck.sh
225+ curl --fail -sL -o "$PACKCHECK" $PACKCHECK_URL || exit 1
226+ chmod +x $PACKCHECK
227+ elif test ! -x "$PACKCHECK"
163228 then
164− export TOOLS_DIR=/opt
165− # /usr/local/opt/curl/bin for macOS
166− export PATH=$HOME/.local/bin:$HOME/.ghcup/bin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/local/opt/curl/bin
167− bash -c "$PACKCHECK_LOCAL_PATH $BUILD"
229+ chmod +x $PACKCHECK
168230 fi
169231
232+ - name: Run tests
233+ run: |
170234 if test -n "$COVERAGE"
171235 then
172236 # Run tests with coverage
@@ -179,4 +243,16 @@ jobs:
179243 bin/test.sh --coverage --raw
180244 # XXX Uncomment this and fix it properly later
181245 # hpc-coveralls --repo-token="$COVERALLS_TOKEN" --coverage-mode=StrictlyFullLines
246+ else
247+ # /usr/local/opt/curl/bin for macOS
248+ export PATH=$HOME/.local/bin:$HOME/.ghcup/bin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/local/opt/curl/bin
249+ if test -n "$SUBDIR"
250+ then
251+ mv "$PACKCHECK" "$SUBDIR/packcheck.sh"
252+ # This is required as dist-newstyle will be created on the top level
253+ # directory as it is considered the working dir.
254+ rm cabal.project
255+ cd "$SUBDIR"
256+ fi
257+ bash -c "$PACKCHECK $BUILD"
182258 fi
.github/workflows/packdiff.ymlnew file+39
@@ -0,0 +1,39 @@
1+name: Packdiff
2+
3+on: pull_request
4+
5+jobs:
6+ packdiff:
7+
8+ runs-on: ubuntu-latest
9+
10+ steps:
11+
12+ - name: Download ghc
13+ run: |
14+ GHCUP_VER=0.1.18.0
15+ curl -sL -o ./ghcup https://downloads.haskell.org/~ghcup/$GHCUP_VER/x86_64-linux-ghcup-$GHCUP_VER
16+ chmod +x ./ghcup
17+ GHCVER=8.10.7
18+ ./ghcup install ghc $GHCVER
19+ ./ghcup set ghc $GHCVER
20+ cabal update
21+
22+ - uses: actions/cache@v2
23+ name: Cache ~/.cabal
24+ with:
25+ path: |
26+ ~/.cabal
27+ # Bump the key version to clear the cache
28+ key: cache-v2
29+
30+ - name: Checkout the current branch
31+ uses: actions/checkout@v2
32+ with:
33+ fetch-depth: 0
34+
35+ - name: Run packdiff on streamly-core
36+ run: cabal run packdiff --project-file=cabal.project.packdiff -- streamly-core $(git rev-parse origin/master) $(git rev-parse HEAD)
37+
38+ - name: Run packdiff on streamly
39+ run: cabal run packdiff --project-file=cabal.project.packdiff -- streamly $(git rev-parse origin/master) $(git rev-parse HEAD)
.github/workflows/regression-check.ymlnew file+165
@@ -0,0 +1,165 @@
1+name: Regression checking
2+
3+on:
4+ workflow_dispatch:
5+ pull_request:
6+
7+# References:
8+# https://docs.github.com/en/actions/managing-workflow-runs/manually-running-a-workflow
9+# https://docs.github.com/en/actions/using-workflows/reusing-workflows#reusable-workflows-and-starter-workflows
10+# https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#onworkflow_call
11+# https://docs.github.com/en/actions/learn-github-actions/contexts#about-contexts-and-expressions
12+
13+# You can override the default DIFF_CUTOFF_PERCENT by specifying a cutoff along
14+# with the benchmark target.
15+# Eg, "Data.Async:12" where "Data.Async" is the benchmark target, ":" is the
16+# seperator, and "12" is the new cutoff percent
17+jobs:
18+ check-regressions:
19+ env:
20+ CI_BENCHMARKS_WITH_CUTOFF: >-
21+ Data.Array
22+ Data.MutArray
23+ Data.Array.Generic
24+ Data.Ring.Unboxed
25+ Data.Fold
26+ Data.Fold.Window
27+ Data.Parser
28+ Data.ParserK
29+ Data.StreamD
30+ Data.StreamK:6
31+ Data.Unfold
32+ Data.Stream
33+ Data.Stream.Concurrent
34+ Data.Stream.ConcurrentEager
35+ Data.Stream.ConcurrentInterleaved
36+ Data.Stream.ConcurrentOrdered
37+ FileSystem.Handle
38+ Unicode.Char
39+ Unicode.Stream
40+ Unicode.Utf8
41+ CI_FIELDS: allocated
42+ CI_DIFF_CUTOFF_PERCENT: 3
43+
44+ runs-on: ubuntu-latest
45+
46+ steps:
47+
48+ - name: Update environment
49+ run: |
50+ CI_BENCHMARKS=""
51+ for i in $CI_BENCHMARKS_WITH_CUTOFF
52+ do
53+ bname=$(echo "$i" | cut -d: -f1)
54+ CI_BENCHMARKS="$CI_BENCHMARKS $bname"
55+ done
56+ echo "CI_BENCHMARKS=$CI_BENCHMARKS" >> $GITHUB_ENV
57+
58+ - name: Download ghc
59+ run: |
60+ GHCUP_VER=0.1.18.0
61+ curl -sL -o ./ghcup https://downloads.haskell.org/~ghcup/$GHCUP_VER/x86_64-linux-ghcup-$GHCUP_VER
62+ chmod +x ./ghcup
63+ GHCVER=9.2.7
64+ ./ghcup install ghc $GHCVER
65+ ./ghcup set ghc $GHCVER
66+ cabal update
67+
68+ - uses: actions/cache@v2
69+ name: Cache ~/.cabal
70+ with:
71+ path: |
72+ ~/.cabal
73+ # Bump the key version to clear the cache
74+ key: cache-v2
75+
76+ - name: Cache bench-runner from pr
77+ id: cache-bench-runner-pr
78+ uses: actions/cache@v2
79+ with:
80+ path: bench-runner
81+ # Bump the key version to clear the cache
82+ key: bench-runner-v1
83+
84+ # -----------------------------------------------------------------
85+ # -- Install bench-report in the current directory
86+ # -----------------------------------------------------------------
87+
88+ - name: Checkout the current branch
89+ uses: actions/checkout@v2
90+ with:
91+ clean: false
92+
93+ - name: Install bench-runner
94+ run: |
95+ cabal install bench-runner --project-file=cabal.project.report --installdir=./
96+
97+ # -----------------------------------------------------------------
98+ # -- Generate reports for the base branch and upload
99+ # -----------------------------------------------------------------
100+
101+ - name: Checkout the base branch
102+ uses: actions/checkout@v2
103+ with:
104+ ref: master
105+ clean: false
106+
107+ - name: Run benchmarks
108+ run: |
109+ ./bench-runner --package-name streamly-benchmarks --package-version 0.0.0 --targets "$CI_BENCHMARKS" --raw
110+
111+ - name: Move charts to charts-master
112+ run: mv charts charts-master
113+
114+ # -----------------------------------------------------------------
115+ # -- Download, generate reports for the current branch and append
116+ # -----------------------------------------------------------------
117+
118+ - name: Checkout the current branch
119+ uses: actions/checkout@v2
120+ with:
121+ clean: false
122+
123+ - name: Copy charts-master to charts
124+ run: cp -r charts-master charts
125+
126+ - name: Run benchmarks and append
127+ run: |
128+ ./bench-runner --package-name streamly-benchmarks --package-version 0.0.0 --targets "$CI_BENCHMARKS" --raw --append
129+
130+ # -----------------------------------------------------------------
131+ # -- Compare
132+ # -----------------------------------------------------------------
133+
134+ - name: List all benchmarks
135+ run: |
136+ ./bench-runner --package-name streamly-benchmarks --package-version 0.0.0 --targets "$CI_BENCHMARKS" --no-measure
137+
138+ - name: Compare benchmarks
139+ run: |
140+
141+ EXIT_STATUS=0
142+
143+ for i in $CI_BENCHMARKS_WITH_CUTOFF
144+ do
145+ arrI=(${i//:/ })
146+
147+ bname=${arrI[0]}
148+ cutoff=${arrI[1]}
149+
150+ test -z "$cutoff" && cutoff=$CI_DIFF_CUTOFF_PERCENT
151+
152+ echo
153+ echo "Checking $bname for regressions greater than $cutoff percent"
154+ ! ./bench-runner \
155+ --package-name streamly-benchmarks \
156+ --package-version 0.0.0 \
157+ --targets "$bname" \
158+ --fields "$CI_FIELDS" \
159+ --no-measure --silent \
160+ --diff-cutoff-percent $cutoff \
161+ | grep -v "^$"
162+ test $? -eq 1 && EXIT_STATUS=1
163+ done
164+
165+ exit $EXIT_STATUS
.gitignore+7−3
@@ -1,7 +1,11 @@
11# Build files/directories
2−/.stack-work/
3−/dist/
4−/dist-newstyle*/
2+.stack-work/
3+dist/
4+dist-newstyle*/
5+.cabal.nix
6+autom4te.cache/
7+benchmark/bench-report/bin/bench-report
8+charts/
59
610# Local GHC and Cabal related files
711.ghc.environment*
.hlint.ignore+12−24
@@ -1,52 +1,40 @@
1−src/Streamly/Internal/Data/Stream/Prelude.hs
2−src/Streamly/Internal/Data/Stream/PreludeCommon.hs
1+core/src/Streamly/Internal/Data/Stream/StreamK/Type.hs
2+core/src/Streamly/Internal/Data/Pipe/Type.hs
3+core/src/Streamly/Internal/Unicode/Stream.hs
4+src/Streamly/Internal/Data/SmallArray/Type.hs
5+src/Streamly/Internal/Data/Stream/IsStream/Eliminate.hs
36src/Streamly/Internal/Data/Stream/Serial.hs
47src/Streamly/Internal/Data/Stream/Zip.hs
5−src/Streamly/Internal/Data/Stream/StreamK/Type.hs
6−src/Streamly/Internal/Data/Pipe/Type.hs
7−src/Streamly/Internal/Data/SmallArray/Type.hs
8−src/Streamly/Internal/Unicode/Stream.hs
9−src/Streamly/Internal/Data/Array/Prim/Type.hs
10−src/Streamly/Internal/Data/Array/Prim/Mut/Type.hs
11−src/Streamly/Internal/Data/Array/Prim/MutTypesInclude.hs
12−src/Streamly/Internal/Data/Array/Prim/Pinned/Mut/Type.hs
13−src/Streamly/Internal/Data/Array/Prim/Pinned/Type.hs
14−src/Streamly/Internal/Data/Array/Prim/TypesInclude.hs
15−test/Streamly/Test/Common/Array.hs
168test/Streamly/Test/Data/Array.hs
17−test/Streamly/Test/Data/Array/Prim.hs
18−test/Streamly/Test/Data/Array/Prim/Pinned.hs
19−test/Streamly/Test/Data/Array/Foreign.hs
209test/Streamly/Test/Data/Parser.hs
21−test/Streamly/Test/Data/Parser/ParserD.hs
10+test/Streamly/Test/Data/ParserK.hs
2211test/Streamly/Test/Data/SmallArray.hs
2312test/Streamly/Test/Data/Unfold.hs
2413test/Streamly/Test/FileSystem/Event.hs
2514test/Streamly/Test/Prelude/Concurrent.hs
15+test/Streamly/Test/Data/Stream/Concurrent.hs
16+test/lib/Streamly/Test/Prelude/Common.hs
2617test/Streamly/Test/Prelude/Fold.hs
2718test/Streamly/Test/Prelude/Rate.hs
2819test/Streamly/Test/Prelude/Serial.hs
2920test/Streamly/Test/Unicode/Stream.hs
21+test/Streamly/Test/Data/Unbox.hs
3022benchmark/lib/Streamly/Benchmark/Common.hs
3123benchmark/lib/Streamly/Benchmark/Common/Handle.hs
3224benchmark/lib/Streamly/Benchmark/Prelude.hs
3325benchmark/NanoBenchmarks.hs
3426benchmark/Streamly/Benchmark/Data/Array.hs
35−benchmark/Streamly/Benchmark/Data/ArrayOps.hs
36−benchmark/Streamly/Benchmark/Data/NestedUnfoldOps.hs
3727benchmark/Streamly/Benchmark/Data/Parser.hs
38−benchmark/Streamly/Benchmark/Data/Parser/ParserD.hs
28+benchmark/Streamly/Benchmark/Data/ParserK.hs
3929benchmark/Streamly/Benchmark/Data/Stream/StreamDK.hs
4030benchmark/Streamly/Benchmark/Data/Stream/StreamK.hs
4131benchmark/Streamly/Benchmark/Data/Unfold.hs
4232benchmark/Streamly/Benchmark/FileSystem/Handle.hs
4333benchmark/Streamly/Benchmark/Prelude/Async.hs
34+benchmark/Streamly/Benchmark/Prelude/Concurrent.hs
4435benchmark/Streamly/Benchmark/Prelude/Merge.hs
4536benchmark/Streamly/Benchmark/Prelude/Parallel.hs
4637benchmark/Streamly/Benchmark/Prelude/Rate.hs
47−benchmark/Streamly/Benchmark/Prelude/Serial/Exceptions.hs
48−benchmark/Streamly/Benchmark/Prelude/Serial/Nested.hs
49−benchmark/Streamly/Benchmark/Prelude/Serial/Split.hs
50−benchmark/Streamly/Benchmark/Prelude/Serial/Transformation1.hs
5138benchmark/Streamly/Benchmark/Prelude/WAsync.hs
5239benchmark/Streamly/Benchmark/Prelude/ZipAsync.hs
40+benchmark/Streamly/Benchmark/Prelude/ZipSerial.hs
.hlint.yaml+17−2
@@ -10,6 +10,8 @@
1010- suggest: {name: "Unused LANGUAGE pragma"}
1111- suggest: {name: "Eta reduce"}
1212- suggest: {name: "Reduce duplication"}
13+
14+# Warnings currently ignored
1315- ignore: {name: "Use list literal pattern"}
1416- ignore: {name: "Use tuple-section"} # requires GHC extension
1517- ignore: {name: "Use fromMaybe"} # may want to use this suggestion, but it didn't match the common idiom of the library
@@ -22,11 +24,24 @@
2224- ignore: {name: "Use uncurry"}
2325- ignore: {name: "Redundant $!"}
2426- ignore: {name: "Use fmap"}
27+- ignore: {name: "Use ++"}
2528
29+# Warnings ignored in specific places
30+- ignore: {name: "Use mapM", within: Stream.Transform}
31+- ignore: {name: "Use traverse", within: Stream.Transform}
32+- ignore: {name: "Redundant <*", within: Stream.Expand}
33+- ignore: {name: "Redundant bracket", within: Stream.Split}
34+- ignore: {name: "Use isDigit", within: Streamly.Internal.Unicode.Parser}
2635
2736# Specify additional command line arguments
2837#
29−# - arguments: [--color, --cpp-simple, -XQuasiQuotes]
38+- arguments:
39+ [ --cpp-include=src
40+ , --cpp-include=src/Streamly/Internal/Data/Stream
41+ , --cpp-include=src/Streamly/Internal/Data/Array
42+ , --cpp-include=test
43+ , --cpp-define=CABAL_OS_LINUX
44+ ]
3045
3146
3247# Control which extensions/flags/modules/functions can be used
@@ -56,7 +71,7 @@
5671# Turn on hints that are off by default
5772#
5873# Ban "module X(module X) where", to require a real export list
59−# - warn: {name: Use explicit module export list}
74+- warn: {name: Use explicit module export list}
6075#
6176# Replace a $ b $ c with a . b $ c
6277# - group: {name: dollar, enabled: true}
.packcheck.ignore+14−1
@@ -1,23 +1,36 @@
11.circleci/config.yml
22.ghci
33.github/workflows/haskell.yml
4+.github/workflows/regression-check.yml
5+.github/workflows/packdiff.yml
46.gitignore
57.hlint.ignore
68.hlint.yaml
79.packcheck.ignore
810appveyor.yml
9−benchmark/bench-report/default.nix
11+benchmark/bench-runner/default.nix
12+benchmark/bench-runner/cabal.project
1013bin/ghc.sh
14+bin/repl
1115bin/run-ci.sh
16+bin/run-repl-quick.sh
1217cabal.project
1318cabal.project.coverage
1419cabal.project.doctest
1520cabal.project.ghc-head
1621cabal.project.hpc-coveralls
1722cabal.project.O0
23+cabal.project.report
24+cabal.project.packdiff
25+cabal.project.streamly
1826cabal.project.Werror
1927cabal.project.Werror-nocode
28+core/
2029default.nix
2130examples/README.md
2231hie.yaml
2332stack.yaml
33+targets/default.nix
34+targets/cabal.project
35+test/test-runner/default.nix
36+test/test-runner/cabal.project
CHANGELOG.mdnew file+1
@@ -0,0 +1 @@
1+docs/User/Project/Changelog.md
CONTRIBUTING.mdmode 100644 → 120000+1−272
@@ -1,272 +0,0 @@
1−# Contributors' Guide
2−
3−## Bug Reports
4−
5−Please feel free to [open an
6−issue](https://github.com/composewell/streamly/issues) for any questions,
7−suggestions, issues or bugs in the library. In case you are reporting a bug
8−we will appreciate if you provide as much detail as possible to reproduce or
9−understand the problem, but nevertheless you are encouraged to open an issue
10−for any problem that you may encounter.
11−
12−## Picking Issues to Work on
13−
14−Beginners are encouraged to pick up issues that are marked `help wanted`. It is
15−a good idea to update the issue expressing your intent so that others do not
16−duplicate the effort and people with a background on the issue can help.
17−
18−## Build and test
19−
20−Some common commands:
21−
22−```
23−$ cabal repl
24−$ cabal build
25−$ cabal build --disable-optimization --flags -opt
26−$ bin/test.sh --quick
27−$ bin/bench.sh --quick # For nix use "--use-nix"
28−$ bin/run-ci --targets help # Only supported with nix
29−$ cabal haddock
30−$ cabal-docspec --timeout 60 --check-properties --property-variables xs
31−```
32−
33−The `bin/test.sh` and `bin/bench.sh` are custom scripts to perform test
34−and benchmarking tasks conveniently. They support running a group of
35−tests or benchmarks, coverage, using correct optimization flags for
36−benchmarking, benchmark comparison reports etc. Use the `--help` option
37−to see how to use these. See [benchmark/README.md](benchmark/README.md)
38−and [test/README.md](test/README.md) for more details.
39−
40−You can also run tests or benchmarks directly for example:
41−
42−```
43−$ cabal test --disable-optimization --flags -opt --test-show-details=streaming --test-option=--color streamly-tests
44−```
45−
46−To view haddock docs open the link printed at the end of the haddock
47−command, in your browser.
48−
49−Nix users: There is a `default.nix` available which can be used to start
50−a nix-shell and then use the above commands as usual. nix-shell started
51−by `default.nix` creates a `.cabal.nix` for cabal configuration and sets
52−`CABAL_DIR` environment variable to point to that. Therefore, `~/.cabal`
53−would not be used.
54−
55−## Contributing A Change
56−
57−If the feature makes significant changes to design, we encourage you to open an
58−issue as early as possible so that you do not have to redo much work because of
59−changes in design decisions. However, if you are confident, you can still go
60−ahead and take that risk as the maintainers are supposed to be reasonable
61−people.
62−
63−### Pull Requests (PR)
64−
65−Please feel free to [send a pull
66−request (PR)](https://github.com/composewell/streamly/pulls) whether it is a
67−single letter typo fix or a complex change. We will accept any PR that makes a
68−net positive change to the package. We encourage you to provide a complete,
69−consistent change with test, documentation and benchmarks. You can contact the
70−[maintainers](https://gitter.im/composewell/streamly) for any help or
71−collaboration needed in that regard. However, if due to lack of time you are
72−not able to complete the PR, you are still welcome to submit it, maintainers
73−will try their best to actively contribute and pick up your change as long as
74−the change is approved.
75−
76−### Pull Request (PR) Checklist
77−
78−Here is a quick checklist for a PR, for details please see the next section:
79−
80−* PR contains one logical changeset
81−* Each commit in the PR consists of a logical change
82−* Commits are rebased/squashed/fixup/reordered as needed
83−* Stylistic changes to irrelevant parts of the code are separated in
84− independent commits.
85−* Code is formatted as per the style of the file or that of other files
86−* Compiler warnings are fixed
87−* Reasonable hlint suggestions are accepted
88−* Tests are added to cover the changed parts
89−* All [tests](test) pass
90−* [Performance benchmarks](benchmark) are added, where applicable
91−* No significant regressions are reported by [performance benchmarks](benchmark/README.md)
92−* Haddock documentation is added to user visible APIs and data types
93−* Tutorial module, [README](README.md), and [guides](docs) are updated if
94− necessary.
95−* [Changelog](Changelog.md) is updated if needed
96−* The code conforms to the license, it is not stolen, credit is given,
97− copyright notices are retained, original license is included if needed.
98−
99−### Structuring Pull Requests
100−
101−__Lean PR:__ Please keep the reviewer in mind when sending pull
102−requests. Use one PR for each logical changeset. A lean and thin
103−PR with one independent logical change is more likely to be reviewed and
104−merged quickly than a big monolithic PR with several unrelated changes.
105−
106−__PR Dependencies:__ If your change depends on an earlier PR you can
107−create a branch from the old PR's branch, and raise a new PR targeting
108−to merge into the old PR branch. Do not push the commits to the same PR
109−just because the commit depends on that PR.
110−
111−__Commits:__ You are encouraged to group a logically related set of
112−changes into a single commit. When the overall changeset is largish you
113−can divide it into multiple smaller commits, with each commit having
114−a logically grouped changeset and the title summarizing the logical
115−grouping. Always keep in mind a logical division helps reviewers
116−understand and review your code quickly, easier history tracking and
117−when required clean reversal changes.
118−
119−__Functional Changes:__ Keep the reviewer in mind when making
120−changes. Please resist the temptation to make style related changes to
121−surrounding code unless you are changing that code anyway . Whenever
122−possible, try to separate unrelated refactoring changes which do not
123−affect functionality in separate commits so that it is easier for the
124−reviewer to verify functional changes.
125−
126−__Style Changes:__ Make sure that your IDE/Editor is not automatically
127−making sweeping style changes to all the files you are editing. That
128−makes separating the signal from the noise very difficult and makes
129−everything harder. If you would like to make style related changes
130−then please send a separate PR with just those changes and no other
131−functionality changes.
132−
133−__Rebasing:__ If your commits reflect how you fixed intermediate
134−problems during testing or made random changes at different times you
135−may have to squash your changes (`git rebase -i`) into a single commit
136−or logically related set of commits.
137−
138−### Resolving Conflicts
139−
140−If during the course of development or before you send the PR you find that
141−your changes are conflicting with the master branch then use `git rebase
142−master` to rebase your changes on top of master. DO NOT MERGE MASTER INTO YOUR
143−BRANCH.
144−
145−### Testing
146−
147−It is a good idea to include tests for the changes where applicable. See
148−the existing tests in the [test](test) directory. Also see the
149−[test/README](test/README) for more details on how to run the tests.
150−
151−### Documentation
152−
153−For user visible APIs, it is a good idea to provide haddock documentation that
154−is easily understood by the end programmer and does not sound highfalutin,
155−and preferably with examples. If your change affects the tutorial or needs to
156−be mentioned in the tutorial then please update the tutorial. Check if the
157−additional [guides](docs) are affected or need to updated.
158−
159−### Performance Benchmarks
160−
161−It is a good idea to run performance benchmarks to see if your change affects
162−any of the existing performance benchmarks. If you introduced something new
163−then you may want to add benchmarks to check if it performs as well as expected
164−by the programmers to deem it usable.
165−
166−See the [README](benchmark/README) file in the `benchmark` directory for more
167−details on how to run the benchmarks.
168−
169−The first level of check is the regression in "allocations", this is
170−the most stable measure of regression. "bytesCopied" is another stable
171−measure, it gives an idea of the amount of long lived data being copied
172−across generations of GC.
173−
174−The next measure to look at is "cpuTime" this may have some variance
175−from run to run because of factors like cpu frequency scaling, load on
176−the system or the number of context switches etc. However, the variance
177−would usually be within 5-10%, anything more than that is likely to be a
178−red flag.
179−
180−Quite often an increase in "cpuTime" would correspond to an increase
181−in "allocations". Increase in "allocations" indicates an inefficiency
182−in computing due to too much GC activity e.g. due to lack of
183−fusion. However, it is also possible for the cpu time to go up without
184−the allocations going up, this indicates an inefficiency in processing
185−in general or more CPU being used for the same task. It could be because
186−of inefficient code generation, branch mis-predictions or lack of cache
187−locality etc.
188−
189−For concurrent benchmarks we can compare "cpuTime" and "time" to check
190−the degree of concurrency and total efficiency.
191−
192−### Changelog
193−
194−Any new changes that affect the user of the library in some way must be
195−documented under `Unreleased` section at the top of the `Changelog`. The
196−changes in the changelog must be organized in the following categories, in that
197−order:
198−
199−* Breaking Changes
200−* Enhancements
201−* Bug Fixes
202−* Deprecations
203−
204−If there are very few changes then you can just prefix a bullet with these
205−annotations. If there are many changes make sections to group them. A section
206−can be absent if there is nothing to add in it.
207−
208−If you make changes that are incompatible with the released versions
209−of the library please indicate that in the `Changelog` as `Breaking Changes`
210−and also write short notes regarding what the programmers need to do to adapt
211−their existing code to the new change.
212−
213−### Licensing
214−
215−If you have copied code from elsewhere you need to conform to the
216−licensing terms of the original code. Usually you would need to add a
217−copyright notice in the source header, and include the license of the
218−original code as per the terms of the license. If the code you are
219−copying does not have an associated license please do not use it.
220−
221−## Developer documentation
222−
223−* Use https://streamly.composewell.com/ for searching in reference docs
224−* Build haddock docs for latest reference docs
225−* See [the dev directory](dev) for design guidelines and dev documents.
226−
227−## Coding Guidelines
228−
229−### Coding Style
230−
231−Please see [the Haskell coding style guide](https://github.com/composewell/haskell-dev/blob/master/coding-style.rst).
232−
233−### Type variable ordering
234−
235−Ordering of variables in `forall` may be important in type applications. In
236−streams, we usually declare them in this order `t m a`.
237−
238−Use the same order in constraints as well
239−
240−Example,
241−
242−```
243−func :: forall m a. (MonadIO m, Storable a) => ...
244−```
245−
246−### StreamD coding style
247−
248−Some conventions that we follow in the StreamD code are illustrated by the
249−following example:
250−
251−```
252−mapM f (Stream step1 state1) = Stream step state
253− where
254−
255− step gst st = do
256− r <- step1 (adaptState gst) st
257− case r of
258− Yield x s -> f x >>= \a -> return $ Yield a s
259− Skip s -> return $ Skip s
260− Stop -> return Stop
261−```
262−
263−* For the input streams use numbering for `step` and `state` e.g.
264− step1/state1. For the output stream use `step` and `state`.
265−* For state argument of `step`, use `st`.
266−* For result of executing a `step` use `r` or `res`
267−* For the yielded element use `x`
268−* For the yielded state use `s`
269−
270−In general, the rule is - the shorter the scope of a variable the shorter its
271−name can be. For example, `s` has the shortest scope in the above code, `st`
272−has a bigger scope and `state` has the biggest scope.
@@ -0,0 +1 @@
1+docs/Developer/Contributing.md
LICENSE−254
@@ -26,172 +26,6 @@ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
2626OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
2727OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2828
29−-------------------------------------------------------------------------------
30−base-4.12.0.0 (http://hackage.haskell.org/package/base-4.12.0.0)
31−-------------------------------------------------------------------------------
32−This library (libraries/base) is derived from code from several
33−sources:
34−
35− * Code from the GHC project which is largely (c) The University of
36− Glasgow, and distributable under a BSD-style license (see below),
37−
38− * Code from the Haskell 98 Report which is (c) Simon Peyton Jones
39− and freely redistributable (but see the full license for
40− restrictions).
41−
42− * Code from the Haskell Foreign Function Interface specification,
43− which is (c) Manuel M. T. Chakravarty and freely redistributable
44− (but see the full license for restrictions).
45−
46−The full text of these licenses is reproduced below. All of the
47−licenses are BSD-style or compatible.
48−
49−The Glasgow Haskell Compiler License
50−
51−Copyright 2004, The University Court of the University of Glasgow.
52−All rights reserved.
53−
54−Redistribution and use in source and binary forms, with or without
55−modification, are permitted provided that the following conditions are met:
56−
57−- Redistributions of source code must retain the above copyright notice,
58−this list of conditions and the following disclaimer.
59−
60−- Redistributions in binary form must reproduce the above copyright notice,
61−this list of conditions and the following disclaimer in the documentation
62−and/or other materials provided with the distribution.
63−
64−- Neither name of the University nor the names of its contributors may be
65−used to endorse or promote products derived from this software without
66−specific prior written permission.
67−
68−THIS SOFTWARE IS PROVIDED BY THE UNIVERSITY COURT OF THE UNIVERSITY OF
69−GLASGOW AND THE CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
70−INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
71−FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
72−UNIVERSITY COURT OF THE UNIVERSITY OF GLASGOW OR THE CONTRIBUTORS BE LIABLE
73−FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
74−DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
75−SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
76−CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
77−LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
78−OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
79−DAMAGE.
80−
81−Code derived from the document "Report on the Programming Language
82−Haskell 98", is distributed under the following license:
83−
84− Copyright (c) 2002 Simon Peyton Jones
85−
86− The authors intend this Report to belong to the entire Haskell
87− community, and so we grant permission to copy and distribute it for
88− any purpose, provided that it is reproduced in its entirety,
89− including this Notice. Modified versions of this Report may also be
90− copied and distributed for any purpose, provided that the modified
91− version is clearly presented as such, and that it does not claim to
92− be a definition of the Haskell 98 Language.
93−
94−Code derived from the document "The Haskell 98 Foreign Function
95−Interface, An Addendum to the Haskell 98 Report" is distributed under
96−the following license:
97−
98− Copyright (c) 2002 Manuel M. T. Chakravarty
99−
100− The authors intend this Report to belong to the entire Haskell
101− community, and so we grant permission to copy and distribute it for
102− any purpose, provided that it is reproduced in its entirety,
103− including this Notice. Modified versions of this Report may also be
104− copied and distributed for any purpose, provided that the modified
105− version is clearly presented as such, and that it does not claim to
106− be a definition of the Haskell 98 Foreign Function Interface.
107−
108−-------------------------------------------------------------------------------
109−bjoern-2008-2009 (http://bjoern.hoehrmann.de/utf-8/decoder/dfa/)
110−-------------------------------------------------------------------------------
111−Copyright (c) 2008-2009 Bjoern Hoehrmann <bjoern@hoehrmann.de>
112−
113−Permission is hereby granted, free of charge, to any person obtaining a copy of
114−this software and associated documentation files (the "Software"), to deal in
115−the Software without restriction, including without limitation the rights to
116−use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
117−of the Software, and to permit persons to whom the Software is furnished to do
118−so, subject to the following conditions:
119−
120−The above copyright notice and this permission notice shall be included in all
121−copies or substantial portions of the Software.
122−
123−THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
124−IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
125−FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
126−AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
127−LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
128−OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
129−SOFTWARE.
130−
131−-------------------------------------------------------------------------------
132−clock-0.7.2 (http://hackage.haskell.org/package/clock-0.7.2)
133−-------------------------------------------------------------------------------
134−Copyright (c) 2009-2012, Cetin Sert
135−Copyright (c) 2010, Eugene Kirpichov
136−
137−All rights reserved.
138−
139−Redistribution and use in source and binary forms, with or without
140−modification, are permitted provided that the following conditions are
141−met:
142−
143− * Redistributions of source code must retain the above copyright
144− notice, this list of conditions and the following disclaimer.
145−
146− * Redistributions in binary form must reproduce the above
147− copyright notice, this list of conditions and the following
148− disclaimer in the documentation and/or other materials provided
149− with the distribution.
150−
151− * The names of contributors may not be used to endorse or promote
152− products derived from this software without specific prior
153− written permission.
154−
155−THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
156−"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
157−LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
158−A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
159−OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
160−SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
161−LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
162−DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
163−THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
164−(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
165−OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
166−
167−-------------------------------------------------------------------------------
168−foldl-1.4.5 (http://hackage.haskell.org/package/foldl-1.4.5)
169−-------------------------------------------------------------------------------
170−Copyright (c) 2013 Gabriel Gonzalez
171−All rights reserved.
172−
173−Redistribution and use in source and binary forms, with or without modification,
174−are permitted provided that the following conditions are met:
175− * Redistributions of source code must retain the above copyright notice,
176− this list of conditions and the following disclaimer.
177− * Redistributions in binary form must reproduce the above copyright notice,
178− this list of conditions and the following disclaimer in the documentation
179− and/or other materials provided with the distribution.
180− * Neither the name of Gabriel Gonzalez nor the names of other contributors
181− may be used to endorse or promote products derived from this software
182− without specific prior written permission.
183−
184−THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
185−ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
186−WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
187−DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
188−ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
189−(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
190−LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
191−ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
192−(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
193−SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
194−
19529-------------------------------------------------------------------------------
19630fsnotify-0.3.0.1 (http://hackage.haskell.org/package/fsnotify-0.3.0.1/)
19731-------------------------------------------------------------------------------
@@ -259,91 +93,3 @@ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
25993THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
26094(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
26195OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
262−
263−-------------------------------------------------------------------------------
264−primitive-0.7.0.0 (https://hackage.haskell.org/package/primitive-0.7.0.0)
265−-------------------------------------------------------------------------------
266−Copyright (c) 2008-2009, Roman Leshchinskiy
267−All rights reserved.
268−
269−Redistribution and use in source and binary forms, with or without
270−modification, are permitted provided that the following conditions are met:
271−
272−- Redistributions of source code must retain the above copyright notice,
273−this list of conditions and the following disclaimer.
274−
275−- Redistributions in binary form must reproduce the above copyright notice,
276−this list of conditions and the following disclaimer in the documentation
277−and/or other materials provided with the distribution.
278−
279−- Neither name of the University nor the names of its contributors may be
280−used to endorse or promote products derived from this software without
281−specific prior written permission.
282−
283−THIS SOFTWARE IS PROVIDED BY THE UNIVERSITY COURT OF THE UNIVERSITY OF
284−GLASGOW AND THE CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
285−INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
286−FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
287−UNIVERSITY COURT OF THE UNIVERSITY OF GLASGOW OR THE CONTRIBUTORS BE LIABLE
288−FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
289−DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
290−SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
291−CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
292−LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
293−OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
294−DAMAGE.
295−
296−-------------------------------------------------------------------------------
297−transient-0.5.5 (http://hackage.haskell.org/package/transient-0.5.5)
298−-------------------------------------------------------------------------------
299−Copyright © 2014-2016 Alberto G. Corona <https://github.com/agocorona>
300−
301−Permission is hereby granted, free of charge, to any person obtaining a copy of
302−this software and associated documentation files (the "Software"), to deal in
303−the Software without restriction, including without limitation the rights to
304−use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
305−the Software, and to permit persons to whom the Software is furnished to do so,
306−subject to the following conditions:
307−
308−The above copyright notice and this permission notice shall be included in all
309−copies or substantial portions of the Software.
310−
311−THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
312−IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
313−FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
314−COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
315−IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
316−CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
317−
318−-------------------------------------------------------------------------------
319−vector-0.12.0.2 (http://hackage.haskell.org/package/vector-0.12.0.2)
320−-------------------------------------------------------------------------------
321−Copyright (c) 2008-2012, Roman Leshchinskiy
322−All rights reserved.
323−
324−Redistribution and use in source and binary forms, with or without
325−modification, are permitted provided that the following conditions are met:
326−
327−- Redistributions of source code must retain the above copyright notice,
328−this list of conditions and the following disclaimer.
329−
330−- Redistributions in binary form must reproduce the above copyright notice,
331−this list of conditions and the following disclaimer in the documentation
332−and/or other materials provided with the distribution.
333−
334−- Neither name of the University nor the names of its contributors may be
335−used to endorse or promote products derived from this software without
336−specific prior written permission.
337−
338−THIS SOFTWARE IS PROVIDED BY THE UNIVERSITY COURT OF THE UNIVERSITY OF
339−GLASGOW AND THE CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
340−INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
341−FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
342−UNIVERSITY COURT OF THE UNIVERSITY OF GLASGOW OR THE CONTRIBUTORS BE LIABLE
343−FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
344−DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
345−SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
346−CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
347−LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
348−OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
349−DAMAGE.
README.mdmode 100644 → 120000+1−651
@@ -1,651 +0,0 @@
1−# [Streamly][]: Idiomatic Haskell with the Performance of C
2−
3−[![Gitter chat](https://badges.gitter.im/composewell/gitter.svg)](https://gitter.im/composewell/streamly)
4−[![Hackage](https://img.shields.io/hackage/v/streamly.svg?style=flat)](https://hackage.haskell.org/package/streamly)
5−
6−Streamly is a Haskell library that provides the building blocks to build
7−safe, scalable, modular and high performance software. Streamly offers:
8−
9−* The type safety of Haskell.
10−* The performance of C programs.
11−* Powerful abstractions for structuring your code.
12−* Idiomatic functional programming.
13−* Declarative concurrency for the seamless use of multiprocessing hardware.
14−
15−## About This Document
16−
17−This guide introduces programming with [Streamly][] using a few practical
18−examples:
19−
20−* We will start with a simple program that [counts the number of words
21− in a text](#modular-word-counting). We will then transform this program
22− into a [concurrent](#concurrent-word-counting) program that can efficiently
23− use multiprocessing hardware.
24−* Next, we will create a [concurrent network
25− server](#a-concurrent-network-server). We then show
26− how to write a network server that [merges multiple
27− streams](#merging-incoming-streams) concurrently.
28−* Our third example shows how to list a directory tree concurrently,
29− by reading [multiple directories in
30− parallel](#listing-directories-recursivelyconcurrently).
31−* Finally, we will look at how to [rate limit](#rate-limiting) stream
32− processing.
33−
34−The guide then looks at how Streamly achieves its
35−[performance](#performance). It [concludes](#notes) with a brief
36−discussion about Streamly's design philosophy, and with suggestions for
37−further reading.
38−
39−## Getting Started
40−
41−### Installing Streamly
42−
43−If you wish to follow along with this guide, you will need to have
44−[Streamly][] installed.
45−
46−Please see the [Getting Started With The Streamly Package](docs/getting-started.md)
47−guide for instructions on how to install [Streamly][].
48−
49−If you wish to run benchmarks, please be sure to build your
50−application using the instructions in the [Build Guide](docs/building.md).
51−
52−### An overview of the types used in these examples
53−
54−As an expository device, we have indicated the types at the intermediate
55−stages of stream computations as comments in the examples below.
56−The meaning of these types are:
57−
58−* A `SerialT IO a` is a serial stream of values of type `a` in the IO Monad.
59−* An `AsyncT IO a` is a concurrent (asynchronous) stream of values of type
60− `a` in the IO Monad.
61−* An `Unfold IO a b` is a representation of a function that converts a seed
62− value of type `a` into a stream of values of type `b` in the IO Monad.
63−* A `Fold IO a b` is a representation of a function that converts a stream of
64− type `a` to a final accumulator of type `b` in the IO Monad.
65−
66−### A Note on Module Naming
67−
68−Some of the examples below use modules from the `Internal` Streamly package
69−hierarchy. These are not really internal to the library. We classify
70−`Streamly` modules into two categories:
71−
72−* _Released modules and APIs_: These modules and APIs are
73− stable. Significant changes to these modules and APIs will cause
74− Streamly's version number to change according to the package versioning
75− policy.
76−* _Pre-release modules and APIs_: These modules and APIs have not been
77− formally released yet. They may change in the near future, and such
78− changes will not necessarily be reflected in Streamly's package
79− version number. As yet unreleased modules and APIs reside in the
80− `Internal` namespace.
81−
82−Please use a minor release upper bound to adhere to the Haskell PVP when
83−using the pre-release (internal) modules.
84−
85−## The Examples
86−
87−### Modular Word Counting
88−
89−A `Fold` in Streamly is a composable stream consumer. For our first
90−example, we will use `Fold`s to count the number of bytes, words and lines
91−present in a file. We will then compose individual `Fold`s together to
92−count words, bytes and lines at the same time.
93−
94−Please see the file [WordCountModular.hs][] for the complete example
95−program, including the imports that we have omitted here.
96−
97−#### Count Bytes (wc -c)
98−
99−We start with a code fragment that counts the number of bytes in a file:
100−
101−```haskell
102−import qualified Streamly.Data.Fold as Fold
103−import qualified Streamly.Internal.FileSystem.File as File
104−import qualified Streamly.Prelude as Stream
105−
106−wcb :: String -> IO Int
107−wcb file =
108− File.toBytes file -- SerialT IO Word8
109− & Stream.fold Fold.length -- IO Int
110−```
111−
112−### Count Lines (wc -l)
113−
114−The next code fragment shows how to count the number of lines in a file:
115−
116−```haskell
117−-- ASCII character 10 is a newline.
118−countl :: Int -> Word8 -> Int
119−countl n ch = if ch == 10 then n + 1 else n
120−
121−-- The fold accepts a stream of `Word8` and returns a line count (`Int`).
122−nlines :: Monad m => Fold m Word8 Int
123−nlines = Fold.foldl' countl 0
124−
125−wcl :: String -> IO Int
126−wcl file =
127− File.toBytes file -- SerialT IO Word8
128− & Stream.fold nlines -- IO Int
129−```
130−
131−### Count Words (wc -w)
132−
133−Our final code fragment counts the number of whitespace-separated words
134−in a stream:
135−
136−```haskell
137−countw :: (Int, Bool) -> Word8 -> (Int, Bool)
138−countw (n, wasSpace) ch =
139− if isSpace $ chr $ fromIntegral ch
140− then (n, True)
141− else (if wasSpace then n + 1 else n, False)
142−
143−-- The fold accepts a stream of `Word8` and returns a word count (`Int`).
144−nwords :: Monad m => Fold m Word8 Int
145−nwords = fst <$> Fold.foldl' countw (0, True)
146−
147−wcw :: String -> IO Int
148−wcw file =
149− File.toBytes file -- SerialT IO Word8
150− & Stream.fold nwords -- IO Int
151−```
152−
153−### Counting Bytes, Words and Lines Together
154−
155−By using the `Tee` combinator we can compose the three folds that count
156−bytes, lines and words individually into a single fold that counts all
157−three at once. The applicative instance of `Tee` distributes its input
158−to all the supplied folds (`Fold.length`, `nlines`, and `nwords`) and
159−then combines the outputs from the folds using the supplied combiner
160−function (`(,,)`).
161−
162−```haskell
163−import qualified Streamly.Internal.Data.Fold.Tee as Tee
164−
165−-- The fold accepts a stream of `Word8` and returns the three counts.
166−countAll :: Fold IO Word8 (Int, Int, Int)
167−countAll = Tee.toFold $ (,,) <$> Tee Fold.length <*> Tee nlines <*> Tee nwords
168−
169−wc :: String -> IO (Int, Int, Int)
170−wc file =
171− File.toBytes file -- SerialT IO Word8
172− & Stream.fold countAll -- IO (Int, Int, Int)
173−```
174−
175−This example demonstrates the excellent modularity offered by
176−[Streamly][]'s simple and concise API. Experienced Haskellers will
177−notice that we have not used bytestrings&mdash;we instead used a stream of
178−`Word8` values, simplifying our program.
179−
180−### The Performance of Word Counting
181−
182−We compare two equivalent implementations: one using [Streamly][],
183−and the other using C.
184−
185−The performance of the [Streamly word counting
186−implementation][WordCount.hs] is:
187−
188−```
189−$ time WordCount-hs gutenberg-500MB.txt
190−11242220 97050938 574714449 gutenberg-500MB.txt
191−
192−real 0m1.825s
193−user 0m1.697s
194−sys 0m0.128s
195−```
196−
197−The performance of an equivalent [wc implementation in C][WordCount.c] is:
198−
199−```
200−$ time WordCount-c gutenberg-500MB.txt
201−11242220 97050938 574714449 gutenberg-500MB.txt
202−
203−real 0m2.100s
204−user 0m1.935s
205−sys 0m0.165s
206−```
207−
208−### Concurrent Word Counting
209−
210−In our next example we show how the task of counting words, lines,
211−and bytes could be done in parallel on multiprocessor hardware.
212−
213−To count words in parallel we first divide the stream into chunks
214−(arrays), do the counting within each chunk, and then add all the
215−counts across chunks. We use the same code as above except that we use
216−arrays for our input data.
217−
218−Please see the file [WordCountParallel.hs][] for the complete working
219−code for this example, including the imports that we have omitted below.
220−
221−The `countArray` function counts the line, word, char counts in one chunk:
222−
223−```haskell
224−import qualified Streamly.Data.Array.Foreign as Array
225−
226−countArray :: Array Word8 -> IO Counts
227−countArray arr =
228− Stream.unfold Array.read arr -- SerialT IO Word8
229− & Stream.decodeLatin1 -- SerialT IO Char
230− & Stream.foldl' count (Counts 0 0 0 True) -- IO Counts
231−```
232−
233−Here the function `count` and the `Counts` data type are defined in the
234−`WordCount` helper module defined in [WordCount.hs][].
235−
236−When combining the counts in two contiguous chunks, we need to check
237−whether the first element of the next chunk is a whitespace character
238−in order to determine if the same word continues in the next chunk or
239−whether the chunk starts with a new word. The `partialCounts` function
240−adds a `Bool` flag to `Counts` returned by `countArray` to indicate
241−whether the first character in the chunk is a space.
242−
243−```haskell
244−partialCounts :: Array Word8 -> IO (Bool, Counts)
245−partialCounts arr = do
246− let r = Array.getIndex arr 0
247− case r of
248− Just x -> do
249− counts <- countArray arr
250− return (isSpace (chr (fromIntegral x)), counts)
251− Nothing -> return (False, Counts 0 0 0 True)
252−```
253−
254−`addCounts` then adds the counts from two consecutive chunks:
255−
256−```haskell
257−addCounts :: (Bool, Counts) -> (Bool, Counts) -> (Bool, Counts)
258−addCounts (sp1, Counts l1 w1 c1 ws1) (sp2, Counts l2 w2 c2 ws2) =
259− let wcount =
260− if not ws1 && not sp2 -- No space between two chunks.
261− then w1 + w2 - 1
262− else w1 + w2
263− in (sp1, Counts (l1 + l2) wcount (c1 + c2) ws2)
264−```
265−
266−To count in parallel we now only need to divide the stream into arrays,
267−apply our counting function to each array, and then combine the counts
268−from each chunk.
269−
270−```haskell
271−wc :: String -> IO (Bool, Counts)
272−wc file = do
273− Stream.unfold File.readChunks file -- AheadT IO (Array Word8)
274− & Stream.mapM partialCounts -- AheadT IO (Bool, Counts)
275− & Stream.maxThreads numCapabilities -- AheadT IO (Bool, Counts)
276− & Stream.fromAhead -- SerialT IO (Bool, Counts)
277− & Stream.foldl' addCounts (False, Counts 0 0 0 True) -- IO (Bool, Counts)
278−```
279−
280−Please note that the only difference between a concurrent and a
281−non-concurrent program lies in the use of the `Stream.fromAhead`
282−combinator. If we remove the call to `Stream.fromAhead`, we would
283−still have a perfectly valid and performant serial program. Notice
284−how succinctly and idiomatically we have expressed the concurrent word
285−counting problem.
286−
287−A benchmark with 2 CPUs:
288−
289−```
290−$ time WordCount-hs-parallel gutenberg-500MB.txt
291−11242220 97050938 574714449 gutenberg-500MB.txt
292−
293−real 0m1.284s
294−user 0m1.952s
295−sys 0m0.140s
296−```
297−
298−These example programs have assumed ASCII encoded input data. For UTF-8
299−streams, we have a [concurrent wc implementation][WordCountUTF8.hs]
300−with UTF-8 decoding. This concurrent implementation performs as well
301−as the standard `wc` program in serial benchmarks. In concurrent mode
302−[Streamly][]'s implementation can utilise multiple processing cores if
303−these are present, and can thereby run much faster than the standard
304−binary.
305−
306−Streamly provides concurrency facilities similar
307−to [OpenMP](https://en.wikipedia.org/wiki/OpenMP) and
308−[Cilk](https://en.wikipedia.org/wiki/Cilk) but with a more declarative
309−style of expression. With Streamly you can write concurrent programs
310−with ease, with support for different types of concurrent scheduling.
311−
312−### A Concurrent Network Server
313−
314−We now move to a slightly more complicated example: we simulate a
315−dictionary lookup server which can serve word meanings to multiple
316−clients concurrently. This example demonstrates the use of the concurrent
317−`mapM` combinator.
318−
319−Please see the file [WordServer.hs][] for the complete code for this
320−example, including the imports that we have omitted below.
321−
322−```haskell
323−import qualified Streamly.Data.Fold as Fold
324−import qualified Streamly.Network.Inet.TCP as TCP
325−import qualified Streamly.Network.Socket as Socket
326−import qualified Streamly.Unicode.Stream as Unicode
327−
328−-- Simulate network/db query by adding a delay.
329−fetch :: String -> IO (String, String)
330−fetch w = threadDelay 1000000 >> return (w,w)
331−
332−-- Read lines of whitespace separated list of words from a socket, fetch the
333−-- meanings of each word concurrently and return the meanings separated by
334−-- newlines, in same order as the words were received. Repeat until the
335−-- connection is closed.
336−lookupWords :: Socket -> IO ()
337−lookupWords sk =
338− Stream.unfold Socket.read sk -- SerialT IO Word8
339− & Unicode.decodeLatin1 -- SerialT IO Char
340− & Stream.wordsBy isSpace Fold.toList -- SerialT IO String
341− & Stream.fromSerial -- AheadT IO String
342− & Stream.mapM fetch -- AheadT IO (String, String)
343− & Stream.fromAhead -- SerialT IO (String, String)
344− & Stream.map show -- SerialT IO String
345− & Stream.intersperse "\n" -- SerialT IO String
346− & Unicode.encodeStrings Unicode.encodeLatin1 -- SerialT IO (Array Word8)
347− & Stream.fold (Socket.writeChunks sk) -- IO ()
348−
349−serve :: Socket -> IO ()
350−serve sk = finally (lookupWords sk) (close sk)
351−
352−-- | Run a server on port 8091. Accept and handle connections concurrently. The
353−-- connection handler is "serve" (i.e. lookupWords). You can use "telnet" or
354−-- "nc" as a client to try it out.
355−main :: IO ()
356−main =
357− Stream.unfold TCP.acceptOnPort 8091 -- SerialT IO Socket
358− & Stream.fromSerial -- AsyncT IO ()
359− & Stream.mapM serve -- AsyncT IO ()
360− & Stream.fromAsync -- SerialT IO ()
361− & Stream.drain -- IO ()
362−```
363−
364−### Merging Incoming Streams
365−
366−In the next example, we show how to merge logs coming from multiple
367−nodes in your network. These logs are merged at line boundaries and
368−the merged logs are written to a file or to a network destination.
369−This example uses the `concatMapWith` combinator to merge multiple
370−streams concurrently.
371−
372−Please see the file [MergeServer.hs][] for the complete working code,
373−including the imports that we have omitted below.
374−
375−```haskell
376−import qualified Streamly.Data.Unfold as Unfold
377−import qualified Streamly.Network.Socket as Socket
378−
379−-- | Read a line stream from a socket.
380−-- Note: lines are buffered, and we could add a limit to the
381−-- buffering for safety.
382−readLines :: Socket -> SerialT IO (Array Char)
383−readLines sk =
384− Stream.unfold Socket.read sk -- SerialT IO Word8
385− & Unicode.decodeLatin1 -- SerialT IO Char
386− & Stream.splitWithSuffix (== '\n') Array.write -- SerialT IO String
387−
388−recv :: Socket -> SerialT IO (Array Char)
389−recv sk = Stream.finally (liftIO $ close sk) (readLines sk)
390−
391−-- | Starts a server at port 8091 listening for lines with space separated
392−-- words. Multiple clients can connect to the server and send streams of lines.
393−-- The server handles all the connections concurrently, merges the incoming
394−-- streams at line boundaries and writes the merged stream to a file.
395−server :: Handle -> IO ()
396−server file =
397− Stream.unfold TCP.acceptOnPort 8090 -- SerialT IO Socket
398− & Stream.concatMapWith Stream.parallel recv -- SerialT IO (Array Char)
399− & Stream.unfoldMany Array.read -- SerialT IO Char
400− & Unicode.encodeLatin1 -- SerialT IO Word8
401− & Stream.fold (Handle.write file) -- IO ()
402−
403−main :: IO ()
404−main = withFile "output.txt" AppendMode server
405−```
406−
407−### Listing Directories Recursively/Concurrently
408−
409−Our next example lists a directory tree recursively, reading
410−multiple directories concurrently.
411−
412−This example uses the tree traversing combinator `iterateMapLeftsWith`.
413−This combinator maps a stream generator on the `Left` values in its
414−input stream (directory names in this case), feeding the resulting `Left`
415−values back to the input, while it lets the `Right` values (file names
416−in this case) pass through to the output. The `Stream.ahead` stream
417−joining combinator then makes it iterate on the directories concurrently.
418−
419−Please see the file [ListDir.hs][] for the complete working code,
420−including the imports that we have omitted below.
421−
422−```haskell
423−import Streamly.Internal.Data.Stream.IsStream (iterateMapLeftsWith)
424−
425−import qualified Streamly.Prelude as Stream
426−import qualified Streamly.Internal.FileSystem.Dir as Dir (toEither)
427−
428−-- Lists a directory as a stream of (Either Dir File).
429−listDir :: String -> SerialT IO (Either String String)
430−listDir dir =
431− Dir.toEither dir -- SerialT IO (Either String String)
432− & Stream.map (bimap mkAbs mkAbs) -- SerialT IO (Either String String)
433−
434− where mkAbs x = dir ++ "/" ++ x
435−
436−-- | List the current directory recursively using concurrent processing.
437−main :: IO ()
438−main = do
439− hSetBuffering stdout LineBuffering
440− let start = Stream.fromPure (Left ".")
441− Stream.iterateMapLeftsWith Stream.ahead listDir start
442− & Stream.mapM_ print
443−```
444−
445−### Rate Limiting
446−
447−For bounded concurrent streams, a stream yield rate can be specified
448−easily. For example, to print "tick" once every second you can simply
449−write:
450−
451−```haskell
452−main :: IO ()
453−main =
454− Stream.repeatM (pure "tick") -- AsyncT IO String
455− & Stream.timestamped -- AsyncT IO (AbsTime, String)
456− & Stream.avgRate 1 -- AsyncT IO (AbsTime, String)
457− & Stream.fromAsync -- SerialT IO (AbsTime, String)
458− & Stream.mapM_ print -- IO ()
459−```
460−
461−Please see the file [Rate.hs][] for the complete working code.
462−
463−The concurrency of the stream is automatically controlled to match the
464−specified rate. [Streamly][]'s rate control works precisely even at
465−throughputs as high as millions of yields per second.
466−
467−For more sophisticated rate control needs please see the Streamly [reference
468−documentation][Streamly].
469−
470−### Reactive Programming
471−
472−Streamly supports reactive (time domain) programming because of its
473−support for declarative concurrency. Please see the `Streamly.Prelude`
474−module for time-specific combinators like `intervalsOf`, and
475−folds like `takeInterval` in `Streamly.Internal.Data.Fold`.
476−Please also see the pre-release sampling combinators in the
477−`Streamly.Internal.Data.Stream.IsStream.Top` module for `throttle` and
478−`debounce` like operations.
479−
480−The examples [AcidRain.hs][] and [CirclingSquare.hs][] demonstrate
481−reactive programming using [Streamly][].
482−
483−### More Examples
484−
485−If you would like to view more examples, please visit the [Streamly
486−Examples][streamly-examples] web page.
487−
488−### Further Reading
489−
490−* [Streaming Benchmarks][streaming-benchmarks]
491−* [Concurrency Benchmarks][concurrency-benchmarks]
492−* Functional Conf 2019 [Video](https://www.youtube.com/watch?v=uzsqgdMMgtk) | [Slides](https://www.slideshare.net/HarendraKumar10/streamly-concurrent-data-flow-programming)
493−* [Other Guides](docs/)
494−* [Streamly Homepage][Streamly]
495−
496−## Performance
497−
498−As you have seen in the word count example above, [Streamly][] offers
499−highly modular abstractions for building programs while also offering
500−the performance close to an equivalent (imperative) C program.
501−
502−Streamly offers excellent performance even for byte-at-a-time stream
503−operations using efficient abstractions like `Unfold`s and terminating
504−`Fold`s. Byte-at-a-time stream operations can simplify programming
505−because the developer does not have to deal explicitly with chunking
506−and re-combining data.
507−
508−Streamly exploits GHC's stream fusion optimizations (`case-of-case` and
509−`spec-constr`) aggressively to achieve C-like speed, while also offering
510−highly modular abstractions to developers.
511−
512−[Streamly][] will usually perform very well without any
513−compiler plugins. However, we have fixed some deficiencies
514−that we had noticed in GHC's optimizer using a [compiler
515−plugin](https://github.com/composewell/fusion-plugin). We hope to fold
516−these optimizations into GHC in the future; until then we recommend that
517−you use this plugin for applications that are performance sensitive.
518−
519−### Benchmarks
520−
521−We measured several Haskell streaming implementations
522−using various micro-benchmarks. Please see the [streaming
523−benchmarks][streaming-benchmarks] page for a detailed comparison of
524−Streamly against other streaming libraries.
525−
526−Our results show that [Streamly][] is the fastest effectful streaming
527−implementation on almost all the measured microbenchmarks. In many cases
528−it runs up to 100x faster, and in some cases even 1000x faster than
529−some of the tested alternatives. In some composite operation benchmarks
530−[Streamly][] turns out to be significantly faster than Haskell's list
531−implementation.
532−
533−*Note*: If you can write a program in some other way or with some other
534−language that runs significantly faster than what [Streamly][] offers,
535−please let us know and we will improve.
536−
537−## Notes
538−
539−Streamly comes equipped with a very powerful set of abstractions to
540−accomplish many kinds of programming tasks: it provides support for
541−programming with streams and arrays, for reading and writing from the
542−file system and from the network, for time domain programming (reactive
543−programming), and for reacting to file system events using `fsnotify`.
544−
545−Please view [Streamly's documentation][Streamly] for more information
546−about Streamly's features.
547−
548−### Concurrency
549−
550−Streamly uses lock-free synchronization for achieving concurrent
551−operation with low overheads. The number of tasks performed concurrently
552−are determined automatically based on the rate at which a consumer
553−is consuming the results. In other words, you do not need to manage
554−thread pools or decide how many threads to use for a particular task.
555−For CPU-bound tasks Streamly will try to keep the number of threads
556−close to the number of CPUs available; for IO-bound tasks it will utilize
557−more threads.
558−
559−The parallelism available during program execution can be utilized with
560−very little overhead even where the task size is very
561−small, because Streamly will automatically switch between
562−serial or batched execution of tasks on the same CPU depending
563−on whichever is more efficient. Please see our [concurrency
564−benchmarks][concurrency-benchmarks] for more detailed performance
565−measurements, and for a comparison with the `async` package.
566−
567−### Design Goals
568−
569−Our goals for [Streamly][] from the very beginning have been:
570−
571−1. To achieve simplicity by unifying abstractions.
572−2. To offer high performance.
573−
574−These goals are hard to achieve simultaneously because they are usually
575−inversely related. We have spent many years trying to get the abstractions
576−right without compromising performance.
577−
578−`Unfold` is an example of an abstraction that we have created to achieve
579−high performance when mapping streams on streams. `Unfold` allows stream
580−generation to be optimized well by the compiler through stream fusion.
581−A `Fold` with termination capability is another example which modularizes
582−stream elimination operations through stream fusion. Terminating folds
583−can perform many simple parsing tasks that do not require backtracking.
584−In Streamly, `Parser`s are a natural extension to terminating `Fold`s;
585−`Parser`s add the ability to backtrack to `Fold`s. Unification leads
586−to simpler abstractions and lower cognitive overheads while also not
587−compromising performance.
588−
589−## Credits
590−
591−The following authors/libraries have influenced or inspired this library in a
592−significant way:
593−
594− * Roman Leshchinskiy ([vector](http://hackage.haskell.org/package/vector))
595− * Gabriel Gonzalez ([foldl](https://hackage.haskell.org/package/foldl))
596− * Alberto G. Corona ([transient](https://hackage.haskell.org/package/transient))
597−
598−Please see the [`credits`](./credits/README.md) directory for a full
599−list of contributors, credits and licenses.
600−
601−## Licensing
602−
603−Streamly is an [open source](https://github.com/composewell/streamly)
604−project available under a liberal [BSD-3-Clause license][LICENSE]
605−
606−## Contributing to Streamly
607−
608−As an open project we welcome contributions:
609−
610−* [Streamly Contributor's Guide][CONTRIBUTING.md]
611−* [Contact the streamly development team](mailto:streamly@composewell.com)
612−
613−## Getting Support
614−
615−Professional support is available for [Streamly][]: please contact
616−[support@composewell.com](mailto:support@composewell.com).
617−
618−You can also join our [community chat
619−channel](https://gitter.im/composewell/streamly) on Gitter.
620−
621−<!--
622−Link References.
623−-->
624−
625−[Streamly]: https://streamly.composewell.com/
626−[streamly-examples]: https://github.com/composewell/streamly-examples
627−[streaming-benchmarks]: https://github.com/composewell/streaming-benchmarks
628−[concurrency-benchmarks]: https://github.com/composewell/concurrency-benchmarks
629−
630−<!--
631−Keep all the unstable links here so that they can be updated to stable
632−links (for online docs) before we release.
633−-->
634−
635−<!-- examples -->
636−[WordCountModular.hs]: https://github.com/composewell/streamly-examples/blob/master/examples/WordCountModular.hs
637−[WordCount.hs]: https://github.com/composewell/streamly-examples/blob/master/examples/WordCount.hs
638−[WordCount.c]: https://github.com/composewell/streamly-examples/blob/master/examples/WordCount.c
639−[WordCountParallel.hs]: https://github.com/composewell/streamly-examples/blob/master/examples/WordCountParallel.hs
640−[WordCountUTF8.hs]: https://github.com/composewell/streamly-examples/blob/master/examples/WordCountUTF8.hs
641−[WordServer.hs]: https://github.com/composewell/streamly-examples/blob/master/examples/WordServer.hs
642−[MergeServer.hs]: https://github.com/composewell/streamly-examples/blob/master/examples/MergeServer.hs
643−[ListDir.hs]: https://github.com/composewell/streamly-examples/blob/master/examples/ListDir.hs
644−[Rate.hs]: https://github.com/composewell/streamly-examples/blob/master/examples/Rate.hs
645−[AcidRain.hs]: https://github.com/composewell/streamly-examples/tree/master/examples/AcidRain.hs
646−[CirclingSquare.hs]: https://github.com/composewell/streamly-examples/tree/master/examples/CirclingSquare.hs
647−
648−<!-- local files -->
649−[LICENSE]: LICENSE
650−[CONTRIBUTING.md]: CONTRIBUTING.md
651−[docs]: docs/
@@ -0,0 +1 @@
1+docs/User/Project/README.md
appveyor.yml+4−2
@@ -14,6 +14,8 @@ environment:
1414 # ------------------------------------------------------------------------
1515 # Common options
1616 # ------------------------------------------------------------------------
17+ # GHC 9.2.7 onwards redundant constraint warnings are incompatible with
18+ # older versions
1719 GHC_OPTIONS: "-Werror"
1820 CABAL_REINIT_CONFIG: "y"
1921 LC_ALL: "C.UTF-8"
@@ -34,9 +36,9 @@ environment:
3436 # Note requiring a specific version of stack using STACKVER may fail due to
3537 # github API limit while checking and upgrading/downgrading to the specific
3638 # version.
37− #STACKVER: "1.6.5"
39+ # STACKVER: "1.6.5"
3840 STACK_UPGRADE: "y"
39− RESOLVER: "lts-18.0"
41+ # RESOLVER: "lts-18.27"
4042 STACK_ROOT: "c:\\sr"
4143 STACK_BUILD_OPTIONS: "--flag streamly-benchmarks:-opt"
4244 STACK_YAML: "stack.yaml"
benchmark/NanoBenchmarks.hs+27−22
@@ -1,3 +1,5 @@
1+{-# OPTIONS_GHC -Wno-deprecations #-}
2+
13-------------------------------------------------------------------------------
24-- Investigate specific benchmarks more closely in isolation, possibly looking
35-- at GHC generated code for optimizing specific problematic cases.
@@ -6,30 +8,27 @@
68{-# LANGUAGE FlexibleContexts #-}
79{-# LANGUAGE ScopedTypeVariables #-}
810
9−import Streamly.Prelude (SerialT)
10−import Streamly.Internal.Data.SVar (MonadAsync)
11+import Data.Char (ord)
12+import Streamly.Internal.Data.Stream (Stream)
13+import System.IO (hSeek, SeekMode(..), openFile, IOMode(..))
1114
12−import qualified Streamly.Data.Array.Foreign as A
13−import qualified Streamly.FileSystem.Handle as FH
15+import qualified Streamly.Data.Array as A
1416import qualified Streamly.Internal.FileSystem.Handle as IFH
1517import qualified Streamly.Data.Fold as FL
18+import qualified Streamly.Internal.Data.Stream as S
1619import qualified Streamly.Internal.Data.Stream.IsStream as Internal
17−import qualified Streamly.Prelude as S
18−import qualified Streamly.Internal.Data.Stream.StreamK as K
1920
20−import Data.Char (ord)
21−import Gauge
22−import System.IO (hSeek, SeekMode(..), openFile, IOMode(..))
21+import Test.Tasty.Bench
2322import System.Random
2423
2524maxValue :: Int
2625maxValue = 100000
2726
28−-- type Stream = K.Stream
29−type Stream = SerialT
27+drain :: Monad m => S.Stream m a -> m ()
28+drain = S.fold FL.drain
3029
3130{-# INLINE sourceUnfoldrM #-}
32−sourceUnfoldrM :: MonadAsync m => Stream m Int
31+sourceUnfoldrM :: Monad m => Stream m Int
3332sourceUnfoldrM = S.unfoldrM step 0
3433 where
3534 step cnt =
@@ -38,7 +37,7 @@ sourceUnfoldrM = S.unfoldrM step 0
3837 else return (Just (cnt, cnt + 1))
3938
4039{-# INLINE sourceUnfoldrMN #-}
41−sourceUnfoldrMN :: MonadAsync m => Int -> Stream m Int
40+sourceUnfoldrMN :: Monad m => Int -> Stream m Int
4241sourceUnfoldrMN n = S.unfoldrM step n
4342 where
4443 step cnt =
@@ -67,7 +66,7 @@ takeAllDropOne = S.drop 1 . S.take maxValue
6766
6867{-# INLINE takeDrop #-}
6968takeDrop :: Monad m => Stream m Int -> m ()
70−takeDrop = S.drain .
69+takeDrop = drain .
7170 takeAllDropOne . takeAllDropOne . takeAllDropOne . takeAllDropOne
7271
7372-------------------------------------------------------------------------------
@@ -82,7 +81,7 @@ dropWhileFalse = S.dropWhile (> maxValue)
8281
8382{-# INLINE dropWhileFalseX4 #-}
8483dropWhileFalseX4 :: Monad m => Stream m Int -> m ()
85−dropWhileFalseX4 = S.drain
84+dropWhileFalseX4 = drain
8685 . dropWhileFalse . dropWhileFalse . dropWhileFalse . dropWhileFalse
8786
8887-------------------------------------------------------------------------------
@@ -91,7 +90,7 @@ dropWhileFalseX4 = S.drain
9190
9291{-# INLINE iterateSource #-}
9392iterateSource
94− :: MonadAsync m
93+ :: Monad m
9594 => (Stream m Int -> Stream m Int) -> Int -> Int -> Stream m Int
9695iterateSource g i n = f i (sourceUnfoldrMN n)
9796 where
@@ -103,20 +102,26 @@ iterateSource g i n = f i (sourceUnfoldrMN n)
103102main :: IO ()
104103main = do
105104 defaultMain [bench "unfoldr" $ nfIO $
106− randomRIO (1,1) >>= \n -> S.drain (sourceUnfoldr n)]
105+ randomRIO (1,1) >>= \n -> drain (sourceUnfoldr n)]
107106 defaultMain [bench "take-drop" $ nfIO $ takeDrop sourceUnfoldrM]
108107 defaultMain [bench "dropWhileFalseX4" $
109108 nfIO $ dropWhileFalseX4 sourceUnfoldrM]
110109 defaultMain [bench "iterate-mapM" $
111− nfIO $ S.drain $ iterateSource (S.mapM return) 100000 10]
110+ nfIO $ drain $ iterateSource (S.mapM return) 100000 10]
112111
113112 inText <- openFile "benchmark/text-processing/gutenberg-500.txt" ReadMode
114113 defaultMain [mkBenchText "splitOn abc...xyz" inText $ do
115− (S.length $ Internal.splitOnSeq (A.fromList $ map (fromIntegral . ord)
116− "abcdefghijklmnopqrstuvwxyz") FL.drain
117− $ IFH.toBytes inText) >>= print
114+ S.fold FL.length
115+ (Internal.splitOnSeq
116+ (A.fromList
117+ $ map (fromIntegral . ord) "abcdefghijklmnopqrstuvwxyz"
118+ )
119+ FL.drain
120+ $ IFH.read inText
121+ )
122+ >>= print
118123 ]
119124 where
120125
121126 mkBenchText name h action =
122− bench name $ perRunEnv (hSeek h AbsoluteSeek 0) (\_ -> action)
127+ env (hSeek h AbsoluteSeek 0) (\_ -> bench name $ nfIO action)
benchmark/README.mdmode 100644 → 120000+1−313
@@ -1,313 +0,0 @@
1−# Benchmarking
2−
3−## Benchmark Drivers
4−
5−Two benchmark drivers are supported:
6−
7−* `tasty-bench` (default)
8−* `gauge` (enabled by `--use-gauge` build flag)
9−
10−## Build and run benchmarks directly
11−
12−The benchmark executables are `tasty-bench` executables unless you have
13−passed `--use-gauge` cabal flag when building in which case it is a
14−`gauge` executable.
15−
16−```
17−$ cabal run bench:Prelude.Serial # run selected
18−$ cabal run bench:Prelude.Serial -- --help # help on arguments
19−$ cabal run bench:Prelude.Serial -- --stdev 100000 # specify arguments
20−$ cabal run bench:Prelude.Serial --flag fusion-plugin # with fusion-plugin
21−
22−$ cabal build bench:Prelude.Serial # build selected
23−$ cabal build --enable-benchmarks streamly-benchmarks # build all
24−$ cabal build --enable-benchmarks all # build all, alternate method
25−
26−$ cabal build --flag "-opt" ... # disable optimization, faster build
27−```
28−
29−## Building and Running Benchmarks with bench.sh
30−
31−`<streamly repo>/bin/bench.sh` script is the top level driver for
32−running benchmarks. It runs the requested benchmarks and then creates a
33−report from the results using the `bench-show` package.
34−
35−IMPORTANT NOTE: The first time you run this script it may take a long
36−time because it has to build the `bench-report` executable which has a
37−lot of dependencies. If you are using nix then use `--use-nix` flag
38−for the first time so that the `bench-report` executable is built using
39−nix. That can save a lot of time compiling it. However, once it is built
40−it will be cached in the `bin` directory of the repo and used from
41−there every time. You can also build it manually from the cabal file in
42−`benchmark/bench-report` and install it in the `bin` directory.
43−
44−## bench.sh: Quick start
45−
46−Useful commands:
47−
48−```
49−$ bin/bench.sh --help
50−$ bin/bench.sh --quick # run all the benchmark suites
51−$ bin/bench.sh --benchmarks help # Show available benchmark suites
52−$ bin/bench.sh --benchmarks serial_grp # Run all serial benchmark suites
53−$ bin/bench.sh --benchmarks "Prelude.Serial Data.Parser" # run selected suites
54−$ bin/bench.sh --no-measure # don't run benchmarks just show previous results
55−
56−# Run all O(1) space complexity benchmarks in `Prelude.Serial` suite
57−$ bin/bench.sh --benchmarks Prelude.Serial --prefix Prelude.Serial/o-1-space
58−
59−# Run a specific benchmark in `Prelude.Serial` suite
60−$ bin/bench.sh --benchmarks Prelude.Serial --prefix Prelude.Serial/o-1-space.generation.unfoldr
61−```
62−
63−Note: `bench.sh` enables fusion-plugin by default.
64−
65−## Comparing results with baseline
66−
67−```
68−# Checkout baseline commit
69−$ bin/bench.sh --quick
70−
71−# Checkout commit with new changes
72−$ bin/bench.sh --quick --append
73−
74−# To add another result to comparisons just repeat the above command on
75−# desired commit
76−```
77−
78−## Comparing benchmark suites
79−
80−First see the available benchmark suites:
81−
82−```
83−$ bin/bench.sh --benchmarks help
84−```
85−
86−You will see some benchmark suites end with `_cmp`, these are comparison
87−groups. If you run a comparison group benchmark, comparison of all the
88−benchmark suites in that group will be shown in the end. For example to compare
89−all array benchmark suites:
90−
91−```
92−$ bin/bench.sh --benchmarks array_cmp
93−```
94−
95−## Reporting without measuring
96−
97−You can use the `--no-measure` option to report the already measured results in
98−the benchmarks results file. A results file may collect an arbitrary number of
99−results by running with `--append` multiple times. Each benchmark has its own
100−results file, for example the `Prelude.Serial` benchmark has the results file at
101−`charts/Prelude.Serial/results.csv`.
102−
103−You can also manually edit the file to remove a set of results if you like or
104−to append results from previously saved results or from some other results
105−file. After editing you can run `bench.sh` with the `--no-measure` option to
106−see the reports corresponding to the results.
107−
108−## Additional benchmark configuration
109−
110−### Stream size
111−
112−You can specify the stream size (default is 100000) to be used for
113−benchmarking:
114−
115−```
116−$ cabal run bench:Prelude.Serial -- --stream-size 1000000
117−```
118−
119−### External input file
120−
121−In the `FileSystem.Handle` benchmark you can specify the input file as an
122−environment variable:
123−
124−```
125−$ export Benchmark_FileSystem_Handle_InputFile=./gutenberg-500.txt
126−$ cabal run FileSystem.Handle -- FileSystem.Handle/o-1-space/reduce/read/S.splitOnSeq
127−```
128−
129−The automatic tests do not test unicode input, this option is useful to specify
130−a unicode text file manually.
131−
132−## Benchmarking notes
133−
134−We run each benchmark in an isolated process to minimize interference
135−of benchmarks and to be able to control the RTS memory restrictions per
136−benchmark.
137−
138−### Gotchas
139−
140−Gauge forces a GC before and after the measurement. However, we have observed
141−that sometimes the GC stats may not be accurate when the number of iterations
142−in the measurement is small (e.g. 1 iteration). In such cases usually the
143−number of GCs and GC times would also be 0.
144−
145−## Diagnosing Performance Issues
146−
147−### Reproducible comparison
148−
149−When comparing different compilers we need to make sure that we are
150−using exactly the same versions of the libraries for apples to apples
151−comparison. We have seen cases where a change in the "random" library
152−caused allocations regressions in the new version of compiler because of
153−the way in which the benchmark code was generated due to the change.
154−
155−When it is required to reproduce benchmark results precisely across
156−different systems, it is recommended that you create and use a cabal
157−freeze file so that the versions of all libraries are pinned.
158−
159−### Identifying issues
160−
161−There are two ways to find problematic code:
162−
163−1. Run performance benchmarks using `bench.sh`, select the benchmarks
164− that are taking more than expected time.
165−2. When making a new change, compare with the baseline and select benchmarks
166− with the most regression reported by `bench.sh`.
167−
168−Number of allocations are the most stable measure that do not vary from
169−run to run. `cpuTime` and `bytesCopied` may vary. When comparing two
170−runs for regression the first thing to look at is the difference in
171−allocations. Also note that allocations may vary from run to run for
172−concurrent benchmarks.
173−
174−The next thing to look at is cpuTime. Please note that cpuTime may
175−fluctuate quite a bit, you may want to run the relevant benchmarks
176−without the --quick mode for confirming and make sure no other load is
177−running on the system when measuring.
178−
179−Usually the increase is cpuTime is proportional to the increase in
180−allocations but sometimes it may increase independently because more cpu
181−instructions are being executed. TBD - we should count the instructions
182−instead.
183−
184−### Inspection Testing
185−
186−Before you proceed make sure have to run the benchmarks with
187−`inspection` flag on. It may catch any obvious issues or regressions.
188−
189−```
190−$ cabal build --flag inspection --flag fusion-plugin --enable-benchmarks streamly-benchmarks
191−```
192−
193−### Compiling with diagnostics
194−
195−1. Comment out all other benchmarks in the given benchmark suite, and
196− keep only the one you are examining.
197−2. Edit the file and add the following line on top:
198−
199−```
200−{-# OPTIONS_GHC
201− -ddump-simpl
202− -ddump-to-file
203− -dsuppress-all
204− -Wmissed-specialisations
205− -Wall-missed-specialisations
206− -fplugin-opt=Fusion.Plugin:verbose=2
207− -fplugin-opt=Fusion.Plugin:dump-core
208−#-}
209−```
210−3. Build the benchmark suite with fusion-plugin enabled:
211−
212−```
213−$ cabal build bench:Prelude.Serial --flag fusion-plugin
214−```
215−
216−See the `.dump-simpl` file in the cabal build directory. You can find it
217−like this:
218−
219−```
220−$ find dist-newstyle/ -name "*.dump-simpl"
221−```
222−
223−Make sure you are looking into the right build dir (`--build-dir` may change
224−`dist-newstyle` to something else), and check in the appropriate GHC
225−version dir.
226−
227−### Compiling standalone example
228−
229−Sometimes you may want to create a separate program from the benchmark code
230−removing the benchmarking harness to simplify and isolate the code for better
231−reasoning and simpler core.
232−
233−Add the following GHC options at the top of your file, say, example.hs:
234−
235−```
236−{-# OPTIONS_GHC
237− -ddump-simpl
238− -ddump-to-file
239− -dsuppress-all
240− -Wmissed-specialisations
241− -Wall-missed-specialisations
242− -fplugin Fusion.Plugin
243− -fplugin-opt=Fusion.Plugin:verbose=2
244− -fplugin-opt=Fusion.Plugin:dump-core
245−#-}
246−```
247−
248−Do not include the optimization options in OPTIONS_GHC pragma, instead, specify
249−them on the command line. This is to avoid optimization failing if you import
250−another module which is not compiled with the same optimization options.
251−
252−```
253−$ cabal build # build and write ghc environment file
254−$ ghc -O2 -fspec-constr-recursive=16 -fmax-worker-args=16 example.hs
255−```
256−
257−To pinpoint where the optimization is going wrong you can examine the
258−plugin generated core files for each optimization pass. The files are
259−numbered for each optimization pass. You can compare successive files
260−using side-by-side diff and see what the compiler is doing between each
261−pass.
262−
263−### Diagnosing the Problem
264−
265−#### Specialization Issues
266−
267−Look for missed specialization messages. When you are comparing against a
268−baseline, check if something that was specialized before is no longer
269−specialized.
270−
271−In the core you have to look for type class dictionaries e.g.
272−
273−```
274−exc_r6DD = \ @s_a6ai -> try $fMonadCatchIO $fExceptionSomeException
275−```
276−
277−Search for `$f` in the core.
278−
279−#### Fusion Issues
280−
281−Look for unfused function warnings emitted by fusion-plugin. You may
282−want to take a look at the unfused constructors or functions that
283−fusion-plugin is warning about. Beware that:
284−
285−* fusion-plugin emits warnings for unfused stuff in intermediate functions as
286− well, those should be ignored.
287−* the constructors may remain genuinely unfused unless the loop is
288− closed. So you should look at the warnings in the file where the loop is
289− closed and everything is supposed to be fused.
290−
291−Also, look at the core for unfused constructors. At times you may need
292−to look for the boxed primitive type constructors e.g. W8# or I#, these
293−may not be eliminated, usually, due to strictness issues.
294−
295−Often it is useful to diff and compare the core without the problem and
296−the core with the problem especially in cases when the problem is due to
297−GHC version changes, or smaller changes in the code.
298−
299−Note, some operations are inherently fusion breaking, those cannot fuse,
300−they are usually annotated so in their documentation.
301−
302−### Resolving the problem
303−
304−Review the problematic code, see [the optimization
305−guide](dev/optimization-guidelines.md) for common problems and how to
306−solve those. If no obvious issues are found on review, then generate and
307−examine the core.
308−
309−You may want to add the `Fuse` annotation on some of those constructors
310−to make the code fuse. Please note that unnecessary `Fuse` annotations
311−may cause unnecessary inlining. Also, make sure that the constructor you
312−are adding fuse annotation is not shared by any other code where you may
313−not want inlining/fusion.
@@ -0,0 +1 @@
1+../docs/Developer/Benchmarks.md
benchmark/Streamly/Benchmark/Data/Array.hs+77−136
@@ -1,132 +1,112 @@
1−-- |
2−-- Module : Main
3−-- Copyright : (c) 2020 Composewell Technologies
4−--
5−-- License : BSD-3-Clause
6−-- Maintainer : streamly@composewell.com
1+{-# OPTIONS_GHC -Wno-deprecations #-}
2+{-# OPTIONS_GHC -Wno-orphans #-}
73
84{-# LANGUAGE CPP #-}
9−{-# LANGUAGE FlexibleContexts #-}
105
11−import Control.DeepSeq (NFData(..))
12−import System.Random (randomRIO)
6+#include "Streamly/Benchmark/Data/Array/CommonImports.hs"
137
14−import qualified Streamly.Benchmark.Data.ArrayOps as Ops
15−import qualified Streamly.Data.Array.Foreign as A
16−import qualified Streamly.Internal.Data.Array.Foreign as IA
17−import qualified Streamly.Prelude as S
18−
19−import Gauge
20−import Streamly.Benchmark.Common hiding (benchPureSrc)
21−import qualified Streamly.Benchmark.Prelude as P
8+import Control.DeepSeq (deepseq)
229
23−#ifdef MEMORY_ARRAY
10+import qualified Streamly.Internal.Data.Array as IA
2411import qualified GHC.Exts as GHC
25−import Foreign.Storable (Storable(..))
26−#endif
2712
28−#if !defined(DATA_ARRAY_PRIM) && !defined(DATA_ARRAY_PRIM_PINNED)
29−import Control.DeepSeq (deepseq)
30−#endif
13+-- import qualified Streamly.Data.Array as A
14+import qualified Streamly.Internal.Data.Array as A
15+
16+type Stream = A.Array
17+
18+#include "Streamly/Benchmark/Data/Array/Common.hs"
19+
20+instance NFData (A.Array a) where
21+ {-# INLINE rnf #-}
22+ rnf _ = ()
3123
3224-------------------------------------------------------------------------------
33−--
25+-- Benchmark helpers
3426-------------------------------------------------------------------------------
3527
36−#ifdef MEMORY_ARRAY
3728-- Drain a source that generates a pure array
3829{-# INLINE benchPureSrc #-}
39−benchPureSrc ::
40− (NFData a, Storable a) => String -> (Int -> Ops.Stream a) -> Benchmark
30+benchPureSrc :: String -> (Int -> Stream a) -> Benchmark
4131benchPureSrc name src = benchPure name src id
42−#endif
43−
44−{-# INLINE benchIO #-}
45−benchIO :: NFData b => String -> (Int -> IO a) -> (a -> b) -> Benchmark
46−benchIO name src f = bench name $ nfIO $
47− randomRIO (1,1) >>= src >>= return . f
4832
4933-- Drain a source that generates an array in the IO monad
5034{-# INLINE benchIOSrc #-}
51−benchIOSrc ::
52−#if !defined(DATA_ARRAY_PRIM) && !defined(DATA_ARRAY_PRIM_PINNED)
53− NFData a =>
54−#endif
55−#ifdef MEMORY_ARRAY
56− Storable a =>
57−#endif
58− String -> (Int -> IO (Ops.Stream a)) -> Benchmark
35+benchIOSrc :: String -> (Int -> IO (Stream a)) -> Benchmark
5936benchIOSrc name src = benchIO name src id
6037
61−{-# INLINE benchPureSink #-}
62−benchPureSink :: NFData b => Int -> String -> (Ops.Stream Int -> b) -> Benchmark
63−benchPureSink value name f = benchIO name (Ops.sourceIntFromTo value) f
38+-------------------------------------------------------------------------------
39+-- Bench Ops
40+-------------------------------------------------------------------------------
41+
42+{-# INLINE sourceIntFromToFromList #-}
43+sourceIntFromToFromList :: MonadIO m => Int -> Int -> m (Stream Int)
44+sourceIntFromToFromList value n = P.return $ A.fromListN value [n..n + value]
45+
46+{-# INLINE readInstance #-}
47+readInstance :: P.String -> Stream Int
48+readInstance str =
49+ let r = P.reads str
50+ in case r of
51+ [(x,"")] -> x
52+ _ -> P.error "readInstance: no parse"
53+
54+#ifdef DEVBUILD
55+{-
56+{-# INLINE foldableFoldl' #-}
57+foldableFoldl' :: Stream Int -> Int
58+foldableFoldl' = F.foldl' (+) 0
59+
60+{-# INLINE foldableSum #-}
61+foldableSum :: Stream Int -> Int
62+foldableSum = P.sum
63+-}
64+#endif
65+
66+{-# INLINE sourceIsList #-}
67+sourceIsList :: Int -> Int -> Stream Int
68+sourceIsList value n = GHC.fromList [n..n+value]
6469
65−{-# INLINE benchIO' #-}
66−benchIO' :: NFData b => String -> (Int -> IO a) -> (a -> IO b) -> Benchmark
67−benchIO' name src f = bench name $ nfIO $
68− randomRIO (1,1) >>= src >>= f
70+{-# INLINE sourceIsString #-}
71+sourceIsString :: Int -> Int -> Stream P.Char
72+sourceIsString value n = GHC.fromString (P.replicate (n + value) 'a')
6973
70−{-# INLINE benchIOSink #-}
71−benchIOSink :: NFData b => Int -> String -> (Ops.Stream Int -> IO b) -> Benchmark
72−benchIOSink value name f = benchIO' name (Ops.sourceIntFromTo value) f
74+{-# INLINE sourceIntFromToFromStream #-}
75+sourceIntFromToFromStream :: MonadIO m => Int -> Int -> m (Stream Int)
76+sourceIntFromToFromStream value n = S.fold A.write $ S.enumerateFromTo n (n + value)
77+
78+-------------------------------------------------------------------------------
79+-- Bench groups
80+-------------------------------------------------------------------------------
7381
7482o_1_space_generation :: Int -> [Benchmark]
7583o_1_space_generation value =
7684 [ bgroup
7785 "generation"
78− [ benchIOSrc "writeN . intFromTo" (Ops.sourceIntFromTo value)
79−#ifndef DATA_SMALLARRAY
80− , benchIOSrc "write . intFromTo" (Ops.sourceIntFromToFromStream value)
81−#endif
82− , benchIOSrc
83− "fromList . intFromTo"
84− (Ops.sourceIntFromToFromList value)
85− , benchIOSrc "writeN . unfoldr" (Ops.sourceUnfoldr value)
86− , benchIOSrc "writeN . fromList" (Ops.sourceFromList value)
87−#ifdef MEMORY_ARRAY
88− , benchPureSrc "writeN . IsList.fromList" (Ops.sourceIsList value)
86+ [ benchIOSrc "write . intFromTo" (sourceIntFromToFromStream value)
87+ , let testStr = "fromList " ++ mkListString value
88+ in testStr `deepseq` bench "read" (nf readInstance testStr)
89+ , benchPureSrc "writeN . IsList.fromList" (sourceIsList value)
8990 , benchPureSrc
9091 "writeN . IsString.fromString"
91− (Ops.sourceIsString value)
92−#endif
93−#if !defined(DATA_ARRAY_PRIM) && !defined(DATA_ARRAY_PRIM_PINNED)
94−#ifdef DATA_SMALLARRAY
95− , let testStr =
96− "fromListN " ++
97− show (value + 1) ++
98− "[1" ++ concat (replicate value ",1") ++ "]"
99−#else
100− , let testStr = mkListString value
101−#endif
102− in testStr `deepseq` (bench "read" $ nf Ops.readInstance testStr)
103−#endif
104− , benchPureSink value "show" Ops.showInstance
92+ (sourceIsString value)
93+
10594 ]
10695 ]
10796
10897o_1_space_elimination :: Int -> [Benchmark]
10998o_1_space_elimination value =
11099 [ bgroup "elimination"
111− [ benchPureSink value "id" id
112− , benchPureSink value "==" Ops.eqInstance
113− , benchPureSink value "/=" Ops.eqInstanceNotEq
114− , benchPureSink value "<" Ops.ordInstance
115− , benchPureSink value "min" Ops.ordInstanceMin
116−#ifdef MEMORY_ARRAY
117− -- length is used to check for foldr/build fusion
118− , benchPureSink value "length . IsList.toList" (length . GHC.toList)
119−#endif
120− , benchIOSink value "foldl'" Ops.pureFoldl'
121− , benchIOSink value "read" Ops.unfoldReadDrain
122− , benchIOSink value "toStreamRev" Ops.toStreamRevDrain
123− , benchFold "writeLastN.1" (S.fold (IA.writeLastN 1)) (P.sourceUnfoldrM value)
124− , benchFold "writeLastN.10" (S.fold (IA.writeLastN 10)) (P.sourceUnfoldrM value)
125−#if !defined(DATA_ARRAY_PRIM) && !defined(DATA_ARRAY_PRIM_PINNED)
100+ [ benchPureSink value "length . IsList.toList" (length . GHC.toList)
101+ , benchFold "writeLastN.1"
102+ (S.fold (IA.writeLastN 1)) (P.sourceUnfoldrM value)
103+ , benchFold "writeLastN.10"
104+ (S.fold (IA.writeLastN 10)) (P.sourceUnfoldrM value)
126105#ifdef DEVBUILD
127− , benchPureSink value "foldable/foldl'" Ops.foldableFoldl'
128− , benchPureSink value "foldable/sum" Ops.foldableSum
129−#endif
106+{-
107+ benchPureSink value "foldable/foldl'" foldableFoldl'
108+ , benchPureSink value "foldable/sum" foldableSum
109+-}
130110#endif
131111 ]
132112 ]
@@ -138,49 +118,14 @@ o_n_heap_serial value =
138118 -- Converting the stream to an array
139119 benchFold "writeLastN.Max" (S.fold (IA.writeLastN (value + 1)))
140120 (P.sourceUnfoldrM value)
141− , benchFold "writeN" (S.fold (A.writeN value))
142− (P.sourceUnfoldrM value)
143121 ]
144122 ]
145123
146−o_1_space_transformation :: Int -> [Benchmark]
147−o_1_space_transformation value =
148− [ bgroup "transformation"
149− [ benchIOSink value "scanl'" (Ops.scanl' value 1)
150− , benchIOSink value "scanl1'" (Ops.scanl1' value 1)
151− , benchIOSink value "map" (Ops.map value 1)
152− ]
153− ]
154−
155−o_1_space_transformationX4 :: Int -> [Benchmark]
156−o_1_space_transformationX4 value =
157− [ bgroup "transformationX4"
158− [ benchIOSink value "scanl'" (Ops.scanl' value 4)
159− , benchIOSink value "scanl1'" (Ops.scanl1' value 4)
160− , benchIOSink value "map" (Ops.map value 4)
161− ]
162− ]
163−
164124moduleName :: String
165−#ifdef DATA_SMALLARRAY
166−moduleName = "Data.SmallArray"
167−#elif defined(MEMORY_ARRAY)
168−moduleName = "Data.Array.Foreign"
169−#elif defined(DATA_ARRAY_PRIM)
170−moduleName = "Data.Array.Prim"
171−#elif defined(DATA_ARRAY_PRIM_PINNED)
172−moduleName = "Data.Array.Prim.Pinned"
173−#else
174125moduleName = "Data.Array"
175−#endif
176126
177−#ifdef DATA_SMALLARRAY
178−defStreamSize :: Int
179−defStreamSize = 128
180−#else
181127defStreamSize :: Int
182128defStreamSize = defaultStreamSize
183−#endif
184129
185130main :: IO ()
186131main = runWithCLIOpts defStreamSize allBenchmarks
@@ -188,12 +133,8 @@ main = runWithCLIOpts defStreamSize allBenchmarks
188133 where
189134
190135 allBenchmarks size =
191− [ bgroup (o_1_space_prefix moduleName) $ concat
192− [ o_1_space_generation size
193− , o_1_space_elimination size
194− , o_1_space_transformation size
195− , o_1_space_transformationX4 size
196− ]
136+ [ bgroup (o_1_space_prefix moduleName) $
137+ o_1_space_generation size ++ o_1_space_elimination size
197138 , bgroup (o_n_space_prefix moduleName) $
198139 o_n_heap_serial size
199− ]
140+ ] ++ commonBenchmarks size
benchmark/Streamly/Benchmark/Data/Array/Common.hsnew file+185
@@ -0,0 +1,185 @@
1+-------------------------------------------------------------------------------
2+-- Benchmark helpers
3+-------------------------------------------------------------------------------
4+
5+{-# INLINE benchIO #-}
6+benchIO :: NFData b => String -> (Int -> IO a) -> (a -> b) -> Benchmark
7+benchIO name src f = bench name $ nfIO $
8+ (randomRIO (1,1) >>= src) <&> f
9+
10+{-# INLINE benchPureSink #-}
11+benchPureSink :: NFData b => Int -> String -> (Stream Int -> b) -> Benchmark
12+benchPureSink value name = benchIO name (sourceIntFromTo value)
13+
14+{-# INLINE benchIO' #-}
15+benchIO' :: NFData b => String -> (Int -> IO a) -> (a -> IO b) -> Benchmark
16+benchIO' name src f = bench name $ nfIO $
17+ randomRIO (1,1) >>= src >>= f
18+
19+{-# INLINE benchIOSink #-}
20+benchIOSink :: NFData b => Int -> String -> (Stream Int -> IO b) -> Benchmark
21+benchIOSink value name = benchIO' name (sourceIntFromTo value)
22+
23+-------------------------------------------------------------------------------
24+-- Bench Ops
25+-------------------------------------------------------------------------------
26+
27+{-# INLINE sourceUnfoldr #-}
28+sourceUnfoldr :: MonadIO m => Int -> Int -> m (Stream Int)
29+sourceUnfoldr value n = S.fold (A.writeN value) $ S.unfoldr step n
30+ where
31+ step cnt =
32+ if cnt > n + value
33+ then Nothing
34+ else Just (cnt, cnt + 1)
35+
36+{-# INLINE sourceIntFromTo #-}
37+sourceIntFromTo :: MonadIO m => Int -> Int -> m (Stream Int)
38+sourceIntFromTo value n = S.fold (A.writeN value) $ S.enumerateFromTo n (n + value)
39+
40+{-# INLINE sourceFromList #-}
41+sourceFromList :: MonadIO m => Int -> Int -> m (Stream Int)
42+sourceFromList value n = S.fold (A.writeN value) $ S.fromList [n..n+value]
43+
44+-------------------------------------------------------------------------------
45+-- Transformation
46+-------------------------------------------------------------------------------
47+
48+{-# INLINE composeN #-}
49+composeN :: P.Monad m
50+ => Int -> (Stream Int -> m (Stream Int)) -> Stream Int -> m (Stream Int)
51+composeN n f x =
52+ case n of
53+ 1 -> f x
54+ 2 -> f x P.>>= f
55+ 3 -> f x P.>>= f P.>>= f
56+ 4 -> f x P.>>= f P.>>= f P.>>= f
57+ _ -> undefined
58+
59+{-# INLINE scanl' #-}
60+{-# INLINE scanl1' #-}
61+{-# INLINE map #-}
62+
63+scanl' , scanl1', map
64+ :: MonadIO m => Int -> Int -> Stream Int -> m (Stream Int)
65+
66+
67+{-# INLINE onArray #-}
68+onArray
69+ :: MonadIO m => Int -> (Stream.Stream m Int -> Stream.Stream m Int)
70+ -> Stream Int
71+ -> m (Stream Int)
72+onArray value f arr = S.fold (A.writeN value) $ f $ S.unfold A.reader arr
73+
74+scanl' value n = composeN n $ onArray value $ S.scan (Fold.foldl' (+) 0)
75+scanl1' value n = composeN n $ onArray value $ Stream.scanl1' (+)
76+map value n = composeN n $ onArray value $ fmap (+1)
77+-- map n = composeN n $ A.map (+1)
78+
79+{-# INLINE eqInstance #-}
80+eqInstance :: Stream Int -> Bool
81+eqInstance src = src == src
82+
83+{-# INLINE eqInstanceNotEq #-}
84+eqInstanceNotEq :: Stream Int -> Bool
85+eqInstanceNotEq src = src P./= src
86+
87+{-# INLINE ordInstance #-}
88+ordInstance :: Stream Int -> Bool
89+ordInstance src = src P.< src
90+
91+{-# INLINE ordInstanceMin #-}
92+ordInstanceMin :: Stream Int -> Stream Int
93+ordInstanceMin src = P.min src src
94+
95+{-# INLINE showInstance #-}
96+showInstance :: Stream Int -> P.String
97+showInstance = P.show
98+
99+{-# INLINE pureFoldl' #-}
100+pureFoldl' :: MonadIO m => Stream Int -> m Int
101+pureFoldl' = S.fold (Fold.foldl' (+) 0) . S.unfold A.reader
102+
103+-------------------------------------------------------------------------------
104+-- Elimination
105+-------------------------------------------------------------------------------
106+
107+{-# INLINE unfoldReadDrain #-}
108+unfoldReadDrain :: MonadIO m => Stream Int -> m ()
109+unfoldReadDrain = S.fold Fold.drain . S.unfold A.reader
110+
111+{-# INLINE toStreamRevDrain #-}
112+toStreamRevDrain :: MonadIO m => Stream Int -> m ()
113+toStreamRevDrain = S.fold Fold.drain . A.readRev
114+
115+-------------------------------------------------------------------------------
116+-- Bench groups
117+-------------------------------------------------------------------------------
118+
119+common_o_1_space_generation :: Int -> [Benchmark]
120+common_o_1_space_generation value =
121+ [ bgroup
122+ "generation"
123+ [ benchIOSrc "writeN . intFromTo" (sourceIntFromTo value)
124+ , benchIOSrc
125+ "fromList . intFromTo"
126+ (sourceIntFromToFromList value)
127+ , benchIOSrc "writeN . unfoldr" (sourceUnfoldr value)
128+ , benchIOSrc "writeN . fromList" (sourceFromList value)
129+ , benchPureSink value "show" showInstance
130+ ]
131+ ]
132+
133+common_o_1_space_elimination :: Int -> [Benchmark]
134+common_o_1_space_elimination value =
135+ [ bgroup "elimination"
136+ [ benchPureSink value "id" id
137+ , benchPureSink value "==" eqInstance
138+ , benchPureSink value "/=" eqInstanceNotEq
139+ , benchPureSink value "<" ordInstance
140+ , benchPureSink value "min" ordInstanceMin
141+ , benchIOSink value "foldl'" pureFoldl'
142+ , benchIOSink value "read" unfoldReadDrain
143+ , benchIOSink value "toStreamRev" toStreamRevDrain
144+ ]
145+ ]
146+
147+common_o_n_heap_serial :: Int -> [Benchmark]
148+common_o_n_heap_serial value =
149+ [ bgroup "elimination"
150+ [
151+ -- Converting the stream to an array
152+ benchFold "writeN" (S.fold (A.writeN value))
153+ (P.sourceUnfoldrM value)
154+ ]
155+ ]
156+
157+common_o_1_space_transformation :: Int -> [Benchmark]
158+common_o_1_space_transformation value =
159+ [ bgroup "transformation"
160+ [ benchIOSink value "scanl'" (scanl' value 1)
161+ , benchIOSink value "scanl1'" (scanl1' value 1)
162+ , benchIOSink value "map" (map value 1)
163+ ]
164+ ]
165+
166+common_o_1_space_transformationX4 :: Int -> [Benchmark]
167+common_o_1_space_transformationX4 value =
168+ [ bgroup "transformationX4"
169+ [ benchIOSink value "scanl'" (scanl' value 4)
170+ , benchIOSink value "scanl1'" (scanl1' value 4)
171+ , benchIOSink value "map" (map value 4)
172+ ]
173+ ]
174+
175+commonBenchmarks :: Int -> [Benchmark]
176+commonBenchmarks size =
177+ [ bgroup (o_1_space_prefix moduleName) $ concat
178+ [ common_o_1_space_generation size
179+ , common_o_1_space_elimination size
180+ , common_o_1_space_transformation size
181+ , common_o_1_space_transformationX4 size
182+ ]
183+ , bgroup (o_n_space_prefix moduleName) $
184+ common_o_n_heap_serial size
185+ ]
benchmark/Streamly/Benchmark/Data/Array/CommonImports.hsnew file+16
@@ -0,0 +1,16 @@
1+{-# LANGUAGE FlexibleContexts #-}
2+
3+import Control.DeepSeq (NFData(..))
4+import Control.Monad.IO.Class (MonadIO)
5+import Data.Functor ((<&>))
6+import System.Random (randomRIO)
7+
8+import qualified Streamly.Data.Fold as Fold
9+import qualified Streamly.Data.Stream as S
10+import qualified Streamly.Internal.Data.Stream as Stream
11+
12+import Test.Tasty.Bench
13+import Streamly.Benchmark.Common hiding (benchPureSrc)
14+import qualified Stream.Common as P
15+
16+import Prelude as P hiding (map)
benchmark/Streamly/Benchmark/Data/Array/Generic.hsnew file+119
@@ -0,0 +1,119 @@
1+{-# OPTIONS_GHC -Wno-deprecations #-}
2+{-# OPTIONS_GHC -Wno-orphans #-}
3+
4+{-# LANGUAGE CPP #-}
5+
6+#include "Streamly/Benchmark/Data/Array/CommonImports.hs"
7+
8+import Control.DeepSeq (deepseq)
9+
10+import qualified Streamly.Internal.Data.Array.Generic as IA
11+import qualified Streamly.Internal.Data.Array.Generic as A
12+
13+type Stream = A.Array
14+
15+#include "Streamly/Benchmark/Data/Array/Common.hs"
16+
17+instance NFData a => NFData (A.Array a) where
18+ {-# INLINE rnf #-}
19+ rnf = A.foldl' (\_ x -> rnf x) ()
20+
21+-------------------------------------------------------------------------------
22+-- Benchmark helpers
23+-------------------------------------------------------------------------------
24+
25+-- Drain a source that generates an array in the IO monad
26+{-# INLINE benchIOSrc #-}
27+benchIOSrc :: NFData a => String -> (Int -> IO (Stream a)) -> Benchmark
28+benchIOSrc name src = benchIO name src id
29+
30+-------------------------------------------------------------------------------
31+-- Bench Ops
32+-------------------------------------------------------------------------------
33+
34+{-# INLINE sourceIntFromToFromList #-}
35+sourceIntFromToFromList :: MonadIO m => Int -> Int -> m (Stream Int)
36+sourceIntFromToFromList value n = P.return $ A.fromListN value [n..n + value]
37+
38+{-# INLINE readInstance #-}
39+readInstance :: P.String -> Stream Int
40+readInstance str =
41+ let r = P.reads str
42+ in case r of
43+ [(x,"")] -> x
44+ _ -> P.error "readInstance: no parse"
45+
46+#ifdef DEVBUILD
47+{-
48+{-# INLINE foldableFoldl' #-}
49+foldableFoldl' :: Stream Int -> Int
50+foldableFoldl' = F.foldl' (+) 0
51+
52+{-# INLINE foldableSum #-}
53+foldableSum :: Stream Int -> Int
54+foldableSum = P.sum
55+-}
56+#endif
57+
58+{-# INLINE sourceIntFromToFromStream #-}
59+sourceIntFromToFromStream :: MonadIO m => Int -> Int -> m (Stream Int)
60+sourceIntFromToFromStream value n =
61+ S.fold A.write $ S.enumerateFromTo n (n + value)
62+
63+-------------------------------------------------------------------------------
64+-- Bench groups
65+-------------------------------------------------------------------------------
66+
67+o_1_space_generation :: Int -> [Benchmark]
68+o_1_space_generation value =
69+ [ bgroup
70+ "generation"
71+ [ benchIOSrc "write . intFromTo" (sourceIntFromToFromStream value)
72+ , let testStr = "fromList " ++ mkListString value
73+ in testStr `deepseq` bench "read" (nf readInstance testStr)
74+ ]
75+ ]
76+
77+o_1_space_elimination :: Int -> [Benchmark]
78+o_1_space_elimination value =
79+ [ bgroup "elimination"
80+ [ benchFold "writeLastN.1"
81+ (S.fold (IA.writeLastN 1)) (P.sourceUnfoldrM value)
82+ , benchFold "writeLastN.10"
83+ (S.fold (IA.writeLastN 10)) (P.sourceUnfoldrM value)
84+#ifdef DEVBUILD
85+{-
86+ benchPureSink value "foldable/foldl'" foldableFoldl'
87+ , benchPureSink value "foldable/sum" foldableSum
88+-}
89+#endif
90+ ]
91+ ]
92+
93+o_n_heap_serial :: Int -> [Benchmark]
94+o_n_heap_serial value =
95+ [ bgroup "elimination"
96+ [
97+ -- Converting the stream to an array
98+ benchFold "writeLastN.Max" (S.fold (IA.writeLastN (value + 1)))
99+ (P.sourceUnfoldrM value)
100+ ]
101+ ]
102+
103+moduleName :: String
104+moduleName = "Data.Array.Generic"
105+
106+defStreamSize :: Int
107+defStreamSize = defaultStreamSize
108+
109+main :: IO ()
110+main = runWithCLIOpts defStreamSize allBenchmarks
111+
112+ where
113+
114+ allBenchmarks size =
115+ [ bgroup (o_1_space_prefix moduleName) $
116+ o_1_space_generation size ++ o_1_space_elimination size
117+ , bgroup (o_n_space_prefix moduleName) $
118+ o_n_heap_serial size
119+ ] ++ commonBenchmarks size
benchmark/Streamly/Benchmark/Data/Array/SmallArray.hsnew file+95
@@ -0,0 +1,95 @@
1+{-# OPTIONS_GHC -Wno-deprecations #-}
2+
3+{-# LANGUAGE CPP #-}
4+
5+#include "Streamly/Benchmark/Data/Array/CommonImports.hs"
6+
7+import Control.DeepSeq (deepseq)
8+
9+import qualified Streamly.Internal.Data.SmallArray as A
10+type Stream = A.SmallArray
11+
12+#include "Streamly/Benchmark/Data/Array/Common.hs"
13+
14+-------------------------------------------------------------------------------
15+-- Benchmark helpers
16+-------------------------------------------------------------------------------
17+
18+-- Drain a source that generates an array in the IO monad
19+{-# INLINE benchIOSrc #-}
20+benchIOSrc :: NFData a => String -> (Int -> IO (Stream a)) -> Benchmark
21+benchIOSrc name src = benchIO name src id
22+
23+-------------------------------------------------------------------------------
24+-- Bench Ops
25+-------------------------------------------------------------------------------
26+
27+{-# INLINE sourceIntFromToFromList #-}
28+sourceIntFromToFromList :: MonadIO m => Int -> Int -> m (Stream Int)
29+sourceIntFromToFromList value n = P.return $ A.fromListN value [n..n + value]
30+
31+{-# INLINE readInstance #-}
32+readInstance :: P.String -> Stream Int
33+readInstance str =
34+ let r = P.reads str
35+ in case r of
36+ [(x,"")] -> x
37+ _ -> P.error "readInstance: no parse"
38+
39+#ifdef DEVBUILD
40+{-
41+{-# INLINE foldableFoldl' #-}
42+foldableFoldl' :: Stream Int -> Int
43+foldableFoldl' = F.foldl' (+) 0
44+
45+{-# INLINE foldableSum #-}
46+foldableSum :: Stream Int -> Int
47+foldableSum = P.sum
48+-}
49+#endif
50+
51+-------------------------------------------------------------------------------
52+-- Bench groups
53+-------------------------------------------------------------------------------
54+
55+o_1_space_generation :: Int -> [Benchmark]
56+o_1_space_generation value =
57+ [ bgroup
58+ "generation"
59+ [ let testStr =
60+ "fromListN " ++
61+ show (value + 1) ++
62+ "[1" ++ concat (replicate value ",1") ++ "]"
63+ in testStr `deepseq` bench "read" (nf readInstance testStr)
64+ ]
65+ ]
66+
67+{-
68+o_1_space_elimination :: Int -> [Benchmark]
69+o_1_space_elimination value =
70+ [ bgroup "elimination"
71+ [
72+#ifdef DEVBUILD
73+{-
74+ benchPureSink value "foldable/foldl'" foldableFoldl'
75+ , benchPureSink value "foldable/sum" foldableSum
76+-}
77+#endif
78+ ]
79+ ]
80+-}
81+
82+moduleName :: String
83+moduleName = "Data.SmallArray"
84+
85+defStreamSize :: Int
86+defStreamSize = 128
87+
88+main :: IO ()
89+main = runWithCLIOpts defStreamSize allBenchmarks
90+
91+ where
92+
93+ allBenchmarks size =
94+ bgroup (o_1_space_prefix moduleName) (o_1_space_generation size)
95+ : commonBenchmarks size
benchmark/Streamly/Benchmark/Data/Array/Stream/Foreign.hs → benchmark/Streamly/Benchmark/Data/Array/Stream.hsrenamed+81−45
@@ -1,3 +1,5 @@
1+{-# OPTIONS_GHC -Wno-deprecations #-}
2+
13-- |
24-- Module : Streamly.Benchmark.Data.ParserD
35-- Copyright : (c) 2020 Composewell Technologies
@@ -24,31 +26,35 @@ module Main
2426 ) where
2527
2628import Control.DeepSeq (NFData(..))
27−import Control.Monad (void)
28−import Control.Monad.Catch (MonadThrow)
29+import Control.Monad (void, when)
30+import Control.Monad.Catch (MonadCatch)
2931import Data.Functor.Identity (runIdentity)
32+import Data.Maybe (isJust)
3033import Data.Word (Word8)
34+import Streamly.Internal.Data.Stream (Stream)
35+import Streamly.Internal.Data.StreamK (StreamK)
3136import System.IO (Handle)
3237import System.Random (randomRIO)
3338import Prelude hiding ()
3439
35−import qualified Streamly.Prelude as Stream
36−import qualified Streamly.Internal.Data.Array.Foreign as Array
37−import qualified Streamly.Internal.Data.Array.Stream.Foreign as ArrayStream
40+import qualified Streamly.Data.Stream as Stream
41+import qualified Streamly.Internal.Data.Array as Array
42+import qualified Streamly.Internal.Data.Array.Stream as ArrayStream
3843import qualified Streamly.Internal.Data.Fold as Fold
39−import qualified Streamly.Internal.Data.Parser.ParserD as ParserD
40−import qualified Streamly.Internal.Data.Stream.IsStream as Stream (arraysOf)
44+import qualified Streamly.Internal.Data.Parser as Parser
45+import qualified Streamly.Internal.Data.Stream as Stream
46+import qualified Streamly.Internal.Data.StreamK as StreamK
4147import qualified Streamly.Internal.FileSystem.Handle as Handle
4248import qualified Streamly.Internal.Unicode.Stream as Unicode
4349
44−import Gauge hiding (env)
45−import Streamly.Prelude (SerialT, MonadAsync, IsStream)
50+import Test.Tasty.Bench hiding (env)
4651import Streamly.Benchmark.Common
4752import Streamly.Benchmark.Common.Handle
53+import Control.Monad.IO.Class (MonadIO)
4854
4955#ifdef INSPECTION
50−import Foreign.Storable (Storable)
51−import Streamly.Internal.Data.Stream.StreamD.Type (Step(..))
56+import Streamly.Internal.Data.MutByteArray (Unbox)
57+import Streamly.Internal.Data.Stream (Step(..))
5258import Test.Inspection
5359#endif
5460
@@ -59,7 +65,7 @@ import Test.Inspection
5965-- XXX these can be moved to the common module
6066
6167{-# INLINE sourceUnfoldrM #-}
62−sourceUnfoldrM :: (IsStream t, MonadAsync m) => Int -> Int -> t m Int
68+sourceUnfoldrM :: MonadIO m => Int -> Int -> Stream.Stream m Int
6369sourceUnfoldrM value n = Stream.unfoldrM step n
6470 where
6571 step cnt =
@@ -70,7 +76,7 @@ sourceUnfoldrM value n = Stream.unfoldrM step n
7076{-# INLINE benchIO #-}
7177benchIO
7278 :: NFData b
73− => String -> (Int -> t IO a) -> (t IO a -> IO b) -> Benchmark
79+ => String -> (Int -> Stream IO a) -> (Stream IO a -> IO b) -> Benchmark
7480benchIO name src sink =
7581 bench name $ nfIO $ randomRIO (1,1) >>= sink . src
7682
@@ -81,11 +87,11 @@ benchIO name src sink =
8187-- | Get the last byte from a file bytestream.
8288toChunksLast :: Handle -> IO (Maybe Word8)
8389toChunksLast inh = do
84− let s = Handle.toChunks inh
90+ let s = Handle.readChunks inh
8591 larr <- Stream.last s
8692 return $ case larr of
8793 Nothing -> Nothing
88− Just arr -> Array.getIndex arr (Array.length arr - 1)
94+ Just arr -> Array.getIndex (Array.length arr - 1) arr
8995
9096#ifdef INSPECTION
9197inspect $ hasNoTypeClasses 'toChunksLast
@@ -95,8 +101,8 @@ inspect $ 'toChunksLast `hasNoType` ''Step
95101-- | Count the number of bytes in a file.
96102toChunksSumLengths :: Handle -> IO Int
97103toChunksSumLengths inh =
98− let s = Handle.toChunks inh
99− in Stream.sum (Stream.map Array.length s)
104+ let s = Handle.readChunks inh
105+ in Stream.fold Fold.sum (Stream.map Array.length s)
100106
101107#ifdef INSPECTION
102108inspect $ hasNoTypeClasses 'toChunksSumLengths
@@ -106,8 +112,8 @@ inspect $ 'toChunksSumLengths `hasNoType` ''Step
106112-- | Sum the bytes in a file.
107113toChunksCountBytes :: Handle -> IO Word8
108114toChunksCountBytes inh = do
109− let foldlArr' f z = runIdentity . Stream.foldl' f z . Array.toStream
110− let s = Handle.toChunks inh
115+ let foldlArr' f z = runIdentity . Stream.foldl' f z . Array.read
116+ let s = Handle.readChunks inh
111117 Stream.foldl' (\acc arr -> acc + foldlArr' (+) 0 arr) 0 s
112118
113119#ifdef INSPECTION
@@ -117,7 +123,7 @@ inspect $ 'toChunksCountBytes `hasNoType` ''Step
117123
118124toChunksDecodeUtf8Arrays :: Handle -> IO ()
119125toChunksDecodeUtf8Arrays =
120− Stream.drain . Unicode.decodeUtf8Arrays . Handle.toChunks
126+ Stream.drain . Unicode.decodeUtf8Chunks . Handle.readChunks
121127
122128#ifdef INSPECTION
123129inspect $ hasNoTypeClasses 'toChunksDecodeUtf8Arrays
@@ -131,7 +137,9 @@ inspect $ hasNoTypeClasses 'toChunksDecodeUtf8Arrays
131137-- | Count the number of lines in a file.
132138toChunksSplitOnSuffix :: Handle -> IO Int
133139toChunksSplitOnSuffix =
134− Stream.length . ArrayStream.splitOnSuffix 10 . Handle.toChunks
140+ Stream.fold Fold.length
141+ . ArrayStream.splitOnSuffix 10
142+ . Handle.readChunks
135143
136144#ifdef INSPECTION
137145inspect $ hasNoTypeClasses 'toChunksSplitOnSuffix
@@ -141,7 +149,10 @@ inspect $ 'toChunksSplitOnSuffix `hasNoType` ''Step
141149-- XXX use a word splitting combinator instead of splitOn and test it.
142150-- | Count the number of words in a file.
143151toChunksSplitOn :: Handle -> IO Int
144−toChunksSplitOn = Stream.length . ArrayStream.splitOn 32 . Handle.toChunks
152+toChunksSplitOn =
153+ Stream.fold Fold.length
154+ . ArrayStream.splitOn 32
155+ . Handle.readChunks
145156
146157#ifdef INSPECTION
147158inspect $ hasNoTypeClasses 'toChunksSplitOn
@@ -179,12 +190,11 @@ o_1_space_read_chunked env =
179190copyChunksSplitInterposeSuffix :: Handle -> Handle -> IO ()
180191copyChunksSplitInterposeSuffix inh outh =
181192 Stream.fold (Handle.write outh)
182− $ ArrayStream.interposeSuffix 10
183− $ ArrayStream.splitOnSuffix 10
184− $ Handle.toChunks inh
193+ $ ArrayStream.interposeSuffix 10 . ArrayStream.splitOnSuffix 10
194+ $ Handle.readChunks inh
185195
186196#ifdef INSPECTION
187−inspect $ hasNoTypeClassesExcept 'copyChunksSplitInterposeSuffix [''Storable]
197+inspect $ hasNoTypeClassesExcept 'copyChunksSplitInterposeSuffix [''Unbox]
188198inspect $ 'copyChunksSplitInterposeSuffix `hasNoType` ''Step
189199#endif
190200
@@ -193,13 +203,12 @@ inspect $ 'copyChunksSplitInterposeSuffix `hasNoType` ''Step
193203copyChunksSplitInterpose :: Handle -> Handle -> IO ()
194204copyChunksSplitInterpose inh outh =
195205 Stream.fold (Handle.write outh)
196− $ ArrayStream.interpose 32
197206 -- XXX this is not correct word splitting combinator
198− $ ArrayStream.splitOn 32
199− $ Handle.toChunks inh
207+ $ ArrayStream.interpose 32 . ArrayStream.splitOn 32
208+ $ Handle.readChunks inh
200209
201210#ifdef INSPECTION
202−inspect $ hasNoTypeClassesExcept 'copyChunksSplitInterpose [''Storable]
211+inspect $ hasNoTypeClassesExcept 'copyChunksSplitInterpose [''Unbox]
203212inspect $ 'copyChunksSplitInterpose `hasNoType` ''Step
204213#endif
205214
@@ -218,30 +227,53 @@ o_1_space_copy_toChunks_group_ungroup env =
218227-------------------------------------------------------------------------------
219228
220229{-# INLINE drainWhile #-}
221−drainWhile :: MonadThrow m => (a -> Bool) -> ParserD.Parser m a ()
222−drainWhile p = ParserD.takeWhile p Fold.drain
230+drainWhile :: MonadCatch m => (a -> Bool) -> Parser.Parser a m ()
231+drainWhile p = Parser.takeWhile p Fold.drain
223232
224233-------------------------------------------------------------------------------
225234-- Folds and parsers
226235-------------------------------------------------------------------------------
227236
228237{-# INLINE fold #-}
229−fold :: SerialT IO (Array.Array Int) -> IO ()
230−fold s = void $ ArrayStream.fold Fold.drain s
231−
232−{-# INLINE parseArray #-}
233−parseArray :: Int -> SerialT IO (Array.Array Int) -> IO ()
234−parseArray value s = void $ ArrayStream.parse (drainWhile (< value)) s
238+fold :: Stream IO (Array.Array Int) -> IO ()
239+fold s = void $ ArrayStream.foldBreak Fold.drain $ StreamK.fromStream s
240+
241+{-# INLINE parse #-}
242+parse :: Int -> Stream IO (Array.Array Int) -> IO ()
243+parse value s =
244+ void $ ArrayStream.parseBreak (drainWhile (< value)) $ StreamK.fromStream s
245+
246+{-# INLINE foldBreak #-}
247+foldBreak :: StreamK IO (Array.Array Int) -> IO ()
248+foldBreak s = do
249+ (r, s1) <- ArrayStream.foldBreak Fold.one s
250+ when (isJust r) $ foldBreak s1
251+
252+{-# INLINE parseBreak #-}
253+parseBreak :: StreamK IO (Array.Array Int) -> IO ()
254+parseBreak s = do
255+ r <- ArrayStream.parseBreak Parser.one s
256+ case r of
257+ (Left _, _) -> return ()
258+ (Right _, s1) -> parseBreak s1
235259
236260o_1_space_serial_array ::
237261 Int -> [Array.Array Int] -> [Array.Array Int] -> [Benchmark]
238262o_1_space_serial_array bound arraysSmall arraysBig =
239263 [ benchIO "fold (of 100)" (\_ -> Stream.fromList arraysSmall) fold
240264 , benchIO "fold (single)" (\_ -> Stream.fromList arraysBig) fold
265+ , benchIO
266+ "foldBreak (recursive, small arrays)"
267+ (\_ -> Stream.fromList arraysSmall)
268+ (foldBreak . StreamK.fromStream)
241269 , benchIO "parse (of 100)" (\_ -> Stream.fromList arraysSmall)
242− $ parseArray bound
270+ $ parse bound
243271 , benchIO "parse (single)" (\_ -> Stream.fromList arraysBig)
244− $ parseArray bound
272+ $ parse bound
273+ , benchIO
274+ "parseBreak (recursive, small arrays)"
275+ (\_ -> Stream.fromList arraysSmall)
276+ (parseBreak . StreamK.fromStream)
245277 ]
246278
247279-------------------------------------------------------------------------------
@@ -249,7 +281,7 @@ o_1_space_serial_array bound arraysSmall arraysBig =
249281-------------------------------------------------------------------------------
250282
251283moduleName :: String
252−moduleName = "Data.Array.Stream.Foreign"
284+moduleName = "Data.Array.Stream"
253285
254286main :: IO ()
255287main = do
@@ -258,10 +290,14 @@ main = do
258290
259291 where
260292
261− alloc value = do
262− small <- Stream.toList $ Stream.arraysOf 100 $ sourceUnfoldrM value 0
263− big <- Stream.toList $ Stream.arraysOf value $ sourceUnfoldrM value 0
264− return (small, big)
293+ alloc value =
294+ if value <= 0
295+ then return (undefined, undefined)
296+ else
297+ do
298+ small <- Stream.toList $ Stream.chunksOf 100 $ sourceUnfoldrM value 0
299+ big <- Stream.toList $ Stream.chunksOf value $ sourceUnfoldrM value 0
300+ return (small, big)
265301
266302 allBenchmarks env arrays value =
267303 let (arraysSmall, arraysBig) = arrays
benchmark/Streamly/Benchmark/Data/ArrayOps.hsdeleted−242
@@ -1,242 +0,0 @@
1−-- |
2−-- Module : Streamly.Benchmark.Data.ArrayOps
3−-- Copyright : (c) 2020 Composewell Technologies
4−--
5−-- License : BSD-3-Clause
6−-- Maintainer : streamly@composewell.com
7−
8−{-# LANGUAGE CPP #-}
9−{-# LANGUAGE FlexibleContexts #-}
10−{-# LANGUAGE ScopedTypeVariables #-}
11−
12−-- CPP:
13−-- MEMORY_ARRAY
14−-- DATA_ARRAY
15−-- DATA_ARRAY_PRIM
16−-- DATA_ARRAY_PRIM_PINNED
17−-- DATA_SMALLARRAY
18−
19−module Streamly.Benchmark.Data.ArrayOps where
20−
21−import Control.Monad.IO.Class (MonadIO)
22−import Prelude (Bool, Int, Maybe(..), ($), (+), (.), (==), (>), undefined)
23−
24−import qualified Prelude as P
25−import qualified Streamly.Prelude as S
26−
27−#if !defined(DATA_ARRAY_PRIM) && !defined(DATA_ARRAY_PRIM_PINNED)
28−#ifdef DEVBUILD
29−import qualified Data.Foldable as F
30−#endif
31−#endif
32−
33−#ifdef DATA_SMALLARRAY
34−import qualified Streamly.Internal.Data.SmallArray as A
35−type Stream = A.SmallArray
36−#elif defined(MEMORY_ARRAY)
37−import qualified GHC.Exts as GHC
38−import qualified Streamly.Data.Array.Foreign as A
39−import qualified Streamly.Internal.Data.Array.Foreign as A
40−type Stream = A.Array
41−#elif defined(DATA_ARRAY_PRIM)
42−import qualified Streamly.Internal.Data.Array.Prim as A
43−type Stream = A.Array
44−#elif defined(DATA_ARRAY_PRIM_PINNED)
45−import qualified Streamly.Internal.Data.Array.Prim.Pinned as A
46−type Stream = A.Array
47−#elif defined(DATA_ARRAY)
48−import qualified Streamly.Internal.Data.Array as A
49−type Stream = A.Array
50−#endif
51−
52−-------------------------------------------------------------------------------
53−-- Benchmark ops
54−-------------------------------------------------------------------------------
55−
56−-------------------------------------------------------------------------------
57−-- Stream generation and elimination
58−-------------------------------------------------------------------------------
59−
60−-------------------------------------------------------------------------------
61−-- CPP Common to:
62−-- MEMORY_ARRAY
63−-- DATA_ARRAY
64−-- DATA_ARRAY_PRIM
65−-- DATA_ARRAY_PRIM_PINNED
66−-- DATA_SMALLARRAY
67−-------------------------------------------------------------------------------
68−
69−{-# INLINE sourceUnfoldr #-}
70−sourceUnfoldr :: MonadIO m => Int -> Int -> m (Stream Int)
71−sourceUnfoldr value n = S.fold (A.writeN value) $ S.unfoldr step n
72− where
73− step cnt =
74− if cnt > n + value
75− then Nothing
76− else (Just (cnt, cnt + 1))
77−
78−{-# INLINE sourceIntFromTo #-}
79−sourceIntFromTo :: MonadIO m => Int -> Int -> m (Stream Int)
80−sourceIntFromTo value n = S.fold (A.writeN value) $ S.enumerateFromTo n (n + value)
81−
82−{-# INLINE sourceFromList #-}
83−sourceFromList :: MonadIO m => Int -> Int -> m (Stream Int)
84−sourceFromList value n = S.fold (A.writeN value) $ S.fromList [n..n+value]
85−
86−-- Different defination of sourceIntFromToFromList for DATA_SMALLARRAY
87−-- CPP:
88−{-# INLINE sourceIntFromToFromList #-}
89−sourceIntFromToFromList :: MonadIO m => Int -> Int -> m (Stream Int)
90−#ifndef DATA_SMALLARRAY
91−sourceIntFromToFromList value n = P.return $ A.fromList $ [n..n + value]
92−#else
93−sourceIntFromToFromList value n = P.return $ A.fromListN value $ [n..n + value]
94−#endif
95−
96−-------------------------------------------------------------------------------
97−-- CPP Common to:
98−-- MEMORY_ARRAY
99−-- DATA_ARRAY
100−-- DATA_ARRAY_PRIM
101−-- DATA_ARRAY_PRIM_PINNED
102−-------------------------------------------------------------------------------
103−
104−-- CPP:
105−#ifndef DATA_SMALLARRAY
106−{-# INLINE sourceIntFromToFromStream #-}
107−sourceIntFromToFromStream :: MonadIO m => Int -> Int -> m (Stream Int)
108−sourceIntFromToFromStream value n = S.fold A.write $ S.enumerateFromTo n (n + value)
109−#endif
110−
111−-------------------------------------------------------------------------------
112−-- CPP Common to:
113−-- MEMORY_ARRAY
114−-------------------------------------------------------------------------------
115−
116−-- CPP:
117−#ifdef MEMORY_ARRAY
118−{-# INLINE sourceIsList #-}
119−sourceIsList :: Int -> Int -> Stream Int
120−sourceIsList value n = GHC.fromList [n..n+value]
121−
122−{-# INLINE sourceIsString #-}
123−sourceIsString :: Int -> Int -> Stream P.Char
124−sourceIsString value n = GHC.fromString (P.replicate (n + value) 'a')
125−#endif
126−
127−-------------------------------------------------------------------------------
128−-- Transformation
129−-------------------------------------------------------------------------------
130−
131−-------------------------------------------------------------------------------
132−-- CPP Common to:
133−-- MEMORY_ARRAY
134−-- DATA_ARRAY
135−-- DATA_ARRAY_PRIM
136−-- DATA_ARRAY_PRIM_PINNED
137−-- DATA_SMALLARRAY
138−-------------------------------------------------------------------------------
139−
140−{-# INLINE composeN #-}
141−composeN :: P.Monad m
142− => Int -> (Stream Int -> m (Stream Int)) -> Stream Int -> m (Stream Int)
143−composeN n f x =
144− case n of
145− 1 -> f x
146− 2 -> f x P.>>= f
147− 3 -> f x P.>>= f P.>>= f
148− 4 -> f x P.>>= f P.>>= f P.>>= f
149− _ -> undefined
150−
151−{-# INLINE scanl' #-}
152−{-# INLINE scanl1' #-}
153−{-# INLINE map #-}
154−
155−scanl' , scanl1', map
156− :: MonadIO m => Int -> Int -> Stream Int -> m (Stream Int)
157−
158−
159−{-# INLINE onArray #-}
160−onArray
161− :: MonadIO m => Int -> (S.SerialT m Int -> S.SerialT m Int)
162− -> Stream Int
163− -> m (Stream Int)
164−onArray value f arr = S.fold (A.writeN value) $ f $ (S.unfold A.read arr)
165−
166−scanl' value n = composeN n $ onArray value $ S.scanl' (+) 0
167−scanl1' value n = composeN n $ onArray value $ S.scanl1' (+)
168−map value n = composeN n $ onArray value $ S.map (+1)
169−-- map n = composeN n $ A.map (+1)
170−
171−{-# INLINE eqInstance #-}
172−eqInstance :: Stream Int -> Bool
173−eqInstance src = src == src
174−
175−{-# INLINE eqInstanceNotEq #-}
176−eqInstanceNotEq :: Stream Int -> Bool
177−eqInstanceNotEq src = src P./= src
178−
179−{-# INLINE ordInstance #-}
180−ordInstance :: Stream Int -> Bool
181−ordInstance src = src P.< src
182−
183−{-# INLINE ordInstanceMin #-}
184−ordInstanceMin :: Stream Int -> Stream Int
185−ordInstanceMin src = P.min src src
186−
187−{-# INLINE showInstance #-}
188−showInstance :: Stream Int -> P.String
189−showInstance src = P.show src
190−
191−{-# INLINE pureFoldl' #-}
192−pureFoldl' :: MonadIO m => Stream Int -> m Int
193−pureFoldl' = S.foldl' (+) 0 . S.unfold A.read
194−
195−-------------------------------------------------------------------------------
196−-- CPP Common to:
197−-- MEMORY_ARRAY
198−-- DATA_ARRAY
199−-- DATA_SMALLARRAY
200−-------------------------------------------------------------------------------
201−
202−-- CPP:
203−#if !defined(DATA_ARRAY_PRIM) && !defined(DATA_ARRAY_PRIM_PINNED)
204−{-# INLINE readInstance #-}
205−readInstance :: P.String -> Stream Int
206−readInstance str =
207− let r = P.reads str
208− in case r of
209− [(x,"")] -> x
210− _ -> P.error "readInstance: no parse"
211−
212−#ifdef DEVBUILD
213−{-# INLINE foldableFoldl' #-}
214−foldableFoldl' :: Stream Int -> Int
215−foldableFoldl' = F.foldl' (+) 0
216−
217−{-# INLINE foldableSum #-}
218−foldableSum :: Stream Int -> Int
219−foldableSum = P.sum
220−#endif
221−#endif
222−
223−-------------------------------------------------------------------------------
224−-- Elimination
225−-------------------------------------------------------------------------------
226−
227−-------------------------------------------------------------------------------
228−-- CPP Common to:
229−-- MEMORY_ARRAY
230−-- DATA_ARRAY
231−-- DATA_ARRAY_PRIM
232−-- DATA_ARRAY_PRIM_PINNED
233−-- DATA_SMALLARRAY
234−-------------------------------------------------------------------------------
235−
236−{-# INLINE unfoldReadDrain #-}
237−unfoldReadDrain :: MonadIO m => Stream Int -> m ()
238−unfoldReadDrain = S.drain . S.unfold A.read
239−
240−{-# INLINE toStreamRevDrain #-}
241−toStreamRevDrain :: MonadIO m => Stream Int -> m ()
242−toStreamRevDrain = S.drain . A.toStreamRev
benchmark/Streamly/Benchmark/Data/Fold.hs+297−138
@@ -6,35 +6,51 @@
66-- Maintainer : streamly@composewell.com
77
88{-# LANGUAGE FlexibleContexts #-}
9+{-# LANGUAGE FlexibleInstances #-}
10+{-# LANGUAGE RankNTypes #-}
11+{-# LANGUAGE ScopedTypeVariables #-}
12+{-# OPTIONS_GHC -fno-warn-warnings-deprecations #-}
13+{-# OPTIONS_GHC -Wno-orphans #-}
14+
15+#undef FUSION_CHECK
16+#ifdef FUSION_CHECK
17+{-# OPTIONS_GHC -ddump-simpl -ddump-to-file -dsuppress-all #-}
18+#endif
919
1020module Main (main) where
1121
1222import Control.DeepSeq (NFData(..))
13−import Data.Functor.Identity (Identity)
23+import Control.Monad (when)
24+import Control.Monad.IO.Class (MonadIO(..))
25+import Data.Functor.Identity (Identity(..))
1426import Data.Map.Strict (Map)
27+import Data.Hashable (Hashable)
28+import Data.HashMap.Strict (HashMap)
29+import Data.IntMap.Strict (IntMap)
1530import Data.Monoid (Last(..), Sum(..))
1631import System.Random (randomRIO)
1732
18−import Streamly.Prelude (SerialT)
33+import Streamly.Internal.Data.Stream (Stream)
1934import Streamly.Internal.Data.Fold (Fold(..))
35+import Streamly.Internal.Data.IsMap.HashMap ()
36+import Streamly.Internal.Data.MutArray (MutArray)
2037
21−import qualified Data.Map.Strict as Map
2238import qualified Streamly.Internal.Data.Fold as FL
39+import qualified Streamly.Data.Fold.Prelude as Fold
40+import qualified Streamly.Internal.Data.Unfold as Unfold
2341import qualified Streamly.Internal.Data.Pipe as Pipe
24−import qualified Streamly.Internal.Data.Sink as Sink
25−import qualified Streamly.Internal.Data.Stream.IsStream as IP
26−import qualified Streamly.Prelude as S
42+import qualified Streamly.Internal.Data.Stream as Stream
2743
28−import Gauge
44+import Test.Tasty.Bench
2945import Streamly.Benchmark.Common
30−import Prelude hiding (all, any, take, unzip, sequence_)
46+import Prelude hiding (all, any, take, unzip, sequence_, filter)
3147
3248-- We need a monadic bind here to make sure that the function f does not get
3349-- completely optimized out by the compiler in some cases.
3450
3551{-# INLINE sourceUnfoldrM #-}
36−sourceUnfoldrM :: (S.IsStream t, S.MonadAsync m) => Int -> Int -> t m Int
37−sourceUnfoldrM value n = S.unfoldrM step n
52+sourceUnfoldrM :: Monad m => Int -> Int -> Stream m Int
53+sourceUnfoldrM value n = Stream.unfoldrM step n
3854 where
3955 step cnt =
4056 if cnt > n + value
@@ -42,14 +58,14 @@ sourceUnfoldrM value n = S.unfoldrM step n
4258 else return (Just (cnt, cnt + 1))
4359
4460{-# INLINE source #-}
45−source :: (S.MonadAsync m, S.IsStream t) => Int -> Int -> t m Int
61+source :: Monad m => Int -> Int -> Stream m Int
4662source = sourceUnfoldrM
4763
4864-- | Takes a fold method, and uses it with a default source.
4965{-# INLINE benchIOSink #-}
5066benchIOSink
51− :: (S.IsStream t, NFData b)
52− => Int -> String -> (t IO Int -> IO b) -> Benchmark
67+ :: NFData b
68+ => Int -> String -> (Stream IO Int -> IO b) -> Benchmark
5369benchIOSink value name f = bench name $ nfIO $ randomRIO (1,1) >>= f . source value
5470
5571-------------------------------------------------------------------------------
@@ -57,16 +73,16 @@ benchIOSink value name f = bench name $ nfIO $ randomRIO (1,1) >>= f . source va
5773-------------------------------------------------------------------------------
5874
5975{-# INLINE any #-}
60−any :: (Monad m, Ord a) => a -> SerialT m a -> m Bool
61−any value = IP.fold (FL.any (> value))
76+any :: (Monad m, Ord a) => a -> Stream m a -> m Bool
77+any value = Stream.fold (FL.any (> value))
6278
6379{-# INLINE all #-}
64−all :: (Monad m, Ord a) => a -> SerialT m a -> m Bool
65−all value = IP.fold (FL.all (<= value))
80+all :: (Monad m, Ord a) => a -> Stream m a -> m Bool
81+all value = Stream.fold (FL.all (<= value))
6682
6783{-# INLINE take #-}
68−take :: Monad m => Int -> SerialT m a -> m ()
69−take value = IP.fold (FL.take value FL.drain)
84+take :: Monad m => Int -> Stream m a -> m ()
85+take value = Stream.fold (FL.take value FL.drain)
7086
7187{-# INLINE sequence_ #-}
7288sequence_ :: Monad m => Int -> Fold m a ()
@@ -78,55 +94,80 @@ sequence_ value =
7894 {-# INLINE f #-}
7995 f m k = FL.concatMap (const k) m
8096
97+-------------------------------------------------------------------------------
98+-- Filter
99+-------------------------------------------------------------------------------
100+
101+{-# INLINE filter #-}
102+filter :: Monad m => Int -> Stream m Int -> m ()
103+filter _ = Stream.fold (FL.filter even FL.drain)
104+
105+{-# INLINE scanMaybe #-}
106+scanMaybe :: Monad m => Int -> Stream m Int -> m ()
107+scanMaybe _ = Stream.fold (FL.scanMaybe (FL.filtering even) FL.drain)
108+
109+{-# INLINE scanMaybe2 #-}
110+scanMaybe2 :: Monad m => Int -> Stream m Int -> m ()
111+scanMaybe2 _ =
112+ Stream.fold
113+ $ FL.scanMaybe (FL.filtering even)
114+ $ FL.scanMaybe (FL.filtering odd) FL.drain
115+
81116-------------------------------------------------------------------------------
82117-- Splitting by serial application
83118-------------------------------------------------------------------------------
84119
85120{-# INLINE takeEndBy_ #-}
86−takeEndBy_ :: Monad m => Int -> SerialT m Int -> m ()
87−takeEndBy_ value = IP.fold (FL.takeEndBy_ (>= value) FL.drain)
121+takeEndBy_ :: Monad m => Int -> Stream m Int -> m ()
122+takeEndBy_ value = Stream.fold (FL.takeEndBy_ (>= value) FL.drain)
88123
89124{-# INLINE many #-}
90−many :: Monad m => SerialT m Int -> m ()
91−many = IP.fold (FL.many (FL.take 1 FL.drain) FL.drain)
125+many :: Monad m => Stream m Int -> m ()
126+many = Stream.fold (FL.many (FL.take 1 FL.drain) FL.drain)
92127
93128{-# INLINE splitAllAny #-}
94−splitAllAny :: Monad m => Int -> SerialT m Int -> m (Bool, Bool)
129+splitAllAny :: Monad m => Int -> Stream m Int -> m (Bool, Bool)
95130splitAllAny value =
96− IP.fold
97− (FL.serialWith (,)
131+ Stream.fold
132+ (FL.splitWith (,)
98133 (FL.all (<= (value `div` 2)))
99134 (FL.any (> value))
100135 )
101136
102−{-# INLINE serial_ #-}
103−serial_ :: Monad m => Int -> SerialT m Int -> m Bool
104−serial_ value =
105− IP.fold
106− (FL.serial_
137+{-# INLINE split_ #-}
138+split_ :: Monad m => Int -> Stream m Int -> m Bool
139+split_ value =
140+ Stream.fold
141+ (FL.split_
107142 (FL.all (<= (value `div` 2)))
108143 (FL.any (> value))
109144 )
110145
111146{-# INLINE shortest #-}
112−shortest :: Monad m => SerialT m Int -> m (Either Int Int)
113−shortest = IP.fold (FL.shortest FL.sum FL.length)
147+shortest :: Monad m => Stream m Int -> m (Either Int Int)
148+shortest = Stream.fold (FL.shortest FL.sum FL.length)
114149
115150{-# INLINE longest #-}
116−longest :: Monad m => SerialT m Int -> m (Either Int Int)
117−longest = IP.fold (FL.longest FL.sum FL.length)
151+longest :: Monad m => Stream m Int -> m (Either Int Int)
152+longest = Stream.fold (FL.longest FL.sum FL.length)
153+
154+{-# INLINE foldBreak #-}
155+foldBreak :: Monad m => Stream m Int -> m ()
156+foldBreak s = do
157+ (r, s1) <- Stream.foldBreak (FL.take 1 FL.length) s
158+ when (r /= 0) $ foldBreak s1
118159
119160-------------------------------------------------------------------------------
120161-- Distributing by parallel application
121162-------------------------------------------------------------------------------
122163
123164{-# INLINE teeSumLength #-}
124−teeSumLength :: Monad m => SerialT m Int -> m (Int, Int)
125−teeSumLength = IP.fold (FL.teeWith (,) FL.sum FL.length)
165+teeSumLength :: Monad m => Stream m Int -> m (Int, Int)
166+teeSumLength = Stream.fold (FL.teeWith (,) FL.sum FL.length)
126167
127168{-# INLINE teeAllAny #-}
128−teeAllAny :: (Monad m, Ord a) => a -> SerialT m a -> m (Bool, Bool)
129−teeAllAny value = IP.fold (FL.teeWith (,) all_ any_)
169+teeAllAny :: (Monad m, Ord a) => a -> Stream m a -> m (Bool, Bool)
170+teeAllAny value = Stream.fold (FL.teeWith (,) all_ any_)
130171
131172 where
132173
@@ -134,16 +175,16 @@ teeAllAny value = IP.fold (FL.teeWith (,) all_ any_)
134175 any_ = FL.any (> value)
135176
136177{-# INLINE teeWithFst #-}
137−teeWithFst :: Monad m => SerialT m Int -> m (Int, Int)
138−teeWithFst = IP.fold (FL.teeWithFst (,) FL.sum FL.length)
178+teeWithFst :: Monad m => Stream m Int -> m (Int, Int)
179+teeWithFst = Stream.fold (FL.teeWithFst (,) FL.sum FL.length)
139180
140181{-# INLINE teeWithMin #-}
141−teeWithMin :: Monad m => SerialT m Int -> m (Int, Int)
142−teeWithMin = IP.fold (FL.teeWithMin (,) FL.sum FL.length)
182+teeWithMin :: Monad m => Stream m Int -> m (Int, Int)
183+teeWithMin = Stream.fold (FL.teeWithMin (,) FL.sum FL.length)
143184
144185{-# INLINE distribute #-}
145−distribute :: Monad m => SerialT m Int -> m [Int]
146−distribute = IP.fold (FL.distribute [FL.sum, FL.length])
186+distribute :: Monad m => Stream m Int -> m [Int]
187+distribute = Stream.fold (FL.distribute [FL.sum, FL.length])
147188
148189-------------------------------------------------------------------------------
149190-- Partitioning
@@ -154,61 +195,99 @@ oddEven :: Int -> Either Int Int
154195oddEven x = if odd x then Left x else Right x
155196
156197{-# INLINE partition #-}
157−partition :: Monad m => SerialT m Int -> m (Int, Int)
158−partition = IP.fold $ FL.lmap oddEven (FL.partition FL.sum FL.length)
198+partition :: Monad m => Stream m Int -> m (Int, Int)
199+partition = Stream.fold $ FL.lmap oddEven (FL.partition FL.sum FL.length)
159200
160201{-# INLINE partitionByFstM #-}
161−partitionByFstM :: Monad m => SerialT m Int -> m (Int, Int)
202+partitionByFstM :: Monad m => Stream m Int -> m (Int, Int)
162203partitionByFstM =
163− IP.fold (FL.partitionByFstM (return . oddEven) FL.sum FL.length)
204+ Stream.fold (FL.partitionByFstM (return . oddEven) FL.sum FL.length)
164205
165206{-# INLINE partitionByMinM #-}
166−partitionByMinM :: Monad m => SerialT m Int -> m (Int, Int)
207+partitionByMinM :: Monad m => Stream m Int -> m (Int, Int)
167208partitionByMinM =
168− IP.fold (FL.partitionByMinM (return . oddEven) FL.sum FL.length)
169−
170−{-# INLINE demuxWith #-}
171−demuxWith ::
172− (Monad m, Ord k)
173− => (a -> (k, a'))
174− -> Map k (Fold m a' b)
175− -> SerialT m a
176− -> m (Map k b)
177−demuxWith f mp = S.fold (FL.demuxWith f mp)
178−
179−{-# INLINE demuxDefaultWith #-}
180−demuxDefaultWith ::
181− (Monad m, Ord k, Num b)
182− => (a -> (k, b))
183− -> Map k (Fold m b b)
184− -> SerialT m a
185− -> m (Map k b, b)
186−demuxDefaultWith f mp = S.fold (FL.demuxDefaultWith f mp (FL.lmap snd FL.sum))
187−
188−{-# INLINE classifyWith #-}
189−classifyWith ::
190− (Monad m, Ord k, Num a) => (a -> k) -> SerialT m a -> m (Map k a)
191−classifyWith f = S.fold (FL.classifyWith f FL.sum)
209+ Stream.fold (FL.partitionByMinM (return . oddEven) FL.sum FL.length)
210+
211+{-# INLINE demuxToMap #-}
212+demuxToMap :: (Monad m, Ord k) =>
213+ (a -> k) -> (a -> m (Fold m a b)) -> Stream m a -> m (Map k b)
214+demuxToMap f g = Stream.fold (FL.demuxToContainer f g)
215+
216+{-# INLINE demuxToIntMap #-}
217+demuxToIntMap :: Monad m =>
218+ (a -> Int) -> (a -> m (Fold m a b)) -> Stream m a -> m (IntMap b)
219+demuxToIntMap f g = Stream.fold (FL.demuxToContainer f g)
220+
221+{-# INLINE demuxToHashMap #-}
222+demuxToHashMap :: (Monad m, Hashable k) =>
223+ (a -> k) -> (a -> m (Fold m a b)) -> Stream m a -> m (HashMap k b)
224+demuxToHashMap f g = Stream.fold (FL.demuxToContainer f g)
225+
226+{-# INLINE demuxToMapIO #-}
227+demuxToMapIO :: (MonadIO m, Ord k) =>
228+ (a -> k) -> (a -> m (Fold m a b)) -> Stream m a -> m (Map k b)
229+demuxToMapIO f g = Stream.fold (FL.demuxToContainerIO f g)
230+
231+{-# INLINE demuxToHashMapIO #-}
232+demuxToHashMapIO :: (MonadIO m, Hashable k) =>
233+ (a -> k) -> (a -> m (Fold m a b)) -> Stream m a -> m (HashMap k b)
234+demuxToHashMapIO f g = Stream.fold (FL.demuxToContainerIO f g)
235+
236+{-# INLINE toMap #-}
237+toMap ::
238+ (Monad m, Ord k, Num a) => (a -> k) -> Stream m a -> m (Map k a)
239+toMap f = Stream.fold (FL.toContainer f FL.sum)
240+
241+{-# INLINE toIntMap #-}
242+toIntMap ::
243+ (Monad m, Num a) => (a -> Int) -> Stream m a -> m (IntMap a)
244+toIntMap f = Stream.fold (FL.toContainer f FL.sum)
245+
246+{-# INLINE toMapIO #-}
247+toMapIO ::
248+ (MonadIO m, Ord k, Num a) => (a -> k) -> Stream m a -> m (Map k a)
249+toMapIO f = Stream.fold (FL.toContainerIO f FL.sum)
250+
251+{-# INLINE toIntMapIO #-}
252+toIntMapIO ::
253+ (MonadIO m, Num a) => (a -> Int) -> Stream m a -> m (IntMap a)
254+toIntMapIO f = Stream.fold (FL.toContainerIO f FL.sum)
255+
256+{-# INLINE toHashMapIO #-}
257+toHashMapIO :: (MonadIO m, Ord k, Num a, Hashable k) =>
258+ (a -> k) -> Stream m a -> m (HashMap k a)
259+toHashMapIO f = Stream.fold (Fold.toHashMapIO f FL.sum)
192260
193261-------------------------------------------------------------------------------
194262-- unzip
195263-------------------------------------------------------------------------------
196264
197265{-# INLINE unzip #-}
198−unzip :: Monad m => SerialT m Int -> m (Int, Int)
199−unzip = IP.fold $ FL.lmap (\a -> (a, a)) (FL.unzip FL.sum FL.length)
266+unzip :: Monad m => Stream m Int -> m (Int, Int)
267+unzip = Stream.fold $ FL.lmap (\a -> (a, a)) (FL.unzip FL.sum FL.length)
200268
201269{-# INLINE unzipWithFstM #-}
202−unzipWithFstM :: Monad m => SerialT m Int -> m (Int, Int)
270+unzipWithFstM :: Monad m => Stream m Int -> m (Int, Int)
203271unzipWithFstM = do
204− let f = \a -> return (a + 1, a)
205− IP.fold (FL.unzipWithFstM f FL.sum FL.length)
272+ let f a = return (a + 1, a)
273+ Stream.fold (FL.unzipWithFstM f FL.sum FL.length)
206274
207275{-# INLINE unzipWithMinM #-}
208−unzipWithMinM :: Monad m => SerialT m Int -> m (Int, Int)
276+unzipWithMinM :: Monad m => Stream m Int -> m (Int, Int)
209277unzipWithMinM = do
210− let f = \a -> return (a + 1, a)
211− IP.fold (FL.unzipWithMinM f FL.sum FL.length)
278+ let f a = return (a + 1, a)
279+ Stream.fold (FL.unzipWithMinM f FL.sum FL.length)
280+
281+-------------------------------------------------------------------------------
282+-- Nested
283+-------------------------------------------------------------------------------
284+
285+{-# INLINE unfoldMany #-}
286+unfoldMany :: Int -> Benchmarkable
287+unfoldMany val =
288+ nfIO
289+ $ Stream.fold (FL.unfoldMany Unfold.replicateM FL.drain)
290+ $ Stream.fromPure (val, randomRIO (1, 1 :: Int))
212291
213292-------------------------------------------------------------------------------
214293-- Benchmarks
@@ -217,92 +296,113 @@ unzipWithMinM = do
217296moduleName :: String
218297moduleName = "Data.Fold"
219298
299+instance NFData (MutArray a) where
300+ {-# INLINE rnf #-}
301+ rnf _ = ()
302+
303+instance NFData a => NFData (Stream Identity a) where
304+ {-# INLINE rnf #-}
305+ rnf xs = runIdentity $ Stream.fold (FL.foldl' (\_ x -> rnf x) ()) xs
306+
220307o_1_space_serial_elimination :: Int -> [Benchmark]
221308o_1_space_serial_elimination value =
222309 [ bgroup "elimination"
223− [ benchIOSink value "drain" (S.fold FL.drain)
224− , benchIOSink value "drainBy" (S.fold (FL.drainBy return))
225− , benchIOSink value "drainN" (S.fold (FL.drainN value))
226− , benchIOSink value "sink" (S.fold $ Sink.toFold Sink.drain)
227− , benchIOSink value "last" (S.fold FL.last)
228− , benchIOSink value "length" (S.fold FL.length)
229− , benchIOSink value "sum" (S.fold FL.sum)
230− , benchIOSink value "sum (foldMap)" (S.fold (FL.foldMap Sum))
231− , benchIOSink value "product" (S.fold FL.product)
232− , benchIOSink value "maximumBy" (S.fold (FL.maximumBy compare))
233− , benchIOSink value "maximum" (S.fold FL.maximum)
234− , benchIOSink value "minimumBy" (S.fold (FL.minimumBy compare))
235− , benchIOSink value "minimum" (S.fold FL.minimum)
310+ [ benchIOSink value "drain" (Stream.fold FL.drain)
311+ , benchIOSink value "drainBy" (Stream.fold (FL.drainBy return))
312+ , benchIOSink value "drainN" (Stream.fold (FL.drainN value))
313+ , benchIOSink value "last" (Stream.fold FL.last)
314+ , benchIOSink value "length" (Stream.fold FL.length)
315+ , benchIOSink value "top" (Stream.fold $ FL.top 10)
316+ , benchIOSink value "bottom" (Stream.fold $ FL.bottom 10)
317+ , benchIOSink value "sum" (Stream.fold FL.sum)
318+ , benchIOSink value "sum (foldMap)" (Stream.fold (FL.foldMap Sum))
319+ , benchIOSink value "product" (Stream.fold FL.product)
320+ , benchIOSink value "maximumBy" (Stream.fold (FL.maximumBy compare))
321+ , benchIOSink value "maximum" (Stream.fold FL.maximum)
322+ , benchIOSink value "minimumBy" (Stream.fold (FL.minimumBy compare))
323+ , benchIOSink value "minimum" (Stream.fold FL.minimum)
236324 , benchIOSink
237325 value
238326 "mean"
239− (S.fold FL.mean . S.map (fromIntegral :: Int -> Double))
327+ (Stream.fold FL.mean . fmap (fromIntegral :: Int -> Double))
240328 , benchIOSink
241329 value
242330 "variance"
243− (S.fold FL.variance . S.map (fromIntegral :: Int -> Double))
331+ (Stream.fold FL.variance . fmap (fromIntegral :: Int -> Double))
244332 , benchIOSink
245333 value
246334 "stdDev"
247− (S.fold FL.stdDev . S.map (fromIntegral :: Int -> Double))
335+ (Stream.fold FL.stdDev . fmap (fromIntegral :: Int -> Double))
248336 , benchIOSink
249337 value
250338 "mconcat"
251− (S.fold FL.mconcat . S.map (Last . Just))
339+ (Stream.fold FL.mconcat . fmap (Last . Just))
252340 , benchIOSink
253341 value
254342 "foldMap"
255− (S.fold (FL.foldMap (Last . Just)))
343+ (Stream.fold (FL.foldMap (Last . Just)))
256344 , benchIOSink
257345 value
258346 "foldMapM"
259− (S.fold (FL.foldMapM (return . Last . Just)))
260− , benchIOSink value "index" (S.fold (FL.index (value + 1)))
261− , benchIOSink value "head" (S.fold FL.head)
262− , benchIOSink value "find" (S.fold (FL.find (== (value + 1))))
347+ (Stream.fold (FL.foldMapM (return . Last . Just)))
348+ , benchIOSink value "index" (Stream.fold (FL.index (value + 1)))
349+ , benchIOSink value "head" (Stream.fold FL.head)
350+ , benchIOSink value "find" (Stream.fold (FL.find (== (value + 1))))
263351 , benchIOSink
264352 value
265353 "lookup"
266− (S.fold (FL.lmap (\a -> (a, a)) (FL.lookup (value + 1))))
354+ (Stream.fold (FL.lmap (\a -> (a, a)) (FL.lookup (value + 1))))
267355 , benchIOSink
268356 value
269357 "findIndex"
270− (S.fold (FL.findIndex (== (value + 1))))
358+ (Stream.fold (FL.findIndex (== (value + 1))))
271359 , benchIOSink
272360 value
273361 "elemIndex"
274− (S.fold (FL.elemIndex (value + 1)))
275− , benchIOSink value "null" (S.fold FL.null)
276− , benchIOSink value "elem" (S.fold (FL.elem (value + 1)))
277− , benchIOSink value "notElem" (S.fold (FL.notElem (value + 1)))
362+ (Stream.fold (FL.elemIndex (value + 1)))
363+ , benchIOSink value "null" (Stream.fold FL.null)
364+ , benchIOSink value "elem" (Stream.fold (FL.elem (value + 1)))
365+ , benchIOSink value "notElem" (Stream.fold (FL.notElem (value + 1)))
278366 , benchIOSink value "all" $ all value
279367 , benchIOSink value "any" $ any value
280368 , benchIOSink value "take" $ take value
281369 , benchIOSink value "takeEndBy_" $ takeEndBy_ value
282− , benchIOSink value "and" (S.fold FL.and . S.map (<= (value + 1)))
283− , benchIOSink value "or" (S.fold FL.or . S.map (> (value + 1)))
370+ , benchIOSink value "and" (Stream.fold FL.and . fmap (<= (value + 1)))
371+ , benchIOSink value "or" (Stream.fold FL.or . fmap (> (value + 1)))
284372 ]
285373 ]
286374
287375o_1_space_serial_transformation :: Int -> [Benchmark]
288376o_1_space_serial_transformation value =
289377 [ bgroup "transformation"
290− [ benchIOSink value "map" (S.fold (FL.lmap (+ 1) FL.drain))
378+ [ benchIOSink value "map" (Stream.fold (FL.lmap (+ 1) FL.drain))
291379 , let f x = if even x then Just x else Nothing
292380 fld = FL.mapMaybe f FL.drain
293− in benchIOSink value "mapMaybe" (S.fold fld)
381+ in benchIOSink value "mapMaybe" (Stream.fold fld)
294382 , benchIOSink
295383 value
296384 "rsequence"
297− (S.fold (FL.rmapM id (return <$> FL.drain)))
298− , benchIOSink value "rmapM" (S.fold (FL.rmapM return FL.drain))
385+ (Stream.fold (FL.rmapM id (return <$> FL.drain)))
386+ , benchIOSink value "rmapM" (Stream.fold (FL.rmapM return FL.drain))
299387 , benchIOSink
300388 value
301389 "pipe-mapM"
302− (S.fold
390+ (Stream.fold
303391 (FL.transform
304392 (Pipe.mapM (\x -> return $ x + 1))
305393 FL.drain))
394+ , benchIOSink
395+ value
396+ "fold-scan"
397+ (Stream.fold $ FL.scan FL.sum FL.drain)
398+ , benchIOSink
399+ value
400+ "fold-scanMany"
401+ (Stream.fold $ FL.scanMany (FL.take 2 FL.drain) FL.drain)
402+ , benchIOSink
403+ value
404+ "fold-postscan"
405+ (Stream.fold $ FL.postscan FL.sum FL.drain)
306406 ]
307407 ]
308408
@@ -310,10 +410,15 @@ o_1_space_serial_composition :: Int -> [Benchmark]
310410o_1_space_serial_composition value =
311411 [ bgroup
312412 "composition"
313− [ benchIOSink value "serialWith (all, any)" $ splitAllAny value
314− , benchIOSink value "serial_ (all, any)" $ serial_ value
413+ [ benchIOSink value "filter even" $ filter value
414+ , benchIOSink value "scanMaybe even" $ scanMaybe value
415+ , benchIOSink value "scanMaybe even, odd" $ scanMaybe2 value
416+ , benchIOSink value "foldBreak (recursive)" foldBreak
417+ , benchIOSink value "splitWith (all, any)" $ splitAllAny value
418+ , benchIOSink value "split_ (all, any)" $ split_ value
315419 , benchIOSink value "tee (all, any)" $ teeAllAny value
316420 , benchIOSink value "many drain (take 1)" many
421+ , bench "unfoldMany" $ unfoldMany value
317422 , benchIOSink value "shortest (sum, length)" shortest
318423 , benchIOSink value "longest (sum, length)" longest
319424 , benchIOSink value "tee (sum, length)" teeSumLength
@@ -326,23 +431,12 @@ o_1_space_serial_composition value =
326431 , benchIOSink value "unzip (sum, length)" unzip
327432 , benchIOSink value "unzipWithFstM (sum, length)" unzipWithFstM
328433 , benchIOSink value "unzipWithMinM (sum, length)" unzipWithMinM
329− , benchIOSink value "demuxDefaultWith [sum, length] sum"
330− $ demuxDefaultWith fn mp
331− , benchIOSink value "demuxWith [sum, length]" $ demuxWith fn mp
332− , benchIOSink value "classifyWith sum" $ classifyWith (fst . fn)
333434 ]
334435 ]
335436
336− where
337−
338− -- We use three keys 0, 1, and 2. 0 and 1 are mapped and 3 is unmapped.
339− fn x = (x `mod` 3, x)
340−
341− mp = Map.fromList [(0, FL.sum), (1, FL.length)]
342−
343437o_n_space_serial :: Int -> [Benchmark]
344438o_n_space_serial value =
345− [ benchIOSink value "sequence_/100" $ S.fold (sequence_ (value `div` 100))
439+ [ benchIOSink value "sequence_/100" $ Stream.fold (sequence_ (value `div` 100))
346440 ]
347441
348442o_n_heap_serial :: Int -> [Benchmark]
@@ -351,23 +445,71 @@ o_n_heap_serial value =
351445 -- Left folds for building a structure are inherently non-streaming
352446 -- as the structure cannot be lazily consumed until fully built.
353447 [
354− benchIOSink value "toList" (S.fold FL.toList)
355− , benchIOSink value "toListRev" (S.fold FL.toListRev)
448+ benchIOSink value "toList" (Stream.fold FL.toList)
449+ , benchIOSink value "toListRev" (Stream.fold FL.toListRev)
356450 , benchIOSink value "toStream"
357− (S.fold FL.toStream
358− :: SerialT IO a -> IO (SerialT Identity a))
451+ (Stream.fold FL.toStream
452+ :: Stream IO a -> IO (Stream Identity a))
359453 , benchIOSink value "toStreamRev"
360− (S.fold FL.toStreamRev
361− :: SerialT IO a -> IO (SerialT Identity a))
454+ (Stream.fold FL.toStreamRev
455+ :: Stream IO a -> IO (Stream Identity a))
456+ , benchIOSink value "nub" (Stream.fold FL.nub)
457+ ]
458+ , bgroup "key-value"
459+ [
460+ benchIOSink value "demuxToMap (64 buckets) [sum, length]"
461+ $ demuxToMap (getKey 64) (getFold . getKey 64)
462+ , benchIOSink value "demuxToIntMap (64 buckets) [sum, length]"
463+ $ demuxToIntMap (getKey 64) (getFold . getKey 64)
464+ , benchIOSink value "demuxToHashMap (64 buckets) [sum, length]"
465+ $ demuxToHashMap (getKey 64) (getFold . getKey 64)
466+ , benchIOSink value "demuxToMapIO (64 buckets) [sum, length]"
467+ $ demuxToMapIO (getKey 64) (getFold . getKey 64)
468+ , benchIOSink value "demuxToHashMapIO (64 buckets) [sum, length]"
469+ $ demuxToHashMapIO (getKey 64) (getFold . getKey 64)
470+
471+ -- classify: immutable
472+ , benchIOSink value "toMap (64 buckets) sum"
473+ $ toMap (getKey 64)
474+ , benchIOSink value "toIntMap (64 buckets) sum"
475+ $ toIntMap (getKey 64)
476+
477+ -- classify: mutable cells
478+ , benchIOSink value "toMapIO (single bucket) sum"
479+ $ toMapIO (getKey 1)
480+ , benchIOSink value "toMapIO (64 buckets) sum"
481+ $ toMapIO (getKey 64)
482+ , benchIOSink value "toMapIO (max buckets) sum"
483+ $ toMapIO (getKey value)
484+ , benchIOSink value "toIntMapIO (64 buckets) sum"
485+ $ toIntMapIO (getKey 64)
486+ , benchIOSink value "toHashMapIO (single bucket) sum"
487+ $ toHashMapIO (getKey 1)
488+ , benchIOSink value "toHashMapIO (64 buckets) sum"
489+ $ toHashMapIO (getKey 64)
490+ , benchIOSink value "toHashMapIO (max buckets) sum"
491+ $ toHashMapIO (getKey value)
362492 ]
363493 ]
364494
495+ where
496+
497+ getKey buckets = (`mod` buckets)
498+
499+ getFold k =
500+ return $ case k of
501+ 0 -> FL.sum
502+ 1 -> FL.length
503+ _ -> FL.length
504+
365505-------------------------------------------------------------------------------
366506-- Driver
367507-------------------------------------------------------------------------------
368508
369509main :: IO ()
370−main = runWithCLIOpts defaultStreamSize allBenchmarks
510+main = do
511+#ifndef FUSION_CHECK
512+ runWithCLIOpts defaultStreamSize allBenchmarks
371513
372514 where
373515
@@ -380,3 +522,20 @@ main = runWithCLIOpts defaultStreamSize allBenchmarks
380522 , bgroup (o_n_space_prefix moduleName) (o_n_space_serial value)
381523 , bgroup (o_n_heap_prefix moduleName) (o_n_heap_serial value)
382524 ]
525+#else
526+ -- Enable FUSION_CHECK macro at the beginning of the file
527+ -- Enable one benchmark below, and run the benchmark
528+ -- Check the .dump-simpl output
529+ let value = 100000
530+ let input = source value 1
531+ let getKey buckets = (`mod` buckets)
532+ let getFold k =
533+ return $ case k of
534+ 0 -> FL.sum
535+ 1 -> FL.length
536+ _ -> FL.length
537+
538+ -- demuxToMap (getKey 64) (getFold . getKey 64) input
539+ toIntMapIO (getKey 64) input
540+ return ()
541+#endif
benchmark/Streamly/Benchmark/Data/Fold/Window.hsnew file+191
@@ -0,0 +1,191 @@
1+{-# OPTIONS_GHC -Wno-deprecations #-}
2+
3+module Main (main) where
4+
5+import Control.DeepSeq (NFData)
6+import Streamly.Data.Fold (Fold)
7+import Streamly.Internal.Data.Stream (Stream)
8+import System.Random (randomRIO)
9+
10+import qualified Streamly.Data.Fold as Fold
11+import qualified Streamly.Internal.Data.Fold as Window
12+import qualified Streamly.Internal.Data.Ring as Ring
13+import qualified Streamly.Internal.Data.Stream as Stream
14+
15+import Streamly.Benchmark.Common
16+import Test.Tasty.Bench
17+
18+{-# INLINE source #-}
19+source :: (Monad m, Num a, Stream.Enumerable a) =>
20+ Int -> a -> Stream m a
21+source len from =
22+ Stream.enumerateFromThenTo from (from + 1) (from + fromIntegral len)
23+
24+{-# INLINE sourceDescending #-}
25+sourceDescending :: (Monad m, Num a, Stream.Enumerable a) =>
26+ Int -> a -> Stream m a
27+sourceDescending len from =
28+ Stream.enumerateFromThenTo
29+ (from + fromIntegral len)
30+ (from + fromIntegral (len - 1))
31+ from
32+
33+{-# INLINE sourceDescendingInt #-}
34+sourceDescendingInt :: Monad m => Int -> Int -> Stream m Int
35+sourceDescendingInt = sourceDescending
36+
37+{-# INLINE benchWith #-}
38+benchWith :: (Num a, NFData b) =>
39+ (Int -> a -> Stream IO a) -> Int -> String -> Fold IO a b -> Benchmark
40+benchWith src len name f =
41+ bench name
42+ $ nfIO
43+ $ randomRIO (1, 1 :: Int) >>= Stream.fold f . src len . fromIntegral
44+
45+{-# INLINE benchWithFold #-}
46+benchWithFold :: NFData a => Int -> String -> Fold IO Double a -> Benchmark
47+benchWithFold = benchWith source
48+
49+{-# INLINE benchWithFoldInt #-}
50+benchWithFoldInt :: Int -> String -> Fold IO Int Int -> Benchmark
51+benchWithFoldInt = benchWith source
52+
53+{-# INLINE benchScanWith #-}
54+benchScanWith :: Num a =>
55+ (Int -> a -> Stream IO a) -> Int -> String -> Fold IO a b -> Benchmark
56+benchScanWith src len name f =
57+ bench name
58+ $ nfIO
59+ $ randomRIO (1, 1 :: Int)
60+ >>= Stream.fold Fold.drain
61+ . Stream.postscan f
62+ . src len
63+ . fromIntegral
64+
65+{-# INLINE benchWithPostscan #-}
66+benchWithPostscan :: Int -> String -> Fold IO Double a -> Benchmark
67+benchWithPostscan = benchScanWith source
68+
69+o_1_space_folds :: Int -> [Benchmark]
70+o_1_space_folds numElements =
71+ [ bgroup "fold"
72+ [ benchWithFold numElements "minimum (window size 100)"
73+ (Window.windowMinimum 100)
74+ , benchWithFold numElements "minimum (window size 1000)"
75+ (Window.windowMinimum 1000)
76+ , benchWith sourceDescendingInt numElements
77+ "minimum descending (window size 1000)"
78+ (Window.windowMinimum 1000)
79+
80+ , benchWithFold numElements "maximum (window size 100)"
81+ (Window.windowMaximum 100)
82+ , benchWithFold numElements "maximum (window size 1000)"
83+ (Window.windowMaximum 1000)
84+ , benchWith sourceDescendingInt numElements
85+ "maximum descending (window size 1000)"
86+ (Window.windowMaximum 1000)
87+
88+ , benchWithFold numElements "range (window size 100)"
89+ (Window.windowRange 100)
90+ , benchWithFold numElements "range (window size 1000)"
91+ (Window.windowRange 1000)
92+ , benchWith sourceDescendingInt numElements
93+ "range descending (window size 1000)"
94+ (Window.windowRange 1000)
95+
96+ , benchWithFoldInt numElements "sumInt (window size 100)"
97+ (Ring.slidingWindow 100 Window.windowSumInt)
98+ , benchWithFoldInt numElements "sum for Int (window size 100)"
99+ (Ring.slidingWindow 100 Window.windowSum)
100+ , benchWithFold numElements "sum (window size 100)"
101+ (Ring.slidingWindow 100 Window.windowSum)
102+ , benchWithFold numElements "sum (window size 1000)"
103+ (Ring.slidingWindow 1000 Window.windowSum)
104+ , benchWithFold numElements "sum (entire stream)"
105+ (Window.cumulative Window.windowSum)
106+ , benchWithFold numElements "sum (Data.Fold)"
107+ Fold.sum
108+
109+ , benchWithFold numElements "mean (window size 100)"
110+ (Ring.slidingWindow 100 Window.windowMean)
111+ , benchWithFold numElements "mean (window size 1000)"
112+ (Ring.slidingWindow 1000 Window.windowMean)
113+ , benchWithFold numElements "mean (entire stream)"
114+ (Window.cumulative Window.windowMean)
115+ , benchWithFold numElements "mean (Data.Fold)"
116+ Fold.mean
117+
118+ , benchWithFold numElements "powerSum 2 (window size 100)"
119+ (Ring.slidingWindow 100 (Window.windowPowerSum 2))
120+ , benchWithFold numElements "powerSum 2 (entire stream)"
121+ (Window.cumulative (Window.windowPowerSum 2))
122+
123+ ]
124+ ]
125+
126+o_1_space_scans :: Int -> [Benchmark]
127+o_1_space_scans numElements =
128+ [ bgroup "scan"
129+ [ benchWithPostscan numElements "minimum (window size 10)"
130+ (Window.windowMinimum 10)
131+ -- Below window size 30 the linear search based impl performs better
132+ -- than the dequeue based implementation.
133+ , benchWithPostscan numElements "minimum (window size 30)"
134+ (Window.windowMinimum 30)
135+ , benchWithPostscan numElements "minimum (window size 1000)"
136+ (Window.windowMinimum 1000)
137+ , benchScanWith sourceDescendingInt numElements
138+ "minimum descending (window size 1000)"
139+ (Window.windowMinimum 1000)
140+
141+ , benchWithPostscan numElements "maximum (window size 10)"
142+ (Window.windowMaximum 10)
143+ , benchWithPostscan numElements "maximum (window size 30)"
144+ (Window.windowMaximum 30)
145+ , benchWithPostscan numElements "maximum (window size 1000)"
146+ (Window.windowMaximum 1000)
147+ , benchScanWith sourceDescendingInt numElements
148+ "maximum descending (window size 1000)"
149+ (Window.windowMaximum 1000)
150+
151+ , benchWithPostscan numElements "range (window size 10)"
152+ (Window.windowRange 10)
153+ , benchWithPostscan numElements "range (window size 30)"
154+ (Window.windowRange 30)
155+ , benchWithPostscan numElements "range (window size 1000)"
156+ (Window.windowRange 1000)
157+ , benchScanWith sourceDescendingInt numElements
158+ "range descending (window size 1000)"
159+ (Window.windowRange 1000)
160+
161+ , benchWithPostscan numElements "sum (window size 100)"
162+ (Ring.slidingWindow 100 Window.windowSum)
163+ , benchWithPostscan numElements "sum (window size 1000)"
164+ (Ring.slidingWindow 1000 Window.windowSum)
165+
166+ , benchWithPostscan numElements "mean (window size 100)"
167+ (Ring.slidingWindow 100 Window.windowMean)
168+ , benchWithPostscan numElements "mean (window size 1000)"
169+ (Ring.slidingWindow 1000 Window.windowMean)
170+
171+ , benchWithPostscan numElements "powerSum 2 (window size 100)"
172+ (Ring.slidingWindow 100 (Window.windowPowerSum 2))
173+ , benchWithPostscan numElements "powerSum 2 (window size 1000)"
174+ (Ring.slidingWindow 1000 (Window.windowPowerSum 2))
175+ ]
176+ ]
177+
178+moduleName :: String
179+moduleName = "Data.Fold.Window"
180+
181+main :: IO ()
182+main = runWithCLIOpts defaultStreamSize allBenchmarks
183+
184+ where
185+
186+ allBenchmarks value =
187+ [ bgroup (o_1_space_prefix moduleName) $ concat
188+ [ o_1_space_folds value
189+ , o_1_space_scans value
190+ ]
191+ ]
benchmark/Streamly/Benchmark/Data/MutArray.hsnew file+300
@@ -0,0 +1,300 @@
1+{-# OPTIONS_GHC -Wno-deprecations #-}
2+{-# OPTIONS_GHC -Wno-orphans #-}
3+
4+-- |
5+-- Module : Streamly.Benchmark.Data.Array.Unboxed.Mut
6+-- Copyright : (c) 2021 Composewell Technologies
7+-- License : BSD-3-Clause
8+-- Maintainer : streamly@composewell.com
9+
10+{-# LANGUAGE CPP #-}
11+{-# LANGUAGE FlexibleContexts #-}
12+{-# LANGUAGE ScopedTypeVariables #-}
13+
14+#ifdef __HADDOCK_VERSION__
15+#undef INSPECTION
16+#endif
17+
18+#ifdef INSPECTION
19+{-# LANGUAGE TemplateHaskell #-}
20+{-# OPTIONS_GHC -fplugin Test.Inspection.Plugin #-}
21+#endif
22+
23+import Control.DeepSeq (NFData(..))
24+import Control.Monad.IO.Class (MonadIO)
25+import Data.Functor ((<&>))
26+import System.Random (randomRIO)
27+import Prelude
28+ ( IO
29+ , Int
30+ , Integral(..)
31+ , Maybe(..)
32+ , Monad(..)
33+ , Num(..)
34+ , Ord(..)
35+ , String
36+ , ($)
37+ , (.)
38+ , (||)
39+ , concat
40+ , const
41+ , fmap
42+ , id
43+ , undefined
44+ )
45+import Streamly.Internal.Data.MutArray (MutArray)
46+
47+import qualified Streamly.Internal.Data.Array as Array
48+import qualified Streamly.Internal.Data.MutArray as MArray
49+import qualified Streamly.Internal.Data.Fold as Fold
50+import qualified Streamly.Internal.Data.Stream as Stream
51+
52+import Test.Tasty.Bench
53+import Streamly.Benchmark.Common hiding (benchPureSrc)
54+
55+type Stream = MutArray
56+
57+instance NFData (MutArray a) where
58+ {-# INLINE rnf #-}
59+ rnf _ = ()
60+
61+-------------------------------------------------------------------------------
62+-- Benchmark helpers
63+-------------------------------------------------------------------------------
64+
65+{-# INLINE benchIO #-}
66+benchIO :: NFData b => String -> (Int -> IO a) -> (a -> b) -> Benchmark
67+benchIO name src f = bench name $ nfIO $
68+ (randomRIO (1,1) >>= src) <&> f
69+
70+{-# INLINE benchPureSink #-}
71+benchPureSink :: NFData b => Int -> String -> (Stream Int -> b) -> Benchmark
72+benchPureSink value name = benchIO name (sourceIntFromTo value)
73+
74+{-# INLINE benchIO' #-}
75+benchIO' :: NFData b => String -> (Int -> IO a) -> (a -> IO b) -> Benchmark
76+benchIO' name src f = bench name $ nfIO $
77+ randomRIO (1,1) >>= src >>= f
78+
79+{-# INLINE benchIOSink #-}
80+benchIOSink :: NFData b => Int -> String -> (Stream Int -> IO b) -> Benchmark
81+benchIOSink value name = benchIO' name (sourceIntFromTo value)
82+
83+-- Drain a source that generates an array in the IO monad
84+{-# INLINE benchIOSrc #-}
85+benchIOSrc :: String -> (Int -> IO (Stream a)) -> Benchmark
86+benchIOSrc name src = benchIO name src id
87+
88+drain :: Monad m => Stream.Stream m a -> m ()
89+drain = Stream.fold Fold.drain
90+
91+-------------------------------------------------------------------------------
92+-- Bench Ops
93+-------------------------------------------------------------------------------
94+
95+{-# INLINE sourceUnfoldr #-}
96+sourceUnfoldr :: MonadIO m => Int -> Int -> m (Stream Int)
97+sourceUnfoldr value n =
98+ Stream.fold (MArray.writeN value) $ Stream.unfoldr step n
99+
100+ where
101+
102+ step cnt =
103+ if cnt > n + value
104+ then Nothing
105+ else Just (cnt, cnt + 1)
106+
107+{-# INLINE sourceIntFromTo #-}
108+sourceIntFromTo :: MonadIO m => Int -> Int -> m (Stream Int)
109+sourceIntFromTo value n =
110+ Stream.fold (MArray.writeN value) $ Stream.enumerateFromTo n (n + value)
111+
112+{-# INLINE sourceFromList #-}
113+sourceFromList :: MonadIO m => Int -> Int -> m (Stream Int)
114+sourceFromList value n =
115+ Stream.fold (MArray.writeN value) $ Stream.fromList [n .. n + value]
116+
117+{-# INLINE sourceIntFromToFromList #-}
118+sourceIntFromToFromList :: MonadIO m => Int -> Int -> m (Stream Int)
119+sourceIntFromToFromList value n = MArray.fromListN value [n..n + value]
120+
121+{-# INLINE sourceIntFromToFromStream #-}
122+sourceIntFromToFromStream :: MonadIO m => Int -> Int -> m (Stream Int)
123+sourceIntFromToFromStream value n =
124+ Stream.fold MArray.write $ Stream.enumerateFromTo n (n + value)
125+
126+{-# INLINE sourceUnfoldrM #-}
127+sourceUnfoldrM :: Monad m => Int -> Int -> Stream.Stream m Int
128+sourceUnfoldrM value n = Stream.unfoldrM step n
129+ where
130+ step cnt =
131+ if cnt > n + value
132+ then return Nothing
133+ else return (Just (cnt, cnt + 1))
134+
135+-------------------------------------------------------------------------------
136+-- Transformation
137+-------------------------------------------------------------------------------
138+
139+{-# INLINE composeN #-}
140+composeN :: Monad m
141+ => Int -> (Stream Int -> m (Stream Int)) -> Stream Int -> m (Stream Int)
142+composeN n f x =
143+ case n of
144+ 1 -> f x
145+ 2 -> f x >>= f
146+ 3 -> f x >>= f >>= f
147+ 4 -> f x >>= f >>= f >>= f
148+ _ -> undefined
149+
150+{-# INLINE scanl' #-}
151+scanl' :: MonadIO m => Int -> Int -> Stream Int -> m (Stream Int)
152+scanl' value n = composeN n $ onArray value $ Stream.scan (Fold.foldl' (+) 0)
153+
154+{-# INLINE scanl1' #-}
155+scanl1' :: MonadIO m => Int -> Int -> Stream Int -> m (Stream Int)
156+scanl1' value n = composeN n $ onArray value $ Stream.scanl1' (+)
157+
158+{-# INLINE map #-}
159+map :: MonadIO m => Int -> Int -> Stream Int -> m (Stream Int)
160+map value n = composeN n $ onArray value $ fmap (+ 1)
161+
162+{-# INLINE onArray #-}
163+onArray
164+ :: MonadIO m => Int -> (Stream.Stream m Int -> Stream.Stream m Int)
165+ -> Stream Int
166+ -> m (Stream Int)
167+onArray value f arr =
168+ Stream.fold (MArray.writeN value) $ f $ Stream.unfold MArray.reader arr
169+
170+-------------------------------------------------------------------------------
171+-- Elimination
172+-------------------------------------------------------------------------------
173+
174+{-# INLINE unfoldReadDrain #-}
175+unfoldReadDrain :: MonadIO m => Stream Int -> m ()
176+unfoldReadDrain = drain . Stream.unfold MArray.reader
177+
178+{-# INLINE unfoldReadRevDrain #-}
179+unfoldReadRevDrain :: MonadIO m => Stream Int -> m ()
180+unfoldReadRevDrain = drain . Stream.unfold MArray.readerRev
181+
182+{-# INLINE toStreamDRevDrain #-}
183+toStreamDRevDrain :: MonadIO m => Stream Int -> m ()
184+toStreamDRevDrain = drain . MArray.readRev
185+
186+{-# INLINE toStreamDDrain #-}
187+toStreamDDrain :: MonadIO m => Stream Int -> m ()
188+toStreamDDrain = drain . MArray.read
189+
190+{-# INLINE unfoldFold #-}
191+unfoldFold :: MonadIO m => Stream Int -> m Int
192+unfoldFold = Stream.fold (Fold.foldl' (+) 0) . Stream.unfold MArray.reader
193+
194+-------------------------------------------------------------------------------
195+-- Bench groups
196+-------------------------------------------------------------------------------
197+
198+o_1_space_generation :: Int -> [Benchmark]
199+o_1_space_generation value =
200+ [ bgroup
201+ "generation"
202+ [ benchIOSrc "writeN . intFromTo" (sourceIntFromTo value)
203+ , benchIOSrc
204+ "fromList . intFromTo"
205+ (sourceIntFromToFromList value)
206+ , benchIOSrc "writeN . unfoldr" (sourceUnfoldr value)
207+ , benchIOSrc "writeN . fromList" (sourceFromList value)
208+ , benchIOSrc "write . intFromTo" (sourceIntFromToFromStream value)
209+ ]
210+ ]
211+
212+o_1_space_elimination :: Int -> [Benchmark]
213+o_1_space_elimination value =
214+ [ bgroup "elimination"
215+ [ benchPureSink value "id" id
216+ , benchIOSink value "foldl'" unfoldFold
217+ , benchIOSink value "read" unfoldReadDrain
218+ , benchIOSink value "readRev" unfoldReadRevDrain
219+ , benchIOSink value "toStream" toStreamDDrain
220+ , benchIOSink value "toStreamRev" toStreamDRevDrain
221+ ]
222+ ]
223+
224+o_n_heap_serial :: Int -> [Benchmark]
225+o_n_heap_serial value =
226+ [ bgroup "elimination"
227+ [
228+ -- Converting the stream to an array
229+ benchFold "writeN" (Stream.fold (MArray.writeN value))
230+ (sourceUnfoldrM value)
231+ ]
232+ ]
233+
234+o_1_space_transformation :: Int -> [Benchmark]
235+o_1_space_transformation value =
236+ [ bgroup "transformation"
237+ [ benchIOSink value "scanl'" (scanl' value 1)
238+ , benchIOSink value "scanl1'" (scanl1' value 1)
239+ , benchIOSink value "map" (map value 1)
240+ ]
241+ ]
242+
243+o_1_space_transformationX4 :: Int -> [Benchmark]
244+o_1_space_transformationX4 value =
245+ [ bgroup "transformationX4"
246+ [ benchIOSink value "scanl'" (scanl' value 4)
247+ , benchIOSink value "scanl1'" (scanl1' value 4)
248+ , benchIOSink value "map" (map value 4)
249+ ]
250+ ]
251+
252+o_1_space_serial_marray ::
253+ Int -> (MutArray Int, Array.Array Int) -> [Benchmark]
254+o_1_space_serial_marray value ~(array, indices) =
255+ [ benchIO' "partitionBy (< 0)" (const (return array))
256+ $ MArray.partitionBy (< 0)
257+ , benchIO' "partitionBy (> 0)" (const (return array))
258+ $ MArray.partitionBy (> 0)
259+ , benchIO' "partitionBy (< value/2)" (const (return array))
260+ $ MArray.partitionBy (< (value `div` 2))
261+ , benchIO' "partitionBy (> value/2)" (const (return array))
262+ $ MArray.partitionBy (> (value `div` 2))
263+ , benchIO' "strip (< value/2 || > value/2)" (const (return array))
264+ $ MArray.strip (\x -> x < value `div` 2 || x > value `div` 2)
265+ , benchIO' "strip (> 0)" (const (return array))
266+ $ MArray.strip (> 0)
267+ , benchIO' "modifyIndices (+ 1)" (const (return indices))
268+ $ Stream.fold (MArray.modifyIndices array (\_idx val -> val + 1))
269+ . Stream.unfold Array.reader
270+ ]
271+
272+-------------------------------------------------------------------------------
273+-- Driver
274+-------------------------------------------------------------------------------
275+
276+moduleName :: String
277+moduleName = "Data.MutArray"
278+
279+main :: IO ()
280+main = do
281+ runWithCLIOptsEnv defaultStreamSize alloc allBenchmarks
282+
283+ where
284+
285+ alloc value = do
286+ marr <- MArray.fromStream (sourceUnfoldrM value 0 :: Stream.Stream IO Int)
287+ indices <- Array.fromStream (sourceUnfoldrM value 0 :: Stream.Stream IO Int)
288+ return (marr, indices)
289+
290+ allBenchmarks array value =
291+ [ bgroup (o_1_space_prefix moduleName)
292+ $ concat
293+ [ o_1_space_serial_marray value array
294+ , o_1_space_generation value
295+ , o_1_space_elimination value
296+ , o_1_space_transformation value
297+ , o_1_space_transformationX4 value
298+ ]
299+ , bgroup (o_n_heap_prefix moduleName) (o_n_heap_serial value)
300+ ]
benchmark/Streamly/Benchmark/Data/Parser.hs+641−181
@@ -1,3 +1,10 @@
1+{-# OPTIONS_GHC -Wno-deprecations #-}
2+
3+#undef FUSION_CHECK
4+#ifdef FUSION_CHECK
5+{-# OPTIONS_GHC -ddump-simpl -ddump-to-file -dsuppress-all #-}
6+#endif
7+
18-- |
29-- Module : Streamly.Benchmark.Data.Parser
310-- Copyright : (c) 2020 Composewell Technologies
@@ -7,43 +14,42 @@
714
815{-# LANGUAGE CPP #-}
916{-# LANGUAGE FlexibleContexts #-}
17+{-# LANGUAGE ScopedTypeVariables #-}
18+{-# OPTIONS_GHC -Wno-orphans #-}
1019
1120module Main
1221 (
1322 main
1423 ) where
1524
25+import Control.Applicative ((<|>))
1626import Control.DeepSeq (NFData(..))
17−import Control.Monad.Catch (MonadCatch)
18−import Data.Foldable (asum)
27+import Data.Function ((&))
1928import Data.Functor (($>))
20−import Data.Maybe (fromMaybe)
2129import Data.Monoid (Sum(..))
2230import GHC.Magic (inline)
23−#if __GLASGOW_HASKELL__ >= 802
2431import GHC.Magic (noinline)
25−#else
26−#define noinline
27−#endif
2832import System.IO (Handle)
2933import System.Random (randomRIO)
30−import Prelude
31− hiding (any, all, take, sequence, sequence_, sequenceA, takeWhile)
34+import Streamly.Internal.Data.Fold (Fold(..))
35+import Streamly.Internal.Data.Parser
36+ (ParseError(..), Parser(..), Initial(..), Step(..))
37+import Streamly.Internal.Data.Stream (Stream)
38+import Prelude hiding
39+ (any, all, take, sequence, sequence_, sequenceA, takeWhile, dropWhile, span)
3240
33−import qualified Data.Traversable as TR
34−import qualified Data.Foldable as F
3541import qualified Control.Applicative as AP
42+import qualified Data.Foldable as F
43+import qualified Data.Traversable as TR
3644import qualified Streamly.FileSystem.Handle as Handle
37−import qualified Streamly.Prelude as S
38−import qualified Streamly.Internal.Data.Array.Foreign as Array
39−import qualified Streamly.Internal.Data.Fold as FL
45+import qualified Streamly.Internal.Data.Array as Array
46+import qualified Streamly.Internal.Data.Fold as Fold
4047import qualified Streamly.Internal.Data.Parser as PR
41−import qualified Streamly.Internal.Data.Stream.IsStream as IP
48+import qualified Streamly.Data.Stream as Stream
4249import qualified Streamly.Internal.Data.Producer as Producer
43−import qualified Streamly.Internal.Data.Producer.Source as Source
50+import qualified Streamly.Internal.Data.Stream as Stream
4451
45−import Gauge hiding (env)
46−import Streamly.Prelude (SerialT)
52+import Test.Tasty.Bench hiding (env)
4753import Streamly.Benchmark.Common
4854import Streamly.Benchmark.Common.Handle
4955
@@ -54,19 +60,59 @@ import Streamly.Benchmark.Common.Handle
5460-- XXX these can be moved to the common module
5561
5662{-# INLINE sourceUnfoldrM #-}
57−sourceUnfoldrM :: (S.IsStream t, S.MonadAsync m) => Int -> Int -> t m Int
58−sourceUnfoldrM value n = S.unfoldrM step n
63+sourceUnfoldrM :: Monad m => Int -> Int -> Stream m Int
64+sourceUnfoldrM value n = Stream.unfoldrM step n
5965 where
6066 step cnt =
6167 if cnt > n + value
6268 then return Nothing
6369 else return (Just (cnt, cnt + 1))
6470
71+-- | Generates something like this: { { \{ \{ } }. The stream consists of
72+-- three parts, the first part is contains a sequence of `{`. The second part
73+-- contains a sequence pf escaped values `\{`. The third part contains a
74+-- sequence of `}`.
75+{-# INLINE sourceEscapedFrames #-}
76+sourceEscapedFrames ::
77+ Monad m
78+ => Int
79+ -> Int
80+ -> Stream m Char
81+sourceEscapedFrames value n = Stream.unfoldrM step n
82+ where
83+
84+ bs = '\\'
85+ cbOpen = '{'
86+ cbClose = '}'
87+ value1 = value `div` 4
88+
89+ step cnt
90+ | cnt > 4 * value1 = return Nothing
91+ | cnt <= value1 = return $ Just (cbOpen, cnt + 1)
92+ | cnt > 3 * value1 = return $ Just (cbClose, cnt + 1)
93+ | otherwise =
94+ return
95+ $ Just
96+ $ if (cnt - value1) `mod` 2 == 1
97+ then (bs, cnt + 1)
98+ else (cbOpen, cnt + 1)
99+
100+{-# INLINE benchIOSrc #-}
101+benchIOSrc
102+ :: NFData b
103+ => (Int -> Int -> Stream IO a)
104+ -> Int
105+ -> String
106+ -> (Stream IO a -> IO b)
107+ -> Benchmark
108+benchIOSrc src value name f =
109+ bench name $ nfIO $ randomRIO (1,1) >>= f . src value
110+
65111-- | Takes a fold method, and uses it with a default source.
66112{-# INLINE benchIOSink #-}
67113benchIOSink
68− :: (S.IsStream t, NFData b)
69− => Int -> String -> (t IO Int -> IO b) -> Benchmark
114+ :: NFData b
115+ => Int -> String -> (Stream IO Int -> IO b) -> Benchmark
70116benchIOSink value name f =
71117 bench name $ nfIO $ randomRIO (1,1) >>= f . sourceUnfoldrM value
72118
@@ -75,188 +121,451 @@ benchIOSink value name f =
75121-------------------------------------------------------------------------------
76122
77123{-# INLINE takeBetween #-}
78−takeBetween :: MonadCatch m => Int -> SerialT m a -> m ()
79−takeBetween value = IP.parse (PR.takeBetween 0 value FL.drain)
124+takeBetween :: Monad m => Int -> Stream m a -> m (Either ParseError ())
125+takeBetween value = Stream.parse (PR.takeBetween 0 value Fold.drain)
80126
81127{-# INLINE takeEQ #-}
82−takeEQ :: MonadCatch m => Int -> SerialT m a -> m ()
83−takeEQ value = IP.parse (PR.takeEQ value FL.drain)
128+takeEQ :: Monad m => Int -> Stream m a -> m (Either ParseError ())
129+takeEQ value = Stream.parse (PR.takeEQ value Fold.drain)
130+
131+{-# INLINE takeGE #-}
132+takeGE :: Monad m => Int -> Stream m a -> m (Either ParseError ())
133+takeGE value = Stream.parse (PR.takeGE value Fold.drain)
134+
135+{-# INLINE dropWhile #-}
136+dropWhile :: Monad m => Int -> Stream m Int -> m (Either ParseError ())
137+dropWhile value = Stream.parse (PR.dropWhile (<= value))
84138
85−{-# INLINE drainWhile #-}
86−drainWhile :: MonadCatch m => Int -> SerialT m Int -> m ()
87−drainWhile value = IP.parse (PR.drainWhile (<= value))
139+{-# INLINE takeStartBy #-}
140+takeStartBy :: Monad m => Int -> Stream m Int -> m (Either ParseError ())
141+takeStartBy value stream = do
142+ let stream2 = value `Stream.cons` stream
143+ Stream.parse (PR.takeStartBy (== value) Fold.drain) stream2
88144
89−{-# INLINE sliceBeginWith #-}
90−sliceBeginWith :: MonadCatch m => Int -> SerialT m Int -> m ()
91−sliceBeginWith value stream = do
92− stream1 <- return . fromMaybe (S.fromPure (value + 1)) =<< S.tail stream
93− let stream2 = value `S.cons` stream1
94− IP.parse (PR.sliceBeginWith (== value) FL.drain) stream2
145+takeFramedByEsc_ :: Monad m => Int -> Stream m Char -> m (Either ParseError ())
146+takeFramedByEsc_ _ = Stream.parse parser
147+
148+ where
149+
150+ isEsc = (== '\\')
151+ isBegin = (== '{')
152+ isEnd = (== '}')
153+
154+ parser = PR.takeFramedByEsc_ isEsc isBegin isEnd Fold.drain
155+
156+{-# INLINE listEqBy #-}
157+listEqBy :: Int -> Stream IO Int -> IO (Either ParseError [Int])
158+listEqBy len = Stream.parse (PR.listEqBy (==) [1 .. len])
159+
160+{-# INLINE streamEqBy #-}
161+streamEqBy :: Int -> Stream IO Int -> IO (Either ParseError ())
162+streamEqBy len = Stream.parse (PR.streamEqBy (==) (Stream.enumerateFromTo 1 len))
95163
96164{-# INLINE takeWhile #-}
97−takeWhile :: MonadCatch m => Int -> SerialT m Int -> m ()
98−takeWhile value = IP.parse (PR.takeWhile (<= value) FL.drain)
165+takeWhile :: Monad m => Int -> Stream m Int -> m (Either ParseError ())
166+takeWhile value = Stream.parse (PR.takeWhile (<= value) Fold.drain)
167+
168+takeWhileP :: Monad m => Int -> Stream m Int -> m (Either ParseError ())
169+takeWhileP value =
170+ Stream.parse (PR.takeWhileP (<= value) (PR.takeWhile (<= value - 1) Fold.drain))
99171
100172{-# INLINE takeP #-}
101−takeP :: MonadCatch m => Int -> SerialT m a -> m ()
102−takeP value = IP.parse (PR.takeP value (PR.fromFold FL.drain))
173+takeP :: Monad m => Int -> Stream m a -> m (Either ParseError ())
174+takeP value = Stream.parse (PR.takeP value (PR.fromFold Fold.drain))
103175
104176{-# INLINE groupBy #-}
105−groupBy :: MonadCatch m => SerialT m Int -> m ()
106−groupBy = IP.parse (PR.groupBy (<=) FL.drain)
177+groupBy :: Monad m => Stream m Int -> m (Either ParseError ())
178+groupBy = Stream.parse (PR.groupBy (<=) Fold.drain)
107179
108180{-# INLINE groupByRolling #-}
109−groupByRolling :: MonadCatch m => SerialT m Int -> m ()
110−groupByRolling = IP.parse (PR.groupByRolling (<=) FL.drain)
181+groupByRolling :: Monad m => Stream m Int -> m (Either ParseError ())
182+groupByRolling = Stream.parse (PR.groupByRolling (<=) Fold.drain)
111183
112184{-# INLINE wordBy #-}
113−wordBy :: MonadCatch m => Int -> SerialT m Int -> m ()
114−wordBy value = IP.parse (PR.wordBy (>= value) FL.drain)
185+wordBy :: Monad m => Int -> Stream m Int -> m (Either ParseError ())
186+wordBy value = Stream.parse (PR.wordBy (>= value) Fold.drain)
187+
188+{-# INLINE sepByWords #-}
189+sepByWords :: Monad m => Stream m Int -> m (Either ParseError ())
190+sepByWords = Stream.parse (wrds even Fold.drain)
191+ where
192+ wrds p = PR.sepBy (PR.takeWhile (not . p) Fold.drain) (PR.dropWhile p)
193+
194+{-# INLINE sepByAllWords #-}
195+sepByAllWords :: Monad m => Stream m Int -> m (Either ParseError ())
196+sepByAllWords = Stream.parse (wrds even Fold.drain)
197+ where
198+ wrds p = PR.sepByAll (PR.takeWhile (not . p) Fold.drain) (PR.dropWhile p)
199+
200+-- Returning a list to compare with the sepBy1 in ParserK
201+{-# INLINE sepBy1 #-}
202+sepBy1 :: Monad m => Stream m Int -> m (Either ParseError [Int])
203+sepBy1 xs = do
204+ Stream.parse (PR.sepBy1 (PR.satisfy odd) (PR.satisfy even) Fold.toList) xs
205+
206+{-# INLINE sepByWords1 #-}
207+sepByWords1 :: Monad m => Stream m Int -> m (Either ParseError ())
208+sepByWords1 = Stream.parse (wrds even Fold.drain)
209+ where
210+ wrds p = PR.sepBy1 (PR.takeWhile (not . p) Fold.drain) (PR.dropWhile p)
211+
212+{-# INLINE deintercalate #-}
213+deintercalate :: Monad m => Int -> Stream m Int -> m (Either ParseError ())
214+deintercalate _ = Stream.parse (partition even)
215+
216+ where
217+
218+ partition p =
219+ PR.deintercalate
220+ (PR.takeWhile (not . p) Fold.sum) (PR.takeWhile p Fold.sum) Fold.drain
221+
222+{-# INLINE deintercalate1 #-}
223+deintercalate1 :: Monad m => Int -> Stream m Int -> m (Either ParseError ())
224+deintercalate1 _ = Stream.parse (partition even)
225+
226+ where
227+
228+ partition p =
229+ PR.deintercalate1
230+ (PR.takeWhile (not . p) Fold.sum) (PR.takeWhile p Fold.sum) Fold.drain
231+
232+{-# INLINE deintercalateAll #-}
233+deintercalateAll :: Monad m => Int -> Stream m Int -> m (Either ParseError ())
234+deintercalateAll _ = Stream.parse (partition even)
235+
236+ where
237+
238+ partition p =
239+ PR.deintercalateAll
240+ (PR.takeWhile (not . p) Fold.sum) (PR.takeWhile p Fold.sum) Fold.drain
115241
116242{-# INLINE manyWordByEven #-}
117−manyWordByEven :: MonadCatch m => SerialT m Int -> m ()
118−manyWordByEven = IP.parse (PR.many (PR.wordBy (Prelude.even) FL.drain) FL.drain)
243+manyWordByEven :: Monad m => Stream m Int -> m (Either ParseError ())
244+manyWordByEven = Stream.parse (PR.many (PR.wordBy even Fold.drain) Fold.drain)
119245
120246{-# INLINE many #-}
121−many :: MonadCatch m => SerialT m Int -> m Int
122−many = IP.parse (PR.many (PR.satisfy (> 0)) FL.length)
247+many :: Monad m => Stream m Int -> m (Either ParseError Int)
248+many = Stream.parse (PR.many (PR.satisfy (> 0)) Fold.length)
123249
124250{-# INLINE manyAlt #-}
125−manyAlt :: MonadCatch m => SerialT m Int -> m Int
251+manyAlt :: Monad m => Stream m Int -> m Int
126252manyAlt xs = do
127− x <- IP.parse (AP.many (PR.satisfy (> 0))) xs
253+ x <- Stream.parse (AP.many (PR.satisfy (> 0))) xs
128254 return $ Prelude.length x
129255
130256{-# INLINE some #-}
131−some :: MonadCatch m => SerialT m Int -> m Int
132−some = IP.parse (PR.some (PR.satisfy (> 0)) FL.length)
257+some :: Monad m => Stream m Int -> m (Either ParseError Int)
258+some = Stream.parse (PR.some (PR.satisfy (> 0)) Fold.length)
133259
134260{-# INLINE someAlt #-}
135−someAlt :: MonadCatch m => SerialT m Int -> m Int
261+someAlt :: Monad m => Stream m Int -> m Int
136262someAlt xs = do
137− x <- IP.parse (AP.some (PR.satisfy (> 0))) xs
263+ x <- Stream.parse (AP.some (PR.satisfy (> 0))) xs
138264 return $ Prelude.length x
139265
140266{-# INLINE manyTill #-}
141−manyTill :: MonadCatch m => Int -> SerialT m Int -> m Int
267+manyTill :: Monad m => Int -> Stream m Int -> m (Either ParseError Int)
142268manyTill value =
143− IP.parse (PR.manyTill (PR.satisfy (> 0)) (PR.satisfy (== value)) FL.length)
269+ Stream.parse (PR.manyTill (PR.satisfy (> 0)) (PR.satisfy (== value)) Fold.length)
144270
145−{-# INLINE splitAp #-}
146−splitAp :: MonadCatch m
147− => Int -> SerialT m Int -> m ((), ())
148−splitAp value =
149− IP.parse
271+{-# INLINE splitAp2 #-}
272+splitAp2 :: Monad m
273+ => Int -> Stream m Int -> m (Either ParseError ((), ()))
274+splitAp2 value =
275+ Stream.parse
150276 ((,)
151− <$> PR.drainWhile (<= (value `div` 2))
152− <*> PR.drainWhile (<= value)
277+ <$> PR.dropWhile (<= (value `div` 2))
278+ <*> PR.dropWhile (<= value)
279+ )
280+
281+{-# INLINE splitAp4 #-}
282+splitAp4 :: Monad m
283+ => Int -> Stream m Int -> m (Either ParseError ())
284+splitAp4 value =
285+ Stream.parse
286+ ( (\() () () () -> ())
287+ <$> PR.dropWhile (<= (value * 1 `div` 4))
288+ <*> PR.dropWhile (<= (value * 2 `div` 4))
289+ <*> PR.dropWhile (<= (value * 3 `div` 4))
290+ <*> PR.dropWhile (<= value)
291+ )
292+
293+{-# INLINE splitAp8 #-}
294+splitAp8 :: Monad m
295+ => Int -> Stream m Int -> m (Either ParseError ())
296+splitAp8 value =
297+ Stream.parse
298+ ( (\() () () () () () () () -> ())
299+ <$> PR.dropWhile (<= (value * 1 `div` 8))
300+ <*> PR.dropWhile (<= (value * 2 `div` 8))
301+ <*> PR.dropWhile (<= (value * 3 `div` 8))
302+ <*> PR.dropWhile (<= (value * 4 `div` 8))
303+ <*> PR.dropWhile (<= (value * 5 `div` 8))
304+ <*> PR.dropWhile (<= (value * 6 `div` 8))
305+ <*> PR.dropWhile (<= (value * 7 `div` 8))
306+ <*> PR.dropWhile (<= value)
153307 )
154308
155309{-# INLINE splitApBefore #-}
156−splitApBefore :: MonadCatch m
157− => Int -> SerialT m Int -> m ()
310+splitApBefore :: Monad m
311+ => Int -> Stream m Int -> m (Either ParseError ())
158312splitApBefore value =
159− IP.parse
160− ( PR.drainWhile (<= (value `div` 2))
161− *> PR.drainWhile (<= value)
313+ Stream.parse
314+ ( PR.dropWhile (<= (value `div` 2))
315+ *> PR.dropWhile (<= value)
162316 )
163317
164318{-# INLINE splitApAfter #-}
165−splitApAfter :: MonadCatch m
166− => Int -> SerialT m Int -> m ()
319+splitApAfter :: Monad m
320+ => Int -> Stream m Int -> m (Either ParseError ())
167321splitApAfter value =
168− IP.parse
169− ( PR.drainWhile (<= (value `div` 2))
170− <* PR.drainWhile (<= value)
322+ Stream.parse
323+ ( PR.dropWhile (<= (value `div` 2))
324+ <* PR.dropWhile (<= value)
171325 )
172326
173−{-# INLINE serialWith #-}
174−serialWith :: MonadCatch m
175− => Int -> SerialT m Int -> m ((), ())
176−serialWith value =
177− IP.parse
178− (PR.serialWith (,)
179− (PR.drainWhile (<= (value `div` 2)))
180− (PR.drainWhile (<= value))
327+{-# INLINE splitWith2 #-}
328+splitWith2 :: Monad m
329+ => Int -> Stream m Int -> m (Either ParseError ((), ()))
330+splitWith2 value =
331+ Stream.parse
332+ (PR.splitWith (,)
333+ (PR.dropWhile (<= (value `div` 2)))
334+ (PR.dropWhile (<= value))
181335 )
182336
183337{-# INLINE split_ #-}
184−split_ :: MonadCatch m
185− => Int -> SerialT m Int -> m ()
338+split_ :: Monad m
339+ => Int -> Stream m Int -> m (Either ParseError ())
186340split_ value =
187− IP.parse
341+ Stream.parse
188342 (PR.split_
189− (PR.drainWhile (<= (value `div` 2)))
190− (PR.drainWhile (<= value))
343+ (PR.dropWhile (<= (value `div` 2)))
344+ (PR.dropWhile (<= value))
191345 )
192346
193−{-# INLINE sliceSepByP #-}
194−sliceSepByP :: MonadCatch m
195− => Int -> SerialT m Int -> m()
196−sliceSepByP value = IP.parse (PR.sliceSepByP (>= value) (PR.fromFold FL.drain))
347+-- XXX dropWhile with applicative does not fuse
348+-- PR.dropWhile (<= (value * 1 `div` 4)) *> PR.die "alt"
349+{-# INLINE takeWhileFail #-}
350+takeWhileFail :: Monad m => (a -> Bool) -> Fold m a b -> Parser a m b
351+takeWhileFail predicate (Fold fstep finitial _ ffinal) =
352+ Parser step initial extract
353+
354+ where
197355
356+ initial = do
357+ res <- finitial
358+ return $ case res of
359+ Fold.Partial s -> IPartial s
360+ Fold.Done b -> IDone b
361+
362+ step s a =
363+ if predicate a
364+ then do
365+ fres <- fstep s a
366+ return
367+ $ case fres of
368+ Fold.Partial s1 -> Partial 0 s1
369+ Fold.Done b -> Done 0 b
370+ else return $ Error "fail"
371+
372+ extract s = fmap (Done 0) (ffinal s)
373+
374+{-# INLINE alt2 #-}
375+alt2 :: Monad m
376+ => Int -> Stream m Int -> m (Either ParseError ())
377+alt2 value =
378+ Stream.parse
379+ (PR.alt
380+ (takeWhileFail (<= (value `div` 2)) Fold.drain)
381+ (PR.dropWhile (<= value))
382+ )
383+
384+{-# INLINE alt4 #-}
385+alt4 :: Monad m
386+ => Int -> Stream m Int -> m (Either ParseError ())
387+alt4 value =
388+ Stream.parse
389+ ( takeWhileFail (<= (value * 1 `div` 4)) Fold.drain
390+ <|> takeWhileFail (<= (value * 2 `div` 4)) Fold.drain
391+ <|> takeWhileFail (<= (value * 3 `div` 4)) Fold.drain
392+ <|> PR.dropWhile (<= value)
393+ )
394+
395+{-# INLINE alt8 #-}
396+alt8 :: Monad m
397+ => Int -> Stream m Int -> m (Either ParseError ())
398+alt8 value =
399+ Stream.parse
400+ ( takeWhileFail (<= (value * 1 `div` 8)) Fold.drain
401+ <|> takeWhileFail (<= (value * 2 `div` 8)) Fold.drain
402+ <|> takeWhileFail (<= (value * 3 `div` 8)) Fold.drain
403+ <|> takeWhileFail (<= (value * 4 `div` 8)) Fold.drain
404+ <|> takeWhileFail (<= (value * 5 `div` 8)) Fold.drain
405+ <|> takeWhileFail (<= (value * 6 `div` 8)) Fold.drain
406+ <|> takeWhileFail (<= (value * 7 `div` 8)) Fold.drain
407+ <|> PR.dropWhile (<= value)
408+ )
409+
410+{-# INLINE alt16 #-}
411+alt16 :: Monad m
412+ => Int -> Stream m Int -> m (Either ParseError ())
413+alt16 value =
414+ Stream.parse
415+ ( takeWhileFail (<= (value * 1 `div` 16)) Fold.drain
416+ <|> takeWhileFail (<= (value * 2 `div` 16)) Fold.drain
417+ <|> takeWhileFail (<= (value * 3 `div` 16)) Fold.drain
418+ <|> takeWhileFail (<= (value * 4 `div` 16)) Fold.drain
419+ <|> takeWhileFail (<= (value * 5 `div` 16)) Fold.drain
420+ <|> takeWhileFail (<= (value * 6 `div` 16)) Fold.drain
421+ <|> takeWhileFail (<= (value * 8 `div` 16)) Fold.drain
422+ <|> takeWhileFail (<= (value * 9 `div` 16)) Fold.drain
423+ <|> takeWhileFail (<= (value * 10 `div` 16)) Fold.drain
424+ <|> takeWhileFail (<= (value * 11 `div` 16)) Fold.drain
425+ <|> takeWhileFail (<= (value * 12 `div` 16)) Fold.drain
426+ <|> takeWhileFail (<= (value * 13 `div` 16)) Fold.drain
427+ <|> takeWhileFail (<= (value * 14 `div` 16)) Fold.drain
428+ <|> takeWhileFail (<= (value * 15 `div` 16)) Fold.drain
429+ <|> PR.dropWhile (<= value)
430+ )
431+
432+{-# INLINE altSmall #-}
433+altSmall :: Monad m
434+ => Int -> Stream m Int -> m ()
435+altSmall value =
436+ Stream.fold Fold.drain .
437+ Stream.parseMany
438+ (PR.alt
439+ (PR.satisfy (>= value) *> PR.die "alt")
440+ (PR.satisfy (<= value))
441+ )
442+
443+{-# INLINE monad #-}
444+monad :: Monad m
445+ => Int -> Stream m Int -> m (Either ParseError ())
446+monad value =
447+ Stream.parse
448+ $ do
449+ PR.dropWhile (<= (value `div` 2))
450+ PR.dropWhile (<= value)
451+
452+{-# INLINE monad4 #-}
453+monad4 :: Monad m
454+ => Int -> Stream m Int -> m (Either ParseError ())
455+monad4 value =
456+ Stream.parse $ do
457+ PR.dropWhile (<= (value `div` 4))
458+ PR.dropWhile (<= (value `div` 2))
459+ PR.dropWhile (<= (value * 3 `div` 4))
460+ PR.dropWhile (<= value)
461+
462+{-# INLINE monad8 #-}
463+monad8 :: Monad m
464+ => Int -> Stream m Int -> m (Either ParseError ())
465+monad8 value =
466+ Stream.parse $ do
467+ PR.dropWhile (<= (value * 1 `div` 8))
468+ PR.dropWhile (<= (value * 2 `div` 8))
469+ PR.dropWhile (<= (value * 3 `div` 8))
470+ PR.dropWhile (<= (value * 4 `div` 8))
471+ PR.dropWhile (<= (value * 5 `div` 8))
472+ PR.dropWhile (<= (value * 6 `div` 8))
473+ PR.dropWhile (<= (value * 7 `div` 8))
474+ PR.dropWhile (<= value)
475+
476+{-# INLINE monad16 #-}
477+monad16 :: Monad m
478+ => Int -> Stream m Int -> m (Either ParseError ())
479+monad16 value =
480+ Stream.parse $ do
481+ PR.dropWhile (<= (value * 1 `div` 16))
482+ PR.dropWhile (<= (value * 2 `div` 16))
483+ PR.dropWhile (<= (value * 3 `div` 16))
484+ PR.dropWhile (<= (value * 4 `div` 16))
485+ PR.dropWhile (<= (value * 5 `div` 16))
486+ PR.dropWhile (<= (value * 6 `div` 16))
487+ PR.dropWhile (<= (value * 7 `div` 16))
488+ PR.dropWhile (<= (value * 8 `div` 16))
489+ PR.dropWhile (<= (value * 9 `div` 16))
490+ PR.dropWhile (<= (value * 10 `div` 16))
491+ PR.dropWhile (<= (value * 11 `div` 16))
492+ PR.dropWhile (<= (value * 12 `div` 16))
493+ PR.dropWhile (<= (value * 13 `div` 16))
494+ PR.dropWhile (<= (value * 14 `div` 16))
495+ PR.dropWhile (<= (value * 15 `div` 16))
496+ PR.dropWhile (<= value)
497+
498+{-# INLINE takeEndBy_ #-}
499+takeEndBy_ :: Monad m
500+ => Int -> Stream m Int -> m (Either ParseError ())
501+takeEndBy_ value = Stream.parse (PR.takeEndBy_ (>= value) (PR.fromFold Fold.drain))
502+
503+{-
198504{-# INLINE teeAllAny #-}
199−teeAllAny :: MonadCatch m
200− => Int -> SerialT m Int -> m ((), ())
505+teeAllAny :: Monad m
506+ => Int -> Stream m Int -> m ((), ())
201507teeAllAny value =
202− IP.parse
508+ Stream.parse
203509 (PR.teeWith (,)
204− (PR.drainWhile (<= value))
205− (PR.drainWhile (<= value))
510+ (PR.dropWhile (<= value))
511+ (PR.dropWhile (<= value))
206512 )
207513
208514{-# INLINE teeFstAllAny #-}
209−teeFstAllAny :: MonadCatch m
210− => Int -> SerialT m Int -> m ((), ())
515+teeFstAllAny :: Monad m
516+ => Int -> Stream m Int -> m ((), ())
211517teeFstAllAny value =
212− IP.parse
518+ Stream.parse
213519 (PR.teeWithFst (,)
214− (PR.drainWhile (<= value))
215− (PR.drainWhile (<= value))
520+ (PR.dropWhile (<= value))
521+ (PR.dropWhile (<= value))
216522 )
217523
218524{-# INLINE shortestAllAny #-}
219−shortestAllAny :: MonadCatch m
220− => Int -> SerialT m Int -> m ()
525+shortestAllAny :: Monad m
526+ => Int -> Stream m Int -> m (Either ParseError ())
221527shortestAllAny value =
222− IP.parse
528+ Stream.parse
223529 (PR.shortest
224− (PR.drainWhile (<= value))
225− (PR.drainWhile (<= value))
530+ (PR.dropWhile (<= value))
531+ (PR.dropWhile (<= value))
226532 )
227533
228534{-# INLINE longestAllAny #-}
229−longestAllAny :: MonadCatch m
230− => Int -> SerialT m Int -> m ()
535+longestAllAny :: Monad m
536+ => Int -> Stream m Int -> m (Either ParseError ())
231537longestAllAny value =
232− IP.parse
538+ Stream.parse
233539 (PR.longest
234− (PR.drainWhile (<= value))
235− (PR.drainWhile (<= value))
540+ (PR.dropWhile (<= value))
541+ (PR.dropWhile (<= value))
236542 )
237−
238−parseManyChunksOfSum :: Int -> Handle -> IO Int
239−parseManyChunksOfSum n inh =
240− S.length
241− $ IP.parseMany
242− (PR.fromFold $ FL.take n FL.sum)
243− (S.unfold Handle.read inh)
543+-}
244544
245545-------------------------------------------------------------------------------
246−-- Parsing with unfolds
546+-- Spanning
247547-------------------------------------------------------------------------------
248548
249−{-# INLINE parseManyUnfoldArrays #-}
250−parseManyUnfoldArrays :: Int -> [Array.Array Int] -> IO ()
251−parseManyUnfoldArrays count arrays = do
252− let src = Source.source (Just (Producer.OuterLoop arrays))
253− let parser = PR.fromFold (FL.take count FL.drain)
254− let readSrc =
255− Source.producer
256− $ Producer.concat Producer.fromList Array.producer
257− let streamParser =
258− Producer.simplify (Source.parseMany parser readSrc)
259− S.drain $ S.unfold streamParser src
549+{-# INLINE span #-}
550+span :: Monad m => Int -> Stream m Int -> m (Either ParseError ((), ()))
551+span value = Stream.parse (PR.span (<= (value `div` 2)) Fold.drain Fold.drain)
552+
553+{-# INLINE spanBy #-}
554+spanBy :: Monad m => Int -> Stream m Int -> m (Either ParseError ((), ()))
555+spanBy value =
556+ Stream.parse (PR.spanBy (\_ i -> i <= (value `div` 2)) Fold.drain Fold.drain)
557+
558+{-# INLINE spanByRolling #-}
559+spanByRolling :: Monad m => Int -> Stream m Int -> m (Either ParseError ((), ()))
560+spanByRolling value =
561+ Stream.parse (PR.spanByRolling (\_ i -> i <= value `div` 2) Fold.drain Fold.drain)
562+
563+parseManyChunksOfSum :: Int -> Handle -> IO Int
564+parseManyChunksOfSum n inh =
565+ Stream.fold Fold.length
566+ $ Stream.parseMany
567+ (PR.fromFold $ Fold.take n Fold.sum)
568+ (Stream.unfold Handle.reader inh)
260569
261570-------------------------------------------------------------------------------
262571-- Parsers in which -fspec-constr-recursive=16 is problematic
@@ -267,63 +576,129 @@ parseManyUnfoldArrays count arrays = do
267576-- not have to rely on it.
268577--
269578{-# INLINE lookAhead #-}
270−lookAhead :: MonadCatch m => Int -> SerialT m Int -> m ()
579+lookAhead :: Monad m => Int -> Stream m Int -> m (Either ParseError ())
271580lookAhead value =
272− IP.parse (PR.lookAhead (PR.takeWhile (<= value) FL.drain) $> ())
581+ Stream.parse (PR.lookAhead (PR.takeWhile (<= value) Fold.drain) $> ())
273582
583+-- XXX The timing of this increased 3x after the stepify extract changes.
584+{-# INLINE sequenceA_ #-}
585+sequenceA_ :: Monad m => Int -> Stream m Int -> m (Either ParseError ())
586+sequenceA_ value =
587+ Stream.parse (F.sequenceA_ $ replicate value (PR.satisfy (> 0)))
588+
589+-- quadratic complexity
274590{-# INLINE sequenceA #-}
275−sequenceA :: MonadCatch m => Int -> SerialT m Int -> m Int
591+sequenceA :: Monad m => Int -> Stream m Int -> m Int
276592sequenceA value xs = do
277− x <- IP.parse (TR.sequenceA (replicate value (PR.satisfy (> 0)))) xs
593+ x <- Stream.parse (TR.sequenceA (replicate value (PR.satisfy (> 0)))) xs
278594 return $ length x
279595
280−{-# INLINE sequenceA_ #-}
281−sequenceA_ :: MonadCatch m => Int -> SerialT m Int -> m ()
282−sequenceA_ value =
283− IP.parse (F.sequenceA_ $ replicate value (PR.satisfy (> 0)))
284−
596+-- quadratic complexity
285597{-# INLINE sequence #-}
286−sequence :: MonadCatch m => Int -> SerialT m Int -> m Int
598+sequence :: Monad m => Int -> Stream m Int -> m Int
287599sequence value xs = do
288− x <- IP.parse (TR.sequence (replicate value (PR.satisfy (> 0)))) xs
600+ x <- Stream.parse (TR.sequence (replicate value (PR.satisfy (> 0)))) xs
289601 return $ length x
290602
291603{-# INLINE sequence_ #-}
292−sequence_ :: MonadCatch m => Int -> SerialT m Int -> m ()
293−sequence_ value =
294− IP.parse (F.sequence_ $ replicate value (PR.satisfy (> 0)))
604+sequence_ :: Monad m => Int -> Stream m Int -> m (Either ParseError ())
605+sequence_ value xs =
606+ Stream.parse (foldr f (return ()) (replicate value (PR.takeBetween 0 1 Fold.drain))) xs
295607
608+ where
609+
610+ {-# INLINE f #-}
611+ f m k = m >>= (\_ -> k)
612+
613+-- choice using the "Alternative" instance with direct style parser type has
614+-- quadratic performance complexity.
615+--
296616{-# INLINE choiceAsum #-}
297−choiceAsum :: MonadCatch m => Int -> SerialT m Int -> m Int
617+choiceAsum :: Monad m => Int -> Stream m Int -> m (Either ParseError Int)
298618choiceAsum value =
299− IP.parse (asum (replicate value (PR.satisfy (< 0)))
619+ Stream.parse (F.asum (replicate value (PR.satisfy (< 0)))
300620 AP.<|> PR.satisfy (> 0))
301621
622+{-
302623{-# INLINE choice #-}
303−choice :: MonadCatch m => Int -> SerialT m Int -> m Int
624+choice :: Monad m => Int -> Stream m Int -> m (Either ParseError Int)
304625choice value =
305− IP.parse
626+ Stream.parse
306627 (PR.choice (replicate value (PR.satisfy (< 0))) AP.<|> PR.satisfy (> 0))
628+-}
629+
630+-------------------------------------------------------------------------------
631+-- Parsing with unfolds
632+-------------------------------------------------------------------------------
633+
634+{-# INLINE parseManyUnfoldArrays #-}
635+parseManyUnfoldArrays :: Int -> [Array.Array Int] -> IO ()
636+parseManyUnfoldArrays count arrays = do
637+ let src = Producer.source (Just (Producer.OuterLoop arrays))
638+ let parser = PR.fromFold (Fold.take count Fold.drain)
639+ let readSrc =
640+ Producer.producer
641+ $ Producer.concat Producer.fromList Array.producer
642+ let streamParser =
643+ Producer.simplify (Producer.parseMany parser readSrc)
644+ Stream.fold Fold.drain $ Stream.unfold streamParser src
307645
308646-------------------------------------------------------------------------------
309647-- Stream transformation
310648-------------------------------------------------------------------------------
311649
312650{-# INLINE parseMany #-}
313−parseMany :: MonadCatch m => Int -> SerialT m Int -> m ()
651+parseMany :: Monad m => Int -> Stream m Int -> m ()
314652parseMany n =
315− S.drain
316− . S.map getSum
317− . IP.parseMany (PR.fromFold $ FL.take n FL.mconcat)
318− . S.map Sum
653+ Stream.fold Fold.drain
654+ . fmap getSum
655+ . Stream.catRights . Stream.parseMany (PR.fromFold $ Fold.take n Fold.mconcat)
656+ . fmap Sum
657+
658+{-# INLINE parseManyGroupBy #-}
659+parseManyGroupBy :: Monad m => (Int -> Int -> Bool) -> Stream m Int -> m ()
660+parseManyGroupBy cmp =
661+ Stream.fold Fold.drain . Stream.parseMany (PR.groupBy cmp Fold.drain)
662+
663+{-# INLINE parseManyGroupsRolling #-}
664+parseManyGroupsRolling :: Monad m => Bool -> Stream m Int -> m ()
665+parseManyGroupsRolling b =
666+ Stream.fold Fold.drain
667+ . Stream.parseMany (PR.groupByRolling (\_ _ -> b) Fold.drain)
668+
669+{-# INLINE parseManyGroupsRollingEither #-}
670+parseManyGroupsRollingEither :: Monad m =>
671+ (Int -> Int -> Bool) -> Int -> m ()
672+parseManyGroupsRollingEither cmp value = do
673+ sourceUnfoldrM value 1
674+ & Stream.parseMany (PR.groupByRollingEither cmp Fold.drain Fold.drain)
675+ & Stream.fold Fold.drain
676+
677+{-# INLINE parseManyGroupsRollingEitherAlt #-}
678+parseManyGroupsRollingEitherAlt :: Monad m =>
679+ (Int -> Int -> Bool) -> Int -> m ()
680+parseManyGroupsRollingEitherAlt cmp value = do
681+ sourceUnfoldrM value 1
682+ -- Make the input unsorted.
683+ & fmap (\x -> if even x then x + 2 else x)
684+ & Stream.parseMany (PR.groupByRollingEither cmp Fold.drain Fold.drain)
685+ & Stream.fold Fold.drain
319686
320687{-# INLINE parseIterate #-}
321−parseIterate :: MonadCatch m => Int -> SerialT m Int -> m ()
688+parseIterate :: Monad m => Int -> Stream m Int -> m ()
322689parseIterate n =
323− S.drain
324− . S.map getSum
325− . IP.parseIterate (PR.fromFold . FL.take n . FL.sconcat) (Sum 0)
326− . S.map Sum
690+ Stream.fold Fold.drain
691+ . fmap getSum
692+ . Stream.catRights
693+ . Stream.parseIterate
694+ (PR.fromFold . Fold.take n . Fold.sconcat)
695+ (Sum 0)
696+ . fmap Sum
697+
698+{-# INLINE concatSequence #-}
699+concatSequence :: Monad m => Stream m Int -> m (Either ParseError ())
700+concatSequence =
701+ Stream.parse $ PR.sequence (Stream.repeat PR.one) Fold.drain
327702
328703-------------------------------------------------------------------------------
329704-- Benchmarks
@@ -332,41 +707,95 @@ parseIterate n =
332707moduleName :: String
333708moduleName = "Data.Parser"
334709
710+instance NFData ParseError where
711+ {-# INLINE rnf #-}
712+ rnf (ParseError x) = rnf x
713+
335714o_1_space_serial :: Int -> [Benchmark]
336715o_1_space_serial value =
337716 [ benchIOSink value "takeBetween" $ takeBetween value
338− , benchIOSink value "takeEQ" $ takeEQ value
339717 , benchIOSink value "takeWhile" $ takeWhile value
718+ , benchIOSink value "takeWhileP" $ takeWhileP value
340719 , benchIOSink value "takeP" $ takeP value
341− , benchIOSink value "drainWhile" $ drainWhile value
342− , benchIOSink value "sliceBeginWith" $ sliceBeginWith value
720+ , benchIOSink value "dropWhile" $ dropWhile value
721+ , benchIOSink value "takeStartBy" $ takeStartBy value
722+ , benchIOSink value "takeEndBy_" $ takeEndBy_ value
343723 , benchIOSink value "groupBy" $ groupBy
344724 , benchIOSink value "groupByRolling" $ groupByRolling
345725 , benchIOSink value "wordBy" $ wordBy value
346− , benchIOSink value "splitAp" $ splitAp value
726+ , benchIOSink value "sepBy (words)" sepByWords
727+ , benchIOSink value "sepByAll (words)" sepByAllWords
728+ , benchIOSink value "sepBy1 (words)" sepByWords1
729+ , benchIOSink value "deintercalate" $ deintercalate value
730+ , benchIOSink value "deintercalate1" $ deintercalate1 value
731+ , benchIOSink value "deintercalateAll" $ deintercalateAll value
732+ -- Applicative and Monad
733+ , benchIOSink value "splitAp2" $ splitAp2 value
734+ , benchIOSink value "splitAp4" $ splitAp4 value
735+ , benchIOSink value "splitAp8" $ splitAp8 value
347736 , benchIOSink value "splitApBefore" $ splitApBefore value
348737 , benchIOSink value "splitApAfter" $ splitApAfter value
349− , benchIOSink value "serialWith" $ serialWith value
350− , benchIOSink value "sliceSepByP" $ sliceSepByP value
738+ , benchIOSink value "splitWith2" $ splitWith2 value
739+ , benchIOSink value "span" $ span value
740+ , benchIOSink value "spanBy" $ spanBy value
741+ , benchIOSink value "spanByRolling" $ spanByRolling value
742+ , benchIOSink value "monad2" $ monad value
743+ , benchIOSink value "monad4" $ monad4 value
744+ , benchIOSink value "monad8" $ monad8 value
745+ -- Alternative
746+ , benchIOSink value "alt2parseMany" $ altSmall value
747+ , benchIOSink value "alt2" $ alt2 value
748+ , benchIOSink value "alt4" $ alt4 value
749+ , benchIOSink value "alt8" $ alt8 value
750+ , benchIOSink value "alt16" $ alt16 value
351751 , benchIOSink value "many" many
352752 , benchIOSink value "many (wordBy even)" $ manyWordByEven
353753 , benchIOSink value "some" some
354754 , benchIOSink value "manyTill" $ manyTill value
355− , benchIOSink value "tee" $ teeAllAny value
356− , benchIOSink value "teeFst" $ teeFstAllAny value
357− , benchIOSink value "shortest" $ shortestAllAny value
358− , benchIOSink value "longest" $ longestAllAny value
755+ , benchIOSink value "parseMany" $ parseMany value
359756 , benchIOSink value "parseMany (take 1)" (parseMany 1)
360757 , benchIOSink value "parseMany (take all)" (parseMany value)
758+ , benchIOSink value "parseMany (groupBy (<))" (parseManyGroupBy (<))
759+ , benchIOSink value "parseMany (groupBy (==))" (parseManyGroupBy (==))
760+ , benchIOSink value "parseMany groupRollingBy (bound groups)"
761+ $ parseManyGroupsRolling False
762+ , benchIOSink value "parseMany groupRollingBy (1 group)"
763+ $ parseManyGroupsRolling True
764+ , bench "parseMany groupRollingByEither (Left)"
765+ $ nfIO $ parseManyGroupsRollingEitherLeft
766+ , bench "parseMany groupRollingByEither (Right)"
767+ $ nfIO $ parseManyGroupsRollingEitherRight
768+ , bench "parseMany groupRollingByEither (Alternating)"
769+ $ nfIO $ parseManyGroupsRollingEitherAlt1
361770 , benchIOSink value "parseIterate (take 1)" (parseIterate 1)
362771 , benchIOSink value "parseIterate (take all)" (parseIterate value)
772+ , benchIOSink value "concatSequence" concatSequence
773+ {-
774+ , benchIOSink value "tee" $ teeAllAny value
775+ , benchIOSink value "teeFst" $ teeFstAllAny value
776+ , benchIOSink value "shortest" $ shortestAllAny value
777+ , benchIOSink value "longest" $ longestAllAny value
778+ -}
779+ , benchIOSink value "streamEqBy" (streamEqBy value)
363780 ]
364781
782+ where
783+
784+ {-# NOINLINE parseManyGroupsRollingEitherLeft #-}
785+ parseManyGroupsRollingEitherLeft = parseManyGroupsRollingEither (<) value
786+
787+ {-# NOINLINE parseManyGroupsRollingEitherRight #-}
788+ parseManyGroupsRollingEitherRight = parseManyGroupsRollingEither (>) value
789+
790+ {-# NOINLINE parseManyGroupsRollingEitherAlt1 #-}
791+ parseManyGroupsRollingEitherAlt1 =
792+ parseManyGroupsRollingEitherAlt (>) value
793+
365794o_1_space_filesystem :: BenchEnv -> [Benchmark]
366795o_1_space_filesystem env =
367− [ mkBench ("S.parseMany (FL.take " ++ show (bigSize env) ++ " FL.sum)") env
796+ [ mkBench ("S.parseMany (Fold.take " ++ show (bigSize env) ++ " Fold.sum)") env
368797 $ \inh _ -> noinline parseManyChunksOfSum (bigSize env) inh
369− , mkBench "S.parseMany (FL.take 1 FL.sum)" env
798+ , mkBench "S.parseMany (Fold.take 1 Fold.sum)" env
370799 $ \inh _ -> inline parseManyChunksOfSum 1 inh
371800 ]
372801
@@ -381,26 +810,38 @@ o_1_space_serial_unfold bound arrays =
381810o_n_heap_serial :: Int -> [Benchmark]
382811o_n_heap_serial value =
383812 [
813+ benchIOSink value "takeEQ" $ takeEQ value
814+ , benchIOSink value "takeGE" $ takeGE value
815+
384816 -- lookahead benchmark holds the entire input till end
385− benchIOSink value "lookAhead" $ lookAhead value
817+ , benchIOSink value "lookAhead" $ lookAhead value
386818
387− -- accumulates the results in a list
388− , benchIOSink value "sequence" $ sequence value
389− , benchIOSink value "sequenceA" $ sequenceA value
819+ -- o-n-heap because of backtracking
820+ , benchIOSrc sourceEscapedFrames value "takeFramedByEsc_"
821+ $ takeFramedByEsc_ value
390822
391− -- XXX why should this take O(n) heap, it discards the results?
392− , benchIOSink value "sequence_" $ sequence_ value
393− , benchIOSink value "sequenceA_" $ sequenceA_ value
394823 -- non-linear time complexity (parserD)
395824 , benchIOSink value "split_" $ split_ value
396− -- XXX why O(n) heap?
397− , benchIOSink value "choice (asum)" $ choiceAsum value
398− , benchIOSink value "choice" $ choice value
825+ -- XXX Takes lot of space when run on a long stream, why?
826+ , benchIOSink value "monad16" $ monad16 value
399827
400828 -- These show non-linear time complexity.
401829 -- They accumulate the results in a list.
830+ , benchIOSink value "sepBy1" sepBy1
402831 , benchIOSink value "manyAlt" manyAlt
403832 , benchIOSink value "someAlt" someAlt
833+ , benchIOSink value "listEqBy" (listEqBy value)
834+ ]
835+
836+-- accumulate results in a list in IO
837+o_n_space_serial :: Int -> [Benchmark]
838+o_n_space_serial value =
839+ [ benchIOSink value "sequenceA/100" $ sequenceA (value `div` 100)
840+ , benchIOSink value "sequenceA_/100" $ sequenceA_ (value `div` 100)
841+ , benchIOSink value "sequence/100" $ sequence (value `div` 100)
842+ , benchIOSink value "sequence_/100" $ sequence_ (value `div` 100)
843+ , benchIOSink value "choice (asum)/100" $ choiceAsum (value `div` 100)
844+ -- , benchIOSink value "choice/100" $ choice (value `div` 100)
404845 ]
405846
406847-------------------------------------------------------------------------------
@@ -409,12 +850,13 @@ o_n_heap_serial value =
409850
410851main :: IO ()
411852main = do
853+#ifndef FUSION_CHECK
412854 env <- mkHandleBenchEnv
413855 runWithCLIOptsEnv defaultStreamSize alloc (allBenchmarks env)
414856
415857 where
416858
417− alloc value = IP.toList $ IP.arraysOf 100 $ sourceUnfoldrM value 0
859+ alloc value = Stream.fold Fold.toList $ Stream.chunksOf 100 $ sourceUnfoldrM value 0
418860
419861 allBenchmarks env arrays value =
420862 [ bgroup (o_1_space_prefix moduleName) (o_1_space_serial value)
@@ -424,4 +866,22 @@ main = do
424866 , bgroup (o_1_space_prefix moduleName)
425867 (o_1_space_serial_unfold value arrays)
426868 , bgroup (o_n_heap_prefix moduleName) (o_n_heap_serial value)
869+ , bgroup (o_n_space_prefix moduleName) (o_n_space_serial value)
427870 ]
871+#else
872+ -- Enable FUSION_CHECK macro at the beginning of the file
873+ -- Enable one benchmark below, and run the benchmark
874+ -- Check the .dump-simpl output
875+ let value = 100000
876+ -- let input = sourceUnfoldrM value 1
877+ -- manyTill value input
878+ -- deintercalate value input
879+ -- deintercalate1 value input
880+ -- deintercalateAll value input
881+ -- sepByWords input
882+ -- sepByAllWords input
883+ -- sepBy1 input
884+ -- sepByWords1 input
885+ takeFramedByEsc_ value (sourceEscapedFrames value 1)
886+ return ()
887+#endif
benchmark/Streamly/Benchmark/Data/Parser/ParserD.hsdeleted−388
@@ -1,388 +0,0 @@
1−-- |
2−-- Module : Streamly.Benchmark.Data.ParserD
3−-- Copyright : (c) 2020 Composewell Technologies
4−--
5−-- License : BSD-3-Clause
6−-- Maintainer : streamly@composewell.com
7−
8−{-# LANGUAGE FlexibleContexts #-}
9−{-# LANGUAGE ScopedTypeVariables #-}
10−{-# OPTIONS_GHC -fspec-constr-recursive=4 #-}
11−
12−module Main
13− (
14− main
15− ) where
16−
17−import Control.DeepSeq (NFData(..))
18−import Control.Monad.Catch (MonadCatch, MonadThrow)
19−import Data.Foldable (asum)
20−import Data.Functor (($>))
21−import Data.Maybe (fromMaybe)
22−import System.Random (randomRIO)
23−import Prelude hiding (any, all, take, sequence, sequenceA, sequence_, takeWhile, span)
24−
25−import qualified Data.Traversable as TR
26−import qualified Data.Foldable as F
27−import qualified Control.Applicative as AP
28−import qualified Streamly.Prelude as S
29−import qualified Streamly.Internal.Data.Array.Foreign as Array
30−import qualified Streamly.Internal.Data.Fold as FL
31−import qualified Streamly.Internal.Data.Parser.ParserD as PR
32−import qualified Streamly.Internal.Data.Producer as Producer
33−import qualified Streamly.Internal.Data.Producer.Source as Source
34−import qualified Streamly.Internal.Data.Stream.IsStream as IP
35−
36−import Gauge
37−import Streamly.Prelude (SerialT, MonadAsync, IsStream)
38−import Streamly.Benchmark.Common
39−
40−-------------------------------------------------------------------------------
41−-- Utilities
42−-------------------------------------------------------------------------------
43−
44−-- XXX these can be moved to the common module
45−
46−{-# INLINE sourceUnfoldrM #-}
47−sourceUnfoldrM :: (IsStream t, MonadAsync m) => Int -> Int -> t m Int
48−sourceUnfoldrM value n = S.unfoldrM step n
49− where
50− step cnt =
51− if cnt > n + value
52− then return Nothing
53− else return (Just (cnt, cnt + 1))
54−
55−-- | Takes a fold method, and uses it with a default source.
56−{-# INLINE benchIOSink #-}
57−benchIOSink
58− :: (IsStream t, NFData b)
59− => Int -> String -> (t IO Int -> IO b) -> Benchmark
60−benchIOSink value name f =
61− bench name $ nfIO $ randomRIO (1,1) >>= f . sourceUnfoldrM value
62−
63−-------------------------------------------------------------------------------
64−-- Parsers
65−-------------------------------------------------------------------------------
66−
67−{-# INLINE drainWhile #-}
68−drainWhile :: MonadThrow m => (a -> Bool) -> PR.Parser m a ()
69−drainWhile p = PR.takeWhile p FL.drain
70−
71−{-# INLINE sliceBeginWith #-}
72−sliceBeginWith :: MonadCatch m => Int -> SerialT m Int -> m ()
73−sliceBeginWith value stream = do
74− stream1 <- return . fromMaybe (S.fromPure (value + 1)) =<< S.tail stream
75− let stream2 = value `S.cons` stream1
76− IP.parseD (PR.sliceBeginWith (== value) FL.drain) stream2
77−
78−{-# INLINE takeWhile #-}
79−takeWhile :: MonadThrow m => Int -> SerialT m Int -> m ()
80−takeWhile value = IP.parseD (drainWhile (<= value))
81−
82−{-# INLINE takeP #-}
83−takeP :: MonadThrow m => Int -> SerialT m a -> m ()
84−takeP value = IP.parseD (PR.takeP value (PR.fromFold FL.drain))
85−
86−{-# INLINE groupBy #-}
87−groupBy :: MonadThrow m => SerialT m Int -> m ()
88−groupBy = IP.parseD (PR.groupBy (<=) FL.drain)
89−
90−{-# INLINE groupByRolling #-}
91−groupByRolling :: MonadThrow m => SerialT m Int -> m ()
92−groupByRolling = IP.parseD (PR.groupByRolling (<=) FL.drain)
93−
94−{-# INLINE wordBy #-}
95−wordBy :: MonadThrow m => Int -> SerialT m Int -> m ()
96−wordBy value = IP.parseD (PR.wordBy (>= value) FL.drain)
97−
98−{-# INLINE manyWordByEven #-}
99−manyWordByEven :: MonadCatch m => SerialT m Int -> m ()
100−manyWordByEven =
101− IP.parseD (PR.many (PR.wordBy (Prelude.even) FL.drain) FL.drain)
102−
103−{-# INLINE many #-}
104−many :: MonadCatch m => SerialT m Int -> m Int
105−many = IP.parseD (PR.many (PR.satisfy (> 0)) FL.length)
106−
107−{-# INLINE manyAlt #-}
108−manyAlt :: MonadCatch m => SerialT m Int -> m Int
109−manyAlt xs = do
110− x <- IP.parseD (AP.many (PR.satisfy (> 0))) xs
111− return $ Prelude.length x
112−
113−{-# INLINE some #-}
114−some :: MonadCatch m => SerialT m Int -> m Int
115−some = IP.parseD (PR.some (PR.satisfy (> 0)) FL.length)
116−
117−{-# INLINE someAlt #-}
118−someAlt :: MonadCatch m => SerialT m Int -> m Int
119−someAlt xs = do
120− x <- IP.parseD (AP.some (PR.satisfy (> 0))) xs
121− return $ Prelude.length x
122−
123−{-#INLINE sliceSepByP #-}
124−sliceSepByP :: MonadCatch m => Int -> SerialT m Int -> m ()
125−sliceSepByP value = IP.parseD (PR.sliceSepByP (>= value) (PR.fromFold FL.drain))
126−
127−{-# INLINE manyTill #-}
128−manyTill :: MonadCatch m => Int -> SerialT m Int -> m Int
129−manyTill value =
130− let p = PR.satisfy (> 0)
131− pcond = PR.satisfy (== value)
132− in IP.parseD (PR.manyTill FL.length p pcond)
133−
134−{-# INLINE serialWith #-}
135−serialWith :: MonadThrow m
136− => Int -> SerialT m Int -> m ((), ())
137−serialWith value =
138− IP.parseD
139− ((,)
140− <$> drainWhile (<= (value `div` 2))
141− <*> drainWhile (<= value)
142− )
143−
144−{-# INLINE teeAllAny #-}
145−teeAllAny :: MonadThrow m
146− => Int -> SerialT m Int -> m ((), ())
147−teeAllAny value =
148− IP.parseD
149− (PR.teeWith (,)
150− (drainWhile (<= value))
151− (drainWhile (<= value))
152− )
153−
154−{-# INLINE teeFstAllAny #-}
155−teeFstAllAny :: MonadThrow m
156− => Int -> SerialT m Int -> m ((), ())
157−teeFstAllAny value =
158− IP.parseD
159− (PR.teeWithFst (,)
160− (drainWhile (<= value))
161− (drainWhile (<= value))
162− )
163−
164−{-# INLINE shortestAllAny #-}
165−shortestAllAny :: MonadThrow m
166− => Int -> SerialT m Int -> m ()
167−shortestAllAny value =
168− IP.parseD
169− (PR.shortest
170− (drainWhile (<= value))
171− (drainWhile (<= value))
172− )
173−
174−{-# INLINE longestAllAny #-}
175−longestAllAny :: MonadCatch m
176− => Int -> SerialT m Int -> m ()
177−longestAllAny value =
178− IP.parseD
179− (PR.longest
180− (drainWhile (<= value))
181− (drainWhile (<= value))
182− )
183−
184−-------------------------------------------------------------------------------
185−-- Spanning
186−-------------------------------------------------------------------------------
187−
188−{-# INLINE span #-}
189−span :: MonadThrow m => Int -> SerialT m Int -> m ((), ())
190−span value = IP.parseD (PR.span (<= (value `div` 2)) FL.drain FL.drain)
191−
192−{-# INLINE spanBy #-}
193−spanBy :: MonadThrow m => Int -> SerialT m Int -> m ((), ())
194−spanBy value =
195− IP.parseD (PR.spanBy (\_ i -> i <= (value `div` 2)) FL.drain FL.drain)
196−
197−{-# INLINE spanByRolling #-}
198−spanByRolling :: MonadThrow m => Int -> SerialT m Int -> m ((), ())
199−spanByRolling value =
200− IP.parseD (PR.spanByRolling (\_ i -> i <= value `div` 2) FL.drain FL.drain)
201−
202−-------------------------------------------------------------------------------
203−-- Nested
204−-------------------------------------------------------------------------------
205−
206−{-# INLINE parseMany #-}
207−parseMany :: MonadThrow m => Int -> SerialT m Int -> m ()
208−parseMany value = IP.drain . IP.parseManyD (drainWhile (<= value + 1))
209−
210−{-# INLINE parseManyGroups #-}
211−parseManyGroups :: MonadThrow m => Bool -> SerialT m Int -> m ()
212−parseManyGroups b = IP.drain . IP.parseManyD (PR.groupBy (\_ _ -> b) FL.drain)
213−
214−{-# INLINE parseManyGroupsRolling #-}
215−parseManyGroupsRolling :: MonadThrow m => Bool -> SerialT m Int -> m ()
216−parseManyGroupsRolling b =
217− IP.drain . IP.parseManyD (PR.groupByRolling (\_ _ -> b) FL.drain)
218−
219−-------------------------------------------------------------------------------
220−-- Parsing with unfolds
221−-------------------------------------------------------------------------------
222−
223−{-# INLINE parseManyUnfoldArrays #-}
224−parseManyUnfoldArrays :: Int -> [Array.Array Int] -> IO ()
225−parseManyUnfoldArrays count arrays = do
226− let src = Source.source (Just (Producer.OuterLoop arrays))
227− let parser = PR.fromFold (FL.take count FL.drain)
228− let readSrc =
229− Source.producer
230− $ Producer.concat Producer.fromList Array.producer
231− let streamParser =
232− Producer.simplify (Source.parseManyD parser readSrc)
233− S.drain $ S.unfold streamParser src
234−
235−-------------------------------------------------------------------------------
236−-- Parsers in which -fspec-constr-recursive=16 is problematic
237−-------------------------------------------------------------------------------
238−
239−-- XXX -fspec-constr-recursive=16 makes GHC go beserk when compiling these.
240−-- We need to fix GHC so that we can have better control over that option or do
241−-- not have to rely on it.
242−--
243−{-# INLINE lookAhead #-}
244−lookAhead :: MonadThrow m => Int -> SerialT m Int -> m ()
245−lookAhead value =
246− IP.parseD (PR.lookAhead (PR.takeWhile (<= value) FL.drain) $> ())
247−
248−{-# INLINE sequenceA_ #-}
249−sequenceA_ :: MonadThrow m => Int -> SerialT m Int -> m ()
250−sequenceA_ value =
251− IP.parseD (F.sequenceA_ $ replicate value (PR.satisfy (> 0)))
252−
253−-- quadratic complexity
254−{-# INLINE sequenceA #-}
255−sequenceA :: MonadThrow m => Int -> SerialT m Int -> m Int
256−sequenceA value xs = do
257− x <- IP.parseD (TR.sequenceA (replicate value (PR.satisfy (> 0)))) xs
258− return $ length x
259−
260−-- quadratic complexity
261−{-# INLINE sequence #-}
262−sequence :: MonadThrow m => Int -> SerialT m Int -> m Int
263−sequence value xs = do
264− x <- IP.parseD (TR.sequence (replicate value (PR.satisfy (> 0)))) xs
265− return $ length x
266−
267−{-# INLINE sequence_ #-}
268−sequence_ :: MonadCatch m => Int -> SerialT m Int -> m ()
269−sequence_ value xs =
270− IP.parseD (foldr f (return ()) (replicate value (PR.takeBetween 0 1 FL.drain))) xs
271−
272− where
273−
274− {-# INLINE f #-}
275− f m k = m >>= (\_ -> k)
276−
277−-- choice using the "Alternative" instance with direct style parser type has
278−-- quadratic performance complexity.
279−--
280−{-# INLINE choiceAsum #-}
281−choiceAsum :: MonadCatch m => Int -> SerialT m Int -> m Int
282−choiceAsum value =
283− IP.parseD (asum (replicate value (PR.satisfy (< 0)))
284− AP.<|> PR.satisfy (> 0))
285−
286−{-# INLINE choice #-}
287−choice :: MonadCatch m => Int -> SerialT m Int -> m Int
288−choice value =
289− IP.parseD
290− (PR.choice (replicate value (PR.satisfy (< 0))) AP.<|> PR.satisfy (> 0))
291−
292−-------------------------------------------------------------------------------
293−-- Benchmarks
294−-------------------------------------------------------------------------------
295−
296−moduleName :: String
297−moduleName = "Data.Parser.ParserD"
298−
299−o_1_space_serial :: Int -> [Benchmark]
300−o_1_space_serial value =
301− [ benchIOSink value "takeWhile" $ takeWhile value
302− , benchIOSink value "takeP" $ takeP value
303− , benchIOSink value "sliceBeginWith" $ sliceBeginWith value
304− , benchIOSink value "groupBy" $ groupBy
305− , benchIOSink value "groupByRolling" $ groupByRolling
306− , benchIOSink value "wordBy" $ wordBy value
307− , benchIOSink value "serialWith" $ serialWith value
308− , benchIOSink value "many" many
309− , benchIOSink value "many (wordBy even)" $ manyWordByEven
310− , benchIOSink value "some" some
311− , benchIOSink value "sliceSepByP" $ sliceSepByP value
312− , benchIOSink value "manyTill" $ manyTill value
313− , benchIOSink value "tee (all,any)" $ teeAllAny value
314− , benchIOSink value "teeFst (all,any)" $ teeFstAllAny value
315− , benchIOSink value "shortest (all,any)" $ shortestAllAny value
316− , benchIOSink value "longest (all,any)" $ longestAllAny value
317− ]
318−
319−o_1_space_serial_spanning :: Int -> [Benchmark]
320−o_1_space_serial_spanning value =
321− [ benchIOSink value "span" $ span value
322− , benchIOSink value "spanBy" $ spanBy value
323− , benchIOSink value "spanByRolling" $ spanByRolling value
324− ]
325−
326−o_1_space_serial_nested :: Int -> [Benchmark]
327−o_1_space_serial_nested value =
328− [ benchIOSink value "parseMany" $ parseMany value
329− , benchIOSink value "parseMany groupBy (bound groups)"
330− $ (parseManyGroups False)
331− , benchIOSink value "parseMany groupRollingBy (bound groups)"
332− $ (parseManyGroupsRolling False)
333− , benchIOSink value "parseMany groupBy (1 group)" $ (parseManyGroups True)
334− , benchIOSink value "parseMany groupRollingBy (1 group)"
335− $ (parseManyGroupsRolling True)
336− ]
337−
338−o_1_space_serial_unfold :: Int -> [Array.Array Int] -> [Benchmark]
339−o_1_space_serial_unfold bound arrays =
340− [ bench "parseMany/Unfold/1000 arrays/1 parse"
341− $ nfIO $ parseManyUnfoldArrays bound arrays
342− , bench "parseMany/Unfold/1000 arrays/100000 parses"
343− $ nfIO $ parseManyUnfoldArrays 1 arrays
344− ]
345−
346−o_n_heap_serial :: Int -> [Benchmark]
347−o_n_heap_serial value =
348− [
349− -- lookahead benchmark holds the entire input till end
350− benchIOSink value "lookAhead" $ lookAhead value
351−
352− -- These show non-linear time complexity
353− -- They accumulate the results in a list.
354− , benchIOSink value "manyAlt" manyAlt
355− , benchIOSink value "someAlt" someAlt
356− ]
357−
358−-- accumulate results in a list in IO
359−o_n_space_serial :: Int -> [Benchmark]
360−o_n_space_serial value =
361− [ benchIOSink value "sequenceA/100" $ sequenceA (value `div` 100)
362− , benchIOSink value "sequenceA_/100" $ sequenceA_ (value `div` 100)
363− , benchIOSink value "sequence/100" $ sequence (value `div` 100)
364− , benchIOSink value "sequence_/100" $ sequence_ (value `div` 100)
365− , benchIOSink value "choice (asum)/100" $ choiceAsum (value `div` 100)
366− , benchIOSink value "choice/100" $ choice (value `div` 100)
367− ]
368−
369−-------------------------------------------------------------------------------
370−-- Driver
371−-------------------------------------------------------------------------------
372−
373−main :: IO ()
374−main = runWithCLIOptsEnv defaultStreamSize alloc allBenchmarks
375−
376− where
377−
378− alloc value = IP.toList $ IP.arraysOf 100 $ sourceUnfoldrM value 0
379−
380− allBenchmarks arraysSmall value =
381− [ bgroup (o_1_space_prefix moduleName) (o_1_space_serial value)
382− , bgroup (o_1_space_prefix moduleName) (o_1_space_serial_spanning value)
383− , bgroup (o_1_space_prefix moduleName) (o_1_space_serial_nested value)
384− , bgroup (o_1_space_prefix moduleName)
385− (o_1_space_serial_unfold value arraysSmall)
386− , bgroup (o_n_heap_prefix moduleName) (o_n_heap_serial value)
387− , bgroup (o_n_space_prefix moduleName) (o_n_space_serial value)
388− ]
benchmark/Streamly/Benchmark/Data/Parser/ParserK.hsdeleted−163
@@ -1,163 +0,0 @@
1−-- |
2−-- Module : Streamly.Benchmark.Data.ParserK
3−-- Copyright : (c) 2020 Composewell Technologies
4−--
5−-- License : BSD-3-Clause
6−-- Maintainer : streamly@composewell.com
7−
8−{-# LANGUAGE CPP #-}
9−{-# LANGUAGE FlexibleContexts #-}
10−
11−module Main
12− (
13− main
14− ) where
15−
16−import Control.DeepSeq (NFData(..))
17−import Control.Monad.Catch (MonadCatch)
18−import Data.Foldable (asum)
19−import System.Random (randomRIO)
20−import Prelude hiding (any, all, take, sequence, sequenceA, takeWhile)
21−
22−import qualified Control.Applicative as AP
23−import qualified Data.Foldable as F
24−import qualified Data.Traversable as TR
25−import qualified Streamly.Prelude as S
26−import qualified Streamly.Internal.Data.Fold as FL
27−import qualified Streamly.Internal.Data.Parser.ParserK.Type as PR
28−import qualified Streamly.Internal.Data.Parser.ParserD as PRD
29−import qualified Streamly.Internal.Data.Stream.IsStream as IP
30−
31−import Gauge
32−import Streamly.Prelude (SerialT, MonadAsync, IsStream)
33−import Streamly.Benchmark.Common
34−
35−-------------------------------------------------------------------------------
36−-- Utilities
37−-------------------------------------------------------------------------------
38−
39−-- XXX these can be moved to the common module
40−
41−{-# INLINE sourceUnfoldrM #-}
42−sourceUnfoldrM :: (IsStream t, MonadAsync m) => Int -> Int -> t m Int
43−sourceUnfoldrM value n = S.unfoldrM step n
44− where
45− step cnt =
46− if cnt > n + value
47− then return Nothing
48− else return (Just (cnt, cnt + 1))
49−
50−-- | Takes a fold method, and uses it with a default source.
51−{-# INLINE benchIOSink #-}
52−benchIOSink
53− :: (IsStream t, NFData b)
54− => Int -> String -> (t IO Int -> IO b) -> Benchmark
55−benchIOSink value name f =
56− bench name $ nfIO $ randomRIO (1,1) >>= f . sourceUnfoldrM value
57−
58−-------------------------------------------------------------------------------
59−-- Parsers
60−-------------------------------------------------------------------------------
61−
62−#ifdef FROM_PARSERK
63−#define PARSE_OP (IP.parseD . PR.fromParserK)
64−#else
65−#define PARSE_OP IP.parseK
66−#endif
67−
68−{-# INLINE satisfy #-}
69−satisfy :: MonadCatch m => (a -> Bool) -> PR.Parser m a a
70−satisfy = PR.toParserK . PRD.satisfy
71−
72−{-# INLINE takeWhile #-}
73−takeWhile :: MonadCatch m => (a -> Bool) -> PR.Parser m a ()
74−takeWhile p = PR.toParserK $ PRD.takeWhile p FL.drain
75−
76−{-# INLINE takeWhileK #-}
77−takeWhileK :: MonadCatch m => Int -> SerialT m Int -> m ()
78−takeWhileK value = PARSE_OP (takeWhile (<= value))
79−
80−{-# INLINE splitApp #-}
81−splitApp :: MonadCatch m
82− => Int -> SerialT m Int -> m ((), ())
83−splitApp value =
84− PARSE_OP ((,) <$> takeWhile (<= (value `div` 2)) <*> takeWhile (<= value))
85−
86−{-# INLINE sequenceA #-}
87−sequenceA :: MonadCatch m => Int -> SerialT m Int -> m Int
88−sequenceA value xs = do
89− let parser = satisfy (> 0)
90− list = Prelude.replicate value parser
91− x <- PARSE_OP (TR.sequenceA list) xs
92− return $ Prelude.length x
93−
94−{-# INLINE sequenceA_ #-}
95−sequenceA_ :: MonadCatch m => Int -> SerialT m Int -> m ()
96−sequenceA_ value xs = do
97− let parser = satisfy (> 0)
98− list = Prelude.replicate value parser
99− PARSE_OP (F.sequenceA_ list) xs
100−
101−{-# INLINE sequence #-}
102−sequence :: MonadCatch m => Int -> SerialT m Int -> m Int
103−sequence value xs = do
104− let parser = satisfy (> 0)
105− list = Prelude.replicate value parser
106− x <- PARSE_OP (TR.sequence list) xs
107− return $ Prelude.length x
108−
109−{-# INLINE manyAlt #-}
110−manyAlt :: MonadCatch m => SerialT m Int -> m Int
111−manyAlt xs = do
112− x <- PARSE_OP (AP.many (satisfy (> 0))) xs
113− return $ Prelude.length x
114−
115−{-# INLINE someAlt #-}
116−someAlt :: MonadCatch m => SerialT m Int -> m Int
117−someAlt xs = do
118− x <- PARSE_OP (AP.some (satisfy (> 0))) xs
119− return $ Prelude.length x
120−
121−{-# INLINE choice #-}
122−choice :: MonadCatch m => Int -> SerialT m Int -> m Int
123−choice value =
124− PARSE_OP (asum (replicate value (satisfy (< 0)))
125− AP.<|> satisfy (> 0))
126−
127−-------------------------------------------------------------------------------
128−-- Benchmarks
129−-------------------------------------------------------------------------------
130−
131−moduleName :: String
132−moduleName = "Data.Parser.ParserK"
133−
134−o_1_space_serial :: Int -> [Benchmark]
135−o_1_space_serial value =
136− [ benchIOSink value "takeWhile" $ takeWhileK value
137− , benchIOSink value "splitApp" $ splitApp value
138− ]
139−
140−-- O(n) heap beacuse of accumulation of the list in strict IO monad?
141−o_n_heap_serial :: Int -> [Benchmark]
142−o_n_heap_serial value =
143− [ benchIOSink value "sequenceA" $ sequenceA value
144− , benchIOSink value "sequenceA_" $ sequenceA_ value
145− , benchIOSink value "sequence" $ sequence value
146− , benchIOSink value "manyAlt" manyAlt
147− , benchIOSink value "someAlt" someAlt
148− , benchIOSink value "choice" $ choice value
149− ]
150−
151−-------------------------------------------------------------------------------
152−-- Driver
153−-------------------------------------------------------------------------------
154−
155−main :: IO ()
156−main = runWithCLIOpts defaultStreamSize allBenchmarks
157−
158− where
159−
160− allBenchmarks value =
161− [ bgroup (o_1_space_prefix moduleName) (o_1_space_serial value)
162− , bgroup (o_n_heap_prefix moduleName) (o_n_heap_serial value)
163− ]
benchmark/Streamly/Benchmark/Data/ParserK.hsnew file+437
@@ -0,0 +1,437 @@
1+-- |
2+-- Module : Streamly.Benchmark.Data.ParserK
3+-- Copyright : (c) 2020 Composewell Technologies
4+--
5+-- License : BSD-3-Clause
6+-- Maintainer : streamly@composewell.com
7+
8+-- BENCH_CHUNKED -> adaptC
9+-- BENCH_CHUNKED_GENERIC -> adaptCG
10+-- BENCH_SINGULAR -> adapt
11+
12+{-# LANGUAGE CPP #-}
13+{-# LANGUAGE FlexibleContexts #-}
14+{-# OPTIONS_GHC -Wno-orphans #-}
15+
16+module Main
17+ (
18+ main
19+ ) where
20+
21+import Control.Applicative ((<|>))
22+import Control.DeepSeq (NFData(..))
23+import Control.Monad.IO.Class (MonadIO)
24+import Data.Foldable (asum)
25+#ifdef BENCH_CHUNKED
26+import Streamly.Data.Array (Array, Unbox)
27+#endif
28+#ifdef BENCH_CHUNKED_GENERIC
29+import Streamly.Data.Array.Generic (Array)
30+import qualified Streamly.Internal.Data.Array.Generic as GenArr (chunksOf)
31+#endif
32+import Streamly.Internal.Data.Fold (Fold(..))
33+import Streamly.Data.StreamK (StreamK)
34+import Streamly.Internal.Data.Parser
35+ (ParseError(..), Parser(..), Initial(..), Step(..))
36+import Streamly.Internal.Data.Stream (Stream)
37+import System.Random (randomRIO)
38+import Prelude hiding
39+ (any, all, take, sequence, sequence_, sequenceA, takeWhile)
40+
41+import qualified Control.Applicative as AP
42+import qualified Data.Foldable as F
43+import qualified Data.Traversable as TR
44+import qualified Streamly.Data.Stream as Stream
45+import qualified Streamly.Data.Fold as FL
46+import qualified Streamly.Internal.Data.Fold as Fold
47+import qualified Streamly.Data.Parser as PRD
48+import qualified Streamly.Internal.Data.ParserK as PR
49+import qualified Streamly.Internal.Data.StreamK as StreamK
50+
51+import Test.Tasty.Bench
52+import Streamly.Benchmark.Common
53+
54+-------------------------------------------------------------------------------
55+-- CPP Helpers
56+-------------------------------------------------------------------------------
57+
58+#ifdef BENCH_CHUNKED
59+
60+#define PARSE_OP StreamK.parseChunks
61+#define FROM_PARSER adaptC
62+#define INPUT (Array a)
63+#define PARSE_ELEM (Array Int)
64+#define CONSTRAINT_IO (MonadIO m, Unbox a)
65+#define CONSTRAINT (Monad m, Unbox a)
66+#define MODULE_NAME "Data.ParserK.Chunked"
67+
68+#endif
69+
70+#ifdef BENCH_CHUNKED_GENERIC
71+
72+#define PARSE_OP StreamK.parseChunksGeneric
73+#define FROM_PARSER adaptCG
74+#define INPUT (Array a)
75+#define PARSE_ELEM (Array Int)
76+#define CONSTRAINT_IO (MonadIO m)
77+#define CONSTRAINT (Monad m)
78+#define MODULE_NAME "Data.ParserK.Chunked.Generic"
79+
80+#endif
81+
82+#ifdef BENCH_SINGULAR
83+
84+#define PARSE_OP StreamK.parse
85+#define FROM_PARSER adapt
86+#define INPUT a
87+#define PARSE_ELEM Int
88+#define CONSTRAINT_IO (MonadIO m)
89+#define CONSTRAINT (Monad m)
90+#define MODULE_NAME "Data.ParserK"
91+
92+#endif
93+
94+-------------------------------------------------------------------------------
95+-- Utilities
96+-------------------------------------------------------------------------------
97+
98+-- XXX these can be moved to the common module
99+
100+{-# INLINE sourceUnfoldrM #-}
101+sourceUnfoldrM :: Monad m => Int -> Int -> Stream m Int
102+sourceUnfoldrM value n = Stream.unfoldrM step n
103+ where
104+ step cnt =
105+ if cnt > n + value
106+ then return Nothing
107+ else return (Just (cnt, cnt + 1))
108+
109+-- | Takes a fold method, and uses it with a default source.
110+{-# INLINE benchIOSink #-}
111+benchIOSink
112+ :: NFData b
113+ => Int -> String -> (StreamK IO PARSE_ELEM -> IO b) -> Benchmark
114+benchIOSink value name f =
115+ bench name $ nfIO $ randomRIO (1,1)
116+ >>= f
117+ . StreamK.fromStream
118+#ifdef BENCH_CHUNKED
119+ . Stream.chunksOf 4000
120+#endif
121+#ifdef BENCH_CHUNKED_GENERIC
122+ . GenArr.chunksOf 4000
123+#endif
124+ . sourceUnfoldrM value
125+
126+-------------------------------------------------------------------------------
127+-- Parsers
128+-------------------------------------------------------------------------------
129+
130+{-# INLINE one #-}
131+one :: MonadIO m =>
132+ Int -> StreamK m PARSE_ELEM -> m (Either ParseError (Maybe Int))
133+one value = PARSE_OP p
134+
135+ where
136+
137+ p = do
138+ m <- PR.FROM_PARSER (PRD.fromFold FL.one)
139+ case m of
140+ Just i -> if i >= value then pure m else p
141+ Nothing -> pure Nothing
142+
143+{-# INLINE satisfy #-}
144+satisfy :: CONSTRAINT_IO => (a -> Bool) -> PR.ParserK INPUT m a
145+satisfy = PR.FROM_PARSER . PRD.satisfy
146+
147+{-# INLINE takeWhile #-}
148+takeWhile :: CONSTRAINT_IO => (a -> Bool) -> PR.ParserK INPUT m ()
149+takeWhile p = PR.FROM_PARSER $ PRD.takeWhile p FL.drain
150+
151+{-# INLINE takeWhileK #-}
152+takeWhileK :: MonadIO m =>
153+ Int -> StreamK m PARSE_ELEM -> m (Either ParseError ())
154+takeWhileK value = PARSE_OP (takeWhile (<= value))
155+
156+{-# INLINE splitAp2 #-}
157+splitAp2 :: MonadIO m
158+ => Int -> StreamK m PARSE_ELEM -> m (Either ParseError ((), ()))
159+splitAp2 value =
160+ PARSE_OP
161+ ((,)
162+ <$> takeWhile (<= (value `div` 2))
163+ <*> takeWhile (<= value)
164+ )
165+
166+{-# INLINE splitAp8 #-}
167+splitAp8 :: MonadIO m
168+ => Int -> StreamK m PARSE_ELEM -> m (Either ParseError ())
169+splitAp8 value =
170+ PARSE_OP
171+ ( (\() () () () () () () () -> ())
172+ <$> takeWhile (<= ( value `div` 8))
173+ <*> takeWhile (<= ((value * 2) `div` 8))
174+ <*> takeWhile (<= ((value * 3) `div` 8))
175+ <*> takeWhile (<= ((value * 4) `div` 8))
176+ <*> takeWhile (<= ((value * 5) `div` 8))
177+ <*> takeWhile (<= ((value * 6) `div` 8))
178+ <*> takeWhile (<= ((value * 7) `div` 8))
179+ <*> takeWhile (<= value)
180+ )
181+
182+{-# INLINE sequenceA #-}
183+sequenceA :: MonadIO m => Int -> StreamK m PARSE_ELEM -> m Int
184+sequenceA value xs = do
185+ let parser = satisfy (> 0)
186+ list = Prelude.replicate value parser
187+ x <- PARSE_OP (TR.sequenceA list) xs
188+ return $ Prelude.length x
189+
190+{-# INLINE sequenceA_ #-}
191+sequenceA_ :: MonadIO m =>
192+ Int -> StreamK m PARSE_ELEM -> m (Either ParseError ())
193+sequenceA_ value xs = do
194+ let parser = satisfy (> 0)
195+ list = Prelude.replicate value parser
196+ PARSE_OP (F.sequenceA_ list) xs
197+
198+{-# INLINE sequence #-}
199+sequence :: MonadIO m => Int -> StreamK m PARSE_ELEM -> m Int
200+sequence value xs = do
201+ let parser = satisfy (> 0)
202+ list = Prelude.replicate value parser
203+ x <- PARSE_OP (TR.sequence list) xs
204+ return $ Prelude.length x
205+
206+{-# INLINE sequence_ #-}
207+sequence_ :: MonadIO m =>
208+ Int -> StreamK m PARSE_ELEM -> m (Either ParseError ())
209+sequence_ value =
210+ let parser = satisfy (> 0)
211+ list = Prelude.replicate value parser
212+ in PARSE_OP (F.sequence_ list)
213+
214+{-# INLINE takeWhileFailD #-}
215+takeWhileFailD :: Monad m => (a -> Bool) -> Fold m a b -> Parser a m b
216+takeWhileFailD predicate (Fold fstep finitial _ ffinal) =
217+ Parser step initial extract
218+
219+ where
220+
221+ initial = do
222+ res <- finitial
223+ return $ case res of
224+ Fold.Partial s -> IPartial s
225+ Fold.Done b -> IDone b
226+
227+ step s a =
228+ if predicate a
229+ then do
230+ fres <- fstep s a
231+ return
232+ $ case fres of
233+ Fold.Partial s1 -> Partial 0 s1
234+ Fold.Done b -> Done 0 b
235+ else return $ Error "fail"
236+
237+ extract s = fmap (Done 0) (ffinal s)
238+
239+{-# INLINE takeWhileFail #-}
240+takeWhileFail :: CONSTRAINT =>
241+ (a -> Bool) -> Fold m a b -> PR.ParserK INPUT m b
242+takeWhileFail p f = PR.FROM_PARSER (takeWhileFailD p f)
243+
244+{-# INLINE alt2 #-}
245+alt2 :: MonadIO m
246+ => Int -> StreamK m PARSE_ELEM -> m (Either ParseError ())
247+alt2 value =
248+ PARSE_OP
249+ ( takeWhileFail (<= (value `div` 2)) Fold.drain
250+ <|> takeWhile (<= value)
251+ )
252+
253+{-# INLINE alt8 #-}
254+alt8 :: MonadIO m
255+ => Int -> StreamK m PARSE_ELEM -> m (Either ParseError ())
256+alt8 value =
257+ PARSE_OP
258+ ( takeWhileFail (<= ( value `div` 8)) Fold.drain
259+ <|> takeWhileFail (<= ((value * 2) `div` 8)) Fold.drain
260+ <|> takeWhileFail (<= ((value * 3) `div` 8)) Fold.drain
261+ <|> takeWhileFail (<= ((value * 4) `div` 8)) Fold.drain
262+ <|> takeWhileFail (<= ((value * 5) `div` 8)) Fold.drain
263+ <|> takeWhileFail (<= ((value * 6) `div` 8)) Fold.drain
264+ <|> takeWhileFail (<= ((value * 7) `div` 8)) Fold.drain
265+ <|> takeWhile (<= value)
266+ )
267+
268+{-# INLINE alt16 #-}
269+alt16 :: MonadIO m
270+ => Int -> StreamK m PARSE_ELEM -> m (Either ParseError ())
271+alt16 value =
272+ PARSE_OP
273+ ( takeWhileFail (<= ( value `div` 16)) Fold.drain
274+ <|> takeWhileFail (<= ((value * 2) `div` 16)) Fold.drain
275+ <|> takeWhileFail (<= ((value * 3) `div` 16)) Fold.drain
276+ <|> takeWhileFail (<= ((value * 4) `div` 16)) Fold.drain
277+ <|> takeWhileFail (<= ((value * 5) `div` 16)) Fold.drain
278+ <|> takeWhileFail (<= ((value * 6) `div` 16)) Fold.drain
279+ <|> takeWhileFail (<= ((value * 7) `div` 16)) Fold.drain
280+ <|> takeWhileFail (<= ((value * 8) `div` 16)) Fold.drain
281+ <|> takeWhileFail (<= ((value * 9) `div` 16)) Fold.drain
282+ <|> takeWhileFail (<= ((value * 10) `div` 16)) Fold.drain
283+ <|> takeWhileFail (<= ((value * 11) `div` 16)) Fold.drain
284+ <|> takeWhileFail (<= ((value * 12) `div` 16)) Fold.drain
285+ <|> takeWhileFail (<= ((value * 13) `div` 16)) Fold.drain
286+ <|> takeWhileFail (<= ((value * 14) `div` 16)) Fold.drain
287+ <|> takeWhileFail (<= ((value * 15) `div` 16)) Fold.drain
288+ <|> takeWhile (<= value)
289+ )
290+
291+{-# INLINE manyAlt #-}
292+manyAlt :: MonadIO m => StreamK m PARSE_ELEM -> m Int
293+manyAlt xs = do
294+ x <- PARSE_OP (AP.many (satisfy (> 0))) xs
295+ return $ Prelude.length x
296+
297+{-# INLINE someAlt #-}
298+someAlt :: MonadIO m => StreamK m PARSE_ELEM -> m Int
299+someAlt xs = do
300+ x <- PARSE_OP (AP.some (satisfy (> 0))) xs
301+ return $ Prelude.length x
302+
303+{-# INLINE choice #-}
304+choice :: MonadIO m =>
305+ Int -> StreamK m PARSE_ELEM -> m (Either ParseError Int)
306+choice value =
307+ PARSE_OP (asum (replicate value (satisfy (< 0)))
308+ AP.<|> satisfy (> 0))
309+
310+{-# INLINE monad2 #-}
311+monad2 :: MonadIO m
312+ => Int -> StreamK m PARSE_ELEM -> m (Either ParseError ())
313+monad2 value =
314+ PARSE_OP $ do
315+ takeWhile (<= (value `div` 2))
316+ takeWhile (<= value)
317+
318+{-# INLINE monad4 #-}
319+monad4 :: MonadIO m
320+ => Int -> StreamK m PARSE_ELEM -> m (Either ParseError ())
321+monad4 value =
322+ PARSE_OP $ do
323+ takeWhile (<= ( value `div` 4))
324+ takeWhile (<= ((value * 2) `div` 4))
325+ takeWhile (<= ((value * 3) `div` 4))
326+ takeWhile (<= value)
327+
328+{-# INLINE monad8 #-}
329+monad8 :: MonadIO m
330+ => Int -> StreamK m PARSE_ELEM -> m (Either ParseError ())
331+monad8 value =
332+ PARSE_OP $ do
333+ takeWhile (<= ( value `div` 8))
334+ takeWhile (<= ((value * 2) `div` 8))
335+ takeWhile (<= ((value * 3) `div` 8))
336+ takeWhile (<= ((value * 4) `div` 8))
337+ takeWhile (<= ((value * 5) `div` 8))
338+ takeWhile (<= ((value * 6) `div` 8))
339+ takeWhile (<= ((value * 7) `div` 8))
340+ takeWhile (<= value)
341+
342+{-# INLINE monad16 #-}
343+monad16 :: MonadIO m
344+ => Int -> StreamK m PARSE_ELEM -> m (Either ParseError ())
345+monad16 value =
346+ PARSE_OP $ do
347+ takeWhile (<= ( value `div` 16))
348+ takeWhile (<= ((value * 2) `div` 16))
349+ takeWhile (<= ((value * 3) `div` 16))
350+ takeWhile (<= ((value * 4) `div` 16))
351+ takeWhile (<= ((value * 5) `div` 16))
352+ takeWhile (<= ((value * 6) `div` 16))
353+ takeWhile (<= ((value * 7) `div` 16))
354+ takeWhile (<= ((value * 8) `div` 16))
355+ takeWhile (<= ((value * 9) `div` 16))
356+ takeWhile (<= ((value * 10) `div` 16))
357+ takeWhile (<= ((value * 11) `div` 16))
358+ takeWhile (<= ((value * 12) `div` 16))
359+ takeWhile (<= ((value * 13) `div` 16))
360+ takeWhile (<= ((value * 14) `div` 16))
361+ takeWhile (<= ((value * 15) `div` 16))
362+ takeWhile (<= value)
363+
364+-------------------------------------------------------------------------------
365+-- Benchmarks
366+-------------------------------------------------------------------------------
367+
368+moduleName :: String
369+moduleName = MODULE_NAME
370+
371+instance NFData ParseError where
372+ {-# INLINE rnf #-}
373+ rnf (ParseError x) = rnf x
374+
375+o_1_space_serial :: Int -> [Benchmark]
376+o_1_space_serial value =
377+ [ benchIOSink value "drain" (Stream.fold Fold.drain . StreamK.toStream)
378+ , benchIOSink value "takeWhile" $ takeWhileK value
379+ , benchIOSink value "splitAp2" $ splitAp2 value
380+ , benchIOSink value "splitAp8" $ splitAp8 value
381+ , benchIOSink value "alt2" $ alt2 value
382+ , benchIOSink value "alt8" $ alt8 value
383+ , benchIOSink value "alt16" $ alt16 value
384+ , benchIOSink value "monad2" $ monad2 value
385+ , benchIOSink value "monad4" $ monad4 value
386+ , benchIOSink value "monad8" $ monad8 value
387+ , benchIOSink value "monad16" $ monad16 value
388+ ]
389+
390+{-# INLINE sepBy1 #-}
391+sepBy1 :: MonadIO m => StreamK m PARSE_ELEM -> m Int
392+sepBy1 xs = do
393+ x <- PARSE_OP (parser (satisfy odd) (satisfy even)) xs
394+ return $ Prelude.length x
395+
396+ where
397+
398+ parser p sep = do
399+ x <- p
400+ fmap (x :) $ AP.many (sep >> p)
401+
402+-- O(n) heap beacuse of accumulation of the list in strict IO monad?
403+o_n_heap_serial :: Int -> [Benchmark]
404+o_n_heap_serial value =
405+ [
406+ -- accumulates the results in a list
407+ -- XXX why should this take O(n) heap, it discards the results?
408+ benchIOSink value "sequence_" $ sequence_ value
409+ , benchIOSink value "sequenceA_" $ sequenceA_ value
410+ , benchIOSink value "sequence" $ sequence value
411+ , benchIOSink value "sequenceA" $ sequenceA value
412+ , benchIOSink value "manyAlt" manyAlt
413+ , benchIOSink value "sepBy1" sepBy1
414+ , benchIOSink value "someAlt" someAlt
415+ , benchIOSink value "choice" $ choice value
416+ ]
417+
418+-- O(n) heap beacuse of accumulation of the list in strict IO monad?
419+o_1_space_recursive :: Int -> [Benchmark]
420+o_1_space_recursive value =
421+ [ benchIOSink value "one (recursive)" $ one value
422+ ]
423+
424+-------------------------------------------------------------------------------
425+-- Driver
426+-------------------------------------------------------------------------------
427+
428+main :: IO ()
429+main = runWithCLIOpts defaultStreamSize allBenchmarks
430+
431+ where
432+
433+ allBenchmarks value =
434+ [ bgroup (o_1_space_prefix moduleName) (o_1_space_serial value)
435+ , bgroup (o_1_space_prefix moduleName) (o_1_space_recursive value)
436+ , bgroup (o_n_heap_prefix moduleName) (o_n_heap_serial value)
437+ ]
benchmark/Streamly/Benchmark/Data/Ring/Unboxed.hsnew file+69
@@ -0,0 +1,69 @@
1+-- |
2+-- Module : Streamly.Benchmark.Data.Ring.Unboxed
3+-- Copyright : (c) 2022 Composewell
4+-- License : BSD-3-Clause
5+-- Maintainer : streamly@composewell.com
6+
7+{-# LANGUAGE FlexibleContexts #-}
8+{-# LANGUAGE RankNTypes #-}
9+{-# LANGUAGE ScopedTypeVariables #-}
10+
11+module Main (main) where
12+
13+import Control.Monad (void)
14+import GHC.Ptr (Ptr(..))
15+import qualified Streamly.Internal.Data.Array as Array
16+import qualified Streamly.Internal.Data.Ring as Ring
17+import qualified Data.Foldable as P
18+
19+import Test.Tasty.Bench
20+import Streamly.Benchmark.Common
21+
22+import Prelude as P
23+
24+-------------------------------------------------------------------------------
25+-- Benchmark ops
26+-------------------------------------------------------------------------------
27+
28+unsafeEqArrayN :: (Int, Array.Array Int, (Ring.Ring Int, Ptr Int)) -> Bool
29+unsafeEqArrayN (value, arr, (ring, rh)) = Ring.unsafeEqArrayN ring rh arr value
30+
31+unsafeEqArray :: (Array.Array Int, (Ring.Ring Int, Ptr Int)) -> Bool
32+unsafeEqArray (arr, (ring, rh)) = Ring.unsafeEqArray ring rh arr
33+
34+-------------------------------------------------------------------------------
35+-- Benchmark groups
36+-------------------------------------------------------------------------------
37+
38+o_1_space_serial ::
39+ Int -> Array.Array Int -> (Ring.Ring Int, Ptr Int) -> [Benchmark]
40+o_1_space_serial value arr (ring, rh) =
41+ [ bench "unsafeEqArrayN" $ nf unsafeEqArrayN (value, arr, (ring, rh))
42+ , bench "unsafeEqArray" $ nf unsafeEqArray (arr, (ring, rh))
43+ ]
44+
45+-------------------------------------------------------------------------------
46+-- Main
47+-------------------------------------------------------------------------------
48+
49+moduleName :: String
50+moduleName = "Data.Ring.Unboxed"
51+
52+main :: IO ()
53+main = do
54+ runWithCLIOptsEnv defaultStreamSize alloc allBenchmarks
55+
56+ where
57+
58+ alloc value = do
59+ let input = [1 .. value] :: [Int]
60+ let arr = Array.fromList input
61+ (ring, rh) <- Ring.new value
62+ void $ P.foldlM (Ring.unsafeInsert ring) rh input
63+ return (arr, (ring, rh))
64+
65+ allBenchmarks (arr, (ring, rh)) value =
66+ [ bgroup
67+ (o_1_space_prefix moduleName)
68+ (o_1_space_serial value arr (ring, rh))
69+ ]
benchmark/Streamly/Benchmark/Data/Serialize.hsnew file+591
@@ -0,0 +1,591 @@
1+{-# LANGUAGE TemplateHaskell #-}
2+{- HLINT ignore -}
3+
4+#undef FUSION_CHECK
5+#ifdef FUSION_CHECK
6+{-# OPTIONS_GHC -ddump-simpl -ddump-to-file -dsuppress-all #-}
7+#endif
8+
9+-- |
10+-- Module : Streamly.Benchmark.Data.Serialize
11+-- Copyright : (c) 2023 Composewell
12+-- License : BSD-3-Clause
13+-- Maintainer : streamly@composewell.com
14+
15+module Main (main) where
16+
17+-------------------------------------------------------------------------------
18+-- Imports
19+-------------------------------------------------------------------------------
20+
21+import Control.DeepSeq (NFData(..), deepseq)
22+import Control.Monad (when, void)
23+import GHC.Generics (Generic)
24+import System.Random (randomRIO)
25+#ifndef USE_UNBOX
26+import Test.QuickCheck (Arbitrary, arbitrary)
27+#endif
28+
29+import Streamly.Internal.Data.MutByteArray
30+import qualified Streamly.Internal.Data.MutByteArray as MBA
31+#ifdef USE_UNBOX
32+import Data.Proxy (Proxy(..))
33+#else
34+import Control.DeepSeq (force)
35+import Test.QuickCheck (oneof, generate)
36+#endif
37+
38+import Test.Tasty.Bench
39+import Streamly.Benchmark.Common
40+
41+#ifndef USE_UNBOX
42+import Streamly.Benchmark.Data.Serialize.RecCompatible
43+import Streamly.Benchmark.Data.Serialize.RecNonCompatible
44+#endif
45+
46+#ifdef USE_UNBOX
47+#define SERIALIZE_CLASS Unbox
48+#define DERIVE_CLASS(typ) $(deriveUnbox [d|instance Unbox typ|])
49+#define SERIALIZE_OP pokeAt
50+#define DESERIALIZE_OP peekAt
51+#else
52+#define SERIALIZE_CLASS Serialize
53+#define DERIVE_CLASS(typ) $(deriveSerialize [d|instance Serialize typ|])
54+#define SERIALIZE_OP serializeAt
55+#define DESERIALIZE_OP deserializeAt
56+#endif
57+
58+-------------------------------------------------------------------------------
59+-- Types
60+-------------------------------------------------------------------------------
61+
62+data Unit = Unit
63+ deriving (Generic, Show, Eq)
64+
65+#ifndef USE_TH
66+instance SERIALIZE_CLASS Unit
67+#else
68+DERIVE_CLASS(Unit)
69+#endif
70+
71+instance NFData Unit where
72+ {-# INLINE rnf #-}
73+ rnf _ = ()
74+
75+data Sum2
76+ = Sum21
77+ | Sum22
78+ deriving (Generic, Show, Eq)
79+
80+#ifndef USE_TH
81+instance SERIALIZE_CLASS Sum2
82+#else
83+DERIVE_CLASS(Sum2)
84+#endif
85+
86+instance NFData Sum2 where
87+ {-# INLINE rnf #-}
88+ rnf _ = ()
89+
90+data Sum25
91+ = Sum251
92+ | Sum252
93+ | Sum253
94+ | Sum254
95+ | Sum255
96+ | Sum256
97+ | Sum257
98+ | Sum258
99+ | Sum259
100+ | Sum2510
101+ | Sum2511
102+ | Sum2512
103+ | Sum2513
104+ | Sum2514
105+ | Sum2515
106+ | Sum2516
107+ | Sum2517
108+ | Sum2518
109+ | Sum2519
110+ | Sum2520
111+ | Sum2521
112+ | Sum2522
113+ | Sum2523
114+ | Sum2524
115+ | Sum2525
116+ deriving (Generic, Show, Eq)
117+
118+#ifndef USE_TH
119+instance SERIALIZE_CLASS Sum25
120+#else
121+DERIVE_CLASS(Sum25)
122+#endif
123+
124+instance NFData Sum25 where
125+ {-# INLINE rnf #-}
126+ rnf _ = ()
127+
128+data Product25
129+ = Product25
130+ Int
131+ Int
132+ Int
133+ Int
134+ Int
135+ Int
136+ Int
137+ Int
138+ Int
139+ Int
140+ Int
141+ Int
142+ Int
143+ Int
144+ Int
145+ Int
146+ Int
147+ Int
148+ Int
149+ Int
150+ Int
151+ Int
152+ Int
153+ Int
154+ Int
155+ deriving (Generic, Show)
156+
157+#ifndef USE_TH
158+instance SERIALIZE_CLASS Product25
159+#else
160+DERIVE_CLASS(Product25)
161+#endif
162+
163+instance NFData Product25 where
164+ {-# INLINE rnf #-}
165+ rnf
166+ (Product25 a1 a2 a3 a4 a5 a6 a7 a8 a9 a10 a11 a12 a13 a14 a15 a16 a17 a18 a19 a20 a21 a22 a23 a24 a25)
167+ = a1
168+ `seq` a2
169+ `seq` a3
170+ `seq` a4
171+ `seq` a5
172+ `seq` a6
173+ `seq` a7
174+ `seq` a8
175+ `seq` a9
176+ `seq` a10
177+ `seq` a11
178+ `seq` a12
179+ `seq` a13
180+ `seq` a14
181+ `seq` a15
182+ `seq` a16
183+ `seq` a17
184+ `seq` a18
185+ `seq` a19
186+ `seq` a20
187+ `seq` a21
188+ `seq` a22
189+ `seq` a23
190+ `seq` a24
191+ `seq` a25
192+ `seq` ()
193+
194+-- XXX derived Eq instance is not inlined
195+instance Eq Product25 where
196+ {-# INLINE (==) #-}
197+ (==)
198+ (Product25 a1 a2 a3 a4 a5 a6 a7 a8 a9 a10 a11 a12 a13 a14 a15 a16 a17 a18 a19 a20 a21 a22 a23 a24 a25)
199+ (Product25 b1 b2 b3 b4 b5 b6 b7 b8 b9 b10 b11 b12 b13 b14 b15 b16 b17 b18 b19 b20 b21 b22 b23 b24 b25)
200+ = a1 == b1
201+ && a2 == b2
202+ && a3 == b3
203+ && a4 == b4
204+ && a5 == b5
205+ && a6 == b6
206+ && a7 == b7
207+ && a8 == b8
208+ && a9 == b9
209+ && a10 == b10
210+ && a11 == b11
211+ && a12 == b12
212+ && a13 == b13
213+ && a14 == b14
214+ && a15 == b15
215+ && a16 == b16
216+ && a17 == b17
217+ && a18 == b18
218+ && a19 == b19
219+ && a20 == b20
220+ && a21 == b21
221+ && a22 == b22
222+ && a23 == b23
223+ && a24 == b24
224+ && a25 == b25
225+
226+-------------------------------------------------------------------------------
227+-- Simple non-recursive ADT
228+-------------------------------------------------------------------------------
229+
230+{-
231+data CustomDT1
232+ = CDT1C1
233+ | CDT1C2 Int
234+ | CDT1C3 Int Int
235+ deriving (Generic, Show, Eq)
236+
237+#ifndef USE_TH
238+instance SERIALIZE_CLASS CustomDT1
239+#else
240+DERIVE_CLASS(CustomDT1)
241+#endif
242+
243+instance NFData CustomDT1 where
244+ {-# INLINE rnf #-}
245+ rnf CDT1C1 = ()
246+ rnf (CDT1C2 i) = i `seq` ()
247+ rnf (CDT1C3 i1 i2) = i1 `seq` i2 `seq` ()
248+-}
249+
250+-------------------------------------------------------------------------------
251+-- Recursive ADT
252+-------------------------------------------------------------------------------
253+
254+#ifndef USE_UNBOX
255+data BinTree a
256+ = Tree (BinTree a) (BinTree a)
257+ | Leaf a
258+ deriving (Show, Read, Eq, Generic)
259+
260+#ifndef USE_TH
261+instance Serialize (BinTree a)
262+#else
263+$(deriveSerialize [d|instance Serialize a => Serialize (BinTree a)|])
264+#endif
265+
266+instance NFData a => NFData (BinTree a) where
267+ {-# INLINE rnf #-}
268+ rnf (Leaf a) = rnf a `seq` ()
269+ rnf (Tree l r) = rnf l `seq` rnf r
270+
271+-- XXX This may not terminate, or could become really large.
272+instance Arbitrary a => Arbitrary (BinTree a) where
273+ arbitrary = oneof [Leaf <$> arbitrary, Tree <$> arbitrary <*> arbitrary]
274+
275+mkBinTree :: (Arbitrary a) => Int -> IO (BinTree a)
276+mkBinTree = go (generate arbitrary)
277+
278+ where
279+
280+ go r 0 = Leaf <$> r
281+ go r n = Tree <$> go r (n - 1) <*> go r (n - 1)
282+
283+#endif
284+
285+-------------------------------------------------------------------------------
286+-- Size helpers
287+-------------------------------------------------------------------------------
288+
289+{-# INLINE getSize #-}
290+getSize :: forall a. SERIALIZE_CLASS a => a -> Int
291+#ifdef USE_UNBOX
292+getSize _ = sizeOf (Proxy :: Proxy a)
293+#else
294+getSize = addSizeTo 0
295+#endif
296+
297+-------------------------------------------------------------------------------
298+-- Common helpers
299+-------------------------------------------------------------------------------
300+
301+{- HLINT ignore "Eta reduce" -}
302+-- Parts of "f" that are dependent on val will not be optimized out.
303+{-# INLINE loop #-}
304+loop :: Int -> (a -> IO b) -> a -> IO ()
305+loop count f val = go count val
306+ where
307+
308+ go n x = when (n > 0) $ f x >> go (n-1) x
309+
310+-- The first arg of "f" is the environment which is not threaded around in the
311+-- loop.
312+{-# INLINE loopWith #-}
313+loopWith :: Int -> (e -> a -> IO b) -> e -> a -> IO ()
314+loopWith count f e val = go count val
315+ where
316+
317+ go n x = when (n > 0) $ f e x >> go (n-1) x
318+
319+benchSink :: NFData b => String -> Int -> (Int -> IO b) -> Benchmark
320+benchSink name times f = bench name (nfIO (randomRIO (times, times) >>= f))
321+
322+-------------------------------------------------------------------------------
323+-- Serialization Helpers
324+-------------------------------------------------------------------------------
325+
326+{-
327+{-# INLINE pokeWithSize #-}
328+pokeWithSize :: SERIALIZE_CLASS a => MutByteArray -> a -> IO ()
329+pokeWithSize arr val = do
330+ let n = getSize val
331+ n `seq` SERIALIZE_OP 0 arr val >> return ()
332+
333+{-# INLINE pokeTimesWithSize #-}
334+pokeTimesWithSize :: SERIALIZE_CLASS a => a -> Int -> IO ()
335+pokeTimesWithSize val times = do
336+ let n = getSize val
337+ arr <- MBA.new n
338+ loopWith times pokeWithSize arr val
339+-}
340+
341+{-# INLINE poke #-}
342+poke :: SERIALIZE_CLASS a => MutByteArray -> a -> IO ()
343+poke arr val = void (SERIALIZE_OP 0 arr val)
344+
345+{-# INLINE pokeTimes #-}
346+pokeTimes :: SERIALIZE_CLASS a => a -> Int -> IO ()
347+pokeTimes val times = do
348+ let n = getSize val
349+ arr <- MBA.new n
350+ loopWith times poke arr val
351+
352+{-# INLINE encode #-}
353+encode :: SERIALIZE_CLASS a => a -> IO ()
354+encode val = do
355+ let n = getSize val
356+ arr <- MBA.new n
357+ void (SERIALIZE_OP 0 arr val)
358+
359+{-# INLINE encodeTimes #-}
360+encodeTimes :: SERIALIZE_CLASS a => a -> Int -> IO ()
361+encodeTimes val times = loop times encode val
362+
363+{-# INLINE peek #-}
364+peek :: forall a. (NFData a, SERIALIZE_CLASS a) =>
365+ (a, Int) -> MutByteArray -> IO ()
366+#ifdef USE_UNBOX
367+peek (_val, _) arr = do
368+ (val1 :: a) <- DESERIALIZE_OP 0 arr
369+#else
370+peek (_val, n) arr = do
371+ (_, val1 :: a) <- DESERIALIZE_OP 0 arr n
372+#endif
373+ -- If the datatype is not deeply strict or deepseq is not used then use
374+ -- Equality.
375+ -- Ensure that we are actually constructing the type and using it. This
376+ -- is important, otherwise the structure is created and discarded, the
377+ -- cost of creation of the structure is not accounted. Otherwise we may
378+ -- just read the values and discard them. The comparison adds to the
379+ -- cost though. We could use deepseq but then we need to write
380+ -- instances of NFData and ensure that they are correct and perform
381+ -- well. Equality check also ensures correctness.
382+ {-
383+ if (val1 /= val)
384+ then error "peek: no match"
385+ else return ()
386+ -}
387+ val1 `deepseq` return ()
388+
389+{-# INLINE peekTimes #-}
390+peekTimes :: (NFData a, SERIALIZE_CLASS a) => Int -> a -> Int -> IO ()
391+peekTimes n val times = do
392+ arr <- MBA.new n
393+ _ <- SERIALIZE_OP 0 arr val
394+ loopWith times peek (val, n) arr
395+
396+{-# INLINE trip #-}
397+trip :: forall a. (NFData a, SERIALIZE_CLASS a) => a -> IO ()
398+trip val = do
399+ let n = getSize val
400+ arr <- MBA.new n
401+ _ <- SERIALIZE_OP 0 arr val
402+#ifdef USE_UNBOX
403+ (val1 :: a) <- DESERIALIZE_OP 0 arr
404+#else
405+ (_, val1 :: a) <- DESERIALIZE_OP 0 arr n
406+#endif
407+ -- Do not remove this or use deepseq, see the comments in peek.
408+ {-
409+ if (val1 /= val)
410+ then error "roundtrip: no match"
411+ else return ()
412+ -}
413+ -- Note: deepseq is not needed if the datatype is strict
414+ val1 `deepseq` return ()
415+
416+{-# INLINE roundtrip #-}
417+roundtrip :: (NFData a, SERIALIZE_CLASS a) => a -> Int -> IO ()
418+roundtrip val times = loop times trip val
419+
420+-------------------------------------------------------------------------------
421+-- Benchmarks
422+-------------------------------------------------------------------------------
423+
424+{-# INLINE benchConst #-}
425+benchConst ::
426+ String
427+ -> (forall a. (NFData a, SERIALIZE_CLASS a) =>
428+ Int -> a -> Int -> IO ())
429+ -> Int
430+ -> Benchmark
431+benchConst gname f times =
432+ bgroup gname
433+ [ let !n = getSize Unit
434+ in benchSink "Unit" times (f n Unit)
435+ {-
436+ , let !n = getSize CDT1C1
437+ in benchSink "C1" times (f n CDT1C1)
438+ , let val = CDT1C2 5
439+ !n = getSize val
440+ in benchSink "C2" (times `div` 2) (f n val)
441+ , let val = CDT1C3 5 2
442+ !n = getSize val
443+ in benchSink "C3" (times `div` 3) (f n val)
444+ -}
445+ , let !n = getSize Sum21
446+ in benchSink "Sum2" times (f n Sum21)
447+ , let !n = getSize Sum2525
448+ in benchSink "Sum25" times (f n Sum2525)
449+ , let val = Product25 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25
450+ !n = getSize val
451+ in benchSink "Product25" (times `div` 26) (f n val)
452+ ]
453+
454+#ifndef USE_UNBOX
455+{-# INLINE benchVar #-}
456+benchVar ::
457+ String
458+ -> (forall a. (NFData a, SERIALIZE_CLASS a) =>
459+ Int -> a -> Int -> IO ())
460+ -> BinTree Int
461+ -> [Int]
462+ -> Int
463+ -> Benchmark
464+benchVar gname f tInt lInt times =
465+ bgroup gname
466+ [ let !n = getSize tInt
467+ in benchSink "bintree-int" times (f n tInt)
468+ , let !n = getSize lInt
469+ in benchSink "list-int" times (f n lInt)
470+ ]
471+
472+{-
473+{-# INLINE benchGeneric #-}
474+benchGeneric
475+ :: (NFData b, Serialize b)
476+ => String
477+ -> String
478+ -> (forall a. (NFData a, Serialize a) =>
479+ Int -> a -> Int -> IO ())
480+ -> b
481+ -> Int
482+ -> Benchmark
483+benchGeneric gname valId f val times =
484+ bgroup gname
485+ [ let !n = getSize val
486+ in benchSink valId times (f n val)
487+ ]
488+-}
489+
490+{-# INLINE benchLargeRec #-}
491+benchLargeRec ::
492+ String
493+ -> (forall a. (NFData a, Serialize a) =>
494+ Int -> a -> Int -> IO ())
495+ -> RecNonCompatible
496+ -> RecCompatible
497+ -> Int
498+ -> Benchmark
499+benchLargeRec gname f recL recR times =
500+ bgroup gname
501+ [ let !n = getSize recL
502+ in benchSink "RecNonCompatible" times (f n recL)
503+ , let !n = getSize recR
504+ in benchSink "RecCompatible" times (f n recR)
505+ ]
506+#endif
507+
508+-- Times is scaled by the number of constructors to normalize
509+#ifdef USE_UNBOX
510+allBenchmarks :: Int -> [Benchmark]
511+allBenchmarks times =
512+#else
513+allBenchmarks ::
514+ BinTree Int -> [Int] -> RecNonCompatible -> RecCompatible -> Int -> [Benchmark]
515+allBenchmarks tInt lInt recL recR times =
516+#endif
517+ [ bgroup "sizeOf"
518+ [
519+#ifndef USE_UNBOX
520+ bench "bintree-int" $ nf getSize tInt
521+ , bench "list-int" $ nf getSize lInt
522+#endif
523+ ]
524+ , benchConst "poke" (const pokeTimes) times
525+ -- , benchConst "pokeWithSize" (const pokeTimesWithSize) times
526+ , benchConst "encode" (const encodeTimes) times
527+ , benchConst "peek" peekTimes times
528+ , benchConst "roundtrip" (const roundtrip) times
529+#ifndef USE_UNBOX
530+ , benchVar "poke" (const pokeTimes) tInt lInt 1
531+ -- , benchVar "pokeWithSize" (const pokeTimesWithSize) tInt lInt 1
532+ , benchVar "encode" (const encodeTimes) tInt lInt 1
533+ , benchVar "peek" peekTimes tInt lInt 1
534+ , benchVar "roundtrip" (const roundtrip) tInt lInt 1
535+ , benchLargeRec "poke" (const pokeTimes) recL recR times
536+ , benchLargeRec "encode" (const encodeTimes) recL recR times
537+ , benchLargeRec "peek" peekTimes recL recR times
538+ , benchLargeRec "roundtrip" (const roundtrip) recL recR times
539+#endif
540+ ]
541+
542+-------------------------------------------------------------------------------
543+-- Driver
544+-------------------------------------------------------------------------------
545+
546+main :: IO ()
547+main = do
548+#ifndef USE_UNBOX
549+ -- Approximately 100000 constructors
550+ -- Assuming Leaf nodes constitute two constructors (Leaf, Int) and internal
551+ -- nodes 1 level = log_2 (100001/3) + 1 = 16
552+ !(tInt :: BinTree Int) <- force <$> mkBinTree 16
553+
554+ let !recL = valRecNonCompatible
555+ let !recR = valRecCompatible
556+
557+ -- Approximately 100000 constructors, assuming two constructors (Cons, Int)
558+ -- per element.
559+ let lInt = [1..50000 :: Int]
560+ let !len = length lInt -- evaluate the list
561+#endif
562+#ifndef FUSION_CHECK
563+#ifdef USE_UNBOX
564+ runWithCLIOpts defaultStreamSize allBenchmarks
565+#else
566+ len
567+ `seq` runWithCLIOpts
568+ defaultStreamSize
569+ (allBenchmarks tInt lInt recL recR)
570+#endif
571+#else
572+ -- Enable FUSION_CHECK macro at the beginning of the file
573+ -- Enable one benchmark below, and run the benchmark
574+ -- Check the .dump-simpl output
575+ let value = 100000
576+ -- print $ getSize (CDT1C3 4 2)
577+ -- print $ getSize tInt
578+ -- print $ getSize lInt
579+
580+ -- pokeTimes tInt 1
581+
582+ -- peekTimes ((CDT1C2 (5 :: Int)) :: CustomDT1) value
583+ -- peekTimes (Sum2525) value
584+ -- peekTimes (Product25 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25) value
585+ -- peekTimes tInt 1
586+ let !n = getSize lInt
587+ peekTimes n lInt 1
588+
589+ -- roundtrip ((CDT1C2 (5 :: Int)) :: CustomDT1) value
590+ return ()
591+#endif
benchmark/Streamly/Benchmark/Data/Serialize/RecCompatible.hsnew file+24
@@ -0,0 +1,24 @@
1+{-# LANGUAGE TemplateHaskell #-}
2+
3+module Streamly.Benchmark.Data.Serialize.RecCompatible
4+ ( RecCompatible(..)
5+ , valRecCompatible
6+ ) where
7+
8+--------------------------------------------------------------------------------
9+-- Imports
10+--------------------------------------------------------------------------------
11+
12+import Streamly.Internal.Data.MutByteArray (Serialize)
13+import Streamly.Benchmark.Data.Serialize.TH (genLargeRecord)
14+
15+import qualified Streamly.Internal.Data.MutByteArray as Serialize
16+
17+--------------------------------------------------------------------------------
18+-- Code
19+--------------------------------------------------------------------------------
20+
21+$(genLargeRecord "RecCompatible" 50)
22+$(Serialize.deriveSerializeWith
23+ (Serialize.encodeRecordFields True)
24+ [d|instance Serialize RecCompatible|])
benchmark/Streamly/Benchmark/Data/Serialize/RecNonCompatible.hsnew file+21
@@ -0,0 +1,21 @@
1+{-# LANGUAGE TemplateHaskell #-}
2+
3+module Streamly.Benchmark.Data.Serialize.RecNonCompatible
4+ ( RecNonCompatible(..)
5+ , valRecNonCompatible
6+ ) where
7+
8+--------------------------------------------------------------------------------
9+-- Imports
10+--------------------------------------------------------------------------------
11+
12+import Streamly.Benchmark.Data.Serialize.TH (genLargeRecord)
13+
14+import qualified Streamly.Internal.Data.MutByteArray as Serialize
15+
16+--------------------------------------------------------------------------------
17+-- Code
18+--------------------------------------------------------------------------------
19+
20+$(genLargeRecord "RecNonCompatible" 50)
21+$(Serialize.deriveSerialize [d|instance Serialize.Serialize RecNonCompatible|])
benchmark/Streamly/Benchmark/Data/Serialize/TH.hsnew file+76
@@ -0,0 +1,76 @@
1+{-# LANGUAGE TemplateHaskell #-}
2+
3+module Streamly.Benchmark.Data.Serialize.TH (genLargeRecord) where
4+
5+--------------------------------------------------------------------------------
6+-- Imports
7+--------------------------------------------------------------------------------
8+
9+import Language.Haskell.TH
10+
11+import Streamly.Internal.Data.MutByteArray (makeI)
12+import Control.DeepSeq (NFData(..))
13+
14+--------------------------------------------------------------------------------
15+-- Large Record
16+--------------------------------------------------------------------------------
17+
18+genLargeRecord :: String -> Int -> Q [Dec]
19+genLargeRecord tyName numFields =
20+ sequence
21+ [ dataD
22+ (pure [])
23+ (mkName tyName)
24+ []
25+ Nothing
26+ [mkCon tyName]
27+ [derivClause Nothing [conT ''Eq, conT ''Show]]
28+ , mkValueSigDec
29+ , mkValueDec
30+ , nfDataInstance tyName
31+ ]
32+
33+ where
34+
35+ fieldTypeChoices = [conT ''()]
36+ chooseCycle i xs = xs !! (i `mod` length xs)
37+ nfDataInstance nm =
38+ instanceD
39+ (pure [])
40+ (appT (conT ''NFData) (conT (mkName nm)))
41+ [ funD
42+ 'rnf
43+ [ clause
44+ [ conP
45+ (mkName nm)
46+ (varP . makeI <$> [0 .. (numFields - 1)])
47+ ]
48+ (normalB
49+ (foldl
50+ (\b a -> [|rnf $(b) `seq` rnf $(a)|])
51+ [|()|]
52+ (varE . makeI <$> [0 .. (numFields - 1)])))
53+ []
54+ ]
55+ ]
56+ valueName = mkName $ "val" ++ tyName
57+ mkValueSigDec = sigD valueName [t|$(conT (mkName tyName))|]
58+ mkValueDec =
59+ funD
60+ valueName
61+ [ clause
62+ []
63+ (normalB
64+ (foldl
65+ (\b a -> [|$(b) $(a)|])
66+ (conE (mkName tyName))
67+ (conE '() <$ [0 .. (numFields - 1)])))
68+ []
69+ ]
70+ mkCon nm = recC (mkName nm) (mkField <$> [0 .. (numFields - 1)])
71+ mkField i =
72+ varBangType
73+ (mkName ("field" ++ show i))
74+ (bangType
75+ (bang noSourceUnpackedness noSourceStrictness)
76+ (chooseCycle i fieldTypeChoices))
benchmark/Streamly/Benchmark/Data/Stream.hsnew file+114
@@ -0,0 +1,114 @@
1+-- |
2+-- Module : Data.Stream
3+-- Copyright : (c) 2018 Composewell Technologies
4+-- License : BSD-3-Clause
5+-- Maintainer : streamly@composewell.com
6+
7+{-# LANGUAGE CPP #-}
8+{-# LANGUAGE FlexibleContexts #-}
9+{-# LANGUAGE ScopedTypeVariables #-}
10+{-# LANGUAGE RankNTypes #-}
11+
12+#undef FUSION_CHECK
13+#ifdef FUSION_CHECK
14+{-# OPTIONS_GHC -ddump-simpl -ddump-to-file -dsuppress-all #-}
15+#endif
16+
17+module Main (main) where
18+
19+import Streamly.Benchmark.Common.Handle (mkHandleBenchEnv)
20+
21+import qualified Stream.Eliminate as Elimination
22+#ifndef USE_STREAMLY_CORE
23+import qualified Stream.Exceptions as Exceptions
24+#endif
25+import qualified Stream.Expand as NestedStream
26+import qualified Stream.Generate as Generation
27+import qualified Stream.Lift as Lift
28+import qualified Stream.Reduce as NestedFold
29+#ifdef USE_PRELUDE
30+import qualified Stream.Split as Split
31+#endif
32+import qualified Stream.Transform as Transformation
33+
34+import Streamly.Benchmark.Common
35+
36+#ifdef FUSION_CHECK
37+import Data.Function ((&))
38+import Streamly.Data.Stream (Stream)
39+import qualified Streamly.Internal.Data.Stream as Stream
40+import qualified Streamly.Internal.Data.Fold as Fold
41+import qualified Data.Foldable as Foldable
42+import Stream.Common
43+#endif
44+
45+moduleName :: String
46+#ifdef USE_STREAMK
47+moduleName = "Data.Stream.StreamDK"
48+#else
49+moduleName = "Data.Stream"
50+#endif
51+
52+-------------------------------------------------------------------------------
53+-- Main
54+-------------------------------------------------------------------------------
55+
56+-- In addition to gauge options, the number of elements in the stream can be
57+-- passed using the --stream-size option.
58+--
59+main :: IO ()
60+main = do
61+#ifndef FUSION_CHECK
62+ env <- mkHandleBenchEnv
63+ runWithCLIOpts defaultStreamSize (allBenchmarks env)
64+
65+ where
66+
67+ allBenchmarks env size = Prelude.concat
68+ [ Generation.benchmarks moduleName size
69+ , Elimination.benchmarks moduleName size
70+#ifndef USE_STREAMLY_CORE
71+ , Exceptions.benchmarks moduleName env size
72+#endif
73+#ifdef USE_PRELUDE
74+ , Split.benchmarks moduleName env
75+#endif
76+ , Transformation.benchmarks moduleName size
77+ , NestedFold.benchmarks moduleName size
78+ , Lift.benchmarks moduleName size
79+ , NestedStream.benchmarks moduleName size
80+ ]
81+#else
82+ -- Enable FUSION_CHECK macro at the beginning of the file
83+ -- Enable one benchmark below, and run the benchmark
84+ -- Check the .dump-simpl output
85+ let value = 100000
86+ let input = sourceUnfoldrM value 1
87+
88+ -- Stream.foldr (:) [] input >>= print . Prelude.length
89+ -- Stream.fold (Fold.foldr' (:) []) input >>= print . Prelude.length
90+
91+ -- Stream.toList input >>= print . Prelude.length
92+ -- Stream.fold Fold.toList input >>= print . Prelude.length
93+
94+ -- We can automatically assert that these generate identical core
95+
96+ -- Stream.drain input >>= print
97+ -- Stream.fold Fold.drain input >>= print
98+
99+ -- Stream.last input >>= print
100+ -- Stream.fold Fold.latest input >>= print
101+
102+ -- Stream.length input >>= print
103+ -- Stream.fold Fold.length input >>= print
104+
105+ -- Stream.maximum input >>= print
106+ -- Stream.fold Fold.maximum input >>= print
107+
108+ -- Stream.head input >>= print
109+ -- Stream.fold Fold.one input >>= print
110+
111+ -- composeN 4 (Stream.scanl' (+) 0) input
112+ composeN 4 (Stream.scan (Fold.foldl' (+) 0)) input
113+ return ()
114+#endif
benchmark/Streamly/Benchmark/Data/Stream/Common.hsnew file+518
@@ -0,0 +1,518 @@
1+{-# LANGUAGE ConstraintKinds #-}
2+{-# LANGUAGE CPP #-}
3+{-# LANGUAGE FlexibleContexts #-}
4+{-# LANGUAGE ScopedTypeVariables #-}
5+
6+-- |
7+-- Module : Stream.Common
8+-- Copyright : (c) 2018 Composewell Technologies
9+-- License : BSD-3-Clause
10+-- Maintainer : streamly@composewell.com
11+
12+#ifdef USE_PRELUDE
13+{-# OPTIONS_GHC -Wno-deprecations #-}
14+#endif
15+
16+module Stream.Common
17+ ( MonadAsync
18+
19+ , fromStream
20+ , toStream
21+
22+ -- Generation
23+ , fromListM
24+ , fromFoldableM
25+
26+ , append
27+ , append2
28+
29+ -- Elimination
30+ , drain
31+ , foldl'
32+ , scanl'
33+
34+ -- Benchmark stream generation
35+ , sourceUnfoldr
36+ , sourceUnfoldrM
37+ , sourceUnfoldrAction
38+ , sourceConcatMapId
39+ , sourceFromFoldable
40+
41+ -- Benchmark stream elimination
42+ , benchIOSink
43+ , benchIOSrc
44+ , benchIO
45+
46+ -- Benchmarking functions
47+#ifdef USE_STREAMK
48+ , concatStreamsWith
49+ , mergeMapWith
50+#endif
51+ , apDiscardFst
52+ , apDiscardSnd
53+ , apLiftA2
54+ , toNullAp
55+ , monadThen
56+ , toNullM
57+ , toNullM3
58+ , filterAllOutM
59+ , filterAllInM
60+ , filterSome
61+ , breakAfterSome
62+ , toListM
63+ , toListSome
64+ , composeN
65+ , mapN
66+ , mapM
67+ , transformMapM
68+ , transformComposeMapM
69+ , transformTeeMapM
70+ , transformZipMapM
71+ )
72+where
73+
74+#if !MIN_VERSION_base(4,18,0)
75+import Control.Applicative (liftA2)
76+#endif
77+import Control.DeepSeq (NFData)
78+import Control.Exception (try)
79+import GHC.Exception (ErrorCall)
80+import System.Random (randomRIO)
81+
82+import qualified Streamly.Internal.Data.Fold as Fold
83+import qualified Streamly.Internal.Data.Pipe as Pipe
84+
85+#ifdef USE_PRELUDE
86+import Streamly.Prelude (foldl', scanl')
87+import qualified Streamly.Internal.Data.Stream.IsStream as Stream
88+import qualified Streamly.Prelude as Stream
89+import qualified Streamly.Prelude as StreamK
90+import Streamly.Benchmark.Prelude
91+ ( composeN, sourceConcatMapId, benchIOSink
92+ , concatStreamsWith
93+ )
94+#else
95+import Streamly.Internal.Data.Stream (Stream)
96+import qualified Streamly.Internal.Data.Stream as D
97+#ifdef USE_STREAMK
98+import Streamly.Internal.Data.StreamK (StreamK)
99+import qualified Streamly.Internal.Data.Stream as Stream
100+import qualified Streamly.Internal.Data.StreamK as StreamK
101+#else
102+import qualified Streamly.Internal.Data.Stream as Stream
103+import qualified Streamly.Internal.Data.Stream as StreamK
104+#endif
105+#endif
106+
107+import Test.Tasty.Bench
108+import Prelude hiding (Foldable(..), mapM, replicate)
109+
110+#ifdef USE_STREAMK
111+toStream :: Applicative m => StreamK m a -> Stream m a
112+toStream = StreamK.toStream
113+
114+fromStream :: Monad m => Stream m a -> StreamK m a
115+fromStream = StreamK.fromStream
116+#else
117+fromStream :: a -> a
118+fromStream = id
119+
120+toStream :: a -> a
121+toStream = id
122+#endif
123+
124+#ifdef USE_PRELUDE
125+type Stream = Stream.SerialT
126+type MonadAsync m = Stream.MonadAsync m
127+mkCross = id
128+unCross = id
129+#else
130+type MonadAsync = Monad
131+
132+#ifdef USE_STREAMK
133+mkCross :: StreamK m a -> StreamK.CrossStreamK m a
134+mkCross = StreamK.mkCross
135+
136+unCross :: StreamK.CrossStreamK m a -> StreamK m a
137+unCross = StreamK.unCross
138+#else
139+mkCross :: Stream m a -> Stream.CrossStream m a
140+mkCross = Stream.mkCross
141+
142+unCross :: Stream.CrossStream m a -> Stream m a
143+unCross = Stream.unCross
144+#endif
145+#endif
146+
147+#ifdef USE_PRELUDE
148+{-# INLINE append #-}
149+append :: Monad m => Stream m a -> Stream m a -> Stream m a
150+append = Stream.serial
151+#else
152+#ifdef USE_STREAMK
153+append :: StreamK m a -> StreamK m a -> StreamK m a
154+append = StreamK.append
155+#else
156+append :: Monad m => Stream m a -> Stream m a -> Stream m a
157+append = Stream.append
158+#endif
159+#endif
160+
161+{-# INLINE append2 #-}
162+append2 :: Monad m => Stream m a -> Stream m a -> Stream m a
163+#ifdef USE_PRELUDE
164+append2 = Stream.append
165+#else
166+append2 = D.append
167+#endif
168+
169+{-# INLINE drain #-}
170+drain :: Monad m => Stream m a -> m ()
171+{-# INLINE toList #-}
172+toList :: Monad m => Stream m a -> m [a]
173+#ifdef USE_PRELUDE
174+drain = Stream.drain
175+toList = Stream.toList
176+#else
177+drain = Stream.fold Fold.drain
178+toList = Stream.fold Fold.toList
179+#endif
180+
181+{-# INLINE fromListM #-}
182+fromListM :: MonadAsync m => [m a] -> Stream m a
183+#ifdef USE_PRELUDE
184+fromListM = Stream.fromListM
185+#else
186+fromListM = Stream.sequence . Stream.fromList
187+#endif
188+
189+{-# INLINE fromFoldableM #-}
190+fromFoldableM :: MonadAsync m => [m a] -> Stream m a
191+#ifdef USE_PRELUDE
192+fromFoldableM = Stream.fromFoldableM
193+#else
194+fromFoldableM = Stream.sequence . toStream . StreamK.fromFoldable
195+#endif
196+
197+{-# INLINE sourceUnfoldrM #-}
198+sourceUnfoldrM :: MonadAsync m => Int -> Int -> Stream m Int
199+sourceUnfoldrM count start = Stream.unfoldrM step start
200+
201+ where
202+
203+ step cnt =
204+ if cnt > start + count
205+ then return Nothing
206+ else return (Just (cnt, cnt + 1))
207+
208+{-# INLINE sourceUnfoldr #-}
209+sourceUnfoldr :: Monad m => Int -> Int -> Stream m Int
210+sourceUnfoldr count start = Stream.unfoldr step start
211+
212+ where
213+
214+ step cnt =
215+ if cnt > start + count
216+ then Nothing
217+ else Just (cnt, cnt + 1)
218+
219+{-# INLINE sourceUnfoldrAction #-}
220+sourceUnfoldrAction :: (Monad m1, Monad m) => Int -> Int -> Stream m (m1 Int)
221+sourceUnfoldrAction value n = Stream.unfoldr step n
222+
223+ where
224+
225+ step cnt =
226+ if cnt > n + value
227+ then Nothing
228+ else Just (return cnt, cnt + 1)
229+
230+{-# INLINE sourceFromFoldable #-}
231+sourceFromFoldable :: Monad m => Int -> Int -> Stream m Int
232+sourceFromFoldable value n = toStream $ StreamK.fromFoldable [n..n+value]
233+
234+#ifndef USE_PRELUDE
235+{-# INLINE benchIOSink #-}
236+benchIOSink
237+ :: (NFData b)
238+ => Int -> String -> (Stream IO Int -> IO b) -> Benchmark
239+benchIOSink value name f =
240+ bench name $ nfIO $ randomRIO (1,1) >>= f . sourceUnfoldrM value
241+#endif
242+
243+-- | Takes a source, and uses it with a default drain/fold method.
244+{-# INLINE benchIOSrc #-}
245+benchIOSrc
246+ :: String
247+ -> (Int -> Stream IO a)
248+ -> Benchmark
249+benchIOSrc name f =
250+ bench name $ nfIO $ randomRIO (1,1) >>= drain . f
251+
252+{-# NOINLINE benchIO #-}
253+benchIO :: (NFData b) => String -> (Int -> IO b) -> Benchmark
254+benchIO name f = bench name $ nfIO $ randomRIO (1,1) >>= f
255+
256+#ifndef USE_PRELUDE
257+#ifdef USE_STREAMK
258+{-# INLINE concatStreamsWith #-}
259+concatStreamsWith
260+ :: (StreamK IO Int -> StreamK IO Int -> StreamK IO Int)
261+ -> Int
262+ -> Int
263+ -> Int
264+ -> IO ()
265+concatStreamsWith op outer inner n =
266+ drain $ toStream $ StreamK.concatMapWith op
267+ (fromStream . sourceUnfoldrM inner)
268+ (fromStream $ sourceUnfoldrM outer n)
269+
270+{-# INLINE mergeMapWith #-}
271+mergeMapWith
272+ :: (StreamK IO Int -> StreamK IO Int -> StreamK IO Int)
273+ -> Int
274+ -> Int
275+ -> Int
276+ -> IO ()
277+mergeMapWith op outer inner n =
278+ drain $ toStream $ StreamK.mergeMapWith op
279+ (fromStream . sourceUnfoldrM inner)
280+ (fromStream $ sourceUnfoldrM outer n)
281+#endif
282+
283+{-# INLINE sourceConcatMapId #-}
284+sourceConcatMapId :: (Monad m)
285+ => Int -> Int -> Stream m (Stream m Int)
286+sourceConcatMapId value n =
287+ Stream.fromList $ fmap (D.fromEffect . return) [n..n+value]
288+#endif
289+
290+{-# INLINE apDiscardFst #-}
291+apDiscardFst :: MonadAsync m =>
292+ Int -> Int -> m ()
293+apDiscardFst linearCount start = drain $ toStream $ unCross $
294+ mkCross (fromStream $ sourceUnfoldrM nestedCount2 start)
295+ *> mkCross (fromStream $ sourceUnfoldrM nestedCount2 start)
296+
297+ where
298+
299+ nestedCount2 = round (fromIntegral linearCount**(1/2::Double))
300+
301+{-# INLINE apDiscardSnd #-}
302+apDiscardSnd :: MonadAsync m => Int -> Int -> m ()
303+apDiscardSnd linearCount start = drain $ toStream $ unCross $
304+ mkCross (fromStream $ sourceUnfoldrM nestedCount2 start)
305+ <* mkCross (fromStream $ sourceUnfoldrM nestedCount2 start)
306+
307+ where
308+
309+ nestedCount2 = round (fromIntegral linearCount**(1/2::Double))
310+
311+{-# INLINE apLiftA2 #-}
312+apLiftA2 :: MonadAsync m => Int -> Int -> m ()
313+apLiftA2 linearCount start = drain $ toStream $ unCross $
314+ liftA2 (+) (mkCross (fromStream $ sourceUnfoldrM nestedCount2 start))
315+ (mkCross (fromStream $ sourceUnfoldrM nestedCount2 start))
316+
317+ where
318+
319+ nestedCount2 = round (fromIntegral linearCount**(1/2::Double))
320+
321+{-# INLINE toNullAp #-}
322+toNullAp :: MonadAsync m => Int -> Int -> m ()
323+toNullAp linearCount start = drain $ toStream $ unCross $
324+ (+) <$> mkCross (fromStream $ sourceUnfoldrM nestedCount2 start)
325+ <*> mkCross (fromStream $ sourceUnfoldrM nestedCount2 start)
326+
327+ where
328+
329+ nestedCount2 = round (fromIntegral linearCount**(1/2::Double))
330+
331+{-# INLINE monadThen #-}
332+monadThen :: MonadAsync m => Int -> Int -> m ()
333+monadThen linearCount start = drain $ toStream $ unCross $ do
334+ mkCross (fromStream $ sourceUnfoldrM nestedCount2 start) >>
335+ mkCross (fromStream $ sourceUnfoldrM nestedCount2 start)
336+
337+ where
338+
339+ nestedCount2 = round (fromIntegral linearCount**(1/2::Double))
340+
341+{-# INLINE toNullM #-}
342+toNullM :: MonadAsync m => Int -> Int -> m ()
343+toNullM linearCount start = drain $ toStream $ unCross $ do
344+ x <- mkCross (fromStream $ sourceUnfoldrM nestedCount2 start)
345+ y <- mkCross (fromStream $ sourceUnfoldrM nestedCount2 start)
346+ return $ x + y
347+
348+ where
349+
350+ nestedCount2 = round (fromIntegral linearCount**(1/2::Double))
351+
352+{-# INLINE toNullM3 #-}
353+toNullM3 :: MonadAsync m => Int -> Int -> m ()
354+toNullM3 linearCount start = drain $ toStream $ unCross $ do
355+ x <- mkCross (fromStream $ sourceUnfoldrM nestedCount3 start)
356+ y <- mkCross (fromStream $ sourceUnfoldrM nestedCount3 start)
357+ z <- mkCross (fromStream $ sourceUnfoldrM nestedCount3 start)
358+ return $ x + y + z
359+ where
360+ nestedCount3 = round (fromIntegral linearCount**(1/3::Double))
361+
362+{-# INLINE filterAllOutM #-}
363+filterAllOutM :: MonadAsync m => Int -> Int -> m ()
364+filterAllOutM linearCount start = drain $ toStream $ unCross $ do
365+ x <- mkCross (fromStream $ sourceUnfoldrM nestedCount2 start)
366+ y <- mkCross (fromStream $ sourceUnfoldrM nestedCount2 start)
367+ let s = x + y
368+ if s < 0
369+ then return s
370+ else mkCross StreamK.nil
371+ where
372+ nestedCount2 = round (fromIntegral linearCount**(1/2::Double))
373+
374+{-# INLINE filterAllInM #-}
375+filterAllInM :: MonadAsync m => Int -> Int -> m ()
376+filterAllInM linearCount start = drain $ toStream $ unCross $ do
377+ x <- mkCross (fromStream $ sourceUnfoldrM nestedCount2 start)
378+ y <- mkCross (fromStream $ sourceUnfoldrM nestedCount2 start)
379+ let s = x + y
380+ if s > 0
381+ then return s
382+ else mkCross StreamK.nil
383+ where
384+ nestedCount2 = round (fromIntegral linearCount**(1/2::Double))
385+
386+{-# INLINE filterSome #-}
387+filterSome :: MonadAsync m => Int -> Int -> m ()
388+filterSome linearCount start = drain $ toStream $ unCross $ do
389+ x <- mkCross (fromStream $ sourceUnfoldrM nestedCount2 start)
390+ y <- mkCross (fromStream $ sourceUnfoldrM nestedCount2 start)
391+ let s = x + y
392+ if s > 1100000
393+ then return s
394+ else mkCross StreamK.nil
395+ where
396+ nestedCount2 = round (fromIntegral linearCount**(1/2::Double))
397+
398+{-# INLINE breakAfterSome #-}
399+breakAfterSome :: Int -> Int -> IO ()
400+breakAfterSome linearCount start = do
401+ (_ :: Either ErrorCall ()) <- try $ drain $ toStream $ unCross $ do
402+ x <- mkCross (fromStream $ sourceUnfoldrM nestedCount2 start)
403+ y <- mkCross (fromStream $ sourceUnfoldrM nestedCount2 start)
404+ let s = x + y
405+ if s > 1100000
406+ then error "break"
407+ else return s
408+ return ()
409+ where
410+ nestedCount2 = round (fromIntegral linearCount**(1/2::Double))
411+
412+{-# INLINE toListM #-}
413+toListM :: MonadAsync m => Int -> Int -> m [Int]
414+toListM linearCount start = toList $ toStream $ unCross $ do
415+ x <- mkCross (fromStream $ sourceUnfoldrM nestedCount2 start)
416+ y <- mkCross (fromStream $ sourceUnfoldrM nestedCount2 start)
417+ return $ x + y
418+ where
419+ nestedCount2 = round (fromIntegral linearCount**(1/2::Double))
420+
421+-- Taking a specified number of elements is very expensive in logict so we have
422+-- a test to measure the same.
423+{-# INLINE toListSome #-}
424+toListSome :: MonadAsync m => Int -> Int -> m [Int]
425+toListSome linearCount start =
426+ toList $ Stream.take 10000 $ toStream $ unCross $ do
427+ x <- mkCross (fromStream $ sourceUnfoldrM nestedCount2 start)
428+ y <- mkCross (fromStream $ sourceUnfoldrM nestedCount2 start)
429+ return $ x + y
430+ where
431+ nestedCount2 = round (fromIntegral linearCount**(1/2::Double))
432+
433+#ifndef USE_PRELUDE
434+{-# INLINE composeN #-}
435+composeN ::
436+ (Monad m)
437+ => Int
438+ -> (Stream m Int -> Stream m Int)
439+ -> Stream m Int
440+ -> m ()
441+composeN n f =
442+ case n of
443+ 1 -> drain . f
444+ 2 -> drain . f . f
445+ 3 -> drain . f . f . f
446+ 4 -> drain . f . f . f . f
447+ _ -> undefined
448+#endif
449+
450+{-# INLINE mapN #-}
451+mapN ::
452+ Monad m
453+ => Int
454+ -> Stream m Int
455+ -> m ()
456+mapN n = composeN n $ fmap (+ 1)
457+
458+{-# INLINE mapM #-}
459+mapM ::
460+ MonadAsync m
461+ => Int
462+ -> Stream m Int
463+ -> m ()
464+mapM n = composeN n $ Stream.mapM return
465+
466+#ifndef USE_PRELUDE
467+foldl' :: Monad m => (b -> a -> b) -> b -> Stream m a -> m b
468+foldl' f z = Stream.fold (Fold.foldl' f z)
469+
470+scanl' :: Monad m => (b -> a -> b) -> b -> Stream m a -> Stream m b
471+scanl' f z = Stream.scan (Fold.foldl' f z)
472+#endif
473+
474+{-# INLINE transformMapM #-}
475+transformMapM ::
476+ (Monad m)
477+ => Int
478+ -> Stream m Int
479+ -> m ()
480+transformMapM n = composeN n $ Stream.transform (Pipe.mapM return)
481+
482+{-# INLINE transformComposeMapM #-}
483+transformComposeMapM ::
484+ (Monad m)
485+ => Int
486+ -> Stream m Int
487+ -> m ()
488+transformComposeMapM n =
489+ composeN n $
490+ Stream.transform
491+ (Pipe.mapM (\x -> return (x + 1)) `Pipe.compose`
492+ Pipe.mapM (\x -> return (x + 2)))
493+
494+{-# INLINE transformTeeMapM #-}
495+transformTeeMapM ::
496+ (Monad m)
497+ => Int
498+ -> Stream m Int
499+ -> m ()
500+transformTeeMapM n =
501+ composeN n $
502+ Stream.transform
503+ (Pipe.mapM (\x -> return (x + 1)) `Pipe.tee`
504+ Pipe.mapM (\x -> return (x + 2)))
505+
506+{-# INLINE transformZipMapM #-}
507+transformZipMapM ::
508+ (Monad m)
509+ => Int
510+ -> Stream m Int
511+ -> m ()
512+transformZipMapM n =
513+ composeN n $
514+ Stream.transform
515+ (Pipe.zipWith
516+ (+)
517+ (Pipe.mapM (\x -> return (x + 1)))
518+ (Pipe.mapM (\x -> return (x + 2))))
benchmark/Streamly/Benchmark/Data/Stream/Concurrent.hsnew file+20
@@ -0,0 +1,20 @@
1+{-# LANGUAGE FlexibleContexts #-}
2+-- |
3+-- Module : Main
4+-- Copyright : (c) 2018 Composewell Technologies
5+--
6+-- License : BSD3
7+-- Maintainer : streamly@composewell.com
8+
9+import Stream.ConcurrentCommon (allBenchmarks)
10+import Streamly.Benchmark.Common (runWithCLIOpts, defaultStreamSize)
11+
12+moduleName :: String
13+moduleName = "Data.Stream.Concurrent"
14+
15+-------------------------------------------------------------------------------
16+-- Main
17+-------------------------------------------------------------------------------
18+
19+main :: IO ()
20+main = runWithCLIOpts defaultStreamSize (allBenchmarks moduleName False id)
benchmark/Streamly/Benchmark/Data/Stream/ConcurrentCommon.hsnew file+208
@@ -0,0 +1,208 @@
1+{-# LANGUAGE FlexibleContexts #-}
2+-- |
3+-- Module : Main
4+-- Copyright : (c) 2018 Composewell Technologies
5+--
6+-- License : BSD3
7+-- Maintainer : streamly@composewell.com
8+
9+module Stream.ConcurrentCommon
10+ ( allBenchmarks
11+ )
12+where
13+
14+import Stream.Common
15+ (composeN, benchIO, benchIOSink, benchIOSrc, sourceUnfoldrM)
16+import Streamly.Data.Stream (Stream)
17+import Streamly.Internal.Data.Stream.Prelude (MonadAsync, Config)
18+
19+import qualified Data.List as List
20+import qualified Streamly.Data.Fold as Fold
21+import qualified Streamly.Data.Stream as Stream
22+import qualified Streamly.Internal.Data.Stream.Prelude as Async
23+
24+import Test.Tasty.Bench
25+import Prelude hiding (mapM)
26+import Streamly.Benchmark.Common
27+
28+-- XXX Write inspection tests to make sure no dictionaries are being passed
29+-- around to find specialization issues. Could be really bad for perf.
30+
31+-------------------------------------------------------------------------------
32+-- Mapping
33+-------------------------------------------------------------------------------
34+
35+{-# INLINE mapM #-}
36+mapM ::
37+ MonadAsync m
38+ => (Config -> Config)
39+ -> Int
40+ -> Stream m Int
41+ -> m ()
42+mapM f n = composeN n $ Async.parMapM f return
43+
44+o_1_space_mapping :: Int -> (Config -> Config) -> [Benchmark]
45+o_1_space_mapping value f =
46+ [ bgroup "mapping"
47+ [ benchIOSink value "mapM" $ mapM f 1
48+ ]
49+ ]
50+
51+-------------------------------------------------------------------------------
52+-- Size conserving transformations (reordering, buffering, etc.)
53+-------------------------------------------------------------------------------
54+
55+o_n_heap_buffering :: Int -> (Config -> Config) -> [Benchmark]
56+o_n_heap_buffering value f =
57+ [ bgroup "buffered"
58+ [ benchIOSink value "mkAsync"
59+ (Stream.fold Fold.drain . Async.parEval f)
60+ ]
61+ ]
62+
63+-------------------------------------------------------------------------------
64+-- Joining
65+-------------------------------------------------------------------------------
66+
67+{-# INLINE async2 #-}
68+async2 :: (Config -> Config) -> Int -> Int -> IO ()
69+async2 f count n =
70+ Stream.fold Fold.drain
71+ $ Async.parTwo f
72+ (sourceUnfoldrM count n) (sourceUnfoldrM count (n + 1))
73+
74+{-# INLINE concatAsync2 #-}
75+concatAsync2 :: (Config -> Config) -> Int -> Int -> IO ()
76+concatAsync2 f count n =
77+ Stream.fold Fold.drain
78+ $ Async.parConcat f
79+ $ Stream.fromList
80+ [sourceUnfoldrM count n, sourceUnfoldrM count (n + 1)]
81+
82+o_1_space_joining :: Int -> (Config -> Config) -> [Benchmark]
83+o_1_space_joining value f =
84+ [ bgroup "joining"
85+ [ benchIOSrc1 "async (2 of n/2)" (async2 f (value `div` 2))
86+ , benchIOSrc1 "concat async (2 of n/2)" (concatAsync2 f (value `div` 2))
87+ ]
88+ ]
89+
90+-------------------------------------------------------------------------------
91+-- Concat
92+-------------------------------------------------------------------------------
93+
94+{-# INLINE sourceFoldMapWith #-}
95+sourceFoldMapWith :: (Config -> Config) -> Int -> Int -> Stream IO Int
96+sourceFoldMapWith f value n =
97+ Async.parConcatMap f Stream.fromPure $ Stream.fromList [n..n+value]
98+
99+{-# INLINE sourceFoldMapWithStream #-}
100+sourceFoldMapWithStream :: (Config -> Config) -> Int -> Int -> Stream IO Int
101+sourceFoldMapWithStream f value n =
102+ Async.parConcatMap f Stream.fromPure
103+ $ Stream.enumerateFromTo n (n + value)
104+
105+{-# INLINE concatFoldableWith #-}
106+concatFoldableWith :: (Config -> Config) -> Int -> Int -> Stream IO Int
107+concatFoldableWith f value n =
108+ let step x =
109+ if x <= n + value
110+ then Just (Stream.fromPure x, x + 1)
111+ else Nothing
112+ list = List.unfoldr step n
113+ in Async.parConcat f (Stream.fromList list)
114+
115+o_1_space_concatFoldable :: Int -> (Config -> Config) -> [Benchmark]
116+o_1_space_concatFoldable value f =
117+ [ bgroup "concat-foldable"
118+ [ benchIOSrc "foldMapWith (<>) (List)"
119+ (sourceFoldMapWith f value)
120+ , benchIOSrc "foldMapWith (<>) (Stream)"
121+ (sourceFoldMapWithStream f value)
122+ , benchIOSrc "S.concatFoldableWith (<>) (List)"
123+ (concatFoldableWith f value)
124+ ]
125+ ]
126+
127+{-# INLINE concatMapStreamsWith #-}
128+concatMapStreamsWith
129+ :: (Config -> Config)
130+ -> Int
131+ -> Int
132+ -> Int
133+ -> IO ()
134+concatMapStreamsWith f outer inner n =
135+ Stream.fold Fold.drain
136+ $ Async.parConcatMap f (sourceUnfoldrM inner) (sourceUnfoldrM outer n)
137+
138+{-# INLINE concatFmapStreamsWith #-}
139+concatFmapStreamsWith
140+ :: (Config -> Config)
141+ -> Int
142+ -> Int
143+ -> Int
144+ -> IO ()
145+concatFmapStreamsWith f outer inner n =
146+ Stream.fold Fold.drain
147+ $ Async.parConcat f
148+ $ fmap (sourceUnfoldrM inner) (sourceUnfoldrM outer n)
149+
150+o_1_space_concatMap :: Int -> (Config -> Config) -> [Benchmark]
151+o_1_space_concatMap value f =
152+ value2 `seq`
153+ [ bgroup "concat"
154+ [ benchIO "parConcatMap (n of 1)"
155+ (concatMapStreamsWith f value 1)
156+ , benchIO "parConcatMap (sqrt x of sqrt x)"
157+ (concatMapStreamsWith f value2 value2)
158+ , benchIO "parConcatMap (1 of n)"
159+ (concatMapStreamsWith f 1 value)
160+ , benchIO "concat . fmap (n of 1)"
161+ (concatFmapStreamsWith f value 1)
162+ ]
163+ ]
164+
165+ where
166+
167+ value2 = round $ sqrt (fromIntegral value :: Double)
168+
169+-------------------------------------------------------------------------------
170+-- Monadic outer product
171+-------------------------------------------------------------------------------
172+
173+{-# INLINE toNullAp #-}
174+toNullAp :: (Config -> Config) -> Int -> Int -> IO ()
175+toNullAp f linearCount start =
176+ Stream.fold Fold.drain
177+ $ Async.parApply f
178+ (fmap (+) (sourceUnfoldrM nestedCount2 start))
179+ (sourceUnfoldrM nestedCount2 start)
180+
181+ where
182+
183+ nestedCount2 = round (fromIntegral linearCount**(1/2::Double))
184+
185+o_1_space_outerProduct :: Int -> (Config -> Config) -> [Benchmark]
186+o_1_space_outerProduct value f =
187+ [ bgroup "monad-outer-product"
188+ [ benchIO "toNullAp" $ toNullAp f value
189+ ]
190+ ]
191+
192+-------------------------------------------------------------------------------
193+-- Benchmark sets
194+-------------------------------------------------------------------------------
195+
196+allBenchmarks :: String -> Bool -> (Config -> Config) -> Int -> [Benchmark]
197+allBenchmarks moduleName wide modifier value =
198+ [ bgroup (o_1_space_prefix moduleName) $ concat
199+ [ o_1_space_mapping value modifier
200+ , o_1_space_concatFoldable value modifier
201+ , o_1_space_concatMap value modifier
202+ , o_1_space_joining value modifier
203+ ] ++ if wide then [] else o_1_space_outerProduct value modifier
204+ , bgroup (o_n_heap_prefix moduleName) $ concat
205+ [ if wide then o_1_space_outerProduct value modifier else []
206+ , o_n_heap_buffering value modifier
207+ ]
208+ ]
benchmark/Streamly/Benchmark/Data/Stream/ConcurrentEager.hsnew file+25
@@ -0,0 +1,25 @@
1+{-# LANGUAGE FlexibleContexts #-}
2+-- |
3+-- Module : Main
4+-- Copyright : (c) 2018 Composewell Technologies
5+--
6+-- License : BSD3
7+-- Maintainer : streamly@composewell.com
8+
9+import Stream.ConcurrentCommon (allBenchmarks)
10+import Streamly.Benchmark.Common (runWithCLIOpts, defaultStreamSize)
11+
12+import qualified Streamly.Internal.Data.Stream.Prelude as Async
13+
14+moduleName :: String
15+moduleName = "Data.Stream.ConcurrentEager"
16+
17+-------------------------------------------------------------------------------
18+-- Main
19+-------------------------------------------------------------------------------
20+
21+main :: IO ()
22+main =
23+ runWithCLIOpts
24+ defaultStreamSize
25+ (allBenchmarks moduleName True (Async.eager True))
benchmark/Streamly/Benchmark/Data/Stream/ConcurrentInterleaved.hsnew file+25
@@ -0,0 +1,25 @@
1+{-# LANGUAGE FlexibleContexts #-}
2+-- |
3+-- Module : Main
4+-- Copyright : (c) 2022 Composewell Technologies
5+--
6+-- License : BSD3
7+-- Maintainer : streamly@composewell.com
8+
9+import Stream.ConcurrentCommon (allBenchmarks)
10+import Streamly.Benchmark.Common (runWithCLIOpts, defaultStreamSize)
11+
12+import qualified Streamly.Internal.Data.Stream.Prelude as Async
13+
14+moduleName :: String
15+moduleName = "Data.Stream.ConcurrentInterleaved"
16+
17+-------------------------------------------------------------------------------
18+-- Main
19+-------------------------------------------------------------------------------
20+
21+main :: IO ()
22+main =
23+ runWithCLIOpts
24+ defaultStreamSize
25+ (allBenchmarks moduleName True (Async.interleaved True))
benchmark/Streamly/Benchmark/Data/Stream/ConcurrentOrdered.hsnew file+25
@@ -0,0 +1,25 @@
1+{-# LANGUAGE FlexibleContexts #-}
2+-- |
3+-- Module : Main
4+-- Copyright : (c) 2018 Composewell Technologies
5+--
6+-- License : BSD3
7+-- Maintainer : streamly@composewell.com
8+
9+import Stream.ConcurrentCommon (allBenchmarks)
10+import Streamly.Benchmark.Common (runWithCLIOpts, defaultStreamSize)
11+
12+import qualified Streamly.Internal.Data.Stream.Prelude as Async
13+
14+moduleName :: String
15+moduleName = "Data.Stream.ConcurrentOrdered"
16+
17+-------------------------------------------------------------------------------
18+-- Main
19+-------------------------------------------------------------------------------
20+
21+main :: IO ()
22+main =
23+ runWithCLIOpts
24+ defaultStreamSize
25+ (allBenchmarks moduleName False (Async.ordered True))
benchmark/Streamly/Benchmark/Prelude/Serial/Elimination.hs → benchmark/Streamly/Benchmark/Data/Stream/Eliminate.hsrenamed+183−121
@@ -1,14 +1,20 @@
11-- |
2−-- Module : Serial.Elimination
2+-- Module : Stream.Eliminate
33-- Copyright : (c) 2018 Composewell Technologies
44-- License : BSD-3-Clause
55-- Maintainer : streamly@composewell.com
66
77{-# LANGUAGE CPP #-}
88{-# LANGUAGE FlexibleContexts #-}
9+{-# LANGUAGE FlexibleInstances #-}
910{-# LANGUAGE ScopedTypeVariables #-}
1011{-# LANGUAGE RankNTypes #-}
1112
13+{-# OPTIONS_GHC -Wno-orphans #-}
14+#ifdef USE_PRELUDE
15+{-# OPTIONS_GHC -Wno-deprecations #-}
16+#endif
17+
1218#ifdef __HADDOCK_VERSION__
1319#undef INSPECTION
1420#endif
@@ -18,7 +24,7 @@
1824{-# OPTIONS_GHC -fplugin Test.Inspection.Plugin #-}
1925#endif
2026
21−module Serial.Elimination (benchmarks) where
27+module Stream.Eliminate (benchmarks) where
2228
2329import Control.DeepSeq (NFData(..))
2430import Data.Functor.Identity (Identity, runIdentity)
@@ -26,28 +32,45 @@ import System.Random (randomRIO)
2632
2733import qualified Data.Foldable as F
2834import qualified GHC.Exts as GHC
35+import qualified Streamly.Internal.Data.Fold as Fold
2936
3037#ifdef INSPECTION
3138import GHC.Types (SPEC(..))
3239import Test.Inspection
33−
34−import qualified Streamly.Internal.Data.Stream.StreamD as D
40+import qualified Streamly.Internal.Data.Stream as D
3541#endif
3642
37−import qualified Streamly.Prelude as S
38−import qualified Streamly.Internal.Data.Stream.IsStream as Internal
43+#ifdef USE_PRELUDE
44+import Streamly.Prelude (fromSerial)
45+import Streamly.Benchmark.Prelude
46+import qualified Streamly.Internal.Data.Stream.IsStream as S
47+import qualified Streamly.Internal.Data.Stream.IsStream as StreamK
48+#else
49+import Stream.Common
50+import Streamly.Internal.Data.Stream (Stream)
51+import qualified Streamly.Internal.Data.Stream as S
52+#ifdef USE_STREAMK
53+import Streamly.Internal.Data.StreamK (StreamK)
54+import qualified Streamly.Data.StreamK as StreamK
55+#else
56+import qualified Streamly.Internal.Data.Stream as StreamK
57+#endif
58+#endif
3959
40−import Gauge
41−import Streamly.Prelude (SerialT, IsStream, fromSerial)
60+import Test.Tasty.Bench
4261import Streamly.Benchmark.Common
43−import Streamly.Benchmark.Prelude
4462import Prelude hiding (length, sum, or, and, any, all, notElem, elem, (!!),
4563 lookup, repeat, minimum, maximum, product, last, mapM_, init)
4664import qualified Prelude
4765
66+#ifdef USE_PRELUDE
67+type Stream = S.SerialT
68+fromStream = id
69+
4870{-# INLINE repeat #-}
4971repeat :: (Monad m, S.IsStream t) => Int -> Int -> t m Int
5072repeat count = S.take count . S.repeat
73+#endif
5174
5275-------------------------------------------------------------------------------
5376-- Elimination
@@ -60,90 +83,92 @@ repeat count = S.take count . S.repeat
6083{-# INLINE foldableFoldl' #-}
6184foldableFoldl' :: Int -> Int -> Int
6285foldableFoldl' value n =
63− F.foldl' (+) 0 (sourceUnfoldr value n :: S.SerialT Identity Int)
86+ F.foldl' (+) 0 (sourceUnfoldr value n :: Stream Identity Int)
6487
6588{-# INLINE foldableFoldrElem #-}
6689foldableFoldrElem :: Int -> Int -> Bool
6790foldableFoldrElem value n =
6891 F.foldr (\x xs -> x == value || xs)
6992 False
70− (sourceUnfoldr value n :: S.SerialT Identity Int)
93+ (sourceUnfoldr value n :: Stream Identity Int)
7194
7295{-# INLINE foldableSum #-}
7396foldableSum :: Int -> Int -> Int
7497foldableSum value n =
75− Prelude.sum (sourceUnfoldr value n :: S.SerialT Identity Int)
98+ Prelude.sum (sourceUnfoldr value n :: Stream Identity Int)
7699
77100{-# INLINE foldableProduct #-}
78101foldableProduct :: Int -> Int -> Int
79102foldableProduct value n =
80− Prelude.product (sourceUnfoldr value n :: S.SerialT Identity Int)
103+ Prelude.product (sourceUnfoldr value n :: Stream Identity Int)
81104
82105{-# INLINE _foldableNull #-}
83106_foldableNull :: Int -> Int -> Bool
84107_foldableNull value n =
85− Prelude.null (sourceUnfoldr value n :: S.SerialT Identity Int)
108+ Prelude.null (sourceUnfoldr value n :: Stream Identity Int)
86109
87110{-# INLINE foldableElem #-}
88111foldableElem :: Int -> Int -> Bool
89112foldableElem value n =
90− value `Prelude.elem` (sourceUnfoldr value n :: S.SerialT Identity Int)
113+ value `Prelude.elem` (sourceUnfoldr value n :: Stream Identity Int)
91114
92115{-# INLINE foldableNotElem #-}
93116foldableNotElem :: Int -> Int -> Bool
94117foldableNotElem value n =
95− value `Prelude.notElem` (sourceUnfoldr value n :: S.SerialT Identity Int)
118+ value `Prelude.notElem` (sourceUnfoldr value n :: Stream Identity Int)
96119
97120{-# INLINE foldableFind #-}
98121foldableFind :: Int -> Int -> Maybe Int
99122foldableFind value n =
100− F.find (== (value + 1)) (sourceUnfoldr value n :: S.SerialT Identity Int)
123+ F.find (== (value + 1)) (sourceUnfoldr value n :: Stream Identity Int)
101124
102125{-# INLINE foldableAll #-}
103126foldableAll :: Int -> Int -> Bool
104127foldableAll value n =
105− Prelude.all (<= (value + 1)) (sourceUnfoldr value n :: S.SerialT Identity Int)
128+ Prelude.all (<= (value + 1)) (sourceUnfoldr value n :: Stream Identity Int)
106129
107130{-# INLINE foldableAny #-}
108131foldableAny :: Int -> Int -> Bool
109132foldableAny value n =
110− Prelude.any (> (value + 1)) (sourceUnfoldr value n :: S.SerialT Identity Int)
133+ Prelude.any (> (value + 1)) (sourceUnfoldr value n :: Stream Identity Int)
111134
135+{- HLINT ignore "Use all"-}
112136{-# INLINE foldableAnd #-}
113137foldableAnd :: Int -> Int -> Bool
114138foldableAnd value n =
115− Prelude.and $ S.map
116− (<= (value + 1)) (sourceUnfoldr value n :: S.SerialT Identity Int)
139+ Prelude.and $ fmap
140+ (<= (value + 1)) (sourceUnfoldr value n :: Stream Identity Int)
117141
142+{- HLINT ignore "Use any"-}
118143{-# INLINE foldableOr #-}
119144foldableOr :: Int -> Int -> Bool
120145foldableOr value n =
121− Prelude.or $ S.map
122− (> (value + 1)) (sourceUnfoldr value n :: S.SerialT Identity Int)
146+ Prelude.or $ fmap
147+ (> (value + 1)) (sourceUnfoldr value n :: Stream Identity Int)
123148
124149{-# INLINE foldableLength #-}
125150foldableLength :: Int -> Int -> Int
126151foldableLength value n =
127− Prelude.length (sourceUnfoldr value n :: S.SerialT Identity Int)
152+ Prelude.length (sourceUnfoldr value n :: Stream Identity Int)
128153
129154{-# INLINE foldableMin #-}
130155foldableMin :: Int -> Int -> Int
131156foldableMin value n =
132− Prelude.minimum (sourceUnfoldr value n :: S.SerialT Identity Int)
157+ Prelude.minimum (sourceUnfoldr value n :: Stream Identity Int)
133158
134159{-# INLINE ordInstanceMin #-}
135−ordInstanceMin :: SerialT Identity Int -> SerialT Identity Int
160+ordInstanceMin :: Stream Identity Int -> Stream Identity Int
136161ordInstanceMin src = min src src
137162
138163{-# INLINE foldableMax #-}
139164foldableMax :: Int -> Int -> Int
140165foldableMax value n =
141− Prelude.maximum (sourceUnfoldr value n :: S.SerialT Identity Int)
166+ Prelude.maximum (sourceUnfoldr value n :: Stream Identity Int)
142167
143168{-# INLINE foldableMinBy #-}
144169foldableMinBy :: Int -> Int -> Int
145170foldableMinBy value n =
146− F.minimumBy compare (sourceUnfoldr value n :: S.SerialT Identity Int)
171+ F.minimumBy compare (sourceUnfoldr value n :: Stream Identity Int)
147172
148173{-# INLINE foldableListMinBy #-}
149174foldableListMinBy :: Int -> Int -> Int
@@ -152,30 +177,30 @@ foldableListMinBy value n = F.minimumBy compare [1..value+n]
152177{-# INLINE foldableMaxBy #-}
153178foldableMaxBy :: Int -> Int -> Int
154179foldableMaxBy value n =
155− F.maximumBy compare (sourceUnfoldr value n :: S.SerialT Identity Int)
180+ F.maximumBy compare (sourceUnfoldr value n :: Stream Identity Int)
156181
157182{-# INLINE foldableToList #-}
158183foldableToList :: Int -> Int -> [Int]
159184foldableToList value n =
160− F.toList (sourceUnfoldr value n :: S.SerialT Identity Int)
185+ F.toList (sourceUnfoldr value n :: Stream Identity Int)
161186
162187{-# INLINE foldableMapM_ #-}
163188foldableMapM_ :: Monad m => Int -> Int -> m ()
164189foldableMapM_ value n =
165− F.mapM_ (\_ -> return ()) (sourceUnfoldr value n :: S.SerialT Identity Int)
190+ F.mapM_ (\_ -> return ()) (sourceUnfoldr value n :: Stream Identity Int)
166191
167192{-# INLINE foldableSequence_ #-}
168193foldableSequence_ :: Int -> Int -> IO ()
169194foldableSequence_ value n =
170− F.sequence_ (sourceUnfoldrAction value n :: S.SerialT Identity (IO Int))
195+ F.sequence_ (sourceUnfoldrAction value n :: Stream Identity (IO Int))
171196
172197{-# INLINE _foldableMsum #-}
173198_foldableMsum :: Int -> Int -> IO Int
174199_foldableMsum value n =
175− F.msum (sourceUnfoldrAction value n :: S.SerialT Identity (IO Int))
200+ F.msum (sourceUnfoldrAction value n :: Stream Identity (IO Int))
176201
177202{-# INLINE showInstance #-}
178−showInstance :: SerialT Identity Int -> String
203+showInstance :: Stream Identity Int -> String
179204showInstance = show
180205
181206o_1_space_elimination_foldable :: Int -> [Benchmark]
@@ -192,6 +217,9 @@ o_1_space_elimination_foldable value =
192217 , bench "minimum" $ nf (foldableMin value) 1
193218 , benchPureSink value "min (ord)" ordInstanceMin
194219 , bench "maximum" $ nf (foldableMax value) 1
220+ , bench "minimumBy" $ nf (`foldableMinBy` 1) value
221+ , bench "maximumBy" $ nf (`foldableMaxBy` 1) value
222+ , bench "minimumByList" $ nf (`foldableListMinBy` 1) value
195223 , bench "length . toList"
196224 $ nf (Prelude.length . foldableToList value) 1
197225 , bench "notElem" $ nf (foldableNotElem value) 1
@@ -214,34 +242,25 @@ o_1_space_elimination_foldable value =
214242 ]
215243 ]
216244
217−o_n_space_elimination_foldable :: Int -> [Benchmark]
218−o_n_space_elimination_foldable value =
219− -- Head recursive strict right folds.
220− [ bgroup "foldl"
221− -- XXX the definitions of minimumBy and maximumBy in Data.Foldable use
222− -- foldl1 which does not work in constant memory for our
223− -- implementation. It works in constant memory for lists but even for
224− -- lists it takes 15x more time compared to our foldl' based
225− -- implementation.
226− [ bench "minimumBy" $ nf (`foldableMinBy` 1) value
227− , bench "maximumBy" $ nf (`foldableMaxBy` 1) value
228− , bench "minimumByList" $ nf (`foldableListMinBy` 1) value
229− ]
230− ]
231−
232245-------------------------------------------------------------------------------
233246-- Stream folds
234247-------------------------------------------------------------------------------
235248
249+#ifndef USE_PRELUDE
250+instance NFData a => NFData (Stream Identity a) where
251+ {-# INLINE rnf #-}
252+ rnf xs = runIdentity $ S.fold (Fold.foldl' (\_ x -> rnf x) ()) xs
253+#endif
254+
236255{-# INLINE benchPureSink #-}
237256benchPureSink :: NFData b
238− => Int -> String -> (SerialT Identity Int -> b) -> Benchmark
257+ => Int -> String -> (Stream Identity Int -> b) -> Benchmark
239258benchPureSink value name = benchPure name (sourceUnfoldr value)
240259
241260{-# INLINE benchHoistSink #-}
242261benchHoistSink
243− :: (IsStream t, NFData b)
244− => Int -> String -> (t Identity Int -> IO b) -> Benchmark
262+ :: (NFData b)
263+ => Int -> String -> (Stream Identity Int -> IO b) -> Benchmark
245264benchHoistSink value name f =
246265 bench name $ nfIO $ randomRIO (1,1) >>= f . sourceUnfoldr value
247266
@@ -249,8 +268,8 @@ benchHoistSink value name f =
249268-- we can't use it as it requires MonadAsync constraint.
250269{-# INLINE benchIdentitySink #-}
251270benchIdentitySink
252− :: (IsStream t, NFData b)
253− => Int -> String -> (t Identity Int -> Identity b) -> Benchmark
271+ :: (NFData b)
272+ => Int -> String -> (Stream Identity Int -> Identity b) -> Benchmark
254273benchIdentitySink value name f = bench name $ nf (f . sourceUnfoldr value) 1
255274
256275-------------------------------------------------------------------------------
@@ -258,23 +277,29 @@ benchIdentitySink value name f = bench name $ nf (f . sourceUnfoldr value) 1
258277-------------------------------------------------------------------------------
259278
260279{-# INLINE uncons #-}
261−uncons :: Monad m => SerialT m Int -> m ()
280+#ifdef USE_STREAMK
281+uncons :: Monad m => StreamK m Int -> m ()
282+#else
283+uncons :: Monad m => Stream m Int -> m ()
284+#endif
262285uncons s = do
263− r <- S.uncons s
286+ r <- StreamK.uncons s
264287 case r of
265288 Nothing -> return ()
266289 Just (_, t) -> uncons t
267290
291+#ifdef USE_PRELUDE
268292{-# INLINE init #-}
269−init :: Monad m => SerialT m a -> m ()
293+init :: Monad m => Stream m a -> m ()
270294init s = S.init s >>= Prelude.mapM_ S.drain
271295
272296{-# INLINE mapM_ #-}
273−mapM_ :: Monad m => SerialT m Int -> m ()
297+mapM_ :: Monad m => Stream m Int -> m ()
274298mapM_ = S.mapM_ (\_ -> return ())
299+#endif
275300
276301{-# INLINE foldrMElem #-}
277−foldrMElem :: Monad m => Int -> SerialT m Int -> m Bool
302+foldrMElem :: Monad m => Int -> Stream m Int -> m Bool
278303foldrMElem e =
279304 S.foldrM
280305 (\x xs ->
@@ -283,155 +308,187 @@ foldrMElem e =
283308 else xs)
284309 (return False)
285310
311+#ifdef USE_STREAMK
286312{-# INLINE foldrToStream #-}
287−foldrToStream :: Monad m => SerialT m Int -> m (SerialT Identity Int)
288−foldrToStream = S.foldr S.cons S.nil
313+foldrToStream :: Monad m => Stream m Int -> m (StreamK Identity Int)
314+foldrToStream = S.foldr StreamK.cons StreamK.nil
315+#else
316+-- {-# INLINE foldrToStream #-}
317+-- foldrToStream :: Monad m => Stream m Int -> m (Stream Identity Int)
318+-- foldrToStream = S.foldr S.cons S.nil
319+#endif
289320
290321{-# INLINE foldrMBuild #-}
291−foldrMBuild :: Monad m => SerialT m Int -> m [Int]
322+foldrMBuild :: Monad m => Stream m Int -> m [Int]
292323foldrMBuild = S.foldrM (\x xs -> (x :) <$> xs) (return [])
293324
325+#ifdef USE_PRELUDE
294326{-# INLINE foldl'Reduce #-}
295−foldl'Reduce :: Monad m => SerialT m Int -> m Int
327+foldl'Reduce :: Monad m => Stream m Int -> m Int
296328foldl'Reduce = S.foldl' (+) 0
297329
298330{-# INLINE foldl1'Reduce #-}
299−foldl1'Reduce :: Monad m => SerialT m Int -> m (Maybe Int)
331+foldl1'Reduce :: Monad m => Stream m Int -> m (Maybe Int)
300332foldl1'Reduce = S.foldl1' (+)
301333
302334{-# INLINE foldlM'Reduce #-}
303−foldlM'Reduce :: Monad m => SerialT m Int -> m Int
335+foldlM'Reduce :: Monad m => Stream m Int -> m Int
304336foldlM'Reduce = S.foldlM' (\xs a -> return $ a + xs) (return 0)
305337
306338{-# INLINE last #-}
307−last :: Monad m => SerialT m Int -> m (Maybe Int)
339+last :: Monad m => Stream m Int -> m (Maybe Int)
308340last = S.last
309341
310342{-# INLINE _head #-}
311−_head :: Monad m => SerialT m Int -> m (Maybe Int)
343+_head :: Monad m => Stream m Int -> m (Maybe Int)
312344_head = S.head
313345
314346{-# INLINE elem #-}
315−elem :: Monad m => Int -> SerialT m Int -> m Bool
347+elem :: Monad m => Int -> Stream m Int -> m Bool
316348elem value = S.elem (value + 1)
317349
318350{-# INLINE notElem #-}
319−notElem :: Monad m => Int -> SerialT m Int -> m Bool
351+notElem :: Monad m => Int -> Stream m Int -> m Bool
320352notElem value = S.notElem (value + 1)
321353
322354{-# INLINE length #-}
323−length :: Monad m => SerialT m Int -> m Int
355+length :: Monad m => Stream m Int -> m Int
324356length = S.length
325357
326358{-# INLINE all #-}
327−all :: Monad m => Int -> SerialT m Int -> m Bool
359+all :: Monad m => Int -> Stream m Int -> m Bool
328360all value = S.all (<= (value + 1))
329361
330362{-# INLINE any #-}
331−any :: Monad m => Int -> SerialT m Int -> m Bool
363+any :: Monad m => Int -> Stream m Int -> m Bool
332364any value = S.any (> (value + 1))
333365
334366{-# INLINE and #-}
335−and :: Monad m => Int -> SerialT m Int -> m Bool
367+and :: Monad m => Int -> Stream m Int -> m Bool
336368and value = S.and . S.map (<= (value + 1))
337369
338370{-# INLINE or #-}
339−or :: Monad m => Int -> SerialT m Int -> m Bool
371+or :: Monad m => Int -> Stream m Int -> m Bool
340372or value = S.or . S.map (> (value + 1))
341373
342374{-# INLINE find #-}
343−find :: Monad m => Int -> SerialT m Int -> m (Maybe Int)
375+find :: Monad m => Int -> Stream m Int -> m (Maybe Int)
344376find value = S.find (== (value + 1))
345377
346378{-# INLINE findM #-}
347−findM :: Monad m => Int -> SerialT m Int -> m (Maybe Int)
379+findM :: Monad m => Int -> Stream m Int -> m (Maybe Int)
348380findM value = S.findM (\z -> return $ z == (value + 1))
349381
350382{-# INLINE findIndex #-}
351−findIndex :: Monad m => Int -> SerialT m Int -> m (Maybe Int)
383+findIndex :: Monad m => Int -> Stream m Int -> m (Maybe Int)
352384findIndex value = S.findIndex (== (value + 1))
353385
354386{-# INLINE elemIndex #-}
355−elemIndex :: Monad m => Int -> SerialT m Int -> m (Maybe Int)
387+elemIndex :: Monad m => Int -> Stream m Int -> m (Maybe Int)
356388elemIndex value = S.elemIndex (value + 1)
357389
358390{-# INLINE maximum #-}
359−maximum :: Monad m => SerialT m Int -> m (Maybe Int)
391+maximum :: Monad m => Stream m Int -> m (Maybe Int)
360392maximum = S.maximum
361393
362394{-# INLINE minimum #-}
363−minimum :: Monad m => SerialT m Int -> m (Maybe Int)
395+minimum :: Monad m => Stream m Int -> m (Maybe Int)
364396minimum = S.minimum
365397
366398{-# INLINE sum #-}
367−sum :: Monad m => SerialT m Int -> m Int
399+sum :: Monad m => Stream m Int -> m Int
368400sum = S.sum
369401
370402{-# INLINE product #-}
371−product :: Monad m => SerialT m Int -> m Int
403+product :: Monad m => Stream m Int -> m Int
372404product = S.product
373405
374406{-# INLINE minimumBy #-}
375−minimumBy :: Monad m => SerialT m Int -> m (Maybe Int)
407+minimumBy :: Monad m => Stream m Int -> m (Maybe Int)
376408minimumBy = S.minimumBy compare
377409
378410{-# INLINE maximumBy #-}
379−maximumBy :: Monad m => SerialT m Int -> m (Maybe Int)
411+maximumBy :: Monad m => Stream m Int -> m (Maybe Int)
380412maximumBy = S.maximumBy compare
381413
382414{-# INLINE the #-}
383−the :: Monad m => SerialT m Int -> m (Maybe Int)
415+the :: Monad m => Stream m Int -> m (Maybe Int)
384416the = S.the
385417
386418{-# INLINE drainN #-}
387−drainN :: Monad m => Int -> SerialT m Int -> m ()
419+drainN :: Monad m => Int -> Stream m Int -> m ()
388420drainN = S.drainN
389421
390422{-# INLINE drainWhile #-}
391−drainWhile :: Monad m => SerialT m Int -> m ()
423+drainWhile :: Monad m => Stream m Int -> m ()
392424drainWhile = S.drainWhile (const True)
393425
394426{-# INLINE (!!) #-}
395−(!!) :: Monad m => Int -> SerialT m Int -> m (Maybe Int)
396−(!!) = flip (Internal.!!)
427+(!!) :: Monad m => Int -> Stream m Int -> m (Maybe Int)
428+(!!) = flip (S.!!)
397429
398430{-# INLINE lookup #-}
399−lookup :: Monad m => Int -> SerialT m Int -> m (Maybe Int)
431+lookup :: Monad m => Int -> Stream m Int -> m (Maybe Int)
400432lookup val = S.lookup val . S.map (\x -> (x, x))
433+#endif
401434
402435o_1_space_elimination_folds :: Int -> [Benchmark]
403436o_1_space_elimination_folds value =
404437 [ bgroup "elimination"
405438 -- Basic folds
406− [ bgroup "reduce"
439+ [
440+#ifdef USE_PRELUDE
441+ bgroup "reduce"
407442 [ bgroup
408443 "IO"
409444 [ benchIOSink value "foldl'" foldl'Reduce
410445 , benchIOSink value "foldl1'" foldl1'Reduce
411446 , benchIOSink value "foldlM'" foldlM'Reduce
412447 ]
448+
413449 , bgroup
414450 "Identity"
415451 [ benchIdentitySink value "foldl'" foldl'Reduce
416452 , benchIdentitySink value "foldl1'" foldl1'Reduce
417453 , benchIdentitySink value "foldlM'" foldlM'Reduce
418454 ]
419− ]
420− , bgroup "build"
455+ ] ,
456+#endif
457+ bgroup "build"
421458 [ bgroup "IO"
422459 [ benchIOSink value "foldrMElem" (foldrMElem value)
423460 ]
424461 , bgroup "Identity"
425462 [ benchIdentitySink value "foldrMElem" (foldrMElem value)
463+#ifdef USE_STREAMK
426464 , benchIdentitySink value "foldrToStreamLength"
427− (S.length . runIdentity . foldrToStream)
465+ (S.fold Fold.length . toStream . runIdentity . foldrToStream)
466+ {-
467+ , benchIdentitySink 16 "foldrToStreamLength (16)"
468+ (S.fold Fold.length . toStream . runIdentity . foldrToStream)
469+ -}
470+#else
471+ {-
472+ , benchIdentitySink 16 "foldrToStreamLength (16)"
473+ (S.fold Fold.length . runIdentity . foldrToStream)
474+ -}
475+#endif
476+ {-
477+ , benchPureSink 16 "foldrMToListLength (16)"
478+ (Prelude.length . runIdentity . foldrMBuild)
479+ -}
428480 , benchPureSink value "foldrMToListLength"
429481 (Prelude.length . runIdentity . foldrMBuild)
430482 ]
431483 ]
432484
433485 -- deconstruction
434− , benchIOSink value "uncons" uncons
486+ , benchIOSink value "uncons" (uncons . fromStream)
487+#ifndef USE_PRELUDE
488+ , benchHoistSink value "length . generalizeInner"
489+ (S.fold Fold.length . S.generalizeInner)
490+#endif
491+#ifdef USE_PRELUDE
435492 , benchIOSink value "init" init
436493
437494 -- draining
@@ -445,8 +502,6 @@ o_1_space_elimination_folds value =
445502 -- , benchIOSink value "head" head
446503 , benchIOSink value "last" last
447504 , benchIOSink value "length" length
448− , benchHoistSink value "length . generally"
449− (length . Internal.generally)
450505 , benchIOSink value "sum" sum
451506 , benchIOSink value "product" product
452507 , benchIOSink value "maximumBy" maximumBy
@@ -470,6 +525,7 @@ o_1_space_elimination_folds value =
470525 , benchIOSink value "any" (any value)
471526 , benchIOSink value "and" (and value)
472527 , benchIOSink value "or" (or value)
528+#endif
473529
474530 -- length is used to check for foldr/build fusion
475531 , benchPureSink value "length . IsList.toList" (Prelude.length . GHC.toList)
@@ -480,12 +536,13 @@ o_1_space_elimination_folds value =
480536-- Buffered Transformations by fold
481537-------------------------------------------------------------------------------
482538
539+#ifdef USE_PRELUDE
483540{-# INLINE foldl'Build #-}
484−foldl'Build :: Monad m => SerialT m Int -> m [Int]
541+foldl'Build :: Monad m => Stream m Int -> m [Int]
485542foldl'Build = S.foldl' (flip (:)) []
486543
487544{-# INLINE foldlM'Build #-}
488−foldlM'Build :: Monad m => SerialT m Int -> m [Int]
545+foldlM'Build :: Monad m => Stream m Int -> m [Int]
489546foldlM'Build = S.foldlM' (\xs x -> return $ x : xs) (return [])
490547
491548o_n_heap_elimination_foldl :: Int -> [Benchmark]
@@ -499,6 +556,7 @@ o_n_heap_elimination_foldl value =
499556 , benchIdentitySink value "foldlM'/build/Identity" foldlM'Build
500557 ]
501558 ]
559+#endif
502560
503561-- For comparisons
504562{-# INLINE showInstanceList #-}
@@ -518,7 +576,7 @@ o_n_heap_elimination_buffered value =
518576 ]
519577
520578{-# INLINE foldrMReduce #-}
521−foldrMReduce :: Monad m => SerialT m Int -> m Int
579+foldrMReduce :: Monad m => Stream m Int -> m Int
522580foldrMReduce = S.foldrM (\x xs -> (x +) <$> xs) (return 0)
523581
524582o_n_space_elimination_foldr :: Int -> [Benchmark]
@@ -534,13 +592,14 @@ o_n_space_elimination_foldr value =
534592 ]
535593 ]
536594
595+#ifdef USE_PRELUDE
537596o_n_heap_elimination_toList :: Int -> [Benchmark]
538597o_n_heap_elimination_toList value =
539598 [ bgroup "toList"
540599 -- Converting the stream to a list or pure stream in a strict monad
541− [ benchIOSink value "toListRev" Internal.toListRev
600+ [ benchIOSink value "toListRev" S.toListRev
542601 , benchIOSink value "toStreamRev"
543− (Internal.toStreamRev :: (SerialT IO Int -> IO (SerialT Identity Int)))
602+ (S.toStreamRev :: (Stream IO Int -> IO (Stream Identity Int)))
544603 ]
545604 ]
546605
@@ -549,10 +608,13 @@ o_n_space_elimination_toList value =
549608 [ bgroup "toList"
550609 -- Converting the stream to a list or pure stream in a strict monad
551610 [ benchIOSink value "toList" S.toList
611+#ifndef USE_PRELUDE
552612 , benchIOSink value "toStream"
553− (Internal.toStream :: (SerialT IO Int -> IO (SerialT Identity Int)))
613+ (S.toStream :: (Stream IO Int -> IO (Stream Identity Int)))
614+#endif
554615 ]
555616 ]
617+#endif
556618
557619-------------------------------------------------------------------------------
558620-- Multi-stream folds
@@ -563,7 +625,7 @@ o_n_space_elimination_toList value =
563625-------------------------------------------------------------------------------
564626
565627{-# INLINE eqBy' #-}
566−eqBy' :: (Monad m, Eq a) => SerialT m a -> m Bool
628+eqBy' :: (Monad m, Eq a) => Stream m a -> m Bool
567629eqBy' src = S.eqBy (==) src src
568630
569631{-# INLINE eqByPure #-}
@@ -577,15 +639,15 @@ inspect $ 'eqByPure `hasNoType` ''D.Step
577639#endif
578640
579641{-# INLINE eqInstance #-}
580−eqInstance :: SerialT Identity Int -> Bool
642+eqInstance :: Stream Identity Int -> Bool
581643eqInstance src = src == src
582644
583645{-# INLINE eqInstanceNotEq #-}
584−eqInstanceNotEq :: SerialT Identity Int -> Bool
646+eqInstanceNotEq :: Stream Identity Int -> Bool
585647eqInstanceNotEq src = src /= src
586648
587649{-# INLINE cmpBy' #-}
588−cmpBy' :: (Monad m, Ord a) => SerialT m a -> m Ordering
650+cmpBy' :: (Monad m, Ord a) => Stream m a -> m Ordering
589651cmpBy' src = S.cmpBy compare src src
590652
591653{-# INLINE cmpByPure #-}
@@ -599,7 +661,7 @@ inspect $ 'cmpByPure `hasNoType` ''D.Step
599661#endif
600662
601663{-# INLINE ordInstance #-}
602−ordInstance :: SerialT Identity Int -> Bool
664+ordInstance :: Stream Identity Int -> Bool
603665ordInstance src = src < src
604666
605667o_1_space_elimination_multi_stream_pure :: Int -> [Benchmark]
@@ -614,15 +676,15 @@ o_1_space_elimination_multi_stream_pure value =
614676 ]
615677
616678{-# INLINE isPrefixOf #-}
617−isPrefixOf :: Monad m => SerialT m Int -> m Bool
679+isPrefixOf :: Monad m => Stream m Int -> m Bool
618680isPrefixOf src = S.isPrefixOf src src
619681
620682{-# INLINE isSubsequenceOf #-}
621−isSubsequenceOf :: Monad m => SerialT m Int -> m Bool
683+isSubsequenceOf :: Monad m => Stream m Int -> m Bool
622684isSubsequenceOf src = S.isSubsequenceOf src src
623685
624686{-# INLINE stripPrefix #-}
625−stripPrefix :: Monad m => SerialT m Int -> m ()
687+stripPrefix :: Monad m => Stream m Int -> m ()
626688stripPrefix src = do
627689 _ <- S.stripPrefix src src
628690 return ()
@@ -673,14 +735,14 @@ benchmarks moduleName size =
673735 , o_1_space_elimination_multi_stream_pure size
674736 , o_1_space_elimination_multi_stream size
675737 ]
676− , bgroup (o_n_heap_prefix moduleName) $ concat
677− [ o_n_heap_elimination_foldl size
678− , o_n_heap_elimination_toList size
679− , o_n_heap_elimination_buffered size
680− ]
681− , bgroup (o_n_space_prefix moduleName) $ concat
682− [ o_n_space_elimination_foldable size
683− , o_n_space_elimination_toList size
684− , o_n_space_elimination_foldr size
685− ]
738+
739+ , bgroup (o_n_heap_prefix moduleName) $
740+ o_n_heap_elimination_buffered size
741+#ifdef USE_PRELUDE
742+ ++ o_n_heap_elimination_foldl size
743+ ++ o_n_heap_elimination_toList size
744+ ++ o_n_space_elimination_toList size
745+#endif
746+ , bgroup (o_n_space_prefix moduleName) $
747+ o_n_space_elimination_foldr size
686748 ]
benchmark/Streamly/Benchmark/Prelude/Serial/Exceptions.hs → benchmark/Streamly/Benchmark/Data/Stream/Exceptions.hsrenamed+124−70
@@ -1,5 +1,5 @@
11-- |
2−-- Module : Streamly.Benchmark.Prelude.Serial.Exceptions
2+-- Module : Stream.Exceptions
33-- Copyright : (c) 2019 Composewell Technologies
44-- License : BSD-3-Clause
55-- Maintainer : streamly@composewell.com
@@ -7,8 +7,13 @@
77-- Portability : GHC
88
99{-# LANGUAGE CPP #-}
10+{-# LANGUAGE FlexibleContexts #-}
1011{-# LANGUAGE ScopedTypeVariables #-}
1112
13+#ifdef USE_PRELUDE
14+{-# OPTIONS_GHC -Wno-deprecations #-}
15+#endif
16+
1217#ifdef __HADDOCK_VERSION__
1318#undef INSPECTION
1419#endif
@@ -18,29 +23,63 @@
1823{-# OPTIONS_GHC -fplugin Test.Inspection.Plugin #-}
1924#endif
2025
21−module Serial.Exceptions (benchmarks) where
26+module Stream.Exceptions (benchmarks) where
2227
23−import Control.Exception (SomeException, Exception, throwIO)
24−import System.IO (Handle, hClose, hPutChar)
28+import Control.Exception (Exception, throwIO)
29+import Stream.Common (drain)
2530
2631import qualified Data.IORef as Ref
2732import qualified Data.Map.Strict as Map
2833
34+import Control.Exception (SomeException)
35+import System.IO (Handle, hClose, hPutChar)
2936import qualified Streamly.FileSystem.Handle as FH
30−import qualified Streamly.Internal.Data.Unfold as IUF
3137import qualified Streamly.Internal.FileSystem.Handle as IFH
32−import qualified Streamly.Internal.Data.Stream.IsStream as IP
33−import qualified Streamly.Prelude as S
38+import qualified Streamly.Internal.Data.Unfold as IUF
39+import qualified Streamly.Internal.Data.Unfold.Prelude as IUF
40+
41+#ifdef USE_PRELUDE
42+import qualified Streamly.Internal.Data.Stream.IsStream as Stream
43+#else
44+import qualified Streamly.Internal.Data.Stream as Stream
45+import qualified Streamly.Internal.Data.Stream.Prelude as Stream
46+#endif
3447
35−import Gauge hiding (env)
48+import Test.Tasty.Bench hiding (env)
3649import Prelude hiding (last, length)
3750import Streamly.Benchmark.Common
3851import Streamly.Benchmark.Common.Handle
3952
4053#ifdef INSPECTION
54+import Control.Monad.Catch (MonadCatch)
4155import Test.Inspection
4256
43−import qualified Streamly.Internal.Data.Stream.StreamD as D
57+import qualified Streamly.Internal.Data.Stream as D
58+#endif
59+
60+#ifdef USE_PRELUDE
61+type Stream = Stream.SerialT
62+toStreamD = Stream.toStream
63+fromStreamD = Stream.fromStream
64+#else
65+type Stream = Stream.Stream
66+toStreamD :: a -> a
67+toStreamD = id
68+fromStreamD :: a -> a
69+fromStreamD = id
70+#endif
71+
72+afterUnsafe :: IO b -> Stream IO a -> Stream IO a
73+finallyUnsafe :: IO b -> Stream IO a -> Stream IO a
74+bracketUnsafe :: IO b -> (b -> IO c) -> (b -> Stream IO a) -> Stream IO a
75+#ifdef USE_PRELUDE
76+afterUnsafe = Stream.after_
77+finallyUnsafe = Stream.finally_
78+bracketUnsafe = Stream.bracket_
79+#else
80+afterUnsafe = Stream.afterUnsafe
81+finallyUnsafe = Stream.finallyUnsafe
82+bracketUnsafe = Stream.bracketUnsafe
4483#endif
4584
4685-------------------------------------------------------------------------------
@@ -56,37 +95,41 @@ instance Exception BenchException
5695
5796retryNoneSimple :: Int -> Int -> IO ()
5897retryNoneSimple length from =
59− IP.drain
60− $ IP.retry (Map.singleton BenchException1 length) (const S.nil) source
98+ drain
99+ $ Stream.retry
100+ (Map.singleton BenchException1 length)
101+ (const Stream.nil)
102+ source
61103
62104 where
63105
64− source = S.enumerateFromTo from (from + length)
106+ source = Stream.enumerateFromTo from (from + length)
65107
66108retryNone :: Int -> Int -> IO ()
67109retryNone length from = do
68110 ref <- Ref.newIORef (0 :: Int)
69− IP.drain
70− $ IP.retry (Map.singleton BenchException1 length) (const S.nil)
111+ drain
112+ $ Stream.retry (Map.singleton BenchException1 length) (const Stream.nil)
71113 $ source ref
72114
73115 where
74116
75117 source ref =
76− IP.replicateM (from + length)
118+ Stream.replicateM (from + length)
77119 $ Ref.modifyIORef' ref (+ 1) >> Ref.readIORef ref
78120
79121retryAll :: Int -> Int -> IO ()
80122retryAll length from = do
81123 ref <- Ref.newIORef 0
82− IP.drain
83− $ IP.retry (Map.singleton BenchException1 (length + from)) (const S.nil)
124+ drain
125+ $ Stream.retry
126+ (Map.singleton BenchException1 (length + from)) (const Stream.nil)
84127 $ source ref
85128
86129 where
87130
88131 source ref =
89− IP.fromEffect
132+ Stream.fromEffect
90133 $ do
91134 Ref.modifyIORef' ref (+ 1)
92135 val <- Ref.readIORef ref
@@ -96,13 +139,13 @@ retryAll length from = do
96139
97140retryUnknown :: Int -> Int -> IO ()
98141retryUnknown length from = do
99− IP.drain
100− $ IP.retry (Map.singleton BenchException1 length) (const source)
101− $ throwIO BenchException2 `S.before` S.nil
142+ drain
143+ $ Stream.retry (Map.singleton BenchException1 length) (const source)
144+ $ throwIO BenchException2 `Stream.before` Stream.nil
102145
103146 where
104147
105− source = S.enumerateFromTo from (from + length)
148+ source = Stream.enumerateFromTo from (from + length)
106149
107150
108151o_1_space_serial_exceptions :: Int -> [Benchmark]
@@ -116,6 +159,8 @@ o_1_space_serial_exceptions length =
116159 ]
117160 ]
118161
162+-- XXX Move these to FileSystem.Handle benchmarks
163+
119164-------------------------------------------------------------------------------
120165-- copy stream exceptions
121166-------------------------------------------------------------------------------
@@ -123,8 +168,8 @@ o_1_space_serial_exceptions length =
123168-- | Send the file contents to /dev/null with exception handling
124169readWriteOnExceptionStream :: Handle -> Handle -> IO ()
125170readWriteOnExceptionStream inh devNull =
126− let readEx = S.onException (hClose inh) (S.unfold FH.read inh)
127− in S.fold (FH.write devNull) $ readEx
171+ let readEx = Stream.onException (hClose inh) (Stream.unfold FH.reader inh)
172+ in Stream.fold (FH.write devNull) readEx
128173
129174#ifdef INSPECTION
130175inspect $ hasNoTypeClasses 'readWriteOnExceptionStream
@@ -133,9 +178,10 @@ inspect $ hasNoTypeClasses 'readWriteOnExceptionStream
133178-- | Send the file contents to /dev/null with exception handling
134179readWriteHandleExceptionStream :: Handle -> Handle -> IO ()
135180readWriteHandleExceptionStream inh devNull =
136− let handler (_e :: SomeException) = S.fromEffect (hClose inh >> return 10)
137− readEx = S.handle handler (S.unfold FH.read inh)
138− in S.fold (FH.write devNull) $ readEx
181+ let handler (_e :: SomeException) =
182+ return $ Stream.fromEffect (hClose inh >> return 10)
183+ readEx = Stream.handle handler (Stream.unfold FH.reader inh)
184+ in Stream.fold (FH.write devNull) readEx
139185
140186#ifdef INSPECTION
141187inspect $ hasNoTypeClasses 'readWriteHandleExceptionStream
@@ -144,8 +190,9 @@ inspect $ hasNoTypeClasses 'readWriteHandleExceptionStream
144190-- | Send the file contents to /dev/null with exception handling
145191readWriteFinally_Stream :: Handle -> Handle -> IO ()
146192readWriteFinally_Stream inh devNull =
147− let readEx = IP.finally_ (hClose inh) (S.unfold FH.read inh)
148− in S.fold (FH.write devNull) readEx
193+ let readEx =
194+ finallyUnsafe (hClose inh) (Stream.unfold FH.reader inh)
195+ in Stream.fold (FH.write devNull) readEx
149196
150197#ifdef INSPECTION
151198inspect $ hasNoTypeClasses 'readWriteFinally_Stream
@@ -153,15 +200,15 @@ inspect $ hasNoTypeClasses 'readWriteFinally_Stream
153200
154201readWriteFinallyStream :: Handle -> Handle -> IO ()
155202readWriteFinallyStream inh devNull =
156− let readEx = S.finally (hClose inh) (S.unfold FH.read inh)
157− in S.fold (FH.write devNull) readEx
203+ let readEx = Stream.finally (hClose inh) (Stream.unfold FH.reader inh)
204+ in Stream.fold (FH.write devNull) readEx
158205
159206-- | Send the file contents to /dev/null with exception handling
160207fromToBytesBracket_Stream :: Handle -> Handle -> IO ()
161208fromToBytesBracket_Stream inh devNull =
162− let readEx = IP.bracket_ (return ()) (\_ -> hClose inh)
163− (\_ -> IFH.toBytes inh)
164− in IFH.putBytes devNull $ readEx
209+ let readEx = bracketUnsafe (return ()) (\_ -> hClose inh)
210+ (\_ -> fromStreamD $ IFH.read inh)
211+ in IFH.putBytes devNull (toStreamD readEx)
165212
166213#ifdef INSPECTION
167214inspect $ hasNoTypeClasses 'fromToBytesBracket_Stream
@@ -169,16 +216,16 @@ inspect $ hasNoTypeClasses 'fromToBytesBracket_Stream
169216
170217fromToBytesBracketStream :: Handle -> Handle -> IO ()
171218fromToBytesBracketStream inh devNull =
172− let readEx = S.bracket (return ()) (\_ -> hClose inh)
173− (\_ -> IFH.toBytes inh)
174− in IFH.putBytes devNull $ readEx
219+ let readEx = Stream.bracket (return ()) (\_ -> hClose inh)
220+ (\_ -> fromStreamD $ IFH.read inh)
221+ in IFH.putBytes devNull (toStreamD readEx)
175222
176223readWriteBeforeAfterStream :: Handle -> Handle -> IO ()
177224readWriteBeforeAfterStream inh devNull =
178225 let readEx =
179− IP.after (hClose inh)
180− $ IP.before (hPutChar devNull 'A') (S.unfold FH.read inh)
181− in S.fold (FH.write devNull) readEx
226+ Stream.after (hClose inh)
227+ $ Stream.before (hPutChar devNull 'A') (Stream.unfold FH.reader inh)
228+ in Stream.fold (FH.write devNull) readEx
182229
183230#ifdef INSPECTION
184231inspect $ 'readWriteBeforeAfterStream `hasNoType` ''D.Step
@@ -186,8 +233,8 @@ inspect $ 'readWriteBeforeAfterStream `hasNoType` ''D.Step
186233
187234readWriteAfterStream :: Handle -> Handle -> IO ()
188235readWriteAfterStream inh devNull =
189− let readEx = IP.after (hClose inh) (S.unfold FH.read inh)
190− in S.fold (FH.write devNull) readEx
236+ let readEx = Stream.after (hClose inh) (Stream.unfold FH.reader inh)
237+ in Stream.fold (FH.write devNull) readEx
191238
192239#ifdef INSPECTION
193240inspect $ 'readWriteAfterStream `hasNoType` ''D.Step
@@ -195,8 +242,8 @@ inspect $ 'readWriteAfterStream `hasNoType` ''D.Step
195242
196243readWriteAfter_Stream :: Handle -> Handle -> IO ()
197244readWriteAfter_Stream inh devNull =
198− let readEx = IP.after_ (hClose inh) (S.unfold FH.read inh)
199− in S.fold (FH.write devNull) readEx
245+ let readEx = afterUnsafe (hClose inh) (Stream.unfold FH.reader inh)
246+ in Stream.fold (FH.write devNull) readEx
200247
201248#ifdef INSPECTION
202249inspect $ hasNoTypeClasses 'readWriteAfter_Stream
@@ -206,25 +253,25 @@ inspect $ 'readWriteAfter_Stream `hasNoType` ''D.Step
206253o_1_space_copy_stream_exceptions :: BenchEnv -> [Benchmark]
207254o_1_space_copy_stream_exceptions env =
208255 [ bgroup "exceptions"
209− [ mkBenchSmall "S.onException" env $ \inh _ ->
256+ [ mkBenchSmall "Stream.onException" env $ \inh _ ->
210257 readWriteOnExceptionStream inh (nullH env)
211− , mkBenchSmall "S.handle" env $ \inh _ ->
258+ , mkBenchSmall "Stream.handle" env $ \inh _ ->
212259 readWriteHandleExceptionStream inh (nullH env)
213− , mkBenchSmall "S.finally_" env $ \inh _ ->
260+ , mkBenchSmall "Stream.finally_" env $ \inh _ ->
214261 readWriteFinally_Stream inh (nullH env)
215− , mkBenchSmall "S.finally" env $ \inh _ ->
262+ , mkBenchSmall "Stream.finally" env $ \inh _ ->
216263 readWriteFinallyStream inh (nullH env)
217− , mkBenchSmall "S.after . S.before" env $ \inh _ ->
264+ , mkBenchSmall "Stream.after . Stream.before" env $ \inh _ ->
218265 readWriteBeforeAfterStream inh (nullH env)
219− , mkBenchSmall "S.after" env $ \inh _ ->
266+ , mkBenchSmall "Stream.after" env $ \inh _ ->
220267 readWriteAfterStream inh (nullH env)
221− , mkBenchSmall "S.after_" env $ \inh _ ->
268+ , mkBenchSmall "Stream.after_" env $ \inh _ ->
222269 readWriteAfter_Stream inh (nullH env)
223270 ]
224271 , bgroup "exceptions/fromToBytes"
225− [ mkBenchSmall "S.bracket_" env $ \inh _ ->
272+ [ mkBenchSmall "Stream.bracket_" env $ \inh _ ->
226273 fromToBytesBracket_Stream inh (nullH env)
227− , mkBenchSmall "S.bracket" env $ \inh _ ->
274+ , mkBenchSmall "Stream.bracket" env $ \inh _ ->
228275 fromToBytesBracketStream inh (nullH env)
229276 ]
230277 ]
@@ -236,26 +283,34 @@ o_1_space_copy_stream_exceptions env =
236283-- | Send the file contents to /dev/null with exception handling
237284readChunksOnException :: Handle -> Handle -> IO ()
238285readChunksOnException inh devNull =
239− let readEx = IUF.onException (\_ -> hClose inh) FH.readChunks
286+ let readEx = IUF.onException (\_ -> hClose inh) FH.chunkReader
240287 in IUF.fold (IFH.writeChunks devNull) readEx inh
241288
242289#ifdef INSPECTION
290+#if __GLASGOW_HASKELL__ >= 906
291+inspect $ hasNoTypeClassesExcept 'readChunksOnException [''MonadCatch]
292+#else
243293inspect $ hasNoTypeClasses 'readChunksOnException
244294#endif
295+#endif
245296
246297-- | Send the file contents to /dev/null with exception handling
247298readChunksBracket_ :: Handle -> Handle -> IO ()
248299readChunksBracket_ inh devNull =
249− let readEx = IUF.bracket_ return (\_ -> hClose inh) FH.readChunks
300+ let readEx = IUF.bracket_ return (\_ -> hClose inh) FH.chunkReader
250301 in IUF.fold (IFH.writeChunks devNull) readEx inh
251302
252303#ifdef INSPECTION
304+#if __GLASGOW_HASKELL__ >= 906
305+inspect $ hasNoTypeClassesExcept 'readChunksBracket_ [''MonadCatch]
306+#else
253307inspect $ hasNoTypeClasses 'readChunksBracket_
254308#endif
309+#endif
255310
256311readChunksBracket :: Handle -> Handle -> IO ()
257312readChunksBracket inh devNull =
258− let readEx = IUF.bracket return (\_ -> hClose inh) FH.readChunks
313+ let readEx = IUF.bracket return (\_ -> hClose inh) FH.chunkReader
259314 in IUF.fold (IFH.writeChunks devNull) readEx inh
260315
261316o_1_space_copy_exceptions_readChunks :: BenchEnv -> [Benchmark]
@@ -277,11 +332,11 @@ o_1_space_copy_exceptions_readChunks env =
277332-- | Send the file contents to /dev/null with exception handling
278333toChunksBracket_ :: Handle -> Handle -> IO ()
279334toChunksBracket_ inh devNull =
280− let readEx = IP.bracket_
335+ let readEx = bracketUnsafe
281336 (return ())
282337 (\_ -> hClose inh)
283− (\_ -> IFH.toChunks inh)
284− in S.fold (IFH.writeChunks devNull) $ readEx
338+ (\_ -> fromStreamD $ IFH.readChunks inh)
339+ in Stream.fold (IFH.writeChunks devNull) readEx
285340
286341#ifdef INSPECTION
287342inspect $ hasNoTypeClasses 'toChunksBracket_
@@ -289,29 +344,28 @@ inspect $ hasNoTypeClasses 'toChunksBracket_
289344
290345toChunksBracket :: Handle -> Handle -> IO ()
291346toChunksBracket inh devNull =
292− let readEx = S.bracket
347+ let readEx = Stream.bracket
293348 (return ())
294349 (\_ -> hClose inh)
295− (\_ -> IFH.toChunks inh)
296− in S.fold (IFH.writeChunks devNull) $ readEx
350+ (\_ -> fromStreamD $ IFH.readChunks inh)
351+ in Stream.fold (IFH.writeChunks devNull) readEx
297352
298353o_1_space_copy_exceptions_toChunks :: BenchEnv -> [Benchmark]
299354o_1_space_copy_exceptions_toChunks env =
300355 [ bgroup "exceptions/toChunks"
301− [ mkBench "S.bracket_" env $ \inH _ ->
356+ [ mkBench "Stream.bracket_" env $ \inH _ ->
302357 toChunksBracket_ inH (nullH env)
303− , mkBench "S.bracket" env $ \inH _ ->
358+ , mkBench "Stream.bracket" env $ \inH _ ->
304359 toChunksBracket inH (nullH env)
305360 ]
306361 ]
307362
308−
309363benchmarks :: String -> BenchEnv -> Int -> [Benchmark]
310−benchmarks moduleName env size =
364+benchmarks moduleName _env size =
311365 [ bgroup (o_1_space_prefix moduleName) $ concat
312− [ o_1_space_copy_exceptions_readChunks env
313− , o_1_space_copy_exceptions_toChunks env
314− , o_1_space_copy_stream_exceptions env
315− , o_1_space_serial_exceptions size
366+ [ o_1_space_serial_exceptions size
367+ , o_1_space_copy_exceptions_readChunks _env
368+ , o_1_space_copy_exceptions_toChunks _env
369+ , o_1_space_copy_stream_exceptions _env
316370 ]
317371 ]
benchmark/Streamly/Benchmark/Prelude/Serial/NestedStream.hs → benchmark/Streamly/Benchmark/Data/Stream/Expand.hsrenamed+263−131
@@ -1,5 +1,5 @@
11-- |
2−-- Module : Serial.NestedStream
2+-- Module : Stream.Expand
33-- Copyright : (c) 2018 Composewell Technologies
44-- License : BSD-3-Clause
55-- Maintainer : streamly@composewell.com
@@ -8,6 +8,11 @@
88{-# LANGUAGE FlexibleContexts #-}
99{-# LANGUAGE ScopedTypeVariables #-}
1010{-# LANGUAGE RankNTypes #-}
11+{-# LANGUAGE TupleSections #-}
12+
13+#ifdef USE_PRELUDE
14+{-# OPTIONS_GHC -Wno-deprecations #-}
15+#endif
1116
1217#ifdef __HADDOCK_VERSION__
1318#undef INSPECTION
@@ -18,33 +23,47 @@
1823{-# OPTIONS_GHC -fplugin Test.Inspection.Plugin #-}
1924#endif
2025
21−module Serial.NestedStream (benchmarks) where
22−
23−import Control.Monad.Trans.Class (lift)
24−
25−import qualified Control.Applicative as AP
26+module Stream.Expand (benchmarks) where
2627
2728#ifdef INSPECTION
2829import GHC.Types (SPEC(..))
2930import Test.Inspection
3031
31−import qualified Streamly.Internal.Data.Stream.StreamD as D
32+import qualified Streamly.Internal.Data.Stream as D
3233#endif
3334
34−import qualified Streamly.Prelude as S
35−import qualified Streamly.Internal.Data.Stream.IsStream as Internal
35+import qualified Stream.Common as Common
3636import qualified Streamly.Internal.Data.Unfold as UF
3737
38−import Gauge
39−import Streamly.Prelude (SerialT, fromSerial, serial)
40−import Streamly.Benchmark.Common
38+#ifdef USE_PRELUDE
39+import qualified Streamly.Internal.Data.Stream.IsStream as S
40+import qualified Streamly.Internal.Data.Stream.IsStream as StreamK
4141import Streamly.Benchmark.Prelude
42+ ( sourceFoldMapM, sourceFoldMapWith, sourceFoldMapWithM
43+ , sourceFoldMapWithStream, concatFoldableWith, concatForFoldableWith)
44+#else
45+import qualified Streamly.Internal.Data.Stream as S
46+#ifdef USE_STREAMK
47+import Streamly.Internal.Data.Stream (Stream)
48+import Streamly.Internal.Data.StreamK (StreamK, CrossStreamK)
49+import qualified Control.Applicative as AP
50+import qualified Streamly.Internal.Data.Fold as Fold
51+import qualified Streamly.Internal.Data.StreamK as StreamK
52+#else
53+import qualified Streamly.Internal.Data.Stream as StreamK
54+#endif
55+#endif
56+
57+import Test.Tasty.Bench
58+import Stream.Common
59+import Streamly.Benchmark.Common
4260import Prelude hiding (concatMap)
4361
4462-------------------------------------------------------------------------------
4563-- Iteration/looping utilities
4664-------------------------------------------------------------------------------
4765
66+#ifdef USE_STREAMK
4867{-# INLINE iterateN #-}
4968iterateN :: (Int -> a -> a) -> a -> Int -> a
5069iterateN g initial count = f count initial
@@ -56,13 +75,18 @@ iterateN g initial count = f count initial
5675
5776-- Iterate a transformation over a singleton stream
5877{-# INLINE iterateSingleton #-}
59−iterateSingleton :: S.MonadAsync m
60− => (Int -> SerialT m Int -> SerialT m Int)
78+iterateSingleton :: Applicative m =>
79+ (Int -> CrossStreamK m Int -> CrossStreamK m Int)
6180 -> Int
6281 -> Int
63− -> SerialT m Int
64−iterateSingleton g count n = iterateN g (return n) count
82+ -> Stream m Int
83+iterateSingleton g count n =
84+ toStream
85+ $ StreamK.unCross
86+ $ iterateN g (StreamK.mkCross (StreamK.fromPure n)) count
87+#endif
6588
89+{-
6690-- XXX need to check why this is slower than the explicit recursion above, even
6791-- if the above code is written in a foldr like head recursive way. We also
6892-- need to try this with foldlM' once #150 is fixed.
@@ -70,12 +94,13 @@ iterateSingleton g count n = iterateN g (return n) count
7094-- foldrM and any related fusion issues.
7195{-# INLINE _iterateSingleton #-}
7296_iterateSingleton ::
73− S.MonadAsync m
74− => (Int -> SerialT m Int -> SerialT m Int)
97+ Monad m
98+ => (Int -> Stream m Int -> Stream m Int)
7599 -> Int
76100 -> Int
77− -> SerialT m Int
101+ -> Stream m Int
78102_iterateSingleton g value n = S.foldrM g (return n) $ sourceIntFromTo value n
103+-}
79104
80105-------------------------------------------------------------------------------
81106-- Multi-Stream
@@ -88,50 +113,28 @@ _iterateSingleton g value n = S.foldrM g (return n) $ sourceIntFromTo value n
88113{-# INLINE serial2 #-}
89114serial2 :: Int -> Int -> IO ()
90115serial2 count n =
91− S.drain $
92− S.serial (sourceUnfoldrM count n) (sourceUnfoldrM count (n + 1))
116+ drain $ toStream $
117+ Common.append
118+ (fromStream $ sourceUnfoldrM count n)
119+ (fromStream $ sourceUnfoldrM count (n + 1))
93120
94121{-# INLINE serial4 #-}
95122serial4 :: Int -> Int -> IO ()
96123serial4 count n =
97− S.drain $
98− S.serial
99− (S.serial (sourceUnfoldrM count n) (sourceUnfoldrM count (n + 1)))
100− (S.serial
101− (sourceUnfoldrM count (n + 2))
102− (sourceUnfoldrM count (n + 3)))
103−
104−{-# INLINE append2 #-}
105−append2 :: Int -> Int -> IO ()
106−append2 count n =
107− S.drain $
108− Internal.append (sourceUnfoldrM count n) (sourceUnfoldrM count (n + 1))
109−
110−{-# INLINE append4 #-}
111−append4 :: Int -> Int -> IO ()
112−append4 count n =
113− S.drain $
114− Internal.append
115− (Internal.append
116− (sourceUnfoldrM count n)
117− (sourceUnfoldrM count (n + 1)))
118− (Internal.append
119− (sourceUnfoldrM count (n + 2))
120− (sourceUnfoldrM count (n + 3)))
121−
122−#ifdef INSPECTION
123−inspect $ hasNoTypeClasses 'append2
124−inspect $ 'append2 `hasNoType` ''SPEC
125−inspect $ 'append2 `hasNoType` ''D.AppendState
126−#endif
124+ drain $ toStream $
125+ Common.append
126+ (Common.append
127+ (fromStream $ sourceUnfoldrM count n)
128+ (fromStream $ sourceUnfoldrM count (n + 1)))
129+ (Common.append
130+ (fromStream $ sourceUnfoldrM count (n + 2))
131+ (fromStream $ sourceUnfoldrM count (n + 3)))
127132
128133o_1_space_joining :: Int -> [Benchmark]
129134o_1_space_joining value =
130135 [ bgroup "joining"
131136 [ benchIOSrc1 "serial (2,x/2)" (serial2 (value `div` 2))
132− , benchIOSrc1 "append (2,x/2)" (append2 (value `div` 2))
133137 , benchIOSrc1 "serial (2,2,x/4)" (serial4 (value `div` 4))
134− , benchIOSrc1 "append (2,2,x/4)" (append4 (value `div` 4))
135138 ]
136139 ]
137140
@@ -139,22 +142,24 @@ o_1_space_joining value =
139142-- Concat Foldable containers
140143-------------------------------------------------------------------------------
141144
145+#ifdef USE_PRELUDE
142146o_1_space_concatFoldable :: Int -> [Benchmark]
143147o_1_space_concatFoldable value =
144148 [ bgroup "concat-foldable"
145− [ benchIOSrc fromSerial "foldMapWith (<>) (List)"
149+ [ benchIOSrc "foldMapWith (<>) (List)"
146150 (sourceFoldMapWith value)
147− , benchIOSrc fromSerial "foldMapWith (<>) (Stream)"
151+ , benchIOSrc "foldMapWith (<>) (Stream)"
148152 (sourceFoldMapWithStream value)
149− , benchIOSrc fromSerial "foldMapWithM (<>) (List)"
153+ , benchIOSrc "foldMapWithM (<>) (List)"
150154 (sourceFoldMapWithM value)
151− , benchIOSrc fromSerial "S.concatFoldableWith (<>) (List)"
155+ , benchIOSrc "S.concatFoldableWith (<>) (List)"
152156 (concatFoldableWith value)
153− , benchIOSrc fromSerial "S.concatForFoldableWith (<>) (List)"
157+ , benchIOSrc "S.concatForFoldableWith (<>) (List)"
154158 (concatForFoldableWith value)
155− , benchIOSrc fromSerial "foldMapM (List)" (sourceFoldMapM value)
159+ , benchIOSrc "foldMapM (List)" (sourceFoldMapM value)
156160 ]
157161 ]
162+#endif
158163
159164-------------------------------------------------------------------------------
160165-- Concat
@@ -165,14 +170,15 @@ o_1_space_concatFoldable value =
165170{-# INLINE concatMap #-}
166171concatMap :: Int -> Int -> Int -> IO ()
167172concatMap outer inner n =
168− S.drain $ S.concatMap
169− (\_ -> sourceUnfoldrM inner n)
170− (sourceUnfoldrM outer n)
173+ drain $ toStream $ StreamK.concatMap
174+ (\_ -> fromStream $ sourceUnfoldrM inner n)
175+ (fromStream $ sourceUnfoldrM outer n)
171176
177+#ifndef USE_STREAMK
172178{-# INLINE concatMapM #-}
173179concatMapM :: Int -> Int -> Int -> IO ()
174180concatMapM outer inner n =
175− S.drain $ S.concatMapM
181+ drain $ S.concatMapM
176182 (\_ -> return $ sourceUnfoldrM inner n)
177183 (sourceUnfoldrM outer n)
178184
@@ -180,18 +186,23 @@ concatMapM outer inner n =
180186inspect $ hasNoTypeClasses 'concatMap
181187inspect $ 'concatMap `hasNoType` ''SPEC
182188#endif
189+#endif
183190
184191-- concatMap unfoldr/unfoldr
185192
186193{-# INLINE concatMapPure #-}
187194concatMapPure :: Int -> Int -> Int -> IO ()
188195concatMapPure outer inner n =
189− S.drain $ S.concatMap
190− (\_ -> sourceUnfoldr inner n)
191− (sourceUnfoldr outer n)
196+ drain $ toStream $ StreamK.concatMap
197+ (\_ -> fromStream $ sourceUnfoldr inner n)
198+ (fromStream $ sourceUnfoldr outer n)
192199
193200#ifdef INSPECTION
201+#if __GLASGOW_HASKELL__ >= 906
202+inspect $ hasNoTypeClassesExcept 'concatMapPure [''Applicative]
203+#else
194204inspect $ hasNoTypeClasses 'concatMapPure
205+#endif
195206inspect $ 'concatMapPure `hasNoType` ''SPEC
196207#endif
197208
@@ -200,42 +211,53 @@ inspect $ 'concatMapPure `hasNoType` ''SPEC
200211{-# INLINE concatMapRepl #-}
201212concatMapRepl :: Int -> Int -> Int -> IO ()
202213concatMapRepl outer inner n =
203− S.drain $ S.concatMap (S.replicate inner) (sourceUnfoldrM outer n)
214+ drain $ toStream $ StreamK.concatMap
215+ (fromStream . S.replicate inner) (fromStream $ sourceUnfoldrM outer n)
204216
205217#ifdef INSPECTION
218+#if __GLASGOW_HASKELL__ >= 906
219+inspect $ hasNoTypeClassesExcept 'concatMapRepl [''Applicative]
220+#else
206221inspect $ hasNoTypeClasses 'concatMapRepl
222+#endif
207223inspect $ 'concatMapRepl `hasNoType` ''SPEC
208224#endif
209225
210226-- concatMapWith
211227
228+#ifdef USE_STREAMK
212229{-# INLINE concatMapWithSerial #-}
213230concatMapWithSerial :: Int -> Int -> Int -> IO ()
214−concatMapWithSerial = concatStreamsWith S.serial
231+concatMapWithSerial = concatStreamsWith Common.append
215232
216233#ifdef INSPECTION
217234inspect $ hasNoTypeClasses 'concatMapWithSerial
218235inspect $ 'concatMapWithSerial `hasNoType` ''SPEC
219236#endif
220237
238+{-
221239{-# INLINE concatMapWithAppend #-}
222240concatMapWithAppend :: Int -> Int -> Int -> IO ()
223−concatMapWithAppend = concatStreamsWith Internal.append
241+concatMapWithAppend = concatStreamsWith Common.append2
224242
225243#ifdef INSPECTION
226244inspect $ hasNoTypeClasses 'concatMapWithAppend
227245inspect $ 'concatMapWithAppend `hasNoType` ''SPEC
228246#endif
247+-}
229248
230−-- concatPairWith
249+-- mergeMapWith
231250
232−{-# INLINE concatPairWithSerial #-}
233−concatPairWithSerial :: Int -> Int -> Int -> IO ()
234−concatPairWithSerial = concatPairsWith Internal.serial
251+{-# INLINE mergeMapWithSerial #-}
252+mergeMapWithSerial :: Int -> Int -> Int -> IO ()
253+mergeMapWithSerial = mergeMapWith Common.append
235254
236−{-# INLINE concatPairWithAppend #-}
237−concatPairWithAppend :: Int -> Int -> Int -> IO ()
238−concatPairWithAppend = concatPairsWith Internal.append
255+{-
256+{-# INLINE mergeMapWithAppend #-}
257+mergeMapWithAppend :: Int -> Int -> Int -> IO ()
258+mergeMapWithAppend = mergeMapWith Common.append2
259+-}
260+#endif
239261
240262-- unfoldMany
241263
@@ -244,10 +266,11 @@ concatPairWithAppend = concatPairsWith Internal.append
244266{-# INLINE unfoldManyRepl #-}
245267unfoldManyRepl :: Int -> Int -> Int -> IO ()
246268unfoldManyRepl outer inner n =
247− S.drain
269+ drain
248270 $ S.unfoldMany
249− (UF.lmap return (UF.replicateM inner))
250− (sourceUnfoldrM outer n)
271+ UF.replicateM
272+ (fmap ((inner,) . return) (sourceUnfoldrM outer n))
273+
251274
252275#ifdef INSPECTION
253276inspect $ hasNoTypeClasses 'unfoldManyRepl
@@ -265,10 +288,6 @@ o_1_space_concat value = sqrtVal `seq`
265288 , benchIOSrc1 "concatMapPure (1 of n)"
266289 (concatMapPure 1 value)
267290
268− -- This is for comparison with foldMapWith
269− , benchIOSrc fromSerial "concatMapId (n of 1) (fromFoldable)"
270− (S.concatMap id . sourceConcatMapId value)
271−
272291 , benchIOSrc1 "concatMap (n of 1)"
273292 (concatMap value 1)
274293 , benchIOSrc1 "concatMap (sqrt n of sqrt n)"
@@ -276,16 +295,25 @@ o_1_space_concat value = sqrtVal `seq`
276295 , benchIOSrc1 "concatMap (1 of n)"
277296 (concatMap 1 value)
278297
298+#ifndef USE_STREAMK
299+ -- This is for comparison with foldMapWith
300+ , benchIOSrc "concatMapId (n of 1) (fromFoldable)"
301+ (S.concatMap id . sourceConcatMapId value)
302+
279303 , benchIOSrc1 "concatMapM (n of 1)"
280304 (concatMapM value 1)
281305 , benchIOSrc1 "concatMapM (sqrt n of sqrt n)"
282306 (concatMapM sqrtVal sqrtVal)
283307 , benchIOSrc1 "concatMapM (1 of n)"
284308 (concatMapM 1 value)
309+#endif
285310
311+#ifdef USE_STREAMK
312+ {-
286313 -- This is for comparison with foldMapWith
287− , benchIOSrc fromSerial "concatMapWithId (n of 1) (fromFoldable)"
288− (S.concatMapWith serial id . sourceConcatMapId value)
314+ , benchIOSrc "concatMapWithId (n of 1) (fromFoldable)"
315+ (toStream . S.concatMapWith Common.append id . sourceConcatMapId value)
316+ -}
289317
290318 , benchIOSrc1 "concatMapWith (n of 1)"
291319 (concatMapWithSerial value 1)
@@ -294,36 +322,54 @@ o_1_space_concat value = sqrtVal `seq`
294322 , benchIOSrc1 "concatMapWith (1 of n)"
295323 (concatMapWithSerial 1 value)
296324
325+ {-
297326 -- quadratic with number of outer streams
298327 , benchIOSrc1 "concatMapWithAppend (2 of n/2)"
299328 (concatMapWithAppend 2 (value `div` 2))
329+ -}
330+#endif
300331
301332 -- concatMap vs unfoldMany
302333 , benchIOSrc1 "concatMapRepl (sqrt n of sqrt n)"
303334 (concatMapRepl sqrtVal sqrtVal)
304335 , benchIOSrc1 "unfoldManyRepl (sqrt n of sqrt n)"
305336 (unfoldManyRepl sqrtVal sqrtVal)
337+ ]
338+ ]
339+
340+ where
306341
307− -------------------concatPairsWith-----------------
342+ sqrtVal = round $ sqrt (fromIntegral value :: Double)
343+
344+#ifdef USE_STREAMK
345+o_n_space_merge :: Int -> [Benchmark]
346+o_n_space_merge value = sqrtVal `seq`
347+ [ bgroup "concat"
348+ [
349+ -------------------mergeMapWith-----------------
308350
309351 -- Use large number of streams to check scalability
310− , benchIOSrc1 "concatPairWithSerial (n of 1)"
311− (concatPairWithSerial value 1)
312− , benchIOSrc1 "concatPairWithSerial (sqrtVal of sqrtVal)"
313− (concatPairWithSerial sqrtVal sqrtVal)
314− , benchIOSrc1 "concatPairWithSerial (2 of n/2)"
315− (concatPairWithSerial 2 (value `div` 2))
316−
317− , benchIOSrc1 "concatPairWithAppend (n of 1)"
318− (concatPairWithAppend value 1)
319− , benchIOSrc1 "concatPairWithAppend (sqrtVal of sqrtVal)"
320− (concatPairWithAppend sqrtVal sqrtVal)
352+
353+ benchIOSrc1 "mergeMapWithSerial (n of 1)"
354+ (mergeMapWithSerial value 1)
355+ , benchIOSrc1 "mergeMapWithSerial (sqrtVal of sqrtVal)"
356+ (mergeMapWithSerial sqrtVal sqrtVal)
357+ , benchIOSrc1 "mergeMapWithSerial (2 of n/2)"
358+ (mergeMapWithSerial 2 (value `div` 2))
359+
360+ {-
361+ , benchIOSrc1 "mergeMapWithAppend (n of 1)"
362+ (mergeMapWithAppend value 1)
363+ , benchIOSrc1 "mergeMapWithAppend (sqrtVal of sqrtVal)"
364+ (mergeMapWithAppend sqrtVal sqrtVal)
365+ -}
321366 ]
322367 ]
323368
324369 where
325370
326371 sqrtVal = round $ sqrt (fromIntegral value :: Double)
372+#endif
327373
328374-------------------------------------------------------------------------------
329375-- Applicative
@@ -332,26 +378,28 @@ o_1_space_concat value = sqrtVal `seq`
332378o_1_space_applicative :: Int -> [Benchmark]
333379o_1_space_applicative value =
334380 [ bgroup "Applicative"
335− [ benchIO "(*>) (sqrt n x sqrt n)" $ apDiscardFst value fromSerial
336− , benchIO "(<*) (sqrt n x sqrt n)" $ apDiscardSnd value fromSerial
337− , benchIO "(<*>) (sqrt n x sqrt n)" $ toNullAp value fromSerial
338− , benchIO "liftA2 (sqrt n x sqrt n)" $ apLiftA2 value fromSerial
381+ [ benchIO "(*>) (sqrt n x sqrt n)" $ apDiscardFst value
382+ , benchIO "(<*) (sqrt n x sqrt n)" $ apDiscardSnd value
383+ , benchIO "(<*>) (sqrt n x sqrt n)" $ toNullAp value
384+ , benchIO "liftA2 (sqrt n x sqrt n)" $ apLiftA2 value
339385 ]
340386 ]
341387
388+#ifdef USE_STREAMK
342389o_n_space_applicative :: Int -> [Benchmark]
343390o_n_space_applicative value =
344− [ bgroup "Applicative"
345− [ benchIOSrc fromSerial "(*>) (n times)" $
391+ [ bgroup "iterated"
392+ [ benchIOSrc "(*>) (n times)" $
346393 iterateSingleton ((*>) . pure) value
347− , benchIOSrc fromSerial "(<*) (n times)" $
394+ , benchIOSrc "(<*) (n times)" $
348395 iterateSingleton (\x xs -> xs <* pure x) value
349− , benchIOSrc fromSerial "(<*>) (n times)" $
396+ , benchIOSrc "(<*>) (n times)" $
350397 iterateSingleton (\x xs -> pure (+ x) <*> xs) value
351− , benchIOSrc fromSerial "liftA2 (n times)" $
398+ , benchIOSrc "liftA2 (n times)" $
352399 iterateSingleton (AP.liftA2 (+) . pure) value
353400 ]
354401 ]
402+#endif
355403
356404-------------------------------------------------------------------------------
357405-- Monad
@@ -360,48 +408,122 @@ o_n_space_applicative value =
360408o_1_space_monad :: Int -> [Benchmark]
361409o_1_space_monad value =
362410 [ bgroup "Monad"
363− [ benchIO "(>>) (sqrt n x sqrt n)" $ monadThen value fromSerial
364− , benchIO "(>>=) (sqrt n x sqrt n)" $ toNullM value fromSerial
411+ [ benchIO "(>>) (sqrt n x sqrt n)" $ monadThen value
412+ , benchIO "(>>=) (sqrt n x sqrt n)" $ toNullM value
365413 , benchIO "(>>=) (sqrt n x sqrt n) (filterAllOut)" $
366− filterAllOutM value fromSerial
414+ filterAllOutM value
367415 , benchIO "(>>=) (sqrt n x sqrt n) (filterAllIn)" $
368− filterAllInM value fromSerial
416+ filterAllInM value
369417 , benchIO "(>>=) (sqrt n x sqrt n) (filterSome)" $
370− filterSome value fromSerial
418+ filterSome value
371419 , benchIO "(>>=) (sqrt n x sqrt n) (breakAfterSome)" $
372− breakAfterSome value fromSerial
420+ breakAfterSome value
373421 , benchIO "(>>=) (cubert n x cubert n x cubert n)" $
374− toNullM3 value fromSerial
422+ toNullM3 value
375423 ]
376424 ]
377425
426+#ifdef USE_STREAMK
378427-- This is a good benchmark but inefficient way to compute primes. As we see a
379428-- new prime we keep appending a division filter for all the future numbers.
380429{-# INLINE sieve #-}
381−sieve :: Monad m => SerialT m Int -> SerialT m Int
382−sieve s = do
383− r <- lift $ S.uncons s
430+sieve :: Monad m => StreamK m Int -> StreamK m Int
431+sieve s = StreamK.concatEffect $ do
432+ r <- StreamK.uncons s
384433 case r of
385434 Just (prime, rest) ->
386− prime `S.cons` sieve (S.filter (\n -> n `mod` prime /= 0) rest)
387− Nothing -> S.nil
435+ -- XXX Use K.filter or rewrite to K.filter
436+ let f = S.filter (\n -> n `mod` prime /= 0)
437+ in pure $ prime `StreamK.cons` sieve (fromStream $ f $ toStream rest)
438+ Nothing -> pure StreamK.nil
439+
440+o_n_space_iterated :: Int -> [Benchmark]
441+o_n_space_iterated value =
442+ [ bgroup "iterated"
443+ [
444+ benchIO "concatEffect prime sieve (n/4)"
445+ (\n ->
446+ S.fold Fold.sum
447+ $ toStream
448+ $ sieve
449+ $ fromStream
450+ $ S.enumerateFromTo 2 (value `div` 4 + n))
451+ , benchIOSrc "(>>) (n times)" $
452+ iterateSingleton ((>>) . pure) value
453+ , benchIOSrc "(>>=) (n times)" $
454+ iterateSingleton (\x xs -> xs >>= \y -> return (x + y)) value
455+ ]
456+ ]
457+#endif
388458
389459o_n_space_monad :: Int -> [Benchmark]
390460o_n_space_monad value =
391461 [ bgroup "Monad"
392− [ benchIOSrc fromSerial "(>>) (n times)" $
393− iterateSingleton ((>>) . pure) value
394− , benchIOSrc fromSerial "(>>=) (n times)" $
395− iterateSingleton (\x xs -> xs >>= \y -> return (x + y)) value
396− , benchIO "(>>=) (sqrt n x sqrt n) (toList)" $
397− toListM value fromSerial
462+ [ benchIO "(>>=) (sqrt n x sqrt n) (toList)" $
463+ toListM value
398464 , benchIO "(>>=) (sqrt n x sqrt n) (toListSome)" $
399− toListSome value fromSerial
400− , benchIO "naive prime sieve (n/4)"
401− (\n -> S.sum $ sieve $ S.enumerateFromTo 2 (value `div` 4 + n))
465+ toListSome value
466+ ]
467+ ]
468+
469+-------------------------------------------------------------------------------
470+-- Joining
471+-------------------------------------------------------------------------------
472+
473+{-
474+toKv :: Int -> (Int, Int)
475+toKv p = (p, p)
476+
477+{-# INLINE joinWith #-}
478+joinWith :: Common.MonadAsync m =>
479+ ((Int -> Int -> Bool) -> Stream m Int -> Stream m Int -> Stream m b)
480+ -> Int
481+ -> Int
482+ -> m ()
483+joinWith j val i =
484+ drain $ j (==) (sourceUnfoldrM val i) (sourceUnfoldrM val (val `div` 2))
485+
486+{-# INLINE joinMapWith #-}
487+joinMapWith :: Common.MonadAsync m =>
488+ (Stream m (Int, Int) -> Stream m (Int, Int) -> Stream m b)
489+ -> Int
490+ -> Int
491+ -> m ()
492+joinMapWith j val i =
493+ drain
494+ $ j
495+ (fmap toKv (sourceUnfoldrM val i))
496+ (fmap toKv (sourceUnfoldrM val (val `div` 2)))
497+
498+o_n_heap_buffering :: Int -> [Benchmark]
499+o_n_heap_buffering value =
500+ [ bgroup "buffered"
501+ [
502+ benchIOSrc1 "joinInnerGeneric (sqrtVal)"
503+ $ joinWith S.joinInnerGeneric sqrtVal
504+ , benchIOSrc1 "joinInner"
505+ $ joinMapWith S.joinInner halfVal
506+ , benchIOSrc1 "joinLeftGeneric (sqrtVal)"
507+ $ joinWith S.joinLeftGeneric sqrtVal
508+ , benchIOSrc1 "joinLeft "
509+ $ joinMapWith S.joinLeft halfVal
510+ , benchIOSrc1 "joinOuterGeneric (sqrtVal)"
511+ $ joinWith S.joinOuterGeneric sqrtVal
512+ , benchIOSrc1 "joinOuter"
513+ $ joinMapWith S.joinOuter halfVal
514+ , benchIOSrc1 "filterInStreamGenericBy (sqrtVal)"
515+ $ joinWith S.filterInStreamGenericBy sqrtVal
516+ , benchIOSrc1 "filterInStreamAscBy"
517+ $ joinMapWith (S.filterInStreamAscBy compare) halfVal
402518 ]
403519 ]
404520
521+ where
522+
523+ halfVal = value `div` 2
524+ sqrtVal = round $ sqrt (fromIntegral value :: Double)
525+-}
526+
405527-------------------------------------------------------------------------------
406528-- Main
407529-------------------------------------------------------------------------------
@@ -409,23 +531,33 @@ o_n_space_monad value =
409531-- In addition to gauge options, the number of elements in the stream can be
410532-- passed using the --stream-size option.
411533--
534+{-# ANN benchmarks "HLint: ignore" #-}
412535benchmarks :: String -> Int -> [Benchmark]
413536benchmarks moduleName size =
414537 [ bgroup (o_1_space_prefix moduleName) $ Prelude.concat
415538 [
416539 -- multi-stream
417540 o_1_space_joining size
541+#ifdef USE_PRELUDE
418542 , o_1_space_concatFoldable size
543+#endif
419544 , o_1_space_concat size
420−
421545 , o_1_space_applicative size
422546 , o_1_space_monad size
423−
424547 ]
425548 , bgroup (o_n_space_prefix moduleName) $ Prelude.concat
426549 [
427550 -- multi-stream
428− o_n_space_applicative size
429− , o_n_space_monad size
551+ o_n_space_monad size
552+#ifdef USE_STREAMK
553+ , o_n_space_merge size
554+ , o_n_space_iterated size
555+ , o_n_space_applicative size
556+#endif
430557 ]
558+ {-
559+ , bgroup (o_n_heap_prefix moduleName) $
560+ -- multi-stream
561+ o_n_heap_buffering size
562+ -}
431563 ]
benchmark/Streamly/Benchmark/Data/Stream/Generate.hsnew file+278
@@ -0,0 +1,278 @@
1+-- |
2+-- Module : Stream.Generate
3+-- Copyright : (c) 2018 Composewell Technologies
4+-- License : BSD-3-Clause
5+-- Maintainer : streamly@composewell.com
6+
7+{-# LANGUAGE CPP #-}
8+{-# LANGUAGE FlexibleContexts #-}
9+{-# LANGUAGE FlexibleInstances #-}
10+{-# LANGUAGE ScopedTypeVariables #-}
11+{-# LANGUAGE RankNTypes #-}
12+
13+{-# OPTIONS_GHC -Wno-orphans #-}
14+#ifdef USE_PRELUDE
15+{-# OPTIONS_GHC -Wno-deprecations #-}
16+#endif
17+
18+module Stream.Generate (benchmarks) where
19+
20+import Control.DeepSeq (NFData(..))
21+import Data.Functor.Identity (Identity(..))
22+
23+import qualified GHC.Exts as GHC
24+import qualified Streamly.Internal.Data.Fold as Fold
25+
26+#ifdef USE_PRELUDE
27+import Streamly.Prelude (MonadAsync)
28+import Stream.Common hiding (MonadAsync)
29+import Streamly.Benchmark.Prelude (sourceFromFoldableM, absTimes)
30+import qualified Streamly.Prelude as S
31+import qualified Streamly.Internal.Data.Stream.IsStream as Stream
32+#else
33+import Stream.Common
34+import Streamly.Internal.Data.Stream (Stream)
35+import qualified Streamly.Internal.Data.Stream as Stream
36+#ifdef USE_STREAMK
37+import System.IO.Unsafe (unsafeInterleaveIO)
38+import qualified Streamly.Internal.Data.StreamK as StreamK
39+import qualified Stream.Common as Common
40+#endif
41+#endif
42+
43+import Test.Tasty.Bench
44+import Streamly.Benchmark.Common
45+import qualified Prelude
46+
47+import Prelude hiding (repeat, replicate, iterate)
48+
49+-------------------------------------------------------------------------------
50+-- Generation
51+-------------------------------------------------------------------------------
52+
53+#ifdef USE_PRELUDE
54+type Stream = Stream.SerialT
55+toStreamD = Stream.toStream
56+#else
57+toStreamD :: a -> a
58+toStreamD = id
59+#endif
60+
61+-------------------------------------------------------------------------------
62+-- fromList
63+-------------------------------------------------------------------------------
64+
65+{-# INLINE sourceFromList #-}
66+sourceFromList :: Monad m => Int -> Int -> Stream m Int
67+sourceFromList value n = Stream.fromList [n..n+value]
68+
69+{-# INLINE sourceFromListM #-}
70+sourceFromListM :: MonadAsync m => Int -> Int -> Stream m Int
71+sourceFromListM value n = fromListM (fmap return [n..n+value])
72+
73+{-# INLINE sourceIsList #-}
74+sourceIsList :: Int -> Int -> Stream Identity Int
75+sourceIsList value n = GHC.fromList [n..n+value]
76+
77+{-# INLINE sourceIsString #-}
78+sourceIsString :: Int -> Int -> Stream Identity Char
79+sourceIsString value n = GHC.fromString (Prelude.replicate (n + value) 'a')
80+
81+{-# INLINE readInstance #-}
82+readInstance :: String -> Stream Identity Int
83+readInstance str =
84+ let r = reads str
85+ in case r of
86+ [(x,"")] -> x
87+ _ -> error "readInstance: no parse"
88+
89+-- For comparisons
90+{-# INLINE readInstanceList #-}
91+readInstanceList :: String -> [Int]
92+readInstanceList str =
93+ let r = reads str
94+ in case r of
95+ [(x,"")] -> x
96+ _ -> error "readInstance: no parse"
97+
98+{-# INLINE repeat #-}
99+repeat :: Monad m => Int -> Int -> Stream m Int
100+repeat count = Stream.take count . Stream.repeat
101+
102+{-# INLINE replicate #-}
103+replicate :: Monad m => Int -> Int -> Stream m Int
104+replicate = Stream.replicate
105+
106+-------------------------------------------------------------------------------
107+-- enumerate
108+-------------------------------------------------------------------------------
109+
110+{-# INLINE sourceIntFromTo #-}
111+sourceIntFromTo :: Monad m => Int -> Int -> Stream m Int
112+sourceIntFromTo value n = Stream.enumerateFromTo n (n + value)
113+
114+{-# INLINE sourceIntFromThenTo #-}
115+sourceIntFromThenTo :: Monad m => Int -> Int -> Stream m Int
116+sourceIntFromThenTo value n = Stream.enumerateFromThenTo n (n + 1) (n + value)
117+
118+{-# INLINE sourceFracFromTo #-}
119+sourceFracFromTo :: Monad m => Int -> Int -> Stream m Double
120+sourceFracFromTo value n =
121+ Stream.enumerateFromTo (fromIntegral n) (fromIntegral (n + value))
122+
123+{-# INLINE sourceFracFromThenTo #-}
124+sourceFracFromThenTo :: Monad m => Int -> Int -> Stream m Double
125+sourceFracFromThenTo value n = Stream.enumerateFromThenTo (fromIntegral n)
126+ (fromIntegral n + 1.0001) (fromIntegral (n + value))
127+
128+{-# INLINE sourceIntegerFromStep #-}
129+sourceIntegerFromStep :: Monad m => Int -> Int -> Stream m Integer
130+sourceIntegerFromStep value n =
131+ Stream.take value $ Stream.enumerateFromThen (fromIntegral n) (fromIntegral n + 1)
132+
133+{-# INLINE enumerateFrom #-}
134+enumerateFrom :: Monad m => Int -> Int -> Stream m Int
135+enumerateFrom count = Stream.take count . Stream.enumerateFrom
136+
137+{-# INLINE enumerateFromTo #-}
138+enumerateFromTo :: Monad m => Int -> Int -> Stream m Int
139+enumerateFromTo = sourceIntFromTo
140+
141+{-# INLINE enumerateFromThen #-}
142+enumerateFromThen :: Monad m => Int -> Int -> Stream m Int
143+enumerateFromThen count inp = Stream.take count $ Stream.enumerateFromThen inp (inp + 1)
144+
145+{-# INLINE enumerateFromThenTo #-}
146+enumerateFromThenTo :: Monad m => Int -> Int -> Stream m Int
147+enumerateFromThenTo = sourceIntFromThenTo
148+
149+-- n ~ 1
150+{-# INLINE enumerate #-}
151+enumerate :: Monad m => Int -> Int -> Stream m Int
152+enumerate count n = Stream.take (count + n) Stream.enumerate
153+
154+-- n ~ 1
155+{-# INLINE enumerateTo #-}
156+enumerateTo :: Monad m => Int -> Int -> Stream m Int
157+enumerateTo count n = Stream.enumerateTo (minBound + count + n)
158+
159+{-# INLINE iterate #-}
160+iterate :: Monad m => Int -> Int -> Stream m Int
161+iterate count = Stream.take count . Stream.iterate (+1)
162+
163+{-# INLINE iterateM #-}
164+iterateM :: MonadAsync m => Int -> Int -> Stream m Int
165+iterateM count = Stream.take count . Stream.iterateM (return . (+1)) . return
166+
167+{-# INLINE repeatM #-}
168+repeatM :: MonadAsync m => Int -> Int -> Stream m Int
169+repeatM count = Stream.take count . Stream.repeatM . return
170+
171+{-# INLINE replicateM #-}
172+replicateM :: MonadAsync m => Int -> Int -> Stream m Int
173+replicateM count = Stream.replicateM count . return
174+
175+#ifdef USE_PRELUDE
176+{-# INLINE fromIndices #-}
177+fromIndices :: (Monad m, S.IsStream t) => Int -> Int -> t m Int
178+fromIndices value n = S.take value $ S.fromIndices (+ n)
179+
180+{-# INLINE fromIndicesM #-}
181+fromIndicesM :: (MonadAsync m, S.IsStream t) => Int -> Int -> t m Int
182+fromIndicesM value n = S.take value $ S.fromIndicesM (return <$> (+ n))
183+#endif
184+
185+#ifdef USE_STREAMK
186+{-# INLINE mfixUnfold #-}
187+mfixUnfold :: Int -> Int -> Stream IO (Int, Int)
188+mfixUnfold count start = toStream $ StreamK.mfix f
189+ where
190+ f action = StreamK.unCross $ do
191+ let incr n act = fmap ((+n) . snd) $ unsafeInterleaveIO act
192+ x <- StreamK.mkCross (fromStream $ Common.fromListM [incr 1 action, incr 2 action])
193+ y <- StreamK.mkCross (fromStream $ Common.sourceUnfoldr count start)
194+ return (x, y)
195+#endif
196+
197+o_1_space_generation :: Int -> [Benchmark]
198+o_1_space_generation value =
199+ [ bgroup "generation"
200+ [ benchIOSrc "unfoldr" (sourceUnfoldr value)
201+ , benchIOSrc "unfoldrM" (sourceUnfoldrM value)
202+ , benchIOSrc "repeat" (repeat value)
203+ , benchIOSrc "replicate" (replicate value)
204+ , benchIOSrc "iterate" (iterate value)
205+ , benchIOSrc "iterateM" (iterateM value)
206+ , benchIOSrc "intFromTo" (sourceIntFromTo value)
207+ , benchIOSrc "intFromThenTo" (sourceIntFromThenTo value)
208+ , benchIOSrc "integerFromStep" (sourceIntegerFromStep value)
209+ , benchIOSrc "fracFromThenTo" (sourceFracFromThenTo value)
210+ , benchIOSrc "fracFromTo" (sourceFracFromTo value)
211+ , benchIOSrc "fromList" (sourceFromList value)
212+ , benchIOSrc "fromListM" (sourceFromListM value)
213+ , benchPureSrc "IsList.fromList" (toStreamD . sourceIsList value)
214+ , benchPureSrc "IsString.fromString" (toStreamD . sourceIsString value)
215+ , benchIOSrc "enumerateFrom" (enumerateFrom value)
216+ , benchIOSrc "enumerateFromTo" (enumerateFromTo value)
217+ , benchIOSrc "enumerateFromThen" (enumerateFromThen value)
218+ , benchIOSrc "enumerateFromThenTo" (enumerateFromThenTo value)
219+ , benchIOSrc "enumerate" (enumerate value)
220+ , benchIOSrc "enumerateTo" (enumerateTo value)
221+ , benchIOSrc "repeatM" (repeatM value)
222+ , benchIOSrc "replicateM" (replicateM value)
223+#ifdef USE_PRELUDE
224+ , benchIOSrc "fromIndices" (fromIndices value)
225+ , benchIOSrc "fromIndicesM" (fromIndicesM value)
226+#endif
227+
228+ -- These essentially test cons and consM
229+#ifdef USE_STREAMK
230+ , benchIOSrc "fromFoldable" (sourceFromFoldable value)
231+ -- , benchIOSrc "fromFoldable 16" (sourceFromFoldable 16)
232+#else
233+ -- , benchIOSrc "fromFoldable 16" (sourceFromFoldable 16)
234+#endif
235+
236+#ifdef USE_PRELUDE
237+ , benchIOSrc "fromFoldableM" (sourceFromFoldableM value)
238+ , benchIOSrc "absTimes" $ absTimes value
239+#endif
240+#ifdef USE_STREAMK
241+ , Common.benchIOSrc "mfix_10" (mfixUnfold 10)
242+ , Common.benchIOSrc "mfix_100" (mfixUnfold 100)
243+ , Common.benchIOSrc "mfix_1000" (mfixUnfold 1000)
244+#endif
245+ ]
246+ ]
247+
248+#ifndef USE_PRELUDE
249+instance NFData a => NFData (Stream Identity a) where
250+ {-# INLINE rnf #-}
251+ rnf xs = runIdentity $ Stream.fold (Fold.foldl' (\_ x -> rnf x) ()) xs
252+#endif
253+
254+o_n_heap_generation :: Int -> [Benchmark]
255+o_n_heap_generation value =
256+ [ bgroup "buffered"
257+ -- Buffers the output of show/read.
258+ -- XXX can the outputs be streaming? Can we have special read/show
259+ -- style type classes, readM/showM supporting streaming effects?
260+ [ bench "readsPrec pure streams" $
261+ nf readInstance (mkString value)
262+ , bench "readsPrec Haskell lists" $
263+ nf readInstanceList (mkListString value)
264+ ]
265+ ]
266+
267+-------------------------------------------------------------------------------
268+-- Main
269+-------------------------------------------------------------------------------
270+
271+-- In addition to gauge options, the number of elements in the stream can be
272+-- passed using the --stream-size option.
273+--
274+benchmarks :: String -> Int -> [Benchmark]
275+benchmarks moduleName size =
276+ [ bgroup (o_1_space_prefix moduleName) (o_1_space_generation size)
277+ , bgroup (o_n_heap_prefix moduleName) (o_n_heap_generation size)
278+ ]
benchmark/Streamly/Benchmark/Data/Stream/Lift.hsnew file+146
@@ -0,0 +1,146 @@
1+-- |
2+-- Module : Stream.Lift
3+-- Copyright : (c) 2018 Composewell Technologies
4+-- License : BSD-3-Clause
5+-- Maintainer : streamly@composewell.com
6+
7+{-# LANGUAGE CPP #-}
8+{-# LANGUAGE FlexibleContexts #-}
9+{-# LANGUAGE ScopedTypeVariables #-}
10+{-# LANGUAGE RankNTypes #-}
11+
12+#ifdef USE_PRELUDE
13+{-# OPTIONS_GHC -Wno-deprecations #-}
14+#endif
15+
16+module Stream.Lift (benchmarks) where
17+
18+import Control.DeepSeq (NFData(..))
19+import Control.Monad.State.Strict (StateT, get, put)
20+import Data.Functor.Identity (Identity)
21+import Stream.Common (sourceUnfoldr, sourceUnfoldrM, benchIOSrc)
22+import System.Random (randomRIO)
23+
24+import qualified Stream.Common as Common
25+import qualified Streamly.Internal.Data.Fold as Fold
26+
27+#ifdef USE_PRELUDE
28+import qualified Streamly.Internal.Data.Stream.IsStream as Stream
29+#else
30+import Streamly.Internal.Data.Stream (Stream)
31+import qualified Streamly.Internal.Data.Stream as Stream
32+#ifdef USE_STREAMK
33+import Stream.Common (benchIO, drain)
34+import Streamly.Internal.Data.StreamK (StreamK)
35+import qualified Streamly.Internal.Data.StreamK as StreamK
36+import qualified Control.Monad.State.Strict as State
37+#endif
38+#endif
39+
40+import Test.Tasty.Bench
41+import Streamly.Benchmark.Common
42+import Prelude hiding (reverse, tail)
43+
44+#ifdef USE_PRELUDE
45+type Stream = Stream.SerialT
46+#endif
47+
48+-------------------------------------------------------------------------------
49+-- Monad transformation (hoisting etc.)
50+-------------------------------------------------------------------------------
51+
52+{-# INLINE sourceUnfoldrState #-}
53+sourceUnfoldrState :: Common.MonadAsync m =>
54+ Int -> Int -> Stream (StateT Int m) Int
55+sourceUnfoldrState value n = Stream.unfoldrM step n
56+ where
57+ step cnt =
58+ if cnt > n + value
59+ then return Nothing
60+ else do
61+ s <- get
62+ put (s + 1)
63+ return (Just (s, cnt + 1))
64+
65+{-# INLINE evalStateT #-}
66+evalStateT :: Common.MonadAsync m => Int -> Int -> Stream m Int
67+evalStateT value n =
68+ Stream.evalStateT (return 0) (sourceUnfoldrState value n)
69+
70+{-# INLINE withState #-}
71+withState :: Common.MonadAsync m => Int -> Int -> Stream m Int
72+withState value n =
73+ Stream.evalStateT
74+ (return (0 :: Int)) (Stream.liftInner (sourceUnfoldrM value n))
75+
76+{-# INLINE benchHoistSink #-}
77+benchHoistSink
78+ :: (NFData b)
79+ => Int -> String -> (Stream Identity Int -> IO b) -> Benchmark
80+benchHoistSink value name f =
81+ bench name $ nfIO $ randomRIO (1,1) >>= f . sourceUnfoldr value
82+
83+o_1_space_hoisting :: Int -> [Benchmark]
84+o_1_space_hoisting value =
85+ [ bgroup "hoisting"
86+ [ benchIOSrc "evalState" (evalStateT value)
87+ , benchIOSrc "withState" (withState value)
88+#ifndef USE_PRELUDE
89+ , benchHoistSink value "generalizeInner"
90+ ((\xs -> Stream.fold Fold.length xs :: IO Int)
91+ . Stream.generalizeInner)
92+#endif
93+ ]
94+ ]
95+
96+#ifdef USE_STREAMK
97+{-# INLINE iterateStateIO #-}
98+iterateStateIO ::
99+ Monad m
100+ => Int
101+ -> StateT Int m Int
102+iterateStateIO n = do
103+ x <- get
104+ if x > n
105+ then do
106+ put (x - 1)
107+ iterateStateIO n
108+ else return x
109+
110+-- XXX This is basically testing the perf of concatEffect, change it to just
111+-- use concatEffect and move it along with other concatMap benchmarks.
112+{-# INLINE iterateStateT #-}
113+iterateStateT :: Int -> StreamK (StateT Int IO) Int
114+iterateStateT n = StreamK.concatEffect $ do
115+ x <- get
116+ if x > n
117+ then do
118+ put (x - 1)
119+ return $ iterateStateT n
120+ else return $ StreamK.fromPure x
121+
122+o_n_heap_transformer :: Int -> [Benchmark]
123+o_n_heap_transformer value =
124+ [ bgroup "transformer"
125+ [ benchIO "StateT Int IO (n times) (baseline)" $ \n ->
126+ State.evalStateT (iterateStateIO n) value
127+ , benchIO "Stream (StateT Int IO) (n times)" $ \n ->
128+ State.evalStateT (drain $ Common.toStream (iterateStateT n)) value
129+ ]
130+ ]
131+#endif
132+
133+-------------------------------------------------------------------------------
134+-- Main
135+-------------------------------------------------------------------------------
136+
137+-- In addition to gauge options, the number of elements in the stream can be
138+-- passed using the --stream-size option.
139+--
140+benchmarks :: String -> Int -> [Benchmark]
141+benchmarks moduleName size =
142+ [ bgroup (o_1_space_prefix moduleName) (o_1_space_hoisting size)
143+#ifdef USE_STREAMK
144+ , bgroup (o_n_heap_prefix moduleName) (o_n_heap_transformer size)
145+#endif
146+ ]
benchmark/Streamly/Benchmark/Data/Stream/Reduce.hsnew file+588
@@ -0,0 +1,588 @@
1+-- |
2+-- Module : Stream.Reduce
3+-- Copyright : (c) 2018 Composewell Technologies
4+-- License : BSD-3-Clause
5+-- Maintainer : streamly@composewell.com
6+
7+{-# LANGUAGE CPP #-}
8+{-# LANGUAGE FlexibleContexts #-}
9+{-# LANGUAGE ScopedTypeVariables #-}
10+{-# LANGUAGE DeriveAnyClass #-}
11+{-# LANGUAGE DeriveGeneric #-}
12+{-# LANGUAGE RankNTypes #-}
13+
14+#ifdef USE_PRELUDE
15+{-# OPTIONS_GHC -Wno-deprecations #-}
16+#endif
17+
18+module Stream.Reduce (benchmarks) where
19+
20+import Control.DeepSeq (NFData(..))
21+import Control.Monad.IO.Class (MonadIO(..))
22+import Data.Monoid (Sum(..))
23+import GHC.Generics (Generic)
24+
25+import qualified Streamly.Internal.Data.Refold.Type as Refold
26+import qualified Streamly.Internal.Data.Fold as FL
27+import qualified Stream.Common as Common
28+
29+#ifndef USE_STREAMLY_CORE
30+import Data.HashMap.Strict (HashMap)
31+import Data.Proxy (Proxy(..))
32+import Streamly.Internal.Data.IsMap.HashMap ()
33+#endif
34+
35+#ifdef USE_PRELUDE
36+import Control.Monad (when)
37+import qualified Streamly.Internal.Data.Stream.IsStream as S
38+import qualified Streamly.Prelude as S
39+import Streamly.Prelude (fromSerial)
40+import Streamly.Benchmark.Prelude hiding
41+ ( benchIO, benchIOSrc, sourceUnfoldrM, apDiscardFst, apDiscardSnd, apLiftA2
42+ , toNullAp, monadThen, toNullM, toNullM3, filterAllInM, filterAllOutM
43+ , filterSome, breakAfterSome, toListM, toListSome, transformMapM
44+ , transformComposeMapM, transformTeeMapM, transformZipMapM)
45+#else
46+
47+import Streamly.Internal.Data.Stream (Stream)
48+import qualified Streamly.Internal.Data.Stream as S
49+#ifndef USE_STREAMLY_CORE
50+import qualified Streamly.Data.Stream.Prelude as S
51+import qualified Streamly.Internal.Data.Stream.Prelude as S
52+#endif
53+
54+#ifdef USE_STREAMK
55+import Streamly.Internal.Data.StreamK (StreamK)
56+import qualified Streamly.Internal.Data.Parser as PR
57+import qualified Streamly.Internal.Data.StreamK as K
58+#else
59+import qualified Streamly.Internal.Data.Stream as K
60+#endif
61+
62+#endif
63+
64+import Test.Tasty.Bench
65+import Streamly.Benchmark.Common
66+import Stream.Common
67+import Prelude hiding (reverse, tail)
68+
69+#ifdef USE_PRELUDE
70+type Stream = S.SerialT
71+#endif
72+
73+-- Apply transformation g count times on a stream of length len
74+#ifdef USE_STREAMK
75+{-# INLINE iterateSource #-}
76+iterateSource ::
77+ MonadAsync m
78+ => (StreamK m Int -> StreamK m Int)
79+ -> Int
80+ -> Int
81+ -> Int
82+ -> StreamK m Int
83+iterateSource g count len n = f count (fromStream $ sourceUnfoldrM len n)
84+
85+ where
86+
87+ f (0 :: Int) stream = stream
88+ f i stream = f (i - 1) (g stream)
89+#else
90+{-# INLINE iterateSource #-}
91+iterateSource ::
92+ MonadAsync m
93+ => (Stream m Int -> Stream m Int)
94+ -> Int
95+ -> Int
96+ -> Int
97+ -> Stream m Int
98+iterateSource g count len n = f count (sourceUnfoldrM len n)
99+
100+ where
101+
102+ f (0 :: Int) stream = stream
103+ f i stream = f (i - 1) (g stream)
104+#endif
105+
106+-------------------------------------------------------------------------------
107+-- Grouping transformations
108+-------------------------------------------------------------------------------
109+
110+{-# INLINE groups #-}
111+groups :: MonadIO m => Stream m Int -> m ()
112+groups =
113+#ifdef USE_PRELUDE
114+ Common.drain . S.groups FL.drain
115+#else
116+ Common.drain . S.groupsWhile (==) FL.drain
117+#endif
118+
119+{-# INLINE groupsWhileLT #-}
120+groupsWhileLT :: MonadIO m => Stream m Int -> m ()
121+groupsWhileLT =
122+#ifdef USE_PRELUDE
123+ Common.drain . S.groupsBy (>) FL.drain
124+#else
125+ Common.drain . S.groupsWhile (<) FL.drain
126+#endif
127+
128+{-# INLINE groupsWhileEq #-}
129+groupsWhileEq :: MonadIO m => Stream m Int -> m ()
130+groupsWhileEq =
131+#ifdef USE_PRELUDE
132+ Common.drain . S.groupsBy (==) FL.drain
133+#else
134+ Common.drain . S.groupsWhile (==) FL.drain
135+#endif
136+
137+
138+{-# INLINE groupsByRollingLT #-}
139+groupsByRollingLT :: MonadIO m => Stream m Int -> m ()
140+groupsByRollingLT =
141+#ifdef USE_PRELUDE
142+ Common.drain . S.groupsByRolling (<) FL.drain
143+#else
144+ Common.drain . S.groupsRollingBy (<) FL.drain
145+#endif
146+
147+{-# INLINE groupsByRollingEq #-}
148+groupsByRollingEq :: MonadIO m => Stream m Int -> m ()
149+groupsByRollingEq =
150+#ifdef USE_PRELUDE
151+ Common.drain . S.groupsByRolling (==) FL.drain
152+#else
153+ Common.drain . S.groupsRollingBy (==) FL.drain
154+#endif
155+
156+{-# INLINE foldMany #-}
157+foldMany :: Monad m => Stream m Int -> m ()
158+foldMany =
159+ Common.drain
160+ . fmap getSum
161+ . S.foldMany (FL.take 2 FL.mconcat)
162+ . fmap Sum
163+
164+{-# INLINE foldManyPost #-}
165+foldManyPost :: Monad m => Stream m Int -> m ()
166+foldManyPost =
167+ Common.drain
168+ . fmap getSum
169+ . S.foldManyPost (FL.take 2 FL.mconcat)
170+ . fmap Sum
171+
172+{-# INLINE refoldMany #-}
173+refoldMany :: Monad m => Stream m Int -> m ()
174+refoldMany =
175+ Common.drain
176+ . fmap getSum
177+ . S.refoldMany (Refold.take 2 Refold.sconcat) (return mempty)
178+ . fmap Sum
179+
180+{-# INLINE foldIterateM #-}
181+foldIterateM :: Monad m => Stream m Int -> m ()
182+foldIterateM =
183+ Common.drain
184+ . fmap getSum
185+ . S.foldIterateM
186+ (return . FL.take 2 . FL.sconcat) (return (Sum 0))
187+ . fmap Sum
188+
189+{-# INLINE refoldIterateM #-}
190+refoldIterateM :: Monad m => Stream m Int -> m ()
191+refoldIterateM =
192+ Common.drain
193+ . fmap getSum
194+ . S.refoldIterateM
195+ (Refold.take 2 Refold.sconcat) (return (Sum 0))
196+ . fmap Sum
197+
198+#ifdef USE_STREAMK
199+{-# INLINE parseBreak #-}
200+parseBreak :: Monad m => StreamK m Int -> m ()
201+parseBreak s = do
202+ r <- K.parseDBreak PR.one s
203+ case r of
204+ (Left _, _) -> return ()
205+ (Right _, s1) -> parseBreak s1
206+#endif
207+
208+o_1_space_grouping :: Int -> [Benchmark]
209+o_1_space_grouping value =
210+ -- Buffering operations using heap proportional to group/window sizes.
211+ [ bgroup "grouping"
212+ [
213+ benchIOSink value "groups" groups
214+ , benchIOSink value "groupsWhileLT" groupsWhileLT
215+ , benchIOSink value "groupsWhileEq" groupsWhileEq
216+ , benchIOSink value "groupsByRollingLT" groupsByRollingLT
217+ , benchIOSink value "groupsByRollingEq" groupsByRollingEq
218+ ,
219+
220+ -- XXX parseMany/parseIterate benchmarks are in the Parser/ParserD
221+ -- modules we can bring those here. chunksOf benchmarks are in
222+ -- Parser/ParserD/Array.Stream/FileSystem.Handle.
223+ benchIOSink value "foldMany" foldMany
224+ , benchIOSink value "foldManyPost" foldManyPost
225+ , benchIOSink value "refoldMany" refoldMany
226+ , benchIOSink value "foldIterateM" foldIterateM
227+ , benchIOSink value "refoldIterateM" refoldIterateM
228+#ifdef USE_STREAMK
229+ , benchIOSink value "parseBreak (recursive)" (parseBreak . fromStream)
230+#endif
231+
232+#ifndef USE_STREAMLY_CORE
233+ , benchIOSink value "classifySessionsOf (10000 buckets)"
234+ (classifySessionsOf (getKey 10000))
235+ , benchIOSink value "classifySessionsOf (64 buckets)"
236+ (classifySessionsOf (getKey 64))
237+ , benchIOSink value "classifySessionsOfHash (10000 buckets)"
238+ (classifySessionsOfHash (getKey 10000))
239+ , benchIOSink value "classifySessionsOfHash (64 buckets)"
240+ (classifySessionsOfHash (getKey 64))
241+#endif
242+ ]
243+ ]
244+
245+#ifndef USE_STREAMLY_CORE
246+ where
247+
248+ getKey :: Int -> Int -> Int
249+ getKey n = (`mod` n)
250+#endif
251+
252+-------------------------------------------------------------------------------
253+-- Size conserving transformations (reordering, buffering, etc.)
254+-------------------------------------------------------------------------------
255+
256+#ifndef USE_PRELUDE
257+{-# INLINE reverse #-}
258+reverse :: MonadIO m => Int -> Stream m Int -> m ()
259+reverse n = composeN n (toStream . K.reverse . fromStream)
260+
261+{-# INLINE reverse' #-}
262+reverse' :: MonadIO m => Int -> Stream m Int -> m ()
263+reverse' n = composeN n S.reverseUnbox
264+#endif
265+
266+o_n_heap_buffering :: Int -> [Benchmark]
267+o_n_heap_buffering value =
268+ [ bgroup "buffered"
269+ [
270+#ifndef USE_PRELUDE
271+ -- Reversing a stream
272+ benchIOSink value "reverse" (reverse 1)
273+ , benchIOSink value "reverse'" (reverse' 1)
274+#else
275+ benchIOSink value "mkAsync" (mkAsync fromSerial)
276+#endif
277+ ]
278+ ]
279+
280+-------------------------------------------------------------------------------
281+-- Grouping/Splitting
282+-------------------------------------------------------------------------------
283+
284+#ifndef USE_STREAMLY_CORE
285+{-# INLINE classifySessionsOf #-}
286+classifySessionsOf :: S.MonadAsync m => (Int -> Int) -> Stream m Int -> m ()
287+classifySessionsOf getKey =
288+ Common.drain
289+ . S.classifySessionsOf
290+ (const (return False)) 3 (FL.take 10 FL.sum)
291+ . S.timestamped
292+ . fmap (\x -> (getKey x, x))
293+
294+{-# INLINE classifySessionsOfHash #-}
295+classifySessionsOfHash :: S.MonadAsync m =>
296+ (Int -> Int) -> Stream m Int -> m ()
297+classifySessionsOfHash getKey =
298+ Common.drain
299+ . S.classifySessionsByGeneric
300+ (Proxy :: Proxy (HashMap k))
301+ 1 False (const (return False)) 3 (FL.take 10 FL.sum)
302+ . S.timestamped
303+ . fmap (\x -> (getKey x, x))
304+#endif
305+
306+-------------------------------------------------------------------------------
307+-- Mixed Transformation
308+-------------------------------------------------------------------------------
309+
310+{-# INLINE scanMap #-}
311+scanMap :: MonadIO m => Int -> Stream m Int -> m ()
312+scanMap n = composeN n $ fmap (subtract 1) . Common.scanl' (+) 0
313+
314+{-# INLINE dropMap #-}
315+dropMap :: MonadIO m => Int -> Stream m Int -> m ()
316+dropMap n = composeN n $ fmap (subtract 1) . S.drop 1
317+
318+{-# INLINE dropScan #-}
319+dropScan :: MonadIO m => Int -> Stream m Int -> m ()
320+dropScan n = composeN n $ Common.scanl' (+) 0 . S.drop 1
321+
322+{-# INLINE takeDrop #-}
323+takeDrop :: MonadIO m => Int -> Int -> Stream m Int -> m ()
324+takeDrop value n = composeN n $ S.drop 1 . S.take (value + 1)
325+
326+{-# INLINE takeScan #-}
327+takeScan :: MonadIO m => Int -> Int -> Stream m Int -> m ()
328+takeScan value n = composeN n $ Common.scanl' (+) 0 . S.take (value + 1)
329+
330+{-# INLINE takeMap #-}
331+takeMap :: MonadIO m => Int -> Int -> Stream m Int -> m ()
332+takeMap value n = composeN n $ fmap (subtract 1) . S.take (value + 1)
333+
334+{-# INLINE filterDrop #-}
335+filterDrop :: MonadIO m => Int -> Int -> Stream m Int -> m ()
336+filterDrop value n = composeN n $ S.drop 1 . S.filter (<= (value + 1))
337+
338+{-# INLINE filterTake #-}
339+filterTake :: MonadIO m => Int -> Int -> Stream m Int -> m ()
340+filterTake value n = composeN n $ S.take (value + 1) . S.filter (<= (value + 1))
341+
342+{-# INLINE filterScan #-}
343+filterScan :: MonadIO m => Int -> Stream m Int -> m ()
344+filterScan n = composeN n $ Common.scanl' (+) 0 . S.filter (<= maxBound)
345+
346+#ifdef USE_PRELUDE
347+{-# INLINE filterScanl1 #-}
348+filterScanl1 :: MonadIO m => Int -> Stream m Int -> m ()
349+filterScanl1 n = composeN n $ S.scanl1' (+) . S.filter (<= maxBound)
350+#endif
351+
352+{-# INLINE filterMap #-}
353+filterMap :: MonadIO m => Int -> Int -> Stream m Int -> m ()
354+filterMap value n = composeN n $ fmap (subtract 1) . S.filter (<= (value + 1))
355+
356+-------------------------------------------------------------------------------
357+-- Scan and fold
358+-------------------------------------------------------------------------------
359+
360+data Pair a b =
361+ Pair !a !b
362+ deriving (Generic, NFData)
363+
364+{-# INLINE sumProductFold #-}
365+sumProductFold :: Monad m => Stream m Int -> m (Pair Int Int)
366+sumProductFold =
367+ Common.foldl' (\(Pair s p) x -> Pair (s + x) (p * x)) (Pair 0 1)
368+
369+{-# INLINE sumProductScan #-}
370+sumProductScan :: Monad m => Stream m Int -> m (Pair Int Int)
371+sumProductScan =
372+ Common.foldl' (\(Pair _ p) (s0, x) -> Pair s0 (p * x)) (Pair 0 1) .
373+ Common.scanl' (\(s, _) x -> (s + x, x)) (0, 0)
374+
375+{-# INLINE foldl'ReduceMap #-}
376+foldl'ReduceMap :: Monad m => Stream m Int -> m Int
377+foldl'ReduceMap = fmap (+ 1) . Common.foldl' (+) 0
378+
379+o_1_space_transformations_mixed :: Int -> [Benchmark]
380+o_1_space_transformations_mixed value =
381+ -- scanl-map and foldl-map are equivalent to the scan and fold in the foldl
382+ -- library. If scan/fold followed by a map is efficient enough we may not
383+ -- need monolithic implementations of these.
384+ [ bgroup "mixed"
385+ [ benchIOSink value "scanl-map" (scanMap 1)
386+ , benchIOSink value "foldl-map" foldl'ReduceMap
387+ , benchIOSink value "sum-product-fold" sumProductFold
388+ , benchIOSink value "sum-product-scan" sumProductScan
389+ ]
390+ ]
391+
392+o_1_space_transformations_mixedX4 :: Int -> [Benchmark]
393+o_1_space_transformations_mixedX4 value =
394+ [ bgroup "mixedX4"
395+ [ benchIOSink value "scan-map" (scanMap 4)
396+ , benchIOSink value "drop-map" (dropMap 4)
397+ , benchIOSink value "drop-scan" (dropScan 4)
398+ , benchIOSink value "take-drop" (takeDrop value 4)
399+ , benchIOSink value "take-scan" (takeScan value 4)
400+ , benchIOSink value "take-map" (takeMap value 4)
401+ , benchIOSink value "filter-drop" (filterDrop value 4)
402+ , benchIOSink value "filter-take" (filterTake value 4)
403+ , benchIOSink value "filter-scan" (filterScan 4)
404+#ifdef USE_PRELUDE
405+ , benchIOSink value "filter-scanl1" (filterScanl1 4)
406+#endif
407+ , benchIOSink value "filter-map" (filterMap value 4)
408+ ]
409+ ]
410+
411+-------------------------------------------------------------------------------
412+-- Iterating a transformation over and over again
413+-------------------------------------------------------------------------------
414+
415+#ifdef USE_STREAMK
416+{-
417+-- this is quadratic
418+{-# INLINE iterateScan #-}
419+iterateScan :: MonadAsync m => Int -> Int -> Int -> Stream m Int
420+iterateScan count len = toStream . iterateSource (K.scanl' (+) 0) count len
421+-}
422+
423+{-# INLINE iterateMapM #-}
424+iterateMapM :: MonadAsync m => Int -> Int -> Int -> Stream m Int
425+iterateMapM count len = toStream . iterateSource (K.mapM return) count len
426+
427+{-# INLINE iterateFilterEven #-}
428+iterateFilterEven :: MonadAsync m => Int -> Int -> Int -> Stream m Int
429+iterateFilterEven count len =
430+ toStream . iterateSource (K.filter even) count len
431+
432+{-# INLINE iterateTakeAll #-}
433+iterateTakeAll :: MonadAsync m => Int -> Int -> Int -> Int -> Stream m Int
434+iterateTakeAll value count len =
435+ toStream . iterateSource (K.take (value + 1)) count len
436+
437+{-# INLINE iterateDropOne #-}
438+iterateDropOne :: MonadAsync m => Int -> Int -> Int -> Stream m Int
439+iterateDropOne count len = toStream . iterateSource (K.drop 1) count len
440+
441+{-# INLINE iterateDropWhileTrue #-}
442+iterateDropWhileTrue :: MonadAsync m
443+ => Int -> Int -> Int -> Int -> Stream m Int
444+iterateDropWhileTrue value count len =
445+ toStream . iterateSource (K.dropWhile (<= (value + 1))) count len
446+
447+{-# INLINE iterateDropWhileFalse #-}
448+iterateDropWhileFalse :: MonadAsync m
449+ => Int -> Int -> Int -> Int -> Stream m Int
450+iterateDropWhileFalse value count len =
451+ toStream . iterateSource (K.dropWhile (> (value + 1))) count len
452+
453+#else
454+
455+-- this is quadratic
456+{-# INLINE iterateScan #-}
457+iterateScan :: MonadAsync m => Int -> Int -> Int -> Stream m Int
458+iterateScan = iterateSource (Common.scanl' (+) 0)
459+
460+#ifdef USE_PRELUDE
461+-- this is quadratic
462+{-# INLINE iterateScanl1 #-}
463+iterateScanl1 :: MonadAsync m => Int -> Int -> Int -> Stream m Int
464+iterateScanl1 = iterateSource (S.scanl1' (+))
465+#endif
466+
467+{-# INLINE iterateMapM #-}
468+iterateMapM :: MonadAsync m => Int -> Int -> Int -> Stream m Int
469+iterateMapM = iterateSource (S.mapM return)
470+
471+{-# INLINE iterateFilterEven #-}
472+iterateFilterEven :: MonadAsync m => Int -> Int -> Int -> Stream m Int
473+iterateFilterEven = iterateSource (S.filter even)
474+
475+{-# INLINE iterateTakeAll #-}
476+iterateTakeAll :: MonadAsync m => Int -> Int -> Int -> Int -> Stream m Int
477+iterateTakeAll value = iterateSource (S.take (value + 1))
478+
479+{-# INLINE iterateDropOne #-}
480+iterateDropOne :: MonadAsync m => Int -> Int -> Int -> Stream m Int
481+iterateDropOne = iterateSource (S.drop 1)
482+
483+{-# INLINE iterateDropWhileTrue #-}
484+iterateDropWhileTrue :: MonadAsync m
485+ => Int -> Int -> Int -> Int -> Stream m Int
486+iterateDropWhileTrue value = iterateSource (S.dropWhile (<= (value + 1)))
487+#endif
488+
489+#ifdef USE_PRELUDE
490+{-# INLINE tail #-}
491+tail :: Monad m => Stream m a -> m ()
492+tail s = S.tail s >>= mapM_ tail
493+
494+{-# INLINE nullHeadTail #-}
495+nullHeadTail :: Monad m => Stream m Int -> m ()
496+nullHeadTail s = do
497+ r <- S.null s
498+ when (not r) $ do
499+ _ <- S.head s
500+ S.tail s >>= mapM_ nullHeadTail
501+#endif
502+
503+-- Head recursive operations.
504+o_n_stack_iterated :: Int -> [Benchmark]
505+o_n_stack_iterated value = by10 `seq` by100 `seq`
506+ [ bgroup "iterated"
507+ [ benchIOSrc "mapM (n/10 x 10)" $ iterateMapM by10 10
508+#ifndef USE_STREAMK
509+ , benchIOSrc "scanl' (quadratic) (n/100 x 100)" $
510+ iterateScan by100 100
511+#endif
512+#ifdef USE_PRELUDE
513+ , benchIOSrc "scanl1' (n/10 x 10)" $ iterateScanl1 by10 10
514+#endif
515+ , benchIOSrc "filterEven (n/10 x 10)" $
516+ iterateFilterEven by10 10
517+ , benchIOSrc "takeAll (n/10 x 10)" $
518+ iterateTakeAll value by10 10
519+ , benchIOSrc "dropOne (n/10 x 10)" $ iterateDropOne by10 10
520+#ifdef USE_STREAMK
521+ , benchIOSrc "dropWhileFalse (n/10 x 10)" $
522+ iterateDropWhileFalse value by10 10
523+#endif
524+ , benchIOSrc "dropWhileTrue (n/10 x 10)" $
525+ iterateDropWhileTrue value by10 10
526+#ifdef USE_PRELUDE
527+ , benchIOSink value "tail" tail
528+ , benchIOSink value "nullHeadTail" nullHeadTail
529+#endif
530+ ]
531+ ]
532+
533+ where
534+
535+ by10 = value `div` 10
536+ by100 = value `div` 100
537+
538+-------------------------------------------------------------------------------
539+-- Pipes
540+-------------------------------------------------------------------------------
541+
542+o_1_space_pipes :: Int -> [Benchmark]
543+o_1_space_pipes value =
544+ [ bgroup "pipes"
545+ [ benchIOSink value "mapM" (transformMapM 1)
546+ , benchIOSink value "compose" (transformComposeMapM 1)
547+ , benchIOSink value "tee" (transformTeeMapM 1)
548+#ifdef DEVBUILD
549+ -- XXX this take 1 GB memory to compile
550+ , benchIOSink value "zip" (transformZipMapM 1)
551+#endif
552+ ]
553+ ]
554+
555+o_1_space_pipesX4 :: Int -> [Benchmark]
556+o_1_space_pipesX4 value =
557+ [ bgroup "pipesX4"
558+ [ benchIOSink value "mapM" (transformMapM 4)
559+ , benchIOSink value "compose" (transformComposeMapM 4)
560+ , benchIOSink value "tee" (transformTeeMapM 4)
561+#ifdef DEVBUILD
562+ -- XXX this take 1 GB memory to compile
563+ , benchIOSink value "zip" (transformZipMapM 4)
564+#endif
565+ ]
566+ ]
567+
568+-------------------------------------------------------------------------------
569+-- Main
570+-------------------------------------------------------------------------------
571+
572+-- In addition to gauge options, the number of elements in the stream can be
573+-- passed using the --stream-size option.
574+--
575+benchmarks :: String -> Int -> [Benchmark]
576+benchmarks moduleName size =
577+ [ bgroup (o_1_space_prefix moduleName) $ Prelude.concat
578+ [ o_1_space_grouping size
579+ , o_1_space_transformations_mixed size
580+ , o_1_space_transformations_mixedX4 size
581+
582+ -- pipes
583+ , o_1_space_pipes size
584+ , o_1_space_pipesX4 size
585+ ]
586+ , bgroup (o_n_stack_prefix moduleName) (o_n_stack_iterated size)
587+ , bgroup (o_n_heap_prefix moduleName) (o_n_heap_buffering size)
588+ ]
benchmark/Streamly/Benchmark/Prelude/Serial/Split.hs → benchmark/Streamly/Benchmark/Data/Stream/Split.hsrenamed+25−12
@@ -1,5 +1,7 @@
1+{-# OPTIONS_GHC -Wno-deprecations #-}
2+
13-- |
2−-- Module : Streamly.Benchmark.Prelude.Serial.Split
4+-- Module : Stream.Split
35-- Copyright : (c) 2019 Composewell Technologies
46-- License : BSD-3-Clause
57-- Maintainer : streamly@composewell.com
@@ -18,14 +20,14 @@
1820{-# OPTIONS_GHC -fplugin Test.Inspection.Plugin #-}
1921#endif
2022
21−module Serial.Split (benchmarks) where
23+module Stream.Split (benchmarks) where
2224
2325import Data.Char (ord)
2426import Data.Word (Word8)
2527import System.IO (Handle)
2628
2729import qualified Streamly.FileSystem.Handle as FH
28−import qualified Streamly.Internal.Data.Array.Foreign as A
30+import qualified Streamly.Internal.Data.Array as A
2931import qualified Streamly.Internal.Data.Fold as FL
3032import qualified Streamly.Internal.Data.Parser as PR
3133import qualified Streamly.Internal.Data.Stream.IsStream as IP
@@ -33,15 +35,15 @@ import qualified Streamly.Internal.FileSystem.Handle as IFH
3335import qualified Streamly.Internal.Unicode.Stream as IUS
3436import qualified Streamly.Prelude as S
3537
36−import Gauge hiding (env)
38+import Test.Tasty.Bench hiding (env)
3739import Prelude hiding (last, length)
3840import Streamly.Benchmark.Common
3941import Streamly.Benchmark.Common.Handle
4042
4143#ifdef INSPECTION
42−import Streamly.Internal.Data.Stream.StreamD.Type (Step(..))
44+import Streamly.Internal.Data.Stream (Step(..))
4345
44−import qualified Streamly.Internal.Data.Array.Foreign.Mut.Type as MA
46+import qualified Streamly.Internal.Data.MutArray as MA
4547import qualified Streamly.Internal.Data.Unfold as IUF
4648
4749import Test.Inspection
@@ -67,7 +69,7 @@ splitOn inh =
6769inspect $ hasNoTypeClasses 'splitOn
6870inspect $ 'splitOn `hasNoType` ''Step
6971inspect $ 'splitOn `hasNoType` ''IUF.ConcatState -- FH.read/UF.many
70−inspect $ 'splitOn `hasNoType` ''MA.ReadUState -- FH.read/A.read
72+inspect $ 'splitOn `hasNoType` ''MA.ArrayUnsafe -- FH.read/A.read
7173#endif
7274
7375-- | Split suffix on line feed.
@@ -80,7 +82,7 @@ splitOnSuffix inh =
8082inspect $ hasNoTypeClasses 'splitOnSuffix
8183inspect $ 'splitOnSuffix `hasNoType` ''Step
8284inspect $ 'splitOnSuffix `hasNoType` ''IUF.ConcatState -- FH.read/UF.many
83−inspect $ 'splitOnSuffix `hasNoType` ''MA.ReadUState -- FH.read/A.read
85+inspect $ 'splitOnSuffix `hasNoType` ''MA.ArrayUnsafe -- FH.read/A.read
8486#endif
8587
8688-- | Split suffix with line feed.
@@ -93,7 +95,7 @@ splitWithSuffix inh =
9395inspect $ hasNoTypeClasses 'splitWithSuffix
9496inspect $ 'splitWithSuffix `hasNoType` ''Step
9597inspect $ 'splitWithSuffix `hasNoType` ''IUF.ConcatState -- FH.read/UF.many
96−inspect $ 'splitWithSuffix `hasNoType` ''MA.ReadUState -- FH.read/A.read
98+inspect $ 'splitWithSuffix `hasNoType` ''MA.ArrayUnsafe -- FH.read/A.read
9799#endif
98100
99101-- | Split on line feed.
@@ -124,7 +126,7 @@ wordsBy inh =
124126inspect $ hasNoTypeClasses 'wordsBy
125127inspect $ 'wordsBy `hasNoType` ''Step
126128inspect $ 'wordsBy `hasNoType` ''IUF.ConcatState -- FH.read/UF.many
127−inspect $ 'wordsBy `hasNoType` ''MA.ReadUState -- FH.read/A.read
129+inspect $ 'wordsBy `hasNoType` ''MA.ArrayUnsafe -- FH.read/A.read
128130#endif
129131
130132-- | Split on a word8 sequence.
@@ -141,7 +143,7 @@ splitOnSeq str inh =
141143-- | Split on a word8 sequence.
142144splitOnSeq100k :: Handle -> IO Int
143145splitOnSeq100k inh = do
144− arr <- A.fromStream $ S.replicate 100000 123
146+ arr <- A.fromStream $ IP.toStream $ S.fromSerial $ S.replicate 100000 123
145147 (S.length $ IP.splitOnSeq arr FL.drain
146148 $ S.unfold FH.read inh) -- >>= print
147149
@@ -156,6 +158,12 @@ splitOnSuffixSeq str inh =
156158-- inspect $ 'splitOnSuffixSeq `hasNoType` ''Step
157159#endif
158160
161+-- | Split on suffix sequence.
162+splitWithSuffixSeq :: String -> Handle -> IO Int
163+splitWithSuffixSeq str inh =
164+ S.length $ IP.splitWithSuffixSeq (toarr str) FL.drain
165+ $ S.unfold FH.read inh -- >>= print
166+
159167o_1_space_reduce_read_split :: BenchEnv -> [Benchmark]
160168o_1_space_reduce_read_split env =
161169 [ bgroup "split"
@@ -185,6 +193,8 @@ o_1_space_reduce_read_split env =
185193 splitOnSeq "\r\n" inh
186194 , mkBench "S.splitOnSuffixSeq \"\\r\\n\" FL.drain" env $ \inh _ ->
187195 splitOnSuffixSeq "\r\n" inh
196+ , mkBench "S.splitWithSuffixSeq \"\\r\\n\" FL.drain" env $ \inh _ ->
197+ splitWithSuffixSeq "\r\n" inh
188198 , mkBench "S.splitOnSeq \"aa\" FL.drain" env $ \inh _ ->
189199 splitOnSeq "aa" inh
190200 , mkBench "S.splitOnSeq \"aaaa\" FL.drain" env $ \inh _ ->
@@ -201,6 +211,8 @@ o_1_space_reduce_read_split env =
201211 env $ \inh _ -> splitOnSeq100k inh
202212 , mkBenchSmall "S.splitOnSuffixSeq \"abcdefghijklmnopqrstuvwxyz\" FL.drain"
203213 env $ \inh _ -> splitOnSuffixSeq "abcdefghijklmnopqrstuvwxyz" inh
214+ , mkBenchSmall "S.splitWithSuffixSeq \"abcdefghijklmnopqrstuvwxyz\" FL.drain"
215+ env $ \inh _ -> splitWithSuffixSeq "abcdefghijklmnopqrstuvwxyz" inh
204216 ]
205217 ]
206218
@@ -208,8 +220,9 @@ o_1_space_reduce_read_split env =
208220splitOnSeqUtf8 :: String -> Handle -> IO Int
209221splitOnSeqUtf8 str inh =
210222 (S.length $ IP.splitOnSeq (A.fromList str) FL.drain
223+ $ IP.fromStream
211224 $ IUS.decodeUtf8Arrays
212− $ IFH.toChunks inh) -- >>= print
225+ $ IFH.readChunks inh) -- >>= print
213226
214227o_1_space_reduce_toChunks_split :: BenchEnv -> [Benchmark]
215228o_1_space_reduce_toChunks_split env =
benchmark/Streamly/Benchmark/Data/Stream/StreamD.hs+46−5
@@ -8,6 +8,8 @@
88{-# LANGUAGE CPP #-}
99{-# LANGUAGE FlexibleContexts #-}
1010{-# LANGUAGE ScopedTypeVariables #-}
11+{-# LANGUAGE TupleSections #-}
12+{-# OPTIONS_GHC -Wno-orphans #-}
1113
1214#ifdef __HADDOCK_VERSION__
1315#undef INSPECTION
@@ -20,15 +22,19 @@
2022
2123module Main (main) where
2224
25+#if !MIN_VERSION_base(4,18,0)
26+import Control.Applicative (liftA2)
27+#endif
2328import Control.Monad (when)
2429import Data.Maybe (isJust)
25−import Gauge (bench, nfIO, bgroup, Benchmark, defaultMain)
30+import Test.Tasty.Bench (bench, nfIO, bgroup, Benchmark, defaultMain)
2631import System.Random (randomRIO)
2732import Prelude hiding (tail, mapM_, foldl, last, map, mapM, concatMap, zip)
2833
2934import qualified Prelude as P
30−import qualified Streamly.Internal.Data.Stream.StreamD as S
35+import qualified Streamly.Internal.Data.Stream as S
3136import qualified Streamly.Internal.Data.Unfold as UF
37+import qualified Streamly.Internal.Data.Fold as FL
3238
3339import Streamly.Benchmark.Common
3440
@@ -125,6 +131,12 @@ uncons s = do
125131 Nothing -> return ()
126132 Just (_, t) -> uncons t
127133
134+{-# INLINE foldBreak #-}
135+foldBreak :: Monad m => Stream m Int -> m ()
136+foldBreak s = do
137+ (r, s1) <- S.foldBreak (FL.take 1 FL.length) s
138+ when (r /= 0) $ foldBreak s1
139+
128140{-# INLINE tail #-}
129141tail :: Monad m => Stream m a -> m ()
130142tail s = S.tail s >>= P.mapM_ tail
@@ -314,6 +326,34 @@ filterMap n = composeN n $ S.map (subtract 1) . S.filter (<= maxValue)
314326-- Nested Composition
315327-------------------------------------------------------------------------------
316328
329+instance Monad f => Applicative (S.Stream f) where
330+ {-# INLINE pure #-}
331+ pure = S.fromPure
332+
333+ {-# INLINE (<*>) #-}
334+ (<*>) = S.crossApply
335+
336+ {-# INLINE liftA2 #-}
337+ liftA2 f x = (<*>) (fmap f x)
338+
339+ {-# INLINE (*>) #-}
340+ (*>) = S.crossApplySnd
341+
342+ {-# INLINE (<*) #-}
343+ (<*) = S.crossApplyFst
344+
345+-- NOTE: even though concatMap for StreamD is 4x faster compared to StreamK,
346+-- the monad instance does not seem to be significantly faster.
347+instance Monad m => Monad (S.Stream m) where
348+ {-# INLINE return #-}
349+ return = pure
350+
351+ {-# INLINE (>>=) #-}
352+ (>>=) = flip S.concatMap
353+
354+ {-# INLINE (>>) #-}
355+ (>>) = (*>)
356+
317357{-# INLINE toNullApNested #-}
318358toNullApNested :: Monad m => Stream m Int -> m ()
319359toNullApNested s = runStream $ do
@@ -409,8 +449,8 @@ unfoldManyRepl :: Int -> Int -> Int -> IO ()
409449unfoldManyRepl outer inner n =
410450 S.drain
411451 $ S.unfoldMany
412− (UF.lmap return (UF.replicateM inner))
413− (sourceUnfoldrMN outer n)
452+ UF.replicateM
453+ (S.map ((inner,) . return) (sourceUnfoldrMN outer n))
414454
415455#ifdef INSPECTION
416456inspect $ hasNoTypeClasses 'unfoldManyRepl
@@ -423,7 +463,7 @@ inspect $ 'unfoldManyRepl `hasNoType` ''SPEC
423463-------------------------------------------------------------------------------
424464
425465moduleName :: String
426−moduleName = "Data.Stream.StreamD"
466+moduleName = "Data.StreamD"
427467
428468o_1_space :: [Benchmark]
429469o_1_space =
@@ -439,6 +479,7 @@ o_1_space =
439479 [ benchFold "toNull" toNull sourceUnfoldrM
440480 , benchFold "mapM_" mapM_ sourceUnfoldrM
441481 , benchFold "uncons" uncons sourceUnfoldrM
482+ , benchFold "foldBreak" foldBreak sourceUnfoldrM
442483 , benchFold "foldl'" foldl sourceUnfoldrM
443484 , benchFold "last" last sourceUnfoldrM
444485 ]
benchmark/Streamly/Benchmark/Data/Stream/StreamK.hs+61−33
@@ -8,6 +8,7 @@
88{-# LANGUAGE CPP #-}
99{-# LANGUAGE FlexibleContexts #-}
1010{-# LANGUAGE ScopedTypeVariables #-}
11+{-# OPTIONS_GHC -Wno-orphans #-}
1112
1213#ifdef __HADDOCK_VERSION__
1314#undef INSPECTION
@@ -20,22 +21,23 @@
2021
2122module Main (main) where
2223
24+#if !MIN_VERSION_base(4,18,0)
25+import Control.Applicative (liftA2)
26+#endif
2327import Control.Monad (when)
2428import Data.Maybe (isJust)
2529import System.Random (randomRIO)
2630import Prelude hiding
27− ( tail, mapM_, foldl, last, map, mapM, concatMap, zipWith, init, iterate
31+ ( Foldable(..), tail, mapM_, last, map, mapM, concatMap, zipWith, init, iterate
2832 , repeat, replicate
2933 )
3034
3135import qualified Prelude as P
3236import qualified Data.List as List
3337
34−import qualified Streamly.Internal.Control.Concurrent as S
35−import qualified Streamly.Internal.Data.Stream.StreamK.Type as S
36−import qualified Streamly.Internal.Data.Stream.StreamK as S
38+import qualified Streamly.Internal.Data.StreamK as S
3739
38−import Gauge (bench, nfIO, bgroup, Benchmark, defaultMain)
40+import Test.Tasty.Bench (bench, nfIO, bgroup, Benchmark, defaultMain)
3941
4042import Streamly.Benchmark.Common
4143
@@ -115,7 +117,7 @@ Benchmarks that need to be added
115117-- Stream generation and elimination
116118-------------------------------------------------------------------------------
117119
118−type Stream m a = S.Stream m a
120+type Stream m a = S.StreamK m a
119121
120122{-# INLINE unfoldr #-}
121123unfoldr :: Int -> Int -> Stream m Int
@@ -127,7 +129,7 @@ unfoldr streamLen n = S.unfoldr step n
127129 else Just (cnt, cnt + 1)
128130
129131{-# INLINE unfoldrM #-}
130−unfoldrM :: S.MonadAsync m => Int -> Int -> Stream m Int
132+unfoldrM :: Monad m => Int -> Int -> Stream m Int
131133unfoldrM streamLen n = S.unfoldrMWith S.consM step n
132134 where
133135 step cnt =
@@ -140,7 +142,7 @@ repeat :: Int -> Int -> Stream m Int
140142repeat streamLen = S.take streamLen . S.repeat
141143
142144{-# INLINE repeatM #-}
143−repeatM :: S.MonadAsync m => Int -> Int -> Stream m Int
145+repeatM :: Monad m => Int -> Int -> Stream m Int
144146repeatM streamLen = S.take streamLen . S.repeatM . return
145147
146148{-# INLINE replicate #-}
@@ -148,7 +150,7 @@ replicate :: Int -> Int -> Stream m Int
148150replicate = S.replicate
149151
150152{-# INLINE replicateM #-}
151−replicateM :: S.MonadAsync m => Int -> Int -> Stream m Int
153+replicateM :: Monad m => Int -> Int -> Stream m Int
152154replicateM streamLen = S.replicateMWith S.consM streamLen . return
153155
154156{-# INLINE iterate #-}
@@ -156,7 +158,7 @@ iterate :: Int -> Int -> Stream m Int
156158iterate streamLen = S.take streamLen . S.iterate (+1)
157159
158160{-# INLINE iterateM #-}
159−iterateM :: S.MonadAsync m => Int -> Int -> Stream m Int
161+iterateM :: Monad m => Int -> Int -> Stream m Int
160162iterateM streamLen = S.take streamLen . S.iterateM (return . (+1)) . return
161163
162164{-# INLINE fromFoldable #-}
@@ -164,26 +166,27 @@ fromFoldable :: Int -> Int -> Stream m Int
164166fromFoldable streamLen n = S.fromFoldable [n..n+streamLen]
165167
166168{-# INLINE fromFoldableM #-}
167−fromFoldableM :: S.MonadAsync m => Int -> Int -> Stream m Int
169+fromFoldableM :: Monad m => Int -> Int -> Stream m Int
168170fromFoldableM streamLen n =
169− Prelude.foldr S.consM S.nil (Prelude.fmap return [n..n+streamLen])
171+ List.foldr S.consM S.nil (Prelude.fmap return [n..n+streamLen])
170172
171173{-# INLINABLE concatMapFoldableWith #-}
172−concatMapFoldableWith :: Foldable f
174+concatMapFoldableWith :: P.Foldable f
173175 => (Stream m b -> Stream m b -> Stream m b)
174176 -> (a -> Stream m b)
175177 -> f a
176178 -> Stream m b
177−concatMapFoldableWith f g = Prelude.foldr (f . g) S.nil
179+concatMapFoldableWith f g = P.foldr (f . g) S.nil
178180
179181{-# INLINE concatMapFoldableSerial #-}
180182concatMapFoldableSerial :: Int -> Int -> Stream m Int
181−concatMapFoldableSerial streamLen n = concatMapFoldableWith S.serial S.fromPure [n..n+streamLen]
183+concatMapFoldableSerial streamLen n =
184+ concatMapFoldableWith S.append S.fromPure [n..n+streamLen]
182185
183186{-# INLINE concatMapFoldableSerialM #-}
184187concatMapFoldableSerialM :: Monad m => Int -> Int -> Stream m Int
185188concatMapFoldableSerialM streamLen n =
186− concatMapFoldableWith S.serial (S.fromEffect . return) [n..n+streamLen]
189+ concatMapFoldableWith S.append (S.fromEffect . return) [n..n+streamLen]
187190
188191-------------------------------------------------------------------------------
189192-- Elimination
@@ -268,11 +271,11 @@ fmapK :: Monad m => Int -> Stream m Int -> m ()
268271fmapK n = composeN n $ P.fmap (+ 1)
269272
270273{-# INLINE mapM #-}
271−mapM :: S.MonadAsync m => Int -> Stream m Int -> m ()
274+mapM :: Monad m => Int -> Stream m Int -> m ()
272275mapM n = composeN n $ S.mapMWith S.consM return
273276
274277{-# INLINE mapMSerial #-}
275−mapMSerial :: S.MonadAsync m => Int -> Stream m Int -> m ()
278+mapMSerial :: Monad m => Int -> Stream m Int -> m ()
276279mapMSerial n = composeN n $ S.mapMSerial return
277280
278281{-# INLINE filterEven #-}
@@ -324,7 +327,7 @@ foldlS :: Monad m => Int -> Stream m Int -> m ()
324327foldlS n = composeN n $ S.foldlS (flip S.cons) S.nil
325328
326329{-# INLINE intersperse #-}
327−intersperse :: S.MonadAsync m => Int -> Int -> Stream m Int -> m ()
330+intersperse :: Monad m => Int -> Int -> Stream m Int -> m ()
328331intersperse streamLen n = composeN n $ S.intersperse streamLen
329332
330333-------------------------------------------------------------------------------
@@ -333,8 +336,7 @@ intersperse streamLen n = composeN n $ S.intersperse streamLen
333336
334337{-# INLINE iterateSource #-}
335338iterateSource
336− :: S.MonadAsync m
337− => Int -> (Stream m Int -> Stream m Int) -> Int -> Int -> Stream m Int
339+ :: Monad m => Int -> (Stream m Int -> Stream m Int) -> Int -> Int -> Stream m Int
338340iterateSource iterStreamLen g i n = f i (unfoldrM iterStreamLen n)
339341 where
340342 f (0 :: Int) m = g m
@@ -342,37 +344,37 @@ iterateSource iterStreamLen g i n = f i (unfoldrM iterStreamLen n)
342344
343345-- this is quadratic
344346{-# INLINE iterateScan #-}
345−iterateScan :: S.MonadAsync m => Int -> Int -> Int -> Stream m Int
347+iterateScan :: Monad m => Int -> Int -> Int -> Stream m Int
346348iterateScan iterStreamLen maxIters =
347349 iterateSource iterStreamLen (S.scanl' (+) 0) (maxIters `div` 10)
348350
349351-- this is quadratic
350352{-# INLINE iterateDropWhileFalse #-}
351−iterateDropWhileFalse :: S.MonadAsync m => Int -> Int -> Int -> Int -> Stream m Int
353+iterateDropWhileFalse :: Monad m => Int -> Int -> Int -> Int -> Stream m Int
352354iterateDropWhileFalse streamLen iterStreamLen maxIters =
353355 iterateSource iterStreamLen (S.dropWhile (> streamLen)) (maxIters `div` 10)
354356
355357{-# INLINE iterateMapM #-}
356−iterateMapM :: S.MonadAsync m => Int -> Int -> Int -> Stream m Int
358+iterateMapM :: Monad m => Int -> Int -> Int -> Stream m Int
357359iterateMapM iterStreamLen =
358360 iterateSource iterStreamLen (S.mapMWith S.consM return)
359361
360362{-# INLINE iterateFilterEven #-}
361−iterateFilterEven :: S.MonadAsync m => Int -> Int -> Int -> Stream m Int
363+iterateFilterEven :: Monad m => Int -> Int -> Int -> Stream m Int
362364iterateFilterEven iterStreamLen = iterateSource iterStreamLen (S.filter even)
363365
364366{-# INLINE iterateTakeAll #-}
365−iterateTakeAll :: S.MonadAsync m => Int -> Int -> Int -> Int -> Stream m Int
367+iterateTakeAll :: Monad m => Int -> Int -> Int -> Int -> Stream m Int
366368iterateTakeAll streamLen iterStreamLen =
367369 iterateSource iterStreamLen (S.take streamLen)
368370
369371{-# INLINE iterateDropOne #-}
370−iterateDropOne :: S.MonadAsync m => Int -> Int -> Int -> Stream m Int
372+iterateDropOne :: Monad m => Int -> Int -> Int -> Stream m Int
371373iterateDropOne iterStreamLen = iterateSource iterStreamLen (S.drop 1)
372374
373375{-# INLINE iterateDropWhileTrue #-}
374−iterateDropWhileTrue :: S.MonadAsync m =>
375− Int -> Int -> Int -> Int -> Stream m Int
376+iterateDropWhileTrue ::
377+ Monad m => Int -> Int -> Int -> Int -> Stream m Int
376378iterateDropWhileTrue streamLen iterStreamLen =
377379 iterateSource iterStreamLen (S.dropWhile (<= streamLen))
378380
@@ -390,7 +392,7 @@ zipWithM src = drain $ S.zipWithM (curry return) src src
390392
391393{-# INLINE sortByK #-}
392394sortByK :: (a -> a -> Ordering) -> Stream m a -> Stream m a
393−sortByK f = S.concatPairsWith (S.mergeBy f) S.fromPure
395+sortByK f = S.mergeMapWith (S.mergeBy f) S.fromPure
394396
395397{-# INLINE sortBy #-}
396398sortBy :: Monad m => Stream m Int -> m ()
@@ -492,7 +494,7 @@ sourceConcatMapId val n =
492494{-# INLINE concatMapBySerial #-}
493495concatMapBySerial :: Int -> Int -> Int -> IO ()
494496concatMapBySerial outer inner n =
495− S.drain $ S.concatMapWith S.serial
497+ S.drain $ S.concatMapWith S.append
496498 (unfoldrM inner)
497499 (unfoldrM outer n)
498500
@@ -500,6 +502,32 @@ concatMapBySerial outer inner n =
500502-- Nested Composition
501503-------------------------------------------------------------------------------
502504
505+instance Monad m => Applicative (S.StreamK m) where
506+ {-# INLINE pure #-}
507+ pure = S.fromPure
508+
509+ {-# INLINE (<*>) #-}
510+ (<*>) = S.crossApply
511+
512+ {-# INLINE liftA2 #-}
513+ liftA2 f x = (<*>) (fmap f x)
514+
515+ {-# INLINE (*>) #-}
516+ (*>) = S.crossApplySnd
517+
518+ {-# INLINE (<*) #-}
519+ (<*) = S.crossApplyFst
520+
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
523+-- fusion.
524+instance Monad m => Monad (S.StreamK m) where
525+ {-# INLINE return #-}
526+ return = pure
527+
528+ {-# INLINE (>>=) #-}
529+ (>>=) = flip S.concatMap
530+
503531{-# INLINE drainApplicative #-}
504532drainApplicative :: Monad m => Stream m Int -> m ()
505533drainApplicative s = drain $ do
@@ -606,7 +634,7 @@ filterAllInNestedList str = do
606634-------------------------------------------------------------------------------
607635
608636moduleName :: String
609−moduleName = "Data.Stream.StreamK"
637+moduleName = "Data.StreamK"
610638
611639o_1_space_generation :: Int -> Benchmark
612640o_1_space_generation streamLen =
@@ -703,7 +731,7 @@ o_1_space_concat streamLen =
703731 -- This is for comparison with concatMapFoldableWith
704732 , benchIOSrc1 "concatMapWithId (n of 1) (fromFoldable)"
705733 (S.drain
706− . S.concatMapWith S.serial id
734+ . S.concatMapWith S.append id
707735 . sourceConcatMapId streamLen)
708736
709737 , benchIOSrc1 "concatMapBy serial (n of 1)"
benchmark/Streamly/Benchmark/Data/Stream/StreamDK.hs → benchmark/Streamly/Benchmark/Data/Stream/StreamKAlt.hsrenamed+6−4
@@ -1,3 +1,5 @@
1+{-# OPTIONS_GHC -Wno-deprecations #-}
2+
13-- |
24-- Module : Streamly.Benchmark.Data.Stream.StreamDK
35-- Copyright : (c) 2018 Composewell Technologies
@@ -16,12 +18,12 @@ import Prelude hiding ()
1618-- import qualified Prelude as P
1719-- import qualified Data.List as List
1820
19−import qualified Streamly.Internal.Data.Stream.StreamDK as S
20−-- import qualified Streamly.Internal.Data.Stream.Prelude as SP
21+import qualified Streamly.Internal.Data.StreamK.Alt as S
22+-- import qualified Streamly.Internal.Data.Stream.Common as SP
2123-- import qualified Streamly.Internal.Data.SVar as S
2224
2325import Streamly.Benchmark.Common
24−import Gauge (bgroup, Benchmark, defaultMain)
26+import Test.Tasty.Bench (bgroup, Benchmark, defaultMain)
2527
2628value :: Int
2729value = 100000
@@ -450,4 +452,4 @@ o_1_space =
450452 ]
451453
452454main :: IO ()
453−main = defaultMain $ concat [o_1_space]
455+main = defaultMain [o_1_space]
benchmark/Streamly/Benchmark/Data/Stream/ToStreamK.hsnew file+938
@@ -0,0 +1,938 @@
1+-- |
2+-- Module : Streamly.Benchmark.Data.StreamK
3+-- Copyright : (c) 2018 Composewell Technologies
4+--
5+-- License : BSD3
6+-- Maintainer : streamly@composewell.com
7+
8+{-# LANGUAGE CPP #-}
9+{-# LANGUAGE FlexibleContexts #-}
10+{-# LANGUAGE ScopedTypeVariables #-}
11+{-# OPTIONS_GHC -Wno-orphans #-}
12+
13+#ifdef __HADDOCK_VERSION__
14+#undef INSPECTION
15+#endif
16+
17+#ifdef INSPECTION
18+{-# LANGUAGE TemplateHaskell #-}
19+{-# OPTIONS_GHC -fplugin Test.Inspection.Plugin #-}
20+#endif
21+
22+module Main (main) where
23+
24+-- import Control.Applicative (liftA2)
25+-- import Control.Monad (when)
26+-- import Data.Maybe (isJust)
27+-- import System.Random (randomRIO)
28+import Prelude hiding
29+ ( tail, mapM_, foldl, last, map, mapM, concatMap, zipWith, init, iterate
30+ , repeat, replicate
31+ )
32+
33+import qualified Prelude as P
34+-- import qualified Data.List as List
35+
36+import qualified Streamly.Internal.Data.StreamK as S
37+import qualified Streamly.Internal.Data.Stream as D
38+import qualified Streamly.Internal.Data.Fold as Fold
39+
40+import Test.Tasty.Bench (bgroup, Benchmark, defaultMain)
41+
42+import Streamly.Benchmark.Common
43+
44+#ifdef INSPECTION
45+import Test.Inspection
46+#endif
47+
48+-------------------------------------------------------------------------------
49+-- Stream generation and elimination
50+-------------------------------------------------------------------------------
51+
52+type Stream m a = S.Stream m a
53+
54+{-# INLINE unfoldrD #-}
55+unfoldrD :: Monad m => Int -> Int -> Stream m Int
56+unfoldrD streamLen n = D.toStreamK (D.unfoldr step n)
57+ where
58+ step cnt =
59+ if cnt > n + streamLen
60+ then Nothing
61+ else Just (cnt, cnt + 1)
62+
63+{-# INLINE unfoldrMD #-}
64+unfoldrMD :: Monad m => Int -> Int -> Stream m Int
65+unfoldrMD streamLen n = D.toStreamK (D.unfoldrM step n)
66+ where
67+ step cnt =
68+ if cnt > n + streamLen
69+ then return Nothing
70+ else return (Just (cnt, cnt + 1))
71+
72+{-
73+{-# INLINE unfoldrK #-}
74+unfoldrK :: Int -> Int -> Stream m Int
75+unfoldrK streamLen n = S.unfoldr step n
76+ where
77+ step cnt =
78+ if cnt > n + streamLen
79+ then Nothing
80+ else Just (cnt, cnt + 1)
81+-}
82+
83+{-# INLINE unfoldrMK #-}
84+unfoldrMK :: Monad m => Int -> Int -> Stream m Int
85+unfoldrMK streamLen n = S.unfoldrMWith S.consM step n
86+ where
87+ step cnt =
88+ if cnt > n + streamLen
89+ then return Nothing
90+ else return (Just (cnt, cnt + 1))
91+
92+{-# INLINE repeat #-}
93+repeat :: Monad m => Int -> Int -> Stream m Int
94+repeat streamLen = S.take streamLen . D.toStreamK . D.repeat
95+
96+{-# INLINE repeatM #-}
97+repeatM :: Monad m => Int -> Int -> Stream m Int
98+repeatM streamLen = S.take streamLen . D.toStreamK . D.repeatM . return
99+
100+{-# INLINE replicate #-}
101+replicate :: Monad m => Int -> Int -> Stream m Int
102+replicate x y = D.toStreamK $ D.replicate x y
103+
104+{-# INLINE replicateM #-}
105+replicateM :: Monad m => Int -> Int -> Stream m Int
106+replicateM streamLen = D.toStreamK . D.replicateM streamLen . return
107+
108+{-# INLINE iterate #-}
109+iterate :: Monad m => Int -> Int -> Stream m Int
110+iterate streamLen = S.take streamLen . D.toStreamK . D.iterate (+1)
111+
112+{-# INLINE iterateM #-}
113+iterateM :: Monad m => Int -> Int -> Stream m Int
114+iterateM streamLen = S.take streamLen . D.toStreamK . D.iterateM (return . (+1)) . return
115+
116+{-# INLINE fromFoldable #-}
117+fromFoldable :: Int -> Int -> Stream m Int
118+fromFoldable streamLen n = S.fromFoldable [n..n+streamLen]
119+
120+{-# INLINE fromFoldableM #-}
121+fromFoldableM :: Monad m => Int -> Int -> Stream m Int
122+fromFoldableM streamLen n =
123+ Prelude.foldr (S.consM . return) S.nil [n .. n + streamLen]
124+
125+{-
126+{-# INLINABLE concatMapFoldableWith #-}
127+concatMapFoldableWith :: Foldable f
128+ => (Stream m b -> Stream m b -> Stream m b)
129+ -> (a -> Stream m b)
130+ -> f a
131+ -> Stream m b
132+concatMapFoldableWith f g = Prelude.foldr (f . g) S.nil
133+-}
134+
135+{-# INLINE concatMapFoldableSerial #-}
136+concatMapFoldableSerial :: Monad m => Int -> Int -> Stream m Int
137+concatMapFoldableSerial streamLen n =
138+ D.toStreamK $ D.concatMap D.fromPure $ D.fromStreamK $ S.fromList [n..n+streamLen]
139+
140+{-# INLINE concatMapFoldableSerialM #-}
141+concatMapFoldableSerialM :: Monad m => Int -> Int -> Stream m Int
142+concatMapFoldableSerialM streamLen n =
143+ -- concatMapFoldableWith S.serial (S.fromEffect . return) [n..n+streamLen]
144+ D.toStreamK $ D.concatMap (D.fromEffect . return) $ D.fromStreamK $ S.fromList [n..n+streamLen]
145+
146+-------------------------------------------------------------------------------
147+-- Elimination
148+-------------------------------------------------------------------------------
149+
150+{-# INLINE drainD #-}
151+drainD :: Monad m => Stream m a -> m ()
152+drainD = D.drain . D.fromStreamK
153+
154+{-# INLINE drain #-}
155+drain :: Monad m => Stream m a -> m ()
156+drain = S.drain
157+
158+{-# INLINE mapM_ #-}
159+mapM_ :: Monad m => Stream m a -> m ()
160+mapM_ s = D.mapM_ (\_ -> return ()) $ D.fromStreamK s
161+
162+{-
163+{-# INLINE uncons #-}
164+uncons :: Monad m => Stream m Int -> m ()
165+uncons s = do
166+ r <- D.uncons $ D.fromStreamK s
167+ case r of
168+ Nothing -> return ()
169+ Just (_, t) -> uncons (D.toStreamK t)
170+
171+{-# INLINE init #-}
172+init :: Monad m => Stream m a -> m ()
173+init s = do
174+ t <- S.init s
175+ P.mapM_ S.drain t
176+
177+{-# INLINE tail #-}
178+tail :: Monad m => Stream m a -> m ()
179+tail s = S.tail s >>= P.mapM_ tail
180+
181+{-# INLINE nullTail #-}
182+nullTail :: Monad m => Stream m Int -> m ()
183+nullTail s = do
184+ r <- S.null s
185+ when (not r) $ S.tail s >>= P.mapM_ nullTail
186+
187+{-# INLINE headTail #-}
188+headTail :: Monad m => Stream m Int -> m ()
189+headTail s = do
190+ h <- S.head s
191+ when (isJust h) $ S.tail s >>= P.mapM_ headTail
192+-}
193+
194+{-# INLINE toList #-}
195+toList :: Monad m => Stream m Int -> m [Int]
196+toList = D.fold Fold.toList . D.fromStreamK
197+
198+{-# INLINE foldl' #-}
199+foldl' :: Monad m => Stream m Int -> m Int
200+foldl' = D.fold (Fold.foldl' (+) 0) . D.fromStreamK
201+
202+{-# INLINE last #-}
203+last :: Monad m => Stream m Int -> m (Maybe Int)
204+last = D.fold Fold.latest . D.fromStreamK
205+
206+-------------------------------------------------------------------------------
207+-- Transformation
208+-------------------------------------------------------------------------------
209+
210+{-# INLINE composeN #-}
211+composeN
212+ :: Monad m
213+ => Int -> (Stream m Int -> Stream m Int) -> Stream m Int -> m ()
214+composeN n f =
215+ case n of
216+ 1 -> drain . f
217+ 2 -> drain . f . f
218+ 3 -> drain . f . f . f
219+ 4 -> drain . f . f . f . f
220+ _ -> undefined
221+
222+{-# INLINE scanl' #-}
223+scanl' :: Monad m => Int -> Stream m Int -> m ()
224+scanl' n =
225+ composeN n (D.toStreamK . D.scan (Fold.foldl' (+) 0) . D.fromStreamK)
226+
227+{-# INLINE map #-}
228+map :: Monad m => Int -> Stream m Int -> m ()
229+map n = composeN n (D.toStreamK . D.map (+ 1) . D.fromStreamK)
230+
231+{-
232+{-# INLINE fmapK #-}
233+fmapK :: Monad m => Int -> Stream m Int -> m ()
234+fmapK n = composeN n $ P.fmap (+ 1)
235+-}
236+
237+{-# INLINE mapM #-}
238+mapM :: Monad m => Int -> Stream m Int -> m ()
239+mapM n = composeN n (D.toStreamK . D.mapM return . D.fromStreamK)
240+
241+{-
242+{-# INLINE mapMSerial #-}
243+mapMSerial :: S.MonadAsync m => Int -> Stream m Int -> m ()
244+mapMSerial n = composeN n $ S.mapMSerial return
245+-}
246+
247+{-# INLINE filterEven #-}
248+filterEven :: Monad m => Int -> Stream m Int -> m ()
249+filterEven n = composeN n (D.toStreamK . D.filter even . D.fromStreamK)
250+
251+{-
252+{-# INLINE filterAllOut #-}
253+filterAllOut :: Monad m => Int -> Int -> Stream m Int -> m ()
254+filterAllOut streamLen n = composeN n $ S.filter (> streamLen)
255+
256+{-# INLINE filterAllIn #-}
257+filterAllIn :: Monad m => Int -> Int -> Stream m Int -> m ()
258+filterAllIn streamLen n = composeN n $ S.filter (<= streamLen)
259+
260+{-# INLINE _takeOne #-}
261+_takeOne :: Monad m => Int -> Stream m Int -> m ()
262+_takeOne n = composeN n $ S.take 1
263+
264+{-# INLINE takeAll #-}
265+takeAll :: Monad m => Int -> Int -> Stream m Int -> m ()
266+takeAll streamLen n = composeN n $ S.take streamLen
267+
268+{-# INLINE takeWhileTrue #-}
269+takeWhileTrue :: Monad m => Int -> Int -> Stream m Int -> m ()
270+takeWhileTrue streamLen n = composeN n $ S.takeWhile (<= streamLen)
271+
272+{-# INLINE dropOne #-}
273+dropOne :: Monad m => Int -> Stream m Int -> m ()
274+dropOne n = composeN n $ S.drop 1
275+
276+{-# INLINE dropAll #-}
277+dropAll :: Monad m => Int -> Int -> Stream m Int -> m ()
278+dropAll streamLen n = composeN n $ S.drop streamLen
279+
280+{-# INLINE dropWhileTrue #-}
281+dropWhileTrue :: Monad m => Int -> Int -> Stream m Int -> m ()
282+dropWhileTrue streamLen n = composeN n $ S.dropWhile (<= streamLen)
283+
284+{-# INLINE dropWhileFalse #-}
285+dropWhileFalse :: Monad m => Int -> Stream m Int -> m ()
286+dropWhileFalse n = composeN n $ S.dropWhile (<= 1)
287+-}
288+
289+{-
290+{-# INLINE foldrS #-}
291+foldrS :: Monad m => Int -> Stream m Int -> m ()
292+foldrS n = composeN n $ S.foldrS S.cons S.nil
293+
294+{-# INLINE foldlS #-}
295+foldlS :: Monad m => Int -> Stream m Int -> m ()
296+foldlS n = composeN n $ S.foldlS (flip S.cons) S.nil
297+-}
298+
299+{-
300+{-# INLINE intersperse #-}
301+intersperse :: S.MonadAsync m => Int -> Int -> Stream m Int -> m ()
302+intersperse streamLen n = composeN n $ S.intersperse streamLen
303+-}
304+
305+-------------------------------------------------------------------------------
306+-- Iteration
307+-------------------------------------------------------------------------------
308+
309+{-
310+{-# INLINE iterateSource #-}
311+iterateSource
312+ :: S.MonadAsync m
313+ => Int -> (Stream m Int -> Stream m Int) -> Int -> Int -> Stream m Int
314+iterateSource iterStreamLen g i n = f i (unfoldrM iterStreamLen n)
315+ where
316+ f (0 :: Int) m = g m
317+ f x m = g (f (x P.- 1) m)
318+
319+-- this is quadratic
320+{-# INLINE iterateScan #-}
321+iterateScan :: S.MonadAsync m => Int -> Int -> Int -> Stream m Int
322+iterateScan iterStreamLen maxIters =
323+ iterateSource iterStreamLen (S.scanl' (+) 0) (maxIters `div` 10)
324+
325+-- this is quadratic
326+{-# INLINE iterateDropWhileFalse #-}
327+iterateDropWhileFalse :: S.MonadAsync m => Int -> Int -> Int -> Int -> Stream m Int
328+iterateDropWhileFalse streamLen iterStreamLen maxIters =
329+ iterateSource iterStreamLen (S.dropWhile (> streamLen)) (maxIters `div` 10)
330+
331+{-# INLINE iterateMapM #-}
332+iterateMapM :: S.MonadAsync m => Int -> Int -> Int -> Stream m Int
333+iterateMapM iterStreamLen =
334+ iterateSource iterStreamLen (S.mapMWith S.consM return)
335+
336+{-# INLINE iterateFilterEven #-}
337+iterateFilterEven :: S.MonadAsync m => Int -> Int -> Int -> Stream m Int
338+iterateFilterEven iterStreamLen = iterateSource iterStreamLen (S.filter even)
339+
340+{-# INLINE iterateTakeAll #-}
341+iterateTakeAll :: S.MonadAsync m => Int -> Int -> Int -> Int -> Stream m Int
342+iterateTakeAll streamLen iterStreamLen =
343+ iterateSource iterStreamLen (S.take streamLen)
344+
345+{-# INLINE iterateDropOne #-}
346+iterateDropOne :: S.MonadAsync m => Int -> Int -> Int -> Stream m Int
347+iterateDropOne iterStreamLen = iterateSource iterStreamLen (S.drop 1)
348+
349+{-# INLINE iterateDropWhileTrue #-}
350+iterateDropWhileTrue :: S.MonadAsync m =>
351+ Int -> Int -> Int -> Int -> Stream m Int
352+iterateDropWhileTrue streamLen iterStreamLen =
353+ iterateSource iterStreamLen (S.dropWhile (<= streamLen))
354+-}
355+
356+-------------------------------------------------------------------------------
357+-- Zipping
358+-------------------------------------------------------------------------------
359+
360+{-
361+{-# INLINE zipWith #-}
362+zipWith :: Monad m => Stream m Int -> m ()
363+zipWith src = drain $ S.zipWith (,) src src
364+
365+{-# INLINE zipWithM #-}
366+zipWithM :: Monad m => Stream m Int -> m ()
367+zipWithM src = drain $ S.zipWithM (curry return) src src
368+
369+{-# INLINE sortByK #-}
370+sortByK :: (a -> a -> Ordering) -> Stream m a -> Stream m a
371+sortByK f = S.concatPairsWith (S.mergeBy f) S.fromPure
372+
373+{-# INLINE sortBy #-}
374+sortBy :: Monad m => Stream m Int -> m ()
375+sortBy = drain . sortByK compare
376+
377+-------------------------------------------------------------------------------
378+-- Mixed Composition
379+-------------------------------------------------------------------------------
380+
381+{-# INLINE scanMap #-}
382+scanMap :: Monad m => Int -> Stream m Int -> m ()
383+scanMap n = composeN n $ S.map (subtract 1) . S.scanl' (+) 0
384+
385+{-# INLINE dropMap #-}
386+dropMap :: Monad m => Int -> Stream m Int -> m ()
387+dropMap n = composeN n $ S.map (subtract 1) . S.drop 1
388+
389+{-# INLINE dropScan #-}
390+dropScan :: Monad m => Int -> Stream m Int -> m ()
391+dropScan n = composeN n $ S.scanl' (+) 0 . S.drop 1
392+
393+{-# INLINE takeDrop #-}
394+takeDrop :: Monad m => Int -> Int -> Stream m Int -> m ()
395+takeDrop streamLen n = composeN n $ S.drop 1 . S.take streamLen
396+
397+{-# INLINE takeScan #-}
398+takeScan :: Monad m => Int -> Int -> Stream m Int -> m ()
399+takeScan streamLen n = composeN n $ S.scanl' (+) 0 . S.take streamLen
400+
401+{-# INLINE takeMap #-}
402+takeMap :: Monad m => Int -> Int -> Stream m Int -> m ()
403+takeMap streamLen n = composeN n $ S.map (subtract 1) . S.take streamLen
404+
405+{-# INLINE filterDrop #-}
406+filterDrop :: Monad m => Int -> Int -> Stream m Int -> m ()
407+filterDrop streamLen n = composeN n $ S.drop 1 . S.filter (<= streamLen)
408+
409+{-# INLINE filterTake #-}
410+filterTake :: Monad m => Int -> Int -> Stream m Int -> m ()
411+filterTake streamLen n = composeN n $ S.take streamLen . S.filter (<= streamLen)
412+
413+{-# INLINE filterScan #-}
414+filterScan :: Monad m => Int -> Stream m Int -> m ()
415+filterScan n = composeN n $ S.scanl' (+) 0 . S.filter (<= maxBound)
416+
417+{-# INLINE filterMap #-}
418+filterMap :: Monad m => Int -> Int -> Stream m Int -> m ()
419+filterMap streamLen n = composeN n $ S.map (subtract 1) . S.filter (<= streamLen)
420+-}
421+
422+-------------------------------------------------------------------------------
423+-- ConcatMap
424+-------------------------------------------------------------------------------
425+
426+-- concatMap unfoldrM/unfoldrM
427+
428+{-# INLINE concatMap #-}
429+concatMap :: Int -> Int -> Int -> IO ()
430+concatMap outer inner n =
431+ S.drain $ D.toStreamK $ D.concatMap
432+ (\_ -> D.fromStreamK $ unfoldrMK inner n)
433+ (D.fromStreamK $ unfoldrMK outer n)
434+
435+#ifdef INSPECTION
436+inspect $ hasNoTypeClasses 'concatMap
437+#endif
438+
439+-- concatMap unfoldr/unfoldr
440+
441+{-
442+{-# INLINE concatMapPure #-}
443+concatMapPure :: Int -> Int -> Int -> IO ()
444+concatMapPure outer inner n =
445+ S.drain $ S.concatMap
446+ (\_ -> unfoldr inner n)
447+ (unfoldr outer n)
448+
449+#ifdef INSPECTION
450+inspect $ hasNoTypeClasses 'concatMapPure
451+#endif
452+
453+-- concatMap replicate/unfoldrM
454+
455+{-# INLINE concatMapRepl #-}
456+concatMapRepl :: Int -> Int -> Int -> IO ()
457+concatMapRepl outer inner n =
458+ S.drain $ S.concatMap (S.replicate inner) (unfoldrM outer n)
459+
460+#ifdef INSPECTION
461+inspect $ hasNoTypeClasses 'concatMapRepl
462+#endif
463+
464+-- concatMapWith
465+
466+{-# INLINE sourceConcatMapId #-}
467+sourceConcatMapId :: Monad m
468+ => Int -> Int -> Stream m (Stream m Int)
469+sourceConcatMapId val n =
470+ S.fromFoldable $ fmap (S.fromEffect . return) [n..n+val]
471+
472+{-# INLINE concatMapBySerial #-}
473+concatMapBySerial :: Int -> Int -> Int -> IO ()
474+concatMapBySerial outer inner n =
475+ S.drain $ S.concatMapWith S.serial
476+ (unfoldrM inner)
477+ (unfoldrM outer n)
478+-}
479+
480+{-
481+-------------------------------------------------------------------------------
482+-- Nested Composition
483+-------------------------------------------------------------------------------
484+
485+instance Monad m => Applicative (S.Stream m) where
486+ {-# INLINE pure #-}
487+ pure = S.fromPure
488+
489+ {-# INLINE (<*>) #-}
490+ (<*>) = S.crossApply
491+
492+ {-# INLINE liftA2 #-}
493+ liftA2 f x = (<*>) (fmap f x)
494+
495+ {-# INLINE (*>) #-}
496+ (*>) = S.crossApplySnd
497+
498+ {-# INLINE (<*) #-}
499+ (<*) = S.crossApplyFst
500+
501+-- NOTE: even though concatMap for StreamD is 3x faster compared to StreamK,
502+-- the monad instance of StreamD is slower than StreamK after foldr/build
503+-- fusion.
504+instance Monad m => Monad (S.Stream m) where
505+ {-# INLINE return #-}
506+ return = pure
507+
508+ {-# INLINE (>>=) #-}
509+ (>>=) = flip S.concatMap
510+
511+{-# INLINE drainApplicative #-}
512+drainApplicative :: Monad m => Stream m Int -> m ()
513+drainApplicative s = drain $ do
514+ (+) <$> s <*> s
515+
516+{-# INLINE drainMonad #-}
517+drainMonad :: Monad m => Stream m Int -> m ()
518+drainMonad s = drain $ do
519+ x <- s
520+ y <- s
521+ return $ x + y
522+
523+{-# INLINE drainMonad3 #-}
524+drainMonad3 :: Monad m => Stream m Int -> m ()
525+drainMonad3 s = drain $ do
526+ x <- s
527+ y <- s
528+ z <- s
529+ return $ x + y + z
530+
531+{-# INLINE filterAllOutMonad #-}
532+filterAllOutMonad
533+ :: Monad m
534+ => Stream m Int -> m ()
535+filterAllOutMonad str = drain $ do
536+ x <- str
537+ y <- str
538+ let s = x + y
539+ if s < 0
540+ then return s
541+ else S.nil
542+
543+{-# INLINE filterAllInMonad #-}
544+filterAllInMonad
545+ :: Monad m
546+ => Stream m Int -> m ()
547+filterAllInMonad str = drain $ do
548+ x <- str
549+ y <- str
550+ let s = x + y
551+ if s > 0
552+ then return s
553+ else S.nil
554+
555+-------------------------------------------------------------------------------
556+-- Nested Composition Pure lists
557+-------------------------------------------------------------------------------
558+
559+-- There are several list benchmarks here for comparison with lists. It is easy
560+-- and convenient to see the comparisons when they are here, otherwise we'll
561+-- have to add a separate module for list benchmarks with the same names and
562+-- then add a comparison in bench.sh.
563+
564+{-# INLINE unfoldrList #-}
565+unfoldrList :: Int -> Int -> [Int]
566+unfoldrList maxval n = List.unfoldr step n
567+ where
568+ step cnt =
569+ if cnt > n + maxval
570+ then Nothing
571+ else Just (cnt, cnt + 1)
572+
573+{-# INLINE toNullApNestedList #-}
574+toNullApNestedList :: [Int] -> [Int]
575+toNullApNestedList s = (+) <$> s <*> s
576+
577+{-# INLINE toNullNestedList #-}
578+toNullNestedList :: [Int] -> [Int]
579+toNullNestedList s = do
580+ x <- s
581+ y <- s
582+ return $ x + y
583+
584+{-# INLINE toNullNestedList3 #-}
585+toNullNestedList3 :: [Int] -> [Int]
586+toNullNestedList3 s = do
587+ x <- s
588+ y <- s
589+ z <- s
590+ return $ x + y + z
591+
592+{-# INLINE filterAllOutNestedList #-}
593+filterAllOutNestedList :: [Int] -> [Int]
594+filterAllOutNestedList str = do
595+ x <- str
596+ y <- str
597+ let s = x + y
598+ if s < 0
599+ then return s
600+ else []
601+
602+{-# INLINE filterAllInNestedList #-}
603+filterAllInNestedList :: [Int] -> [Int]
604+filterAllInNestedList str = do
605+ x <- str
606+ y <- str
607+ let s = x + y
608+ if s > 0
609+ then return s
610+ else []
611+ -}
612+
613+-------------------------------------------------------------------------------
614+-- Benchmarks
615+-------------------------------------------------------------------------------
616+
617+moduleName :: String
618+moduleName = "Data.Stream.ToStreamK"
619+
620+-- Generation of StreamK using StreamD generation functions and eleminating
621+-- using StreamK drain.
622+o_1_space_generation :: Int -> Benchmark
623+o_1_space_generation streamLen =
624+ bgroup "generation"
625+ [ benchFold "unfoldr" drain (unfoldrD streamLen)
626+ , benchFold "unfoldrM" drain (unfoldrMD streamLen)
627+ , benchFold "repeat" drain (repeat streamLen)
628+ , benchFold "repeatM" drain (repeatM streamLen)
629+ , benchFold "replicate" drain (replicate streamLen)
630+ , benchFold "replicateM" drain (replicateM streamLen)
631+ , benchFold "iterate" drain (iterate streamLen)
632+ , benchFold "iterateM" drain (iterateM streamLen)
633+
634+ , benchFold "fromFoldable" drain (fromFoldable streamLen)
635+ , benchFold "fromFoldableM" drain (fromFoldableM streamLen)
636+
637+ -- appends
638+ , benchFold "concatMapFoldableWith" drain (concatMapFoldableSerial streamLen)
639+ , benchFold "concatMapFoldableWithM" drain (concatMapFoldableSerialM streamLen)
640+ ]
641+
642+-- Generating using StreamK and eliminating using StreamD folds.
643+o_1_space_elimination :: Int -> Benchmark
644+o_1_space_elimination streamLen =
645+ bgroup "elimination"
646+ [ benchFold "toNull" drainD (unfoldrMK streamLen)
647+ , benchFold "mapM_" mapM_ (unfoldrMK streamLen)
648+ -- , benchFold "uncons" uncons (unfoldrMK streamLen)
649+ -- , benchFold "init" init (unfoldrM streamLen)
650+ , benchFold "foldl'" foldl' (unfoldrMK streamLen)
651+ , benchFold "last" last (unfoldrMK streamLen)
652+ ]
653+
654+{-
655+o_1_space_nested :: Int -> Benchmark
656+o_1_space_nested streamLen =
657+ bgroup "nested"
658+ [ benchFold "drainApplicative" drainApplicative (unfoldrM streamLen2)
659+ , benchFold "drainMonad" drainMonad (unfoldrM streamLen2)
660+ , benchFold "drainMonad3" drainMonad3 (unfoldrM streamLen3)
661+ , benchFold "filterAllInMonad" filterAllInMonad (unfoldrM streamLen2)
662+ , benchFold "filterAllOutMonad" filterAllOutMonad (unfoldrM streamLen2)
663+ , benchFold "drainApplicative (pure)" drainApplicative (unfoldr streamLen2)
664+ , benchFold "drainMonad (pure)" drainMonad (unfoldr streamLen2)
665+ , benchFold "drainMonad3 (pure)" drainMonad3 (unfoldr streamLen3)
666+ , benchFold "filterAllInMonad (pure)" filterAllInMonad (unfoldr streamLen2)
667+ , benchFold "filterAllOutMonad (pure)" filterAllOutMonad (unfoldr streamLen2)
668+ ]
669+ where
670+ streamLen2 = round (P.fromIntegral streamLen**(1/2::P.Double)) -- double nested loop
671+ streamLen3 = round (P.fromIntegral streamLen**(1/3::P.Double)) -- triple nested loop
672+-}
673+
674+-- Generate using StreamK and transform using StreamD transformation functions
675+-- and then drain using StreamK.
676+o_1_space_transformation :: Int -> Benchmark
677+o_1_space_transformation streamLen =
678+ bgroup "transformation"
679+ [ -- benchFold "foldrS" (foldrS 1) (unfoldrM streamLen)
680+ benchFold "scanl'" (scanl' 1) (unfoldrMK streamLen)
681+ , benchFold "map" (map 1) (unfoldrMK streamLen)
682+ -- , benchFold "fmap" (fmapK 1) (unfoldrM streamLen)
683+ , benchFold "mapM" (mapM 1) (unfoldrMK streamLen)
684+ -- , benchFold "mapMSerial" (mapMSerial 1) (unfoldrM streamLen)
685+ ]
686+
687+o_1_space_transformationX4 :: Int -> Benchmark
688+o_1_space_transformationX4 streamLen =
689+ bgroup "transformationX4"
690+ [ benchFold "scanl'" (scanl' 4) (unfoldrMK streamLen)
691+ , benchFold "map" (map 4) (unfoldrMK streamLen)
692+ -- , benchFold "fmap" (fmapK 4) (unfoldrMK streamLen)
693+ , benchFold "mapM" (mapM 4) (unfoldrMK streamLen)
694+ -- , benchFold "mapMSerial" (mapMSerial 4) (unfoldrM streamLen)
695+ -- XXX this is horribly slow
696+ -- , benchFold "concatMap" (concatMap 4) (unfoldrM streamLen16)
697+ ]
698+
699+-- Generate using K, fold using K, concat using D.concatMap
700+o_1_space_concat :: Int -> Benchmark
701+o_1_space_concat streamLen =
702+ bgroup "concat"
703+ [ {- benchIOSrc1 "concatMapPure (n of 1)"
704+ (concatMapPure streamLen 1)
705+ , benchIOSrc1 "concatMapPure (sqrt n of sqrt n)"
706+ (concatMapPure streamLen2 streamLen2)
707+ , benchIOSrc1 "concatMapPure (1 of n)"
708+ (concatMapPure 1 streamLen)
709+ -}
710+
711+ benchIOSrc1 "concatMap (n of 1)"
712+ (concatMap streamLen 1)
713+ , benchIOSrc1 "concatMap (sqrt n of sqrt n)"
714+ (concatMap streamLen2 streamLen2)
715+ , benchIOSrc1 "concatMap (1 of n)"
716+ (concatMap 1 streamLen)
717+
718+{-
719+ , benchIOSrc1 "concatMapRepl (sqrt n of sqrt n)"
720+ (concatMapRepl streamLen2 streamLen2)
721+
722+ -- This is for comparison with concatMapFoldableWith
723+ , benchIOSrc1 "concatMapWithId (n of 1) (fromFoldable)"
724+ (S.drain
725+ . S.concatMapWith S.serial id
726+ . sourceConcatMapId streamLen)
727+
728+ , benchIOSrc1 "concatMapBy serial (n of 1)"
729+ (concatMapBySerial streamLen 1)
730+ , benchIOSrc1 "concatMapBy serial (sqrt n of sqrt n)"
731+ (concatMapBySerial streamLen2 streamLen2)
732+ , benchIOSrc1 "concatMapBy serial (1 of n)"
733+ (concatMapBySerial 1 streamLen)
734+ , benchFold "sortBy" sortBy (unfoldrM streamLen)
735+ -}
736+ ]
737+ where
738+ streamLen2 = round (P.fromIntegral streamLen**(1/2::P.Double)) -- double nested loop
739+
740+o_1_space_filtering :: Int -> Benchmark
741+o_1_space_filtering streamLen =
742+ bgroup "filtering"
743+ [ benchFold "filter-even" (filterEven 1) (unfoldrMK streamLen)
744+ {-
745+ , benchFold "filter-all-out" (filterAllOut streamLen 1) (unfoldrM streamLen)
746+ , benchFold "filter-all-in" (filterAllIn streamLen 1) (unfoldrM streamLen)
747+ , benchFold "take-all" (takeAll streamLen 1) (unfoldrM streamLen)
748+ , benchFold "takeWhile-true" (takeWhileTrue streamLen 1) (unfoldrM streamLen)
749+ , benchFold "drop-one" (dropOne 1) (unfoldrM streamLen)
750+ , benchFold "drop-all" (dropAll streamLen 1) (unfoldrM streamLen)
751+ , benchFold "dropWhile-true" (dropWhileTrue streamLen 1) (unfoldrM streamLen)
752+ , benchFold "dropWhile-false" (dropWhileFalse 1) (unfoldrM streamLen)
753+ -}
754+ ]
755+
756+o_1_space_filteringX4 :: Int -> Benchmark
757+o_1_space_filteringX4 streamLen =
758+ bgroup "filteringX4"
759+ [ benchFold "filter-even" (filterEven 4) (unfoldrMK streamLen)
760+ {-
761+ , benchFold "filter-all-out" (filterAllOut streamLen 4) (unfoldrM streamLen)
762+ , benchFold "filter-all-in" (filterAllIn streamLen 4) (unfoldrM streamLen)
763+ , benchFold "take-all" (takeAll streamLen 4) (unfoldrM streamLen)
764+ , benchFold "takeWhile-true" (takeWhileTrue streamLen 4) (unfoldrM streamLen)
765+ , benchFold "drop-one" (dropOne 4) (unfoldrM streamLen)
766+ , benchFold "drop-all" (dropAll streamLen 4) (unfoldrM streamLen)
767+ , benchFold "dropWhile-true" (dropWhileTrue streamLen 4) (unfoldrM streamLen)
768+ , benchFold "dropWhile-false" (dropWhileFalse 4) (unfoldrM streamLen)
769+ -}
770+ ]
771+
772+{-
773+o_1_space_zipping :: Int -> Benchmark
774+o_1_space_zipping streamLen =
775+ bgroup "zipping"
776+ [ benchFold "zipWith" zipWith (unfoldrM streamLen)
777+ , benchFold "zipWithM" zipWithM (unfoldrM streamLen)
778+ ]
779+
780+o_1_space_mixed :: Int -> Benchmark
781+o_1_space_mixed streamLen =
782+ bgroup "mixed"
783+ [ benchFold "scan-map" (scanMap 1) (unfoldrM streamLen)
784+ , benchFold "drop-map" (dropMap 1) (unfoldrM streamLen)
785+ , benchFold "drop-scan" (dropScan 1) (unfoldrM streamLen)
786+ , benchFold "take-drop" (takeDrop streamLen 1) (unfoldrM streamLen)
787+ , benchFold "take-scan" (takeScan streamLen 1) (unfoldrM streamLen)
788+ , benchFold "take-map" (takeMap streamLen 1) (unfoldrM streamLen)
789+ , benchFold "filter-drop" (filterDrop streamLen 1) (unfoldrM streamLen)
790+ , benchFold "filter-take" (filterTake streamLen 1) (unfoldrM streamLen)
791+ , benchFold "filter-scan" (filterScan 1) (unfoldrM streamLen)
792+ , benchFold "filter-map" (filterMap streamLen 1) (unfoldrM streamLen)
793+ ]
794+
795+o_1_space_mixedX2 :: Int -> Benchmark
796+o_1_space_mixedX2 streamLen =
797+ bgroup "mixedX2"
798+ [ benchFold "scan-map" (scanMap 2) (unfoldrM streamLen)
799+ , benchFold "drop-map" (dropMap 2) (unfoldrM streamLen)
800+ , benchFold "drop-scan" (dropScan 2) (unfoldrM streamLen)
801+ , benchFold "take-drop" (takeDrop streamLen 2) (unfoldrM streamLen)
802+ , benchFold "take-scan" (takeScan streamLen 2) (unfoldrM streamLen)
803+ , benchFold "take-map" (takeMap streamLen 2) (unfoldrM streamLen)
804+ , benchFold "filter-drop" (filterDrop streamLen 2) (unfoldrM streamLen)
805+ , benchFold "filter-take" (filterTake streamLen 2) (unfoldrM streamLen)
806+ , benchFold "filter-scan" (filterScan 2) (unfoldrM streamLen)
807+ , benchFold "filter-map" (filterMap streamLen 2) (unfoldrM streamLen)
808+ ]
809+
810+o_1_space_mixedX4 :: Int -> Benchmark
811+o_1_space_mixedX4 streamLen =
812+ bgroup "mixedX4"
813+ [ benchFold "scan-map" (scanMap 4) (unfoldrM streamLen)
814+ , benchFold "drop-map" (dropMap 4) (unfoldrM streamLen)
815+ , benchFold "drop-scan" (dropScan 4) (unfoldrM streamLen)
816+ , benchFold "take-drop" (takeDrop streamLen 4) (unfoldrM streamLen)
817+ , benchFold "take-scan" (takeScan streamLen 4) (unfoldrM streamLen)
818+ , benchFold "take-map" (takeMap streamLen 4) (unfoldrM streamLen)
819+ , benchFold "filter-drop" (filterDrop streamLen 4) (unfoldrM streamLen)
820+ , benchFold "filter-take" (filterTake streamLen 4) (unfoldrM streamLen)
821+ , benchFold "filter-scan" (filterScan 4) (unfoldrM streamLen)
822+ , benchFold "filter-map" (filterMap streamLen 4) (unfoldrM streamLen)
823+ ]
824+ -}
825+
826+{-
827+o_1_space_list :: Int -> Benchmark
828+o_1_space_list streamLen =
829+ bgroup "list"
830+ [ bgroup "elimination"
831+ [ benchList "last" (\xs -> [List.last xs]) (unfoldrList streamLen)
832+ ]
833+ , bgroup "nested"
834+ [ benchList "toNullAp" toNullApNestedList (unfoldrList streamLen2)
835+ , benchList "toNull" toNullNestedList (unfoldrList streamLen2)
836+ , benchList "toNull3" toNullNestedList3 (unfoldrList streamLen3)
837+ , benchList "filterAllIn" filterAllInNestedList (unfoldrList streamLen2)
838+ , benchList "filterAllOut" filterAllOutNestedList (unfoldrList streamLen2)
839+ ]
840+ ]
841+ where
842+
843+ streamLen2 = round (P.fromIntegral streamLen**(1/2::P.Double)) -- double nested loop
844+ streamLen3 = round (P.fromIntegral streamLen**(1/3::P.Double)) -- triple nested loop
845+-}
846+
847+o_1_space :: Int -> Benchmark
848+o_1_space streamLen =
849+ bgroup (o_1_space_prefix moduleName)
850+ [ o_1_space_generation streamLen
851+ , o_1_space_elimination streamLen
852+ -- , o_1_space_nested streamLen
853+ , o_1_space_transformation streamLen
854+ , o_1_space_transformationX4 streamLen
855+ , o_1_space_concat streamLen
856+ , o_1_space_filtering streamLen
857+ , o_1_space_filteringX4 streamLen
858+ -- , o_1_space_zipping streamLen
859+ -- , o_1_space_mixed streamLen
860+ -- , o_1_space_mixedX2 streamLen
861+ -- , o_1_space_mixedX4 streamLen
862+ -- , o_1_space_list streamLen
863+ ]
864+
865+{-
866+o_n_heap :: Int -> Benchmark
867+o_n_heap streamLen =
868+ bgroup (o_n_heap_prefix moduleName)
869+ [ bgroup "transformation"
870+ [ benchFold "foldlS" (foldlS 1) (unfoldrM streamLen)
871+ ]
872+ ]
873+
874+{-# INLINE benchK #-}
875+benchK :: P.String -> (Int -> Stream P.IO Int) -> Benchmark
876+benchK name f = bench name $ nfIO $ randomRIO (1,1) >>= drain . f
877+
878+o_n_stack :: Int -> Int -> Int -> Benchmark
879+o_n_stack streamLen iterStreamLen maxIters =
880+ bgroup (o_n_stack_prefix moduleName)
881+ [ bgroup "elimination"
882+ [ benchFold "tail" tail (unfoldrM streamLen)
883+ , benchFold "nullTail" nullTail (unfoldrM streamLen)
884+ , benchFold "headTail" headTail (unfoldrM streamLen)
885+ ]
886+ , bgroup "transformation"
887+ [
888+ -- XXX why do these need so much stack
889+ benchFold "intersperse" (intersperse streamLen 1) (unfoldrM streamLen2)
890+ , benchFold "interspersePure" (intersperse streamLen 1) (unfoldr streamLen2)
891+ ]
892+ , bgroup "transformationX4"
893+ [
894+ benchFold "intersperse" (intersperse streamLen 4) (unfoldrM streamLen16)
895+ ]
896+ , bgroup "iterated"
897+ [ benchK "mapM" (iterateMapM iterStreamLen maxIters)
898+ , benchK "scan(1/10)" (iterateScan iterStreamLen maxIters)
899+ , benchK "filterEven" (iterateFilterEven iterStreamLen maxIters)
900+ , benchK "takeAll" (iterateTakeAll streamLen iterStreamLen maxIters)
901+ , benchK "dropOne" (iterateDropOne iterStreamLen maxIters)
902+ , benchK "dropWhileFalse(1/10)" (iterateDropWhileFalse streamLen iterStreamLen maxIters)
903+ , benchK "dropWhileTrue" (iterateDropWhileTrue streamLen iterStreamLen maxIters)
904+ ]
905+ ]
906+ where
907+ streamLen2 = round (P.fromIntegral streamLen**(1/2::P.Double)) -- double nested loop
908+ streamLen16 = round (P.fromIntegral streamLen**(1/16::P.Double)) -- triple nested loop
909+-}
910+
911+o_n_space :: Int -> Benchmark
912+o_n_space streamLen =
913+ bgroup (o_n_space_prefix moduleName)
914+ [ bgroup "elimination"
915+ [ benchFold "toList" toList (unfoldrMK streamLen)
916+ ]
917+ ]
918+
919+{-
920+{-# INLINE benchList #-}
921+benchList :: P.String -> ([Int] -> [Int]) -> (Int -> [Int]) -> Benchmark
922+benchList name run f = bench name $ nfIO $ randomRIO (1,1) >>= return . run . f
923+-}
924+
925+main :: IO ()
926+main =
927+ defaultMain
928+ [ o_1_space streamLen
929+ -- , o_n_stack streamLen iterStreamLen maxIters
930+ -- , o_n_heap streamLen
931+ , o_n_space streamLen
932+ ]
933+
934+ where
935+
936+ streamLen = 100000
937+ -- maxIters = 10000
938+ -- iterStreamLen = 10
benchmark/Streamly/Benchmark/Prelude/Serial/Transformation1.hs → benchmark/Streamly/Benchmark/Data/Stream/Transform.hsrenamed+284−164
@@ -1,14 +1,20 @@
11-- |
2−-- Module : Serial.Transformation1
2+-- Module : Stream.Transform
33-- Copyright : (c) 2018 Composewell Technologies
44-- License : BSD-3-Clause
55-- Maintainer : streamly@composewell.com
66
77{-# LANGUAGE CPP #-}
88{-# LANGUAGE FlexibleContexts #-}
9+{-# LANGUAGE FlexibleInstances #-}
910{-# LANGUAGE ScopedTypeVariables #-}
1011{-# LANGUAGE RankNTypes #-}
1112
13+{-# OPTIONS_GHC -Wno-orphans #-}
14+#ifdef USE_PRELUDE
15+{-# OPTIONS_GHC -Wno-deprecations #-}
16+#endif
17+
1218#ifdef __HADDOCK_VERSION__
1319#undef INSPECTION
1420#endif
@@ -18,30 +24,48 @@
1824{-# OPTIONS_GHC -fplugin Test.Inspection.Plugin #-}
1925#endif
2026
21−module Serial.Transformation1 (benchmarks) where
27+module Stream.Transform (benchmarks) where
2228
23−import Control.DeepSeq (NFData(..))
2429import Control.Monad.IO.Class (MonadIO(..))
25−import Data.Functor.Identity (Identity)
26−import Data.IORef (newIORef, modifyIORef')
27−import System.Random (randomRIO)
2830
29−#ifdef INSPECTION
30−import Test.Inspection
31−#endif
31+import System.Random (randomRIO)
3232
33−import qualified Streamly.Prelude as S
34−import qualified Streamly.Internal.Data.Stream.IsStream as Internal
3533import qualified Streamly.Internal.Data.Fold as FL
34+
35+import qualified Stream.Common as Common
3636import qualified Streamly.Internal.Data.Unfold as Unfold
37+
38+#ifdef USE_PRELUDE
39+import Control.DeepSeq (NFData(..))
40+import Data.Functor.Identity (Identity(..))
41+import qualified Prelude
42+import qualified Streamly.Internal.Data.Fold as Fold
43+import qualified Streamly.Internal.Data.Stream.IsStream as Stream
44+import Streamly.Internal.Data.Time.Units
45+#else
46+import Streamly.Internal.Data.Stream (Stream)
47+import qualified Streamly.Internal.Data.Stream as Stream
48+#ifndef USE_STREAMLY_CORE
49+import qualified Streamly.Internal.Data.Stream.Prelude as Stream
50+#endif
51+#ifdef USE_STREAMK
52+import Control.DeepSeq (NFData(..))
53+import Data.Functor.Identity (Identity(..))
3754import qualified Prelude
55+import qualified Streamly.Internal.Data.Fold as Fold
56+import Streamly.Internal.Data.StreamK (StreamK)
57+import qualified Streamly.Internal.Data.StreamK as StreamK
58+#endif
59+#endif
3860
39−import Gauge
40−import Streamly.Prelude (SerialT, fromSerial, MonadAsync)
61+import Test.Tasty.Bench
62+import Stream.Common hiding (scanl')
4163import Streamly.Benchmark.Common
42−import Streamly.Benchmark.Prelude
43−import Streamly.Internal.Data.Time.Units
44−import Prelude hiding (sequence, mapM, fmap)
64+import Prelude hiding (sequence, mapM)
65+
66+#ifdef USE_PRELUDE
67+type Stream = Stream.SerialT
68+#endif
4569
4670-------------------------------------------------------------------------------
4771-- Pipelines (stream-to-stream transformations)
@@ -55,28 +79,36 @@ import Prelude hiding (sequence, mapM, fmap)
5579-- Traversable Instance
5680-------------------------------------------------------------------------------
5781
82+#ifdef USE_STREAMK
5883{-# INLINE traversableTraverse #-}
59−traversableTraverse :: SerialT Identity Int -> IO (SerialT Identity Int)
84+traversableTraverse :: StreamK Identity Int -> IO (StreamK Identity Int)
6085traversableTraverse = traverse return
6186
6287{-# INLINE traversableSequenceA #-}
63−traversableSequenceA :: SerialT Identity Int -> IO (SerialT Identity Int)
88+traversableSequenceA :: StreamK Identity Int -> IO (StreamK Identity Int)
6489traversableSequenceA = sequenceA . Prelude.fmap return
6590
6691{-# INLINE traversableMapM #-}
67−traversableMapM :: SerialT Identity Int -> IO (SerialT Identity Int)
92+traversableMapM :: StreamK Identity Int -> IO (StreamK Identity Int)
6893traversableMapM = Prelude.mapM return
6994
7095{-# INLINE traversableSequence #-}
71−traversableSequence :: SerialT Identity Int -> IO (SerialT Identity Int)
96+traversableSequence :: StreamK Identity Int -> IO (StreamK Identity Int)
7297traversableSequence = Prelude.sequence . Prelude.fmap return
7398
7499{-# INLINE benchPureSinkIO #-}
75100benchPureSinkIO
76101 :: NFData b
77− => Int -> String -> (SerialT Identity Int -> IO b) -> Benchmark
102+ => Int -> String -> (StreamK Identity Int -> IO b) -> Benchmark
78103benchPureSinkIO value name f =
79− bench name $ nfIO $ randomRIO (1, 1) >>= f . sourceUnfoldr value
104+ bench name
105+ $ nfIO $ randomRIO (1, 1) >>= f . fromStream . sourceUnfoldr value
106+
107+instance NFData a => NFData (StreamK Identity a) where
108+ {-# INLINE rnf #-}
109+ rnf xs =
110+ runIdentity
111+ $ Stream.fold (Fold.foldl' (\_ x -> rnf x) ()) (toStream xs)
80112
81113o_n_space_traversable :: Int -> [Benchmark]
82114o_n_space_traversable value =
@@ -89,113 +121,124 @@ o_n_space_traversable value =
89121 , benchPureSinkIO value "sequence" traversableSequence
90122 ]
91123 ]
124+#endif
92125
93126-------------------------------------------------------------------------------
94127-- maps and scans
95128-------------------------------------------------------------------------------
96129
130+#ifdef USE_PRELUDE
97131{-# INLINE scanl' #-}
98−scanl' :: MonadIO m => Int -> SerialT m Int -> m ()
99−scanl' n = composeN n $ S.scanl' (+) 0
132+scanl' :: MonadIO m => Int -> Stream m Int -> m ()
133+scanl' n = composeN n $ Stream.scanl' (+) 0
100134
101135{-# INLINE scanlM' #-}
102−scanlM' :: MonadIO m => Int -> SerialT m Int -> m ()
103−scanlM' n = composeN n $ S.scanlM' (\b a -> return $ b + a) (return 0)
136+scanlM' :: MonadIO m => Int -> Stream m Int -> m ()
137+scanlM' n = composeN n $ Stream.scanlM' (\b a -> return $ b + a) (return 0)
104138
105139{-# INLINE scanl1' #-}
106−scanl1' :: MonadIO m => Int -> SerialT m Int -> m ()
107−scanl1' n = composeN n $ S.scanl1' (+)
140+scanl1' :: MonadIO m => Int -> Stream m Int -> m ()
141+scanl1' n = composeN n $ Stream.scanl1' (+)
108142
109143{-# INLINE scanl1M' #-}
110−scanl1M' :: MonadIO m => Int -> SerialT m Int -> m ()
111−scanl1M' n = composeN n $ S.scanl1M' (\b a -> return $ b + a)
144+scanl1M' :: MonadIO m => Int -> Stream m Int -> m ()
145+scanl1M' n = composeN n $ Stream.scanl1M' (\b a -> return $ b + a)
146+#endif
112147
113148{-# INLINE scan #-}
114−scan :: MonadIO m => Int -> SerialT m Int -> m ()
115−scan n = composeN n $ S.scan FL.sum
149+scan :: MonadIO m => Int -> Stream m Int -> m ()
150+scan n = composeN n $ Stream.scan FL.sum
116151
152+#ifdef USE_PRELUDE
117153{-# INLINE postscanl' #-}
118−postscanl' :: MonadIO m => Int -> SerialT m Int -> m ()
119−postscanl' n = composeN n $ S.postscanl' (+) 0
154+postscanl' :: MonadIO m => Int -> Stream m Int -> m ()
155+postscanl' n = composeN n $ Stream.postscanl' (+) 0
120156
121157{-# INLINE postscanlM' #-}
122−postscanlM' :: MonadIO m => Int -> SerialT m Int -> m ()
123−postscanlM' n = composeN n $ S.postscanlM' (\b a -> return $ b + a) (return 0)
158+postscanlM' :: MonadIO m => Int -> Stream m Int -> m ()
159+postscanlM' n = composeN n $ Stream.postscanlM' (\b a -> return $ b + a) (return 0)
160+#endif
124161
125162{-# INLINE postscan #-}
126−postscan :: MonadIO m => Int -> SerialT m Int -> m ()
127−postscan n = composeN n $ S.postscan FL.sum
163+postscan :: MonadIO m => Int -> Stream m Int -> m ()
164+postscan n = composeN n $ Stream.postscan FL.sum
128165
129166{-# INLINE sequence #-}
130−sequence ::
131− (S.IsStream t, S.MonadAsync m)
132− => (t m Int -> S.SerialT m Int)
133− -> t m (m Int)
134− -> m ()
135−sequence t = S.drain . t . S.sequence
167+sequence :: MonadAsync m => Stream m (m Int) -> m ()
168+sequence = Common.drain . Stream.sequence
136169
137170{-# INLINE tap #-}
138−tap :: MonadIO m => Int -> SerialT m Int -> m ()
139−tap n = composeN n $ S.tap FL.sum
140−
141−{-# INLINE tapRate #-}
142−tapRate :: Int -> SerialT IO Int -> IO ()
143−tapRate n str = do
144− cref <- newIORef 0
145− composeN n (Internal.tapRate 1 (\c -> modifyIORef' cref (c +))) str
171+tap :: MonadIO m => Int -> Stream m Int -> m ()
172+tap n = composeN n $ Stream.tap FL.sum
146173
174+#ifdef USE_PRELUDE
147175{-# INLINE pollCounts #-}
148−pollCounts :: Int -> SerialT IO Int -> IO ()
176+pollCounts :: Int -> Stream IO Int -> IO ()
149177pollCounts n =
150− composeN n (Internal.pollCounts (const True) f FL.drain)
178+ composeN n (Stream.pollCounts (const True) f)
151179
152180 where
153181
154− f = Internal.rollingMap (-) . Internal.delayPost 1
182+ f = Stream.drain . Stream.rollingMap2 (-) . Stream.delayPost 1
155183
156184{-# INLINE timestamped #-}
157−timestamped :: (S.MonadAsync m) => SerialT m Int -> m ()
158−timestamped = S.drain . Internal.timestamped
185+timestamped :: (MonadAsync m) => Stream m Int -> m ()
186+timestamped = Stream.drain . Stream.timestamped
187+#endif
159188
189+#ifdef USE_STREAMK
160190{-# INLINE foldrS #-}
161−foldrS :: MonadIO m => Int -> SerialT m Int -> m ()
162−foldrS n = composeN n $ Internal.foldrS S.cons S.nil
191+foldrS :: MonadIO m => Int -> Stream m Int -> m ()
192+foldrS n =
193+ composeN n (toStream . StreamK.foldrS StreamK.cons StreamK.nil . fromStream)
163194
164195{-# INLINE foldrSMap #-}
165−foldrSMap :: MonadIO m => Int -> SerialT m Int -> m ()
166−foldrSMap n = composeN n $ Internal.foldrS (\x xs -> x + 1 `S.cons` xs) S.nil
196+foldrSMap :: MonadIO m => Int -> Stream m Int -> m ()
197+foldrSMap n =
198+ composeN n
199+ ( toStream
200+ . StreamK.foldrS (\x xs -> x + 1 `StreamK.cons` xs) StreamK.nil
201+ . fromStream
202+ )
203+#endif
167204
205+{-
168206{-# INLINE foldrT #-}
169−foldrT :: MonadIO m => Int -> SerialT m Int -> m ()
170−foldrT n = composeN n $ Internal.foldrT S.cons S.nil
207+foldrT :: MonadIO m => Int -> Stream m Int -> m ()
208+foldrT n = composeN n (unCrossStream . Stream.foldrT cns (CrossStream Stream.nil))
171209
172−{-# INLINE foldrTMap #-}
173−foldrTMap :: MonadIO m => Int -> SerialT m Int -> m ()
174−foldrTMap n = composeN n $ Internal.foldrT (\x xs -> x + 1 `S.cons` xs) S.nil
210+ where cns x (CrossStream xs) = CrossStream (Stream.cons x xs)
175211
212+{-# INLINE foldrTMap #-}
213+foldrTMap :: MonadIO m => Int -> Stream m Int -> m ()
214+foldrTMap n = composeN n $ Stream.foldrT (\x xs -> x + 1 `Stream.cons` xs) Stream.nil
215+-}
176216
177217{-# INLINE trace #-}
178−trace :: MonadAsync m => Int -> SerialT m Int -> m ()
179−trace n = composeN n $ Internal.trace return
218+trace :: MonadAsync m => Int -> Stream m Int -> m ()
219+trace n = composeN n $ Stream.trace return
180220
181221o_1_space_mapping :: Int -> [Benchmark]
182222o_1_space_mapping value =
183223 [ bgroup
184224 "mapping"
185225 [
226+#ifdef USE_STREAMK
186227 -- Right folds
187228 benchIOSink value "foldrS" (foldrS 1)
188229 , benchIOSink value "foldrSMap" (foldrSMap 1)
189− , benchIOSink value "foldrT" (foldrT 1)
190− , benchIOSink value "foldrTMap" (foldrTMap 1)
230+ ,
231+#endif
232+ -- , benchIOSink value "foldrT" (foldrT 1)
233+ -- , benchIOSink value "foldrTMap" (foldrTMap 1)
191234
192235 -- Mapping
193− , benchIOSink value "map" (mapN fromSerial 1)
236+ benchIOSink value "map" (mapN 1)
194237 , bench "sequence" $ nfIO $ randomRIO (1, 1000) >>= \n ->
195− sequence fromSerial (sourceUnfoldrAction value n)
196− , benchIOSink value "mapM" (mapM fromSerial 1)
238+ sequence (sourceUnfoldrAction value n)
239+ , benchIOSink value "mapM" (mapM 1)
197240 , benchIOSink value "tap" (tap 1)
198− , benchIOSink value "tapRate 1 second" (tapRate 1)
241+#ifdef USE_PRELUDE
199242 , benchIOSink value "pollCounts 1 second" (pollCounts 1)
200243 , benchIOSink value "timestamped" timestamped
201244
@@ -206,7 +249,7 @@ o_1_space_mapping value =
206249 , benchIOSink value "scanl1M'" (scanl1M' 1)
207250 , benchIOSink value "postscanl'" (postscanl' 1)
208251 , benchIOSink value "postscanlM'" (postscanlM' 1)
209−
252+#endif
210253 , benchIOSink value "scan" (scan 1)
211254 , benchIOSink value "postscan" (postscan 1)
212255 ]
@@ -215,36 +258,37 @@ o_1_space_mapping value =
215258o_1_space_mappingX4 :: Int -> [Benchmark]
216259o_1_space_mappingX4 value =
217260 [ bgroup "mappingX4"
218− [ benchIOSink value "map" (mapN fromSerial 4)
219− , benchIOSink value "mapM" (mapM fromSerial 4)
261+ [ benchIOSink value "map" (mapN 4)
262+ , benchIOSink value "mapM" (mapM 4)
220263 , benchIOSink value "trace" (trace 4)
221264
265+#ifdef USE_PRELUDE
222266 , benchIOSink value "scanl'" (scanl' 4)
223267 , benchIOSink value "scanl1'" (scanl1' 4)
224268 , benchIOSink value "scanlM'" (scanlM' 4)
225269 , benchIOSink value "scanl1M'" (scanl1M' 4)
226270 , benchIOSink value "postscanl'" (postscanl' 4)
227271 , benchIOSink value "postscanlM'" (postscanlM' 4)
228−
272+#endif
229273 ]
230274 ]
231275
232276{-# INLINE sieveScan #-}
233−sieveScan :: Monad m => SerialT m Int -> SerialT m Int
277+sieveScan :: Monad m => Stream m Int -> Stream m Int
234278sieveScan =
235− S.mapMaybe snd
236− . S.scanlM' (\(primes, _) n -> do
279+ Stream.mapMaybe snd
280+ . Stream.scan (FL.foldlM' (\(primes, _) n -> do
237281 return $
238282 let ps = takeWhile (\p -> p * p <= n) primes
239283 in if all (\p -> n `mod` p /= 0) ps
240284 then (primes ++ [n], Just n)
241− else (primes, Nothing)) (return ([2], Just 2))
285+ else (primes, Nothing)) (return ([2], Just 2)))
242286
243287o_n_space_mapping :: Int -> [Benchmark]
244288o_n_space_mapping value =
245289 [ bgroup "mapping"
246290 [ benchIO "naive prime sieve"
247− (\n -> S.sum $ sieveScan $ S.enumerateFromTo 2 (value + n))
291+ (\n -> Stream.fold FL.sum $ sieveScan $ Stream.enumerateFromTo 2 (value + n))
248292 ]
249293 ]
250294
@@ -255,8 +299,75 @@ o_n_space_mapping value =
255299o_1_space_functor :: Int -> [Benchmark]
256300o_1_space_functor value =
257301 [ bgroup "Functor"
258− [ benchIOSink value "fmap" (fmapN fromSerial 1)
259− , benchIOSink value "fmap x 4" (fmapN fromSerial 4)
302+ [ benchIOSink value "fmap" (mapN 1)
303+ , benchIOSink value "fmap x 4" (mapN 4)
304+ ]
305+ ]
306+
307+-------------------------------------------------------------------------------
308+-- Iteration/looping utilities
309+-------------------------------------------------------------------------------
310+
311+{-# INLINE iterateN #-}
312+iterateN :: (Int -> a -> a) -> a -> Int -> a
313+iterateN g initial count = f count initial
314+
315+ where
316+
317+ f (0 :: Int) x = x
318+ f i x = f (i - 1) (g i x)
319+
320+#ifdef USE_STREAMK
321+-- Iterate a transformation over a singleton stream
322+{-# INLINE iterateSingleton #-}
323+iterateSingleton :: Applicative m =>
324+ (Int -> StreamK m Int -> StreamK m Int)
325+ -> Int
326+ -> Int
327+ -> Stream m Int
328+iterateSingleton g count n = toStream $ iterateN g (StreamK.fromPure n) count
329+#else
330+-- Iterate a transformation over a singleton stream
331+{-# INLINE iterateSingleton #-}
332+iterateSingleton :: Applicative m =>
333+ (Int -> Stream m Int -> Stream m Int)
334+ -> Int
335+ -> Int
336+ -> Stream m Int
337+iterateSingleton g count n = iterateN g (Stream.fromPure n) count
338+#endif
339+
340+{-
341+-- XXX need to check why this is slower than the explicit recursion above, even
342+-- if the above code is written in a foldr like head recursive way. We also
343+-- need to try this with foldlM' once #150 is fixed.
344+-- However, it is perhaps best to keep the iteration benchmarks independent of
345+-- foldrM and any related fusion issues.
346+{-# INLINE _iterateSingleton #-}
347+_iterateSingleton ::
348+ Monad m
349+ => (Int -> Stream m Int -> Stream m Int)
350+ -> Int
351+ -> Int
352+ -> Stream m Int
353+_iterateSingleton g value n = S.foldrM g (return n) $ sourceIntFromTo value n
354+-}
355+
356+o_n_space_iterated :: Int -> [Benchmark]
357+o_n_space_iterated value =
358+ [ bgroup "iterated"
359+ [ benchIO "(+) (n times) (baseline)" $ \i0 ->
360+ iterateN (\i acc -> acc >>= \n -> return $ i + n) (return i0) value
361+ , benchIOSrc "(<$) (n times)" $
362+ iterateSingleton (<$) value
363+ , benchIOSrc "fmap (n times)" $
364+ iterateSingleton (fmap . (+)) value
365+ {-
366+ , benchIOSrc fromSerial "_(<$) (n times)" $
367+ _iterateSingleton (<$) value
368+ , benchIOSrc fromSerial "_fmap (n times)" $
369+ _iterateSingleton (fmap . (+)) value
370+ -}
260371 ]
261372 ]
262373
@@ -265,121 +376,129 @@ o_1_space_functor value =
265376-------------------------------------------------------------------------------
266377
267378{-# INLINE filterEven #-}
268−filterEven :: MonadIO m => Int -> SerialT m Int -> m ()
269−filterEven n = composeN n $ S.filter even
379+filterEven :: MonadIO m => Int -> Stream m Int -> m ()
380+filterEven n = composeN n $ Stream.filter even
270381
271382{-# INLINE filterAllOut #-}
272−filterAllOut :: MonadIO m => Int -> Int -> SerialT m Int -> m ()
273−filterAllOut value n = composeN n $ S.filter (> (value + 1))
383+filterAllOut :: MonadIO m => Int -> Int -> Stream m Int -> m ()
384+filterAllOut value n = composeN n $ Stream.filter (> (value + 1))
274385
275386{-# INLINE filterAllIn #-}
276−filterAllIn :: MonadIO m => Int -> Int -> SerialT m Int -> m ()
277−filterAllIn value n = composeN n $ S.filter (<= (value + 1))
387+filterAllIn :: MonadIO m => Int -> Int -> Stream m Int -> m ()
388+filterAllIn value n = composeN n $ Stream.filter (<= (value + 1))
278389
279390{-# INLINE filterMEven #-}
280−filterMEven :: MonadIO m => Int -> SerialT m Int -> m ()
281−filterMEven n = composeN n $ S.filterM (return . even)
391+filterMEven :: MonadIO m => Int -> Stream m Int -> m ()
392+filterMEven n = composeN n $ Stream.filterM (return . even)
282393
283394{-# INLINE filterMAllOut #-}
284−filterMAllOut :: MonadIO m => Int -> Int -> SerialT m Int -> m ()
285−filterMAllOut value n = composeN n $ S.filterM (\x -> return $ x > (value + 1))
395+filterMAllOut :: MonadIO m => Int -> Int -> Stream m Int -> m ()
396+filterMAllOut value n = composeN n $ Stream.filterM (\x -> return $ x > (value + 1))
286397
287398{-# INLINE filterMAllIn #-}
288−filterMAllIn :: MonadIO m => Int -> Int -> SerialT m Int -> m ()
289−filterMAllIn value n = composeN n $ S.filterM (\x -> return $ x <= (value + 1))
399+filterMAllIn :: MonadIO m => Int -> Int -> Stream m Int -> m ()
400+filterMAllIn value n = composeN n $ Stream.filterM (\x -> return $ x <= (value + 1))
290401
291402{-# INLINE _takeOne #-}
292−_takeOne :: MonadIO m => Int -> SerialT m Int -> m ()
293−_takeOne n = composeN n $ S.take 1
403+_takeOne :: MonadIO m => Int -> Stream m Int -> m ()
404+_takeOne n = composeN n $ Stream.take 1
294405
295406{-# INLINE takeAll #-}
296−takeAll :: MonadIO m => Int -> Int -> SerialT m Int -> m ()
297−takeAll value n = composeN n $ S.take (value + 1)
407+takeAll :: MonadIO m => Int -> Int -> Stream m Int -> m ()
408+takeAll value n = composeN n $ Stream.take (value + 1)
298409
299410{-# INLINE takeWhileTrue #-}
300−takeWhileTrue :: MonadIO m => Int -> Int -> SerialT m Int -> m ()
301−takeWhileTrue value n = composeN n $ S.takeWhile (<= (value + 1))
411+takeWhileTrue :: MonadIO m => Int -> Int -> Stream m Int -> m ()
412+takeWhileTrue value n = composeN n $ Stream.takeWhile (<= (value + 1))
302413
303414{-# INLINE takeWhileMTrue #-}
304−takeWhileMTrue :: MonadIO m => Int -> Int -> SerialT m Int -> m ()
305−takeWhileMTrue value n = composeN n $ S.takeWhileM (return . (<= (value + 1)))
415+takeWhileMTrue :: MonadIO m => Int -> Int -> Stream m Int -> m ()
416+takeWhileMTrue value n = composeN n $ Stream.takeWhileM (return . (<= (value + 1)))
306417
418+#if !defined(USE_STREAMLY_CORE) && !defined(USE_PRELUDE)
307419{-# INLINE takeInterval #-}
308−takeInterval :: NanoSecond64 -> Int -> SerialT IO Int -> IO ()
309−takeInterval i n = composeN n (Internal.takeInterval i)
420+takeInterval :: Double -> Int -> Stream IO Int -> IO ()
421+takeInterval i n = composeN n (Stream.takeInterval i)
310422
423+-- Inspection testing is disabled for takeInterval
424+-- Enable it when looking at it throughly
311425#ifdef INSPECTION
312426-- inspect $ hasNoType 'takeInterval ''SPEC
313−inspect $ hasNoTypeClasses 'takeInterval
427+-- inspect $ hasNoTypeClasses 'takeInterval
314428-- inspect $ 'takeInterval `hasNoType` ''D.Step
315429#endif
316430
431+{-# INLINE dropInterval #-}
432+dropInterval :: Double -> Int -> Stream IO Int -> IO ()
433+dropInterval i n = composeN n (Stream.dropInterval i)
434+
435+-- Inspection testing is disabled for dropInterval
436+-- Enable it when looking at it throughly
437+#ifdef INSPECTION
438+-- inspect $ hasNoTypeClasses 'dropInterval
439+-- inspect $ 'dropInterval `hasNoType` ''D.Step
440+#endif
441+#endif
442+
317443{-# INLINE dropOne #-}
318−dropOne :: MonadIO m => Int -> SerialT m Int -> m ()
319−dropOne n = composeN n $ S.drop 1
444+dropOne :: MonadIO m => Int -> Stream m Int -> m ()
445+dropOne n = composeN n $ Stream.drop 1
320446
321447{-# INLINE dropAll #-}
322−dropAll :: MonadIO m => Int -> Int -> SerialT m Int -> m ()
323−dropAll value n = composeN n $ S.drop (value + 1)
448+dropAll :: MonadIO m => Int -> Int -> Stream m Int -> m ()
449+dropAll value n = composeN n $ Stream.drop (value + 1)
324450
325451{-# INLINE dropWhileTrue #-}
326−dropWhileTrue :: MonadIO m => Int -> Int -> SerialT m Int -> m ()
327−dropWhileTrue value n = composeN n $ S.dropWhile (<= (value + 1))
452+dropWhileTrue :: MonadIO m => Int -> Int -> Stream m Int -> m ()
453+dropWhileTrue value n = composeN n $ Stream.dropWhile (<= (value + 1))
328454
329455{-# INLINE dropWhileMTrue #-}
330−dropWhileMTrue :: MonadIO m => Int -> Int -> SerialT m Int -> m ()
331−dropWhileMTrue value n = composeN n $ S.dropWhileM (return . (<= (value + 1)))
456+dropWhileMTrue :: MonadIO m => Int -> Int -> Stream m Int -> m ()
457+dropWhileMTrue value n = composeN n $ Stream.dropWhileM (return . (<= (value + 1)))
332458
333459{-# INLINE dropWhileFalse #-}
334−dropWhileFalse :: MonadIO m => Int -> Int -> SerialT m Int -> m ()
335−dropWhileFalse value n = composeN n $ S.dropWhile (> (value + 1))
460+dropWhileFalse :: MonadIO m => Int -> Int -> Stream m Int -> m ()
461+dropWhileFalse value n = composeN n $ Stream.dropWhile (> (value + 1))
336462
463+#ifdef USE_PRELUDE
337464-- XXX Decide on the time interval
338465{-# INLINE _intervalsOfSum #-}
339−_intervalsOfSum :: MonadAsync m => Double -> Int -> SerialT m Int -> m ()
340−_intervalsOfSum i n = composeN n (S.intervalsOf i FL.sum)
341−
342−{-# INLINE dropInterval #-}
343−dropInterval :: NanoSecond64 -> Int -> SerialT IO Int -> IO ()
344−dropInterval i n = composeN n (Internal.dropInterval i)
345−
346−#ifdef INSPECTION
347−inspect $ hasNoTypeClasses 'dropInterval
348−-- inspect $ 'dropInterval `hasNoType` ''D.Step
466+_intervalsOfSum :: MonadAsync m => Double -> Int -> Stream m Int -> m ()
467+_intervalsOfSum i n = composeN n (Stream.intervalsOf i FL.sum)
349468#endif
350469
351470{-# INLINE findIndices #-}
352−findIndices :: MonadIO m => Int -> Int -> SerialT m Int -> m ()
353−findIndices value n = composeN n $ S.findIndices (== (value + 1))
471+findIndices :: MonadIO m => Int -> Int -> Stream m Int -> m ()
472+findIndices value n = composeN n $ Stream.findIndices (== (value + 1))
354473
355474{-# INLINE elemIndices #-}
356−elemIndices :: MonadIO m => Int -> Int -> SerialT m Int -> m ()
357−elemIndices value n = composeN n $ S.elemIndices (value + 1)
475+elemIndices :: MonadIO m => Int -> Int -> Stream m Int -> m ()
476+elemIndices value n = composeN n $ Stream.elemIndices (value + 1)
358477
359478{-# INLINE deleteBy #-}
360−deleteBy :: MonadIO m => Int -> Int -> SerialT m Int -> m ()
361−deleteBy value n = composeN n $ S.deleteBy (>=) (value + 1)
479+deleteBy :: MonadIO m => Int -> Int -> Stream m Int -> m ()
480+deleteBy value n = composeN n $ Stream.deleteBy (>=) (value + 1)
362481
363482-- uniq . uniq == uniq, composeN 2 ~ composeN 1
364483{-# INLINE uniq #-}
365−uniq :: MonadIO m => Int -> SerialT m Int -> m ()
366−uniq n = composeN n S.uniq
484+uniq :: MonadIO m => Int -> Stream m Int -> m ()
485+uniq n = composeN n Stream.uniq
367486
368487{-# INLINE mapMaybe #-}
369−mapMaybe :: MonadIO m => Int -> SerialT m Int -> m ()
488+mapMaybe :: MonadIO m => Int -> Stream m Int -> m ()
370489mapMaybe n =
371490 composeN n $
372− S.mapMaybe
491+ Stream.mapMaybe
373492 (\x ->
374493 if odd x
375494 then Nothing
376495 else Just x)
377496
378497{-# INLINE mapMaybeM #-}
379−mapMaybeM :: S.MonadAsync m => Int -> SerialT m Int -> m ()
498+mapMaybeM :: MonadAsync m => Int -> Stream m Int -> m ()
380499mapMaybeM n =
381500 composeN n $
382− S.mapMaybeM
501+ Stream.mapMaybeM
383502 (\x ->
384503 if odd x
385504 then return Nothing
@@ -398,18 +517,14 @@ o_1_space_filtering value =
398517
399518 -- Trimming
400519 , benchIOSink value "take-all" (takeAll value 1)
401− , benchIOSink
402− value
403− "takeInterval-all"
404− (takeInterval (NanoSecond64 maxBound) 1)
405520 , benchIOSink value "takeWhile-true" (takeWhileTrue value 1)
406521 -- , benchIOSink value "takeWhileM-true" (_takeWhileMTrue value 1)
407522 , benchIOSink value "drop-one" (dropOne 1)
408523 , benchIOSink value "drop-all" (dropAll value 1)
409− , benchIOSink
410− value
411− "dropInterval-all"
412− (dropInterval (NanoSecond64 maxBound) 1)
524+#if !defined(USE_STREAMLY_CORE) && !defined(USE_PRELUDE)
525+ , benchIOSink value "takeInterval-all" (takeInterval 10000 1)
526+ , benchIOSink value "dropInterval-all" (dropInterval 10000 1)
527+#endif
413528 , benchIOSink value "dropWhile-true" (dropWhileTrue value 1)
414529 -- , benchIOSink value "dropWhileM-true" (_dropWhileMTrue value 1)
415530 , benchIOSink
@@ -472,26 +587,26 @@ o_1_space_filteringX4 value =
472587-------------------------------------------------------------------------------
473588
474589{-# INLINE intersperse #-}
475−intersperse :: S.MonadAsync m => Int -> Int -> SerialT m Int -> m ()
476−intersperse value n = composeN n $ S.intersperse (value + 1)
590+intersperse :: MonadAsync m => Int -> Int -> Stream m Int -> m ()
591+intersperse value n = composeN n $ Stream.intersperse (value + 1)
477592
478593{-# INLINE intersperseM #-}
479−intersperseM :: S.MonadAsync m => Int -> Int -> SerialT m Int -> m ()
480−intersperseM value n = composeN n $ S.intersperseM (return $ value + 1)
594+intersperseM :: MonadAsync m => Int -> Int -> Stream m Int -> m ()
595+intersperseM value n = composeN n $ Stream.intersperseM (return $ value + 1)
481596
482597{-# INLINE insertBy #-}
483−insertBy :: MonadIO m => Int -> Int -> SerialT m Int -> m ()
484−insertBy value n = composeN n $ S.insertBy compare (value + 1)
598+insertBy :: MonadIO m => Int -> Int -> Stream m Int -> m ()
599+insertBy value n = composeN n $ Stream.insertBy compare (value + 1)
485600
486601{-# INLINE interposeSuffix #-}
487−interposeSuffix :: S.MonadAsync m => Int -> Int -> SerialT m Int -> m ()
602+interposeSuffix :: Monad m => Int -> Int -> Stream m Int -> m ()
488603interposeSuffix value n =
489− composeN n $ Internal.interposeSuffix (value + 1) Unfold.identity
604+ composeN n $ Stream.interposeSuffix (value + 1) Unfold.identity
490605
491606{-# INLINE intercalateSuffix #-}
492−intercalateSuffix :: S.MonadAsync m => Int -> Int -> SerialT m Int -> m ()
607+intercalateSuffix :: Monad m => Int -> Int -> Stream m Int -> m ()
493608intercalateSuffix value n =
494− composeN n $ Internal.intercalateSuffix Unfold.identity (value + 1)
609+ composeN n $ Stream.intercalateSuffix Unfold.identity (value + 1)
495610
496611o_1_space_inserting :: Int -> [Benchmark]
497612o_1_space_inserting value =
@@ -517,12 +632,12 @@ o_1_space_insertingX4 value =
517632-------------------------------------------------------------------------------
518633
519634{-# INLINE indexed #-}
520−indexed :: MonadIO m => Int -> SerialT m Int -> m ()
521−indexed n = composeN n (S.map snd . S.indexed)
635+indexed :: MonadIO m => Int -> Stream m Int -> m ()
636+indexed n = composeN n (fmap snd . Stream.indexed)
522637
523638{-# INLINE indexedR #-}
524−indexedR :: MonadIO m => Int -> Int -> SerialT m Int -> m ()
525−indexedR value n = composeN n (S.map snd . S.indexedR value)
639+indexedR :: MonadIO m => Int -> Int -> Stream m Int -> m ()
640+indexedR value n = composeN n (fmap snd . Stream.indexedR value)
526641
527642o_1_space_indexing :: Int -> [Benchmark]
528643o_1_space_indexing value =
@@ -561,7 +676,12 @@ benchmarks moduleName size =
561676 , o_1_space_indexingX4 size
562677 ]
563678 , bgroup (o_n_space_prefix moduleName) $ Prelude.concat
564− [ o_n_space_traversable size
565− , o_n_space_mapping size
679+ [
680+#ifdef USE_STREAMK
681+ o_n_space_traversable size
682+ ,
683+#endif
684+ o_n_space_mapping size
685+ , o_n_space_iterated size
566686 ]
567687 ]
benchmark/Streamly/Benchmark/Data/Unfold.hs+89−60
@@ -21,6 +21,8 @@ module Main (main) where
2121
2222import Control.DeepSeq (NFData(..))
2323import Control.Exception (SomeException, ErrorCall, try)
24+import Data.Char (ord)
25+import Data.Word (Word8)
2426import Streamly.Internal.Data.Unfold (Unfold)
2527import System.IO (Handle, hClose)
2628import System.Random (randomRIO)
@@ -29,17 +31,18 @@ import qualified Prelude
2931import qualified Streamly.FileSystem.Handle as FH
3032import qualified Streamly.Internal.Data.Fold as FL
3133import qualified Streamly.Internal.Data.Unfold as UF
32−import qualified Streamly.Internal.Data.Stream.IsStream as S
33−import qualified Streamly.Internal.Data.Stream.StreamD as D
34−import qualified Streamly.Internal.Data.Stream.StreamK as K
35−import qualified Streamly.Prelude as SP
34+import qualified Streamly.Internal.Data.Unfold.Prelude as UF
35+import qualified Streamly.Internal.Data.Stream as S
36+import qualified Streamly.Internal.Data.Stream as D
37+import qualified Streamly.Internal.Data.StreamK as K
3638
37−import Gauge hiding (env)
38−import Prelude hiding (concat, take, filter, zipWith, map, mapM, takeWhile)
39+import Test.Tasty.Bench hiding (env)
40+import Prelude hiding (take, filter, zipWith, map, mapM, takeWhile)
3941import Streamly.Benchmark.Common
4042import Streamly.Benchmark.Common.Handle
4143
4244#ifdef INSPECTION
45+import Control.Monad.Catch (MonadCatch)
4346import Test.Inspection
4447#endif
4548
@@ -54,7 +57,7 @@ benchIO name f = bench name $ nfIO $ randomRIO (1,1) >>= f
5457-- generate numbers up to the argument value
5558{-# INLINE source #-}
5659source :: Monad m => Int -> Unfold m Int Int
57−source n = UF.supplySecond n UF.enumerateFromToIntegral
60+source n = UF.second n UF.enumerateFromToIntegral
5861
5962-------------------------------------------------------------------------------
6063-- Benchmark helpers
@@ -73,7 +76,7 @@ drainTransformation unf f seed = drainGeneration (f unf) seed
7376drainTransformationDefault ::
7477 Monad m => Int -> (Unfold m Int Int -> Unfold m c d) -> c -> m ()
7578drainTransformationDefault to =
76− drainTransformation (UF.supplySecond to UF.enumerateFromToIntegral)
79+ drainTransformation (UF.second to UF.enumerateFromToIntegral)
7780
7881{-# INLINE drainProduct #-}
7982drainProduct ::
@@ -96,7 +99,7 @@ drainProductDefault to = drainProduct src src
9699
97100 where
98101
99− src = UF.supplySecond to UF.enumerateFromToIntegral
102+ src = UF.second to UF.enumerateFromToIntegral
100103
101104-------------------------------------------------------------------------------
102105-- Operations on input
@@ -112,26 +115,26 @@ lmapM :: Monad m => Int -> Int -> m ()
112115lmapM size start =
113116 drainTransformationDefault (size + start) (UF.lmapM (return . (+) 1)) start
114117
115−{-# INLINE supply #-}
116−supply :: Monad m => Int -> Int -> m ()
117−supply size start =
118− drainTransformationDefault (size + start) (UF.supply start) undefined
118+{-# INLINE both #-}
119+both :: Monad m => Int -> Int -> m ()
120+both size start =
121+ drainTransformationDefault (size + start) (UF.both start) undefined
119122
120123
121−{-# INLINE supplyFirst #-}
122−supplyFirst :: Monad m => Int -> Int -> m ()
123−supplyFirst size start =
124+{-# INLINE first #-}
125+first :: Monad m => Int -> Int -> m ()
126+first size start =
124127 drainTransformation
125128 (UF.take size UF.enumerateFromThenIntegral)
126− (UF.supplyFirst start)
129+ (UF.first start)
127130 1
128131
129−{-# INLINE supplySecond #-}
130−supplySecond :: Monad m => Int -> Int -> m ()
131−supplySecond size start =
132+{-# INLINE second #-}
133+second :: Monad m => Int -> Int -> m ()
134+second size start =
132135 drainTransformation
133136 (UF.take size UF.enumerateFromThenIntegral)
134− (UF.supplySecond 1)
137+ (UF.second 1)
135138 start
136139
137140{-# INLINE discardFirst #-}
@@ -159,7 +162,7 @@ swap size start =
159162{-# INLINE fromStream #-}
160163fromStream :: Int -> Int -> IO ()
161164fromStream size start =
162− drainGeneration UF.fromStream (S.replicate size start :: S.SerialT IO Int)
165+ drainGeneration UF.fromStream (S.replicate size start :: S.Stream IO Int)
163166
164167-- XXX INVESTIGATE: Although the performance of this should be equivalant to
165168-- fromStream, this is considerably worse. More than 4x worse.
@@ -229,7 +232,7 @@ _fromProducer = undefined
229232
230233{-# INLINE replicateM #-}
231234replicateM :: Monad m => Int -> Int -> m ()
232−replicateM size start = drainGeneration (UF.replicateM size) (return start)
235+replicateM size start = drainGeneration UF.replicateM (size, return start)
233236
234237{-# INLINE repeatM #-}
235238repeatM :: Monad m => Int -> Int -> m ()
@@ -254,7 +257,7 @@ enumerateFromThenIntegral size start =
254257enumerateFromToIntegral :: Monad m => Int -> Int -> m ()
255258enumerateFromToIntegral size start =
256259 drainGeneration
257− ( UF.supplySecond
260+ ( UF.second
258261 (size + start)
259262 UF.enumerateFromToIntegral
260263 ) start
@@ -278,7 +281,7 @@ enumerateFromToFractional :: Monad m => Int -> Int -> m ()
278281enumerateFromToFractional size start =
279282 let intToDouble x = (fromInteger (fromIntegral x)) :: Double
280283 in drainGeneration
281− ( UF.supplySecond
284+ ( UF.second
282285 (intToDouble $ start + size)
283286 UF.enumerateFromToFractional
284287 )
@@ -288,6 +291,11 @@ enumerateFromToFractional size start =
288291-- Stream transformation
289292-------------------------------------------------------------------------------
290293
294+{-# INLINE postscan #-}
295+postscan :: Monad m => Int -> Int -> m ()
296+postscan size start =
297+ drainTransformationDefault (size + start) (UF.postscan FL.sum) start
298+
291299{-# INLINE map #-}
292300map :: Monad m => Int -> Int -> m ()
293301map size start = drainTransformationDefault (size + start) (UF.map (+1)) start
@@ -297,12 +305,12 @@ mapM :: Monad m => Int -> Int -> m ()
297305mapM size start =
298306 drainTransformationDefault (size + start) (UF.mapM (return . (+) 1)) start
299307
300−{-# INLINE mapMWithInput #-}
301−mapMWithInput :: Monad m => Int -> Int -> m ()
302−mapMWithInput size start =
308+{-# INLINE mapM2 #-}
309+mapM2 :: Monad m => Int -> Int -> m ()
310+mapM2 size start =
303311 drainTransformationDefault
304312 size
305− (UF.mapMWithInput (\a b -> return $ a + b))
313+ (UF.mapM2 (\a b -> return $ a + b))
306314 start
307315
308316-------------------------------------------------------------------------------
@@ -410,13 +418,16 @@ teeZipWith size start =
410418-- Applicative
411419-------------------------------------------------------------------------------
412420
421+nthRoot :: Double -> Int -> Int
422+nthRoot n value = round (fromIntegral value**(1/n))
423+
413424{-# INLINE toNullAp #-}
414425toNullAp :: Monad m => Int -> Int -> m ()
415426toNullAp value start =
416427 let end = start + nthRoot 2 value
417428 s = source end
418429 -- in UF.fold ((+) <$> s <*> s) FL.drain start
419− in UF.fold FL.drain ((+) `fmap` s `UF.apply` s) start
430+ in UF.fold FL.drain ((+) `fmap` s `UF.crossApply` s) start
420431
421432{-# INLINE _apDiscardFst #-}
422433_apDiscardFst :: Int -> Int -> m ()
@@ -430,9 +441,6 @@ _apDiscardSnd = undefined
430441-- Monad
431442-------------------------------------------------------------------------------
432443
433−nthRoot :: Double -> Int -> Int
434−nthRoot n value = round (fromIntegral value**(1/n))
435−
436444{-# INLINE concatMapM #-}
437445concatMapM :: Monad m => Int -> Int -> m ()
438446concatMapM value start =
@@ -441,8 +449,8 @@ concatMapM value start =
441449 where
442450
443451 val = nthRoot 2 value
444− unfoldInGen i = return (UF.supplySecond (i + val) UF.enumerateFromToIntegral)
445− unfoldOut = UF.supplySecond (start + val) UF.enumerateFromToIntegral
452+ unfoldInGen i = return (UF.second (i + val) UF.enumerateFromToIntegral)
453+ unfoldOut = UF.second (start + val) UF.enumerateFromToIntegral
446454
447455{-# INLINE toNull #-}
448456toNull :: Monad m => Int -> Int -> m ()
@@ -593,9 +601,9 @@ concatCount :: Int -> Int
593601concatCount linearCount =
594602 round (((1 + 8 * fromIntegral linearCount)**(1/2::Double) - 1) / 2)
595603
596−{-# INLINE concat #-}
597−concat :: Monad m => Int -> Int -> m ()
598−concat linearCount start = do
604+{-# INLINE many #-}
605+many :: Monad m => Int -> Int -> m ()
606+many linearCount start = do
599607 let end = start + concatCount linearCount
600608 UF.fold FL.drain (UF.many (source end) (source end)) start
601609
@@ -612,9 +620,9 @@ o_1_space_transformation_input size =
612620 "transformation/input"
613621 [ benchIO "lmap" $ lmap size
614622 , benchIO "lmapM" $ lmapM size
615− , benchIO "supply" $ supply size
616− , benchIO "supplyFirst" $ supplyFirst size
617− , benchIO "supplySecond" $ supplySecond size
623+ , benchIO "both" $ both size
624+ , benchIO "first" $ first size
625+ , benchIO "second" $ second size
618626 , benchIO "discardFirst" $ discardFirst size
619627 , benchIO "discardSecond" $ discardSecond size
620628 , benchIO "swap" $ swap size
@@ -660,7 +668,8 @@ o_1_space_transformation size =
660668 "transformation"
661669 [ benchIO "map" $ map size
662670 , benchIO "mapM" $ mapM size
663− , benchIO "mapMWithInput" $ mapMWithInput size
671+ , benchIO "mapM2" $ mapM2 size
672+ , benchIO "postscan" $ postscan size
664673 ]
665674 ]
666675
@@ -693,8 +702,17 @@ o_1_space_zip size =
693702 ]
694703 ]
695704
696−o_1_space_nested :: Int -> [Benchmark]
697−o_1_space_nested size =
705+lf :: Word8
706+lf = fromIntegral (ord '\n')
707+
708+-- | Split on line feed.
709+foldManySepBy :: Handle -> IO Int
710+foldManySepBy =
711+ let u = UF.foldMany (FL.takeEndBy_ (== lf) FL.drain) FH.reader
712+ in UF.fold FL.length u
713+
714+o_1_space_nested :: BenchEnv -> Int -> [Benchmark]
715+o_1_space_nested env size =
698716 [ bgroup
699717 "nested"
700718 [ benchIO "(<*>) (sqrt n x sqrt n)" $ toNullAp size
@@ -710,7 +728,9 @@ o_1_space_nested size =
710728 , benchIO "filterAllIn" $ filterAllIn size
711729 , benchIO "filterSome" $ filterSome size
712730
713− , benchIO "concat" $ concat size
731+ , benchIO "many" $ many size
732+ , mkBench "foldMany (Fold.takeEndBy_ (== lf) Fold.drain)" env
733+ $ \inh _ -> foldManySepBy inh
714734 ]
715735 ]
716736
@@ -729,11 +749,11 @@ o_n_space_nested size =
729749-- | Send the file contents to /dev/null with exception handling
730750readWriteOnExceptionUnfold :: Handle -> Handle -> IO ()
731751readWriteOnExceptionUnfold inh devNull =
732− let readEx = UF.onException (\_ -> hClose inh) FH.read
733− in SP.fold (FH.write devNull) $ SP.unfold readEx inh
752+ let readEx = UF.onException (\_ -> hClose inh) FH.reader
753+ in S.fold (FH.write devNull) $ S.unfold readEx inh
734754
735755#ifdef INSPECTION
736−inspect $ hasNoTypeClasses 'readWriteOnExceptionUnfold
756+-- inspect $ hasNoTypeClasses 'readWriteOnExceptionUnfold
737757-- inspect $ 'readWriteOnExceptionUnfold `hasNoType` ''Step
738758#endif
739759
@@ -741,45 +761,54 @@ inspect $ hasNoTypeClasses 'readWriteOnExceptionUnfold
741761readWriteHandleExceptionUnfold :: Handle -> Handle -> IO ()
742762readWriteHandleExceptionUnfold inh devNull =
743763 let handler (_e :: SomeException) = hClose inh >> return 10
744− readEx = UF.handle (UF.functionM handler) FH.read
745− in SP.fold (FH.write devNull) $ SP.unfold readEx inh
764+ readEx = UF.handle (UF.functionM handler) FH.reader
765+ in S.fold (FH.write devNull) $ S.unfold readEx inh
746766
747767#ifdef INSPECTION
748−inspect $ hasNoTypeClasses 'readWriteHandleExceptionUnfold
768+-- hasNoTypeClasses started failing in GHC 9.4.4
769+-- inspect $ hasNoTypeClasses 'readWriteHandleExceptionUnfold
749770-- inspect $ 'readWriteHandleExceptionUnfold `hasNoType` ''Step
750771#endif
751772
752773-- | Send the file contents to /dev/null with exception handling
753774readWriteFinally_Unfold :: Handle -> Handle -> IO ()
754775readWriteFinally_Unfold inh devNull =
755− let readEx = UF.finally_ (\_ -> hClose inh) FH.read
756− in SP.fold (FH.write devNull) $ SP.unfold readEx inh
776+ let readEx = UF.finally_ (\_ -> hClose inh) FH.reader
777+ in S.fold (FH.write devNull) $ S.unfold readEx inh
757778
758779#ifdef INSPECTION
780+#if __GLASGOW_HASKELL__ >= 906
781+inspect $ hasNoTypeClassesExcept 'readWriteFinally_Unfold [''MonadCatch]
782+#else
759783inspect $ hasNoTypeClasses 'readWriteFinally_Unfold
784+#endif
760785-- inspect $ 'readWriteFinallyUnfold `hasNoType` ''Step
761786#endif
762787
763788readWriteFinallyUnfold :: Handle -> Handle -> IO ()
764789readWriteFinallyUnfold inh devNull =
765− let readEx = UF.finally (\_ -> hClose inh) FH.read
766− in SP.fold (FH.write devNull) $ SP.unfold readEx inh
790+ let readEx = UF.finally (\_ -> hClose inh) FH.reader
791+ in S.fold (FH.write devNull) $ S.unfold readEx inh
767792
768793-- | Send the file contents to /dev/null with exception handling
769794readWriteBracket_Unfold :: Handle -> Handle -> IO ()
770795readWriteBracket_Unfold inh devNull =
771− let readEx = UF.bracket_ return (\_ -> hClose inh) FH.read
772− in SP.fold (FH.write devNull) $ SP.unfold readEx inh
796+ let readEx = UF.bracket_ return (\_ -> hClose inh) FH.reader
797+ in S.fold (FH.write devNull) $ S.unfold readEx inh
773798
774799#ifdef INSPECTION
800+#if __GLASGOW_HASKELL__ >= 906
801+inspect $ hasNoTypeClassesExcept 'readWriteBracket_Unfold [''MonadCatch]
802+#else
775803inspect $ hasNoTypeClasses 'readWriteBracket_Unfold
804+#endif
776805-- inspect $ 'readWriteBracketUnfold `hasNoType` ''Step
777806#endif
778807
779808readWriteBracketUnfold :: Handle -> Handle -> IO ()
780809readWriteBracketUnfold inh devNull =
781− let readEx = UF.bracket return (\_ -> hClose inh) FH.read
782− in SP.fold (FH.write devNull) $ S.unfold readEx inh
810+ let readEx = UF.bracket return (\_ -> hClose inh) FH.reader
811+ in S.fold (FH.write devNull) $ S.unfold readEx inh
783812
784813o_1_space_copy_read_exceptions :: BenchEnv -> [Benchmark]
785814o_1_space_copy_read_exceptions env =
@@ -819,7 +848,7 @@ main = do
819848 , o_1_space_transformation size
820849 , o_1_space_filtering size
821850 , o_1_space_zip size
822− , o_1_space_nested size
851+ , o_1_space_nested env size
823852 , o_1_space_copy_read_exceptions env
824853 ]
825854 , bgroup (o_n_space_prefix moduleName)
benchmark/Streamly/Benchmark/FileSystem/Handle.hs+1−5
@@ -17,16 +17,12 @@
1717{-# LANGUAGE TemplateHaskell #-}
1818{-# OPTIONS_GHC -fplugin Test.Inspection.Plugin #-}
1919#endif
20−
21−#if __GLASGOW_HASKELL__ >= 800
22−#endif
23−
2420import Streamly.Benchmark.Common.Handle (mkHandleBenchEnv)
2521
2622import qualified Handle.ReadWrite as RW
2723import qualified Handle.Read as RO
2824
29−import Gauge hiding (env)
25+import Test.Tasty.Bench hiding (env)
3026import Prelude hiding (last, length)
3127import Streamly.Benchmark.Common
3228
benchmark/Streamly/Benchmark/FileSystem/Handle/Read.hs+66−62
@@ -1,3 +1,5 @@
1+{-# OPTIONS_GHC -Wno-deprecations #-}
2+
13-- |
24-- Module : Streamly.Benchmark.FileSystem.Handle
35-- Copyright : (c) 2019 Composewell Technologies
@@ -24,32 +26,29 @@ where
2426
2527import Data.Word (Word8)
2628import GHC.Magic (inline)
27−#if __GLASGOW_HASKELL__ >= 802
2829import GHC.Magic (noinline)
29−#else
30−#define noinline
31−#endif
3230import System.IO (Handle)
3331
32+import qualified Streamly.Data.Stream as Stream
33+import qualified Streamly.Data.Fold as Fold
3434import qualified Streamly.FileSystem.Handle as FH
35−import qualified Streamly.Internal.Data.Array.Foreign as A
36−import qualified Streamly.Internal.Data.Array.Foreign.Type as AT
35+import qualified Streamly.Internal.Data.Array as A
3736import qualified Streamly.Internal.Data.Fold as FL
38−import qualified Streamly.Internal.Data.Stream.IsStream as IP
37+import qualified Streamly.Internal.Data.Stream as IP
3938import qualified Streamly.Internal.FileSystem.Handle as IFH
4039import qualified Streamly.Internal.Unicode.Stream as IUS
41−import qualified Streamly.Prelude as S
40+import qualified Streamly.Data.Stream.Prelude as S
4241import qualified Streamly.Unicode.Stream as SS
4342
44−import Gauge hiding (env)
43+import Test.Tasty.Bench hiding (env)
4544import Prelude hiding (last, length)
4645import Streamly.Benchmark.Common.Handle
4746
4847#ifdef INSPECTION
49−import Streamly.Internal.Data.Stream.StreamD.Type (Step(..), FoldMany)
48+import Streamly.Internal.Data.Stream (Step(..), FoldMany)
5049
51−import qualified Streamly.Internal.Data.Array.Foreign.Mut.Type as MA
52−import qualified Streamly.Internal.Data.Stream.StreamD as D
50+import qualified Streamly.Internal.Data.MutArray as MutArray
51+import qualified Streamly.Internal.Data.Stream as D
5352import qualified Streamly.Internal.Data.Unfold as IUF
5453
5554import Test.Inspection
@@ -63,49 +62,49 @@ import Test.Inspection
6362
6463-- | Get the last byte from a file bytestream.
6564readLast :: Handle -> IO (Maybe Word8)
66−readLast = S.last . S.unfold FH.read
65+readLast = S.fold Fold.last . S.unfold FH.reader
6766
6867#ifdef INSPECTION
6968inspect $ hasNoTypeClasses 'readLast
7069inspect $ 'readLast `hasNoType` ''Step -- S.unfold
7170inspect $ 'readLast `hasNoType` ''IUF.ConcatState -- FH.read/UF.many
72−inspect $ 'readLast `hasNoType` ''MA.ReadUState -- FH.read/A.read
71+inspect $ 'readLast `hasNoType` ''MutArray.ArrayUnsafe -- FH.read/A.read
7372#endif
7473
7574-- assert that flattenArrays constructors are not present
7675-- | Count the number of bytes in a file.
7776readCountBytes :: Handle -> IO Int
78−readCountBytes = S.length . S.unfold FH.read
77+readCountBytes = S.fold Fold.length . S.unfold FH.reader
7978
8079#ifdef INSPECTION
8180inspect $ hasNoTypeClasses 'readCountBytes
8281inspect $ 'readCountBytes `hasNoType` ''Step -- S.unfold
8382inspect $ 'readCountBytes `hasNoType` ''IUF.ConcatState -- FH.read/UF.many
84−inspect $ 'readCountBytes `hasNoType` ''MA.ReadUState -- FH.read/A.read
83+inspect $ 'readCountBytes `hasNoType` ''MutArray.ArrayUnsafe -- FH.read/A.read
8584#endif
8685
8786-- | Count the number of lines in a file.
8887readCountLines :: Handle -> IO Int
8988readCountLines =
90− S.length
89+ S.fold Fold.length
9190 . IUS.lines FL.drain
9291 . SS.decodeLatin1
93− . S.unfold FH.read
92+ . S.unfold FH.reader
9493
9594#ifdef INSPECTION
9695inspect $ hasNoTypeClasses 'readCountLines
9796inspect $ 'readCountLines `hasNoType` ''Step
9897inspect $ 'readCountLines `hasNoType` ''IUF.ConcatState -- FH.read/UF.many
99−inspect $ 'readCountLines `hasNoType` ''MA.ReadUState -- FH.read/A.read
98+inspect $ 'readCountLines `hasNoType` ''MutArray.ArrayUnsafe -- FH.read/A.read
10099#endif
101100
102101-- | Count the number of words in a file.
103102readCountWords :: Handle -> IO Int
104103readCountWords =
105− S.length
104+ S.fold Fold.length
106105 . IUS.words FL.drain
107106 . SS.decodeLatin1
108− . S.unfold FH.read
107+ . S.unfold FH.reader
109108
110109#ifdef INSPECTION
111110inspect $ hasNoTypeClasses 'readCountWords
@@ -114,13 +113,13 @@ inspect $ hasNoTypeClasses 'readCountWords
114113
115114-- | Sum the bytes in a file.
116115readSumBytes :: Handle -> IO Word8
117−readSumBytes = S.sum . S.unfold FH.read
116+readSumBytes = S.fold Fold.sum . S.unfold FH.reader
118117
119118#ifdef INSPECTION
120119inspect $ hasNoTypeClasses 'readSumBytes
121120inspect $ 'readSumBytes `hasNoType` ''Step
122121inspect $ 'readSumBytes `hasNoType` ''IUF.ConcatState -- FH.read/UF.many
123−inspect $ 'readSumBytes `hasNoType` ''MA.ReadUState -- FH.read/A.read
122+inspect $ 'readSumBytes `hasNoType` ''MutArray.ArrayUnsafe -- FH.read/A.read
124123#endif
125124
126125-- XXX When we mark this with INLINE and we have two benchmarks using S.drain
@@ -134,21 +133,21 @@ inspect $ 'readSumBytes `hasNoType` ''MA.ReadUState -- FH.read/A.read
134133-- fusion-plugin to propagate INLINE phase information such that this problem
135134-- does not occur.
136135readDrain :: Handle -> IO ()
137−readDrain inh = S.drain $ S.unfold FH.read inh
136+readDrain inh = S.fold Fold.drain $ S.unfold FH.reader inh
138137
139138-- XXX investigate why we need an INLINE in this case (GHC)
140139{-# INLINE readDecodeLatin1 #-}
141140readDecodeLatin1 :: Handle -> IO ()
142141readDecodeLatin1 inh =
143− S.drain
142+ S.fold Fold.drain
144143 $ SS.decodeLatin1
145− $ S.unfold FH.read inh
144+ $ S.unfold FH.reader inh
146145
147146readDecodeUtf8 :: Handle -> IO ()
148147readDecodeUtf8 inh =
149− S.drain
148+ S.fold Fold.drain
150149 $ SS.decodeUtf8
151− $ S.unfold FH.read inh
150+ $ S.unfold FH.reader inh
152151
153152#ifdef INSPECTION
154153inspect $ hasNoTypeClasses 'readDecodeUtf8
@@ -187,25 +186,25 @@ o_1_space_reduce_read env =
187186-------------------------------------------------------------------------------
188187
189188-- | Count the number of lines in a file.
190−toChunksConcatUnfoldCountLines :: Handle -> IO Int
191−toChunksConcatUnfoldCountLines inh =
192− S.length
189+getChunksConcatUnfoldCountLines :: Handle -> IO Int
190+getChunksConcatUnfoldCountLines inh =
191+ S.fold Fold.length
193192 $ IUS.lines FL.drain
194193 $ SS.decodeLatin1
195194 -- XXX replace with toBytes
196− $ S.unfoldMany A.read (IFH.toChunks inh)
195+ $ S.unfoldMany A.reader (IFH.readChunks inh)
197196
198197#ifdef INSPECTION
199−inspect $ hasNoTypeClasses 'toChunksConcatUnfoldCountLines
200−inspect $ 'toChunksConcatUnfoldCountLines `hasNoType` ''Step
201−inspect $ 'toChunksConcatUnfoldCountLines `hasNoType` ''D.ConcatMapUState
198+inspect $ hasNoTypeClasses 'getChunksConcatUnfoldCountLines
199+inspect $ 'getChunksConcatUnfoldCountLines `hasNoType` ''Step
200+inspect $ 'getChunksConcatUnfoldCountLines `hasNoType` ''D.ConcatMapUState
202201#endif
203202
204203o_1_space_reduce_toBytes :: BenchEnv -> [Benchmark]
205204o_1_space_reduce_toBytes env =
206205 [ bgroup "reduce/toBytes"
207206 [ mkBench "US.lines . SS.decodeLatin1" env $ \inh _ ->
208− toChunksConcatUnfoldCountLines inh
207+ getChunksConcatUnfoldCountLines inh
209208 ]
210209 ]
211210
@@ -214,46 +213,51 @@ o_1_space_reduce_toBytes env =
214213-------------------------------------------------------------------------------
215214
216215chunksOfSum :: Int -> Handle -> IO Int
217−chunksOfSum n inh = S.length $ S.chunksOf n FL.sum (S.unfold FH.read inh)
216+chunksOfSum n inh =
217+ S.fold Fold.length $ IP.groupsOf n FL.sum (S.unfold FH.reader inh)
218218
219219foldManyPostChunksOfSum :: Int -> Handle -> IO Int
220220foldManyPostChunksOfSum n inh =
221− S.length $ IP.foldManyPost (FL.take n FL.sum) (S.unfold FH.read inh)
221+ S.fold Fold.length
222+ $ IP.foldManyPost (FL.take n FL.sum) (S.unfold FH.reader inh)
222223
223224foldManyChunksOfSum :: Int -> Handle -> IO Int
224225foldManyChunksOfSum n inh =
225− S.length $ IP.foldMany (FL.take n FL.sum) (S.unfold FH.read inh)
226+ S.fold Fold.length
227+ $ IP.foldMany (FL.take n FL.sum) (S.unfold FH.reader inh)
226228
227229-- XXX investigate why we need an INLINE in this case (GHC)
228230-- Even though allocations remain the same in both cases inlining improves time
229231-- by 4x.
230232-- | Slice in chunks of size n and get the count of chunks.
231−{-# INLINE chunksOf #-}
232−chunksOf :: Int -> Handle -> IO Int
233−chunksOf n inh =
233+{-# INLINE groupsOf #-}
234+groupsOf :: Int -> Handle -> IO Int
235+groupsOf n inh =
234236 -- writeNUnsafe gives 2.5x boost here over writeN.
235− S.length $ S.chunksOf n (AT.writeNUnsafe n) (S.unfold FH.read inh)
237+ S.fold Fold.length
238+ $ IP.groupsOf n (A.writeNUnsafe n) (S.unfold FH.reader inh)
236239
237240#ifdef INSPECTION
238−inspect $ hasNoTypeClasses 'chunksOf
239−inspect $ 'chunksOf `hasNoType` ''Step
240−inspect $ 'chunksOf `hasNoType` ''FoldMany
241−inspect $ 'chunksOf `hasNoType` ''AT.ArrayUnsafe -- AT.writeNUnsafe
242−inspect $ 'chunksOf `hasNoType` ''IUF.ConcatState -- FH.read/UF.many
243−inspect $ 'chunksOf `hasNoType` ''MA.ReadUState -- FH.read/A.read
241+inspect $ hasNoTypeClasses 'groupsOf
242+inspect $ 'groupsOf `hasNoType` ''Step
243+inspect $ 'groupsOf `hasNoType` ''FoldMany
244+inspect $ 'groupsOf `hasNoType` ''MutArray.ArrayUnsafe -- AT.writeNUnsafe
245+ -- FH.read/A.read
246+inspect $ 'groupsOf `hasNoType` ''IUF.ConcatState -- FH.read/UF.many
244247#endif
245248
246−{-# INLINE arraysOf #-}
247−arraysOf :: Int -> Handle -> IO Int
248−arraysOf n inh = S.length $ IP.arraysOf n (S.unfold FH.read inh)
249+{-# INLINE chunksOf #-}
250+chunksOf :: Int -> Handle -> IO Int
251+chunksOf n inh =
252+ S.fold Fold.length $ Stream.chunksOf n (S.unfold FH.reader inh)
249253
250254o_1_space_reduce_read_grouped :: BenchEnv -> [Benchmark]
251255o_1_space_reduce_read_grouped env =
252256 [ bgroup "reduce/read/chunks"
253− [ mkBench ("S.chunksOf " ++ show (bigSize env) ++ " FL.sum") env $
257+ [ mkBench ("S.groupsOf " ++ show (bigSize env) ++ " FL.sum") env $
254258 \inh _ ->
255259 chunksOfSum (bigSize env) inh
256− , mkBench "S.chunksOf 1 FL.sum" env $ \inh _ ->
260+ , mkBench "S.groupsOf 1 FL.sum" env $ \inh _ ->
257261 chunksOfSum 1 inh
258262
259263 -- XXX investigate why we need inline/noinline in these cases (GHC)
@@ -276,20 +280,20 @@ o_1_space_reduce_read_grouped env =
276280 $ \inh _ -> inline foldManyChunksOfSum 1 inh
277281
278282 -- folding chunks to arrays
283+ , mkBenchSmall "S.groupsOf 1" env $ \inh _ ->
284+ groupsOf 1 inh
285+ , mkBench "S.groupsOf 10" env $ \inh _ ->
286+ groupsOf 10 inh
287+ , mkBench "S.groupsOf 1000" env $ \inh _ ->
288+ groupsOf 1000 inh
289+
290+ -- chunksOf may use a different impl than groupsOf
279291 , mkBenchSmall "S.chunksOf 1" env $ \inh _ ->
280292 chunksOf 1 inh
281293 , mkBench "S.chunksOf 10" env $ \inh _ ->
282294 chunksOf 10 inh
283295 , mkBench "S.chunksOf 1000" env $ \inh _ ->
284296 chunksOf 1000 inh
285−
286− -- arraysOf may use a different impl than chunksOf
287− , mkBenchSmall "S.arraysOf 1" env $ \inh _ ->
288− arraysOf 1 inh
289− , mkBench "S.arraysOf 10" env $ \inh _ ->
290− arraysOf 10 inh
291− , mkBench "S.arraysOf 1000" env $ \inh _ ->
292− arraysOf 1000 inh
293297 ]
294298 ]
295299
benchmark/Streamly/Benchmark/FileSystem/Handle/ReadWrite.hs+45−48
@@ -1,3 +1,5 @@
1+{-# OPTIONS_GHC -Wno-deprecations #-}
2+
13-- |
24-- Module : Streamly.Benchmark.FileSystem.Handle
35-- Copyright : (c) 2019 Composewell Technologies
@@ -29,20 +31,18 @@ import Streamly.Internal.System.IO (defaultChunkSize)
2931import qualified Streamly.FileSystem.Handle as FH
3032import qualified Streamly.Internal.Data.Unfold as IUF
3133import qualified Streamly.Internal.FileSystem.Handle as IFH
32−import qualified Streamly.Data.Array.Foreign as A
33−import qualified Streamly.Prelude as S
34+import qualified Streamly.Data.Array as A
35+import qualified Streamly.Data.Stream.Prelude as S
3436
35−import Gauge hiding (env)
37+import Test.Tasty.Bench hiding (env)
3638import Streamly.Benchmark.Common.Handle
3739
3840#ifdef INSPECTION
39−import Streamly.Internal.Data.Stream.StreamD.Type (Step(..))
41+import Streamly.Internal.Data.Stream (Step(..))
4042
41−import qualified Streamly.Internal.Data.Stream.StreamD.Type as D
43+import qualified Streamly.Internal.Data.Stream as D
4244import qualified Streamly.Internal.Data.Tuple.Strict as Strict
43−import qualified Streamly.Internal.Data.Array.Stream.Mut.Foreign as MAS
44−import qualified Streamly.Internal.Data.Array.Foreign.Type as AT
45−import qualified Streamly.Internal.Data.Array.Foreign.Mut.Type as MA
45+import qualified Streamly.Internal.Data.MutArray as MutArray
4646
4747import Test.Inspection
4848#endif
@@ -53,7 +53,7 @@ import Test.Inspection
5353
5454-- | Copy file
5555copyChunks :: Handle -> Handle -> IO ()
56−copyChunks inh outh = S.fold (IFH.writeChunks outh) $ IFH.toChunks inh
56+copyChunks inh outh = S.fold (IFH.writeChunks outh) $ IFH.readChunks inh
5757
5858#ifdef INSPECTION
5959inspect $ hasNoTypeClasses 'copyChunks
@@ -62,7 +62,7 @@ inspect $ 'copyChunks `hasNoType` ''Step
6262
6363o_1_space_copy_chunked :: BenchEnv -> [Benchmark]
6464o_1_space_copy_chunked env =
65− [ bgroup "copy/toChunks"
65+ [ bgroup "copy/getChunks"
6666 [ mkBench "toNull" env $ \inH _ ->
6767 copyChunks inH (nullH env)
6868 , mkBench "raw" env $ \inH outH ->
@@ -76,14 +76,14 @@ o_1_space_copy_chunked env =
7676
7777-- | Copy file
7878copyStream :: Handle -> Handle -> IO ()
79−copyStream inh outh = S.fold (FH.write outh) (S.unfold FH.read inh)
79+copyStream inh outh = S.fold (FH.write outh) (S.unfold FH.reader inh)
8080
8181#ifdef INSPECTION
8282inspect $ hasNoTypeClasses 'copyStream
8383inspect $ 'copyStream `hasNoType` ''Step -- S.unfold
8484inspect $ 'copyStream `hasNoType` ''IUF.ConcatState -- FH.read/UF.many
85−inspect $ 'copyStream `hasNoType` ''MA.ReadUState -- FH.read/A.read
86−inspect $ 'copyStream `hasNoType` ''AT.ArrayUnsafe -- FH.write/writeNUnsafe
85+inspect $ 'copyStream `hasNoType` ''MutArray.ArrayUnsafe -- FH.write/writeNUnsafe
86+ -- FH.read/A.read
8787inspect $ 'copyStream `hasNoType` ''Strict.Tuple3' -- FH.write/chunksOf
8888#endif
8989
@@ -103,28 +103,28 @@ o_1_space_copy_read env =
103103
104104-- | Send the file contents to /dev/null
105105readFromBytesNull :: Handle -> Handle -> IO ()
106−readFromBytesNull inh devNull = IFH.putBytes devNull $ S.unfold FH.read inh
106+readFromBytesNull inh devNull = IFH.putBytes devNull $ S.unfold FH.reader inh
107107
108108#ifdef INSPECTION
109109inspect $ hasNoTypeClasses 'readFromBytesNull
110110inspect $ 'readFromBytesNull `hasNoType` ''Step
111−inspect $ 'readFromBytesNull `hasNoType` ''MAS.SpliceState
112−inspect $ 'readFromBytesNull `hasNoType` ''AT.ArrayUnsafe -- FH.fromBytes/S.arraysOf
111+inspect $ 'readFromBytesNull `hasNoType` ''MutArray.SpliceState
112+inspect $ 'readFromBytesNull `hasNoType` ''MutArray.ArrayUnsafe -- FH.fromBytes/S.chunksOf
113113inspect $ 'readFromBytesNull `hasNoType` ''D.FoldMany
114114#endif
115115
116116-- | Send the file contents ('defaultChunkSize') to /dev/null
117−readWithBufferOfFromBytesNull :: Handle -> Handle -> IO ()
118−readWithBufferOfFromBytesNull inh devNull =
117+readWithFromBytesNull :: Handle -> Handle -> IO ()
118+readWithFromBytesNull inh devNull =
119119 IFH.putBytes devNull
120− $ S.unfold FH.readWithBufferOf (defaultChunkSize, inh)
120+ $ S.unfold FH.readerWith (defaultChunkSize, inh)
121121
122122#ifdef INSPECTION
123−inspect $ hasNoTypeClasses 'readWithBufferOfFromBytesNull
124−inspect $ 'readWithBufferOfFromBytesNull `hasNoType` ''Step
125−inspect $ 'readWithBufferOfFromBytesNull `hasNoType` ''MAS.SpliceState
126−inspect $ 'readWithBufferOfFromBytesNull `hasNoType` ''AT.ArrayUnsafe -- FH.fromBytes/S.arraysOf
127−inspect $ 'readWithBufferOfFromBytesNull `hasNoType` ''D.FoldMany
123+inspect $ hasNoTypeClasses 'readWithFromBytesNull
124+inspect $ 'readWithFromBytesNull `hasNoType` ''Step
125+inspect $ 'readWithFromBytesNull `hasNoType` ''MutArray.SpliceState
126+inspect $ 'readWithFromBytesNull `hasNoType` ''MutArray.ArrayUnsafe -- FH.fromBytes/S.chunksOf
127+inspect $ 'readWithFromBytesNull `hasNoType` ''D.FoldMany
128128#endif
129129
130130-- | Send the chunk content ('defaultChunkSize') to /dev/null
@@ -135,63 +135,60 @@ _readChunks inh devNull = IUF.fold fld unf inh
135135 where
136136
137137 fld = FH.write devNull
138− unf = IUF.many FH.readChunks A.read
138+ unf = IUF.many A.reader FH.chunkReader
139139
140140-- | Send the chunk content to /dev/null
141−-- Implicitly benchmarked via 'readWithBufferOfFromBytesNull'
142−_readChunksWithBufferOf :: Handle -> Handle -> IO ()
143−_readChunksWithBufferOf inh devNull = IUF.fold fld unf (defaultChunkSize, inh)
141+-- Implicitly benchmarked via 'readWithFromBytesNull'
142+_readChunksWith :: Handle -> Handle -> IO ()
143+_readChunksWith inh devNull = IUF.fold fld unf (defaultChunkSize, inh)
144144
145145 where
146146
147147 fld = FH.write devNull
148− unf = IUF.many FH.readChunksWithBufferOf A.read
149−
148+ unf = IUF.many A.reader FH.chunkReaderWith
150149
151150o_1_space_copy_fromBytes :: BenchEnv -> [Benchmark]
152151o_1_space_copy_fromBytes env =
153152 [ bgroup "copy/putBytes"
154153 [ mkBench "rawToNull" env $ \inh _ ->
155154 readFromBytesNull inh (nullH env)
156− , mkBench "FH.readWithBufferOf" env $ \inh _ ->
157− readWithBufferOfFromBytesNull inh (nullH env)
155+ , mkBench "FH.readWith" env $ \inh _ ->
156+ readWithFromBytesNull inh (nullH env)
158157 ]
159158 ]
160159
161160-- | Send the file contents ('defaultChunkSize') to /dev/null
162−{-# NOINLINE writeReadWithBufferOf #-}
163−writeReadWithBufferOf :: Handle -> Handle -> IO ()
164−writeReadWithBufferOf inh devNull = IUF.fold fld unf (defaultChunkSize, inh)
161+writeReadWith :: Handle -> Handle -> IO ()
162+writeReadWith inh devNull = IUF.fold fld unf (defaultChunkSize, inh)
165163
166164 where
167165
168− fld = FH.writeWithBufferOf defaultChunkSize devNull
169− unf = FH.readWithBufferOf
166+ fld = FH.writeWith defaultChunkSize devNull
167+ unf = FH.readerWith
170168
171169#ifdef INSPECTION
172−inspect $ hasNoTypeClasses 'writeReadWithBufferOf
173−inspect $ 'writeReadWithBufferOf `hasNoType` ''Step
174−inspect $ 'writeReadWithBufferOf `hasNoType` ''IUF.ConcatState -- FH.read/UF.many
175−inspect $ 'writeReadWithBufferOf `hasNoType` ''MA.ReadUState -- FH.read/A.read
176−inspect $ 'writeReadWithBufferOf `hasNoType` ''AT.ArrayUnsafe -- FH.write/writeNUnsafe
170+inspect $ hasNoTypeClasses 'writeReadWith
171+inspect $ 'writeReadWith `hasNoType` ''Step
172+inspect $ 'writeReadWith `hasNoType` ''IUF.ConcatState -- FH.read/UF.many
173+inspect $ 'writeReadWith `hasNoType` ''MutArray.ArrayUnsafe -- FH.write/writeNUnsafe
174+ -- FH.read/A.read
177175#endif
178176
179177-- | Send the file contents ('AT.defaultChunkSize') to /dev/null
180−{-# NOINLINE writeRead #-}
181178writeRead :: Handle -> Handle -> IO ()
182179writeRead inh devNull = IUF.fold fld unf inh
183180
184181 where
185182
186183 fld = FH.write devNull
187− unf = FH.read
184+ unf = FH.reader
188185
189186#ifdef INSPECTION
190187inspect $ hasNoTypeClasses 'writeRead
191188inspect $ 'writeRead `hasNoType` ''Step
192189inspect $ 'writeRead `hasNoType` ''IUF.ConcatState -- FH.read/UF.many
193−inspect $ 'writeRead `hasNoType` ''MA.ReadUState -- FH.read/A.read
194−inspect $ 'writeRead `hasNoType` ''AT.ArrayUnsafe -- FH.write/writeNUnsafe
190+inspect $ 'writeRead `hasNoType` ''MutArray.ArrayUnsafe -- FH.write/writeNUnsafe
191+ -- FH.read/A.read
195192#endif
196193
197194o_1_space_copy :: BenchEnv -> [Benchmark]
@@ -199,8 +196,8 @@ o_1_space_copy env =
199196 [ bgroup "copy"
200197 [ mkBench "FH.write . FH.read" env $ \inh _ ->
201198 writeRead inh (nullH env)
202− , mkBench "FH.writeWithBufferOf . FH.readWithBufferOf" env $ \inh _ ->
203− writeReadWithBufferOf inh (nullH env)
199+ , mkBench "FH.writeWith . FH.readWith" env $ \inh _ ->
200+ writeReadWith inh (nullH env)
204201 ]
205202 ]
206203
benchmark/Streamly/Benchmark/Prelude/Adaptive.hs+11−6
@@ -1,3 +1,5 @@
1+{-# OPTIONS_GHC -Wno-deprecations #-}
2+
13-- |
24-- Module : Main
35-- Copyright : (c) 2018 Composewell Technologies
@@ -8,7 +10,7 @@
810import Control.Concurrent (threadDelay)
911import Control.Monad (when)
1012import Control.Monad.IO.Class (liftIO)
11−import Gauge
13+import Test.Tasty.Bench
1214import Streamly.Prelude as S
1315import System.Random (randomRIO)
1416
@@ -34,11 +36,14 @@ source range = S.replicateM value $ do
3436
3537{-# INLINE run #-}
3638run :: IsStream t => (Int, Int) -> (Int, Int) -> (t IO Int -> SerialT IO Int) -> IO ()
37−run srange crange t = S.drain $ do
38− n <- t $ source srange
39− d <- liftIO (randomRIO crange)
40− when (d /= 0) $ liftIO $ threadDelay d
41− return n
39+run srange crange t = S.drain $ S.mapM action (t $ source srange)
40+
41+ where
42+
43+ action x = liftIO $ do
44+ d <- randomRIO crange
45+ when (d /= 0) $ threadDelay d
46+ return x
4247
4348low, medium, high :: Int
4449low = 10
benchmark/Streamly/Benchmark/Prelude/Ahead.hs+3−1
@@ -1,3 +1,5 @@
1+{-# OPTIONS_GHC -Wno-deprecations #-}
2+
13-- |
24-- Module : Main
35-- Copyright : (c) 2018 Composewell Technologies
@@ -13,7 +15,7 @@ import qualified Streamly.Prelude as S
1315import Streamly.Benchmark.Common
1416import Streamly.Benchmark.Prelude
1517
16−import Gauge
18+import Test.Tasty.Bench
1719
1820moduleName :: String
1921moduleName = "Prelude.Ahead"
benchmark/Streamly/Benchmark/Prelude/Async.hs+5−3
@@ -1,3 +1,5 @@
1+{-# OPTIONS_GHC -Wno-deprecations #-}
2+
13-- |
24-- Module : Main
35-- Copyright : (c) 2018 Composewell Technologies
@@ -14,7 +16,7 @@ import qualified Streamly.Internal.Data.Stream.IsStream.Transform as Transform
1416import Streamly.Benchmark.Common
1517import Streamly.Benchmark.Prelude
1618
17−import Gauge
19+import Test.Tasty.Bench
1820
1921moduleName :: String
2022moduleName = "Prelude.Async"
@@ -122,9 +124,9 @@ o_1_space_concatFoldable value =
122124 (sourceFoldMapWithStream value)
123125 , benchIOSrc fromAsync "foldMapWithM (<>) (List)"
124126 (sourceFoldMapWithM value)
125− , benchIOSrc fromSerial "S.concatFoldableWith (<>) (List)"
127+ , benchIOSrc fromAsync "S.concatFoldableWith (<>) (List)"
126128 (concatFoldableWith value)
127− , benchIOSrc fromSerial "S.concatForFoldableWith (<>) (List)"
129+ , benchIOSrc fromAsync "S.concatForFoldableWith (<>) (List)"
128130 (concatForFoldableWith value)
129131 , benchIOSrc fromAsync "foldMapM (List)" (sourceFoldMapM value)
130132 ]
benchmark/Streamly/Benchmark/Prelude/Concurrent.hs+2−1
@@ -1,3 +1,4 @@
1+{-# OPTIONS_GHC -Wno-deprecations #-}
12{-# LANGUAGE CPP #-}
23{-# LANGUAGE RankNTypes #-}
34-- |
@@ -14,7 +15,7 @@ import Streamly.Prelude
1415 , fromWAsync, parallel, fromParallel
1516 )
1617
17−import Gauge
18+import Test.Tasty.Bench
1819import qualified Streamly.Prelude as S
1920
2021-------------------------------------------------------------------------------
benchmark/Streamly/Benchmark/Prelude/Merge.hs+25−2
@@ -1,3 +1,5 @@
1+{-# OPTIONS_GHC -Wno-deprecations #-}
2+
13-- |
24-- Module : Main
35-- Copyright : (c) 2018 Composewell Technologies
@@ -21,19 +23,20 @@
2123#endif
2224
2325import Streamly.Internal.Data.Stream.IsStream (SerialT)
26+import qualified Data.List as List
2427import qualified Streamly.Internal.Data.Stream.IsStream as Stream
2528-- import qualified Streamly.Internal.Data.Unfold as Unfold
2629
2730import Streamly.Benchmark.Common
2831import Streamly.Benchmark.Prelude
2932
30−import Gauge
33+import Test.Tasty.Bench
3134
3235#ifdef INSPECTION
3336import GHC.Types (SPEC(..))
3437import Test.Inspection
3538
36−import qualified Streamly.Internal.Data.Stream.StreamD as D
39+import qualified Streamly.Internal.Data.Stream as D
3740#endif
3841
3942moduleName :: String
@@ -194,6 +197,7 @@ inspect $ hasNoTypeClasses 'unfoldManyMergeBy
194197sortBy :: (Int -> Int -> Ordering) -> SerialT IO Int -> IO ()
195198sortBy cmp = Stream.drain . Stream.sortBy cmp
196199
200+{-
197201-- For fair comparison with concatPairs, removed sorted segmentation
198202{-# INLINE listSortBy #-}
199203listSortBy :: (a -> a -> Ordering) -> [a] -> [a]
@@ -213,6 +217,7 @@ listSortBy cmp = mergeAll . sequences
213217 | otherwise = a:merge as' bs
214218 merge [] bs = bs
215219 merge as [] = as
220+-}
216221
217222o_n_heap_concat :: Int -> [Benchmark]
218223o_n_heap_concat value =
@@ -246,10 +251,28 @@ o_n_heap_concat value =
246251 , bgroup "sorting"
247252 [ benchIOSink value "sortBy compare" (sortBy compare)
248253 , benchIOSink value "sortBy (flip compare)" (sortBy (flip compare))
254+ , benchIOSink value "sortBy compare randomized"
255+ (sortBy compare . Stream.map (\x -> if even x then x + 2 else x))
256+ {-
249257 , bench "sortByLists compare"
250258 $ nf (\x -> listSortBy compare [1..x]) value
251259 , bench "sortByLists (flip compare)"
252260 $ nf (\x -> listSortBy (flip compare) [1..x]) value
261+ , bench "sortByLists compare randomized"
262+ $ nf (\x -> listSortBy compare
263+ (map (\n -> if even n then n + 2 else n) [1..x])
264+ )
265+ value
266+ -}
267+ , bench "sortByLists compare"
268+ $ nf (\x -> List.sortBy compare [1..x]) value
269+ , bench "sortByLists (flip compare)"
270+ $ nf (\x -> List.sortBy (flip compare) [1..x]) value
271+ , bench "sortByLists compare randomized"
272+ $ nf (\x -> List.sortBy compare
273+ (map (\n -> if even n then n + 2 else n) [1..x])
274+ )
275+ value
253276 ]
254277 ]
255278
benchmark/Streamly/Benchmark/Prelude/Parallel.hs+3−1
@@ -1,3 +1,5 @@
1+{-# OPTIONS_GHC -Wno-deprecations #-}
2+
13-- |
24-- Module : Main
35-- Copyright : (c) 2018 Composewell Technologies
@@ -20,7 +22,7 @@ import qualified Streamly.Internal.Data.Stream.IsStream as Internal
2022import Streamly.Benchmark.Common
2123import Streamly.Benchmark.Prelude
2224
23−import Gauge
25+import Test.Tasty.Bench
2426
2527moduleName :: String
2628moduleName = "Prelude.Parallel"
benchmark/Streamly/Benchmark/Prelude/Rate.hs+2−1
@@ -1,3 +1,4 @@
1+{-# OPTIONS_GHC -Wno-deprecations #-}
12{-# LANGUAGE FlexibleContexts #-}
23
34-- |
@@ -13,7 +14,7 @@ import qualified Streamly.Prelude as S
1314import Streamly.Benchmark.Common
1415import Streamly.Benchmark.Prelude
1516
16−import Gauge
17+import Test.Tasty.Bench
1718
1819moduleName :: String
1920moduleName = "Prelude.Rate"
benchmark/Streamly/Benchmark/Prelude/Serial.hsdeleted−53
@@ -1,53 +0,0 @@
1−-- |
2−-- Module : Serial
3−-- Copyright : (c) 2018 Composewell Technologies
4−-- License : BSD-3-Clause
5−-- Maintainer : streamly@composewell.com
6−
7−{-# LANGUAGE CPP #-}
8−{-# LANGUAGE FlexibleContexts #-}
9−{-# LANGUAGE ScopedTypeVariables #-}
10−{-# LANGUAGE RankNTypes #-}
11−
12−module Main (main) where
13−
14−import Streamly.Benchmark.Common.Handle (mkHandleBenchEnv)
15−
16−import qualified Serial.Elimination as Elimination
17−import qualified Serial.Exceptions as Exceptions
18−import qualified Serial.Generation as Generation
19−import qualified Serial.NestedStream as NestedStream
20−import qualified Serial.Split as Split
21−import qualified Serial.Transformation1 as Transformation1
22−import qualified Serial.NestedFold as NestedFold
23−import qualified Serial.Lift as Lift
24−
25−import Streamly.Benchmark.Common
26−
27−moduleName :: String
28−moduleName = "Prelude.Serial"
29−
30−-------------------------------------------------------------------------------
31−-- Main
32−-------------------------------------------------------------------------------
33−
34−-- In addition to gauge options, the number of elements in the stream can be
35−-- passed using the --stream-size option.
36−--
37−main :: IO ()
38−main = do
39− env <- mkHandleBenchEnv
40− runWithCLIOpts defaultStreamSize (allBenchmarks env)
41−
42− where
43−
44− allBenchmarks env size = Prelude.concat
45− [ Generation.benchmarks moduleName size
46− , Elimination.benchmarks moduleName size
47− , Exceptions.benchmarks moduleName env size
48− , Split.benchmarks moduleName env
49− , Transformation1.benchmarks moduleName size
50− , NestedFold.benchmarks moduleName size
51− , Lift.benchmarks moduleName size
52− , NestedStream.benchmarks moduleName size
53− ]
benchmark/Streamly/Benchmark/Prelude/Serial/Generation.hsdeleted−179
@@ -1,179 +0,0 @@
1−-- |
2−-- Module : Serial.Generation
3−-- Copyright : (c) 2018 Composewell Technologies
4−-- License : BSD-3-Clause
5−-- Maintainer : streamly@composewell.com
6−
7−{-# LANGUAGE CPP #-}
8−{-# LANGUAGE FlexibleContexts #-}
9−{-# LANGUAGE ScopedTypeVariables #-}
10−{-# LANGUAGE RankNTypes #-}
11−
12−module Serial.Generation (benchmarks) where
13−
14−import Data.Functor.Identity (Identity)
15−
16−import qualified Prelude
17−import qualified GHC.Exts as GHC
18−
19−import qualified Streamly.Prelude as S
20−
21−import Gauge
22−import Streamly.Prelude (SerialT, fromSerial, MonadAsync)
23−import Streamly.Benchmark.Common
24−import Streamly.Benchmark.Prelude
25−import Prelude hiding (repeat, replicate, iterate)
26−
27−-------------------------------------------------------------------------------
28−-- Generation
29−-------------------------------------------------------------------------------
30−
31−-------------------------------------------------------------------------------
32−-- fromList
33−-------------------------------------------------------------------------------
34−
35−{-# INLINE sourceIsList #-}
36−sourceIsList :: Int -> Int -> SerialT Identity Int
37−sourceIsList value n = GHC.fromList [n..n+value]
38−
39−{-# INLINE sourceIsString #-}
40−sourceIsString :: Int -> Int -> SerialT Identity Char
41−sourceIsString value n = GHC.fromString (Prelude.replicate (n + value) 'a')
42−
43−{-# INLINE readInstance #-}
44−readInstance :: String -> SerialT Identity Int
45−readInstance str =
46− let r = reads str
47− in case r of
48− [(x,"")] -> x
49− _ -> error "readInstance: no parse"
50−
51−-- For comparisons
52−{-# INLINE readInstanceList #-}
53−readInstanceList :: String -> [Int]
54−readInstanceList str =
55− let r = reads str
56− in case r of
57− [(x,"")] -> x
58− _ -> error "readInstance: no parse"
59−
60−{-# INLINE repeat #-}
61−repeat :: (Monad m, S.IsStream t) => Int -> Int -> t m Int
62−repeat count = S.take count . S.repeat
63−
64−{-# INLINE repeatM #-}
65−repeatM :: (MonadAsync m, S.IsStream t) => Int -> Int -> t m Int
66−repeatM count = S.take count . S.repeatM . return
67−
68−{-# INLINE replicate #-}
69−replicate :: (Monad m, S.IsStream t) => Int -> Int -> t m Int
70−replicate = S.replicate
71−
72−{-# INLINE replicateM #-}
73−replicateM :: (MonadAsync m, S.IsStream t) => Int -> Int -> t m Int
74−replicateM count = S.replicateM count . return
75−
76−{-# INLINE enumerateFrom #-}
77−enumerateFrom :: (Monad m, S.IsStream t) => Int -> Int -> t m Int
78−enumerateFrom count = S.take count . S.enumerateFrom
79−
80−{-# INLINE enumerateFromTo #-}
81−enumerateFromTo :: (Monad m, S.IsStream t) => Int -> Int -> t m Int
82−enumerateFromTo = sourceIntFromTo
83−
84−{-# INLINE enumerateFromThen #-}
85−enumerateFromThen :: (Monad m, S.IsStream t) => Int -> Int -> t m Int
86−enumerateFromThen count inp = S.take count $ S.enumerateFromThen inp (inp + 1)
87−
88−{-# INLINE enumerateFromThenTo #-}
89−enumerateFromThenTo :: (Monad m, S.IsStream t) => Int -> Int -> t m Int
90−enumerateFromThenTo = sourceIntFromThenTo
91−
92−-- n ~ 1
93−{-# INLINE enumerate #-}
94−enumerate :: (Monad m, S.IsStream t) => Int -> Int -> t m Int
95−enumerate count n = S.take (count + n) S.enumerate
96−
97−-- n ~ 1
98−{-# INLINE enumerateTo #-}
99−enumerateTo :: (Monad m, S.IsStream t) => Int -> Int -> t m Int
100−enumerateTo count n = S.enumerateTo (minBound + count + n)
101−
102−{-# INLINE iterate #-}
103−iterate :: (Monad m, S.IsStream t) => Int -> Int -> t m Int
104−iterate count = S.take count . S.iterate (+1)
105−
106−{-# INLINE iterateM #-}
107−iterateM :: (MonadAsync m, S.IsStream t) => Int -> Int -> t m Int
108−iterateM count = S.take count . S.iterateM (return . (+1)) . return
109−
110−{-# INLINE fromIndices #-}
111−fromIndices :: (Monad m, S.IsStream t) => Int -> Int -> t m Int
112−fromIndices value n = S.take value $ S.fromIndices (+ n)
113−
114−{-# INLINE fromIndicesM #-}
115−fromIndicesM :: (MonadAsync m, S.IsStream t) => Int -> Int -> t m Int
116−fromIndicesM value n = S.take value $ S.fromIndicesM (return <$> (+ n))
117−
118−o_1_space_generation :: Int -> [Benchmark]
119−o_1_space_generation value =
120− [ bgroup "generation"
121− [ benchIOSrc fromSerial "unfoldr" (sourceUnfoldr value)
122− , benchIOSrc fromSerial "unfoldrM" (sourceUnfoldrM value)
123− , benchIOSrc fromSerial "repeat" (repeat value)
124− , benchIOSrc fromSerial "repeatM" (repeatM value)
125− , benchIOSrc fromSerial "replicate" (replicate value)
126− , benchIOSrc fromSerial "replicateM" (replicateM value)
127− , benchIOSrc fromSerial "iterate" (iterate value)
128− , benchIOSrc fromSerial "iterateM" (iterateM value)
129− , benchIOSrc fromSerial "fromIndices" (fromIndices value)
130− , benchIOSrc fromSerial "fromIndicesM" (fromIndicesM value)
131− , benchIOSrc fromSerial "intFromTo" (sourceIntFromTo value)
132− , benchIOSrc fromSerial "intFromThenTo" (sourceIntFromThenTo value)
133− , benchIOSrc fromSerial "integerFromStep" (sourceIntegerFromStep value)
134− , benchIOSrc fromSerial "fracFromThenTo" (sourceFracFromThenTo value)
135− , benchIOSrc fromSerial "fracFromTo" (sourceFracFromTo value)
136− , benchIOSrc fromSerial "fromList" (sourceFromList value)
137− , benchPureSrc "IsList.fromList" (sourceIsList value)
138− , benchPureSrc "IsString.fromString" (sourceIsString value)
139− , benchIOSrc fromSerial "fromListM" (sourceFromListM value)
140− , benchIOSrc fromSerial "enumerateFrom" (enumerateFrom value)
141− , benchIOSrc fromSerial "enumerateFromTo" (enumerateFromTo value)
142− , benchIOSrc fromSerial "enumerateFromThen" (enumerateFromThen value)
143− , benchIOSrc fromSerial "enumerateFromThenTo" (enumerateFromThenTo value)
144− , benchIOSrc fromSerial "enumerate" (enumerate value)
145− , benchIOSrc fromSerial "enumerateTo" (enumerateTo value)
146−
147− -- These essentially test cons and consM
148− , benchIOSrc fromSerial "fromFoldable" (sourceFromFoldable value)
149− , benchIOSrc fromSerial "fromFoldableM" (sourceFromFoldableM value)
150−
151− , benchIOSrc fromSerial "absTimes" $ absTimes value
152− ]
153− ]
154−
155−o_n_heap_generation :: Int -> [Benchmark]
156−o_n_heap_generation value =
157− [ bgroup "buffered"
158− -- Buffers the output of show/read.
159− -- XXX can the outputs be streaming? Can we have special read/show
160− -- style type classes, readM/showM supporting streaming effects?
161− [ bench "readsPrec pure streams" $
162− nf readInstance (mkString value)
163− , bench "readsPrec Haskell lists" $
164− nf readInstanceList (mkListString value)
165− ]
166− ]
167−
168−-------------------------------------------------------------------------------
169−-- Main
170−-------------------------------------------------------------------------------
171−
172−-- In addition to gauge options, the number of elements in the stream can be
173−-- passed using the --stream-size option.
174−--
175−benchmarks :: String -> Int -> [Benchmark]
176−benchmarks moduleName size =
177− [ bgroup (o_1_space_prefix moduleName) (o_1_space_generation size)
178− , bgroup (o_n_heap_prefix moduleName) (o_n_heap_generation size)
179− ]
benchmark/Streamly/Benchmark/Prelude/Serial/Lift.hsdeleted−123
@@ -1,123 +0,0 @@
1−-- |
2−-- Module : Serial.Lift
3−-- Copyright : (c) 2018 Composewell Technologies
4−-- License : BSD-3-Clause
5−-- Maintainer : streamly@composewell.com
6−
7−{-# LANGUAGE CPP #-}
8−{-# LANGUAGE FlexibleContexts #-}
9−{-# LANGUAGE ScopedTypeVariables #-}
10−{-# LANGUAGE RankNTypes #-}
11−
12−module Serial.Lift (benchmarks) where
13−
14−import Control.Monad.State.Strict (StateT, get, put, MonadState)
15−import qualified Control.Monad.State.Strict as State
16−import Control.Monad.Trans.Class (lift)
17−
18−import qualified Streamly.Prelude as S
19−import qualified Streamly.Internal.Data.Stream.IsStream as Internal
20−
21−import Gauge
22−import Streamly.Prelude (SerialT, fromSerial)
23−import Streamly.Benchmark.Common
24−import Streamly.Benchmark.Prelude
25−import Prelude hiding (reverse, tail)
26−
27−-------------------------------------------------------------------------------
28−-- Monad transformation (hoisting etc.)
29−-------------------------------------------------------------------------------
30−
31−{-# INLINE sourceUnfoldrState #-}
32−sourceUnfoldrState :: (S.IsStream t, S.MonadAsync m)
33− => Int -> Int -> t (StateT Int m) Int
34−sourceUnfoldrState value n = S.unfoldrM step n
35− where
36− step cnt =
37− if cnt > n + value
38− then return Nothing
39− else do
40− s <- get
41− put (s + 1)
42− return (Just (s, cnt + 1))
43−
44−{-# INLINE evalStateT #-}
45−evalStateT :: S.MonadAsync m => Int -> Int -> SerialT m Int
46−evalStateT value n =
47− Internal.evalStateT (return 0) (sourceUnfoldrState value n)
48−
49−{-# INLINE withState #-}
50−withState :: S.MonadAsync m => Int -> Int -> SerialT m Int
51−withState value n =
52− Internal.evalStateT
53− (return (0 :: Int)) (Internal.liftInner (sourceUnfoldrM value n))
54−
55−o_1_space_hoisting :: Int -> [Benchmark]
56−o_1_space_hoisting value =
57− [ bgroup "hoisting"
58− [ benchIOSrc fromSerial "evalState" (evalStateT value)
59− , benchIOSrc fromSerial "withState" (withState value)
60− ]
61− ]
62−
63−{-# INLINE iterateStateIO #-}
64−iterateStateIO ::
65− (S.MonadAsync m)
66− => Int
67− -> StateT Int m Int
68−iterateStateIO n = do
69− x <- get
70− if x > n
71− then do
72− put (x - 1)
73− iterateStateIO n
74− else return x
75−
76−{-# INLINE iterateStateT #-}
77−iterateStateT :: Int -> SerialT (StateT Int IO) Int
78−iterateStateT n = do
79− x <- lift get
80− if x > n
81− then do
82− lift $ put (x - 1)
83− iterateStateT n
84− else return x
85−
86−{-# INLINE iterateState #-}
87−{-# SPECIALIZE iterateState :: Int -> SerialT (StateT Int IO) Int #-}
88−iterateState ::
89− (S.MonadAsync m, MonadState Int m)
90− => Int
91− -> SerialT m Int
92−iterateState n = do
93− x <- get
94− if x > n
95− then do
96− put (x - 1)
97− iterateState n
98− else return x
99−
100−o_n_heap_transformer :: Int -> [Benchmark]
101−o_n_heap_transformer value =
102− [ bgroup "transformer"
103− [ benchIO "StateT Int IO (n times) (baseline)" $ \n ->
104− State.evalStateT (iterateStateIO n) value
105− , benchIO "SerialT (StateT Int IO) (n times)" $ \n ->
106− State.evalStateT (S.drain (iterateStateT n)) value
107− , benchIO "MonadState Int m => SerialT m Int" $ \n ->
108− State.evalStateT (S.drain (iterateState n)) value
109− ]
110− ]
111−
112−-------------------------------------------------------------------------------
113−-- Main
114−-------------------------------------------------------------------------------
115−
116−-- In addition to gauge options, the number of elements in the stream can be
117−-- passed using the --stream-size option.
118−--
119−benchmarks :: String -> Int -> [Benchmark]
120−benchmarks moduleName size =
121− [ bgroup (o_1_space_prefix moduleName) (o_1_space_hoisting size)
122− , bgroup (o_n_heap_prefix moduleName) (o_n_heap_transformer size)
123− ]
benchmark/Streamly/Benchmark/Prelude/Serial/NestedFold.hsdeleted−443
@@ -1,443 +0,0 @@
1−-- |
2−-- Module : Serial.NestedFold
3−-- Copyright : (c) 2018 Composewell Technologies
4−-- License : BSD-3-Clause
5−-- Maintainer : streamly@composewell.com
6−
7−{-# LANGUAGE CPP #-}
8−{-# LANGUAGE FlexibleContexts #-}
9−{-# LANGUAGE ScopedTypeVariables #-}
10−{-# LANGUAGE DeriveAnyClass #-}
11−{-# LANGUAGE DeriveGeneric #-}
12−{-# LANGUAGE RankNTypes #-}
13−{-# LANGUAGE TupleSections #-}
14−
15−module Serial.NestedFold (benchmarks) where
16−
17−import Control.DeepSeq (NFData(..))
18−import Control.Monad (when)
19−import Control.Monad.IO.Class (MonadIO(..))
20−import Data.Monoid (Sum(..))
21−import GHC.Generics (Generic)
22−
23−import qualified Streamly.Internal.Data.Fold as FL
24−import qualified Streamly.Internal.Data.Stream.IsStream as Internal
25−import qualified Streamly.Prelude as S
26−
27−import Gauge
28−import Streamly.Prelude (SerialT, fromSerial)
29−import Streamly.Benchmark.Common
30−import Streamly.Benchmark.Prelude
31−import Prelude hiding (reverse, tail)
32−
33−-------------------------------------------------------------------------------
34−-- Iteration/looping utilities
35−-------------------------------------------------------------------------------
36−
37−{-# INLINE iterateN #-}
38−iterateN :: (Int -> a -> a) -> a -> Int -> a
39−iterateN g initial count = f count initial
40−
41− where
42−
43− f (0 :: Int) x = x
44− f i x = f (i - 1) (g i x)
45−
46−-- Iterate a transformation over a singleton stream
47−{-# INLINE iterateSingleton #-}
48−iterateSingleton :: S.MonadAsync m
49− => (Int -> SerialT m Int -> SerialT m Int)
50− -> Int
51− -> Int
52− -> SerialT m Int
53−iterateSingleton g count n = iterateN g (return n) count
54−
55−-- XXX need to check why this is slower than the explicit recursion above, even
56−-- if the above code is written in a foldr like head recursive way. We also
57−-- need to try this with foldlM' once #150 is fixed.
58−-- However, it is perhaps best to keep the iteration benchmarks independent of
59−-- foldrM and any related fusion issues.
60−{-# INLINE _iterateSingleton #-}
61−_iterateSingleton ::
62− S.MonadAsync m
63− => (Int -> SerialT m Int -> SerialT m Int)
64− -> Int
65− -> Int
66− -> SerialT m Int
67−_iterateSingleton g value n = S.foldrM g (return n) $ sourceIntFromTo value n
68−
69−-- Apply transformation g count times on a stream of length len
70−{-# INLINE iterateSource #-}
71−iterateSource ::
72− S.MonadAsync m
73− => (SerialT m Int -> SerialT m Int)
74− -> Int
75− -> Int
76− -> Int
77− -> SerialT m Int
78−iterateSource g count len n = f count (sourceUnfoldrM len n)
79−
80− where
81−
82− f (0 :: Int) stream = stream
83− f i stream = f (i - 1) (g stream)
84−
85−-------------------------------------------------------------------------------
86−-- Functor
87−-------------------------------------------------------------------------------
88−
89−o_n_space_functor :: Int -> [Benchmark]
90−o_n_space_functor value =
91− [ bgroup "Functor"
92− [ benchIO "(+) (n times) (baseline)" $ \i0 ->
93− iterateN (\i acc -> acc >>= \n -> return $ i + n) (return i0) value
94− , benchIOSrc fromSerial "(<$) (n times)" $
95− iterateSingleton (<$) value
96− , benchIOSrc fromSerial "fmap (n times)" $
97− iterateSingleton (fmap . (+)) value
98− {-
99− , benchIOSrc fromSerial "_(<$) (n times)" $
100− _iterateSingleton (<$) value
101− , benchIOSrc fromSerial "_fmap (n times)" $
102− _iterateSingleton (fmap . (+)) value
103− -}
104− ]
105− ]
106−
107−-------------------------------------------------------------------------------
108−-- Grouping transformations
109−-------------------------------------------------------------------------------
110−
111−{-# INLINE groups #-}
112−groups :: MonadIO m => SerialT m Int -> m ()
113−groups = S.drain . S.groups FL.drain
114−
115−-- XXX Change this test when the order of comparison is later changed
116−{-# INLINE groupsByGT #-}
117−groupsByGT :: MonadIO m => SerialT m Int -> m ()
118−groupsByGT = S.drain . S.groupsBy (>) FL.drain
119−
120−{-# INLINE groupsByEq #-}
121−groupsByEq :: MonadIO m => SerialT m Int -> m ()
122−groupsByEq = S.drain . S.groupsBy (==) FL.drain
123−
124−-- XXX Change this test when the order of comparison is later changed
125−{-# INLINE groupsByRollingLT #-}
126−groupsByRollingLT :: MonadIO m => SerialT m Int -> m ()
127−groupsByRollingLT =
128− S.drain . S.groupsByRolling (<) FL.drain
129−
130−{-# INLINE groupsByRollingEq #-}
131−groupsByRollingEq :: MonadIO m => SerialT m Int -> m ()
132−groupsByRollingEq =
133− S.drain . S.groupsByRolling (==) FL.drain
134−
135−{-# INLINE foldMany #-}
136−foldMany :: Monad m => SerialT m Int -> m ()
137−foldMany =
138− S.drain
139− . S.map getSum
140− . Internal.foldMany (FL.take 2 FL.mconcat)
141− . S.map Sum
142−
143−{-# INLINE foldIterateM #-}
144−foldIterateM :: Monad m => SerialT m Int -> m ()
145−foldIterateM =
146− S.drain
147− . S.map getSum
148− . Internal.foldIterateM
149− (return . FL.take 2 . FL.sconcat) (return (Sum 0))
150− . S.map Sum
151−
152−o_1_space_grouping :: Int -> [Benchmark]
153−o_1_space_grouping value =
154− -- Buffering operations using heap proportional to group/window sizes.
155− [ bgroup "grouping"
156− [ benchIOSink value "groups" groups
157− , benchIOSink value "groupsByGT" groupsByGT
158− , benchIOSink value "groupsByEq" groupsByEq
159− , benchIOSink value "groupsByRollingLT" groupsByRollingLT
160− , benchIOSink value "groupsByRollingEq" groupsByRollingEq
161− , benchIOSink value "foldMany" foldMany
162− , benchIOSink value "foldIterateM" foldIterateM
163− ]
164− ]
165−
166−-------------------------------------------------------------------------------
167−-- Size conserving transformations (reordering, buffering, etc.)
168−-------------------------------------------------------------------------------
169−
170−{-# INLINE reverse #-}
171−reverse :: MonadIO m => Int -> SerialT m Int -> m ()
172−reverse n = composeN n S.reverse
173−
174−{-# INLINE reverse' #-}
175−reverse' :: MonadIO m => Int -> SerialT m Int -> m ()
176−reverse' n = composeN n Internal.reverse'
177−
178−o_n_heap_buffering :: Int -> [Benchmark]
179−o_n_heap_buffering value =
180− [ bgroup "buffered"
181− [
182− -- Reversing a stream
183− benchIOSink value "reverse" (reverse 1)
184− , benchIOSink value "reverse'" (reverse' 1)
185−
186− , benchIOSink value "mkAsync" (mkAsync fromSerial)
187− ]
188− ]
189−
190−-------------------------------------------------------------------------------
191−-- Grouping/Splitting
192−-------------------------------------------------------------------------------
193−
194−{-# INLINE classifySessionsOf #-}
195−classifySessionsOf :: (S.MonadAsync m) => SerialT m Int -> m ()
196−classifySessionsOf =
197− S.drain
198− . Internal.classifySessionsOf (const (return False)) 3 FL.drain
199− . Internal.timestamped
200− . S.concatMap (\x -> S.map (x,) (S.enumerateFromTo 1 (10 :: Int)))
201−
202−o_n_space_grouping :: Int -> [Benchmark]
203−o_n_space_grouping value =
204− -- Buffering operations using heap proportional to group/window sizes.
205− [ bgroup "grouping"
206− [ benchIOSink (value `div` 10) "classifySessionsOf" classifySessionsOf
207− ]
208− ]
209−
210−-------------------------------------------------------------------------------
211−-- Mixed Transformation
212−-------------------------------------------------------------------------------
213−
214−{-# INLINE scanMap #-}
215−scanMap :: MonadIO m => Int -> SerialT m Int -> m ()
216−scanMap n = composeN n $ S.map (subtract 1) . S.scanl' (+) 0
217−
218−{-# INLINE dropMap #-}
219−dropMap :: MonadIO m => Int -> SerialT m Int -> m ()
220−dropMap n = composeN n $ S.map (subtract 1) . S.drop 1
221−
222−{-# INLINE dropScan #-}
223−dropScan :: MonadIO m => Int -> SerialT m Int -> m ()
224−dropScan n = composeN n $ S.scanl' (+) 0 . S.drop 1
225−
226−{-# INLINE takeDrop #-}
227−takeDrop :: MonadIO m => Int -> Int -> SerialT m Int -> m ()
228−takeDrop value n = composeN n $ S.drop 1 . S.take (value + 1)
229−
230−{-# INLINE takeScan #-}
231−takeScan :: MonadIO m => Int -> Int -> SerialT m Int -> m ()
232−takeScan value n = composeN n $ S.scanl' (+) 0 . S.take (value + 1)
233−
234−{-# INLINE takeMap #-}
235−takeMap :: MonadIO m => Int -> Int -> SerialT m Int -> m ()
236−takeMap value n = composeN n $ S.map (subtract 1) . S.take (value + 1)
237−
238−{-# INLINE filterDrop #-}
239−filterDrop :: MonadIO m => Int -> Int -> SerialT m Int -> m ()
240−filterDrop value n = composeN n $ S.drop 1 . S.filter (<= (value + 1))
241−
242−{-# INLINE filterTake #-}
243−filterTake :: MonadIO m => Int -> Int -> SerialT m Int -> m ()
244−filterTake value n = composeN n $ S.take (value + 1) . S.filter (<= (value + 1))
245−
246−{-# INLINE filterScan #-}
247−filterScan :: MonadIO m => Int -> SerialT m Int -> m ()
248−filterScan n = composeN n $ S.scanl' (+) 0 . S.filter (<= maxBound)
249−
250−{-# INLINE filterScanl1 #-}
251−filterScanl1 :: MonadIO m => Int -> SerialT m Int -> m ()
252−filterScanl1 n = composeN n $ S.scanl1' (+) . S.filter (<= maxBound)
253−
254−{-# INLINE filterMap #-}
255−filterMap :: MonadIO m => Int -> Int -> SerialT m Int -> m ()
256−filterMap value n = composeN n $ S.map (subtract 1) . S.filter (<= (value + 1))
257−
258−-------------------------------------------------------------------------------
259−-- Scan and fold
260−-------------------------------------------------------------------------------
261−
262−data Pair a b =
263− Pair !a !b
264− deriving (Generic, NFData)
265−
266−{-# INLINE sumProductFold #-}
267−sumProductFold :: Monad m => SerialT m Int -> m (Int, Int)
268−sumProductFold = S.foldl' (\(s, p) x -> (s + x, p * x)) (0, 1)
269−
270−{-# INLINE sumProductScan #-}
271−sumProductScan :: Monad m => SerialT m Int -> m (Pair Int Int)
272−sumProductScan =
273− S.foldl' (\(Pair _ p) (s0, x) -> Pair s0 (p * x)) (Pair 0 1) .
274− S.scanl' (\(s, _) x -> (s + x, x)) (0, 0)
275−
276−{-# INLINE foldl'ReduceMap #-}
277−foldl'ReduceMap :: Monad m => SerialT m Int -> m Int
278−foldl'ReduceMap = fmap (+ 1) . S.foldl' (+) 0
279−
280−o_1_space_transformations_mixed :: Int -> [Benchmark]
281−o_1_space_transformations_mixed value =
282− -- scanl-map and foldl-map are equivalent to the scan and fold in the foldl
283− -- library. If scan/fold followed by a map is efficient enough we may not
284− -- need monolithic implementations of these.
285− [ bgroup "mixed"
286− [ benchIOSink value "scanl-map" (scanMap 1)
287− , benchIOSink value "foldl-map" foldl'ReduceMap
288− , benchIOSink value "sum-product-fold" sumProductFold
289− , benchIOSink value "sum-product-scan" sumProductScan
290− ]
291− ]
292−
293−o_1_space_transformations_mixedX4 :: Int -> [Benchmark]
294−o_1_space_transformations_mixedX4 value =
295− [ bgroup "mixedX4"
296− [ benchIOSink value "scan-map" (scanMap 4)
297− , benchIOSink value "drop-map" (dropMap 4)
298− , benchIOSink value "drop-scan" (dropScan 4)
299− , benchIOSink value "take-drop" (takeDrop value 4)
300− , benchIOSink value "take-scan" (takeScan value 4)
301− , benchIOSink value "take-map" (takeMap value 4)
302− , benchIOSink value "filter-drop" (filterDrop value 4)
303− , benchIOSink value "filter-take" (filterTake value 4)
304− , benchIOSink value "filter-scan" (filterScan 4)
305− , benchIOSink value "filter-scanl1" (filterScanl1 4)
306− , benchIOSink value "filter-map" (filterMap value 4)
307− ]
308− ]
309−
310−-------------------------------------------------------------------------------
311−-- Iterating a transformation over and over again
312−-------------------------------------------------------------------------------
313−
314−-- this is quadratic
315−{-# INLINE iterateScan #-}
316−iterateScan :: S.MonadAsync m => Int -> Int -> Int -> SerialT m Int
317−iterateScan = iterateSource (S.scanl' (+) 0)
318−
319−-- this is quadratic
320−{-# INLINE iterateScanl1 #-}
321−iterateScanl1 :: S.MonadAsync m => Int -> Int -> Int -> SerialT m Int
322−iterateScanl1 = iterateSource (S.scanl1' (+))
323−
324−{-# INLINE iterateMapM #-}
325−iterateMapM :: S.MonadAsync m => Int -> Int -> Int -> SerialT m Int
326−iterateMapM = iterateSource (S.mapM return)
327−
328−{-# INLINE iterateFilterEven #-}
329−iterateFilterEven :: S.MonadAsync m => Int -> Int -> Int -> SerialT m Int
330−iterateFilterEven = iterateSource (S.filter even)
331−
332−{-# INLINE iterateTakeAll #-}
333−iterateTakeAll :: S.MonadAsync m => Int -> Int -> Int -> Int -> SerialT m Int
334−iterateTakeAll value = iterateSource (S.take (value + 1))
335−
336−{-# INLINE iterateDropOne #-}
337−iterateDropOne :: S.MonadAsync m => Int -> Int -> Int -> SerialT m Int
338−iterateDropOne = iterateSource (S.drop 1)
339−
340−{-# INLINE iterateDropWhileFalse #-}
341−iterateDropWhileFalse :: S.MonadAsync m
342− => Int -> Int -> Int -> Int -> SerialT m Int
343−iterateDropWhileFalse value = iterateSource (S.dropWhile (> (value + 1)))
344−
345−{-# INLINE iterateDropWhileTrue #-}
346−iterateDropWhileTrue :: S.MonadAsync m
347− => Int -> Int -> Int -> Int -> SerialT m Int
348−iterateDropWhileTrue value = iterateSource (S.dropWhile (<= (value + 1)))
349−
350−{-# INLINE tail #-}
351−tail :: Monad m => SerialT m a -> m ()
352−tail s = S.tail s >>= mapM_ tail
353−
354−{-# INLINE nullHeadTail #-}
355−nullHeadTail :: Monad m => SerialT m Int -> m ()
356−nullHeadTail s = do
357− r <- S.null s
358− when (not r) $ do
359− _ <- S.head s
360− S.tail s >>= mapM_ nullHeadTail
361−
362−-- Head recursive operations.
363−o_n_stack_iterated :: Int -> [Benchmark]
364−o_n_stack_iterated value = by10 `seq` by100 `seq`
365− [ bgroup "iterated"
366− [ benchIOSrc fromSerial "mapM (n/10 x 10)" $ iterateMapM by10 10
367− , benchIOSrc fromSerial "scanl' (quadratic) (n/100 x 100)" $
368− iterateScan by100 100
369− , benchIOSrc fromSerial "scanl1' (n/10 x 10)" $ iterateScanl1 by10 10
370− , benchIOSrc fromSerial "filterEven (n/10 x 10)" $
371− iterateFilterEven by10 10
372− , benchIOSrc fromSerial "takeAll (n/10 x 10)" $
373− iterateTakeAll value by10 10
374− , benchIOSrc fromSerial "dropOne (n/10 x 10)" $ iterateDropOne by10 10
375− , benchIOSrc fromSerial "dropWhileFalse (n/10 x 10)" $
376− iterateDropWhileFalse value by10 10
377− , benchIOSrc fromSerial "dropWhileTrue (n/10 x 10)" $
378− iterateDropWhileTrue value by10 10
379− , benchIOSink value "tail" tail
380− , benchIOSink value "nullHeadTail" nullHeadTail
381− ]
382− ]
383−
384− where
385−
386− by10 = value `div` 10
387− by100 = value `div` 100
388−
389−-------------------------------------------------------------------------------
390−-- Pipes
391−-------------------------------------------------------------------------------
392−
393−o_1_space_pipes :: Int -> [Benchmark]
394−o_1_space_pipes value =
395− [ bgroup "pipes"
396− [ benchIOSink value "mapM" (transformMapM fromSerial 1)
397− , benchIOSink value "compose" (transformComposeMapM fromSerial 1)
398− , benchIOSink value "tee" (transformTeeMapM fromSerial 1)
399−#ifdef DEVBUILD
400− -- XXX this take 1 GB memory to compile
401− , benchIOSink value "zip" (transformZipMapM fromSerial 1)
402−#endif
403− ]
404− ]
405−
406−o_1_space_pipesX4 :: Int -> [Benchmark]
407−o_1_space_pipesX4 value =
408− [ bgroup "pipesX4"
409− [ benchIOSink value "mapM" (transformMapM fromSerial 4)
410− , benchIOSink value "compose" (transformComposeMapM fromSerial 4)
411− , benchIOSink value "tee" (transformTeeMapM fromSerial 4)
412−#ifdef DEVBUILD
413− -- XXX this take 1 GB memory to compile
414− , benchIOSink value "zip" (transformZipMapM fromSerial 4)
415−#endif
416− ]
417− ]
418−
419−-------------------------------------------------------------------------------
420−-- Main
421−-------------------------------------------------------------------------------
422−
423−-- In addition to gauge options, the number of elements in the stream can be
424−-- passed using the --stream-size option.
425−--
426−benchmarks :: String -> Int -> [Benchmark]
427−benchmarks moduleName size =
428− [ bgroup (o_1_space_prefix moduleName) $ Prelude.concat
429− [ o_1_space_grouping size
430− , o_1_space_transformations_mixed size
431− , o_1_space_transformations_mixedX4 size
432−
433− -- pipes
434− , o_1_space_pipes size
435− , o_1_space_pipesX4 size
436− ]
437− , bgroup (o_n_stack_prefix moduleName) (o_n_stack_iterated size)
438− , bgroup (o_n_heap_prefix moduleName) $ Prelude.concat
439− [ o_n_space_grouping size
440− , o_n_space_functor size
441− , o_n_heap_buffering size
442− ]
443− ]
benchmark/Streamly/Benchmark/Prelude/WAsync.hs+3−1
@@ -1,3 +1,5 @@
1+{-# OPTIONS_GHC -Wno-deprecations #-}
2+
13-- |
24-- Module : Main
35-- Copyright : (c) 2018 Composewell Technologies
@@ -13,7 +15,7 @@ import qualified Streamly.Prelude as S
1315import Streamly.Benchmark.Common
1416import Streamly.Benchmark.Prelude
1517
16−import Gauge
18+import Test.Tasty.Bench
1719
1820moduleName :: String
1921moduleName = "Prelude.WAsync"
benchmark/Streamly/Benchmark/Prelude/WSerial.hs+20−8
@@ -1,3 +1,5 @@
1+{-# OPTIONS_GHC -Wno-deprecations #-}
2+
13-- |
24-- Module : Main
35-- Copyright : (c) 2018 Composewell Technologies
@@ -27,13 +29,13 @@ import qualified Streamly.Internal.Data.Unfold as UF
2729import Streamly.Benchmark.Common
2830import Streamly.Benchmark.Prelude
2931
30−import Gauge
32+import Test.Tasty.Bench
3133
3234#ifdef INSPECTION
3335import GHC.Types (SPEC(..))
3436import Test.Inspection
3537
36−import qualified Streamly.Internal.Data.Stream.StreamD as D
38+import qualified Streamly.Internal.Data.Stream as D
3739#endif
3840
3941moduleName :: String
@@ -186,13 +188,22 @@ o_1_space_concat value =
186188 , benchIOSrc1
187189 "concatMapWithWSerial (sqrtVal of sqrtVal)"
188190 (concatStreamsWith wSerial sqrtVal sqrtVal)
191+ ]
192+ ]
193+
194+ where
195+
196+ sqrtVal = round $ sqrt (fromIntegral value :: Double)
197+
198+o_n_space_concat :: Int -> [Benchmark]
199+o_n_space_concat value =
200+ [ bgroup "concatMapWith"
201+ [
189202 -- concatMapWith using StreamD versions of interleave operations are
190203 -- all quadratic, we just measure the sqrtVal benchmark for comparison.
191− {-
192− , benchIOSrc1
193− "concatMapWithInterleave (n of 1)"
194− (concatStreamsWith Internal.interleave value 1)
195− -}
204+ benchIOSrc1
205+ "concatMapWithInterleave (sqrtVal of 1)"
206+ (concatStreamsWith Internal.interleave sqrtVal 1)
196207 , benchIOSrc1
197208 "concatMapWithInterleave (sqrtVal of sqrtVal)"
198209 (concatStreamsWith Internal.interleave sqrtVal sqrtVal)
@@ -353,5 +364,6 @@ main = runWithCLIOpts defaultStreamSize allBenchmarks
353364 , o_1_space_outerProduct size
354365 ]
355366 , bgroup (o_n_heap_prefix moduleName) (o_n_heap_concat size)
356− , bgroup (o_n_space_prefix moduleName) (o_n_space_outerProduct size)
367+ , bgroup (o_n_space_prefix moduleName) $
368+ o_n_space_outerProduct size ++ o_n_space_concat size
357369 ]
benchmark/Streamly/Benchmark/Prelude/ZipAsync.hs+17−1
@@ -1,3 +1,5 @@
1+{-# OPTIONS_GHC -Wno-deprecations #-}
2+
13-- |
24-- Module : Main
35-- Copyright : (c) 2018 Composewell Technologies
@@ -13,7 +15,7 @@ import qualified Streamly.Prelude as S
1315import Streamly.Benchmark.Common
1416import Streamly.Benchmark.Prelude
1517
16−import Gauge
18+import Test.Tasty.Bench
1719
1820moduleName :: String
1921moduleName = "Prelude.ZipAsync"
@@ -41,6 +43,12 @@ zipAsyncAp count n =
4143 S.fromZipAsync $
4244 (,) <$> sourceUnfoldrM count n <*> sourceUnfoldrM count (n + 1)
4345
46+fromZipAsyncTraverse :: String -> Int -> Benchmark
47+fromZipAsyncTraverse name count =
48+ bench name
49+ $ nfIO
50+ $ S.drain $ S.fromZipAsync $ traverse S.fromPure [0 :: Int .. count]
51+
4452o_1_space_joining :: Int -> [Benchmark]
4553o_1_space_joining value =
4654 [ bgroup "joining"
@@ -53,6 +61,13 @@ o_1_space_joining value =
5361 ]
5462 ]
5563
64+o_n_heap_joining :: Int -> [Benchmark]
65+o_n_heap_joining value =
66+ [ bgroup "joining"
67+ [ fromZipAsyncTraverse "ZipAsync Applicative (x/100)" (value `div` 100)
68+ ]
69+ ]
70+
5671-------------------------------------------------------------------------------
5772-- Monad outer product
5873-------------------------------------------------------------------------------
@@ -78,4 +93,5 @@ main = runWithCLIOpts defaultStreamSize allBenchmarks
7893 [ o_1_space_joining size
7994 , o_1_space_outerProduct size
8095 ]
96+ , bgroup (o_n_heap_prefix moduleName) $ o_n_heap_joining size
8197 ]
benchmark/Streamly/Benchmark/Prelude/ZipSerial.hs+9−5
@@ -1,3 +1,5 @@
1+{-# OPTIONS_GHC -Wno-deprecations #-}
2+
13-- |
24-- Module : Main
35-- Copyright : (c) 2018 Composewell Technologies
@@ -27,13 +29,13 @@ import qualified Streamly.Prelude as S
2729import Streamly.Benchmark.Common
2830import Streamly.Benchmark.Prelude hiding (sourceUnfoldrM)
2931
30−import Gauge
32+import Test.Tasty.Bench
3133
3234#ifdef INSPECTION
3335import GHC.Types (SPEC(..))
3436import Test.Inspection
3537
36−import qualified Streamly.Internal.Data.Stream.StreamD as D
38+import qualified Streamly.Internal.Data.Stream as D
3739#endif
3840
3941moduleName :: String
@@ -104,8 +106,6 @@ o_1_space_joining value =
104106 , benchIOSrc1 "concatMapWithZip (+) (2 of n/2)"
105107 (concatMapWithZip 2 (value `div` 2))
106108 -}
107− , benchIOSrc1 "concatPairsWithZip (+) (2 of n/2)"
108− (concatPairsWithZip 2 (value `div` 2))
109109 ]
110110 ]
111111
@@ -138,6 +138,8 @@ o_n_heap_concat value =
138138 (concatPairsWithZip value 1)
139139 , benchIOSrc1 "concatPairsWithZip (sqrtVal of sqrtVal)"
140140 (concatPairsWithZip sqrtVal sqrtVal)
141+ , benchIOSrc1 "concatPairsWithZip (+) (2 of n/2)"
142+ (concatPairsWithZip 2 (value `div` 2))
141143 ]
142144 ]
143145
@@ -176,8 +178,10 @@ main = runWithCLIOpts defaultStreamSize allBenchmarks
176178 [ bgroup (o_1_space_prefix moduleName) $ concat
177179 [ o_1_space_joining size
178180 , o_1_space_mapping size
179− , o_n_heap_concat size
180181 -- XXX need to fix, timing in ns
181182 -- , o_1_space_outerProduct size
182183 ]
184+ , bgroup (o_n_heap_prefix moduleName) $ concat
185+ [ o_n_heap_concat size
186+ ]
183187 ]
benchmark/Streamly/Benchmark/Unicode/Char.hs+18−10
@@ -1,3 +1,5 @@
1+{-# OPTIONS_GHC -Wno-deprecations -Wno-orphans #-}
2+
13--
24-- Module : Streamly.Unicode.Char
35-- Copyright : (c) 2021 Composewell Technologies
@@ -10,19 +12,19 @@
1012-- Imports
1113--------------------------------------------------------------------------------
1214
13−import Control.DeepSeq (NFData)
14−import Streamly.Internal.Data.Array.Foreign (Array)
15+import Control.DeepSeq (NFData(..))
16+import Streamly.Internal.Data.Array (Array)
1517import System.FilePath (dropExtensions, takeFileName)
1618import System.FilePath.Posix ((</>))
17−import Gauge.Main (Benchmark, bench, bgroup, defaultMain, env, nfIO)
19+import Test.Tasty.Bench (Benchmark, bench, bgroup, defaultMain, env, nfIO)
1820import Streamly.Internal.Unicode.Char
1921 ( NormalizationMode(NFC, NFD, NFKC, NFKD)
2022 , normalize
2123 )
2224import Streamly.Benchmark.Common (o_1_space_prefix)
2325
24−import qualified Streamly.Internal.Data.Array.Foreign as Array
25−import qualified Streamly.Internal.Data.Stream.IsStream as IsStream
26+import qualified Streamly.Internal.Data.Array as Array
27+import qualified Streamly.Internal.Data.Stream as IsStream
2628import qualified System.Directory as Dir
2729
2830--------------------------------------------------------------------------------
@@ -41,7 +43,13 @@ dataDir = "benchmark/Streamly/Benchmark/Unicode/data"
4143dataSetSize :: Int
4244dataSetSize = 1000000
4345
44−makeBench :: (NFData a) => (String, a -> IO ()) -> (String, IO a) -> Benchmark
46+-- Unboxed arrays are fully evaluated.
47+instance NFData (Array a) where
48+ {-# INLINE rnf #-}
49+ rnf _ = ()
50+
51+makeBench ::
52+ (String, Array Char -> IO ()) -> (String, IO (Array Char)) -> Benchmark
4553makeBench (implName, func) (dataName, setup) =
4654 env setup (bench (implName ++ "/" ++ dataName) . nfIO . func)
4755
@@ -65,10 +73,10 @@ arrInput file = second (fmap Array.fromList) (strInput file)
6573
6674benchFunctions :: [(String, Array Char -> IO ())]
6775benchFunctions =
68− [ ("NFD", IsStream.drain . normalize NFD . Array.toStream)
69− , ("NFKD", IsStream.drain . normalize NFKD . Array.toStream)
70− , ("NFC", IsStream.drain . normalize NFC . Array.toStream)
71− , ("NFKC", IsStream.drain . normalize NFKC . Array.toStream)
76+ [ ("NFD", IsStream.drain . normalize NFD . Array.read)
77+ , ("NFKD", IsStream.drain . normalize NFKD . Array.read)
78+ , ("NFC", IsStream.drain . normalize NFC . Array.read)
79+ , ("NFKC", IsStream.drain . normalize NFKC . Array.read)
7280 ]
7381
7482main :: IO ()
benchmark/Streamly/Benchmark/Unicode/Parser.hsnew file+107
@@ -0,0 +1,107 @@
1+-- |
2+-- Module : Streamly.Benchmark.Data.Parser
3+-- Copyright : (c) 2020 Composewell Technologies
4+--
5+-- License : BSD-3-Clause
6+-- Maintainer : streamly@composewell.com
7+
8+{-# LANGUAGE CPP #-}
9+{-# LANGUAGE FlexibleContexts #-}
10+{-# LANGUAGE ScopedTypeVariables #-}
11+{-# OPTIONS_GHC -Wno-orphans #-}
12+
13+#undef FUSION_CHECK
14+#ifdef FUSION_CHECK
15+{-# OPTIONS_GHC -ddump-simpl -ddump-to-file -dsuppress-all #-}
16+#endif
17+
18+module Main
19+ (
20+ main
21+ ) where
22+
23+import Control.DeepSeq (NFData(..))
24+import Control.Monad (replicateM_)
25+import Streamly.Internal.Data.Parser (ParseError(..))
26+import Streamly.Internal.Data.Stream (Stream)
27+import Prelude hiding
28+ (any, all, take, sequence, sequence_, sequenceA, takeWhile, dropWhile)
29+
30+import qualified Streamly.Data.Array as Array
31+import qualified Streamly.Data.Stream as Stream
32+import qualified Streamly.Internal.Unicode.Parser as PRU
33+
34+import Test.Tasty.Bench hiding (env)
35+import Streamly.Benchmark.Common
36+
37+runParser :: Int -> (Stream IO Char -> IO a) -> IO ()
38+runParser count p = do
39+ let v = "+123456789.123456789e-123"
40+ let !(arr :: Array.Array Char) = Array.fromListN (length v) v
41+ let s = Stream.unfold Array.reader arr
42+ replicateM_ count (p s)
43+
44+-- | Takes a fold method, and uses it with a default source.
45+{-# INLINE benchIOSink #-}
46+benchIOSink :: Int -> String -> (Stream IO Char -> IO b) -> Benchmark
47+benchIOSink value name f = bench name $ nfIO $ runParser value f
48+
49+{-# INLINE doubleParser #-}
50+doubleParser :: Monad m => Stream m Char -> m (Either ParseError (Int, Int))
51+doubleParser = Stream.parse PRU.doubleParser
52+
53+{-# INLINE number #-}
54+number :: Monad m => Stream m Char -> m (Either ParseError (Integer, Int))
55+number = Stream.parse PRU.number
56+
57+{-# INLINE double #-}
58+double :: Monad m => Stream m Char -> m (Either ParseError Double)
59+double = Stream.parse PRU.double
60+
61+{-# INLINE numberDouble #-}
62+numberDouble :: Monad m => Stream m Char -> m (Either ParseError Double)
63+numberDouble = Stream.parse p
64+ where p = uncurry PRU.mkDouble <$> PRU.number
65+
66+-------------------------------------------------------------------------------
67+-- Benchmarks
68+-------------------------------------------------------------------------------
69+
70+moduleName :: String
71+moduleName = "Unicode.Parser"
72+
73+instance NFData ParseError where
74+ {-# INLINE rnf #-}
75+ rnf (ParseError x) = rnf x
76+
77+o_n_heap_serial :: Int -> [Benchmark]
78+o_n_heap_serial value =
79+ [
80+ benchIOSink value "doubleParser" doubleParser
81+ , benchIOSink value "number" number
82+ , benchIOSink value "double (doubleParser)" double
83+ , benchIOSink value "double (number)" numberDouble
84+ ]
85+
86+-------------------------------------------------------------------------------
87+-- Driver
88+-------------------------------------------------------------------------------
89+
90+main :: IO ()
91+main = do
92+#ifndef FUSION_CHECK
93+ runWithCLIOpts defaultStreamSize allBenchmarks
94+
95+ where
96+
97+ allBenchmarks value =
98+ [ bgroup (o_n_heap_prefix moduleName) (o_n_heap_serial value)
99+ ]
100+#else
101+ -- Enable FUSION_CHECK macro at the beginning of the file
102+ -- Enable one benchmark below, and run the benchmark
103+ -- Check the .dump-simpl output
104+ let value = 100000
105+ runParser value double
106+ return ()
107+#endif
benchmark/Streamly/Benchmark/Unicode/Stream.hs+78−31
@@ -1,3 +1,5 @@
1+{-# OPTIONS_GHC -Wno-deprecations #-}
2+
13--
24-- Module : Streamly.Unicode.Stream
35-- Copyright : (c) 2019 Composewell Technologies
@@ -9,6 +11,11 @@
911{-# LANGUAGE CPP #-}
1012{-# LANGUAGE ScopedTypeVariables #-}
1113
14+#undef FUSION_CHECK
15+#ifdef FUSION_CHECK
16+{-# OPTIONS_GHC -ddump-simpl -ddump-to-file -dsuppress-all #-}
17+#endif
18+
1219#ifdef __HADDOCK_VERSION__
1320#undef INSPECTION
1421#endif
@@ -18,29 +25,30 @@
1825{-# OPTIONS_GHC -fplugin Test.Inspection.Plugin #-}
1926#endif
2027
28+import Streamly.Data.Stream (Stream)
29+import Streamly.Data.Fold (Fold)
2130import Prelude hiding (last, length)
2231import System.IO (Handle)
2332
24−import qualified Streamly.Data.Array.Foreign as Array
33+import qualified Streamly.Data.Array as Array
2534import qualified Streamly.Data.Fold as Fold
26−import qualified Streamly.FileSystem.Handle as Handle
27−import qualified Streamly.Internal.Data.Stream.IsStream as Stream
35+import qualified Streamly.Internal.Data.Stream as Stream
2836import qualified Streamly.Internal.Data.Unfold as Unfold
2937import qualified Streamly.Internal.FileSystem.Handle as Handle
30−import qualified Streamly.Internal.Unicode.Array.Char as UnicodeArr
38+import qualified Streamly.Internal.Unicode.Array as UnicodeArr
3139import qualified Streamly.Internal.Unicode.Stream as Unicode
3240
33−import Gauge hiding (env)
41+import Test.Tasty.Bench hiding (env)
3442import Streamly.Benchmark.Common
3543import Streamly.Benchmark.Common.Handle
3644
3745#ifdef INSPECTION
38−import Foreign.Storable (Storable)
39−import Streamly.Internal.Data.Stream.StreamD.Type (Step(..))
40−import qualified Streamly.Internal.Data.Fold.Type as Fold
46+import Streamly.Internal.Data.MutByteArray (Unbox)
47+import Streamly.Internal.Data.Stream (Step(..))
48+import qualified Streamly.Internal.Data.Array as Array
49+import qualified Streamly.Internal.Data.MutArray as MutArray
50+import qualified Streamly.Internal.Data.Fold as Fold
4151import qualified Streamly.Internal.Data.Tuple.Strict as Strict
42−import qualified Streamly.Internal.Data.Array.Foreign.Type as Array
43−import qualified Streamly.Internal.Data.Array.Foreign.Mut.Type as MArray
4452
4553import Test.Inspection
4654#endif
@@ -54,8 +62,8 @@ copyCodecUtf8ArraysLenient :: Handle -> Handle -> IO ()
5462copyCodecUtf8ArraysLenient inh outh =
5563 Stream.fold (Handle.write outh)
5664 $ Unicode.encodeUtf8'
57− $ Unicode.decodeUtf8Arrays
58− $ Handle.toChunks inh
65+ $ Unicode.decodeUtf8Chunks
66+ $ Handle.readChunks inh
5967
6068#ifdef INSPECTION
6169inspect $ hasNoTypeClasses 'copyCodecUtf8ArraysLenient
@@ -75,23 +83,29 @@ o_1_space_decode_encode_chunked env =
7583-- copy with group/ungroup transformations
7684-------------------------------------------------------------------------------
7785
86+{-# INLINE splitOnSuffix #-}
87+splitOnSuffix
88+ :: (Monad m)
89+ => (a -> Bool) -> Fold m a b -> Stream m a -> Stream m b
90+splitOnSuffix predicate f = Stream.foldMany (Fold.takeEndBy_ predicate f)
91+
7892{-# NOINLINE linesUnlinesCopy #-}
7993linesUnlinesCopy :: Handle -> Handle -> IO ()
8094linesUnlinesCopy inh outh =
8195 Stream.fold (Handle.write outh)
8296 $ Unicode.encodeLatin1'
8397 $ Unicode.unlines Unfold.fromList
84− $ Stream.splitOnSuffix (== '\n') Fold.toList
98+ $ splitOnSuffix (== '\n') Fold.toList
8599 $ Unicode.decodeLatin1
86− $ Stream.unfold Handle.read inh
100+ $ Stream.unfold Handle.reader inh
87101
88102{-# NOINLINE linesUnlinesArrayWord8Copy #-}
89103linesUnlinesArrayWord8Copy :: Handle -> Handle -> IO ()
90104linesUnlinesArrayWord8Copy inh outh =
91105 Stream.fold (Handle.write outh)
92− $ Stream.interposeSuffix 10 Array.read
93− $ Stream.splitOnSuffix (== 10) Array.write
94− $ Stream.unfold Handle.read inh
106+ $ Stream.interposeSuffix 10 Array.reader
107+ $ splitOnSuffix (== 10) Array.write
108+ $ Stream.unfold Handle.reader inh
95109
96110-- XXX splitSuffixOn requires -funfolding-use-threshold=150 for better fusion
97111-- | Lines and unlines
@@ -103,10 +117,10 @@ linesUnlinesArrayCharCopy inh outh =
103117 $ UnicodeArr.unlines
104118 $ UnicodeArr.lines
105119 $ Unicode.decodeLatin1
106− $ Stream.unfold Handle.read inh
120+ $ Stream.unfold Handle.reader inh
107121
108122#ifdef INSPECTION
109−inspect $ hasNoTypeClassesExcept 'linesUnlinesArrayCharCopy [''Storable]
123+inspect $ hasNoTypeClassesExcept 'linesUnlinesArrayCharCopy [''Unbox]
110124-- inspect $ 'linesUnlinesArrayCharCopy `hasNoType` ''Step
111125#endif
112126
@@ -131,7 +145,7 @@ wordsUnwordsCopyWord8 inh outh =
131145 Stream.fold (Handle.write outh)
132146 $ Stream.interposeSuffix 32 Unfold.fromList
133147 $ Stream.wordsBy isSp Fold.toList
134− $ Stream.unfold Handle.read inh
148+ $ Stream.unfold Handle.reader inh
135149
136150#ifdef INSPECTION
137151inspect $ hasNoTypeClasses 'wordsUnwordsCopyWord8
@@ -155,7 +169,7 @@ wordsUnwordsCopy inh outh =
155169 $ Stream.wordsBy isSpace Fold.toList
156170 -- -- $ Stream.splitOn isSpace Fold.toList
157171 $ Unicode.decodeLatin1
158− $ Stream.unfold Handle.read inh
172+ $ Stream.unfold Handle.reader inh
159173
160174#ifdef INSPECTION
161175-- inspect $ hasNoTypeClasses 'wordsUnwordsCopy
@@ -170,7 +184,7 @@ wordsUnwordsCharArrayCopy inh outh =
170184 $ UnicodeArr.unwords
171185 $ UnicodeArr.words
172186 $ Unicode.decodeLatin1
173− $ Stream.unfold Handle.read inh
187+ $ Stream.unfold Handle.reader inh
174188
175189o_1_space_copy_read_group_ungroup :: BenchEnv -> [Benchmark]
176190o_1_space_copy_read_group_ungroup env =
@@ -202,16 +216,16 @@ copyStreamLatin1' inh outh =
202216 Stream.fold (Handle.write outh)
203217 $ Unicode.encodeLatin1'
204218 $ Unicode.decodeLatin1
205− $ Stream.unfold Handle.read inh
219+ $ Stream.unfold Handle.reader inh
206220
207221#ifdef INSPECTION
208222inspect $ hasNoTypeClasses 'copyStreamLatin1'
209223inspect $ 'copyStreamLatin1' `hasNoType` ''Step
210224inspect $ 'copyStreamLatin1' `hasNoType` ''Unfold.ConcatState -- Handle.read/UF.many
211−inspect $ 'copyStreamLatin1' `hasNoType` ''MArray.ReadUState -- Handle.read/Array.read
212225
213226inspect $ 'copyStreamLatin1' `hasNoType` ''Fold.Step
214−inspect $ 'copyStreamLatin1' `hasNoType` ''Array.ArrayUnsafe -- Handle.write/writeNUnsafe
227+inspect $ 'copyStreamLatin1' `hasNoType` ''MutArray.ArrayUnsafe -- Handle.write/writeNUnsafe
228+ -- Handle.read/Array.read
215229inspect $ 'copyStreamLatin1' `hasNoType` ''Strict.Tuple3' -- Handle.write/chunksOf
216230#endif
217231
@@ -222,17 +236,17 @@ copyStreamLatin1 inh outh =
222236 Stream.fold (Handle.write outh)
223237 $ Unicode.encodeLatin1
224238 $ Unicode.decodeLatin1
225− $ Stream.unfold Handle.read inh
239+ $ Stream.unfold Handle.reader inh
226240
227241#ifdef INSPECTION
228242inspect $ hasNoTypeClasses 'copyStreamLatin1
229243inspect $ 'copyStreamLatin1 `hasNoType` ''Step
230244inspect $ 'copyStreamLatin1 `hasNoType` ''Unfold.ConcatState -- Handle.read/UF.many
231−inspect $ 'copyStreamLatin1 `hasNoType` ''MArray.ReadUState -- Handle.read/Array.read
232245
233246inspect $ 'copyStreamLatin1 `hasNoType` ''Fold.ManyState
234247inspect $ 'copyStreamLatin1 `hasNoType` ''Fold.Step
235−inspect $ 'copyStreamLatin1 `hasNoType` ''Array.ArrayUnsafe -- Handle.write/writeNUnsafe
248+inspect $ 'copyStreamLatin1 `hasNoType` ''MutArray.ArrayUnsafe -- Handle.write/writeNUnsafe
249+ -- Handle.read/Array.read
236250inspect $ 'copyStreamLatin1 `hasNoType` ''Strict.Tuple3' -- Handle.write/chunksOf
237251#endif
238252
@@ -242,7 +256,7 @@ _copyStreamUtf8' inh outh =
242256 Stream.fold (Handle.write outh)
243257 $ Unicode.encodeUtf8'
244258 $ Unicode.decodeUtf8'
245− $ Stream.unfold Handle.read inh
259+ $ Stream.unfold Handle.reader inh
246260
247261#ifdef INSPECTION
248262inspect $ hasNoTypeClasses '_copyStreamUtf8'
@@ -258,7 +272,7 @@ copyStreamUtf8 inh outh =
258272 Stream.fold (Handle.write outh)
259273 $ Unicode.encodeUtf8
260274 $ Unicode.decodeUtf8
261− $ Stream.unfold Handle.read inh
275+ $ Stream.unfold Handle.reader inh
262276
263277#ifdef INSPECTION
264278inspect $ hasNoTypeClasses 'copyStreamUtf8
@@ -267,6 +281,24 @@ inspect $ hasNoTypeClasses 'copyStreamUtf8
267281-- inspect $ 'copyStreamUtf8Lax `hasNoType` ''D.ConcatMapUState
268282#endif
269283
284+{-# NOINLINE _copyStreamUtf8'Fold #-}
285+_copyStreamUtf8'Fold :: Handle -> Handle -> IO ()
286+_copyStreamUtf8'Fold inh outh =
287+ Stream.fold (Handle.write outh)
288+ $ Unicode.encodeUtf8
289+ $ Stream.catRights
290+ $ Stream.parseMany Unicode.writeCharUtf8'
291+ $ Stream.unfold Handle.reader inh
292+
293+{-# NOINLINE _copyStreamUtf8Parser #-}
294+_copyStreamUtf8Parser :: Handle -> Handle -> IO ()
295+_copyStreamUtf8Parser inh outh =
296+ Stream.fold (Handle.write outh)
297+ $ Unicode.encodeUtf8
298+ $ Stream.catRights $ Stream.parseMany
299+ (Unicode.parseCharUtf8With Unicode.TransliterateCodingFailure)
300+ $ Stream.unfold Handle.reader inh
301+
270302o_1_space_decode_encode_read :: BenchEnv -> [Benchmark]
271303o_1_space_decode_encode_read env =
272304 [ bgroup "decode-encode"
@@ -276,11 +308,15 @@ o_1_space_decode_encode_read env =
276308 copyStreamLatin1' inh outh
277309 , mkBench "encodeLatin1 . decodeLatin1" env $ \inh outh ->
278310 copyStreamLatin1 inh outh
279−#ifdef DEVBUILD
311+#ifdef INCLUDE_STRICT_UTF8
280312 -- Requires valid unicode input
281313 , mkBench "encodeUtf8' . decodeUtf8'" env $ \inh outh ->
282314 _copyStreamUtf8' inh outh
315+ , mkBench "encodeUtf8' . foldMany writeCharUtf8'" env $ \inh outh ->
316+ _copyStreamUtf8'Fold inh outh
283317#endif
318+ , mkBenchSmall "encodeUtf8 . parseMany parseCharUtf8" env
319+ $ \inh outh -> _copyStreamUtf8Parser inh outh
284320 , mkBenchSmall "encodeUtf8 . decodeUtf8" env $ \inh outh ->
285321 copyStreamUtf8 inh outh
286322 ]
@@ -288,6 +324,7 @@ o_1_space_decode_encode_read env =
288324
289325main :: IO ()
290326main = do
327+#ifndef FUSION_CHECK
291328 env <- mkHandleBenchEnv
292329 defaultMain (allBenchmarks env)
293330
@@ -300,3 +337,13 @@ main = do
300337 , o_1_space_decode_encode_read env
301338 ]
302339 ]
340+#else
341+ -- Enable FUSION_CHECK macro at the beginning of the file
342+ -- Enable one benchmark below, and run the benchmark
343+ -- Check the .dump-simpl output
344+ env <- mkHandleBenchEnv
345+ let mkHandles (RefHandles {bigInH = inh, outputH = outh}) = Handles inh outh
346+ (Handles inh outh) <- getHandles env mkHandles
347+ copyStreamLatin1' inh outh
348+ return ()
349+#endif
benchmark/Streamly/Benchmark/Unicode/Utf8.hs+3−3
@@ -13,7 +13,7 @@
1313import Data.Char (chr)
1414import Streamly.Internal.Unicode.Utf8 (Utf8)
1515
16−import Gauge hiding (env)
16+import Test.Tasty.Bench hiding (env)
1717import Streamly.Benchmark.Common
1818
1919import qualified Streamly.Internal.Unicode.Utf8 as Utf8
@@ -49,7 +49,7 @@ main = runWithCLIOpts defaultStreamSize allBenchmarks
4949 allBenchmarks value =
5050 [ bgroup
5151 moduleName
52− [ bench "pack" $ nf pack value
53− , bench "pack + unpack" $ nf packUnpack value
52+ [ bench "pack" $ whnf pack value
53+ , bench "pack + unpack" $ whnf packUnpack value
5454 ]
5555 ]
benchmark/bench-report/BenchReport.hsdeleted−273
@@ -1,273 +0,0 @@
1−{-# LANGUAGE RecordWildCards #-}
2−{-# LANGUAGE ScopedTypeVariables #-}
3−
4−module Main where
5−
6−import Control.Exception (catch, ErrorCall(..))
7−import Control.Monad (mzero)
8−import Control.Monad.IO.Class (liftIO)
9−import Control.Monad.Trans.Maybe
10−import Control.Monad.Trans.State
11−import Data.Char (toLower)
12−import Data.List
13−import GHC.Real (infinity)
14−import System.Environment (getArgs)
15−import Text.Read (readMaybe)
16−
17−import BenchShow
18−
19−------------------------------------------------------------------------------
20−-- Command line parsing
21−------------------------------------------------------------------------------
22−
23−data BenchType
24− = Compare String
25− | Standard String
26− deriving Show
27−
28−data Options = Options
29− { genGraphs :: Bool
30− , sortByName :: Bool
31− , useGauge :: Bool
32− , benchType :: Maybe BenchType
33− , fields :: [String]
34− , diffStyle :: GroupStyle
35− , cutOffPercent :: Double
36− } deriving Show
37−
38−defaultOptions :: Options
39−defaultOptions = Options False False False Nothing ["time"] PercentDiff 0
40−
41−setGenGraphs :: Monad m => Bool -> StateT (a, Options) m ()
42−setGenGraphs val = do
43− (args, opts) <- get
44− put (args, opts { genGraphs = val })
45−
46−setSortByName :: Monad m => Bool -> StateT (a, Options) m ()
47−setSortByName val = do
48− (args, opts) <- get
49− put (args, opts { sortByName = val })
50−
51−setUseGauge :: Monad m => Bool -> StateT (a, Options) m ()
52−setUseGauge val = do
53− (args, opts) <- get
54− put (args, opts { useGauge = val })
55−
56−setBenchType :: Monad m => BenchType -> StateT (a, Options) m ()
57−setBenchType val = do
58− (args, opts) <- get
59− put (args, opts { benchType = Just val })
60−
61−setFields :: Monad m => [String] -> StateT (a, Options) m ()
62−setFields val = do
63− (args, opts) <- get
64− put (args, opts { fields = val })
65−
66−setDiff :: Monad m => String -> StateT (a, Options) m ()
67−setDiff val = do
68− (args, opts) <- get
69− let cmpStyle =
70− case val of
71− "absolute" -> Absolute
72− "multiples" -> Multiples
73− "percent" -> PercentDiff
74− x -> error $ "Unknown diff option: " ++ show x
75− in put (args, opts { diffStyle = cmpStyle })
76−
77−setCutOff :: Monad m => String -> StateT (a, Options) m ()
78−setCutOff val = do
79− (args, opts) <- get
80− case readMaybe val of
81− Just x -> put (args, opts { cutOffPercent = x })
82− Nothing -> error $ "Invalid cutoff value: " ++ show val
83−
84−-- Like the shell "shift" to shift the command line arguments
85−shift :: StateT ([String], Options) (MaybeT IO) (Maybe String)
86−shift = do
87− s <- get
88− case s of
89− ([], _) -> return Nothing
90− (x : xs, opts) -> put (xs, opts) >> return (Just x)
91−
92−parseBench :: StateT ([String], Options) (MaybeT IO) ()
93−parseBench = do
94− x <- shift
95− case x of
96− Just str | "_cmp" `isSuffixOf` str -> setBenchType (Compare str)
97− Just str -> setBenchType (Standard str)
98− Nothing -> do
99− liftIO $ putStrLn "please provide a benchmark type "
100− mzero
101−
102−parseFields :: StateT ([String], Options) (MaybeT IO) ()
103−parseFields = do
104− x <- shift
105− case x of
106− Just str -> setFields (words str)
107− Nothing -> do
108− liftIO $ putStrLn
109− "please provide a list of fields after --fields"
110− mzero
111−
112−parseDiff :: StateT ([String], Options) (MaybeT IO) ()
113−parseDiff = do
114− x <- shift
115− case x of
116− Just str -> setDiff str
117− Nothing -> do
118− liftIO $ putStrLn "please provide a diff type"
119− mzero
120−
121−parseCutOff :: StateT ([String], Options) (MaybeT IO) ()
122−parseCutOff = do
123− x <- shift
124− case x of
125− Just str -> setCutOff str
126− Nothing -> do
127− liftIO $ putStrLn "please provide a cutoff percent"
128− mzero
129−
130−-- totally imperative style option parsing
131−parseOptions :: IO (Maybe Options)
132−parseOptions = do
133− args <- getArgs
134− runMaybeT $ flip evalStateT (args, defaultOptions) $ do
135− parseLoop
136− fmap snd get
137−
138− where
139−
140− parseOpt opt =
141− case opt of
142− "--graphs" -> setGenGraphs True
143− "--sort-by-name" -> setSortByName True
144− "--use-gauge" -> setUseGauge True
145− "--benchmark" -> parseBench
146− "--fields" -> parseFields
147− "--diff-style" -> parseDiff
148− "--diff-cutoff-percent" -> parseCutOff
149− str -> do
150− liftIO $ putStrLn $ "Unrecognized option " <> str
151− mzero
152−
153− parseLoop = do
154− next <- shift
155− case next of
156− Just opt -> parseOpt opt >> parseLoop
157− Nothing -> return ()
158−
159−ignoringErr :: IO () -> IO ()
160−ignoringErr a = catch a (\(ErrorCall err :: ErrorCall) ->
161− putStrLn $ "Failed with error:\n" <> err <> "\nSkipping.")
162−
163−------------------------------------------------------------------------------
164−-- Generic
165−------------------------------------------------------------------------------
166−
167−makeGraphs :: String -> Config -> String -> IO ()
168−makeGraphs name cfg@Config{..} inputFile =
169− ignoringErr $ graph inputFile name cfg
170−
171−------------------------------------------------------------------------------
172−-- Arrays
173−------------------------------------------------------------------------------
174−
175−showComparisons :: Options -> Config -> FilePath -> FilePath -> IO ()
176−showComparisons Options{..} cfg inp out =
177− let cfg1 = cfg { classifyBenchmark = classifyComparison }
178− in if genGraphs
179− then ignoringErr $ graph inp "comparison"
180− cfg1 { outputDir = Just out
181− , presentation = Groups Absolute
182− }
183− else ignoringErr $ report inp Nothing cfg1
184−
185− where
186−
187− separator = if useGauge then '/' else '.'
188− dropComponent sep = dropWhile (== sep) . dropWhile (/= sep)
189−
190− -- In case of tasty-bench the names could be like
191− -- All.Data.Array.Prim.Pinned/o-1-space.generation.show
192− -- All.Data.Array.Foreign/o-1-space.generation.show
193− classifyComparison b =
194− let b1 =
195− if useGauge
196− then b
197− else dropComponent separator b --- drop "All." at the beginning
198− in Just
199− ( takeWhile (/= '/') b1
200− , dropComponent '/' b1 -- for tasty-bench drop up to "/"
201− )
202−
203−------------------------------------------------------------------------------
204−-- text reports
205−------------------------------------------------------------------------------
206−
207−selectBench
208− :: Options
209− -> (SortColumn -> Maybe GroupStyle -> Either String [(String, Double)])
210− -> [String]
211−selectBench Options{..} f =
212− reverse
213− $ fmap fst
214− $ filter (\(_,y) -> filterPred y)
215− $ either
216− (const $ either error sortFunc $ f (ColumnIndex 0) (Just PercentDiff))
217− sortFunc
218− $ f (ColumnIndex 1) (Just PercentDiff)
219−
220− where
221−
222− sortFunc = if sortByName then sortOn fst else sortOn snd
223−
224− cutOffMultiples = 1 + cutOffPercent / 100
225−
226− filterPred x =
227− case benchType of
228− Just (Compare _) ->
229− x <= negate cutOffPercent || x >= cutOffPercent
230− _ -> True
231−
232−benchShow ::
233− Options
234− -> Config
235− -> (Config -> String -> IO ())
236− -> String
237− -> FilePath
238− -> IO ()
239−benchShow Options{..} cfg func inp out =
240− if genGraphs
241− then func cfg {outputDir = Just out} inp
242− else ignoringErr $ report inp Nothing cfg
243−
244−main :: IO ()
245−main = do
246− res <- parseOptions
247− case res of
248− Nothing -> do
249− putStrLn "cannot parse options"
250− return ()
251− Just opts@Options{fields = fs, benchType = btype} ->
252− let cfg = defaultConfig
253− { presentation = Groups (diffStyle opts)
254− , selectBenchmarks = selectBench opts
255− , selectFields = filter
256− ( flip elem (fmap (fmap toLower) fs)
257− . fmap toLower
258− )
259− }
260− in case btype of
261− Just (Compare str) ->
262− showComparisons opts cfg
263− { title = Just str }
264− ("charts/" ++ str ++ "/results.csv")
265− ("charts/" ++ str)
266− Just (Standard str) ->
267− benchShow opts cfg
268− { title = Just str }
269− (makeGraphs str)
270− ("charts/" ++ str ++ "/results.csv")
271− ("charts/" ++ str)
272− Nothing ->
273− error "Please specify a benchmark using --benchmark."
benchmark/bench-report/bench-report.cabaldeleted−23
@@ -1,23 +0,0 @@
1−cabal-version: 2.2
2−name: bench-report
3−version: 0.0.0
4−synopsis: Benchmark report generation
5−description: Benchmark reporting application is not included in the overall
6− cabal project so that the dependencies of both can remain independent.
7− Benchmark reporting has a lot of dependencies that usually lag behind
8− when new GHC releases arrive.
9−
10−-------------------------------------------------------------------------------
11−-- benchmark comparison and presentation
12−-------------------------------------------------------------------------------
13−
14−executable bench-report
15− default-language: Haskell2010
16− ghc-options: -Wall
17− hs-source-dirs: .
18− main-is: BenchReport.hs
19− buildable: True
20− build-Depends:
21− base >= 4.9 && < 5
22− , bench-show >= 0.3 && < 0.4
23− , transformers >= 0.4 && < 0.6
benchmark/bench-report/bin/bench-runner.shdeleted−667
@@ -1,667 +0,0 @@
1−#!/usr/bin/env bash
2−
3−# Note that this script is used in the "streamly" package as well as
4−# in "streaming-benchmarks" package. Any changes to the script should be
5−# generic enough so that it works in both the cases.
6−
7−#------------------------------------------------------------------------------
8−
9−set -o pipefail
10−
11−SCRIPT_DIR=$(cd `dirname $0`; pwd)
12−
13−RUNNING_BENCHMARKS=y
14−source $SCRIPT_DIR/build-lib.sh
15−
16−print_help () {
17− echo "Usage: $0 "
18− echo " [--benchmarks <"bench1 bench2 ..." | help>]"
19− echo " [--prefix <benchmark name prefix to match>"
20− echo " [--fields <"field1 field2 ..." | help>]"
21− echo " [--sort-by-name]"
22− echo " [--compare]"
23− echo " [--diff-style <absolute|percent|multiples>]"
24− echo " [--cutoff-percent <percent-value>]"
25− echo " [--graphs]"
26− echo " [--no-measure]"
27− echo " [--append]"
28− echo " [--long]"
29− echo " [--slow]"
30− echo " [--quick]"
31− echo " [--raw]"
32− echo " [--dev-build]"
33− echo " [--use-nix]"
34− echo " [--with-compiler <compiler exe name>]"
35− echo " [--cabal-build-options <options>]"
36− echo " [--rtsopts <opts>]"
37− echo " [--commit-compare] [--base <commit>] [--candidate <commit>]"
38− #echo " -- <gauge options or benchmarks>"
39− echo
40− echo "--benchmarks: benchmarks to run, use 'help' for list of benchmarks"
41− echo "--compare: compare the specified benchmarks with each other"
42− echo "--fields: measurement fields to report, use 'help' for a list"
43− echo "--graphs: Generate graphical reports"
44− echo "--no-measure: Don't run benchmarks, run reports from previous results"
45− echo "--append: Don't overwrite previous results, append for comparison"
46− echo "--long: Use much longer stream size for infinite stream benchmarks"
47− echo "--slow: Slightly more accurate results at the expense of speed"
48− echo "--quick: Faster results, useful for longer benchmarks"
49− echo "--raw: Run the benchmarks but don't report them. This is useful when"
50− echo " you only want to work with the csv files generated."
51− echo "--cabal-build-options: Pass any cabal build options to be used for build"
52− echo " e.g. --cabal-build-options \"--flag dev\""
53− echo
54− echo "When specific space complexity group is chosen then (and only then) "
55− echo "RTS memory restrictions are used accordingly. For example, "
56− echo "bench.sh --benchmarks Data.Parser -- Data.Parser/o-1-space "
57− echo "restricts Heap/Stack space for O(1) characterstics"
58− echo
59− echo "When using --commit-compare, by default comparative chart of HEAD^ vs HEAD"
60− echo "commit is generated, in the 'charts' directory."
61− echo "Use --base and --candidate to select the commits to compare."
62− echo
63− #echo "Any arguments after a '--' are passed directly to gauge"
64− exit
65−}
66−
67−#-----------------------------------------------------------------------------
68−# Reporting utility functions
69−#-----------------------------------------------------------------------------
70−
71−list_comparisons () {
72− echo "Comparison groups:"
73− for i in $COMPARISONS
74− do
75− echo -n "$i ["
76− eval "echo -n \$$i"
77− echo "]"
78− done
79− echo
80−}
81−
82−build_report_prog() {
83− local prog_path=$BENCH_REPORT_DIR/bin/bench-report
84−
85− hash -r
86− if test ! -x "$prog_path" -a "$BUILD_ONCE" = "0"
87− then
88− echo "Building bench-report executables"
89− BUILD_ONCE=1
90− pushd $BENCH_REPORT_DIR
91− local cmd
92− cmd="$CABAL_EXECUTABLE install --installdir bin bench-report"
93− if test "$USE_NIX" -eq 0
94− then
95− $cmd || die "bench-report build failed"
96− else
97− nix-shell --run "$cmd" || die "bench-report build failed"
98− fi
99− popd
100− elif test ! -x "$prog_path"
101− then
102− return 1
103− fi
104− return 0
105−}
106−
107−build_report_progs() {
108− if test "$RAW" = "0"
109− then
110− build_report_prog || exit 1
111− local prog
112− prog=$BENCH_REPORT_DIR/bin/bench-report
113− test -x $prog || die "Cannot find bench-report executable"
114− echo "Using bench-report executable [$prog]"
115− fi
116−}
117−
118−# We run the benchmarks in isolation in a separate process so that different
119−# benchmarks do not interfere with other. To enable that we need to pass the
120−# benchmark exe path to gauge as an argument. Unfortunately it cannot find its
121−# own path currently.
122−
123−# The path is dependent on the architecture and cabal version.
124−
125−bench_output_file() {
126− local bench_name=$1
127− echo "charts/$bench_name/results.csv"
128−}
129−
130−#------------------------------------------------------------------------------
131−# Speed options
132−#------------------------------------------------------------------------------
133−
134−# tasty-bench does not like an option set twice
135−set_super_quick_mode () {
136− echo -n super_quick
137−}
138−
139−# For certain long benchmarks if the user has not requested super quick
140−# mode we anyway use a slightly quicker mode.
141−use_quicker_mode () {
142− if test "$QUICK_MODE" -eq 0
143− then
144− echo quicker
145− fi
146−}
147−
148−#------------------------------------------------------------------------------
149−# Determine options from benchmark name
150−#------------------------------------------------------------------------------
151−
152−# Global environment passed:
153−# BENCH_EXEC_PATH: the benchmark executable
154−# RTS_OPTIONS: additional RTS options
155−# QUICK_MODE: whether we are in quick mode
156−# USE_GAUGE: whether to use gauge or tasty-bench
157−# LONG: whether to use a large stream size
158−
159−# $1: bench name
160−bench_exec_one() {
161− local BENCH_NAME_ORIG
162− BENCH_NAME_ORIG="$1"
163− shift
164−
165− local SUPER_QUICK_OPTIONS
166− local QUICKER_OPTIONS
167− if test "$USE_GAUGE" -eq 0
168− then
169− SUPER_QUICK_OPTIONS="--stdev 1000000"
170− QUICKER_OPTIONS="--stdev 100"
171− else
172− # Do not keep time limit as 0 otherwise GC stats may remain 0 in some cases.
173− SUPER_QUICK_OPTIONS="--quick --min-duration 0 --time-limit 0.01 --include-first-iter"
174− QUICKER_OPTIONS="--min-samples 3 --time-limit 1"
175− fi
176−
177− local BENCH_NAME0
178− local BENCH_NAME1
179− local BENCH_NAME2
180− local BENCH_NAME
181− # XXX this is a hack to make the "/" separated names used in the functions
182− # determining options based on benchmark name. For tasty-bench the benchmark
183− # names are separated by "." instead of "/" and are prefixed by "All".
184− #
185− # For example, All.Prelude.Serial/x.y.z => Prelude.Serial/x/y/z
186− if test "$USE_GAUGE" -eq 0
187− then
188− # Remove the prefix "All."
189− BENCH_NAME0=$(echo $BENCH_NAME_ORIG | sed -e s/^All\.//)
190−
191− # Module names could contain dots e.g. "Prelude.Serial". So we insert
192− # an explicit "/" to separate the module name part and the rest of
193− # the benchmark name. For example, Prelude.Serial/elimination.drain
194− BENCH_NAME1=$(echo $BENCH_NAME0 | cut -f1 -d '/')
195−
196− if test "$BENCH_NAME1" = "$BENCH_NAME0"
197− then
198− # There is no "/" separator
199− BENCH_NAME1=$(echo $BENCH_NAME0 | sed -e 's/\./\//g')
200− BENCH_NAME2=""
201− else
202− BENCH_NAME2=/$(echo $BENCH_NAME0 | cut -f2- -d '/' | sed -e 's/\./\//g')
203− fi
204− BENCH_NAME="${BENCH_NAME1}${BENCH_NAME2}"
205− else
206− BENCH_NAME=$BENCH_NAME_ORIG
207− fi
208−
209− local RTS_OPTIONS1
210− RTS_OPTIONS1="\
211−+RTS -T \
212−$(bench_rts_options $(basename $BENCH_EXEC_PATH) $BENCH_NAME) \
213−$RTS_OPTIONS \
214−-RTS"
215−
216− local QUICK_MODE_TYPE
217− QUICK_MODE_TYPE="\
218− $(if test "$QUICK_MODE" -ne 0; then set_super_quick_mode; fi) \
219− $(bench_speed_options $(basename $BENCH_EXEC_PATH) $BENCH_NAME)"
220−
221− local QUICK_BENCH_OPTIONS
222− for i in $QUICK_MODE_TYPE
223− do
224− case "$i" in
225− super_quick) QUICK_BENCH_OPTIONS="$SUPER_QUICK_OPTIONS"; break ;;
226− quicker) QUICK_BENCH_OPTIONS="$QUICKER_OPTIONS"; break ;;
227− esac
228− done
229−
230− local STREAM_SIZE
231− local STREAM_LEN
232− local STREAM_SIZE_OPT
233− if test "$LONG" -ne 0
234− then
235− STREAM_SIZE=10000000
236− STREAM_LEN=$(env LC_ALL=en_US.UTF-8 printf "--stream-size %'.f\n" $STREAM_SIZE)
237− STREAM_SIZE_OPT="--stream-size $STREAM_SIZE"
238− fi
239−
240− echo "$BENCH_NAME_ORIG: \
241− $RTS_OPTIONS1 \
242− $STREAM_LEN \
243− $QUICK_BENCH_OPTIONS" \
244− "$@"
245−
246− #------------------------------------------------------------------------------
247− # Run benchmark with options and collect results
248− #------------------------------------------------------------------------------
249−
250− local output_file
251− output_file=$(bench_output_file $(basename $BENCH_EXEC_PATH))
252− mkdir -p `dirname $output_file`
253− rm -f ${output_file}.tmp
254−
255− local BENCH_NAME_ESC
256− if test $USE_GAUGE -eq 0
257− then
258− # Escape "\" and double quotes in benchmark names
259− BENCH_NAME_ESC=$(echo "$BENCH_NAME_ORIG" | sed -e 's/\\/\\\\/g' | sed -e 's/"/\\"/g')
260− $BENCH_EXEC_PATH \
261− -j 1 \
262− $RTS_OPTIONS1 \
263− $STREAM_SIZE_OPT \
264− $QUICK_BENCH_OPTIONS \
265− "$@" \
266− --csv=${output_file}.tmp \
267− -p '$0 == "'"$BENCH_NAME_ESC"'"' || die "Benchmark execution failed."
268−
269− # Convert cpuTime field from picoseconds to seconds
270− awk --version 2>&1 | grep -q "GNU Awk" \
271− || die "Need GNU awk. [$(which awk)] is not GNU awk."
272− tail -n +2 ${output_file}.tmp | \
273− awk 'BEGIN {FPAT = "([^,]+)|(\"[^\"]+\")";OFS=","} {$2=$2/1000000000000;print}' \
274− >> $output_file
275− else
276− $BENCH_EXEC_PATH \
277− $RTS_OPTIONS1 \
278− $STREAM_SIZE_OPT \
279− $QUICK_BENCH_OPTIONS \
280− "$@" \
281− --csvraw=${output_file}.tmp \
282− -m exact "$BENCH_NAME" || die "Benchmark execution failed."
283− tail -n +2 ${output_file}.tmp \
284− >> $output_file
285− fi
286−}
287−
288−invoke_gauge () {
289− local target_prog="$1"
290− local target_name="$2"
291− local output_file="$3"
292−
293− local MATCH=""
294− if test "$LONG" -ne 0
295− then
296− MATCH="$target_name/o-1-space"
297− else
298− MATCH="$BENCH_PREFIX"
299− fi
300− echo "name,iters,time,cycles,cpuTime,utime,stime,maxrss,minflt,majflt,nvcsw,nivcsw,allocated,numGcs,bytesCopied,mutatorWallSeconds,mutatorCpuSeconds,gcWallSeconds,gcCpuSeconds" >> $output_file
301− # keep only benchmark names with shortest prefix e.g. "a/b/c" and "a/b", we
302− # should only keep "a/b" otherwise benchmarks will run multiple times. why?
303− $target_prog -l \
304− | grep "^$MATCH" \
305− | while read -r name; \
306− do bench_exec_one "$name" "${GAUGE_ARGS[@]}" || exit 1; done \
307− || die "Benchmark execution failed."
308−}
309−
310−invoke_tasty_bench () {
311− local target_prog="$1"
312− local target_name="$2"
313− local output_file="$3"
314−
315− local MATCH=""
316− if test "$LONG" -ne 0
317− then
318− MATCH="-p /$target_name\/o-1-space/"
319− else
320− if test -n "$BENCH_PREFIX"
321− then
322− # escape "/"
323− local escaped_name=$(echo "$BENCH_PREFIX" | sed -e 's/\//\\\//g')
324− MATCH="-p /$escaped_name/"
325− fi
326− fi
327− echo "Name,cpuTime,2*Stdev (ps),Allocated,bytesCopied" >> $output_file
328− $target_prog -l $MATCH \
329− | grep "^All" \
330− | while read -r name; \
331− do bench_exec_one "$name" "${GAUGE_ARGS[@]}" || exit 1; done \
332− || die "Benchmark execution failed."
333−}
334−
335−run_bench_target () {
336− local package_name=$1
337− local component=$2
338− local target_name=$3
339−
340− local target_prog
341− if test -z "$BENCHMARK_PACKAGE_VERSION"
342− then
343− echo "Please set BENCHMARK_PACKAGE_VERSION in bench_config"
344− exit 1
345− fi
346− target_prog=$(cabal_target_prog $package_name-$BENCHMARK_PACKAGE_VERSION $component $target_name) || \
347− die "Cannot find executable for target $target_name"
348−
349− echo "Running executable $target_name ..."
350−
351− # Needed by bench_exec_one
352− BENCH_EXEC_PATH=$target_prog
353−
354− local output_file=$(bench_output_file $target_name)
355− mkdir -p `dirname $output_file`
356− if test "$USE_GAUGE" -eq 0
357− then invoke_tasty_bench "$target_prog" "$target_name" "$output_file"
358− else invoke_gauge "$target_prog" "$target_name" "$output_file"
359− fi
360−}
361−
362−# $1: package name
363−# $2: component
364−# $3: targets
365−run_bench_targets() {
366− for i in $3
367− do
368− run_bench_target $1 $2 $i
369− done
370−}
371−
372−run_benches_comparing() {
373− local bench_list=$1
374−
375− if test -z "$CANDIDATE"
376− then
377− CANDIDATE=$(git rev-parse HEAD)
378− fi
379− if test -z "$BASE"
380− then
381− # XXX Should be where the current branch is forked from master
382− BASE="$CANDIDATE^"
383− fi
384− echo "Comparing baseline commit [$BASE] with candidate [$CANDIDATE]"
385− echo "Checking out base commit [$BASE] for benchmarking"
386− git checkout "$BASE" || die "Checkout of base commit [$BASE] failed"
387−
388− $BUILD_BENCH || die "build failed"
389− run_bench_targets $BENCHMARK_PACKAGE_NAME b "$bench_list" target_exe_extra_args
390−
391− echo "Checking out candidate commit [$CANDIDATE] for benchmarking"
392− git checkout "$CANDIDATE" || \
393− die "Checkout of candidate [$CANDIDATE] commit failed"
394−
395− $BUILD_BENCH || die "build failed"
396− run_bench_targets $BENCHMARK_PACKAGE_NAME b "$bench_list" target_exe_extra_args
397− # XXX reset back to the original commit
398−}
399−
400−backup_output_file() {
401− local bench_name=$1
402− local output_file=$(bench_output_file $bench_name)
403−
404− if test -e $output_file -a "$APPEND" != 1
405− then
406− mv -f -v $output_file ${output_file}.prev
407− fi
408−}
409−
410−run_measurements() {
411− local bench_list=$1
412−
413− for i in $bench_list
414− do
415− backup_output_file $i
416− done
417−
418− if test "$COMMIT_COMPARE" = "0"
419− then
420− run_bench_targets $BENCHMARK_PACKAGE_NAME b "$bench_list" target_exe_extra_args
421− else
422− run_benches_comparing "$bench_list"
423− fi
424−}
425−
426−run_reports() {
427− local prog
428− prog=$BENCH_REPORT_DIR/bin/bench-report
429− test -x $prog || die "Cannot find bench-report executable"
430− echo
431−
432− for i in $1
433− do
434− echo "Generating reports for ${i}..."
435− $prog \
436− --benchmark $i \
437− $(test "$USE_GAUGE" = 1 && echo "--use-gauge") \
438− $(test "$GRAPH" = 1 && echo "--graphs") \
439− $(test "$SORT_BY_NAME" = 1 && echo "--sort-by-name") \
440− $(test -n "$BENCH_DIFF_STYLE" && echo "--diff-style $BENCH_DIFF_STYLE") \
441− $(test -n "$BENCH_CUTOFF_PERCENT" && echo "--diff-cutoff-percent $BENCH_CUTOFF_PERCENT") \
442− --fields "$FIELDS"
443− done
444−}
445−
446−#-----------------------------------------------------------------------------
447−# Execution starts here
448−#-----------------------------------------------------------------------------
449−
450−USE_GIT_CABAL=1 # This is used by set_common_vars
451−set_common_vars
452−
453−USE_NIX=0
454−COMPARE=0
455−COMMIT_COMPARE=0
456−BASE=
457−CANDIDATE=
458−
459−APPEND=0
460−LONG=0
461−RAW=0
462−SORT_BY_NAME=0
463−GRAPH=0
464−MEASURE=1
465−
466−GAUGE_ARGS=
467−BUILD_ONCE=0
468−
469−CABAL_BUILD_OPTIONS="--flag fusion-plugin --flag limit-build-mem"
470−
471−#-----------------------------------------------------------------------------
472−# Read command line
473−#-----------------------------------------------------------------------------
474−
475−while test -n "$1"
476−do
477− case $1 in
478− -h|--help|help) print_help ;;
479− # options with arguments
480− --benchmarks) shift; TARGETS=$1; shift ;;
481− --targets) shift; TARGETS=$1; shift ;;
482− --prefix) shift; BENCH_PREFIX="$1"; shift ;;
483− --fields) shift; FIELDS=$1; shift ;;
484− --base) shift; BASE=$1; shift ;;
485− --candidate) shift; CANDIDATE=$1; shift ;;
486− --with-compiler) shift; CABAL_WITH_COMPILER=$1; shift ;;
487− --cabal-build-flags) shift; CABAL_BUILD_OPTIONS+=$1; shift ;;
488− --cabal-build-options) shift; CABAL_BUILD_OPTIONS+=$1; shift ;;
489− --rtsopts) shift; RTS_OPTIONS=$1; shift ;;
490− --config) shift; BENCH_CONFIG_FILE=$1; shift ;;
491− --diff-style) shift; BENCH_DIFF_STYLE=$1; shift ;;
492− --diff-cutoff-percent) shift; BENCH_CUTOFF_PERCENT=$1; shift ;;
493− # flags
494− --slow) SLOW=1; shift ;;
495− --quick) QUICK_MODE=1; shift ;;
496− --compare) COMPARE=1; shift ;;
497− --commit-compare) COMMIT_COMPARE=1; shift ;;
498− --raw) RAW=1; shift ;;
499− --append) APPEND=1; shift ;;
500− --long) LONG=1; shift ;;
501− --sort-by-name) SORT_BY_NAME=1; shift ;;
502− --graphs) GRAPH=1; shift ;;
503− --no-measure) MEASURE=0; shift ;;
504− --dev-build) RUNNING_DEVBUILD=1; shift ;;
505− --use-nix) USE_NIX=1; shift ;;
506− --use-gauge) USE_GAUGE=1; shift ;;
507− --) shift; break ;;
508− *) echo "Unknown flags: $*"; echo; print_help ;;
509− esac
510−done
511−GAUGE_ARGS=("$@")
512−
513−if test -z "$BENCH_CONFIG_FILE"
514−then
515− die "Please use --config to specify config file"
516−fi
517−
518−source "$BENCH_CONFIG_FILE" || \
519− die "Failed to source config file $BENCH_CONFIG_FILE"
520−
521−# Defined in $BENCH_CONFIG_FILE
522−bench_config
523−
524−if test -z "$FIELDS"
525−then
526− FIELDS=$DEFAULT_FIELDS
527−fi
528−
529−set_derived_vars
530−
531−#-----------------------------------------------------------------------------
532−# Determine targets
533−#-----------------------------------------------------------------------------
534−
535−only_real_benchmarks () {
536− for i in $TARGETS
537− do
538− local SKIP=0
539− for j in $COMPARISONS
540− do
541− if test $i == $j
542− then
543− SKIP=1
544− fi
545− done
546− if test "$SKIP" -eq 0
547− then
548− echo -n "$i "
549− fi
550− done
551−}
552−
553−# defined in $BENCH_CONFIG_FILE
554−bench_targets
555−
556−if test "$(has_item "$TARGETS" help)" = "help"
557−then
558− list_target_groups
559− list_comparisons
560− list_targets
561− exit
562−fi
563−
564−COMMON_FIELDS="allocated bytescopied cputime maxrss"
565−if test "$USE_GAUGE" -eq 1
566−then
567− ALL_FIELDS="$COMMON_FIELDS time cycles utime stime minflt majflt nvcsw nivcsw"
568−else
569− ALL_FIELDS="$COMMON_FIELDS"
570−fi
571−if test "$(has_item "$FIELDS" help)" = "help"
572−then
573− echo "Supported fields: $ALL_FIELDS"
574− echo "Default fields: $DEFAULT_FIELDS"
575− exit
576−fi
577−
578−if test "$LONG" -ne 0
579−then
580− if test -n "$TARGETS"
581− then
582− echo "Cannot specify benchmarks [$TARGETS] with --long"
583− exit
584− fi
585− TARGETS=$infinite_grp
586−fi
587−
588−DEFAULT_TARGETS="$(all_grp)"
589−TARGETS=$(set_targets)
590−
591−TARGETS_ORIG=$TARGETS
592−TARGETS=$(only_real_benchmarks)
593−
594−echo "Using benchmark suites [$TARGETS]"
595−
596−#-----------------------------------------------------------------------------
597−# Build reporting utility
598−#-----------------------------------------------------------------------------
599−
600−# We need to build the report progs first at the current (latest) commit before
601−# checking out any other commit for benchmarking.
602−build_report_progs
603−
604−#-----------------------------------------------------------------------------
605−# Build and run targets
606−#-----------------------------------------------------------------------------
607−
608−if test "$USE_GAUGE" -eq 1
609−then
610− BUILD_FLAGS="--flag use-gauge"
611−fi
612−
613−BUILD_BENCH="$CABAL_EXECUTABLE v2-build $BUILD_FLAGS $CABAL_BUILD_OPTIONS --enable-benchmarks"
614−if test "$MEASURE" = "1"
615−then
616− run_build "$BUILD_BENCH" $BENCHMARK_PACKAGE_NAME bench "$TARGETS"
617− run_measurements "$TARGETS"
618−fi
619−
620−#-----------------------------------------------------------------------------
621−# Run reports
622−#-----------------------------------------------------------------------------
623−
624−# $1: var name
625−build_comparison_results () {
626− local name
627− local constituents
628−
629− name=$1
630− constituents=$(eval "echo -n \$${name}")
631− mkdir -p "charts/$name"
632− dest_file="charts/$name/results.csv"
633− : > $dest_file
634− for j in $constituents
635− do
636− cat "charts/$j/results.csv" >> $dest_file
637− done
638−}
639−
640−if test "$COMPARE" -eq 1
641−then
642− DYN_CMP_GRP="$(echo "$TARGETS" | sed -e 's/ /_/g')_cmp"
643− eval "$DYN_CMP_GRP=\"$TARGETS\""
644− COMPARISON_REPORTS=$DYN_CMP_GRP
645− build_comparison_results $DYN_CMP_GRP
646−else
647− COMPARISON_REPORTS=""
648−fi
649−
650−for i in $COMPARISONS
651−do
652− if test "$(has_item "$TARGETS_ORIG" $i)" = $i
653− then
654− COMPARISON_REPORTS="$COMPARISON_REPORTS $i"
655− build_comparison_results $i
656− fi
657−done
658−
659−if test "$RAW" = "0"
660−then
661− run_reports "$TARGETS"
662− run_reports "$COMPARISON_REPORTS"
663− if test -n "$DYN_CMP_GRP"
664− then
665− rm -rf "charts/$DYN_CMP_GRP"
666− fi
667−fi
benchmark/bench-report/bin/build-lib.shdeleted−213
@@ -1,213 +0,0 @@
1−# $1: message
2−die () {
3− >&2 echo -e "Error: $1"
4− exit 1
5−}
6−
7−warn () {
8− >&2 echo -e "Warning: $1"
9−}
10−
11−# $1: command
12−function run_verbose() {
13− echo "$*"
14− bash -c "$*"
15−}
16−
17−has_item () {
18− for i in $1
19− do
20− if test "$i" = "$2"
21− then
22− echo "$i"
23− break
24− fi
25− done
26−}
27−
28−#------------------------------------------------------------------------------
29−# target groups
30−#------------------------------------------------------------------------------
31−
32−test_only () {
33− if test -n "$RUNNING_TESTS"
34− then
35− echo $1
36− fi
37−}
38−
39−bench_only () {
40− if test -n "$RUNNING_BENCHMARKS"
41− then
42− echo $1
43− fi
44−}
45−
46−dev_build () {
47− if test -n "$RUNNING_DEVBUILD"
48− then
49− echo $1
50− fi
51−}
52−
53−# A group consisting of all known individual targets
54−all_grp () {
55− { for i in $GROUP_TARGETS
56− do
57− for j in $(eval "echo \$$i")
58− do
59− echo $j
60− done
61− done
62− for i in $INDIVIDUAL_TARGETS
63− do
64− echo $i
65− done
66− } | sort | uniq
67−}
68−
69−# All groups
70−all_target_groups () {
71− echo $GROUP_TARGETS
72−}
73−
74−# XXX pass as arg
75−list_targets () {
76− echo "Individual targets:"
77− for i in $(all_grp)
78− do
79− echo "$i"
80− done
81− echo
82−}
83−
84−# XXX pass as arg
85−list_target_groups () {
86− echo "All Targets: all_grp"
87− echo "Target groups:"
88− for i in $(all_target_groups)
89− do
90− echo -n "$i ["
91− eval "echo -n \$$i"
92− echo "]"
93− done
94− echo
95−}
96−
97−# XXX pass as arg
98−set_targets() {
99− if test -z "$TARGETS"
100− then
101− echo $DEFAULT_TARGETS
102− else
103− for i in $(echo $TARGETS)
104− do
105− case $i in
106− *_grp) eval "echo -n \$${i}" ;;
107− *_cmp) eval "echo -n \$${i} $i" ;;
108− *) echo -n $i ;;
109− esac
110− echo -n " "
111− done
112− fi
113−}
114−
115−# XXX cabal issue "cabal v2-exec which" cannot find benchmark/test executables
116−
117−# $1: builddir
118−# $2: package name with version
119−# $3: component ("" (lib), t (test), b (benchmark), x (executable))
120−# $4: command to find
121−cabal_which_builddir() {
122− local noopt=""
123− if test "$TEST_QUICK_MODE" -eq 1
124− then
125− noopt="/noopt"
126− fi
127−
128− local path=$(echo $1/build/*/ghc-${GHC_VERSION}/${2}/$3/$4$noopt/build/$4/$4)
129− echo "[cabal_which $path]" 1>&2
130− test -f "$path" && echo $path
131−}
132−
133−# $1: package name with version
134−# $2: component
135−# $3: command to find
136−cabal_which() {
137− cabal_which_builddir $BUILD_DIR $1 $2 $3
138−}
139−
140−# We run the benchmarks in isolation in a separate process so that different
141−# benchmarks do not interfere with other. To enable that we need to pass the
142−# benchmark exe path to gauge as an argument. Unfortunately it cannot find its
143−# own path currently.
144−
145−# The path is dependent on the architecture and cabal version.
146−
147−# $1: package name with version
148−# $2: component
149−# $3: target
150−cabal_target_prog () {
151− local target_prog=`cabal_which $1 $2 $3`
152− if test -x "$target_prog"
153− then
154− echo $target_prog
155− else
156− return 1
157− fi
158−}
159−
160−set_common_vars () {
161− SLOW=0
162− QUICK_MODE=0
163−
164− RUNNING_DEVBUILD=
165−
166− TARGET_EXE_ARGS=
167− RTS_OPTIONS=
168−
169− CABAL_BUILD_OPTIONS=""
170− CABAL_EXECUTABLE=cabal
171−
172− # Use branch specific builds if git-cabal is present in PATH
173− BUILD_DIR=dist-newstyle
174− if test "$USE_GIT_CABAL" -eq 1
175− then
176− if which git-cabal 2>/dev/null
177− then
178− echo "Using git-cabal for branch specific builds"
179− CABAL_EXECUTABLE=git-cabal
180− BUILD_DIR=$(git-cabal show-builddir)
181− fi
182− fi
183−}
184−
185−# To be called after parsing CLI arguments
186−set_derived_vars () {
187− if test -n "$CABAL_WITH_COMPILER"
188− then
189− CABAL_BUILD_OPTIONS+=" --with-compiler $CABAL_WITH_COMPILER"
190− else
191− CABAL_WITH_COMPILER=ghc
192− fi
193−
194− GHC_VERSION=$($CABAL_WITH_COMPILER --numeric-version)
195−}
196−
197−# $1: build program
198−# $2: package name
199−# $3: component prefix
200−# $4: targets
201−run_build () {
202− local build_prog=$1
203− local package=$2
204− local component_prefix=$3
205− local COMPONENTS
206− local c
207−
208− for c in $4
209− do
210− COMPONENTS+="$package:$component_prefix:$c "
211− done
212− run_verbose $build_prog $COMPONENTS || die "build failed"
213−}
benchmark/bench-report/default.nixdeleted−50
@@ -1,50 +0,0 @@
1−{
2− nixpkgs ?
3− # nixpkgs 21.05 needs a revised version of bench-show and we do not
4− # know how to use a revised version in nix.
5− #import (builtins.fetchTarball https://github.com/NixOS/nixpkgs/archive/refs/tags/21.05.tar.gz)
6− import (builtins.fetchTarball https://github.com/composewell/nixpkgs/archive/01dd2b4e738.tar.gz)
7− {}
8−#, compiler ? "ghc884" # For nix 21.05
9−, compiler ? "default"
10−}:
11−let haskellPackages =
12− if compiler == "default"
13− then nixpkgs.haskellPackages
14− else nixpkgs.haskell.packages.${compiler};
15−
16− mkPackage = super: pkg: path: opts: inShell:
17− let orig = super.callCabal2nixWithOptions pkg path opts {};
18− in if inShell
19− # Avoid copying the source directory to nix store by using
20− # src = null.
21− then orig.overrideAttrs (oldAttrs: { src = null; })
22− else orig;
23−
24− mkHaskellPackages = inShell:
25− haskellPackages.override {
26− overrides = self: super:
27− with nixpkgs.haskell.lib;
28− {
29− bench-report = mkPackage super "bench-report" ./. "" inShell;
30− };
31− };
32−
33− drv = mkHaskellPackages true;
34−
35− shell = drv.shellFor {
36− packages = p:
37− [ p.bench-report
38− ];
39− # Use a better prompt
40− shellHook = ''
41− export CABAL_DIR="$(pwd)/.cabal.nix"
42− if test -n "$PS_SHELL"
43− then
44− export PS1="$PS_SHELL\[$bldred\](nix)\[$txtrst\] "
45− fi
46− '';
47− };
48−in if nixpkgs.lib.inNixShell
49− then shell
50− else (mkHaskellPackages false).bench-report
benchmark/bench-runner/Main.hsnew file+183
@@ -0,0 +1,183 @@
1+module Main (main) where
2+
3+import BenchRunner (mainWith)
4+import BuildLib (Quickness(..))
5+import Control.Applicative ((<|>))
6+import Data.List (isInfixOf, isPrefixOf, isSuffixOf)
7+
8+import Targets (targets)
9+
10+rtsOpts :: String -> String -> String
11+rtsOpts exeName benchName0 = unwords [general, exeSpecific, benchSpecific]
12+
13+ where
14+
15+ -- Drop All.
16+ benchName = drop 4 benchName0
17+
18+ general
19+ -- GHC-9.6 requires 32M heap vs 16M for GHC-9.4
20+ | "o-1-sp" `isInfixOf` benchName = "-K36K -M32M"
21+ | "o-n-h" `isInfixOf` benchName = "-K36K -M32M"
22+ -- GHC-9.6 requires 32M heap vs 16M for GHC-9.4
23+ | "o-n-st" `isInfixOf` benchName = "-K1M -M32M"
24+ | "o-n-sp" `isInfixOf` benchName = "-K1M -M32M"
25+ | otherwise = ""
26+
27+ exeSpecific
28+ | "Prelude.Concurrent" `isSuffixOf` exeName = "-K512K -M384M"
29+ | otherwise = ""
30+
31+ benchSpecific
32+ -- GHC-9.6 requires 64M, earlier it was 16M
33+ | "Data.Fold/o-n-heap.key-value.toHashMapIO (max buckets) sum" == benchName =
34+ "-M64M"
35+
36+ -- This is required only for the --long case because we allocate all
37+ -- the arrays upfront. depends on the size of the stream.
38+ | "Data.Parser/o-1-space" `isPrefixOf` benchName =
39+ "-M128M"
40+
41+ -----------------------------------------------------------------------
42+
43+ | "Prelude.Parallel/o-n-heap.mapping.mapM" == benchName = "-M256M"
44+ | "Prelude.Parallel/o-n-heap.monad-outer-product."
45+ `isPrefixOf` benchName = "-M256M"
46+ | "Prelude.Parallel/o-n-space.monad-outer-product."
47+ `isPrefixOf` benchName = "-K2M -M256M"
48+ | "Prelude.Rate/o-1-space." `isPrefixOf` benchName = "-K128K"
49+ | "Prelude.Rate/o-1-space.asyncly." `isPrefixOf` benchName = "-K128K"
50+ | "Prelude.WSerial/o-n-space." `isPrefixOf` benchName = "-K4M"
51+ | "Prelude.Async/o-n-space.monad-outer-product." `isPrefixOf` benchName =
52+ "-K4M"
53+ | "Prelude.Ahead/o-1-space.monad-outer-product." `isPrefixOf` benchName =
54+ "-K128K -M32M"
55+ | "Prelude.Ahead/o-1-space." `isPrefixOf` benchName = "-K128K"
56+ | "Prelude.Ahead/o-n-space.monad-outer-product." `isPrefixOf` benchName =
57+ "-K4M"
58+ | "Prelude.WAsync/o-n-heap.monad-outer-product.toNull3" == benchName =
59+ "-M64M"
60+ | "Prelude.WAsync/o-n-space.monad-outer-product." `isPrefixOf` benchName =
61+ "-K4M"
62+
63+ -- This module is dev only now, and can be removed at some point
64+ | "Data.Stream.StreamDK/o-1-space.grouping.classifySessionsOf"
65+ `isPrefixOf` benchName = "-K512K"
66+ | "Data.Stream.StreamDK/o-n-space.foldr.foldrM/"
67+ `isPrefixOf` benchName = "-K4M"
68+ | "Data.Stream.StreamDK/o-n-space.iterated."
69+ `isPrefixOf` benchName = "-K4M -M64M"
70+ -- GHC 9.4.4 requires 4M
71+ | "Data.Stream.StreamDK/o-n-space.traversable."
72+ `isPrefixOf` benchName = "-K4M"
73+ -- GHC-9.6 requires 64M, earlier it was 32M
74+ | "Data.Stream.StreamDK/o-n-heap.buffered.readsPrec pure streams" == benchName =
75+ "-M64M"
76+ -- GHC-9.6 requires 64M, earlier it was 32M
77+ | "Data.Stream.StreamDK/o-n-heap.buffered.showPrec Haskell lists" == benchName =
78+ "-M64M"
79+
80+ -----------------------------------------------------------------------
81+
82+ | "Data.StreamD/o-n-space.elimination.toList" == benchName =
83+ "-K2M"
84+ | "Data.StreamK/o-n-space.elimination.toList" == benchName =
85+ "-K2M"
86+
87+ -----------------------------------------------------------------------
88+
89+ | "Data.Stream/o-1-space.grouping.classifySessionsOf"
90+ `isPrefixOf` benchName = "-K512K"
91+ | "Data.Stream/o-n-space.foldr.foldrM/"
92+ `isPrefixOf` benchName = "-K4M"
93+ | "Data.Stream/o-n-space.iterated."
94+ `isPrefixOf` benchName = "-K4M"
95+
96+ -- GHC-9.6 requires 64M, earlier it was 32M
97+ | "Data.Stream/o-n-heap.buffered.showPrec Haskell lists" == benchName =
98+ "-M64M"
99+ -- GHC-9.6 requires 64M, earlier it was 32M
100+ | "Data.Stream/o-n-heap.buffered.readsPrec pure streams" == benchName =
101+ "-M64M"
102+
103+ | "Data.Stream.ConcurrentEager/o-n-heap.monad-outer-product.toNullAp"
104+ `isPrefixOf` benchName = "-M1024M"
105+ | "Data.Stream.ConcurrentEager/o-1-space."
106+ `isPrefixOf` benchName = "-M128M"
107+
108+ | "Data.Stream.ConcurrentOrdered/o-1-space.concat-foldable.foldMapWith"
109+ `isPrefixOf` benchName = "-K128K"
110+
111+ ----------------------------------------------------------------------
112+
113+ | "Data.Array" `isPrefixOf` benchName
114+ && "/o-1-space.generation.read" `isSuffixOf` benchName = "-M32M"
115+ -- XXX GHC 9.6 onwards needs 64M, earlier it was 32M
116+ | "Data.Array" `isPrefixOf` benchName
117+ && "/o-1-space.generation.show" `isSuffixOf` benchName = "-M64M"
118+ -- XXX GHC 9.6 onwards needs 64M, earlier it was 32M
119+ | "Data.Array.Generic/o-1-space.transformationX4.map"
120+ `isPrefixOf` benchName = "-M64M"
121+
122+ -- XXX For --long option, need to check why so much heap is required.
123+ -- Note, if we remove the chunked stream module we need to keep the
124+ -- chunked stream benchmarks in the stream module.
125+ | "Data.Array.Stream/o-1-space"
126+ `isPrefixOf` benchName = "-K4M -M512M"
127+ -- XXX Takes up to 160MB heap for --long, we use chunked stream for
128+ -- this, so the reason may be related to chunked streams.
129+ | "Data.ParserK/o-1-space"
130+ `isPrefixOf` benchName = "-K4M -M256M"
131+
132+ -----------------------------------------------------------------------
133+
134+ | "Unicode.Char/o-1-space." `isPrefixOf` benchName = "-M32M"
135+
136+ | otherwise = ""
137+
138+speedOpts :: String -> String -> Maybe Quickness
139+speedOpts exeName benchName0 = exeSpecific <|> benchSpecific
140+
141+ where
142+
143+ -- slowestOf Quicker _ = Quicker
144+ -- slowestOf _ Quicker = Quicker
145+ -- slowestOf _ _ = SuperQuick
146+
147+ -- Drop All.
148+ benchName = drop 4 benchName0
149+ exeSpecific
150+ | "Prelude.Concurrent" == exeName = Just SuperQuick
151+ | "Prelude.Rate" == exeName = Just SuperQuick
152+ | "Prelude.Adaptive" == exeName = Just SuperQuick
153+ | otherwise = Nothing
154+ benchSpecific
155+ | "Prelude.Parallel/o-n-heap.mapping.mapM" == benchName =
156+ Just SuperQuick
157+ | "Prelude.Parallel/o-n-heap.monad-outer-product."
158+ `isPrefixOf` benchName = Just SuperQuick
159+ | "Prelude.Parallel.o-n-space.monad-outer-product."
160+ `isPrefixOf` benchName = Just SuperQuick
161+ | "Prelude.Parallel/o-n-heap.generation." `isPrefixOf` benchName =
162+ Just Quicker
163+ | "Prelude.Parallel/o-n-heap.mapping." `isPrefixOf` benchName =
164+ Just Quicker
165+ | "Prelude.Parallel/o-n-heap.concat-foldable." `isPrefixOf` benchName =
166+ Just Quicker
167+ | "Prelude.Async/o-1-space.monad-outer-product." `isPrefixOf` benchName =
168+ Just Quicker
169+ | "Prelude.Async/o-n-space.monad-outer-product." `isPrefixOf` benchName =
170+ Just Quicker
171+ | "Prelude.Ahead/o-1-space.monad-outer-product." `isPrefixOf` benchName =
172+ Just Quicker
173+ | "Prelude.Ahead/o-n-space.monad-outer-product." `isPrefixOf` benchName =
174+ Just Quicker
175+ | "Prelude.WAsync/o-n-heap.monad-outer-product." `isPrefixOf` benchName =
176+ Just Quicker
177+ | "Prelude.WAsync/o-n-space.monad-outer-product." `isPrefixOf` benchName =
178+ Just Quicker
179+ | "FileSystem.Handle." `isPrefixOf` benchName = Just Quicker
180+ | otherwise = Nothing
181+
182+main :: IO ()
183+main = mainWith targets speedOpts rtsOpts
benchmark/bench-runner/bench-runner.cabalnew file+42
@@ -0,0 +1,42 @@
1+cabal-version: 2.4
2+name: bench-runner
3+version: 0.1.0.0
4+
5+-- A short (one-line) description of the package.
6+-- synopsis:
7+
8+-- A longer description of the package.
9+-- description:
10+
11+-- A URL where users can report bugs.
12+-- bug-reports:
13+
14+-- The license under which the package is released.
15+-- license:
16+
17+-- The package author(s).
18+-- author:
19+
20+-- An email address to which users can send suggestions, bug reports, and patches.
21+-- maintainer:
22+
23+-- A copyright notice.
24+-- copyright:
25+-- category:
26+-- extra-source-files: CHANGELOG.md
27+
28+executable bench-runner
29+ ghc-options: -Wall
30+ main-is: Main.hs
31+
32+ -- Modules included in this executable, other than Main.
33+ -- other-modules:
34+
35+ -- LANGUAGE extensions used by modules in this package.
36+ -- other-extensions:
37+ build-depends: base
38+ , bench-report
39+ , containers
40+ , streamly-targets
41+ hs-source-dirs: .
42+ default-language: Haskell2010
benchmark/bench-runner/cabal.projectnew file+4
@@ -0,0 +1,4 @@
1+packages: . ../../targets
2+
3+package bench-report
4+ flags: +no-charts
benchmark/bench-runner/default.nixnew file+164
@@ -0,0 +1,164 @@
1+let
2+ nixpkgsPath_21_11 =
3+ "https://github.com/NixOS/nixpkgs/archive/refs/tags/21.11.tar.gz";
4+ nixpkgsDefault = import (builtins.fetchTarball nixpkgsPath_21_11) { };
5+in
6+{
7+ nixpkgs ? nixpkgsDefault
8+, compiler ? "default"
9+}:
10+let haskellPackages =
11+ if compiler == "default"
12+ then nixpkgs.haskellPackages
13+ else nixpkgs.haskell.packages.${compiler};
14+
15+ mkPackage = super: pkg: path: opts: inShell:
16+ let orig = super.callCabal2nixWithOptions pkg path opts {};
17+ in if inShell
18+ # Avoid copying the source directory to nix store by using
19+ # src = null.
20+ then orig.overrideAttrs (oldAttrs: { src = null; })
21+ else orig;
22+
23+ mkPkgGit = super: gitSrc: rev: name:
24+ let
25+ src = builtins.fetchGit {
26+ url = gitSrc;
27+ rev = rev;
28+ };
29+ in super.callCabal2nix name src { };
30+
31+ mkPkgGitRef = super: gitSrc: rev: ref: name:
32+ let
33+ src = builtins.fetchGit {
34+ url = gitSrc;
35+ rev = rev;
36+ ref = ref;
37+ };
38+ in super.callCabal2nix name src { };
39+
40+ mkHaskellPackages = inShell:
41+ haskellPackages.override {
42+ overrides = self: super:
43+ with nixpkgs.haskell.lib;
44+ {
45+ bench-runner = mkPackage super "bench-runner" ./. "" inShell;
46+ streamly-targets = mkPackage super "streamly-targets" ../../targets "" false;
47+
48+ bench-report =
49+ nixpkgs.haskell.lib.overrideCabal
50+ (let src = fetchGit {
51+ url = "git@github.com:composewell/bench-report.git";
52+ rev = "3b50bf0ad06f746bca42f30c8d40a0426e159af3";
53+ }; in super.callCabal2nix "bench-report" src {})
54+ (old:
55+ { enableLibraryProfiling = false;
56+ doHaddock = false;
57+ });
58+
59+ bench-show = super.callHackageDirect {
60+ pkg = "bench-show";
61+ ver = "0.3.2";
62+ sha256 = "16b8vyzdp9b5bh34kqmbfwjsyv8wgnxxwl8kjcpgxjsh52xzyaa0";
63+ } { };
64+
65+# streamly-coreutils = let
66+# src = "git@github.com:composewell/streamly-coreutils.git";
67+# rev = "a12756efe24bbf303f2f6d66a95426c7657d297b";
68+# in mkPkgGit super src rev "streamly-coreutils";
69+
70+ streamly-coreutils =
71+ nixpkgs.haskell.lib.overrideCabal
72+ (let src = fetchGit {
73+ url = "git@github.com:composewell/streamly-coreutils.git";
74+ rev = "b1e6fc37f0e898c54378129750d3ccc1c034f611";
75+ }; in super.callCabal2nix "streamly-coreutils" src {})
76+ (old:
77+ { librarySystemDepends =
78+ if builtins.currentSystem == "x86_64-darwin"
79+ then [nixpkgs.darwin.apple_sdk.frameworks.Cocoa]
80+ else [];
81+ #enableLibraryProfiling = false;
82+ doHaddock = false;
83+ doCheck = false;
84+ });
85+
86+ streamly-shell = let
87+ src = "https://github.com/composewell/streamly-shell.git";
88+ rev = "1b3fea3239ebe47963955d81565b9d5e34567ab7";
89+ in mkPkgGit super src rev "streamly-shell";
90+
91+ streamly-process = let
92+ src = "https://github.com/composewell/streamly-process.git";
93+ rev = "e310c8a9c6e61515373a2f5f1fb82f6e15fe452b";
94+ in nixpkgs.haskell.lib.dontCheck
95+ (mkPkgGit super src rev "streamly-process");
96+
97+ #streamly-process = nixpkgs.haskell.lib.dontCheck
98+ # (super.callHackageDirect {
99+ # pkg = "streamly-process";
100+ # ver = "0.1.0";
101+ # sha256 = "01nxisqfmn29fbirdsx71sfjp2rdqwrf469qyjcql2d11i1bxn94";
102+ # } { });
103+
104+ # streamly = super.callHackageDirect {
105+ # pkg = "streamly";
106+ # ver = "0.8.0";
107+ # sha256 = "0vy2lkljizlhpbpbybmg9jcmj2g4s1aaqd2dzy5c0y0n4rgwxask";
108+ # } { };
109+ streamly =
110+ nixpkgs.haskell.lib.overrideCabal
111+ #(super.callHackageDirect
112+ # { pkg = "streamly";
113+ # ver = "0.8.2";
114+ # sha256 = "sha256-CjFq9SCdbgLZa7NqOE4OtC8OaFg4vK8VmIDjGU5rGko=";
115+ # } {})
116+ (let src = fetchGit {
117+ url = "git@github.com:composewell/streamly.git";
118+ rev = "14ee0b70363cf925e9cc067bf1df4ecbd047ac38";
119+ }; in super.callCabal2nix "streamly" src {})
120+ (old:
121+ { librarySystemDepends =
122+ if builtins.currentSystem == "x86_64-darwin"
123+ then [nixpkgs.darwin.apple_sdk.frameworks.Cocoa]
124+ else [];
125+ #enableLibraryProfiling = false;
126+ doHaddock = false;
127+ });
128+
129+ streamly-core =
130+ nixpkgs.haskell.lib.overrideCabal
131+ (let src = fetchGit {
132+ url = "git@github.com:composewell/streamly.git";
133+ rev = "14ee0b70363cf925e9cc067bf1df4ecbd047ac38";
134+ }; in super.callCabal2nix "streamly-core" "${src}/core" {})
135+ (old:
136+ { librarySystemDepends =
137+ if builtins.currentSystem == "x86_64-darwin"
138+ then [nixpkgs.darwin.apple_sdk.frameworks.Cocoa]
139+ else [];
140+ #enableLibraryProfiling = false;
141+ doHaddock = false;
142+ });
143+
144+ };
145+ };
146+
147+ drv = mkHaskellPackages true;
148+
149+ shell = drv.shellFor {
150+ packages = p:
151+ [ p.bench-runner
152+ ];
153+ # Use a better prompt
154+ shellHook = ''
155+ export CABAL_DIR="$(pwd)/.cabal.nix"
156+ if test -n "$PS_SHELL"
157+ then
158+ export PS1="$PS_SHELL\[$bldred\](nix)\[$txtrst\] "
159+ fi
160+ '';
161+ };
162+in if nixpkgs.lib.inNixShell
163+ then shell
164+ else (mkHaskellPackages false).bench-runner
benchmark/lib/Streamly/Benchmark/Common.hs+11−12
@@ -1,7 +1,5 @@
11{-# LANGUAGE CPP #-}
2−#if __GLASGOW_HASKELL__ >= 800
32{-# OPTIONS_GHC -Wno-orphans #-}
4−#endif
53
64-- |
75-- Module : Streamly.Benchmark.Common
@@ -55,10 +53,10 @@ import Control.DeepSeq (NFData(..))
5553import Data.Functor.Identity (Identity, runIdentity)
5654import System.Random (randomRIO)
5755
58−import qualified Streamly.Prelude as S
56+import qualified Streamly.Internal.Data.Fold as Fold
57+import qualified Streamly.Internal.Data.Stream as S
5958
60−import Streamly.Prelude (SerialT)
61−import Gauge
59+import Test.Tasty.Bench
6260
6361-------------------------------------------------------------------------------
6462-- Benchmark Prefixes
@@ -80,10 +78,6 @@ o_n_stack_prefix name = name ++ "/o-n-stack"
8078-- Benchmarking utilities
8179-------------------------------------------------------------------------------
8280
83−#if !MIN_VERSION_deepseq(1,4,3)
84−instance NFData Ordering where rnf = (`seq` ())
85−#endif
86−
8781-- XXX once we convert all the functions to use this we can rename this to
8882-- benchIOSink
8983{-# INLINE benchIOSink1 #-}
@@ -113,8 +107,12 @@ benchPureSink1 name f =
113107 bench name $ nfIO $ randomRIO (1,1) >>= return . runIdentity . f
114108
115109{-# INLINE benchPureSrc #-}
116−benchPureSrc :: String -> (Int -> SerialT Identity a) -> Benchmark
117−benchPureSrc name src = benchPure name src (runIdentity . S.drain)
110+benchPureSrc :: String -> (Int -> S.Stream Identity a) -> Benchmark
111+benchPureSrc name src = benchPure name src (runIdentity . drain)
112+
113+ where
114+
115+ drain = S.fold Fold.drain
118116
119117-------------------------------------------------------------------------------
120118-- String/List generation for read instances
@@ -244,8 +242,9 @@ runWithCLIOptsEnv defStreamSize alloc mkBench = do
244242 r <- alloc value
245243 value `seq` runMode (mode cfg) cfg benches (mkBench r value)
246244#else
245+ r0 <- alloc 0
247246 (value, ingredients) <-
248− parseCLIOpts defStreamSize $ bgroup "All" (mkBench undefined 0)
247+ parseCLIOpts defStreamSize $ bgroup "All" (mkBench r0 0)
249248 r <- alloc value
250249 value `seq` defaultMainWithIngredients ingredients
251250 $ bgroup "All" (mkBench r value)
benchmark/lib/Streamly/Benchmark/Common/Handle.hs+15−4
@@ -30,20 +30,25 @@ module Streamly.Benchmark.Common.Handle
3030 , isSpace
3131 , isSp
3232 , mkHandleBenchEnv
33+ , Handles(..)
34+ , getHandles
3335 )
3436where
3537
3638import Control.DeepSeq (NFData(rnf))
3739import Data.Char (ord, chr)
40+#if MIN_VERSION_base(4,17,0)
41+import Data.Char (generalCategory, GeneralCategory(Space))
42+#endif
3843import Data.Word (Word8)
3944import System.Directory (getFileSize)
4045import System.Environment (lookupEnv)
4146import System.IO (openFile, IOMode(..), Handle, hClose, stderr, hPutStrLn)
42−import System.Process.Typed (shell, runProcess_)
47+import System.Process (callCommand)
4348
4449import Data.IORef
4550import Prelude hiding (last, length)
46−import Gauge hiding (env)
51+import Test.Tasty.Bench hiding (env)
4752
4853
4954scratchDir :: String
@@ -140,8 +145,10 @@ mkBenchSmall name env action =
140145
141146 useSmallH (RefHandles {smallInH = inh, outputH = outh}) = Handles inh outh
142147
148+#if !MIN_VERSION_base(4,17,0)
143149foreign import ccall unsafe "u_iswspace"
144150 iswspace :: Int -> Int
151+#endif
145152
146153-- Code copied from base/Data.Char to INLINE it
147154{-# INLINE isSpace #-}
@@ -154,7 +161,11 @@ isSpace :: Char -> Bool
154161-- so we'll do it like this until there's a way around that.
155162isSpace c
156163 | uc <= 0x377 = uc == 32 || uc - 0x9 <= 4 || uc == 0xa0
164+#if MIN_VERSION_base(4,17,0)
165+ | otherwise = generalCategory c == Space
166+#else
157167 | otherwise = iswspace (ord c) /= 0
168+#endif
158169 where
159170 uc = fromIntegral (ord c) :: Word
160171
@@ -183,8 +194,8 @@ mkHandleBenchEnv = do
183194 ++ "\" && head -c " ++ show size
184195 ++ " </dev/urandom >" ++ infile
185196 ++ ";}"
186− runProcess_ (shell (cmd inFileSmall smallFileSize))
187− runProcess_ (shell (cmd inFileBig bigFileSize))
197+ callCommand (cmd inFileSmall smallFileSize)
198+ callCommand (cmd inFileBig bigFileSize)
188199 return (inFileSmall, inFileBig)
189200
190201 hPutStrLn stderr $ "Using small input file: " ++ small
benchmark/lib/Streamly/Benchmark/Prelude.hs+57−5
@@ -1,3 +1,5 @@
1+{-# OPTIONS_GHC -Wno-deprecations #-}
2+
13-- |
24-- Module : Streamly.Benchmark.Prelude
35-- Copyright : (c) 2018 Composewell Technologies
@@ -10,16 +12,66 @@
1012{-# LANGUAGE ScopedTypeVariables #-}
1113{-# LANGUAGE RankNTypes #-}
1214
13−module Streamly.Benchmark.Prelude where
15+module Streamly.Benchmark.Prelude
16+ ( absTimes
17+ , apDiscardFst
18+ , apDiscardSnd
19+ , apLiftA2
20+ , benchIO
21+ , benchIOSink
22+ , benchIOSrc
23+ , breakAfterSome
24+ , composeN
25+ , concatFoldableWith
26+ , concatForFoldableWith
27+ , concatPairsWith
28+ , concatStreamsWith
29+ , filterAllInM
30+ , filterAllOutM
31+ , filterSome
32+ , fmapN
33+ , mapM
34+ , mapN
35+ , mkAsync
36+ , monadThen
37+ , runToList
38+ , sourceConcatMapId
39+ , sourceFoldMapM
40+ , sourceFoldMapWith
41+ , sourceFoldMapWithM
42+ , sourceFoldMapWithStream
43+ , sourceFracFromThenTo
44+ , sourceFracFromTo
45+ , sourceFromFoldable
46+ , sourceFromFoldableM
47+ , sourceFromList
48+ , sourceFromListM
49+ , sourceIntegerFromStep
50+ , sourceIntFromThenTo
51+ , sourceIntFromTo
52+ , sourceUnfoldr
53+ , sourceUnfoldrAction
54+ , sourceUnfoldrM
55+ , sourceUnfoldrMSerial
56+ , toListM
57+ , toListSome
58+ , toNull
59+ , toNullAp
60+ , toNullM
61+ , toNullM3
62+ , transformComposeMapM
63+ , transformMapM
64+ , transformTeeMapM
65+ , transformZipMapM
66+ )
67+where
1468
1569import Control.Applicative (liftA2)
1670import Control.DeepSeq (NFData(..))
1771import Control.Exception (try)
1872import Data.Functor.Identity (Identity)
19−#if !(MIN_VERSION_base(4,11,0))
20−import Data.Semigroup (Semigroup((<>)))
21−#endif
2273import GHC.Exception (ErrorCall)
74+import Prelude hiding (mapM)
2375import System.Random (randomRIO)
2476
2577import qualified Data.Foldable as F
@@ -30,7 +82,7 @@ import qualified Streamly.Internal.Data.Stream.IsStream.Type as IsStream
3082import qualified Streamly.Internal.Data.Pipe as Pipe
3183import qualified Streamly.Internal.Data.Stream.Serial as Serial
3284
33−import Gauge
85+import Test.Tasty.Bench
3486import Streamly.Internal.Data.Time.Units
3587
3688-- Common polymorphic stream APIs used across multiple stream modules
benchmark/streamly-benchmarks.cabal+424−179
@@ -39,6 +39,11 @@ flag dev
3939 manual: True
4040 default: False
4141
42+flag include-strict-utf8
43+ description: Include strict utf8 input benchmarks
44+ manual: True
45+ default: False
46+
4247flag has-llvm
4348 description: Use llvm backend for better performance
4449 manual: True
@@ -49,8 +54,13 @@ flag opt
4954 manual: True
5055 default: True
5156
52−flag use-gauge
53− description: Use gauge instead of tasty-bench for benchmarking
57+flag use-streamly-core
58+ description: Benchmark only core package
59+ manual: True
60+ default: False
61+
62+flag use-prelude
63+ description: Use Prelude instead of Data.Stream for serial benchmarks
5464 manual: True
5565 default: False
5666
@@ -58,24 +68,81 @@ flag use-gauge
5868-- Common stanzas
5969-------------------------------------------------------------------------------
6070
71+common default-extensions
72+ default-extensions:
73+ BangPatterns
74+ CApiFFI
75+ CPP
76+ ConstraintKinds
77+ DeriveDataTypeable
78+ DeriveGeneric
79+ DeriveTraversable
80+ ExistentialQuantification
81+ FlexibleContexts
82+ FlexibleInstances
83+ GeneralizedNewtypeDeriving
84+ InstanceSigs
85+ KindSignatures
86+ LambdaCase
87+ MagicHash
88+ MultiParamTypeClasses
89+ PatternSynonyms
90+ RankNTypes
91+ RecordWildCards
92+ ScopedTypeVariables
93+ TupleSections
94+ TypeApplications
95+ TypeFamilies
96+ TypeOperators
97+ ViewPatterns
98+
99+ -- MonoLocalBinds, enabled by TypeFamilies, causes performance
100+ -- regressions. Disable it. This must come after TypeFamilies,
101+ -- otherwise TypeFamilies will enable it again.
102+ NoMonoLocalBinds
103+
104+ -- UndecidableInstances -- Does not show any perf impact
105+ -- UnboxedTuples -- interferes with (#.)
106+
61107common compile-options
108+ import: default-extensions
62109 default-language: Haskell2010
63110
111+ if flag(use-streamly-core)
112+ cpp-options: -DUSE_STREAMLY_CORE
113+
64114 if flag(dev)
65115 cpp-options: -DDEVBUILD
66116
117+ if flag(include-strict-utf8)
118+ cpp-options: -DINCLUDE_STRICT_UTF8
119+
67120 if flag(inspection)
68121 cpp-options: -DINSPECTION
69122
70− ghc-options: -Wall
71− -Wcompat
72− -Wunrecognised-warning-flags
73− -Widentities
74− -Wincomplete-record-updates
75− -Wincomplete-uni-patterns
76− -Wredundant-constraints
77− -Wnoncanonical-monad-instances
78− -Rghc-timing
123+ ghc-options: -Weverything
124+ -Wno-implicit-prelude
125+ -Wno-missing-deriving-strategies
126+ -Wno-missing-exported-signatures
127+ -Wno-missing-import-lists
128+ -Wno-missing-local-signatures
129+ -Wno-missing-safe-haskell-mode
130+ -Wno-missed-specialisations
131+ -Wno-all-missed-specialisations
132+ -Wno-monomorphism-restriction
133+ -Wno-prepositive-qualified-module
134+ -Wno-unsafe
135+ -Wno-unused-packages
136+ -Rghc-timing
137+
138+ if impl(ghc >= 9.2)
139+ ghc-options:
140+ -Wno-missing-kind-signatures
141+ -Wno-operator-whitespace
142+
143+ if impl(ghc >= 9.8)
144+ ghc-options:
145+ -Wno-missing-role-annotations
79146
80147 if flag(has-llvm)
81148 ghc-options: -fllvm
@@ -84,15 +151,17 @@ common compile-options
84151 ghc-options: -Wmissed-specialisations
85152 -Wall-missed-specialisations
86153
87− if flag(dev) || flag(debug)
88− ghc-options: -fno-ignore-asserts
89−
90154common optimization-options
91155 if flag(opt)
92156 ghc-options: -O2
93157 -fdicts-strict
94158 -fspec-constr-recursive=16
95159 -fmax-worker-args=16
160+
161+ -- For this to be effective it must come after the -O2 option
162+ if flag(dev) || flag(debug)
163+ ghc-options: -fno-ignore-asserts
164+
96165 if flag(fusion-plugin) && !impl(ghcjs) && !impl(ghc < 8.6)
97166 ghc-options: -fplugin Fusion.Plugin
98167 else
@@ -106,37 +175,34 @@ common bench-depends
106175 -- Core libraries shipped with ghc, the min and max
107176 -- constraints of these libraries should match with
108177 -- the GHC versions we support
109− base >= 4.9 && < 5
110− , deepseq >= 1.4.1 && < 1.5
111− , mtl >= 2.2 && < 3
178+ base >= 4.9 && < 4.20
179+ , deepseq >= 1.4.1 && < 1.6
180+ , mtl >= 2.2 && < 2.3.2
112181
113182 -- other libraries
114− , streamly >= 0.7.0
183+ , exceptions >= 0.8 && < 0.11
115184 , random >= 1.0 && < 2.0
116− , transformers >= 0.4 && < 0.6
117− , containers >= 0.5 && < 0.7
118− , typed-process >= 0.2.3 && < 0.3
185+ , transformers >= 0.4 && < 0.7
186+ , containers >= 0.5 && < 0.8
187+ , hashable >= 1.3 && < 1.5
188+ , unordered-containers >= 0.2 && < 0.3
189+ , process >= 1.4 && < 1.7
119190 , directory >= 1.2.2 && < 1.4
120− , filepath >= 1.4.1 && < 1.5
121− , ghc-prim >= 0.4 && < 0.8
191+ , filepath >= 1.4.1 && < 1.6
192+ , ghc-prim >= 0.4 && < 0.12
193+ , tasty-bench >= 0.3 && < 0.4
194+ , tasty >= 1.4.1 && < 1.6
195+ , streamly-core
122196
123− if flag(use-gauge)
124− build-depends: gauge >= 0.2.4 && < 0.3
125− else
126− build-depends: tasty-bench >= 0.2.5 && < 0.3
127− , tasty >= 1.4.1
128− mixins: tasty-bench
129− (Test.Tasty.Bench as Gauge
130− , Test.Tasty.Bench as Gauge.Main
131− )
197+ if !flag(use-streamly-core)
198+ build-depends: streamly
132199
133200 if flag(fusion-plugin) && !impl(ghcjs) && !impl(ghc < 8.6)
134201 build-depends:
135202 fusion-plugin >= 0.2 && < 0.3
136203 if flag(inspection)
137− build-depends: template-haskell >= 2.14 && < 2.17
138− , inspection-testing >= 0.4 && < 0.5
139− , ghc-prim >= 0.2 && < 0.7
204+ build-depends: template-haskell >= 2.14 && < 2.22
205+ , inspection-testing >= 0.4 && < 0.6
140206 -- Array uses a Storable constraint in dev build making several inspection
141207 -- tests fail
142208 if flag(dev) && flag(inspection)
@@ -150,8 +216,10 @@ library
150216 import: lib-options, bench-depends
151217 hs-source-dirs: lib
152218 exposed-modules: Streamly.Benchmark.Common
153− , Streamly.Benchmark.Common.Handle
154− , Streamly.Benchmark.Prelude
219+ , Streamly.Benchmark.Common.Handle
220+ if flag(use-prelude)
221+ exposed-modules: Streamly.Benchmark.Prelude
222+
155223
156224-------------------------------------------------------------------------------
157225-- Benchmarks
@@ -159,6 +227,7 @@ library
159227
160228common bench-options
161229 import: compile-options, optimization-options, bench-depends
230+ include-dirs: .
162231 ghc-options: -rtsopts
163232 if flag(limit-build-mem)
164233 ghc-options: +RTS -M512M -RTS
@@ -178,120 +247,142 @@ common bench-options-threaded
178247-- Serial Streams
179248-------------------------------------------------------------------------------
180249
181−benchmark Prelude.Serial
250+benchmark Data.Stream
182251 import: bench-options
183252 type: exitcode-stdio-1.0
184− hs-source-dirs: Streamly/Benchmark/Prelude
185− main-is: Serial.hs
253+ hs-source-dirs: Streamly/Benchmark/Data
254+ main-is: Stream.hs
186255 other-modules:
187− Serial.Generation
188− , Serial.Elimination
189− , Serial.Transformation1
190− , Serial.NestedStream
191− , Serial.NestedFold
192− , Serial.Split
193− , Serial.Exceptions
194− , Serial.Lift
195− if impl(ghcjs)
196− buildable: False
197− else
198− buildable: True
256+ Stream.Generate
257+ Stream.Eliminate
258+ Stream.Transform
259+ Stream.Reduce
260+ Stream.Expand
261+ Stream.Lift
262+ Stream.Common
263+ if !flag(use-streamly-core)
264+ other-modules:
265+ Stream.Exceptions
199266 if flag(limit-build-mem)
200− ghc-options: +RTS -M2000M -RTS
201−
267+ if flag(dev)
268+ ghc-options: +RTS -M3500M -RTS
269+ else
270+ ghc-options: +RTS -M2500M -RTS
202271
203−benchmark Prelude.WSerial
272+-- Use StreamK functions where possible, converting to StreaK to StreamD
273+benchmark Data.Stream.StreamDK
204274 import: bench-options
205275 type: exitcode-stdio-1.0
206− hs-source-dirs: Streamly/Benchmark/Prelude
207− main-is: WSerial.hs
208− if impl(ghcjs)
276+ hs-source-dirs: Streamly/Benchmark/Data
277+ main-is: Stream.hs
278+ other-modules:
279+ Stream.Generate
280+ Stream.Eliminate
281+ Stream.Transform
282+ Stream.Reduce
283+ Stream.Expand
284+ Stream.Lift
285+ Stream.Common
286+ if !flag(use-streamly-core)
287+ other-modules:
288+ Stream.Exceptions
289+ -- Cannot use USE_STREAMK and USE_PRELUDE together
290+ if flag(use-prelude)
209291 buildable: False
210− else
211− buildable: True
292+ cpp-options: -DUSE_STREAMK
293+ if flag(limit-build-mem)
294+ if flag(dev)
295+ ghc-options: +RTS -M3500M -RTS
296+ else
297+ ghc-options: +RTS -M2500M -RTS
212298
213−benchmark Prelude.Merge
214− import: bench-options
299+benchmark Data.Stream.Concurrent
300+ import: bench-options-threaded
215301 type: exitcode-stdio-1.0
216− hs-source-dirs: Streamly/Benchmark/Prelude
217− main-is: Merge.hs
218− if impl(ghcjs)
302+ hs-source-dirs: Streamly/Benchmark/Data/Stream/, Streamly/Benchmark/Data/
303+ main-is: Concurrent.hs
304+ other-modules:
305+ Stream.ConcurrentCommon
306+ Stream.Common
307+ if flag(use-streamly-core) || impl(ghcjs)
219308 buildable: False
220309 else
221310 buildable: True
222311
223−benchmark Prelude.ZipSerial
224− import: bench-options
312+benchmark Data.Stream.ConcurrentInterleaved
313+ import: bench-options-threaded
225314 type: exitcode-stdio-1.0
226− hs-source-dirs: Streamly/Benchmark/Prelude
227− main-is: ZipSerial.hs
228− if impl(ghcjs)
315+ hs-source-dirs: Streamly/Benchmark/Data/Stream/, Streamly/Benchmark/Data/
316+ main-is: ConcurrentInterleaved.hs
317+ other-modules:
318+ Stream.ConcurrentCommon
319+ Stream.Common
320+ if flag(use-streamly-core) || impl(ghcjs)
229321 buildable: False
230322 else
231323 buildable: True
232324
233−benchmark Prelude.ZipAsync
234− import: bench-options
325+benchmark Data.Stream.ConcurrentEager
326+ import: bench-options-threaded
235327 type: exitcode-stdio-1.0
236− hs-source-dirs: Streamly/Benchmark/Prelude
237− main-is: ZipAsync.hs
238− if impl(ghcjs)
328+ hs-source-dirs: Streamly/Benchmark/Data/Stream/, Streamly/Benchmark/Data/
329+ main-is: ConcurrentEager.hs
330+ other-modules:
331+ Stream.ConcurrentCommon
332+ Stream.Common
333+ if flag(use-streamly-core) || impl(ghcjs)
239334 buildable: False
240335 else
241336 buildable: True
242− if flag(limit-build-mem)
243− ghc-options: +RTS -M1000M -RTS
244−
245337
246−benchmark Prelude.Ahead
338+benchmark Data.Stream.ConcurrentOrdered
247339 import: bench-options-threaded
248340 type: exitcode-stdio-1.0
249− hs-source-dirs: Streamly/Benchmark/Prelude
250− main-is: Ahead.hs
251− if impl(ghcjs)
341+ hs-source-dirs: Streamly/Benchmark/Data/Stream/, Streamly/Benchmark/Data/
342+ main-is: ConcurrentOrdered.hs
343+ other-modules:
344+ Stream.ConcurrentCommon
345+ Stream.Common
346+ if flag(use-streamly-core) || impl(ghcjs)
252347 buildable: False
253348 else
254349 buildable: True
255350
256−benchmark Prelude.Async
257− import: bench-options-threaded
351+benchmark Data.Unbox
352+ import: bench-options
258353 type: exitcode-stdio-1.0
259− hs-source-dirs: Streamly/Benchmark/Prelude
260− main-is: Async.hs
261− if impl(ghcjs)
262− buildable: False
263− else
264− buildable: True
354+ hs-source-dirs: .
355+ cpp-options: -DUSE_UNBOX
356+ main-is: Streamly/Benchmark/Data/Serialize.hs
265357
266−benchmark Prelude.WAsync
267− import: bench-options-threaded
358+benchmark Data.Unbox.Derive.TH
359+ import: bench-options
268360 type: exitcode-stdio-1.0
269− hs-source-dirs: Streamly/Benchmark/Prelude
270− main-is: WAsync.hs
271− if impl(ghcjs)
272− buildable: False
273− else
274− buildable: True
361+ hs-source-dirs: .
362+ cpp-options: -DUSE_UNBOX
363+ cpp-options: -DUSE_TH
364+ main-is: Streamly/Benchmark/Data/Serialize.hs
275365
276−benchmark Prelude.Parallel
277− import: bench-options-threaded
366+benchmark Data.Serialize
367+ import: bench-options
278368 type: exitcode-stdio-1.0
279− hs-source-dirs: Streamly/Benchmark/Prelude
280− main-is: Parallel.hs
281− if impl(ghcjs)
282− buildable: False
283− else
284− buildable: True
369+ hs-source-dirs: .
370+ cpp-options: -DUSE_TH
371+ main-is: Streamly/Benchmark/Data/Serialize.hs
372+ build-depends: QuickCheck, template-haskell
373+ other-modules:
374+ Streamly.Benchmark.Data.Serialize.TH
375+ Streamly.Benchmark.Data.Serialize.RecCompatible
376+ Streamly.Benchmark.Data.Serialize.RecNonCompatible
285377 if flag(limit-build-mem)
286− ghc-options: +RTS -M2000M -RTS
287−
378+ ghc-options: +RTS -M1000M -RTS
288379
289380benchmark Data.Unfold
290381 import: bench-options
291382 type: exitcode-stdio-1.0
292383 hs-source-dirs: .
293384 main-is: Streamly/Benchmark/Data/Unfold.hs
294− if impl(ghcjs)
385+ if flag(use-streamly-core) || impl(ghcjs)
295386 buildable: False
296387 else
297388 buildable: True
@@ -301,28 +392,42 @@ benchmark Data.Fold
301392 type: exitcode-stdio-1.0
302393 hs-source-dirs: Streamly/Benchmark/Data
303394 main-is: Fold.hs
304− if impl(ghcjs)
395+ if flag(use-streamly-core) || impl(ghcjs)
305396 buildable: False
306397 else
307398 buildable: True
308399
309−benchmark Data.Parser.ParserD
400+benchmark Data.Fold.Window
310401 import: bench-options
311402 type: exitcode-stdio-1.0
312− hs-source-dirs: Streamly/Benchmark/Data/Parser
313− main-is: ParserD.hs
403+ hs-source-dirs: Streamly/Benchmark/Data/Fold
404+ main-is: Window.hs
405+ if flag(use-streamly-core)
406+ buildable: False
407+ else
408+ buildable: True
409+
410+benchmark Data.Parser
411+ import: bench-options
412+ type: exitcode-stdio-1.0
413+ hs-source-dirs: Streamly/Benchmark/Data
414+ main-is: Parser.hs
314415 if impl(ghcjs)
315416 buildable: False
316417 else
317418 buildable: True
318419 build-depends: exceptions >= 0.8 && < 0.11
319420 if flag(limit-build-mem)
320− ghc-options: +RTS -M750M -RTS
421+ if flag(dev)
422+ ghc-options: +RTS -M3000M -RTS
423+ else
424+ ghc-options: +RTS -M2000M -RTS
321425
322−benchmark Data.Parser.ParserK
426+benchmark Data.ParserK
323427 import: bench-options
324428 type: exitcode-stdio-1.0
325− hs-source-dirs: Streamly/Benchmark/Data/Parser
429+ hs-source-dirs: Streamly/Benchmark/Data
430+ cpp-options: -DBENCH_SINGULAR
326431 main-is: ParserK.hs
327432 if impl(ghcjs)
328433 buildable: False
@@ -330,15 +435,11 @@ benchmark Data.Parser.ParserK
330435 buildable: True
331436 build-depends: exceptions >= 0.8 && < 0.11
332437
333−-- Note: to use this we have to set DISABLE_FUSION in ParserD.hs so that
334−-- the rewrite rules are disabled. We can also use the "no-fusion" build
335−-- flag but we need to keep in mind that it disables fusion for streams
336−-- as well.
337−benchmark Data.Parser.FromParserK
438+benchmark Data.ParserK.Chunked
338439 import: bench-options
339440 type: exitcode-stdio-1.0
340− hs-source-dirs: Streamly/Benchmark/Data/Parser
341− cpp-options: -DFROM_PARSERK
441+ hs-source-dirs: Streamly/Benchmark/Data
442+ cpp-options: -DBENCH_CHUNKED
342443 main-is: ParserK.hs
343444 if impl(ghcjs)
344445 buildable: False
@@ -346,62 +447,167 @@ benchmark Data.Parser.FromParserK
346447 buildable: True
347448 build-depends: exceptions >= 0.8 && < 0.11
348449
349−benchmark Data.Parser
450+benchmark Data.ParserK.Chunked.Generic
350451 import: bench-options
351452 type: exitcode-stdio-1.0
352453 hs-source-dirs: Streamly/Benchmark/Data
353− main-is: Parser.hs
454+ cpp-options: -DBENCH_CHUNKED_GENERIC
455+ main-is: ParserK.hs
354456 if impl(ghcjs)
355457 buildable: False
356458 else
357459 buildable: True
358460 build-depends: exceptions >= 0.8 && < 0.11
359− if flag(limit-build-mem)
360− ghc-options: +RTS -M1000M -RTS
361461
362462-------------------------------------------------------------------------------
363463-- Raw Streams
364464-------------------------------------------------------------------------------
365465
366−benchmark Data.Stream.StreamD
466+benchmark Data.StreamD
367467 import: bench-options
368468 type: exitcode-stdio-1.0
369469 hs-source-dirs: Streamly/Benchmark/Data/Stream
370470 main-is: StreamD.hs
371471 if impl(ghcjs)
372472 buildable: False
373− else
374− buildable: True
375473
376−benchmark Data.Stream.StreamK
474+benchmark Data.StreamK
377475 import: bench-options
378476 type: exitcode-stdio-1.0
379477 hs-source-dirs: Streamly/Benchmark/Data/Stream
380478 main-is: StreamK.hs
381479 if impl(ghcjs)
382480 buildable: False
383− else
384− buildable: True
385481
386−benchmark Data.Stream.StreamDK
482+benchmark Data.Stream.ToStreamK
387483 import: bench-options
388484 type: exitcode-stdio-1.0
389485 hs-source-dirs: Streamly/Benchmark/Data/Stream
390− main-is: StreamDK.hs
391− if impl(ghcjs)
486+ main-is: ToStreamK.hs
487+ if !flag(dev) || impl(ghcjs)
488+ buildable: False
489+
490+benchmark Data.StreamK.Alt
491+ import: bench-options
492+ type: exitcode-stdio-1.0
493+ hs-source-dirs: Streamly/Benchmark/Data/Stream
494+ main-is: StreamKAlt.hs
495+ if !flag(dev) || impl(ghcjs)
392496 buildable: False
393− else
394− buildable: True
395497
396498executable nano-bench
397499 import: bench-options
398500 hs-source-dirs: .
399501 main-is: NanoBenchmarks.hs
400− if flag(dev)
401− buildable: True
402− else
502+ if !flag(dev)
403503 buildable: False
404504
505+-------------------------------------------------------------------------------
506+-- Streamly.Prelude
507+-------------------------------------------------------------------------------
508+
509+benchmark Prelude
510+ import: bench-options
511+ type: exitcode-stdio-1.0
512+ hs-source-dirs: Streamly/Benchmark/Data
513+ main-is: Stream.hs
514+ other-modules:
515+ Stream.Generate
516+ Stream.Eliminate
517+ Stream.Transform
518+ Stream.Reduce
519+ Stream.Expand
520+ Stream.Lift
521+ Stream.Common
522+ Stream.Split
523+ Stream.Exceptions
524+ cpp-options: -DUSE_PRELUDE
525+ if !flag(use-prelude)
526+ buildable: False
527+ if flag(limit-build-mem)
528+ if flag(dev)
529+ ghc-options: +RTS -M3500M -RTS
530+ else
531+ ghc-options: +RTS -M2500M -RTS
532+
533+benchmark Prelude.WSerial
534+ import: bench-options
535+ type: exitcode-stdio-1.0
536+ hs-source-dirs: Streamly/Benchmark/Prelude
537+ main-is: WSerial.hs
538+ cpp-options: -DUSE_PRELUDE
539+ if !flag(use-prelude)
540+ buildable: False
541+ if flag(limit-build-mem)
542+ ghc-options: +RTS -M750M -RTS
543+
544+benchmark Prelude.Merge
545+ import: bench-options
546+ type: exitcode-stdio-1.0
547+ hs-source-dirs: Streamly/Benchmark/Prelude
548+ main-is: Merge.hs
549+ cpp-options: -DUSE_PRELUDE
550+ if !flag(use-prelude)
551+ buildable: False
552+
553+benchmark Prelude.ZipSerial
554+ import: bench-options
555+ type: exitcode-stdio-1.0
556+ hs-source-dirs: Streamly/Benchmark/Prelude
557+ main-is: ZipSerial.hs
558+ cpp-options: -DUSE_PRELUDE
559+ if !flag(use-prelude)
560+ buildable: False
561+
562+benchmark Prelude.ZipAsync
563+ import: bench-options
564+ type: exitcode-stdio-1.0
565+ hs-source-dirs: Streamly/Benchmark/Prelude
566+ main-is: ZipAsync.hs
567+ cpp-options: -DUSE_PRELUDE
568+ if !flag(use-prelude)
569+ buildable: False
570+ if flag(limit-build-mem)
571+ ghc-options: +RTS -M1000M -RTS
572+
573+benchmark Prelude.Ahead
574+ import: bench-options-threaded
575+ type: exitcode-stdio-1.0
576+ hs-source-dirs: Streamly/Benchmark/Prelude
577+ main-is: Ahead.hs
578+ cpp-options: -DUSE_PRELUDE
579+ if !flag(use-prelude)
580+ buildable: False
581+
582+benchmark Prelude.Async
583+ import: bench-options-threaded
584+ type: exitcode-stdio-1.0
585+ hs-source-dirs: Streamly/Benchmark/Prelude
586+ main-is: Async.hs
587+ cpp-options: -DUSE_PRELUDE
588+ if !flag(use-prelude)
589+ buildable: False
590+
591+benchmark Prelude.WAsync
592+ import: bench-options-threaded
593+ type: exitcode-stdio-1.0
594+ hs-source-dirs: Streamly/Benchmark/Prelude
595+ main-is: WAsync.hs
596+ cpp-options: -DUSE_PRELUDE
597+ if !flag(use-prelude)
598+ buildable: False
599+
600+benchmark Prelude.Parallel
601+ import: bench-options-threaded
602+ type: exitcode-stdio-1.0
603+ hs-source-dirs: Streamly/Benchmark/Prelude
604+ main-is: Parallel.hs
605+ cpp-options: -DUSE_PRELUDE
606+ if !flag(use-prelude)
607+ buildable: False
608+ if flag(limit-build-mem)
609+ ghc-options: +RTS -M2000M -RTS
610+
405611-------------------------------------------------------------------------------
406612-- Concurrent Streams
407613-------------------------------------------------------------------------------
@@ -411,84 +617,101 @@ benchmark Prelude.Concurrent
411617 type: exitcode-stdio-1.0
412618 hs-source-dirs: Streamly/Benchmark/Prelude
413619 main-is: Concurrent.hs
620+ cpp-options: -DUSE_PRELUDE
621+ if !flag(use-prelude)
622+ buildable: False
414623
415624benchmark Prelude.Adaptive
416625 import: bench-options-threaded
417626 type: exitcode-stdio-1.0
418627 hs-source-dirs: Streamly/Benchmark/Prelude
419628 main-is: Adaptive.hs
420− if impl(ghcjs)
629+ cpp-options: -DUSE_PRELUDE
630+ if !flag(use-prelude)
421631 buildable: False
422− else
423− buildable: True
424632
425633benchmark Prelude.Rate
426634 import: bench-options-threaded
427635 type: exitcode-stdio-1.0
428636 hs-source-dirs: Streamly/Benchmark/Prelude
429637 main-is: Rate.hs
430− if impl(ghcjs)
638+ cpp-options: -DUSE_PRELUDE
639+ if !flag(use-prelude)
431640 buildable: False
432− else
433− buildable: True
434641
435642-------------------------------------------------------------------------------
436643-- Array Benchmarks
437644-------------------------------------------------------------------------------
438645
439−benchmark Data.Array
646+benchmark Data.Array.Generic
440647 import: bench-options
441648 type: exitcode-stdio-1.0
442− hs-source-dirs: .
443− main-is: Streamly/Benchmark/Data/Array.hs
444− other-modules: Streamly.Benchmark.Data.ArrayOps
445− cpp-options: -DDATA_ARRAY
649+ hs-source-dirs: ., Streamly/Benchmark/Data
650+ main-is: Streamly/Benchmark/Data/Array/Generic.hs
651+ other-modules:
652+ Stream.Common
653+ if flag(use-streamly-core)
654+ buildable: False
655+ else
656+ buildable: True
657+ if flag(limit-build-mem)
658+ ghc-options: +RTS -M1000M -RTS
446659
447−benchmark Data.Array.Prim
660+benchmark Data.SmallArray
448661 import: bench-options
449662 type: exitcode-stdio-1.0
450− hs-source-dirs: .
451− main-is: Streamly/Benchmark/Data/Array.hs
452− other-modules: Streamly.Benchmark.Data.ArrayOps
453− cpp-options: -DDATA_ARRAY_PRIM
454− build-depends: primitive
663+ main-is: Streamly/Benchmark/Data/Array/SmallArray.hs
664+ if flag(dev) && !flag(use-streamly-core)
665+ buildable: True
666+ else
667+ buildable: False
455668
456−benchmark Data.SmallArray
669+benchmark Data.Array
457670 import: bench-options
458671 type: exitcode-stdio-1.0
459− hs-source-dirs: .
672+ hs-source-dirs: ., Streamly/Benchmark/Data
460673 main-is: Streamly/Benchmark/Data/Array.hs
461− other-modules: Streamly.Benchmark.Data.ArrayOps
462− cpp-options: -DDATA_SMALLARRAY
674+ other-modules:
675+ Stream.Common
676+ if flag(use-streamly-core)
677+ buildable: False
678+ else
679+ buildable: True
680+ if flag(limit-build-mem)
681+ ghc-options: +RTS -M1500M -RTS
463682
464−benchmark Data.Array.Prim.Pinned
683+benchmark Data.MutArray
465684 import: bench-options
466685 type: exitcode-stdio-1.0
467− hs-source-dirs: .
468− main-is: Streamly/Benchmark/Data/Array.hs
469− other-modules: Streamly.Benchmark.Data.ArrayOps
470− cpp-options: -DDATA_ARRAY_PRIM_PINNED
686+ main-is: Streamly/Benchmark/Data/MutArray.hs
687+ if flag(limit-build-mem)
688+ ghc-options: +RTS -M1500M -RTS
689+ if flag(use-streamly-core)
690+ buildable: False
691+ else
692+ buildable: True
693+
694+-------------------------------------------------------------------------------
695+-- Ring Benchmarks
696+-------------------------------------------------------------------------------
471697
472−benchmark Data.Array.Foreign
698+benchmark Data.Ring.Unboxed
473699 import: bench-options
474700 type: exitcode-stdio-1.0
475− hs-source-dirs: .
476− main-is: Streamly/Benchmark/Data/Array.hs
477− other-modules: Streamly.Benchmark.Data.ArrayOps
478− cpp-options: -DMEMORY_ARRAY
701+ main-is: Streamly/Benchmark/Data/Ring/Unboxed.hs
479702 if flag(limit-build-mem)
480− ghc-options: +RTS -M750M -RTS
703+ ghc-options: +RTS -M1500M -RTS
481704
482705-------------------------------------------------------------------------------
483706-- Array Stream Benchmarks
484707-------------------------------------------------------------------------------
485708
486−benchmark Data.Array.Stream.Foreign
709+benchmark Data.Array.Stream
487710 import: bench-options
488711 type: exitcode-stdio-1.0
489− hs-source-dirs: Streamly/Benchmark/Data/Array/Stream
490− main-is: Foreign.hs
491− if impl(ghcjs)
712+ hs-source-dirs: Streamly/Benchmark/Data/Array
713+ main-is: Stream.hs
714+ if flag(use-streamly-core) || impl(ghcjs)
492715 buildable: False
493716 else
494717 buildable: True
@@ -506,6 +729,12 @@ benchmark FileSystem.Handle
506729 other-modules:
507730 Handle.Read
508731 , Handle.ReadWrite
732+ if flag(limit-build-mem)
733+ ghc-options: +RTS -M1000M -RTS
734+ if flag(use-streamly-core)
735+ buildable: False
736+ else
737+ buildable: True
509738
510739-------------------------------------------------------------------------------
511740-- Unicode Benchmarks
@@ -516,6 +745,12 @@ benchmark Unicode.Stream
516745 type: exitcode-stdio-1.0
517746 hs-source-dirs: Streamly/Benchmark/Unicode
518747 main-is: Stream.hs
748+ if flag(limit-build-mem)
749+ ghc-options: +RTS -M1000M -RTS
750+ if flag(use-streamly-core)
751+ buildable: False
752+ else
753+ buildable: True
519754
520755benchmark Unicode.Char
521756 import: bench-options
@@ -523,11 +758,21 @@ benchmark Unicode.Char
523758 hs-source-dirs: Streamly/Benchmark/Unicode
524759 main-is: Char.hs
525760 -- Takes too much memory for ghcjs
526− if impl(ghcjs)
527− buildable: false
761+ if flag(use-streamly-core) || impl(ghcjs)
762+ buildable: False
528763
529764benchmark Unicode.Utf8
530765 import: bench-options
531766 type: exitcode-stdio-1.0
532767 hs-source-dirs: Streamly/Benchmark/Unicode
533768 main-is: Utf8.hs
769+ if flag(use-streamly-core)
770+ buildable: False
771+ else
772+ buildable: True
773+
774+benchmark Unicode.Parser
775+ import: bench-options
776+ type: exitcode-stdio-1.0
777+ hs-source-dirs: Streamly/Benchmark/Unicode
778+ main-is: Parser.hs
bin/bench-config.shdeleted−160
@@ -1,160 +0,0 @@
1−#!/usr/bin/env bash
2−
3−BENCH_CONFIG_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" &> /dev/null && pwd)"
4−source $BENCH_CONFIG_DIR/targets.sh \
5− || { echo "Cannot source $BENCH_CONFIG_DIR/targets.sh"; exit 1; }
6−
7−# Customization options
8−bench_config () {
9− BENCH_REPORT_DIR=benchmark/bench-report
10− BENCHMARK_PACKAGE_NAME=streamly-benchmarks
11− BENCHMARK_PACKAGE_VERSION=0.0.0
12−
13− USE_GAUGE=0
14− DEFAULT_FIELDS="allocated cputime bytescopied"
15−}
16−
17−#------------------------------------------------------------------------------
18−# benchmark groups
19−#------------------------------------------------------------------------------
20−
21−bench_targets () {
22− targets
23−}
24−
25−#------------------------------------------------------------------------------
26−# RTS options based on the benchmark executable name and benchmark name
27−#------------------------------------------------------------------------------
28−
29−bench_rts_options () {
30− local exe_name
31− local bench_name
32−
33− exe_name="$1"
34− bench_name="$2"
35−
36− # Based on benchmark class
37− case "$bench_name" in
38− */o-1-sp*) echo -n "-K36K -M16M" ;;
39− */o-n-h*) echo -n "-K36K -M32M" ;;
40− */o-n-st*) echo -n "-K1M -M16M" ;;
41− */o-n-sp*) echo -n "-K1M -M32M" ;;
42− *) echo -n "" ;;
43− esac
44−
45− echo -n " "
46− case "$exe_name" in
47− Prelude.Concurrent*) echo -n "-K256K -M384M" ;;
48− *) echo -n "" ;;
49− esac
50−
51− echo -n " "
52− # Based on specific benchmark
53− # XXX Note: for tasty-bench we replace the "." separator in the benchmark names
54− # with "/" for matching with this. It may not work reliably if the benchmark
55− # name already contains ".".
56− case "$bench_name" in
57− Data.Stream.StreamD/o-n-space/elimination/toList) echo -n "-K2M" ;;
58− Data.Stream.StreamK/o-n-space/elimination/toList) echo -n "-K2M" ;;
59−
60− Prelude.Parallel/o-n-heap/mapping/mapM) echo -n "-M256M" ;;
61− Prelude.Parallel/o-n-heap/monad-outer-product/*) echo -n "-M256M" ;;
62− Prelude.Parallel/o-n-space/monad-outer-product/*) echo -n "-K4M -M256M" ;;
63−
64− Prelude.Rate/o-1-space/*) echo -n "-K128K" ;;
65− Prelude.Rate/o-1-space/asyncly/*) echo -n "-K128K" ;;
66−
67− # XXX For GHC-9.0
68− Prelude.Serial/o-1-space/mixed/sum-product-fold) echo -n "-K64M" ;;
69−
70− # XXX These should be moved to o-n-space?
71− Prelude.Serial/o-n-heap/grouping/classifySessionsOf) echo -n "-K1M -M32M" ;;
72− Prelude.Serial/o-n-heap/Functor/*) echo -n "-K4M -M32M" ;;
73− Prelude.Serial/o-n-heap/transformer/*) echo -n "-K8M -M64M" ;;
74−
75− Prelude.Serial/o-n-space/Functor/*) echo -n "-K4M -M64M" ;;
76− Prelude.Serial/o-n-space/Applicative/*) echo -n "-K8M -M128M" ;;
77− Prelude.Serial/o-n-space/Monad/*) echo -n "-K8M -M64M" ;;
78−
79− # Use -K4M for o-n-space except for grouping
80− Prelude.Serial/o-n-space/grouping/*) echo -n "" ;;
81− Prelude.Serial/o-n-space/*) echo -n "-K4M" ;;
82−
83− Prelude.WSerial/o-n-space/*) echo -n "-K4M" ;;
84−
85− Prelude.Async/o-n-space/monad-outer-product/*) echo -n "-K4M" ;;
86− Prelude.Ahead/o-n-space/monad-outer-product/*) echo -n "-K4M" ;;
87− Prelude.Ahead/o-1-space/*) echo -n "-K128K" ;;
88−
89− Prelude.WAsync/o-n-heap/monad-outer-product/toNull3) echo -n "-M64M" ;;
90− Prelude.WAsync/o-n-space/monad-outer-product/*) echo -n "-K4M" ;;
91−
92− # XXX need to investigate these, taking too much stack
93− Data.Parser.ParserD/o-1-space/some) echo -n "-K8M" ;;
94− Data.Parser/o-1-space/some) echo -n "-K8M" ;;
95− Data.Parser.ParserD/o-1-space/manyTill) echo -n "-K4M" ;;
96− Data.Parser/o-1-space/manyTill) echo -n "-K4M" ;;
97− Data.Parser/o-n-heap/manyAlt) echo -n "-K4M -M128M" ;;
98− Data.Parser/o-n-heap/someAlt) echo -n "-K4M -M128M" ;;
99− Data.Parser/o-n-heap/choice) echo -n "-K16M -M32M" ;;
100− Data.Parser.ParserK/o-n-heap/manyAlt) echo -n "-K4M -M128M" ;;
101− Data.Parser.ParserK/o-n-heap/someAlt) echo -n "-K4M -M128M" ;;
102− Data.Parser.ParserK/o-n-heap/sequence) echo -n "-M64M";;
103− Data.Parser.ParserK/o-n-heap/sequenceA) echo -n "-M64M";;
104−
105− Data.SmallArray/o-1-sp*) echo -n "-K128K" ;;
106− # For tasty-bench
107− Data.Array*/o-1-space/generation/show) echo -n "-M32M" ;;
108− # XXX For GHC-8.10
109− Data.Array/o-1-space/transformationX4/map) echo -n "-M32M" ;;
110− # DEVBUILD only benchmarks - array foldable instance
111− Data.Array.Foreign/o-1-space/elimination/foldable/foldl*) echo -n "-K8M" ;;
112− Data.Array.Foreign/o-1-space/elimination/foldable/sum) echo -n "-K8M" ;;
113− *) echo -n "" ;;
114− esac
115−}
116−
117−#------------------------------------------------------------------------------
118−# Speed options
119−#------------------------------------------------------------------------------
120−
121−bench_speed_options () {
122− local exe_name
123− local bench_name
124−
125− exe_name="$1"
126− bench_name="$2"
127−
128− case "$exe_name" in
129− Prelude.Concurrent) set_super_quick_mode ;;
130− Prelude.Rate) set_super_quick_mode ;;
131− Prelude.Adaptive) set_super_quick_mode;;
132− *) echo -n "" ;;
133− esac
134−
135− # XXX Note: for tasty-bench we replace the "." separator in the benchmark names
136− # with "/" for matching with this. It may not work reliably if the benchmark
137− # name already contains ".".
138−
139− # Use quick options for benchmarks that take too long
140− case "$bench_name" in
141− Prelude.Parallel/o-n-heap/mapping/mapM) set_super_quick_mode ;;
142− Prelude.Parallel/o-n-heap/monad-outer-product/*) set_super_quick_mode ;;
143− Prelude.Parallel/o-n-space/monad-outer-product/*) set_super_quick_mode ;;
144− Prelude.Parallel/o-n-heap/generation/*) use_quicker_mode ;;
145− Prelude.Parallel/o-n-heap/mapping/*) use_quicker_mode ;;
146− Prelude.Parallel/o-n-heap/concat-foldable/*) use_quicker_mode ;;
147−
148− Prelude.Async/o-1-space/monad-outer-product/*) use_quicker_mode ;;
149− Prelude.Async/o-n-space/monad-outer-product/*) use_quicker_mode ;;
150−
151− Prelude.Ahead/o-1-space/monad-outer-product/*) use_quicker_mode ;;
152− Prelude.Ahead/o-n-space/monad-outer-product/*) use_quicker_mode ;;
153−
154− Prelude.WAsync/o-n-heap/monad-outer-product/*) use_quicker_mode ;;
155− Prelude.WAsync/o-n-space/monad-outer-product/*) use_quicker_mode ;;
156−
157− FileSystem.Handle/*) use_quicker_mode ;;
158− *) echo -n "" ;;
159− esac
160−}
bin/bench.shdeleted−15
@@ -1,15 +0,0 @@
1−#!/usr/bin/env bash
2−
3−SCRIPT_DIR=$(cd `dirname $0`; pwd)
4−source $SCRIPT_DIR/bench-config.sh \
5− || { echo "Cannot source $SCRIPT_DIR/bench-config.sh"; exit 1; }
6−
7−bench_config
8−if test -z "$BENCH_REPORT_DIR"
9−then
10− echo "BENCH_REPORT_DIR variable not defined by bench-config() in $SCRIPT_DIR/bench-config.sh"
11− exit 1
12−fi
13−
14−cd $SCRIPT_DIR/..
15−$BENCH_REPORT_DIR/bin/bench-runner.sh --config $SCRIPT_DIR/bench-config.sh "$@"
bin/mk-hscope.sh+1−1
@@ -1,7 +1,7 @@
11#!/usr/bin/env bash
22
33GHC_VERSION=8.10.4
4−STREAMLY_VERSION=0.8.0
4+STREAMLY_VERSION=0.9.0
55
66case `uname` in
77 Darwin) SYSTEM=x86_64-osx;;
bin/replnew file+3
@@ -0,0 +1,3 @@
1+#!/bin/bash
2+
3+cabal repl --project-file cabal.project.O0
bin/run-ci.sh+45−36
@@ -10,7 +10,6 @@
1010
1111SCRIPT_DIR=$(cd "$(dirname "$0")" || exit; pwd)
1212SCRIPT_NAME=$(basename "$0")
13−source "$SCRIPT_DIR/../benchmark/bench-report/bin/build-lib.sh"
1413
1514CABAL_BUILD_OPTIONS="--flag limit-build-mem"
1615
@@ -19,32 +18,36 @@ CABAL_BUILD_OPTIONS="--flag limit-build-mem"
1918#------------------------------------------------------------------------------
2019
2120# XXX take these from command line
22−GHC_PRIME_NIX="ghc8104"
23−GHC_PRIME_VER="8.10"
21+GHC_PRIME_NIX="ghc922"
22+GHC_PRIME_VER="9.2.2"
2423JOBS=1
2524
2625# Without cabal project file, it will not run any tests
26+# XXX Added DISABLE_SDIST_BUILD because of a cabal issue, need to remove it
2727ghc_prime_dist () {
2828 nix-shell \
2929 --argstr compiler "$GHC_PRIME_NIX" \
3030 --run "\
3131 packcheck.sh cabal-v2 \
3232 GHCVER=$GHC_PRIME_VER \
33− CABAL_BUILD_OPTIONS="$CABAL_BUILD_OPTIONS --jobs=$JOBS" \
33+ CABAL_BUILD_OPTIONS=\"$CABAL_BUILD_OPTIONS --jobs=$JOBS\" \
3434 CABAL_DISABLE_DEPS=y \
35+ DISABLE_SDIST_BUILD=y \
3536 CABAL_CHECK_RELAX=y"
3637}
3738
3839# With cabal.project file, it will run the tests
40+# XXX Added DISABLE_SDIST_BUILD because of a cabal issue, need to remove it
3941ghc_prime_dist_tests () {
4042 nix-shell \
4143 --argstr compiler "$GHC_PRIME_NIX" \
4244 --run "\
4345 packcheck.sh cabal-v2 \
4446 GHCVER=$GHC_PRIME_VER \
45− CABAL_BUILD_OPTIONS="$CABAL_BUILD_OPTIONS --jobs=$JOBS" \
47+ CABAL_BUILD_OPTIONS=\"$CABAL_BUILD_OPTIONS --jobs=$JOBS\" \
4648 CABAL_PROJECT=cabal.project \
4749 CABAL_DISABLE_DEPS=y \
50+ DISABLE_SDIST_BUILD=y \
4851 CABAL_CHECK_RELAX=y"
4952}
5053
@@ -55,7 +58,7 @@ ghc_prime_dist_tests_stack () {
5558 --run "\
5659 packcheck.sh stack \
5760 GHCVER=$GHC_PRIME_VER \
58− STACK_BUILD_OPTIONS="--jobs $JOBS --system-ghc" \
61+ STACK_BUILD_OPTIONS=\"--jobs $JOBS --system-ghc\" \
5962 STACK_YAML=stack.yaml"
6063}
6164
@@ -69,9 +72,9 @@ ghc_prime_perf () {
6972 --argstr compiler "$GHC_PRIME_NIX" \
7073 --argstr c2nix "--flag inspection" \
7174 --run "\
72− bin/test.sh --cabal-build-options \
75+ bin/test-runner --cabal-build-options \
7376 \"--jobs=$JOBS --project-file cabal.project.Werror $PERF_FLAGS\";\
74− bin/bench.sh --cabal-build-options \
77+ bin/bench-runner --cabal-build-options \
7578 \"--jobs=$JOBS --project-file cabal.project.Werror $PERF_FLAGS\" \
7679 --quick --raw;"
7780}
@@ -80,7 +83,7 @@ ghc_prime_O0 () {
8083 nix-shell \
8184 --argstr compiler "$GHC_PRIME_NIX" \
8285 --run "\
83− bin/test.sh --cabal-build-options \
86+ bin/test-runner --cabal-build-options \
8487 \"--jobs=$JOBS --project-file cabal.project.O0\""
8588}
8689
@@ -91,7 +94,7 @@ ghc_prime_O0 () {
9194# XXX avoid rebuilding if nothing has changed in the source
9295# XXX run hlint only on changed files
9396lint () {
94− packcheck cabal \
97+ packcheck.sh cabal \
9598 HLINT_OPTIONS="lint --cpp-include=src --cpp-include=test" \
9699 HLINT_TARGETS="src test benchmark"
97100}
@@ -105,14 +108,13 @@ werror () {
105108ghc_prime_Werror () {
106109 nix-shell \
107110 --argstr compiler "$GHC_PRIME_NIX" \
108− --run "cabal build $CABAL_BUILD_OPTIONS --jobs=$JOBS --project-file cabal.project.Werror all"
111+ --run "cabal build $CABAL_BUILD_OPTIONS --jobs=$JOBS --project-file cabal.project.Werror --enable-tests --enable-benchmarks all"
109112}
110113
111114ghc_prime_doctests () {
112115 nix-shell \
113116 --argstr compiler "$GHC_PRIME_NIX" \
114− --run "cabal build $CABAL_BUILD_OPTIONS --jobs=$JOBS --project-file cabal.project.doctest all"
115− cabal-docspec --timeout 60
117+ --run "cabal build $CABAL_BUILD_OPTIONS --jobs=$JOBS --project-file cabal.project.doctest all && cabal-docspec --timeout 60"
116118}
117119
118120#------------------------------------------------------------------------------
@@ -125,39 +127,33 @@ ghc_prime_doctests () {
125127ghc_prime_coverage () {
126128 nix-shell \
127129 --argstr compiler "$GHC_PRIME_NIX" \
128− --run "bin/test.sh --cabal-build-options \"--jobs=$JOBS\" --coverage"
130+ --run "bin/test-runner --cabal-build-options \"--jobs=$JOBS\" --coverage"
129131}
130132
131133#------------------------------------------------------------------------------
132134# Flags
133135#------------------------------------------------------------------------------
134136
135−ghc_prime_dev_perf () {
137+ghc_prime_dev_test () {
136138 nix-shell \
137139 --argstr compiler "$GHC_PRIME_NIX" \
138140 --run "\
139− bin/test.sh --cabal-build-options \
140− \"--jobs=$JOBS --flag dev\";\
141− bin/bench.sh --cabal-build-options \
142− \"--jobs=$JOBS --flag dev $PERF_FLAGS\" --quick --raw"
141+ bin/test-runner --cabal-build-options \
142+ \"--jobs=$JOBS --flag dev\""
143143}
144144
145−ghc_prime_c_malloc () {
145+ghc_prime_dev_perf () {
146146 nix-shell \
147147 --argstr compiler "$GHC_PRIME_NIX" \
148− --run "bin/test.sh --cabal-build-options \"--jobs=$JOBS --flag use-c-malloc\""
148+ --run "\
149+ bin/bench-runner --cabal-build-options \
150+ \"--jobs=$JOBS --flag dev $PERF_FLAGS\" --quick --raw"
149151}
150152
151153ghc_prime_debug () {
152154 nix-shell \
153155 --argstr compiler "$GHC_PRIME_NIX" \
154− --run "bin/test.sh --cabal-build-options \"--jobs=$JOBS --flag debug\""
155−}
156−
157−ghc_prime_streamk () {
158− nix-shell \
159− --argstr compiler "$GHC_PRIME_NIX" \
160− --run "bin/test.sh --cabal-build-options \"--jobs=$JOBS --flag streamk\""
156+ --run "bin/test-runner --cabal-build-options \"--jobs=$JOBS --flag debug\""
161157}
162158
163159#------------------------------------------------------------------------------
@@ -173,7 +169,7 @@ ghc () {
173169 --run "\
174170 packcheck.sh cabal-v2 \
175171 GHCVER=$2 \
176− CABAL_BUILD_OPTIONS="$CABAL_BUILD_OPTIONS --jobs=$JOBS" \
172+ CABAL_BUILD_OPTIONS=\"$CABAL_BUILD_OPTIONS --jobs=$JOBS\" \
177173 CABAL_DISABLE_DEPS=y \
178174 CABAL_CHECK_RELAX=y \
179175 DISABLE_SDIST_BUILD=y \
@@ -204,11 +200,15 @@ ghcHEAD () {
204200# ghcjs
205201#------------------------------------------------------------------------------
206202
203+# Use the following nix expression for ghcjs
204+# nix-env -f https://github.com/composewell/nixpkgs/archive/refs/tags/22.05-composewell.tar.gz -iA pkgs.haskell.compiler.ghcjs
207205ghcjs () {
208− export PATH=~/.local/bin:/opt/ghc/bin:/opt/ghcjs/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:$PATH
206+ # We don't pass 'CABAL_BUILD_OPTIONS="--flag limit-build-mem"' here as
207+ # ghcjs requires more memory to build. Adding a conditional for ghcjs in
208+ # the cabal file is a maintainence overhead.
209209 packcheck.sh cabal-v2 \
210− GHCVER=8.4.0 \
211− CABAL_BUILD_OPTIONS="$CABAL_BUILD_OPTIONS --jobs=$JOBS" \
210+ GHCVER=8.10.7 \
211+ CABAL_BUILD_OPTIONS="--jobs=$JOBS" \
212212 CABAL_CHECK_RELAX=y \
213213 DISABLE_SDIST_BUILD=y \
214214 DISABLE_TEST=y \
@@ -223,21 +223,19 @@ ghcjs () {
223223RELEASE_CI_TARGETS="\
224224ghc_prime_dist \
225225ghc_prime_dist_tests \
226+ghc_prime_dev_test \
226227ghc_prime_perf \
227228ghc_prime_O0 \
228229ghc_prime_Werror \
229230ghc_prime_doctests \
230231ghc_prime_coverage \
231−ghc_prime_c_malloc \
232232ghc_prime_debug \
233−ghc_prime_streamk \
234233ghc901 \
235234ghc884 \
236235ghcjs \
237236lint"
238237
239−# XXX We should include dev as well but it has some test and benchmark
240−# failures to be fixed.
238+# XXX Include flaky tests flag in manual tests
241239ALL_TARGETS="\
242240$RELEASE_CI_TARGETS \
243241ghc_prime_dist_tests_stack \
@@ -290,6 +288,17 @@ else
290288 fi
291289fi
292290
291+has_item () {
292+ for i in $1
293+ do
294+ if test "$i" = "$2"
295+ then
296+ echo "$i"
297+ break
298+ fi
299+ done
300+}
301+
293302for i in $TARGETS
294303do
295304 if test "$(has_item "$ALL_TARGETS" "$i")" != "$i"
bin/run-repl-quick.shnew file+113
@@ -0,0 +1,113 @@
1+#!/usr/bin/env bash
2+
3+# XXX Having a repl-ish option on packcheck can be very useful for quick type
4+# checking. Running that in a loop in a smart way will work like ghcid.
5+
6+# The idea is to have an extremely light version of run-ci.sh
7+# This can be very helpful on any refactoring change.
8+
9+# This script should be majorly improved but it solves my use case for the time
10+# being.
11+
12+set -e
13+
14+SCRIPT_DIR=$(dirname $0)
15+
16+STREAMLY_VERSION=0.9.0
17+BENCH_REPORT_DIR=benchmark/bench-report
18+source $SCRIPT_DIR/targets.sh
19+
20+#------------------------------------------------------------------------------
21+# Script
22+#------------------------------------------------------------------------------
23+
24+print_help () {
25+ echo "Usage: $0"
26+ echo
27+ echo "Very dumb script."
28+ echo "Currently runs everything in the repl and exits."
29+ echo "Useful for type checking and displaying warnings."
30+ echo
31+ exit
32+}
33+
34+#------------------------------------------------------------------------------
35+# Helper functions
36+#------------------------------------------------------------------------------
37+
38+run_build_repl () {
39+ local prefix=$1
40+ local targets=$2
41+ local COMPONENTS
42+ local c
43+
44+ for c in $targets
45+ do
46+ CABAL_BUILD_OPTIONS=$(dev_build "--flag dev")
47+ echo "|--------------------------------------------------------------------"
48+ echo "|" $CABAL_EXECUTABLE repl "$prefix:$c" $CABAL_BUILD_OPTIONS <<< :q
49+ echo "|--------------------------------------------------------------------"
50+ run_verbose $CABAL_EXECUTABLE repl "$prefix:$c" $CABAL_BUILD_OPTIONS <<< :q
51+ done
52+}
53+
54+#------------------------------------------------------------------------------
55+# Setup
56+#------------------------------------------------------------------------------
57+
58+source $BENCH_REPORT_DIR/bin/build-lib.sh
59+
60+USE_GIT_CABAL=0
61+set_common_vars
62+
63+#------------------------------------------------------------------------------
64+# Library
65+#------------------------------------------------------------------------------
66+
67+# XXX Ideally run for all the valid flag combinations
68+CABAL_BUILD_OPTIONS=""
69+run_verbose $CABAL_EXECUTABLE repl $CABAL_BUILD_OPTIONS <<< :q
70+
71+CABAL_BUILD_OPTIONS="--flag dev"
72+run_verbose $CABAL_EXECUTABLE repl $CABAL_BUILD_OPTIONS <<< :q
73+
74+CABAL_BUILD_OPTIONS="--flag streamk"
75+run_verbose $CABAL_EXECUTABLE repl $CABAL_BUILD_OPTIONS <<< :q
76+
77+CABAL_BUILD_OPTIONS="--flag use-c-malloc"
78+run_verbose $CABAL_EXECUTABLE repl $CABAL_BUILD_OPTIONS <<< :q
79+
80+#------------------------------------------------------------------------------
81+# Benchmarks
82+#------------------------------------------------------------------------------
83+
84+RUNNING_BENCHMARKS=y
85+RUNNING_TESTS=
86+
87+RUNNING_DEVBUILD=
88+targets
89+TARGETS="$(all_grp)"
90+run_build_repl "bench" "$TARGETS"
91+
92+
93+RUNNING_DEVBUILD=y
94+targets
95+TARGETS="$(all_grp)"
96+run_build_repl "bench" "$TARGETS"
97+
98+#------------------------------------------------------------------------------
99+# Tests
100+#------------------------------------------------------------------------------
101+
102+RUNNING_TESTS=y
103+RUNNING_BENCHMARKS=
104+
105+RUNNING_DEVBUILD=
106+targets
107+TARGETS="$(all_grp)"
108+run_build_repl "test" "$TARGETS"
109+
110+RUNNING_DEVBUILD=y
111+targets
112+TARGETS="$(all_grp)"
113+run_build_repl "test" "$TARGETS"
bin/targets.shdeleted−120
@@ -1,120 +0,0 @@
1−#------------------------------------------------------------------------------
2−# test and benchmark groups
3−#------------------------------------------------------------------------------
4−
5−# Depends on RUNNING_TESTS, RUNNING_BENCHMARKS, RUNNING_DEVBUILD variables
6−# being set for dev_build, test_only, bench_only functions to work. So the
7−# "targets" fucntion should be called only after these are set.
8−
9−# IMPORTANT NOTE: the names "_grp" and "_cmp" suffixes are special, do
10−# not rename them to something else.
11−
12−targets () {
13− base_stream_grp="\
14− `bench_only Data.Stream.StreamD` \
15− `bench_only Data.Stream.StreamK` \
16− `bench_only Data.Stream.StreamDK`"
17−
18− prelude_serial_grp="\
19− Prelude.Serial \
20− Prelude.WSerial \
21− Prelude.ZipSerial"
22−
23− prelude_concurrent_grp="\
24− Prelude.Async \
25− Prelude.WAsync \
26− Prelude.Ahead \
27− Prelude.Parallel \
28− Prelude.ZipAsync"
29−
30− prelude_other_grp="\
31− `test_only Prelude` \
32− $(test_only $(dev_build Prelude.Rate)) \
33− `bench_only Prelude.Rate` \
34− `test_only Prelude.Fold` \
35− `test_only Prelude.Concurrent` \
36− $(bench_only $(dev_build Prelude.Concurrent)) \
37− `bench_only Prelude.Adaptive`"
38−
39− array_grp="\
40− Data.Array \
41− Data.Array.Foreign \
42− Data.Array.Prim \
43− Data.SmallArray \
44− Data.Array.Prim.Pinned"
45−
46− base_parser_grp="\
47− Data.Parser.ParserD \
48− `bench_only Data.Parser.ParserK`"
49−
50− parser_grp="\
51− Data.Fold \
52− Data.Parser"
53−
54− list_grp="\
55− `test_only Data.List.Base` \
56− `test_only Data.List`"
57−
58− #------------------------------------------------------------------------------
59− # Streaming vs non-streaming
60− #------------------------------------------------------------------------------
61− # The "o-1-space" groups of these benchmarks are run with long stream
62− # sizes when --long option is used.
63−
64− infinite_grp="\
65− $prelude_serial_grp \
66− $prelude_concurrent_grp \
67− `bench_only Prelude.Rate`"
68−
69− #------------------------------------------------------------------------------
70− # Benchmark comparison groups
71− #------------------------------------------------------------------------------
72−
73− # *_cmp denotes a comparison benchmark, the benchmarks provided in *_cmp
74− # variables are compared with each other
75− base_stream_cmp="Data.Stream.StreamD Data.Stream.StreamK"
76− serial_wserial_cmp="Prelude.Serial Prelude.WSerial"
77− serial_async_cmp="Prelude.Serial Prelude.Async"
78− concurrent_cmp="Prelude.Async Prelude.WAsync Prelude.Ahead Prelude.Parallel"
79− array_cmp="Data.Array.Foreign Data.Array.Prim Data.Array Data.Array.Prim.Pinned"
80− pinned_array_cmp="Data.Array.Foreign Data.Array.Prim.Pinned"
81− base_parser_cmp=$base_parser_grp
82−
83− COMPARISONS="\
84− base_stream_cmp \
85− serial_wserial_cmp \
86− serial_async_cmp \
87− concurrent_cmp \
88− array_cmp \
89− pinned_array_cmp \
90− base_parser_cmp"
91−
92− #------------------------------------------------------------------------------
93− # All test/benchmark modules must be in at least one of these
94− #------------------------------------------------------------------------------
95−
96− # All groups
97− GROUP_TARGETS="\
98− base_stream_grp \
99− prelude_serial_grp \
100− prelude_concurrent_grp \
101− prelude_other_grp \
102− array_grp \
103− base_parser_grp \
104− parser_grp \
105− list_grp \
106− infinite_grp"
107−
108− # Not in any groups
109− INDIVIDUAL_TARGETS="\
110− Data.Unfold \
111− Unicode.Stream \
112− $(test_only $(dev_build Unicode.Char)) \
113− `bench_only Unicode.Char` \
114− `bench_only Unicode.Utf8` \
115− FileSystem.Handle \
116− `test_only FileSystem.Event` \
117− `test_only Network.Socket` \
118− `test_only Network.Inet.TCP` \
119− `test_only version-bounds`"
120−}
bin/test.shdeleted−244
@@ -1,244 +0,0 @@
1−#!/usr/bin/env bash
2−
3−SCRIPT_DIR=$(dirname $0)
4−
5−STREAMLY_VERSION=0.8.0
6−BENCH_REPORT_DIR=benchmark/bench-report
7−source $SCRIPT_DIR/targets.sh
8−
9−#------------------------------------------------------------------------------
10−# Script
11−#------------------------------------------------------------------------------
12−
13−print_help () {
14− echo "Usage: $0 "
15− echo " [--targets <"target1 target2 ..." | help>]"
16− echo
17− echo " [--quick]"
18− echo " [--with-compiler <compiler exe name>]"
19− echo " [--cabal-build-options <option>]"
20− echo " [--dev-build]"
21− echo
22− echo " [--coverage]"
23− echo " [--hpc-report-options <option>]"
24− echo " [--no-measure]"
25− echo " [--raw]"
26− echo
27− echo " [--rtsopts <option>]"
28− echo " -- <hspec options or test names>"
29− echo
30− echo "--targets: targets to run, use 'help' for list of targets"
31− echo
32− echo "--quick: disable optimizations to build quickly"
33− echo "--cabal-build-options: Pass any cabal build options to be used for build"
34− echo "--dev-build: runs some additional tests"
35− echo
36− echo "--coverage: enable coverage and report coverage info"
37− echo "--hpc-report-options: option for 'hpc report'"
38− echo "--no-measure: with --coverage, do not run tests, only show coverage info"
39− echo "--raw: with --coverage, do not run hpc"
40− echo
41− echo "--rtsopts: pass GHC RTS options to the test executable"
42− echo "Any arguments after a '--' are passed directly to hspec"
43− exit
44−}
45−
46−#-----------------------------------------------------------------------------
47−# Read command line
48−#-----------------------------------------------------------------------------
49−
50−RUNNING_TESTS=y
51−source $BENCH_REPORT_DIR/bin/build-lib.sh
52−
53−USE_GIT_CABAL=1
54−set_common_vars
55−COVERAGE=0
56−MEASURE=1
57−HPC_REPORT_OPTIONS=
58−RAW=0
59−CABAL_BUILD_OPTIONS="--flag limit-build-mem"
60−
61−# XXX add a bisect option
62−while test -n "$1"
63−do
64− case $1 in
65− -h|--help|help) print_help ;;
66− # options with arguments
67− --targets) shift; TARGETS=$1; shift ;;
68− --with-compiler) shift; CABAL_WITH_COMPILER=$1; shift ;;
69− --cabal-build-options) shift; CABAL_BUILD_OPTIONS+=" $1"; shift ;;
70− --hpc-report-options) shift; HPC_REPORT_OPTIONS="$1"; shift ;;
71− --rtsopts) shift; RTS_OPTIONS="$1"; shift ;;
72− # flags
73− --raw) RAW=1; shift ;;
74− #--slow) SLOW=1; shift ;; # not implemented
75− --quick) TEST_QUICK_MODE=1; shift ;;
76− --dev-build) RUNNING_DEVBUILD=1 CABAL_BUILD_OPTIONS+=" --flag dev"; shift ;;
77− --coverage) COVERAGE=1; shift ;;
78− --no-measure) MEASURE=0; shift ;;
79− --) shift; break ;;
80− -*|--*) echo "Unknown flags: $*"; echo; print_help ;;
81− *) break ;;
82− esac
83−done
84−TARGET_EXE_ARGS=$*
85−
86−set_derived_vars
87−
88−if test "$TEST_QUICK_MODE" -eq 1
89−then
90− CABAL_BUILD_OPTIONS+=" --disable-optimization --flags -opt"
91−fi
92−
93−#-----------------------------------------------------------------------------
94−# Determine targets
95−#-----------------------------------------------------------------------------
96−
97−# Defined in targets.sh
98−targets
99−
100−if test "$(has_item "$TARGETS" help)" = "help"
101−then
102− list_target_groups
103− list_targets
104− exit
105−fi
106−
107−DEFAULT_TARGETS="$(all_grp)"
108−TARGETS=$(set_targets)
109−
110−echo "Using targets [$TARGETS]"
111−
112−#-----------------------------------------------------------------------------
113−# Build targets
114−#-----------------------------------------------------------------------------
115−
116−test_exe_rts_opts () {
117− case "$1" in
118− # XXX Data.Array.* heap requirement increased for GHC-8.10
119− Data.Array.Foreign) echo -n "-M128M" ;;
120− Data.Array.Prim) echo -n "-M128M" ;;
121− Data.Array.Prim.Pinned) echo -n "-M128M" ;;
122− Prelude.Rate) echo -n "-M512M" ;;
123− # For -O0 case writeChunks test fails, maybe we should have a separate flag
124− # for O0 case?
125− FileSystem.Handle) echo -n "-K16M" ;;
126− *) if test "$COVERAGE" -eq "1"
127− then
128− echo -n "-K8M -M1024M"
129− else
130− echo -n "-K8M -M64M"
131− fi ;;
132− esac
133−}
134−
135−# $1: bench name
136−# $2: bench executable
137−target_exe_extra_args () {
138− local bench_name=$1
139− local bench_prog=$2
140−
141− echo "+RTS \
142− $(test_exe_rts_opts $(basename $bench_prog)) \
143− $RTS_OPTIONS \
144− -RTS"
145−}
146−
147−if test "$COVERAGE" -eq "1"
148−then
149− # Used to determine the hpc tix dir
150− PACKAGE_FULL_NAME=streamly-$STREAMLY_VERSION
151− case `uname` in
152− Linux) SYSTEM=x86_64-linux ;;
153− *) echo "Unsupported system"; exit 1 ;;
154− esac
155−
156− # With the --enable-coverage option the tests as well as the library get
157− # compiled with -fhpc, and we get coverage for tests as well. But we want to
158− # exclude that, so a project file is needed.
159− CABAL_BUILD_OPTIONS+=" --project-file cabal.project.coverage"
160− mkdir -p $BUILD_DIR/hpc
161−fi
162−BUILD_TEST="$CABAL_EXECUTABLE v2-build $CABAL_BUILD_OPTIONS --enable-tests"
163−
164−if test "$MEASURE" -eq "1"
165−then
166−run_build "$BUILD_TEST" streamly-tests test "$TARGETS"
167−fi
168−
169−#-----------------------------------------------------------------------------
170−# Run targets
171−#-----------------------------------------------------------------------------
172−
173−# $1: target name
174−get_tix_file () {
175− echo $BUILD_DIR/build/$SYSTEM/ghc-${GHC_VERSION}/$PACKAGE_FULL_NAME/hpc/vanilla/tix/$1/$1.tix
176−}
177−
178−# $1: package name
179−# $2: component
180−# $3: target
181−# $4: args generator func
182−run_target () {
183− local package_name=$1
184− local component=$2
185− local target_name=$3
186− local extra_args=$4
187−
188− local target_prog
189−
190− target_prog=$(cabal_target_prog $package_name $component $target_name) || \
191− die "Cannot find executable for target $target_name"
192−
193− echo "Running executable $target_name ..."
194−
195− mkdir -p $(dirname $(get_tix_file $target_name))
196− export HPCTIXFILE=$(get_tix_file $target_name)
197−
198− run_verbose $target_prog $($extra_args $target_name $target_prog) \
199− || die "Target exe failed"
200−
201− # hpc-coveralls fails if there is an empty dir and no .tix file generated
202− rmdir $(dirname $(get_tix_file $target_name)) 2>/dev/null || true
203−}
204−
205−# $1: package name with version
206−# $2: component
207−# $3: targets
208−# $4: args generator func
209−run_targets() {
210− for i in $3
211− do
212− run_target $1 $2 $i $4
213− done
214−}
215−
216−if test "$MEASURE" -eq "1"
217−then
218−run_targets "streamly-tests-0.0.0" t "$TARGETS" target_exe_extra_args
219−fi
220−
221−#-----------------------------------------------------------------------------
222−# Run coverage reports
223−#-----------------------------------------------------------------------------
224−
225−PACKAGE_NAME=streamly-$STREAMLY_VERSION
226−MIX_DIR=$BUILD_DIR/build/$SYSTEM/ghc-${GHC_VERSION}/$PACKAGE_NAME/hpc/vanilla/mix/$PACKAGE_NAME/
227−ALLTIX=$BUILD_DIR/hpc/all.tix
228−
229−if test "$COVERAGE" -eq "1" -a "$RAW" -eq 0
230−then
231− TIXFILES=
232− for i in $TARGETS
233− do
234− tixfile="$(get_tix_file ${i})"
235− if test -f "$tixfile"
236− then
237− TIXFILES+="$tixfile "
238− fi
239− done
240−
241− hpc sum --output=$ALLTIX $TIXFILES
242− run_verbose hpc markup $ALLTIX --hpcdir $MIX_DIR
243− run_verbose hpc report $ALLTIX $HPC_REPORT_OPTIONS --hpcdir $MIX_DIR
244−fi
cabal.project+1
@@ -1,4 +1,5 @@
11packages: streamly.cabal
2+ , core/streamly-core.cabal
23 , test/streamly-tests.cabal
34 , benchmark/streamly-benchmarks.cabal
45 , docs/streamly-docs.cabal
cabal.project.O0+8−3
@@ -2,18 +2,23 @@ packages:
22 ./
33 test
44 benchmark
5+ core
56
67-- Keep the flags same as cabal.project.doctest because we utilize the
78-- same build for doctests in CI.
89
910package streamly
1011 flags: -opt
11− ghc-options: -O0 -Werror
12+ ghc-options: -O0
13+
14+package streamly-core
15+ flags: -opt
16+ ghc-options: -O0
1217
1318package streamly-tests
1419 flags: -opt
15− ghc-options: -O0 -Werror
20+ ghc-options: -O0
1621
1722package streamly-benchmarks
1823 flags: -opt
19− ghc-options: -O0 -Werror
24+ ghc-options: -O0
cabal.project.Werror+4
@@ -2,10 +2,14 @@ packages:
22 ./
33 benchmark
44 test
5+ core
56
67package streamly
78 ghc-options: -Werror
89
10+package streamly-core
11+ ghc-options: -Werror
12+
913package streamly-benchmarks
1014 ghc-options: -Werror
1115
cabal.project.Werror-nocode+8
@@ -2,12 +2,20 @@ packages:
22 ./
33 benchmark
44 test
5+ core
6+
7+package streamly-core
8+ flags: -opt
9+ ghc-options: -Werror -O0
510
611package streamly
12+ flags: -opt
713 ghc-options: -Werror -fno-code
814
915package streamly-benchmarks
16+ flags: -opt
1017 ghc-options: -Werror -fno-code
1118
1219package streamly-tests
20+ flags: -opt
1321 ghc-options: -Werror -fno-code
cabal.project.coverage+4
@@ -1,10 +1,14 @@
11packages:
22 ./
33 test
4+ core
45
56package streamly
67 coverage: true
78
9+package streamly-core
10+ coverage: true
11+
812-- package streamly-tests
913 -- A few percent lesss coverage for some build speedup
1014 -- -DCOVERAGE_BUILD
cabal.project.doctest+14−3
@@ -1,13 +1,24 @@
11packages: streamly.cabal
2− , docs/streamly-docs.cabal
2+ , core/streamly-core.cabal
3+ -- , docs/streamly-docs.cabal
4+ -- for QuickCheck in property doctests
5+ , test/streamly-tests.cabal
36
47-- Keep the flags same as cabal.project.O0 because we utilize the same build
58-- for doctest in CI.
69
710package streamly
811 flags: -opt
9− ghc-options: -O0 -Werror
12+ ghc-options: -O0
13+
14+package streamly-core
15+ flags: -opt
16+ ghc-options: -O0
1017
1118package streamly-docs
1219 flags: -opt
13− ghc-options: -O0 -Werror
20+ ghc-options: -O0
21+
22+package streamly-tests
23+ flags: -opt
24+ ghc-options: -O0
cabal.project.ghc-head+21−41
@@ -1,55 +1,35 @@
1+-- See head.hackage:
2+-- info at https://ghc.gitlab.haskell.org/head.hackage/
3+-- source at https://gitlab.haskell.org/ghc/head.hackage/
4+
15packages: streamly.cabal
6+ , core/streamly-core.cabal
27 , test/streamly-tests.cabal
38 , benchmark/streamly-benchmarks.cabal
49 , docs/streamly-docs.cabal
510
6−-- Up to date on github
7−source-repository-package
8− type: git
9− location: https://github.com/haskell/primitive
10− tag: d57dfacd4486b78785140ac9ae071770748a1c23
11+write-ghc-environment-files: always
1112
12−source-repository-package
13− type: git
14− location: https://github.com/haskell/random
15− tag: 4c6da86e00f8128f7094e597bb9ff7db23cee2d8
13+repository head.hackage.ghc.haskell.org
14+ url: https://ghc.gitlab.haskell.org/head.hackage/
15+ secure: True
16+ key-threshold: 3
17+ root-keys:
18+ f76d08be13e9a61a377a85e2fb63f4c5435d40f8feb3e12eb05905edb8cdea89
19+ 26021a13b401500c8eb2761ca95c61f2d625bfef951b939a8124ed12ecf07329
20+ 7541f32a4ccca4f97aea3b22f5e593ba2c0267546016b992dfadcd2fe944e55d
1621
17−-- Modified
18−source-repository-package
19− type: git
20− location: https://github.com/composewell/fusion-plugin
21− tag: 1ccd16a4fbe9470d0a81f50f1dee45ed0d1f6356
22+active-repositories: hackage.haskell.org, head.hackage.ghc.haskell.org:override
2223
2324source-repository-package
2425 type: git
25− location: https://github.com/composewell/colour
26− tag: 657cc05600a8e15464387bbe2379d03613636aa2
27−
28−source-repository-package
29− type: git
30− location: https://github.com/composewell/network
31− tag: b83c9146072b69f99128a32a9fcda3a6e9200722
26+ location: https://github.com/composewell/fusion-plugin
27+ tag: 3c6535a7027d60d88c37b9a601cb180b805e7431
3228
3329source-repository-package
3430 type: git
35− location: https://github.com/composewell/tasty
36− tag: a2cdda6868b3da1e02ca2b45c12525c1f74911b0
37− subdir: core
38−
39−package fusion-plugin
40− tests: false
41−
42−package primitive
43− tests: false
44−
45−package random
46− tests: false
47−
48−package colour
49− tests: false
50−
51−package network
52− tests: false
31+ location: https://github.com/rrnewton/haskell-lockfree
32+ tag: 00a70cfe74994b41eb3627c752170d1e82118a8e
33+ subdir: lockfree-queue
5334
54−package tasty
55− tests: false
35+allow-newer: all
cabal.project.packdiffnew file+9
@@ -0,0 +1,9 @@
1+source-repository-package
2+ type: git
3+ location: https://github.com/composewell/packdiff.git
4+ tag: b11a50c9c0523382a19eebc0b12efdae194406a9
5+
6+source-repository-package
7+ type: git
8+ location: https://github.com/composewell/streamly-process.git
9+ tag: d80b860d9d8ea98e4f7f63390442b3155c34dd08
cabal.project.reportnew file+30
@@ -0,0 +1,30 @@
1+packages:
2+ targets/streamly-targets.cabal
3+ benchmark/bench-runner/bench-runner.cabal
4+ test/test-runner/test-runner.cabal
5+
6+package bench-report
7+ flags: +no-charts
8+
9+package bench-show
10+ flags: +no-charts
11+
12+source-repository-package
13+ type: git
14+ location: https://github.com/composewell/bench-report.git
15+ tag: 3b50bf0ad06f746bca42f30c8d40a0426e159af3
16+
17+source-repository-package
18+ type: git
19+ location: https://github.com/composewell/streamly-coreutils.git
20+ tag: 5dbb8bcefac3aefd5eb298dc410b11e36e79f35a
21+
22+source-repository-package
23+ type: git
24+ location: https://github.com/composewell/streamly-shell.git
25+ tag: b0c6318119d1cc5e2106343f17b5cff2ad94417f
26+
27+source-repository-package
28+ type: git
29+ location: https://github.com/composewell/streamly-process.git
30+ tag: d80b860d9d8ea98e4f7f63390442b3155c34dd08
cabal.project.streamlynew file+10
@@ -0,0 +1,10 @@
1+packages: streamly.cabal
2+ , test/streamly-tests.cabal
3+ , benchmark/streamly-benchmarks.cabal
4+ , docs/streamly-docs.cabal
5+
6+source-repository-package
7+ type: git
8+ location: https://github.com/composewell/streamly
9+ tag: master
10+ subdir: core
configure+9−237

This diff is too big to show here.

configure.ac+1−5

This diff is too big to show here.

core/Changelog.mdnew file+1

This diff is too big to show here.

core/LICENSEnew file+322

This diff is too big to show here.

core/Setup.hsnew file+6

This diff is too big to show here.

core/configurenew file+4349

This diff is too big to show here.

core/configure.acnew file+17

This diff is too big to show here.

core/docs/ApiChangelogs/0.1.0-0.2.0.txtnew file+1471

This diff is too big to show here.

core/docs/ApiChangelogs/0.1.0.txtnew file+405

This diff is too big to show here.

core/docs/ApiChangelogs/0.2.0-0.2.2.txtnew file+306

This diff is too big to show here.

core/docs/Changelog.mdnew file+97

This diff is too big to show here.

core/docs/Readme.mdnew file+1

This diff is too big to show here.

jsbits/clock.js → core/jsbits/clock.jsrenamed

The content is the same.

core/src/DocTestDataArray.hsnew file+22

This diff is too big to show here.

core/src/DocTestDataFold.hsnew file+27

This diff is too big to show here.

core/src/DocTestDataMutArray.hsnew file+10

This diff is too big to show here.

core/src/DocTestDataMutArrayGeneric.hsnew file+10

This diff is too big to show here.

core/src/DocTestDataParser.hsnew file+20

This diff is too big to show here.

core/src/DocTestDataParserK.hsnew file+15

This diff is too big to show here.

core/src/DocTestDataStream.hsnew file+39

This diff is too big to show here.

core/src/DocTestDataStreamK.hsnew file+21

This diff is too big to show here.

core/src/DocTestDataUnfold.hsnew file+12

This diff is too big to show here.

core/src/DocTestFileSystemHandle.hsnew file+15

This diff is too big to show here.

core/src/DocTestUnicodeParser.hsnew file+9

This diff is too big to show here.

core/src/DocTestUnicodeStream.hsnew file+12

This diff is too big to show here.

core/src/DocTestUnicodeString.hsnew file+5

This diff is too big to show here.

src/Streamly/Console/Stdio.hs → core/src/Streamly/Console/Stdio.hsrenamed+3−4

This diff is too big to show here.

core/src/Streamly/Data/Array.hsnew file+167

This diff is too big to show here.

core/src/Streamly/Data/Array/Generic.hsnew file+51

This diff is too big to show here.

core/src/Streamly/Data/Fold.hsnew file+415

This diff is too big to show here.

core/src/Streamly/Data/MutArray.hsnew file+110

This diff is too big to show here.

core/src/Streamly/Data/MutArray/Generic.hsnew file+70

This diff is too big to show here.

core/src/Streamly/Data/MutByteArray.hsnew file+106

This diff is too big to show here.

core/src/Streamly/Data/Parser.hsnew file+247

This diff is too big to show here.

core/src/Streamly/Data/ParserK.hsnew file+139

This diff is too big to show here.

core/src/Streamly/Data/Stream.hsnew file+746

This diff is too big to show here.

core/src/Streamly/Data/StreamK.hsnew file+194

This diff is too big to show here.

core/src/Streamly/Data/Unfold.hsnew file+233

This diff is too big to show here.

core/src/Streamly/FileSystem/Dir.hsnew file+23

This diff is too big to show here.

core/src/Streamly/FileSystem/File.hsnew file+60

This diff is too big to show here.

src/Streamly/FileSystem/Handle.hs → core/src/Streamly/FileSystem/Handle.hsrenamed+34−13

This diff is too big to show here.

src/Streamly/Internal/BaseCompat.hs → core/src/Streamly/Internal/BaseCompat.hsrenamed+2−31

This diff is too big to show here.

src/Streamly/Internal/Console/Stdio.hs → core/src/Streamly/Internal/Console/Stdio.hsrenamed+44−45

This diff is too big to show here.

src/Streamly/Internal/Control/Exception.hs → core/src/Streamly/Internal/Control/Exception.hsrenamed+1−13

This diff is too big to show here.

core/src/Streamly/Internal/Control/ForkIO.hsnew file+50

This diff is too big to show here.

src/Streamly/Internal/Control/Monad.hs → core/src/Streamly/Internal/Control/Monad.hsrenamed

The content is the same.

core/src/Streamly/Internal/Data/Array.hsnew file+1018

This diff is too big to show here.

core/src/Streamly/Internal/Data/Array/ArrayMacros.hnew file+43

This diff is too big to show here.

core/src/Streamly/Internal/Data/Array/Generic.hsnew file+342

This diff is too big to show here.

core/src/Streamly/Internal/Data/Array/Stream.hsnew file+725

This diff is too big to show here.

core/src/Streamly/Internal/Data/Array/Type.hsnew file+1148

This diff is too big to show here.

src/Streamly/Internal/Data/Binary/Decode.hs → core/src/Streamly/Internal/Data/Binary/Parser.hsrenamed+164−43

This diff is too big to show here.

core/src/Streamly/Internal/Data/Binary/Stream.hsnew file+383

This diff is too big to show here.

core/src/Streamly/Internal/Data/Builder.hsnew file+82

This diff is too big to show here.

src/Streamly/Internal/Data/Either/Strict.hs → core/src/Streamly/Internal/Data/Either/Strict.hsrenamed+2

This diff is too big to show here.

core/src/Streamly/Internal/Data/Fold.hsnew file+33

This diff is too big to show here.

src/Streamly/Internal/Data/Array/Stream/Fold/Foreign.hs → core/src/Streamly/Internal/Data/Fold/Chunked.hsrenamed+141−100

This diff is too big to show here.

core/src/Streamly/Internal/Data/Fold/Combinators.hsnew file+2452

This diff is too big to show here.

core/src/Streamly/Internal/Data/Fold/Container.hsnew file+783

This diff is too big to show here.

src/Streamly/Internal/Data/Fold/Step.hs → core/src/Streamly/Internal/Data/Fold/Step.hsrenamed+2−2

This diff is too big to show here.

src/Streamly/Internal/Data/Fold/Tee.hs → core/src/Streamly/Internal/Data/Fold/Tee.hsrenamed+33−6

This diff is too big to show here.

core/src/Streamly/Internal/Data/Fold/Type.hsnew file+2099

This diff is too big to show here.

core/src/Streamly/Internal/Data/Fold/Window.hsnew file+357

This diff is too big to show here.

src/Streamly/Internal/Data/IOFinalizer.hs → core/src/Streamly/Internal/Data/IOFinalizer.hsrenamed+20−22

This diff is too big to show here.

src/Streamly/Internal/Data/IORef/Prim.hs → core/src/Streamly/Internal/Data/IORef/Unboxed.hsrenamed+36−35

This diff is too big to show here.

core/src/Streamly/Internal/Data/IsMap.hsnew file+60

This diff is too big to show here.

core/src/Streamly/Internal/Data/List.hsnew file+234

This diff is too big to show here.

src/Streamly/Internal/Data/Maybe/Strict.hs → core/src/Streamly/Internal/Data/Maybe/Strict.hsrenamed+12−3

This diff is too big to show here.

core/src/Streamly/Internal/Data/MutArray.hsnew file+207

This diff is too big to show here.

core/src/Streamly/Internal/Data/MutArray/Generic.hsnew file+947

This diff is too big to show here.

core/src/Streamly/Internal/Data/MutArray/Stream.hsnew file+145

This diff is too big to show here.

core/src/Streamly/Internal/Data/MutArray/Type.hsnew file+3318

This diff is too big to show here.

core/src/Streamly/Internal/Data/MutByteArray.hsnew file+251

This diff is too big to show here.

core/src/Streamly/Internal/Data/MutByteArray/Type.hsnew file+321

This diff is too big to show here.

core/src/Streamly/Internal/Data/Parser.hsnew file+3621

This diff is too big to show here.

src/Streamly/Internal/Data/Parser/ParserD/Tee.hs → core/src/Streamly/Internal/Data/Parser/Tee.hsrenamed+10−6

This diff is too big to show here.

src/Streamly/Internal/Data/Parser/ParserD/Type.hs → core/src/Streamly/Internal/Data/Parser/Type.hsrenamed+631−302

This diff is too big to show here.

core/src/Streamly/Internal/Data/ParserK.hsnew file+16

This diff is too big to show here.

core/src/Streamly/Internal/Data/ParserK/Type.hsnew file+752

This diff is too big to show here.

core/src/Streamly/Internal/Data/Pipe.hsnew file+273

This diff is too big to show here.

src/Streamly/Internal/Data/Pipe/Type.hs → core/src/Streamly/Internal/Data/Pipe/Type.hsrenamed−3

This diff is too big to show here.

src/Streamly/Internal/Data/Producer.hs → core/src/Streamly/Internal/Data/Producer.hsrenamed+6−13

This diff is too big to show here.

src/Streamly/Internal/Data/Producer/Source.hs → core/src/Streamly/Internal/Data/Producer/Source.hsrenamed+101−36

This diff is too big to show here.

src/Streamly/Internal/Data/Producer/Type.hs → core/src/Streamly/Internal/Data/Producer/Type.hsrenamed+1−1

This diff is too big to show here.

core/src/Streamly/Internal/Data/Refold/Type.hsnew file+251

This diff is too big to show here.

core/src/Streamly/Internal/Data/Ring.hsnew file+619

This diff is too big to show here.

core/src/Streamly/Internal/Data/Ring/Generic.hsnew file+185

This diff is too big to show here.

src/Streamly/Internal/Data/SVar/Type.hs → core/src/Streamly/Internal/Data/SVar/Type.hsrenamed+10−1

This diff is too big to show here.

core/src/Streamly/Internal/Data/Serialize/TH.hsnew file+530

This diff is too big to show here.

core/src/Streamly/Internal/Data/Serialize/TH/Bottom.hsnew file+475

This diff is too big to show here.

core/src/Streamly/Internal/Data/Serialize/TH/Common.hsnew file+70

This diff is too big to show here.

core/src/Streamly/Internal/Data/Serialize/TH/RecHeader.hsnew file+411

This diff is too big to show here.

core/src/Streamly/Internal/Data/Serialize/Type.hsnew file+317

This diff is too big to show here.

core/src/Streamly/Internal/Data/Stream.hsnew file+42

This diff is too big to show here.

core/src/Streamly/Internal/Data/Stream/Container.hsnew file+310

This diff is too big to show here.

core/src/Streamly/Internal/Data/Stream/Eliminate.hsnew file+849

This diff is too big to show here.

src/Streamly/Internal/Data/Stream/StreamD/Exception.hs → core/src/Streamly/Internal/Data/Stream/Exception.hsrenamed+228−141

This diff is too big to show here.

core/src/Streamly/Internal/Data/Stream/Generate.hsnew file+1191

This diff is too big to show here.

core/src/Streamly/Internal/Data/Stream/Lift.hsnew file+129

This diff is too big to show here.

src/Streamly/Internal/Data/Stream/StreamD/Nesting.hs → core/src/Streamly/Internal/Data/Stream/Nesting.hsrenamed+923−290

This diff is too big to show here.

src/Streamly/Internal/Data/Stream/StreamD/Step.hs → core/src/Streamly/Internal/Data/Stream/Step.hsrenamed+2−2

This diff is too big to show here.

core/src/Streamly/Internal/Data/Stream/StreamD.hsnew file+16

This diff is too big to show here.

core/src/Streamly/Internal/Data/Stream/Top.hsnew file+480

This diff is too big to show here.

core/src/Streamly/Internal/Data/Stream/Transform.hsnew file+1971

This diff is too big to show here.

core/src/Streamly/Internal/Data/Stream/Transformer.hsnew file+183

This diff is too big to show here.

core/src/Streamly/Internal/Data/Stream/Type.hsnew file+2220

This diff is too big to show here.

core/src/Streamly/Internal/Data/StreamK.hsnew file+1730

This diff is too big to show here.

src/Streamly/Internal/Data/Stream/StreamDK/Type.hs → core/src/Streamly/Internal/Data/StreamK/Alt.hsrenamed+143−3

This diff is too big to show here.

core/src/Streamly/Internal/Data/StreamK/Transformer.hsnew file+79

This diff is too big to show here.

core/src/Streamly/Internal/Data/StreamK/Type.hsnew file+2153

This diff is too big to show here.

core/src/Streamly/Internal/Data/Time/Clock.hsnew file+180

This diff is too big to show here.

src/Streamly/Internal/Data/Time/Clock/Darwin.c → core/src/Streamly/Internal/Data/Time/Clock/Darwin.crenamed

The content is the same.

src/Streamly/Internal/Data/Time/Clock/Type.hsc → core/src/Streamly/Internal/Data/Time/Clock/Type.hscrenamed+1−1

This diff is too big to show here.

src/Streamly/Internal/Data/Time/Clock/Windows.c → core/src/Streamly/Internal/Data/Time/Clock/Windows.crenamed

The content is the same.

src/Streamly/Internal/Data/Time/Clock/config-clock.h → core/src/Streamly/Internal/Data/Time/Clock/config-clock.hrenamed

The content is the same.

src/Streamly/Internal/Data/Time/TimeSpec.hsc → core/src/Streamly/Internal/Data/Time/TimeSpec.hscrenamed−3

This diff is too big to show here.

src/Streamly/Internal/Data/Time/Units.hs → core/src/Streamly/Internal/Data/Time/Units.hsrenamed+8−7

This diff is too big to show here.

src/Streamly/Internal/Data/Tuple/Strict.hs → core/src/Streamly/Internal/Data/Tuple/Strict.hsrenamed+11

This diff is too big to show here.

core/src/Streamly/Internal/Data/Unbox.hsnew file+908

This diff is too big to show here.

core/src/Streamly/Internal/Data/Unbox/TH.hsnew file+498

This diff is too big to show here.

src/Streamly/Internal/Data/Unfold.hs → core/src/Streamly/Internal/Data/Unfold.hsrenamed+275−327

This diff is too big to show here.

src/Streamly/Internal/Data/Unfold/Enumeration.hs → core/src/Streamly/Internal/Data/Unfold/Enumeration.hsrenamed+4−34

This diff is too big to show here.

src/Streamly/Internal/Data/Unfold/Type.hs → core/src/Streamly/Internal/Data/Unfold/Type.hsrenamed+302−80

This diff is too big to show here.

src/Streamly/Internal/FileSystem/Dir.hs → core/src/Streamly/Internal/FileSystem/Dir.hsrenamed+191−84

This diff is too big to show here.

src/Streamly/Internal/FileSystem/File.hs → core/src/Streamly/Internal/FileSystem/File.hsrenamed+216−148

This diff is too big to show here.

src/Streamly/Internal/FileSystem/Handle.hs → core/src/Streamly/Internal/FileSystem/Handle.hsrenamed+232−235

This diff is too big to show here.

core/src/Streamly/Internal/FileSystem/Path.hsnew file+515

This diff is too big to show here.

src/Streamly/Internal/System/IO.hs → core/src/Streamly/Internal/System/IO.hsrenamed+19−13

This diff is too big to show here.

core/src/Streamly/Internal/Unicode/Array.hsnew file+104

This diff is too big to show here.

core/src/Streamly/Internal/Unicode/Parser.hsnew file+627

This diff is too big to show here.

src/Streamly/Internal/Unicode/Stream.hs → core/src/Streamly/Internal/Unicode/Stream.hsrenamed+384−292

This diff is too big to show here.

core/src/Streamly/Internal/Unicode/String.hsnew file+158

This diff is too big to show here.

core/src/Streamly/Unicode/Parser.hsnew file+69

This diff is too big to show here.

src/Streamly/Unicode/Stream.hs → core/src/Streamly/Unicode/Stream.hsrenamed+20−17

This diff is too big to show here.

core/src/Streamly/Unicode/String.hsnew file+30

This diff is too big to show here.

core/src/assert.hsnew file+6

This diff is too big to show here.

core/src/config.h.innew file+57

This diff is too big to show here.

core/src/inline.hsnew file+27

This diff is too big to show here.

core/streamly-core.cabalnew file+534

This diff is too big to show here.

default.nix+28−14

This diff is too big to show here.

docs/Developer/Benchmarks.mdnew file+342

This diff is too big to show here.

docs/Developer/Contributing.mdnew file+271

This diff is too big to show here.

docs/Developer/Github.linknew file+1

This diff is too big to show here.

dev/MAINTAINING.md → docs/Developer/MAINTAINING.mdrenamed+154−46

This diff is too big to show here.

docs/Developer/Tests.mdnew file+139

This diff is too big to show here.

dev/ci-tests.md → docs/Developer/ci-tests.mdrenamed+16−6

This diff is too big to show here.

dev/container-api.md → docs/Developer/container-api.mdrenamed

The content is the same.

dev/cps-vs-direct.rst → docs/Developer/cps-vs-direct.rstrenamed

The content is the same.

dev/dfa-bytes.png → docs/Developer/dfa-bytes.pngrenamed

Binary file not shown.

dev/dfa-classes.png → docs/Developer/dfa-classes.pngrenamed

Binary file not shown.

dev/dfa-rearr.png → docs/Developer/dfa-rearr.pngrenamed

Binary file not shown.

dev/linked-lists.md → docs/Developer/linked-lists.mdrenamed

The content is the same.

dev/module-organization.md → docs/Developer/module-organization.mdrenamed+4−4

This diff is too big to show here.

dev/optimization-guidelines.md → docs/Developer/optimization-guidelines.mdrenamed+13−1

This diff is too big to show here.

dev/overview.md → docs/Developer/overview.mdrenamed

The content is the same.

dev/paths.rst → docs/Developer/paths.rstrenamed+25−2

This diff is too big to show here.

dev/related-packages.md → docs/Developer/related-packages.mdrenamed

The content is the same.

dev/resources.md → docs/Developer/resources.mdrenamed

The content is the same.

dev/roadmap.md → docs/Developer/roadmap.mdrenamed

The content is the same.

dev/unicode.md → docs/Developer/unicode.mdrenamed

The content is the same.

dev/utf8-decoder.md → docs/Developer/utf8-decoder.mdrenamed+3−3

This diff is too big to show here.

docs/Documentation.mdnew file+5

This diff is too big to show here.

docs/Overview.md → docs/User/Explanatory/Overview.mdrenamed+2−2

This diff is too big to show here.

docs/User/Explanatory/design.mdnew file+42

This diff is too big to show here.

docs/monad-transformers.md → docs/User/Explanatory/monad-transformers.mdrenamed

The content is the same.

docs/performance.md → docs/User/Explanatory/performance.mdrenamed

The content is the same.

docs/streaming-pradigms.rst → docs/User/Explanatory/streaming-pradigms.rstrenamed

The content is the same.

docs/unified-abstractions.md → docs/User/Explanatory/unified-abstractions.mdrenamed+12−9

This diff is too big to show here.

docs/building.md → docs/User/HowTo/Compiling.mdrenamed+54−45

This diff is too big to show here.

docs/User/HowTo/Examples.linknew file+1

This diff is too big to show here.

docs/User/HowTo/faq.mdnew file+94

This diff is too big to show here.

docs/interoperation.md → docs/User/HowTo/interoperation.mdrenamed

The content is the same.

docs/optimizing.md → docs/User/HowTo/optimizing.mdrenamed

The content is the same.

docs/streamly-vs-async.md → docs/User/HowTo/streamly-vs-async.mdrenamed+3−1

This diff is too big to show here.

docs/streamly-vs-list-time.svg → docs/User/HowTo/streamly-vs-list-time.svgrenamed

The content is the same.

docs/streamly-vs-lists.md → docs/User/HowTo/streamly-vs-lists.mdrenamed+4−2

This diff is too big to show here.

docs/User/Project/ApiChangelogs/0.8.3-0.9.0.txtnew file+175

This diff is too big to show here.

docs/API-changelog.txt → docs/User/Project/ApiChangelogs/0.8.3.txtrenamed+19−8

This diff is too big to show here.

docs/User/Project/ApiChangelogs/0.9.0-0.10.0.txtnew file+424

This diff is too big to show here.

docs/CONTRIBUTORS.md → docs/User/Project/CONTRIBUTORS.mdrenamed+37

This diff is too big to show here.

Changelog.md → docs/User/Project/Changelog.mdrenamed+159−10

This diff is too big to show here.

docs/Credits.md → docs/User/Project/Credits.mdrenamed

The content is the same.

docs/User/Project/Github.linknew file+1

This diff is too big to show here.

docs/User/Project/README.mdnew file+141

This diff is too big to show here.

docs/User/Project/Roadmap.linknew file+1

This diff is too big to show here.

docs/User/Project/Upgrading-0.8-to-0.9.mdnew file+384

This diff is too big to show here.

docs/ConcurrentStreams.hs → docs/User/Tutorials/ConcurrentStreams.hsrenamed+31−40

This diff is too big to show here.

docs/User/Tutorials/Examples.linknew file+1

This diff is too big to show here.

docs/ReactiveProgramming.hs → docs/User/Tutorials/ReactiveProgramming.hsrenamed+5−3

This diff is too big to show here.

docs/Tutorial.hs → docs/User/Tutorials/Tutorial.hsrenamed+49−81

This diff is too big to show here.

docs/User/Tutorials/before-you-begin.mdnew file+77

This diff is too big to show here.

docs/User/Tutorials/getting-started.mdnew file+225

This diff is too big to show here.

docs/User/Tutorials/haskell-lazy-evaluation.mdnew file+215

This diff is too big to show here.

docs/User/Tutorials/quick-overview.mdnew file+517

This diff is too big to show here.

docs/User/Tutorials/why-haskell-streamly.mdnew file+91

This diff is too big to show here.

docs/resources.md → docs/User/resources.mdrenamed

The content is the same.

docs/faq.mddeleted−70

This diff is too big to show here.

docs/getting-started.mddeleted−296

This diff is too big to show here.

docs/streamly-docs.cabal+25−6

This diff is too big to show here.

hie.yaml+89−38

This diff is too big to show here.

src/Streamly.hsdeleted−690

This diff is too big to show here.

src/Streamly/Data/Array.hsdeleted−43

This diff is too big to show here.

src/Streamly/Data/Array/Foreign.hs+44−3

This diff is too big to show here.

src/Streamly/Data/Fold.hsdeleted−289

This diff is too big to show here.

src/Streamly/Data/Fold/Prelude.hsnew file+65

This diff is too big to show here.

src/Streamly/Data/Fold/Tee.hs+3−28

This diff is too big to show here.

src/Streamly/Data/Prim/Array.hsdeleted−43

This diff is too big to show here.

src/Streamly/Data/SmallArray.hs+2−2

This diff is too big to show here.

src/Streamly/Data/Stream/MkType.hsnew file+115

This diff is too big to show here.

src/Streamly/Data/Stream/Prelude.hsnew file+232

This diff is too big to show here.

src/Streamly/Data/Unfold.hsdeleted−152

This diff is too big to show here.

src/Streamly/Data/Unicode/Stream.hsdeleted−99

This diff is too big to show here.

src/Streamly/Internal/Control/Concurrent.hs+44−67

This diff is too big to show here.

src/Streamly/Internal/Control/ForkLifted.hsnew file+66

This diff is too big to show here.

src/Streamly/Internal/Data/Array.hsdeleted−250

This diff is too big to show here.

src/Streamly/Internal/Data/Array/Foreign.hsdeleted−549

This diff is too big to show here.

src/Streamly/Internal/Data/Array/Foreign/Mut.hsdeleted−146

This diff is too big to show here.

src/Streamly/Internal/Data/Array/Foreign/Mut/Type.hsdeleted−1171

This diff is too big to show here.

src/Streamly/Internal/Data/Array/Foreign/Type.hsdeleted−698

This diff is too big to show here.

src/Streamly/Internal/Data/Array/Prim.hsdeleted−110

This diff is too big to show here.

src/Streamly/Internal/Data/Array/Prim/Mut/Type.hsdeleted−94

This diff is too big to show here.

src/Streamly/Internal/Data/Array/Prim/MutTypesInclude.hsdeleted−413

This diff is too big to show here.

src/Streamly/Internal/Data/Array/Prim/Pinned.hsdeleted−108

This diff is too big to show here.

src/Streamly/Internal/Data/Array/Prim/Pinned/Mut/Type.hsdeleted−176

This diff is too big to show here.

src/Streamly/Internal/Data/Array/Prim/Pinned/Type.hsdeleted−127

This diff is too big to show here.

src/Streamly/Internal/Data/Array/Prim/Type.hsdeleted−98

This diff is too big to show here.

src/Streamly/Internal/Data/Array/Prim/TypesInclude.hsdeleted−703

This diff is too big to show here.

src/Streamly/Internal/Data/Array/PrimInclude.hsdeleted−184

This diff is too big to show here.

src/Streamly/Internal/Data/Array/Stream/Foreign.hsdeleted−860

This diff is too big to show here.

src/Streamly/Internal/Data/Array/Stream/Mut/Foreign.hsdeleted−238

This diff is too big to show here.

src/Streamly/Internal/Data/Channel.hsnew file+19

This diff is too big to show here.

src/Streamly/Internal/Data/Channel/Dispatcher.hsnew file+294

This diff is too big to show here.

src/Streamly/Internal/Data/Channel/Types.hsnew file+817

This diff is too big to show here.

src/Streamly/Internal/Data/Channel/Worker.hsnew file+375

This diff is too big to show here.

src/Streamly/Internal/Data/Consumer/Type.hsdeleted−120

This diff is too big to show here.

src/Streamly/Internal/Data/Fold.hsdeleted−1717

This diff is too big to show here.

src/Streamly/Internal/Data/Fold/Async.hs+23−10

This diff is too big to show here.

src/Streamly/Internal/Data/Fold/Concurrent.hsnew file+57

This diff is too big to show here.

src/Streamly/Internal/Data/Fold/Concurrent/Channel.hsnew file+112

This diff is too big to show here.

src/Streamly/Internal/Data/Fold/Concurrent/Channel/Type.hsnew file+331

This diff is too big to show here.

src/Streamly/Internal/Data/Fold/Prelude.hsnew file+19

This diff is too big to show here.

src/Streamly/Internal/Data/Fold/SVar.hs+8−7

This diff is too big to show here.

src/Streamly/Internal/Data/Fold/Type.hsdeleted−1412

This diff is too big to show here.

src/Streamly/Internal/Data/IOFinalizer/Lifted.hsnew file+74

This diff is too big to show here.

src/Streamly/Internal/Data/IsMap/HashMap.hsnew file+42

This diff is too big to show here.

src/Streamly/Internal/Data/List.hsdeleted−193

This diff is too big to show here.

src/Streamly/Internal/Data/Parser.hsdeleted−1170

This diff is too big to show here.

src/Streamly/Internal/Data/Parser/ParserD.hsdeleted−1149

This diff is too big to show here.

src/Streamly/Internal/Data/Parser/ParserK/Type.hsdeleted−471

This diff is too big to show here.

src/Streamly/Internal/Data/Pipe.hsdeleted−1968

This diff is too big to show here.

src/Streamly/Internal/Data/SVar.hs+4−4

This diff is too big to show here.

src/Streamly/Internal/Data/SVar/Dispatch.hs+3−6

This diff is too big to show here.

src/Streamly/Internal/Data/Sink.hsdeleted−245

This diff is too big to show here.

src/Streamly/Internal/Data/Sink/Type.hsdeleted−24

This diff is too big to show here.

src/Streamly/Internal/Data/SmallArray.hs+26−25

This diff is too big to show here.

src/Streamly/Internal/Data/SmallArray/Type.hs+8−75

This diff is too big to show here.

src/Streamly/Internal/Data/Stream/Ahead.hs+47−23

This diff is too big to show here.

src/Streamly/Internal/Data/Stream/Async.hs+62−29

This diff is too big to show here.

src/Streamly/Internal/Data/Stream/Common.hsnew file+105

This diff is too big to show here.

src/Streamly/Internal/Data/Stream/Concurrent.hsnew file+903

This diff is too big to show here.

src/Streamly/Internal/Data/Stream/Concurrent/Channel.hsnew file+109

This diff is too big to show here.

src/Streamly/Internal/Data/Stream/Concurrent/Channel/Append.hsnew file+1046

This diff is too big to show here.

src/Streamly/Internal/Data/Stream/Concurrent/Channel/Consumer.hsnew file+127

This diff is too big to show here.

src/Streamly/Internal/Data/Stream/Concurrent/Channel/Dispatcher.hsnew file+417

This diff is too big to show here.

src/Streamly/Internal/Data/Stream/Concurrent/Channel/Interleave.hsnew file+252

This diff is too big to show here.

src/Streamly/Internal/Data/Stream/Concurrent/Channel/Operations.hsnew file+294

This diff is too big to show here.

src/Streamly/Internal/Data/Stream/Concurrent/Channel/Type.hsnew file+172

This diff is too big to show here.

src/Streamly/Internal/Data/Stream/Instances.hs+9−16

This diff is too big to show here.

src/Streamly/Internal/Data/Stream/IsStream.hs+25−5

This diff is too big to show here.

src/Streamly/Internal/Data/Stream/IsStream/Combinators.hs+4−2

This diff is too big to show here.

src/Streamly/Internal/Data/Stream/IsStream/Common.hs+102−46

This diff is too big to show here.

src/Streamly/Internal/Data/Stream/IsStream/Eliminate.hs+71−81

This diff is too big to show here.

src/Streamly/Internal/Data/Stream/IsStream/Enumeration.hs+15−2

This diff is too big to show here.

src/Streamly/Internal/Data/Stream/IsStream/Exception.hs+31−19

This diff is too big to show here.

src/Streamly/Internal/Data/Stream/IsStream/Expand.hs+87−98

This diff is too big to show here.

src/Streamly/Internal/Data/Stream/IsStream/Generate.hs+33−73

This diff is too big to show here.

src/Streamly/Internal/Data/Stream/IsStream/Lift.hs+8−10

This diff is too big to show here.

src/Streamly/Internal/Data/Stream/IsStream/Reduce.hs+419−331

This diff is too big to show here.

src/Streamly/Internal/Data/Stream/IsStream/Top.hs+249−110

This diff is too big to show here.

src/Streamly/Internal/Data/Stream/IsStream/Transform.hs+111−187

This diff is too big to show here.

src/Streamly/Internal/Data/Stream/IsStream/Type.hs+171−86

This diff is too big to show here.

src/Streamly/Internal/Data/Stream/Lifted.hsnew file+335

This diff is too big to show here.

src/Streamly/Internal/Data/Stream/MkType.hsnew file+641

This diff is too big to show here.

src/Streamly/Internal/Data/Stream/Parallel.hs+60−32

This diff is too big to show here.

src/Streamly/Internal/Data/Stream/Prelude.hs+7−45

This diff is too big to show here.

src/Streamly/Internal/Data/Stream/PreludeCommon.hsdeleted−139

This diff is too big to show here.

src/Streamly/Internal/Data/Stream/SVar.hsnew file+18

This diff is too big to show here.

src/Streamly/Internal/Data/Stream/SVar/Eliminate.hs+14−8

This diff is too big to show here.

src/Streamly/Internal/Data/Stream/SVar/Generate.hs+15−12

This diff is too big to show here.

src/Streamly/Internal/Data/Stream/Serial.hs+83−105

This diff is too big to show here.

src/Streamly/Internal/Data/Stream/StreamD.hsdeleted−36

This diff is too big to show here.

src/Streamly/Internal/Data/Stream/StreamD/Eliminate.hsdeleted−511

This diff is too big to show here.

src/Streamly/Internal/Data/Stream/StreamD/Generate.hsdeleted−406

This diff is too big to show here.

src/Streamly/Internal/Data/Stream/StreamD/Lift.hsdeleted−112

This diff is too big to show here.

src/Streamly/Internal/Data/Stream/StreamD/Transform.hsdeleted−1218

This diff is too big to show here.

src/Streamly/Internal/Data/Stream/StreamD/Type.hsdeleted−979

This diff is too big to show here.

src/Streamly/Internal/Data/Stream/StreamDK.hsdeleted−156

This diff is too big to show here.

src/Streamly/Internal/Data/Stream/StreamK.hsdeleted−967

This diff is too big to show here.

src/Streamly/Internal/Data/Stream/StreamK/Type.hsdeleted−1320

This diff is too big to show here.

src/Streamly/Internal/Data/Stream/Time.hsnew file+950

This diff is too big to show here.

src/Streamly/Internal/Data/Stream/Zip.hs+39−87

This diff is too big to show here.

src/Streamly/Internal/Data/Stream/ZipAsync.hsnew file+134

This diff is too big to show here.

src/Streamly/Internal/Data/Time.hsdeleted−74

This diff is too big to show here.

src/Streamly/Internal/Data/Time/Clock.hsdeleted−80

This diff is too big to show here.

src/Streamly/Internal/Data/Unfold/Exception.hsnew file+214

This diff is too big to show here.

src/Streamly/Internal/Data/Unfold/Prelude.hsnew file+17

This diff is too big to show here.

src/Streamly/Internal/Data/Unfold/SVar.hs+3−6

This diff is too big to show here.

src/Streamly/Internal/FileSystem/Event.hsnew file+245

This diff is too big to show here.

src/Streamly/Internal/FileSystem/Event/Darwin.hs+218−162

This diff is too big to show here.

src/Streamly/Internal/FileSystem/Event/Linux.hs+281−221

This diff is too big to show here.

src/Streamly/Internal/FileSystem/Event/Windows.hs+223−166

This diff is too big to show here.

src/Streamly/Internal/FileSystem/FD.hs+74−64

This diff is too big to show here.

src/Streamly/Internal/FileSystem/FDIO.hs−7

This diff is too big to show here.

src/Streamly/Internal/Foreign/Malloc.hsdeleted−49

This diff is too big to show here.

src/Streamly/Internal/Network/Inet/TCP.hs+166−128

This diff is too big to show here.

src/Streamly/Internal/Network/Socket.hs+195−246

This diff is too big to show here.

src/Streamly/Internal/Ring/Foreign.hsdeleted−252

This diff is too big to show here.

src/Streamly/Internal/System/IOVec.hs+19−14

This diff is too big to show here.

src/Streamly/Internal/Unicode/Array/Char.hsdeleted−92

This diff is too big to show here.

src/Streamly/Internal/Unicode/Array/Prim/Pinned.hsdeleted−91

This diff is too big to show here.

src/Streamly/Internal/Unicode/Char.hs+21−12

This diff is too big to show here.

src/Streamly/Internal/Unicode/Utf8.hs+15−9

This diff is too big to show here.

src/Streamly/Memory/Array.hsdeleted−74

This diff is too big to show here.

src/Streamly/Network/Inet/TCP.hs+45−6

This diff is too big to show here.

src/Streamly/Network/Socket.hs+84−51

This diff is too big to show here.

src/Streamly/Prelude.hs+14−8

This diff is too big to show here.

src/assert.hsnew file+6

This diff is too big to show here.

src/config.h.in−36

This diff is too big to show here.

src/inline.hs+2−2

This diff is too big to show here.

stack.yaml+9−2

This diff is too big to show here.

streamly.cabal+294−287

This diff is too big to show here.

targets/Targets.hsnew file+213

This diff is too big to show here.

benchmark/bench-report/cabal.project → targets/cabal.projectrenamed

The content is the same.

targets/default.nixnew file+163

This diff is too big to show here.

targets/streamly-targets.cabalnew file+12

This diff is too big to show here.

test/README.mdmode 100644 → 120000+1−158

This diff is too big to show here.

test/Streamly/Test/Common/Array.hsdeleted−291

This diff is too big to show here.

test/Streamly/Test/Data/Array.hs+268−3

This diff is too big to show here.

test/Streamly/Test/Data/Array/Common.hsnew file+101

This diff is too big to show here.

test/Streamly/Test/Data/Array/CommonImports.hsnew file+13

This diff is too big to show here.

test/Streamly/Test/Data/Array/Foreign.hsdeleted−12

This diff is too big to show here.

test/Streamly/Test/Data/Array/Generic.hsnew file+65

This diff is too big to show here.

test/Streamly/Test/Data/Array/Prim.hsdeleted−12

This diff is too big to show here.

test/Streamly/Test/Data/Array/Prim/Pinned.hsdeleted−12

This diff is too big to show here.

test/Streamly/Test/Data/Array/Stream.hsnew file+113

This diff is too big to show here.

test/Streamly/Test/Data/Array/Stream/Foreign.hsdeleted−72

This diff is too big to show here.

test/Streamly/Test/Data/Fold.hs+205−161

This diff is too big to show here.

test/Streamly/Test/Data/Fold/Window.hsnew file+67

This diff is too big to show here.

test/Streamly/Test/Data/List.hs+20−27

This diff is too big to show here.

test/Streamly/Test/Data/MutArray.hsnew file+152

This diff is too big to show here.

test/Streamly/Test/Data/Parser.hs+767−182

This diff is too big to show here.

test/Streamly/Test/Data/Parser/ParserD.hs → test/Streamly/Test/Data/ParserK.hsrenamed+156−92

This diff is too big to show here.

test/Streamly/Test/Data/Ring/Unboxed.hsnew file+53

This diff is too big to show here.

test/Streamly/Test/Data/Serialize.hsnew file+306

This diff is too big to show here.

test/Streamly/Test/Data/Serialize/CompatV0.hsnew file+46

This diff is too big to show here.

test/Streamly/Test/Data/Serialize/CompatV1.hsnew file+48

This diff is too big to show here.

test/Streamly/Test/Data/Serialize/TH.hsnew file+82

This diff is too big to show here.

test/Streamly/Test/Data/SmallArray.hs+20−3

This diff is too big to show here.

test/Streamly/Test/Data/Stream.hsnew file+33

This diff is too big to show here.

test/Streamly/Test/Data/Stream/Concurrent.hsnew file+363

This diff is too big to show here.

test/Streamly/Test/Data/Unbox.hsnew file+347

This diff is too big to show here.

test/Streamly/Test/Data/Unbox/TH.hsnew file+146

This diff is too big to show here.

test/Streamly/Test/Data/Unfold.hs+38−35

This diff is too big to show here.

test/Streamly/Test/FileSystem/Event.hs+13−387

This diff is too big to show here.

test/Streamly/Test/FileSystem/Event/Common.hsnew file+422

This diff is too big to show here.

test/Streamly/Test/FileSystem/Event/Darwin.hsnew file+86

This diff is too big to show here.

test/Streamly/Test/FileSystem/Event/Linux.hsnew file+163

This diff is too big to show here.

test/Streamly/Test/FileSystem/Event/Windows.hsnew file+51

This diff is too big to show here.

test/Streamly/Test/FileSystem/Handle.hs+31−35

This diff is too big to show here.

test/Streamly/Test/Network/Inet/TCP.hs+25−18

This diff is too big to show here.

test/Streamly/Test/Network/Socket.hs+36−27

This diff is too big to show here.

test/Streamly/Test/Prelude.hs+2−3

This diff is too big to show here.

test/Streamly/Test/Prelude/Ahead.hs+3−4

This diff is too big to show here.

test/Streamly/Test/Prelude/Async.hs+39−5

This diff is too big to show here.

test/Streamly/Test/Prelude/Concurrent.hs+3−4

This diff is too big to show here.

test/Streamly/Test/Prelude/Fold.hs+3−1

This diff is too big to show here.

test/Streamly/Test/Prelude/Parallel.hs+3−4

This diff is too big to show here.

test/Streamly/Test/Prelude/Rate.hs+3−1

This diff is too big to show here.

test/Streamly/Test/Prelude/Serial.hs+166−120

This diff is too big to show here.

test/Streamly/Test/Prelude/Top.hsnew file+224

This diff is too big to show here.

test/Streamly/Test/Prelude/WAsync.hs+54−4

This diff is too big to show here.

test/Streamly/Test/Prelude/WSerial.hs+3−4

This diff is too big to show here.

test/Streamly/Test/Prelude/ZipAsync.hs+3−1

This diff is too big to show here.

test/Streamly/Test/Prelude/ZipSerial.hs+3−4

This diff is too big to show here.

test/Streamly/Test/Serialize/Serializable.hsnew file+237

This diff is too big to show here.

test/Streamly/Test/Unicode/Char.hs+13−16

This diff is too big to show here.

test/Streamly/Test/Unicode/Parser.hsnew file+231

This diff is too big to show here.

test/Streamly/Test/Unicode/Stream.hs+34−30

This diff is too big to show here.

test/lib/Streamly/Test/Common.hs+4−3

This diff is too big to show here.

test/lib/Streamly/Test/Prelude/Common.hs+29−48

This diff is too big to show here.

test/streamly-tests.cabal+233−40

This diff is too big to show here.

test/test-runner/Main.hsnew file+33

This diff is too big to show here.

test/test-runner/cabal.projectnew file+4

This diff is too big to show here.

test/test-runner/default.nixnew file+164

This diff is too big to show here.

test/test-runner/test-runner.cabalnew file+41

This diff is too big to show here.