From f5f25b43b6bee78200743b23c062fe57d468a567 Mon Sep 17 00:00:00 2001 From: Ranjeet Ranjan Date: Mon, 24 Jul 2023 17:51:27 +0530 Subject: [PATCH] Rename Data.Parser.ParserK benchmark to Data.ParserK (#2457) --- .github/workflows/regression-check.yml | 2 +- benchmark/Streamly/Benchmark/Data/{Parser => }/ParserK.hs | 2 +- benchmark/bench-runner/Main.hs | 2 +- benchmark/streamly-benchmarks.cabal | 8 ++++---- hie.yaml | 6 ++---- streamly.cabal | 1 - targets/Targets.hs | 2 +- 7 files changed, 10 insertions(+), 13 deletions(-) rename benchmark/Streamly/Benchmark/Data/{Parser => }/ParserK.hs (99%) diff --git a/.github/workflows/regression-check.yml b/.github/workflows/regression-check.yml index 22ecbdb91..b5626f857 100644 --- a/.github/workflows/regression-check.yml +++ b/.github/workflows/regression-check.yml @@ -25,7 +25,7 @@ jobs: Data.Fold Data.Fold.Window Data.Parser - Data.Parser.ParserK + Data.ParserK Data.Stream.StreamD Data.Stream.StreamK:6 Data.Unfold diff --git a/benchmark/Streamly/Benchmark/Data/Parser/ParserK.hs b/benchmark/Streamly/Benchmark/Data/ParserK.hs similarity index 99% rename from benchmark/Streamly/Benchmark/Data/Parser/ParserK.hs rename to benchmark/Streamly/Benchmark/Data/ParserK.hs index cbdcef25d..38b58dd5b 100644 --- a/benchmark/Streamly/Benchmark/Data/Parser/ParserK.hs +++ b/benchmark/Streamly/Benchmark/Data/ParserK.hs @@ -313,7 +313,7 @@ monad16 value = ------------------------------------------------------------------------------- moduleName :: String -moduleName = "Data.Parser.ParserK" +moduleName = "Data.ParserK" instance NFData ParseError where {-# INLINE rnf #-} diff --git a/benchmark/bench-runner/Main.hs b/benchmark/bench-runner/Main.hs index 2b4d23a81..42072e405 100644 --- a/benchmark/bench-runner/Main.hs +++ b/benchmark/bench-runner/Main.hs @@ -98,7 +98,7 @@ rtsOpts exeName benchName0 = unwords [general, exeSpecific, benchSpecific] `isPrefixOf` benchName = "-K4M -M512M" -- XXX Takes up to 160MB heap for --long, we use chunked stream for -- this, so the reason may be related to chunked streams. - | "Data.Parser.ParserK/o-1-space" + | "Data.ParserK/o-1-space" `isPrefixOf` benchName = "-K4M -M256M" ----------------------------------------------------------------------- diff --git a/benchmark/streamly-benchmarks.cabal b/benchmark/streamly-benchmarks.cabal index 9848eeaff..732a77cd9 100644 --- a/benchmark/streamly-benchmarks.cabal +++ b/benchmark/streamly-benchmarks.cabal @@ -403,10 +403,10 @@ benchmark Data.Parser else ghc-options: +RTS -M2000M -RTS -benchmark Data.Parser.ParserK +benchmark Data.ParserK import: bench-options type: exitcode-stdio-1.0 - hs-source-dirs: Streamly/Benchmark/Data/Parser + hs-source-dirs: Streamly/Benchmark/Data main-is: ParserK.hs if impl(ghcjs) buildable: False @@ -418,10 +418,10 @@ benchmark Data.Parser.ParserK -- the rewrite rules are disabled. We can also use the "no-fusion" build -- flag but we need to keep in mind that it disables fusion for streams -- as well. -benchmark Data.Parser.FromParserK +benchmark Data.FromParserK import: bench-options type: exitcode-stdio-1.0 - hs-source-dirs: Streamly/Benchmark/Data/Parser + hs-source-dirs: Streamly/Benchmark/Data cpp-options: -DFROM_PARSERK main-is: ParserK.hs if flag(use-streamly-core) || impl(ghcjs) diff --git a/hie.yaml b/hie.yaml index a9dd25847..86b714c6f 100644 --- a/hie.yaml +++ b/hie.yaml @@ -28,10 +28,8 @@ cradle: component: "bench:Data.Fold" - path: "./benchmark/Streamly/Benchmark/Data/Parser.hs" component: "bench:Data.Parser" - - path: "./benchmark/Streamly/Benchmark/Data/Parser/ParserD.hs" - component: "bench:Data.Parser.ParserD" - - path: "./benchmark/Streamly/Benchmark/Data/Parser/ParserK.hs" - component: "bench:Data.Parser.ParserK" + - path: "./benchmark/Streamly/Benchmark/Data/ParserK.hs" + component: "bench:Data.ParserK" - path: "./benchmark/Streamly/Benchmark/Data/Stream/StreamD.hs" component: "bench:Data.Stream.StreamD" - path: "./benchmark/Streamly/Benchmark/Data/Stream/StreamK.hs" diff --git a/streamly.cabal b/streamly.cabal index f0294dbb2..9b8cc123a 100644 --- a/streamly.cabal +++ b/streamly.cabal @@ -72,7 +72,6 @@ extra-source-files: benchmark/Streamly/Benchmark/Data/Array/Mut.hs benchmark/Streamly/Benchmark/Data/Array/Stream.hs benchmark/Streamly/Benchmark/Data/Fold/Window.hs - benchmark/Streamly/Benchmark/Data/Parser/*.hs benchmark/Streamly/Benchmark/Data/Stream/*.hs benchmark/Streamly/Benchmark/FileSystem/*.hs benchmark/Streamly/Benchmark/FileSystem/Handle/*.hs diff --git a/targets/Targets.hs b/targets/Targets.hs index 05bcbb707..1949fd64a 100644 --- a/targets/Targets.hs +++ b/targets/Targets.hs @@ -176,7 +176,7 @@ targets = , ("Data.Ring.Unboxed", []) -- Parsers - , ("Data.Parser.ParserK", + , ("Data.ParserK", [ "base_parser_grp" , "base_parser_cmp" , "infinite_grp"