From 7036fde9df61b6eae9719c7f6c656778c756bec9 Mon Sep 17 00:00:00 2001 From: Simon Marlow Date: Fri, 29 Jul 2016 14:11:03 +0100 Subject: Overhaul of Compact Regions (#12455) Summary: This commit makes various improvements and addresses some issues with Compact Regions (aka Compact Normal Forms). This was the most important thing I wanted to fix. Compaction previously prevented GC from running until it was complete, which would be a problem in a multicore setting. Now, we compact using a hand-written Cmm routine that can be interrupted at any point. When a GC is triggered during a sharing-enabled compaction, the GC has to traverse and update the hash table, so this hash table is now stored in the StgCompactNFData object. Previously, compaction consisted of a deepseq using the NFData class, followed by a traversal in C code to copy the data. This is now done in a single pass with hand-written Cmm (see rts/Compact.cmm). We no longer use the NFData instances, instead the Cmm routine evaluates components directly as it compacts. The new compaction is about 50% faster than the old one with no sharing, and a little faster on average with sharing (the cost of the hash table dominates when we're doing sharing). Static objects that don't (transitively) refer to any CAFs don't need to be copied into the compact region. In particular this means we often avoid copying Char values and small Int values, because these are static closures in the runtime. Each Compact# object can support a single compactAdd# operation at any given time, so the Data.Compact library now enforces mutual exclusion using an MVar stored in the Compact object. We now get exceptions rather than killing everything with a barf() when we encounter an object that cannot be compacted (a function, or a mutable object). We now also detect pinned objects, which can't be compacted either. The Data.Compact API has been refactored and cleaned up. A new compactSize operation returns the size (in bytes) of the compact object. Most of the documentation is in the Haddock docs for the compact library, which I've expanded and improved here. Various comments in the code have been improved, especially the main Note [Compact Normal Forms] in rts/sm/CNF.c. I've added a few tests, and expanded a few of the tests that were there. We now also run the tests with GHCi, and in a new test way that enables sanity checking (+RTS -DS). There's a benchmark in libraries/compact/tests/compact_bench.hs for measuring compaction speed and comparing sharing vs. no sharing. The field totalDataW in StgCompactNFData was unnecessary. Test Plan: * new unit tests * validate * tested manually that we can compact Data.Aeson data Reviewers: gcampax, bgamari, ezyang, austin, niteria, hvr, erikd Subscribers: thomie, simonpj Differential Revision: https://phabricator.haskell.org/D2751 GHC Trac Issues: #12455 --- rts/Stats.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) (limited to 'rts/Stats.c') diff --git a/rts/Stats.c b/rts/Stats.c index 95511f2c35..767a36fd96 100644 --- a/rts/Stats.c +++ b/rts/Stats.c @@ -817,7 +817,7 @@ stat_exit (void) void statDescribeGens(void) { - uint32_t g, mut, lge, i; + uint32_t g, mut, lge, compacts, i; W_ gen_slop; W_ tot_live, tot_slop; W_ gen_live, gen_blocks; @@ -825,10 +825,10 @@ statDescribeGens(void) generation *gen; debugBelch( -"----------------------------------------------------------\n" -" Gen Max Mut-list Blocks Large Live Slop\n" -" Blocks Bytes Objects \n" -"----------------------------------------------------------\n"); +"----------------------------------------------------------------------\n" +" Gen Max Mut-list Blocks Large Compacts Live Slop\n" +" Blocks Bytes Objects \n" +"----------------------------------------------------------------------\n"); tot_live = 0; tot_slop = 0; @@ -840,6 +840,10 @@ statDescribeGens(void) lge++; } + for (bd = gen->compact_objects, compacts = 0; bd; bd = bd->link) { + compacts++; + } + gen_live = genLiveWords(gen); gen_blocks = genLiveBlocks(gen); @@ -862,15 +866,15 @@ statDescribeGens(void) gen_slop = gen_blocks * BLOCK_SIZE_W - gen_live; - debugBelch("%8" FMT_Word " %8d %8" FMT_Word " %8" FMT_Word "\n", gen_blocks, lge, + debugBelch("%8" FMT_Word " %8d %8d %9" FMT_Word " %9" FMT_Word "\n", gen_blocks, lge, compacts, gen_live*(W_)sizeof(W_), gen_slop*(W_)sizeof(W_)); tot_live += gen_live; tot_slop += gen_slop; } - debugBelch("----------------------------------------------------------\n"); - debugBelch("%41s%8" FMT_Word " %8" FMT_Word "\n", + debugBelch("----------------------------------------------------------------------\n"); + debugBelch("%51s%9" FMT_Word " %9" FMT_Word "\n", "",tot_live*sizeof(W_),tot_slop*sizeof(W_)); - debugBelch("----------------------------------------------------------\n"); + debugBelch("----------------------------------------------------------------------\n"); debugBelch("\n"); } -- cgit v1.2.1