8fd51b2 · streamly · git.iko.soy

benchmark/README.md+2−2

compare with master

unifiedsplit

@@ -126,13 +126,13 @@ it basically selects all benchmarks starting with

126Run a specific benchmark in `Prelude.Serial` suite:

127

128```

129−$ bench.sh --benchmarks Prelude.Serial --prefix Prelude.Serial/o-1-space/generation/unfoldr

129+$ bench.sh --benchmarks Prelude.Serial --prefix Prelude.Serial/o-1-space.generation.unfoldr

130```

131

132Run a benchmark directly instead of running it through `bench.sh`:

133

134```

135−$ cabal run bench:Prelude.Serial -- Prelude.Serial/o-1-space/generation/unfoldr

135+$ cabal run bench:Prelude.Serial --prefix Prelude.Serial/o-1-space.generation.unfoldr

136```

137

138The options after `--` are the benchmark executable options.

benchmark/Chart.hs → benchmark/bench-report/BenchReport.hsrenamed

The content is the same.

benchmark/bench-report/bench-report.cabalnew file+23

@@ -0,0 +1,23 @@

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/cabal.projectnew file+1

@@ -0,0 +1 @@

1+packages: benchmark/bench-report/bench-report.cabal

benchmark/bench-report/default.nixnew file+30

@@ -0,0 +1,30 @@

1+{ nixpkgs ? import <nixpkgs> {}, compiler ? "default", doBenchmark ? false }:

2+

3+let

4+

5+ inherit (nixpkgs) pkgs;

6+

7+ f = { mkDerivation, base, bench-show, stdenv, transformers }:

8+ mkDerivation {

9+ pname = "bench-report";

10+ version = "0.0.0";

11+ src = ./.;

12+ isLibrary = false;

13+ isExecutable = true;

14+ executableHaskellDepends = [ base bench-show transformers ];

15+ description = "Benchmark report generation";

16+ license = "unknown";

17+ hydraPlatforms = stdenv.lib.platforms.none;

18+ };

19+

20+ haskellPackages = if compiler == "default"

21+ then pkgs.haskellPackages

22+ else pkgs.haskell.packages.${compiler};

23+

24+ variant = if doBenchmark then pkgs.haskell.lib.doBenchmark else pkgs.lib.id;

25+

26+ drv = variant (haskellPackages.callPackage f {});

27+

28+in

29+

30+ if pkgs.lib.inNixShell then drv.env else drv

benchmark/streamly-benchmarks.cabal−23

@@ -44,11 +44,6 @@ flag has-llvm

44 manual: True

45 default: False

46

47−flag no-charts

48− description: Disable benchmark charts in development build

49− manual: True

50− default: False

51−

52flag opt

47flag opt

53 description: off=-O0 (faster builds), on=-O2

48 description: off=-O0 (faster builds), on=-O2

54 manual: True

49 manual: True

@@ -507,21 +502,3 @@ benchmark Unicode.Stream

507 type: exitcode-stdio-1.0

502 type: exitcode-stdio-1.0

508 hs-source-dirs: Streamly/Benchmark/Unicode

503 hs-source-dirs: Streamly/Benchmark/Unicode

509 main-is: Stream.hs

504 main-is: Stream.hs

510−

511−-------------------------------------------------------------------------------

512−-- benchmark comparison and presentation

513−-------------------------------------------------------------------------------

514−

515−executable chart

516− default-language: Haskell2010

517− ghc-options: -Wall

518− hs-source-dirs: .

519− main-is: Chart.hs

520− if flag(dev) && !flag(no-charts) && !impl(ghcjs)

521− buildable: True

522− build-Depends:

523− base >= 4.9 && < 5

524− , bench-show >= 0.3 && < 0.4

525− , transformers >= 0.4 && < 0.6

526− else

527− buildable: False

bin/bench.sh+9−9

@@ -71,11 +71,11 @@ list_comparisons () {

71# chart is expensive to build and usually not required to be rebuilt,

72# use master branch as fallback

73cabal_which_report() {

74− local path=$(cabal_which streamly-benchmarks x $1)

74+ local path=$(cabal_which bench-report x $1)

75 if test -z "$path"

76 then

77 echo "Cannot find $1 executable, trying in dist-newstyle" 1>&2

78− local path1=$(cabal_which_builddir dist-newstyle streamly-benchmarks x $1)

78+ local path1=$(cabal_which_builddir dist-newstyle bench-report x $1)

79 if test -z "$path1"

80 then

81 local path2="./bin/$1"

@@ -93,7 +93,7 @@ cabal_which_report() {

93}

94

95find_report_prog() {

96− local prog_name="chart"

96+ local prog_name="bench-report"

97 hash -r

98 local prog_path=$(cabal_which_report $prog_name)

99 if test -x "$prog_path"

@@ -105,16 +105,16 @@ find_report_prog() {

105}

106

107build_report_prog() {

108− local prog_name="chart"

108+ local prog_name="bench-report"

109 local prog_path=$(cabal_which_report $prog_name)

110

111 hash -r

112 if test ! -x "$prog_path" -a "$BUILD_ONCE" = "0"

113 then

114− echo "Building bench-show executables"

114+ echo "Building bench-report executables"

115 BUILD_ONCE=1

116− $CABAL_EXECUTABLE v2-build --flags dev chart \

116+ $CABAL_EXECUTABLE v2-build bench-report --project-file=benchmark/bench-report/cabal.project \

117− || die "bench-show build failed"

117+ || die "bench-report build failed"

118

119 elif test ! -x "$prog_path"

120 then

@@ -129,8 +129,8 @@ build_report_progs() {

129 build_report_prog || exit 1

130 local prog

131 prog=$(find_report_prog) || \

132− die "Cannot find bench-show executable"

132+ die "Cannot find bench-report executable"

133− echo "Using bench-show executable [$prog]"

133+ echo "Using bench-report executable [$prog]"

134 fi

135}

136

streamly.cabal+4

@@ -60,6 +60,10 @@ extra-source-files:

60 appveyor.yml

61 benchmark/*.hs

62 benchmark/README.md

63+ benchmark/bench-report/BenchReport.hs

64+ benchmark/bench-report/bench-report.cabal

65+ benchmark/bench-report/cabal.project

66+ benchmark/bench-report/default.nix

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

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

64 benchmark/Streamly/Benchmark/Data/Array/Stream/Foreign.hs

68 benchmark/Streamly/Benchmark/Data/Array/Stream/Foreign.hs

65 benchmark/Streamly/Benchmark/Data/Parser/*.hs

69 benchmark/Streamly/Benchmark/Data/Parser/*.hs