diff options
author | Simon Marlow <marlowsd@gmail.com> | 2016-09-26 12:07:05 +0100 |
---|---|---|
committer | Simon Marlow <marlowsd@gmail.com> | 2018-05-16 13:36:13 +0100 |
commit | eb8e692cab7970c495681e14721d05ecadd21581 (patch) | |
tree | 178cabcdff120f707ab31560086bf85753462cd1 /libraries/ghci | |
parent | a18e7dfabd234af8b55d3280f9375e5e83facca1 (diff) | |
download | haskell-eb8e692cab7970c495681e14721d05ecadd21581.tar.gz |
An overhaul of the SRT representation
Summary:
- Previously we would hvae a single big table of pointers per module,
with a set of bitmaps to reference entries within it. The new
representation is identical to a static constructor, which is much
simpler for the GC to traverse, and we get to remove the complicated
bitmap-traversal code from the GC.
- Rewrite all the code to generate SRTs in CmmBuildInfoTables, and
document it much better (see Note [SRTs]). This has been something
I've wanted to do since we moved to the new code generator, I
finally had the opportunity to finish it while on a transatlantic
flight recently :)
There are a series of 4 diffs:
1. D4632 (this one), which does the bulk of the changes
2. D4633 which adds support for smaller `CmmLabelDiffOff` constants
3. D4634 which takes advantage of D4632 and D4633 to save a word in
info tables that have an SRT on x86_64. This is where most of the
binary size improvement comes from.
4. D4637 which makes a further optimisation to merge some SRTs with
static FUN closures. This adds some complexity and the benefits
are fairly modest, so it's not clear yet whether we should do this.
Results (after (3), on x86_64)
- GHC itself (staticaly linked) is 5.2% smaller
- -1.7% binary sizes in nofib, -2.9% module sizes. Full nofib results: P176
- I measured the overhead of traversing all the static objects in a
major GC in GHC itself by doing `replicateM_ 1000 performGC` as the
first thing in `Main.main`. The new version was 5-10% faster, but
the results did vary quite a bit.
- I'm not sure if there's a compile-time difference, the results are
too unreliable.
Test Plan: validate
Reviewers: bgamari, michalt, niteria, simonpj, erikd, osa1
Subscribers: thomie, carter
Differential Revision: https://phabricator.haskell.org/D4632
Diffstat (limited to 'libraries/ghci')
-rw-r--r-- | libraries/ghci/GHCi/InfoTable.hsc | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/libraries/ghci/GHCi/InfoTable.hsc b/libraries/ghci/GHCi/InfoTable.hsc index d650e246ba..d5e50c2dff 100644 --- a/libraries/ghci/GHCi/InfoTable.hsc +++ b/libraries/ghci/GHCi/InfoTable.hsc @@ -57,7 +57,11 @@ peekItbl a0 = do ptrs' <- (#peek StgInfoTable, layout.payload.ptrs) a0 nptrs' <- (#peek StgInfoTable, layout.payload.nptrs) a0 tipe' <- (#peek StgInfoTable, type) a0 +#if __GLASGOW_HASKELL__ > 804 + srtlen' <- (#peek StgInfoTable, has_srt) a0 +#else srtlen' <- (#peek StgInfoTable, srt_bitmap) a0 +#endif return StgInfoTable { entry = entry' , ptrs = ptrs' @@ -393,7 +397,11 @@ pokeItbl a0 itbl = do (#poke StgInfoTable, layout.payload.ptrs) a0 (ptrs itbl) (#poke StgInfoTable, layout.payload.nptrs) a0 (nptrs itbl) (#poke StgInfoTable, type) a0 (tipe itbl) +#if __GLASGOW_HASKELL__ > 804 + (#poke StgInfoTable, has_srt) a0 (srtlen itbl) +#else (#poke StgInfoTable, srt_bitmap) a0 (srtlen itbl) +#endif #if defined(TABLES_NEXT_TO_CODE) let code_offset = (a0 `plusPtr` (#offset StgInfoTable, code)) case code itbl of |