diff options
| author | Simon Marlow <marlowsd@gmail.com> | 2015-11-07 09:39:05 +0000 |
|---|---|---|
| committer | Simon Marlow <marlowsd@gmail.com> | 2015-11-07 09:39:05 +0000 |
| commit | ce1f1607ed7f8fedd2f63c8610cafefd59baaf32 (patch) | |
| tree | 718641160c3d93a2ca974deec1e228cb09e1a97e /testsuite/mk | |
| parent | a58eeb7febd67c93dab82de7049ef1dcdecd34e9 (diff) | |
| download | haskell-ce1f1607ed7f8fedd2f63c8610cafefd59baaf32.tar.gz | |
Make GHCi & TH work when the compiler is built with -prof
Summary:
Amazingly, there were zero changes to the byte code generator and very
few changes to the interpreter - mainly because we've used good
abstractions that hide the differences between profiling and
non-profiling. So that bit was pleasantly straightforward, but there
were a pile of other wibbles to get the whole test suite through.
Note that a compiler built with -prof is now like one built with
-dynamic, in that to use TH you have to build the code the same way.
For dynamic, we automatically enable -dynamic-too when TH is required,
but we don't have anything equivalent for profiling, so you have to
explicitly use -prof when building code that uses TH with a profiled
compiler. For this reason Cabal won't work with TH. We don't expect
to ship a profiled compiler, so I think that's OK.
Test Plan: validate with GhcProfiled=YES in validate.mk
Reviewers: goldfire, bgamari, rwbarton, austin, hvr, erikd, ezyang
Reviewed By: ezyang
Subscribers: thomie
Differential Revision: https://phabricator.haskell.org/D1407
GHC Trac Issues: #4837, #545
Diffstat (limited to 'testsuite/mk')
| -rw-r--r-- | testsuite/mk/boilerplate.mk | 4 | ||||
| -rw-r--r-- | testsuite/mk/ghc-config.hs | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/testsuite/mk/boilerplate.mk b/testsuite/mk/boilerplate.mk index 055c85659a..30398790d0 100644 --- a/testsuite/mk/boilerplate.mk +++ b/testsuite/mk/boilerplate.mk @@ -250,6 +250,10 @@ ifeq "$(GhcDynamic)" "YES" ghcThWayFlags = -dynamic ghciWayFlags = -dynamic ghcPluginWayFlags = -dynamic +else ifeq "$(GhcProfiled)" "YES" +ghcThWayFlags = -prof +ghciWayFlags = -prof +ghcPluginWayFlags = -prof else ghcThWayFlags = -static ghciWayFlags = -static diff --git a/testsuite/mk/ghc-config.hs b/testsuite/mk/ghc-config.hs index c5ad5ff3b7..4ca3d3085c 100644 --- a/testsuite/mk/ghc-config.hs +++ b/testsuite/mk/ghc-config.hs @@ -25,6 +25,7 @@ main = do getGhcFieldOrFail fields "GhcRTSWays" "RTS ways" getGhcFieldOrDefault fields "GhcDynamicByDefault" "Dynamic by default" "NO" getGhcFieldOrDefault fields "GhcDynamic" "GHC Dynamic" "NO" + getGhcFieldOrDefault fields "GhcProfiled" "GHC Profiled" "NO" getGhcFieldProgWithDefault fields "AR" "ar command" "ar" getGhcFieldProgWithDefault fields "LLC" "LLVM llc command" "llc" |