From b7b3aa8d0233236e802315b89b8bc30203e5c78b Mon Sep 17 00:00:00 2001
From: Harendra Kumar <harendra@composewell.com>
Date: Thu, 28 Apr 2022 20:21:11 +0530
Subject: [PATCH] Rename benchmark driver exe to bench-runner

To keep it consistent with test-runner for test driver
---
 .github/workflows/regression-check.yml                 | 10 +++++-----
 .packcheck.ignore                                      |  9 ++++-----
 benchmark/{report => bench-runner}/Main.hs             |  2 --
 .../report.cabal => bench-runner/bench-runner.cabal}   |  4 ++--
 benchmark/{report => bench-runner}/cabal.project       |  0
 benchmark/{report => bench-runner}/default.nix         |  0
 cabal.project.report                                   |  4 ++--
 streamly.cabal                                         |  8 ++++----
 test/{report => test-runner}/Main.hs                   |  0
 test/{report => test-runner}/cabal.project             |  0
 test/{report => test-runner}/default.nix               |  0
 .../test-runner.cabal}                                 |  4 ++--
 12 files changed, 19 insertions(+), 22 deletions(-)
 rename benchmark/{report => bench-runner}/Main.hs (99%)
 rename benchmark/{report/report.cabal => bench-runner/bench-runner.cabal} (94%)
 rename benchmark/{report => bench-runner}/cabal.project (100%)
 rename benchmark/{report => bench-runner}/default.nix (100%)
 rename test/{report => test-runner}/Main.hs (100%)
 rename test/{report => test-runner}/cabal.project (100%)
 rename test/{report => test-runner}/default.nix (100%)
 rename test/{report/streamly-test-report.cabal => test-runner/test-runner.cabal} (93%)

diff --git a/.github/workflows/regression-check.yml b/.github/workflows/regression-check.yml
index 50cd1d9d..9aafefcb 100644
--- a/.github/workflows/regression-check.yml
+++ b/.github/workflows/regression-check.yml
@@ -70,11 +70,10 @@ jobs:
         cabal update
 
     - uses: actions/cache@v2
-      name: Cache ~/.cabal and bench-report
+      name: Cache ~/.cabal
       with:
         path: |
             ~/.cabal
-            ./benchmark/bench-report/bin/bench-report
         # Bump the key version to clear the cache
         key: cache-v1
 
@@ -120,7 +119,7 @@ jobs:
 
     - name: Run benchmarks and append
       run: |
-        cabal run report --project-file=cabal.project.report -- --targets "$CI_BENCHMARKS" --raw --append
+        cabal run bench-runner --project-file=cabal.project.report -- --targets "$CI_BENCHMARKS" --raw --append
 
     # -----------------------------------------------------------------
     # -- Compare
@@ -128,7 +127,7 @@ jobs:
 
     - name: List all benchmarks
       run: |
-        cabal run report --project-file=cabal.project.report -- --targets "$CI_BENCHMARKS" --no-measure
+        cabal run bench-runner --project-file=cabal.project.report -- --targets "$CI_BENCHMARKS" --no-measure
 
     - name: Compare benchmarks
       run: |
@@ -146,7 +145,8 @@ jobs:
 
           echo
           echo "Checking $bname for regressions greater than $cutoff percent"
-          ! cabal run report --project-file=cabal.project.report -- --targets "$bname" \
+          ! cabal run bench-runner --project-file=cabal.project.report -- \
+                      --targets "$bname" \
                       --fields "$CI_FIELDS" \
                       --no-measure --silent \
                       --diff-cutoff-percent $cutoff \
diff --git a/.packcheck.ignore b/.packcheck.ignore
index 64ebf408..3a9b5b71 100644
--- a/.packcheck.ignore
+++ b/.packcheck.ignore
@@ -7,9 +7,8 @@
 .hlint.yaml
 .packcheck.ignore
 appveyor.yml
-benchmark/bench-report/default.nix
-benchmark/report/default.nix
-benchmark/report/cabal.project
+benchmark/bench-runner/default.nix
+benchmark/bench-runner/cabal.project
 bin/ghc.sh
 bin/run-ci.sh
 bin/run-repl-quick.sh
@@ -28,5 +27,5 @@ hie.yaml
 stack.yaml
 targets/default.nix
 targets/cabal.project
-test/report/default.nix
-test/report/cabal.project
+test/test-runner/default.nix
+test/test-runner/cabal.project
diff --git a/benchmark/report/Main.hs b/benchmark/bench-runner/Main.hs
similarity index 99%
rename from benchmark/report/Main.hs
rename to benchmark/bench-runner/Main.hs
index 1b7c1a57..42aaa6a9 100644
--- a/benchmark/report/Main.hs
+++ b/benchmark/bench-runner/Main.hs
@@ -4,9 +4,7 @@ import BenchRunner (mainWith)
 import BuildLib (Quickness(..))
 import Control.Applicative ((<|>))
 import Data.List (isInfixOf, isPrefixOf, isSuffixOf)
-import Data.Map (Map)
 
-import qualified Data.Map as Map
 import Targets (targets)
 
 rtsOpts :: String -> String -> String
diff --git a/benchmark/report/report.cabal b/benchmark/bench-runner/bench-runner.cabal
similarity index 94%
rename from benchmark/report/report.cabal
rename to benchmark/bench-runner/bench-runner.cabal
index 8dd2ffda..419fc254 100644
--- a/benchmark/report/report.cabal
+++ b/benchmark/bench-runner/bench-runner.cabal
@@ -1,5 +1,5 @@
 cabal-version:      2.4
-name:               report
+name:               bench-runner
 version:            0.1.0.0
 
 -- A short (one-line) description of the package.
@@ -25,7 +25,7 @@ version:            0.1.0.0
 -- category:
 -- extra-source-files: CHANGELOG.md
 
-executable report
+executable bench-runner
     ghc-options: -Wall
     main-is:          Main.hs
 
diff --git a/benchmark/report/cabal.project b/benchmark/bench-runner/cabal.project
similarity index 100%
rename from benchmark/report/cabal.project
rename to benchmark/bench-runner/cabal.project
diff --git a/benchmark/report/default.nix b/benchmark/bench-runner/default.nix
similarity index 100%
rename from benchmark/report/default.nix
rename to benchmark/bench-runner/default.nix
diff --git a/cabal.project.report b/cabal.project.report
index ce91cea6..cdff779c 100644
--- a/cabal.project.report
+++ b/cabal.project.report
@@ -1,7 +1,7 @@
 packages:
   targets/streamly-targets.cabal
-  benchmark/report/report.cabal
-  test/report/streamly-test-report.cabal
+  benchmark/bench-runner/bench-runner.cabal
+  test/test-runner/test-runner.cabal
   streamly.cabal
   core/streamly-core.cabal
 
diff --git a/streamly.cabal b/streamly.cabal
index 7f1c4d68..7ae4fd27 100644
--- a/streamly.cabal
+++ b/streamly.cabal
@@ -49,8 +49,8 @@ build-type:          Configure
 
 extra-source-files:
     benchmark/*.hs
-    benchmark/report/Main.hs
-    benchmark/report/report.cabal
+    benchmark/bench-runner/Main.hs
+    benchmark/bench-runner/bench-runner.cabal
     benchmark/Streamly/Benchmark/Data/*.hs
     benchmark/Streamly/Benchmark/Data/Array/Common.hs
     benchmark/Streamly/Benchmark/Data/Array/CommonImports.hs
@@ -79,8 +79,8 @@ extra-source-files:
     docs/streamly-docs.cabal
     targets/streamly-targets.cabal
     targets/Targets.hs
-    test/report/Main.hs
-    test/report/streamly-test-report.cabal
+    test/test-runner/Main.hs
+    test/test-runner/test-runner.cabal
 
     -- This is duplicated
     src/Streamly/Internal/Data/Stream/Instances.hs
diff --git a/test/report/Main.hs b/test/test-runner/Main.hs
similarity index 100%
rename from test/report/Main.hs
rename to test/test-runner/Main.hs
diff --git a/test/report/cabal.project b/test/test-runner/cabal.project
similarity index 100%
rename from test/report/cabal.project
rename to test/test-runner/cabal.project
diff --git a/test/report/default.nix b/test/test-runner/default.nix
similarity index 100%
rename from test/report/default.nix
rename to test/test-runner/default.nix
diff --git a/test/report/streamly-test-report.cabal b/test/test-runner/test-runner.cabal
similarity index 93%
rename from test/report/streamly-test-report.cabal
rename to test/test-runner/test-runner.cabal
index 09b4f094..6a0818f0 100644
--- a/test/report/streamly-test-report.cabal
+++ b/test/test-runner/test-runner.cabal
@@ -1,5 +1,5 @@
 cabal-version:      2.4
-name:               streamly-test-report
+name:               test-runner
 version:            0.1.0.0
 
 -- A short (one-line) description of the package.
@@ -25,7 +25,7 @@ version:            0.1.0.0
 -- category:
 -- extra-source-files: CHANGELOG.md
 
-executable test-report
+executable test-runner
     main-is:          Main.hs
 
     -- Modules included in this executable, other than Main.