b7b3aa8 · streamly · git.iko.soy

git.iko.soy/streamly

Rename benchmark driver exe to bench-runner

To keep it consistent with test-runner for test driver

commitb7b3aa8d0233236e802315b89b8bc30203e5c78b authorHarendra Kumar <harendra@composewell.com> dateThu 28 Apr 2022, 20:21 (5 years ago) parent7d12c64

12 files changed+19−22

compare with master

unifiedsplit

.github/workflows/regression-check.yml+5−5 .packcheck.ignore+4−5 benchmark/report/Main.hs → benchmark/bench-runner/Main.hs−2 benchmark/report/report.cabal → benchmark/bench-runner/bench-runner.cabal+2−2 benchmark/report/cabal.project → benchmark/bench-runner/cabal.project benchmark/report/default.nix → benchmark/bench-runner/default.nix cabal.project.report+2−2 streamly.cabal+4−4 test/report/Main.hs → test/test-runner/Main.hs test/report/cabal.project → test/test-runner/cabal.project test/report/default.nix → test/test-runner/default.nix test/report/streamly-test-report.cabal → test/test-runner/test-runner.cabal+2−2

.github/workflows/regression-check.yml+5−5

@@ -70,11 +70,10 @@ jobs:

7070 cabal update

7171

7272 - uses: actions/cache@v2

73− name: Cache ~/.cabal and bench-report

73+ name: Cache ~/.cabal

7474 with:

7575 path: |

7676 ~/.cabal

77− ./benchmark/bench-report/bin/bench-report

7877 # Bump the key version to clear the cache

7978 key: cache-v1

8079

@@ -120,7 +119,7 @@ jobs:

120119

121120 - name: Run benchmarks and append

122121 run: |

123− cabal run report --project-file=cabal.project.report -- --targets "$CI_BENCHMARKS" --raw --append

122+ cabal run bench-runner --project-file=cabal.project.report -- --targets "$CI_BENCHMARKS" --raw --append

124123

125124 # -----------------------------------------------------------------

126125 # -- Compare

@@ -128,7 +127,7 @@ jobs:

128127

129128 - name: List all benchmarks

130129 run: |

131− cabal run report --project-file=cabal.project.report -- --targets "$CI_BENCHMARKS" --no-measure

130+ cabal run bench-runner --project-file=cabal.project.report -- --targets "$CI_BENCHMARKS" --no-measure

132131

133132 - name: Compare benchmarks

134133 run: |

@@ -146,7 +145,8 @@ jobs:

146145

147146 echo

148147 echo "Checking $bname for regressions greater than $cutoff percent"

149− ! cabal run report --project-file=cabal.project.report -- --targets "$bname" \

148+ ! cabal run bench-runner --project-file=cabal.project.report -- \

149+ --targets "$bname" \

150150 --fields "$CI_FIELDS" \

151151 --no-measure --silent \

152152 --diff-cutoff-percent $cutoff \

.packcheck.ignore+4−5

@@ -7,9 +7,8 @@

77.hlint.yaml

88.packcheck.ignore

99appveyor.yml

10−benchmark/bench-report/default.nix

11−benchmark/report/default.nix

12−benchmark/report/cabal.project

10+benchmark/bench-runner/default.nix

11+benchmark/bench-runner/cabal.project

1312bin/ghc.sh

1413bin/run-ci.sh

1514bin/run-repl-quick.sh

@@ -28,5 +27,5 @@ hie.yaml

2827stack.yaml

2928targets/default.nix

3029targets/cabal.project

31−test/report/default.nix

32−test/report/cabal.project

30+test/test-runner/default.nix

31+test/test-runner/cabal.project

benchmark/report/Main.hs → benchmark/bench-runner/Main.hsrenamed−2

@@ -4,9 +4,7 @@ import BenchRunner (mainWith)

44import BuildLib (Quickness(..))

55import Control.Applicative ((<|>))

66import Data.List (isInfixOf, isPrefixOf, isSuffixOf)

7−import Data.Map (Map)

9−import qualified Data.Map as Map

108import Targets (targets)

119

1210rtsOpts :: String -> String -> String

benchmark/report/report.cabal → benchmark/bench-runner/bench-runner.cabalrenamed+2−2

@@ -1,5 +1,5 @@

11cabal-version: 2.4

2−name: report

2+name: bench-runner

33version: 0.1.0.0

55-- A short (one-line) description of the package.

@@ -25,7 +25,7 @@ version: 0.1.0.0

2525-- category:

2626-- extra-source-files: CHANGELOG.md

2727

28−executable report

28+executable bench-runner

2929 ghc-options: -Wall

3030 main-is: Main.hs

3131

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

The content is the same.

benchmark/report/default.nix → benchmark/bench-runner/default.nixrenamed

The content is the same.

cabal.project.report+2−2

@@ -1,7 +1,7 @@

11packages:

22 targets/streamly-targets.cabal

3− benchmark/report/report.cabal

4− test/report/streamly-test-report.cabal

3+ benchmark/bench-runner/bench-runner.cabal

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

55 streamly.cabal

66 core/streamly-core.cabal

streamly.cabal+4−4

@@ -49,8 +49,8 @@ build-type: Configure

4949

5050extra-source-files:

5151 benchmark/*.hs

52− benchmark/report/Main.hs

53− benchmark/report/report.cabal

52+ benchmark/bench-runner/Main.hs

53+ benchmark/bench-runner/bench-runner.cabal

5454 benchmark/Streamly/Benchmark/Data/*.hs

5555 benchmark/Streamly/Benchmark/Data/Array/Common.hs

5656 benchmark/Streamly/Benchmark/Data/Array/CommonImports.hs

@@ -79,8 +79,8 @@ extra-source-files:

7979 docs/streamly-docs.cabal

8080 targets/streamly-targets.cabal

8181 targets/Targets.hs

82− test/report/Main.hs

83− test/report/streamly-test-report.cabal

82+ test/test-runner/Main.hs

83+ test/test-runner/test-runner.cabal

8484

8585 -- This is duplicated

8686 src/Streamly/Internal/Data/Stream/Instances.hs

test/report/Main.hs → test/test-runner/Main.hsrenamed

The content is the same.

test/report/cabal.project → test/test-runner/cabal.projectrenamed

The content is the same.

test/report/default.nix → test/test-runner/default.nixrenamed

The content is the same.

test/report/streamly-test-report.cabal → test/test-runner/test-runner.cabalrenamed+2−2

@@ -1,5 +1,5 @@

11cabal-version: 2.4

2−name: streamly-test-report

2+name: test-runner

33version: 0.1.0.0

55-- A short (one-line) description of the package.

@@ -25,7 +25,7 @@ version: 0.1.0.0

2525-- category:

2626-- extra-source-files: CHANGELOG.md

2727

28−executable test-report

28+executable test-runner

2929 main-is: Main.hs

3030

3131 -- Modules included in this executable, other than Main.