Refactor PAPI support, and add profiling of multithreaded GC

[ghc-hetmet.git] / rts / Stats.c

diff --git a/rts/Stats.c b/rts/Stats.c
index f18e26f..1127b81 100644 (file)
--- a/rts/Stats.c
+++ b/rts/Stats.c
@@ -41,7 +41,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 */
@@ -172,8 +171,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 +285,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 +298,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),
@@ -320,7 +316,6 @@ stat_endGC (lnat alloc, lnat live, lnat copied,
        GC_coll_times[gen] += gc_time;
 
        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;
@@ -522,12 +517,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*/);
@@ -613,16 +604,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
        }