Repository : ssh://g...@git.haskell.org/bytestring
On branch : ghc-head
Link :
http://git.haskell.org/packages/bytestring.git/commitdiff/0e147ddd283d6a0bc68d2f880457bc32d2d4697c
>---------------------------------------------------------------
commit 0e147ddd283d6a0bc68d2f880457bc32d2d4697c
Author: Duncan Coutts <dun...@community.haskell.org>
Date: Sun Oct 6 14:42:32 2013 +0100
Move the other benchmarks into the separate cabal file
They also have the problem with recursive dependencies.
>---------------------------------------------------------------
0e147ddd283d6a0bc68d2f880457bc32d2d4697c
bench/bench-bytestring.cabal | 28 +++++++++++++++++++++++++++
bytestring.cabal | 44 ------------------------------------------
2 files changed, 28 insertions(+), 44 deletions(-)
diff --git a/bench/bench-bytestring.cabal b/bench/bench-bytestring.cabal
index f0ce82e..3222a3c 100644
--- a/bench/bench-bytestring.cabal
+++ b/bench/bench-bytestring.cabal
@@ -124,3 +124,31 @@ executable bench-bytestring-builder
-- NamedFieldPuns
-- PackageImports
-- ForeignFunctionInterface
+
+executable bench-builder-boundscheck
+ hs-source-dirs: .. .
+ main-is: BoundsCheckFusion.hs
+ build-depends: base, deepseq, ghc-prim,
+ criterion
+ c-sources: ../cbits/fpstring.c
+ ../cbits/itoa.c
+ include-dirs: ../include
+ ghc-options: -O2
+ -fmax-simplifier-iterations=10
+ -fdicts-cheap
+ -fspec-constr-count=6
+
+--executable bench-builder-csv
+-- hs-source-dirs: .. .
+-- main-is: CSV.hs
+-- build-depends: base, deepseq, ghc-prim,
+-- text, binary,
+-- criterion
+-- c-sources: ../cbits/fpstring.c
+-- ../cbits/itoa.c
+-- include-dirs: ../include
+-- ghc-options: -O2
+-- -fmax-simplifier-iterations=10
+-- -fdicts-cheap
+-- -fspec-constr-count=6
+
diff --git a/bytestring.cabal b/bytestring.cabal
index 208cffc..75dc6c6 100644
--- a/bytestring.cabal
+++ b/bytestring.cabal
@@ -193,47 +193,3 @@ test-suite test-builder
includes: fpstring.h
install-includes: fpstring.h
-benchmark bench-builder-all
- type: exitcode-stdio-1.0
- hs-source-dirs: . bench
- main-is: BenchAll.hs
- build-depends: base, deepseq, ghc-prim,
- criterion
- c-sources: cbits/fpstring.c
- cbits/itoa.c
- include-dirs: include
- ghc-options: -O2
- -fmax-simplifier-iterations=10
- -fdicts-cheap
- -fspec-constr-count=6
-
-benchmark bench-builder-boundscheck
- type: exitcode-stdio-1.0
- hs-source-dirs: . bench
- main-is: BoundsCheckFusion.hs
- build-depends: base, deepseq, ghc-prim,
- criterion
- c-sources: cbits/fpstring.c
- cbits/itoa.c
- include-dirs: include
- ghc-options: -O2
- -fmax-simplifier-iterations=10
- -fdicts-cheap
- -fspec-constr-count=6
-
--- Sadly we cannot use benchmark bench-builder-csv currently because it
--- depends on both text and binary, which both depend on bytestring
--- which gives cabal fits about cyclic dependencies.
--- type: exitcode-stdio-1.0
--- hs-source-dirs: . bench
--- main-is: CSV.hs
--- build-depends: base, deepseq, ghc-prim,
--- text, binary,
--- criterion
--- c-sources: cbits/fpstring.c
--- cbits/itoa.c
--- include-dirs: include
--- ghc-options: -O2
--- -fmax-simplifier-iterations=10
--- -fdicts-cheap
--- -fspec-constr-count=6
_______________________________________________
ghc-commits mailing list
ghc-commits@haskell.org
http://www.haskell.org/mailman/listinfo/ghc-commits
