X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fincludes%2FStgTicky.h;h=fdef66868fc665d43ba1958e6ebedca43ab4e3d0;hb=d8a22a2b98e2ccb3a49d6524583fbad636c7d81d;hp=dc0a47850c1e446a455cbf516ef4b922f36a8865;hpb=1e295cefb7bf257899dee252917c40f5850e8627;p=ghc-hetmet.git diff --git a/ghc/includes/StgTicky.h b/ghc/includes/StgTicky.h index dc0a478..fdef668 100644 --- a/ghc/includes/StgTicky.h +++ b/ghc/includes/StgTicky.h @@ -1,5 +1,5 @@ /* ---------------------------------------------------------------------------- - * $Id: StgTicky.h,v 1.5 1999/06/24 13:10:31 simonmar Exp $ + * $Id: StgTicky.h,v 1.12 2002/04/09 11:00:11 njn Exp $ * * (c) The AQUA project, Glasgow University, 1994-1997 * (c) The GHC Team, 1998-1999 @@ -21,7 +21,18 @@ * the allocations gives an indication of how many things we get per trip * to the well: */ -#define TICK_ALLOC_HEAP(n) ALLOC_HEAP_ctr++; ALLOC_HEAP_tot += (n) +#define TICK_ALLOC_HEAP(n, f_ct) \ + { \ + f_ct.allocs += (n); \ + ALLOC_HEAP_ctr++; \ + ALLOC_HEAP_tot += (n); \ + } + +#define TICK_ALLOC_HEAP_NOCTR(n) \ + { \ + ALLOC_HEAP_ctr++; \ + ALLOC_HEAP_tot += (n); \ + } /* We count things every time we allocate something in the dynamic heap. * For each, we count the number of words of (1) ``admin'' (header), @@ -124,42 +135,66 @@ #define TICK_ENT_VIA_NODE() ENT_VIA_NODE_ctr++ -#define TICK_ENT_THK() ENT_THK_ctr++ /* thunk */ -#define TICK_ENT_FUN_STD() ENT_FUN_STD_ctr++ /* std entry pt */ +#define TICK_ENT_STATIC_THK() ENT_STATIC_THK_ctr++ +#define TICK_ENT_DYN_THK() ENT_DYN_THK_ctr++ -struct ent_counter { +typedef struct _StgEntCounter { unsigned registeredp:16, /* 0 == no, 1 == yes */ arity:16, /* arity (static info) */ stk_args:16; /* # of args off stack */ /* (rest of args are in registers) */ - StgChar *f_str; /* name of the thing */ - StgChar *f_arg_kinds; /* info about the args types */ - I_ ctr; /* the actual counter */ - struct ent_counter *link; /* link to chain them all together */ -}; - -#define TICK_ENT_FUN_DIRECT(f_ct, f_str, f_arity, f_args, f_arg_kinds) \ + char *str; /* name of the thing */ + char *arg_kinds; /* info about the args types */ + I_ entry_count; /* Trips to fast entry code */ + I_ slow_entry_count; /* Trips to slow entry code */ + I_ allocs; /* number of allocations by this fun */ + struct _StgEntCounter *link;/* link to chain them all together */ +} StgEntCounter; + +#define TICK_CTR(f_ct, str, arity, args, arg_kinds) \ + static StgEntCounter f_ct \ + = { 0, arity, args, \ + str, arg_kinds, \ + 0, 0, 0, NULL }; + +/* The slow entry point for a function always goes to + the fast entry point, which will register the stats block, + so no need to do so here */ +#define TICK_ENT_STATIC_FUN_STD(f_ct) \ + f_ct.slow_entry_count++; \ + ENT_STATIC_FUN_STD_ctr++ /* The static total one */ + +#define TICK_ENT_DYN_FUN_STD(f_ct) \ + f_ct.slow_entry_count++; \ + ENT_DYN_FUN_STD_ctr++ /* The dynamic total one */ + +#define TICK_ENT_FUN_DIRECT_BODY(f_ct) \ { \ - static struct ent_counter f_ct \ - = { 0, \ - (f_arity), (f_args), (f_str), (f_arg_kinds), \ - 0, NULL }; \ - if ( ! f_ct.registeredp ) { \ + if ( ! f_ct.registeredp ) { \ /* hook this one onto the front of the list */ \ f_ct.link = ticky_entry_ctrs; \ ticky_entry_ctrs = & (f_ct); \ - \ /* mark it as "registered" */ \ f_ct.registeredp = 1; \ + } \ + f_ct.entry_count += 1; \ } \ - f_ct.ctr += 1; \ - } \ - ENT_FUN_DIRECT_ctr++ /* the old boring one */ -extern struct ent_counter *ticky_entry_ctrs; +#define TICK_ENT_STATIC_FUN_DIRECT(f_ct) \ + TICK_ENT_FUN_DIRECT_BODY(f_ct) \ + ENT_STATIC_FUN_DIRECT_ctr++ /* The static total one */ + +#define TICK_ENT_DYN_FUN_DIRECT(f_ct) \ + TICK_ENT_FUN_DIRECT_BODY(f_ct) \ + ENT_DYN_FUN_DIRECT_ctr++ /* The dynamic total one */ -#define TICK_ENT_CON(n) ENT_CON_ctr++ /* enter constructor */ -#define TICK_ENT_IND(n) ENT_IND_ctr++ /* enter indirection */ +extern StgEntCounter top_ct; +extern StgEntCounter *ticky_entry_ctrs; + +#define TICK_ENT_STATIC_CON(n) ENT_STATIC_CON_ctr++ /* enter static constructor */ +#define TICK_ENT_DYN_CON(n) ENT_DYN_CON_ctr++ /* enter dynamic constructor */ +#define TICK_ENT_STATIC_IND(n) ENT_STATIC_IND_ctr++ /* enter static indirection */ +#define TICK_ENT_DYN_IND(n) ENT_DYN_IND_ctr++ /* enter dynamic indirection */ #define TICK_ENT_PERM_IND(n) ENT_PERM_IND_ctr++ /* enter permanent indirection */ #define TICK_ENT_PAP(n) ENT_PAP_ctr++ /* enter PAP */ #define TICK_ENT_AP_UPD(n) ENT_AP_UPD_ctr++ /* enter AP_UPD */ @@ -239,11 +274,10 @@ extern struct ent_counter *ticky_entry_ctrs; Macro Where ----------------------- -------------------------------------------- - TICK_UPD_EXISTING Updating with an indirection to something - already in the heap TICK_UPD_SQUEEZED Same as UPD_EXISTING but because of stack-squeezing TICK_UPD_CON_IN_NEW Allocating a new CON + TICK_UPD_CON_IN_PLACE Updating with a PAP in place TICK_UPD_PAP_IN_NEW Allocating a new PAP TICK_UPD_PAP_IN_PLACE Updating with a PAP in place @@ -254,12 +288,14 @@ extern struct ent_counter *ticky_entry_ctrs; __idx = (n); \ UPD_##categ##_hst[((__idx > 8) ? 8 : __idx)] += 1;} -#define TICK_UPD_EXISTING() UPD_EXISTING_ctr++ #define TICK_UPD_SQUEEZED() UPD_SQUEEZED_ctr++ #define TICK_UPD_CON_IN_NEW(n) UPD_CON_IN_NEW_ctr++ ; \ TICK_UPD_HISTO(CON_IN_NEW,n) +#define TICK_UPD_CON_IN_PLACE(n) UPD_CON_IN_PLACE_ctr++; \ + TICK_UPD_HISTO(CON_IN_PLACE,n) + #define TICK_UPD_PAP_IN_NEW(n) UPD_PAP_IN_NEW_ctr++ ; \ TICK_UPD_HISTO(PAP_IN_NEW,n) @@ -440,11 +476,16 @@ EXTERN unsigned long ALLOC_BF_hst[5] #endif EXTERN unsigned long ENT_VIA_NODE_ctr INIT(0); -EXTERN unsigned long ENT_THK_ctr INIT(0); -EXTERN unsigned long ENT_FUN_STD_ctr INIT(0); -EXTERN unsigned long ENT_FUN_DIRECT_ctr INIT(0); -EXTERN unsigned long ENT_CON_ctr INIT(0); -EXTERN unsigned long ENT_IND_ctr INIT(0); +EXTERN unsigned long ENT_STATIC_THK_ctr INIT(0); +EXTERN unsigned long ENT_DYN_THK_ctr INIT(0); +EXTERN unsigned long ENT_STATIC_FUN_STD_ctr INIT(0); +EXTERN unsigned long ENT_DYN_FUN_STD_ctr INIT(0); +EXTERN unsigned long ENT_STATIC_FUN_DIRECT_ctr INIT(0); +EXTERN unsigned long ENT_DYN_FUN_DIRECT_ctr INIT(0); +EXTERN unsigned long ENT_STATIC_CON_ctr INIT(0); +EXTERN unsigned long ENT_DYN_CON_ctr INIT(0); +EXTERN unsigned long ENT_STATIC_IND_ctr INIT(0); +EXTERN unsigned long ENT_DYN_IND_ctr INIT(0); EXTERN unsigned long ENT_PERM_IND_ctr INIT(0); EXTERN unsigned long ENT_PAP_ctr INIT(0); EXTERN unsigned long ENT_AP_UPD_ctr INIT(0); @@ -495,9 +536,9 @@ EXTERN unsigned long CATCHF_PUSHED_ctr INIT(0); EXTERN unsigned long UPDF_RCC_PUSHED_ctr INIT(0); EXTERN unsigned long UPDF_RCC_OMITTED_ctr INIT(0); -EXTERN unsigned long UPD_EXISTING_ctr INIT(0); EXTERN unsigned long UPD_SQUEEZED_ctr INIT(0); EXTERN unsigned long UPD_CON_IN_NEW_ctr INIT(0); +EXTERN unsigned long UPD_CON_IN_PLACE_ctr INIT(0); EXTERN unsigned long UPD_PAP_IN_NEW_ctr INIT(0); EXTERN unsigned long UPD_PAP_IN_PLACE_ctr INIT(0); @@ -506,6 +547,11 @@ EXTERN unsigned long UPD_CON_IN_NEW_hst[9] = {0,0,0,0,0,0,0,0,0} #endif ; +EXTERN unsigned long UPD_CON_IN_PLACE_hst[9] +#ifdef TICKY_C + = {0,0,0,0,0,0,0,0,0} +#endif +; EXTERN unsigned long UPD_PAP_IN_NEW_hst[9] #ifdef TICKY_C = {0,0,0,0,0,0,0,0,0} @@ -539,7 +585,8 @@ EXTERN unsigned long GC_WORDS_COPIED_ctr INIT(0); #else /* !TICKY_TICKY */ -#define TICK_ALLOC_HEAP(words) +#define TICK_ALLOC_HEAP(words, f_ct) +#define TICK_ALLOC_HEAP_NOCTR(words) #define TICK_ALLOC_FUN(g,s) #define TICK_ALLOC_UP_THK(g,s) @@ -557,12 +604,17 @@ EXTERN unsigned long GC_WORDS_COPIED_ctr INIT(0); #define TICK_ENT_VIA_NODE() -#define TICK_ENT_THK() -#define TICK_ENT_FUN_STD() -#define TICK_ENT_FUN_DIRECT(n) +#define TICK_ENT_STATIC_THK() +#define TICK_ENT_DYN_THK() +#define TICK_ENT_STATIC_FUN_STD(n) +#define TICK_ENT_DYN_FUN_STD(n) +#define TICK_ENT_STATIC_FUN_DIRECT(n) +#define TICK_ENT_DYN_FUN_DIRECT(n) -#define TICK_ENT_CON(n) -#define TICK_ENT_IND(n) +#define TICK_ENT_STATIC_CON(n) +#define TICK_ENT_DYN_CON(n) +#define TICK_ENT_STATIC_IND(n) +#define TICK_ENT_DYN_IND(n) #define TICK_ENT_PERM_IND(n) #define TICK_ENT_PAP(n) #define TICK_ENT_AP_UPD(n) @@ -583,9 +635,9 @@ EXTERN unsigned long GC_WORDS_COPIED_ctr INIT(0); #define TICK_UPDF_RCC_PUSHED() #define TICK_UPDF_RCC_OMITTED() -#define TICK_UPD_EXISTING() #define TICK_UPD_SQUEEZED() #define TICK_UPD_CON_IN_NEW(n) +#define TICK_UPD_CON_IN_PLACE(n) #define TICK_UPD_PAP_IN_NEW(n) #define TICK_UPD_PAP_IN_PLACE()