X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2FStats.c;h=9a9accad6c36d9d2917189153296fc398d2b0571;hb=4c394999264d602f10e7623cefa7588423c4f68b;hp=f18e26fbd578591b22cbbb3775134b76a69065cc;hpb=6015a94f9108a502150565577b66c23650796639;p=ghc-hetmet.git diff --git a/rts/Stats.c b/rts/Stats.c index f18e26f..9a9acca 100644 --- a/rts/Stats.c +++ b/rts/Stats.c @@ -16,6 +16,9 @@ #include "ParTicky.h" /* ToDo: move into Rts.h */ #include "Profiling.h" #include "GetTime.h" +#include "GC.h" +#include "GCUtils.h" +#include "Evac.h" #if USE_PAPI #include "Papi.h" @@ -41,7 +44,6 @@ static Ticks ExitElapsedTime = 0; static ullong GC_tot_alloc = 0; static ullong GC_tot_copied = 0; -static ullong GC_tot_scavd_copied = 0; static Ticks GC_start_time = 0, GC_tot_time = 0; /* User GC Time */ static Ticks GCe_start_time = 0, GCe_tot_time = 0; /* Elapsed GC time */ @@ -66,7 +68,8 @@ static lnat ResidencySamples = 0; // for stats only static lnat GC_start_faults = 0, GC_end_faults = 0; -static Ticks *GC_coll_times; +static Ticks *GC_coll_times = NULL; +static Ticks *GC_coll_etimes = NULL; static void statsFlush( void ); static void statsClose( void ); @@ -139,8 +142,13 @@ initStats(void) (Ticks *)stgMallocBytes( sizeof(Ticks)*RtsFlags.GcFlags.generations, "initStats"); + GC_coll_etimes = + (Ticks *)stgMallocBytes( + sizeof(Ticks)*RtsFlags.GcFlags.generations, + "initStats"); for (i = 0; i < RtsFlags.GcFlags.generations; i++) { GC_coll_times[i] = 0; + GC_coll_etimes[i] = 0; } } @@ -172,8 +180,6 @@ stat_endInit(void) InitElapsedTime = elapsed - ElapsedTimeStart; } #if USE_PAPI - papi_init_eventsets(); - /* We start counting events for the mutator * when garbage collection starts * we switch to the GC event set. */ @@ -288,8 +294,7 @@ stat_startGC(void) -------------------------------------------------------------------------- */ void -stat_endGC (lnat alloc, lnat live, lnat copied, - lnat scavd_copied, lnat gen) +stat_endGC (lnat alloc, lnat live, lnat copied, lnat gen) { if (RtsFlags.GcFlags.giveStats != NO_GC_STATS) { Ticks time, etime, gc_time, gc_etime; @@ -302,7 +307,7 @@ stat_endGC (lnat alloc, lnat live, lnat copied, nat faults = getPageFaults(); statsPrintf("%9ld %9ld %9ld", - alloc*sizeof(W_), (copied+scavd_copied)*sizeof(W_), + alloc*sizeof(W_), copied*sizeof(W_), live*sizeof(W_)); statsPrintf(" %5.2f %5.2f %7.2f %7.2f %4ld %4ld (Gen: %2ld)\n", TICK_TO_DBL(gc_time), @@ -318,9 +323,9 @@ stat_endGC (lnat alloc, lnat live, lnat copied, } GC_coll_times[gen] += gc_time; + GC_coll_etimes[gen] += gc_etime; GC_tot_copied += (ullong) copied; - GC_tot_scavd_copied += (ullong) scavd_copied; GC_tot_alloc += (ullong) alloc; GC_tot_time += gc_time; GCe_tot_time += gc_etime; @@ -352,7 +357,11 @@ stat_endGC (lnat alloc, lnat live, lnat copied, #if USE_PAPI if(papi_is_reporting) { /* Switch to counting mutator events */ - papi_stop_gc_count(); + if (gen == 0) { + papi_stop_gc0_count(); + } else { + papi_stop_gc1_count(); + } papi_start_mutator_count(); } #endif @@ -522,12 +531,8 @@ stat_exit(int alloc) ullong_format_string(GC_tot_copied*sizeof(W_), temp, rtsTrue/*commas*/); - statsPrintf("%11s bytes copied during GC (scavenged)\n", temp); + statsPrintf("%11s bytes copied during GC\n", temp); - ullong_format_string(GC_tot_scavd_copied*sizeof(W_), - temp, rtsTrue/*commas*/); - statsPrintf("%11s bytes copied during GC (not scavenged)\n", temp); - if ( ResidencySamples > 0 ) { ullong_format_string(MaxResidency*sizeof(W_), temp, rtsTrue/*commas*/); @@ -538,12 +543,13 @@ stat_exit(int alloc) /* Print garbage collections in each gen */ for (g = 0; g < RtsFlags.GcFlags.generations; g++) { - statsPrintf("%11d collections in generation %d (%6.2fs)\n", + statsPrintf("%11d collections in generation %d, %6.2fs, %6.2fs elapsed\n", generations[g].collections, g, - TICK_TO_DBL(GC_coll_times[g])); + TICK_TO_DBL(GC_coll_times[g]), + TICK_TO_DBL(GC_coll_etimes[g])); } - statsPrintf("\n%11ld Mb total memory in use\n\n", + statsPrintf("\n%11ld MB total memory in use\n\n", mblocks_allocated * MBLOCK_SIZE / (1024 * 1024)); #if defined(THREADED_RTS) @@ -613,16 +619,7 @@ stat_exit(int alloc) */ #if USE_PAPI - /* PAPI reporting, should put somewhere else? - * Note that the cycles are counted _after_ the initialization of the RTS -- AR */ - - statsPrintf(" -- CPU Mutator counters --\n"); - papi_mut_cycles(); - papi_report(MutatorCounters); - - statsPrintf("\n -- CPU GC counters --\n"); - papi_gc_cycles(); - papi_report(GCCounters); + papi_stats_report(); #endif } @@ -641,12 +638,32 @@ stat_exit(int alloc) TICK_TO_DBL(GC_tot_time), TICK_TO_DBL(GCe_tot_time)); } +#if defined(THREADED_RTS) && defined(PROF_SPIN) + { + nat g, s; + + statsPrintf("recordMutableGen_sync: %"FMT_Word64"\n", recordMutableGen_sync.spin); + statsPrintf("gc_alloc_block_sync: %"FMT_Word64"\n", gc_alloc_block_sync.spin); + statsPrintf("whitehole_spin: %"FMT_Word64"\n", whitehole_spin); + for (g = 0; g < RtsFlags.GcFlags.generations; g++) { + for (s = 0; s < generations[g].n_steps; s++) { + statsPrintf("gen[%d].steps[%d].sync_todo: %"FMT_Word64"\n", g, s, generations[g].steps[s].sync_todo.spin); + statsPrintf("gen[%d].steps[%d].sync_large_objects: %"FMT_Word64"\n", g, s, generations[g].steps[s].sync_large_objects.spin); + } + } + } +#endif + statsFlush(); statsClose(); } + if (GC_coll_times) stgFree(GC_coll_times); GC_coll_times = NULL; + if (GC_coll_etimes) + stgFree(GC_coll_etimes); + GC_coll_etimes = NULL; } /* ----------------------------------------------------------------------------- @@ -654,7 +671,6 @@ stat_exit(int alloc) Produce some detailed info on the state of the generational GC. -------------------------------------------------------------------------- */ -#ifdef DEBUG void statDescribeGens(void) { @@ -682,14 +698,10 @@ statDescribeGens(void) for (bd = step->large_objects, lge = 0; bd; bd = bd->link) { lge++; } - live = step->n_large_blocks * BLOCK_SIZE; - bd = step->blocks; // This live figure will be slightly less that the "live" figure // given by +RTS -Sstderr, because we take don't count the // slop at the end of each block. - for (; bd; bd = bd->link) { - live += (bd->free - bd->start) * sizeof(W_); - } + live += countOccupied(step->blocks) + countOccupied(step->large_objects); if (s != 0) { debugBelch("%36s",""); } @@ -699,7 +711,6 @@ statDescribeGens(void) } debugBelch("\n"); } -#endif /* ----------------------------------------------------------------------------- Stats available via a programmatic interface, so eg. GHCi can time