X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Frts%2FTicky.c;h=04734d550bb4462bd5c0bb5a1263476c4213da2c;hb=9c383315203f0ad7cfd65272d04d921c0cef3cec;hp=dbbdcdb0a1f7491a65f65cbbab444c6039d7d2f7;hpb=5c67176de89fee19a02056216a7c58579e765148;p=ghc-hetmet.git diff --git a/ghc/rts/Ticky.c b/ghc/rts/Ticky.c index dbbdcdb..04734d5 100644 --- a/ghc/rts/Ticky.c +++ b/ghc/rts/Ticky.c @@ -1,5 +1,5 @@ /* ----------------------------------------------------------------------------- - * $Id: Ticky.c,v 1.10 1999/10/13 16:39:24 simonmar Exp $ + * $Id: Ticky.c,v 1.16 2002/03/04 10:35:43 keithw Exp $ * * (c) The AQUA project, Glasgow University, 1992-1997 * (c) The GHC Team, 1998-1999 @@ -10,6 +10,7 @@ #if defined(TICKY_TICKY) #define TICKY_C /* define those variables */ +#include "PosixSource.h" #include "Rts.h" #include "RtsFlags.h" #include "Ticky.h" @@ -66,14 +67,20 @@ PrintTickyInfo(void) unsigned long tot_wds = /* total words */ tot_adm_wds + tot_gds_wds + tot_slp_wds; + unsigned long tot_thk_enters = ENT_STATIC_THK_ctr + ENT_DYN_THK_ctr; + unsigned long tot_con_enters = ENT_STATIC_CON_ctr + ENT_DYN_CON_ctr; + unsigned long tot_fun_direct_enters = ENT_STATIC_FUN_DIRECT_ctr + ENT_DYN_FUN_DIRECT_ctr; + unsigned long tot_fun_std_enters = ENT_STATIC_FUN_STD_ctr + ENT_DYN_FUN_STD_ctr; + unsigned long tot_ind_enters = ENT_STATIC_IND_ctr + ENT_DYN_IND_ctr; + unsigned long tot_enters = - ENT_CON_ctr + ENT_FUN_DIRECT_ctr + - ENT_IND_ctr + ENT_PERM_IND_ctr + ENT_PAP_ctr + ENT_THK_ctr; + tot_con_enters + tot_fun_direct_enters + + tot_ind_enters + ENT_PERM_IND_ctr + ENT_PAP_ctr + tot_thk_enters; unsigned long jump_direct_enters = tot_enters - ENT_VIA_NODE_ctr; unsigned long bypass_enters = - ENT_FUN_DIRECT_ctr - - (ENT_FUN_STD_ctr - UPD_PAP_IN_NEW_ctr); + tot_fun_direct_enters - + (tot_fun_std_enters - UPD_PAP_IN_NEW_ctr); unsigned long tot_returns = RET_NEW_ctr + RET_OLD_ctr + RET_UNBOXED_TUP_ctr + @@ -182,22 +189,22 @@ PrintTickyInfo(void) jump_direct_enters, PC(INTAVG(jump_direct_enters,tot_enters))); fprintf(tf,"%7ld (%5.1f%%) thunks\n", - ENT_THK_ctr, - PC(INTAVG(ENT_THK_ctr,tot_enters))); + tot_thk_enters, + PC(INTAVG(tot_thk_enters,tot_enters))); fprintf(tf,"%7ld (%5.1f%%) data values\n", - ENT_CON_ctr, - PC(INTAVG(ENT_CON_ctr,tot_enters))); + tot_con_enters, + PC(INTAVG(tot_con_enters,tot_enters))); fprintf(tf,"%7ld (%5.1f%%) function values\n\t\t [of which %ld (%.1f%%) bypassed arg-satisfaction chk]\n", - ENT_FUN_DIRECT_ctr, - PC(INTAVG(ENT_FUN_DIRECT_ctr,tot_enters)), + tot_fun_direct_enters, + PC(INTAVG(tot_fun_direct_enters,tot_enters)), bypass_enters, - PC(INTAVG(bypass_enters,ENT_FUN_DIRECT_ctr))); + PC(INTAVG(bypass_enters,tot_fun_direct_enters))); fprintf(tf,"%7ld (%5.1f%%) partial applications\n", ENT_PAP_ctr, PC(INTAVG(ENT_PAP_ctr,tot_enters))); fprintf(tf,"%7ld (%5.1f%%) normal indirections\n", - ENT_IND_ctr, - PC(INTAVG(ENT_IND_ctr,tot_enters))); + tot_ind_enters, + PC(INTAVG(tot_ind_enters,tot_enters))); fprintf(tf,"%7ld (%5.1f%%) permanent indirections\n", ENT_PERM_IND_ctr, PC(INTAVG(ENT_PERM_IND_ctr,tot_enters))); @@ -402,10 +409,14 @@ PrintTickyInfo(void) #endif PR_CTR(ENT_VIA_NODE_ctr); - PR_CTR(ENT_CON_ctr); - PR_CTR(ENT_FUN_STD_ctr); - PR_CTR(ENT_FUN_DIRECT_ctr); - PR_CTR(ENT_IND_ctr); + PR_CTR(ENT_STATIC_CON_ctr); + PR_CTR(ENT_DYN_CON_ctr); + PR_CTR(ENT_STATIC_FUN_STD_ctr); + PR_CTR(ENT_DYN_FUN_STD_ctr); + PR_CTR(ENT_STATIC_FUN_DIRECT_ctr); + PR_CTR(ENT_DYN_FUN_DIRECT_ctr); + PR_CTR(ENT_STATIC_IND_ctr); + PR_CTR(ENT_DYN_IND_ctr); /* The counters ENT_PERM_IND and UPD_{NEW,OLD}_PERM_IND are not dumped * at the end of execution unless update squeezing is turned off (+RTS @@ -420,12 +431,13 @@ PrintTickyInfo(void) * * This of course refers to the -ticky version that uses PERM_INDs to * determine the number of closures entered 0/1/>1. KSW 1999-04. */ - COND_PR_CTR(ENT_PERM_IND_ctr,RtsFlags.GcFlags.squeezeUpdFrames == rtsTrue,"E!NT_PERM_IND_ctr requires +RTS -Z"); + COND_PR_CTR(ENT_PERM_IND_ctr,RtsFlags.GcFlags.squeezeUpdFrames == rtsFalse,"E!NT_PERM_IND_ctr requires +RTS -Z"); PR_CTR(ENT_PAP_ctr); PR_CTR(ENT_AP_UPD_ctr); PR_CTR(ENT_BH_ctr); - PR_CTR(ENT_THK_ctr); + PR_CTR(ENT_STATIC_THK_ctr); + PR_CTR(ENT_DYN_THK_ctr); PR_CTR(RET_NEW_ctr); PR_CTR(RET_OLD_ctr); @@ -524,10 +536,10 @@ PrintTickyInfo(void) PR_CTR(UPD_NEW_IND_ctr); /* see comment on ENT_PERM_IND_ctr */ - COND_PR_CTR(UPD_NEW_PERM_IND_ctr,RtsFlags.GcFlags.squeezeUpdFrames == rtsTrue,"U!PD_NEW_PERM_IND_ctr requires +RTS -Z"); + COND_PR_CTR(UPD_NEW_PERM_IND_ctr,RtsFlags.GcFlags.squeezeUpdFrames == rtsFalse,"U!PD_NEW_PERM_IND_ctr requires +RTS -Z"); PR_CTR(UPD_OLD_IND_ctr); /* see comment on ENT_PERM_IND_ctr */ - COND_PR_CTR(UPD_OLD_PERM_IND_ctr,RtsFlags.GcFlags.squeezeUpdFrames == rtsTrue,"U!PD_OLD_PERM_IND_ctr requires +RTS -Z"); + COND_PR_CTR(UPD_OLD_PERM_IND_ctr,RtsFlags.GcFlags.squeezeUpdFrames == rtsFalse,"U!PD_OLD_PERM_IND_ctr requires +RTS -Z"); PR_CTR(GC_SEL_ABANDONED_ctr); PR_CTR(GC_SEL_MINOR_ctr); @@ -550,19 +562,20 @@ printRegisteredCounterInfo (FILE *tf) if ( ticky_entry_ctrs != NULL ) { fprintf(tf,"\n**************************************************\n\n"); } - fprintf(tf, "%-30s %6s%6s %-16s%-11s%-11s\n", - "Function", "Arity", "Stack", "Kinds", "Entries", - "Allocs"); + fprintf(tf, "%11s%11s%11s %6s%6s %-11s%-30s\n", + "Entries", "Slow ent", "Allocs", "Arity", "Stack", "Kinds", "Function"); fprintf(tf, "--------------------------------------------------------------------------------\n"); + /* Function name at the end so it doesn't mess up the tabulation */ for (p = ticky_entry_ctrs; p != NULL; p = p->link) { - fprintf(tf, "%-30s%6u%6u %-11s%11ld%11ld", - p->str, + fprintf(tf, "%11ld%11ld%11ld %6u%6u %-11s%-30s", + p->entry_count, + p->slow_entry_count, + p->allocs, p->arity, p->stk_args, p->arg_kinds, - p->ctr, - p->allocs); + p->str); fprintf(tf, "\n"); @@ -575,7 +588,7 @@ printRegisteredCounterInfo (FILE *tf) StgEntCounter top_ct = { 0, 0, 0, "TOP", "", - 0, 0, NULL }; + 0, 0, 0, NULL }; #endif /* TICKY_TICKY */