X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Frts%2FProfiling.c;h=abe319ddf3f8467a672f12beb1875153e46caa48;hb=423d477bfecd490de1449c59325c8776f91d7aac;hp=b0c38dbfcc0feb631d53f1fe3d0bb0ff4cc92cfc;hpb=45f66f4ef8154db7d1a7e7faf7cc70050212215f;p=ghc-hetmet.git diff --git a/ghc/rts/Profiling.c b/ghc/rts/Profiling.c index b0c38db..abe319d 100644 --- a/ghc/rts/Profiling.c +++ b/ghc/rts/Profiling.c @@ -1,5 +1,5 @@ /* ----------------------------------------------------------------------------- - * $Id: Profiling.c,v 1.23 2001/10/18 13:46:47 simonmar Exp $ + * $Id: Profiling.c,v 1.38 2004/08/13 13:10:26 simonmar Exp $ * * (c) The GHC Team, 1998-2000 * @@ -16,8 +16,18 @@ #include "Profiling.h" #include "Storage.h" #include "Proftimer.h" -#include "Itimer.h" +#include "Timer.h" #include "ProfHeap.h" +#include "Arena.h" +#include "RetainerProfile.h" +#include "LdvProfile.h" + +#include + +/* + * Profiling allocation arena. + */ +Arena *prof_arena; /* * Global variables used to assign unique IDs to cc's, ccs's, and @@ -28,24 +38,10 @@ unsigned int CC_ID; unsigned int CCS_ID; unsigned int HP_ID; -/* Table sizes from old profiling system. Not sure if we'll need - * these. - */ -nat time_intervals = 0; -nat earlier_ticks = 0; -nat max_cc_no = 0; -nat max_mod_no = 0; -nat max_grp_no = 0; -nat max_descr_no = 0; -nat max_type_no = 0; - -/* Are we time-profiling? - */ -rtsBool time_profiling = rtsFalse; - /* figures for the profiling report. */ -static lnat total_alloc, total_prof_ticks; +static ullong total_alloc; +static lnat total_prof_ticks; /* Globals for opening the profiling log file(s) */ @@ -135,16 +131,12 @@ static CostCentreStack * ActualPush ( CostCentreStack *, CostCentre * ); static CostCentreStack * IsInIndexTable ( IndexTable *, CostCentre * ); static IndexTable * AddToIndexTable ( IndexTable *, CostCentreStack *, CostCentre *, unsigned int ); +static void ccsSetSelected ( CostCentreStack *ccs ); +static void initTimeProfiling ( void ); +static void initProfilingLogFile( void ); - -#ifdef DEBUG -static void printCCS ( CostCentreStack *ccs ); -#endif -static void initTimeProfiling ( void ); -static void initProfilingLogFile( void ); - -static void reportCCS_XML ( CostCentreStack *ccs ); +static void reportCCS_XML ( CostCentreStack *ccs ); /* ----------------------------------------------------------------------------- Initialise the profiling environment @@ -153,6 +145,9 @@ static void reportCCS_XML ( CostCentreStack *ccs ); void initProfiling1 (void) { + // initialise our arena + prof_arena = newArena(); + /* for the benefit of allocate()... */ CCCS = CCS_SYSTEM; @@ -204,7 +199,9 @@ initProfiling2 (void) */ ASSERT(CCS_MAIN->prevStack == 0); CCS_MAIN->root = CC_MAIN; + ccsSetSelected(CCS_MAIN); DecCCS(CCS_MAIN); + for (ccs = CCS_LIST; ccs != CCS_MAIN; ) { next = ccs->prevStack; ccs->prevStack = 0; @@ -221,18 +218,60 @@ initProfiling2 (void) initHeapProfiling(); } } - + +// Decide whether closures with this CCS should contribute to the heap +// profile. +static void +ccsSetSelected( CostCentreStack *ccs ) +{ + if (RtsFlags.ProfFlags.modSelector) { + if (! strMatchesSelector( ccs->cc->module, + RtsFlags.ProfFlags.modSelector ) ) { + ccs->selected = 0; + return; + } + } + if (RtsFlags.ProfFlags.ccSelector) { + if (! strMatchesSelector( ccs->cc->label, + RtsFlags.ProfFlags.ccSelector ) ) { + ccs->selected = 0; + return; + } + } + if (RtsFlags.ProfFlags.ccsSelector) { + CostCentreStack *c; + for (c = ccs; c != NULL; c = c->prevStack) { + if ( strMatchesSelector( c->cc->label, + RtsFlags.ProfFlags.ccsSelector )) { + break; + } + } + if (c == NULL) { + ccs->selected = 0; + return; + } + } + + ccs->selected = 1; + return; +} + + static void initProfilingLogFile(void) { /* Initialise the log file name */ - prof_filename = stgMallocBytes(strlen(prog_argv[0]) + 6, "initProfiling"); - sprintf(prof_filename, "%s.prof", prog_argv[0]); + prof_filename = arenaAlloc(prof_arena, strlen(prog_name) + 6); + sprintf(prof_filename, "%s.prof", prog_name); /* open the log file */ if ((prof_file = fopen(prof_filename, "w")) == NULL) { fprintf(stderr, "Can't open profiling report file %s\n", prof_filename); RtsFlags.CcFlags.doCostCentres = 0; + // The following line was added by Sung; retainer/LDV profiling may need + // two output files, i.e., .prof/hp. + if (RtsFlags.ProfFlags.doHeapProfile == HEAP_BY_RETAINER) + RtsFlags.ProfFlags.doHeapProfile = 0; return; } @@ -253,8 +292,8 @@ initProfilingLogFile(void) if (RtsFlags.ProfFlags.doHeapProfile) { /* Initialise the log file name */ - hp_filename = stgMallocBytes(strlen(prog_argv[0]) + 6, "initProfiling"); - sprintf(hp_filename, "%s.hp", prog_argv[0]); + hp_filename = arenaAlloc(prof_arena, strlen(prog_name) + 6); + sprintf(hp_filename, "%s.hp", prog_name); /* open the log file */ if ((hp_file = fopen(hp_filename, "w")) == NULL) { @@ -269,8 +308,6 @@ initProfilingLogFile(void) void initTimeProfiling(void) { - time_profiling = rtsTrue; - /* Start ticking */ startProfTimer(); }; @@ -291,19 +328,19 @@ endProfiling ( void ) -------------------------------------------------------------------------- */ rtsBool entering_PAP; -CostCentreStack * -EnterFunCCS ( CostCentreStack *cccs, CostCentreStack *ccsfn ) +void +EnterFunCCS ( CostCentreStack *ccsfn ) { /* PAP_entry has already set CCCS for us */ if (entering_PAP) { entering_PAP = rtsFalse; - return CCCS; + return; } if (ccsfn->root->is_caf == CC_IS_CAF) { - return AppendCCS(cccs,ccsfn); + CCCS = AppendCCS(CCCS,ccsfn); } else { - return ccsfn; + CCCS = ccsfn; } } @@ -319,7 +356,7 @@ PushCostCentre ( CostCentreStack *ccs, CostCentre *cc ) { IF_DEBUG(prof, fprintf(stderr,"Pushing %s on ", cc->label); - printCCS(ccs); + fprintCCS(stderr,ccs); fprintf(stderr,"\n")); return PushCostCentre(ccs,cc); } @@ -381,9 +418,9 @@ AppendCCS ( CostCentreStack *ccs1, CostCentreStack *ccs2 ) IF_DEBUG(prof, if (ccs1 != ccs2) { fprintf(stderr,"Appending "); - printCCS(ccs1); + fprintCCS(stderr,ccs1); fprintf(stderr," to "); - printCCS(ccs2); + fprintCCS(stderr,ccs2); fprintf(stderr,"\n");}); return AppendCCS(ccs1,ccs2); } @@ -415,7 +452,7 @@ ActualPush ( CostCentreStack *ccs, CostCentre *cc ) CostCentreStack *new_ccs; /* allocate space for a new CostCentreStack */ - new_ccs = (CostCentreStack *) stgMallocBytes(sizeof(CostCentreStack), "Error allocating space for CostCentreStack"); + new_ccs = (CostCentreStack *) arenaAlloc(prof_arena, sizeof(CostCentreStack)); return ActualPush_(ccs, cc, new_ccs); } @@ -445,6 +482,9 @@ ActualPush_ ( CostCentreStack *ccs, CostCentre *cc, CostCentreStack *new_ccs ) new_ccs->root = ccs->root; + // Set the selected field. + ccsSetSelected(new_ccs); + /* update the memoization table for the parent stack */ if (ccs != EMPTY_STACK) ccs->indexTable = AddToIndexTable(ccs->indexTable, new_ccs, cc, @@ -480,7 +520,7 @@ AddToIndexTable(IndexTable *it, CostCentreStack *new_ccs, { IndexTable *new_it; - new_it = stgMallocBytes(sizeof(IndexTable), "AddToIndexTable"); + new_it = arenaAlloc(prof_arena, sizeof(IndexTable)); new_it->cc = cc; new_it->ccs = new_ccs; @@ -520,6 +560,35 @@ DecBackEdge( CostCentreStack *ccs, CostCentreStack *oldccs ) Generating a time & allocation profiling report. -------------------------------------------------------------------------- */ +/* We omit certain system-related CCs and CCSs from the default + * reports, so as not to cause confusion. + */ +static rtsBool +cc_to_ignore (CostCentre *cc) +{ + if ( cc == CC_OVERHEAD + || cc == CC_DONT_CARE + || cc == CC_GC + || cc == CC_SYSTEM) { + return rtsTrue; + } else { + return rtsFalse; + } +} + +static rtsBool +ccs_to_ignore (CostCentreStack *ccs) +{ + if ( ccs == CCS_OVERHEAD + || ccs == CCS_DONT_CARE + || ccs == CCS_GC + || ccs == CCS_SYSTEM) { + return rtsTrue; + } else { + return rtsFalse; + } +} + /* ----------------------------------------------------------------------------- Generating the aggregated per-cost-centre time/alloc report. -------------------------------------------------------------------------- */ @@ -577,7 +646,7 @@ report_per_cc_costs( void ) } } - fprintf(prof_file, "%-20s %-10s", "COST CENTRE", "MODULE"); + fprintf(prof_file, "%-30s %-20s", "COST CENTRE", "MODULE"); fprintf(prof_file, "%6s %6s", "%time", "%alloc"); if (RtsFlags.CcFlags.doCostCentres >= COST_CENTRES_VERBOSE) { fprintf(prof_file, " %5s %9s", "ticks", "bytes"); @@ -585,17 +654,20 @@ report_per_cc_costs( void ) fprintf(prof_file, "\n\n"); for (cc = sorted_cc_list; cc != NULL; cc = cc->link) { - fprintf(prof_file, "%-20s %-10s", cc->label, cc->module); - fprintf(prof_file, "%6.1f %6.1f", - total_prof_ticks == 0 ? 0.0 : (cc->time_ticks / (StgFloat) total_prof_ticks * 100), - total_alloc == 0 ? 0.0 : (cc->mem_alloc / (StgFloat) - total_alloc * 100) - ); - - if (RtsFlags.CcFlags.doCostCentres >= COST_CENTRES_VERBOSE) { - fprintf(prof_file, " %5ld %9lld", cc->time_ticks, cc->mem_alloc); - } - fprintf(prof_file, "\n"); + if (cc_to_ignore(cc)) { + continue; + } + fprintf(prof_file, "%-30s %-20s", cc->label, cc->module); + fprintf(prof_file, "%6.1f %6.1f", + total_prof_ticks == 0 ? 0.0 : (cc->time_ticks / (StgFloat) total_prof_ticks * 100), + total_alloc == 0 ? 0.0 : (cc->mem_alloc / (StgFloat) + total_alloc * 100) + ); + + if (RtsFlags.CcFlags.doCostCentres >= COST_CENTRES_VERBOSE) { + fprintf(prof_file, " %5ld %9lld", cc->time_ticks, cc->mem_alloc); + } + fprintf(prof_file, "\n"); } fprintf(prof_file,"\n\n"); @@ -608,10 +680,10 @@ report_per_cc_costs( void ) static void fprint_header( void ) { - fprintf(prof_file, "%-24s %-10s individual inherited\n", "", ""); + fprintf(prof_file, "%-24s %-10s individual inherited\n", "", ""); - fprintf(prof_file, "%-24s %-10s", "COST CENTRE", "MODULE"); - fprintf(prof_file, "%8s %5s %5s %5s %5s", "entries", "%time", "%alloc", "%time", "%alloc"); + fprintf(prof_file, "%-24s %-50s", "COST CENTRE", "MODULE"); + fprintf(prof_file, "%6s %10s %5s %5s %5s %5s", "no.", "entries", "%time", "%alloc", "%time", "%alloc"); if (RtsFlags.CcFlags.doCostCentres >= COST_CENTRES_VERBOSE) { fprintf(prof_file, " %5s %9s", "ticks", "bytes"); @@ -625,7 +697,7 @@ fprint_header( void ) } void -report_ccs_profiling( void ) +reportCCSProfiling( void ) { nat count; char temp[128]; /* sigh: magic constant */ @@ -643,13 +715,14 @@ report_ccs_profiling( void ) gen_XML_logfile(); return; default: + break; } fprintf(prof_file, "\t%s Time and Allocation Profiling Report (%s)\n", time_str(), "Final"); fprintf(prof_file, "\n\t "); - fprintf(prof_file, " %s", prog_argv[0]); + fprintf(prof_file, " %s", prog_name); fprintf(prof_file, " +RTS"); for (count = 0; rts_argv[count]; count++) fprintf(prof_file, " %s", rts_argv[count]); @@ -663,9 +736,8 @@ report_ccs_profiling( void ) total_prof_ticks, TICK_MILLISECS); fprintf(prof_file, "\ttotal alloc = %11s bytes", - ullong_format_string((ullong) total_alloc * sizeof(W_), + ullong_format_string(total_alloc * sizeof(W_), temp, rtsTrue/*commas*/)); - /* ToDo: 64-bit error! */ #if defined(PROFILING_DETAIL_COUNTS) fprintf(prof_file, " (%lu closures)", total_allocs); @@ -678,8 +750,6 @@ report_ccs_profiling( void ) fprint_header(); reportCCS(pruneCCSTree(CCS_MAIN), 0); - - fclose(prof_file); } static void @@ -697,15 +767,15 @@ reportCCS(CostCentreStack *ccs, nat indent) /* force printing of *all* cost centres if -P -P */ { - fprintf(prof_file, "%-*s%-*s %-10s", + fprintf(prof_file, "%-*s%-*s %-50s", indent, "", 24-indent, cc->label, cc->module); - fprintf(prof_file, "%8lld %5.1f %5.1f %5.1f %5.1f", - ccs->scc_count, - total_prof_ticks == 0 ? 0.0 : (ccs->time_ticks / (StgFloat) total_prof_ticks * 100), - total_alloc == 0 ? 0.0 : (ccs->mem_alloc / (StgFloat) total_alloc * 100), - total_prof_ticks == 0 ? 0.0 : (ccs->inherited_ticks / (StgFloat) total_prof_ticks * 100), - total_alloc == 0 ? 0.0 : (ccs->inherited_alloc / (StgFloat) total_alloc * 100) + fprintf(prof_file, "%6d %11.0f %5.1f %5.1f %5.1f %5.1f", + ccs->ccsID, (double) ccs->scc_count, + total_prof_ticks == 0 ? 0.0 : ((double)ccs->time_ticks / (double)total_prof_ticks * 100.0), + total_alloc == 0 ? 0.0 : ((double)ccs->mem_alloc / (double)total_alloc * 100.0), + total_prof_ticks == 0 ? 0.0 : ((double)ccs->inherited_ticks / (double)total_prof_ticks * 100.0), + total_alloc == 0 ? 0.0 : ((double)ccs->inherited_alloc / (double)total_alloc * 100.0) ); if (RtsFlags.CcFlags.doCostCentres >= COST_CENTRES_VERBOSE) { @@ -769,23 +839,6 @@ inherit_costs(CostCentreStack *ccs) return; } -/* return rtsTrue if it is one of the ones that - * should not be reported normally (because it confuses - * the users) - */ -static rtsBool -ccs_to_ignore (CostCentreStack *ccs) -{ - if ( ccs == CCS_OVERHEAD - || ccs == CCS_DONT_CARE - || ccs == CCS_GC - || ccs == CCS_SYSTEM) { - return rtsTrue; - } else { - return rtsFalse; - } -} - static CostCentreStack * pruneCCSTree( CostCentreStack *ccs ) { @@ -853,39 +906,16 @@ reportCCS_XML(CostCentreStack *ccs) } void -print_ccs (FILE *fp, CostCentreStack *ccs) -{ - if (ccs == CCCS) { - fprintf(fp, "Cost-Centre Stack: "); - } - - if (ccs != CCS_MAIN) - { - print_ccs(fp, ccs->prevStack); - fprintf(fp, "->[%s,%s]", ccs->cc->label, ccs->cc->module); - } else { - fprintf(fp, "[%s,%s]", ccs->cc->label, ccs->cc->module); - } - - if (ccs == CCCS) { - fprintf(fp, "\n"); - } -} - - -#ifdef DEBUG -static void -printCCS ( CostCentreStack *ccs ) +fprintCCS( FILE *f, CostCentreStack *ccs ) { - fprintf(stderr,"<"); - for (; ccs; ccs = ccs->prevStack ) { - fprintf(stderr,ccs->cc->label); - if (ccs->prevStack) { - fprintf(stderr,","); - } + fprintf(f,"<"); + for (; ccs && ccs != CCS_MAIN; ccs = ccs->prevStack ) { + fprintf(f,"%s.%s", ccs->cc->module, ccs->cc->label); + if (ccs->prevStack && ccs->prevStack != CCS_MAIN) { + fprintf(f,","); + } } - fprintf(stderr,">"); + fprintf(f,">"); } -#endif #endif /* PROFILING */