diff options
author | Herbert Valerio Riedel <hvr@gnu.org> | 2014-10-19 20:37:40 +0200 |
---|---|---|
committer | Herbert Valerio Riedel <hvr@gnu.org> | 2014-11-12 11:03:42 +0100 |
commit | c774b28f76ee4c220f7c1c9fd81585e0e3af0e8a (patch) | |
tree | 9fc156d8e3c7d8fd414b572826f139c1efa5f34c /libraries/base | |
parent | fcfc87dce752c3c1702eeb54d1023213729f1832 (diff) | |
download | haskell-c774b28f76ee4c220f7c1c9fd81585e0e3af0e8a.tar.gz |
Implement new integer-gmp2 from scratch (re #9281)
This is done as a separate `integer-gmp2` backend library because it
turned out to become a complete rewrite from scratch.
Due to the different (over)allocation scheme and potentially different
accounting (via the new `{shrink,resize}MutableByteArray#` primitives),
some of the nofib benchmarks actually results in increased allocation
numbers (but not necessarily an increase in runtime!). I believe the
allocation numbers could improve if `{resize,shrink}MutableByteArray#`
could be optimised to reallocate in-place more efficiently.
Here are the more apparent changes in the latest nofib comparision
between `integer-gmp` and `integer-gmp2`:
------------------------------------------------------------------
Program Size Allocs Runtime Elapsed TotalMem
------------------------------------------------------------------
...
bernouilli +1.6% +15.3% 0.132 0.132 0.0%
...
cryptarithm1 -2.2% 0.0% -9.7% -9.7% 0.0%
...
fasta -0.7% -0.0% +10.9% +10.9% 0.0%
...
kahan +0.6% +38.9% 0.169 0.169 0.0%
...
lcss -0.7% -0.0% -6.4% -6.4% 0.0%
...
mandel +1.6% +33.6% 0.049 0.049 0.0%
...
pidigits +0.8% +8.5% +3.9% +3.9% 0.0%
power +1.4% -23.8% -18.6% -18.6% -16.7%
...
primetest +1.3% +50.1% 0.085 0.085 0.0%
...
rsa +1.6% +53.4% 0.026 0.026 0.0%
...
scs +1.2% +6.6% +6.5% +6.6% +14.3%
...
symalg +1.0% +9.5% 0.010 0.010 0.0%
...
transform -0.6% -0.0% -5.9% -5.9% 0.0%
...
------------------------------------------------------------------
Min -2.3% -23.8% -18.6% -18.6% -16.7%
Max +1.6% +53.4% +10.9% +10.9% +14.3%
Geometric Mean -0.3% +1.9% -0.8% -0.8% +0.0%
(see P35 / https://phabricator.haskell.org/P35 for full report)
By default, `INTEGER_LIBRARY=integer-gmp2` is active now, which results
in the package `integer-gmp-1.0.0.0` being registered in the package db.
The previous `integer-gmp-0.5.1.0` can be restored by setting
`INTEGER_LIBRARY=integer-gmp` (but will probably be removed altogether
for GHC 7.12). In-tree GMP support has been stolen from the old
`integer-gmp` (while unpatching the custom memory-allocators, as well as
forcing `-fPIC`)
A minor hack to `ghc-cabal` was necessary in order to support two different
`integer-gmp` packages (in different folders) with the same package key.
There will be a couple of follow-up commits re-implementing some features
that were dropped to keep D82 minimal, as well as further
clean-ups/improvements.
More information can be found via #9281 and
https://ghc.haskell.org/trac/ghc/wiki/Design/IntegerGmp2
Reviewed By: austin, rwbarton, simonmar
Differential Revision: https://phabricator.haskell.org/D82
Diffstat (limited to 'libraries/base')
-rw-r--r-- | libraries/base/GHC/Real.hs | 4 | ||||
-rw-r--r-- | libraries/base/base.cabal | 19 |
2 files changed, 22 insertions, 1 deletions
diff --git a/libraries/base/GHC/Real.hs b/libraries/base/GHC/Real.hs index dd806bc561..2b5f6cc78d 100644 --- a/libraries/base/GHC/Real.hs +++ b/libraries/base/GHC/Real.hs @@ -27,7 +27,11 @@ import GHC.Show import {-# SOURCE #-} GHC.Exception( divZeroException, overflowException, ratioZeroDenomException ) #ifdef OPTIMISE_INTEGER_GCD_LCM +# if defined(MIN_VERSION_integer_gmp) || defined(MIN_VERSION_integer_gmp2) import GHC.Integer.GMP.Internals +# else +# error unsupported OPTIMISE_INTEGER_GCD_LCM configuration +# endif #endif infixr 8 ^, ^^ diff --git a/libraries/base/base.cabal b/libraries/base/base.cabal index 7e5ca15476..c3f4d28a1e 100644 --- a/libraries/base/base.cabal +++ b/libraries/base/base.cabal @@ -44,6 +44,18 @@ source-repository head Flag integer-simple Description: Use integer-simple + Manual: True + Default: False + +Flag integer-gmp + Description: Use integer-gmp + Manual: True + Default: False + +Flag integer-gmp2 + Description: Use integer-gmp2 + Manual: True + Default: False Library default-language: Haskell2010 @@ -90,10 +102,15 @@ Library build-depends: rts == 1.0.*, ghc-prim >= 0.3.1 && < 0.4 if flag(integer-simple) build-depends: integer-simple >= 0.1.1 && < 0.2 - else + + if flag(integer-gmp) build-depends: integer-gmp >= 0.5.1 && < 0.6 cpp-options: -DOPTIMISE_INTEGER_GCD_LCM + if flag(integer-gmp2) + build-depends: integer-gmp >= 1.0 && < 1.1 + cpp-options: -DOPTIMISE_INTEGER_GCD_LCM + exposed-modules: Control.Applicative Control.Arrow |