b7b3aa8 · streamly · git.iko.soy

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

compare with master

unifiedsplit

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

70 cabal update

71

72 - uses: actions/cache@v2

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

73+ name: Cache ~/.cabal

74 with:

75 path: |

76 ~/.cabal

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

78 # Bump the key version to clear the cache

77 # Bump the key version to clear the cache

79 key: cache-v1

78 key: cache-v1

80

79

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

120

119

121 - name: Run benchmarks and append

120 - name: Run benchmarks and append

122 run: |

121 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

124

123

125 # -----------------------------------------------------------------

124 # -----------------------------------------------------------------

126 # -- Compare

125 # -- Compare

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

128

127

129 - name: List all benchmarks

128 - name: List all benchmarks

130 run: |

129 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

132

131

133 - name: Compare benchmarks

132 - name: Compare benchmarks

134 run: |

133 run: |

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

146

145

147 echo

146 echo

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

147 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" \

150 --fields "$CI_FIELDS" \

151 --no-measure --silent \

152 --diff-cutoff-percent $cutoff \

.packcheck.ignore+4−5

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

7.hlint.yaml

8.packcheck.ignore

9appveyor.yml

10−benchmark/bench-report/default.nix

10+benchmark/bench-runner/default.nix

11−benchmark/report/default.nix

12−benchmark/report/cabal.project

11+benchmark/bench-runner/cabal.project

13bin/ghc.sh

12bin/ghc.sh

14bin/run-ci.sh

13bin/run-ci.sh

15bin/run-repl-quick.sh

14bin/run-repl-quick.sh

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

28stack.yaml

27stack.yaml

29targets/default.nix

28targets/default.nix

30targets/cabal.project

29targets/cabal.project

31−test/report/default.nix

30+test/test-runner/default.nix

32−test/report/cabal.project

31+test/test-runner/cabal.project

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

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

4import BuildLib (Quickness(..))

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

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

7−import Data.Map (Map)

8

7

9−import qualified Data.Map as Map

10import Targets (targets)

8import Targets (targets)

11

9

12rtsOpts :: String -> String -> String

10rtsOpts :: String -> String -> String

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

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

1cabal-version: 2.4

2−name: report

2+name: bench-runner

3version: 0.1.0.0

4

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

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

25-- category:

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

27

28−executable report

28+executable bench-runner

29 ghc-options: -Wall

30 main-is: Main.hs

31

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 @@

1packages:

2 targets/streamly-targets.cabal

3− benchmark/report/report.cabal

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

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

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

5 streamly.cabal

6 core/streamly-core.cabal

7

streamly.cabal+4−4

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

49

50extra-source-files:

51 benchmark/*.hs

52− benchmark/report/Main.hs

52+ benchmark/bench-runner/Main.hs

53− benchmark/report/report.cabal

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

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

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

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

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

79 docs/streamly-docs.cabal

80 targets/streamly-targets.cabal

81 targets/Targets.hs

82− test/report/Main.hs

82+ test/test-runner/Main.hs

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

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

84

85 -- This is duplicated

86 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 @@

1cabal-version: 2.4

2−name: streamly-test-report

2+name: test-runner

3version: 0.1.0.0

4

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

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

25-- category:

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

27

28−executable test-report

28+executable test-runner

29 main-is: Main.hs

30

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