X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fincludes%2FStgTicky.h;h=fdef66868fc665d43ba1958e6ebedca43ab4e3d0;hb=e2bcc01c862ab0c4a12040172429075aa5921b49;hp=bd4fa1c1296401e77d34937fe813bdbb3a2bd190;hpb=7f309f1c021e7583f724cce599ce2dd3c439361b;p=ghc-hetmet.git diff --git a/ghc/includes/StgTicky.h b/ghc/includes/StgTicky.h index bd4fa1c..fdef668 100644 --- a/ghc/includes/StgTicky.h +++ b/ghc/includes/StgTicky.h @@ -1,5 +1,5 @@ /* ---------------------------------------------------------------------------- - * $Id: StgTicky.h,v 1.3 1999/02/05 16:02:30 simonm 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), @@ -41,8 +52,13 @@ ALLOC_FUN_gds += (g); ALLOC_FUN_slp += (s); \ TICK_ALLOC_HISTO(FUN,_HS,g,s) -#define TICK_ALLOC_THK(g,s) \ - ALLOC_THK_ctr++; ALLOC_THK_adm += _HS; \ +#define TICK_ALLOC_UP_THK(g,s) \ + ALLOC_UP_THK_ctr++; ALLOC_THK_adm += _HS; \ + ALLOC_THK_gds += (g); ALLOC_THK_slp += (s); \ + TICK_ALLOC_HISTO(THK,_HS,g,s) + +#define TICK_ALLOC_SE_THK(g,s) \ + ALLOC_SE_THK_ctr++; ALLOC_THK_adm += _HS; \ ALLOC_THK_gds += (g); ALLOC_THK_slp += (s); \ TICK_ALLOC_HISTO(THK,_HS,g,s) @@ -119,16 +135,72 @@ #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_FUN_DIRECT(n) ENT_FUN_DIRECT_ctr++ /* fast entry pt */ - -#define TICK_ENT_CON(n) ENT_CON_ctr++ /* enter constructor */ -#define TICK_ENT_IND(n) ENT_IND_ctr++ /* enter indirection */ +#define TICK_ENT_STATIC_THK() ENT_STATIC_THK_ctr++ +#define TICK_ENT_DYN_THK() ENT_DYN_THK_ctr++ + +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) */ + 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) \ + { \ + 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; \ + } \ + +#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 */ + +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 */ #define TICK_ENT_BH() ENT_BH_ctr++ /* enter BLACKHOLE */ + /* ----------------------------------------------------------------------------- Returns -------------------------------------------------------------------------- */ @@ -185,7 +257,8 @@ -------------------------------------------------------------------------- */ #define TICK_UPDF_OMITTED() UPDF_OMITTED_ctr++ -#define TICK_UPDF_PUSHED() UPDF_PUSHED_ctr++ +#define TICK_UPDF_PUSHED(tgt,inf) UPDF_PUSHED_ctr++ \ +/* ; fprintf(stderr,"UPDF_PUSHED:%p:%p\n",tgt,inf) */ #define TICK_SEQF_PUSHED() SEQF_PUSHED_ctr++ #define TICK_CATCHF_PUSHED() CATCHF_PUSHED_ctr++ #define TICK_UPDF_RCC_PUSHED() UPDF_RCC_PUSHED_ctr++ @@ -201,11 +274,10 @@ 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 @@ -216,12 +288,14 @@ __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) @@ -230,7 +304,22 @@ /* For the generational collector: */ #define TICK_UPD_NEW_IND() UPD_NEW_IND_ctr++ +#define TICK_UPD_NEW_PERM_IND(tgt) UPD_NEW_PERM_IND_ctr++ \ +/* ; fprintf(stderr,"UPD_NEW_PERM:%p\n",tgt) */ #define TICK_UPD_OLD_IND() UPD_OLD_IND_ctr++ +#define TICK_UPD_OLD_PERM_IND() UPD_OLD_PERM_IND_ctr++ + +/* Count blackholes: + */ +#define TICK_UPD_BH_UPDATABLE() UPD_BH_UPDATABLE_ctr++ +#define TICK_UPD_BH_SINGLE_ENTRY() UPD_BH_SINGLE_ENTRY_ctr++ +#define TICK_UPD_CAF_BH_UPDATABLE(s) \ + UPD_CAF_BH_UPDATABLE_ctr++ \ +/* ; fprintf(stderr,"TICK_UPD_CAF_BH_UPDATABLE(%s)\n",s) */ +#define TICK_UPD_CAF_BH_SINGLE_ENTRY(s) \ + UPD_CAF_BH_SINGLE_ENTRY_ctr++ \ +/* ; fprintf(stderr,"TICK_UPD_CAF_BH_SINGLE_ENTRY(%s)\n",s) */ + /* ----------------------------------------------------------------------------- Garbage collection counters @@ -283,7 +372,8 @@ EXTERN unsigned long ALLOC_FUN_hst[5] #endif ; -EXTERN unsigned long ALLOC_THK_ctr INIT(0); +EXTERN unsigned long ALLOC_UP_THK_ctr INIT(0); +EXTERN unsigned long ALLOC_SE_THK_ctr INIT(0); EXTERN unsigned long ALLOC_THK_adm INIT(0); EXTERN unsigned long ALLOC_THK_gds INIT(0); EXTERN unsigned long ALLOC_THK_slp INIT(0); @@ -386,11 +476,17 @@ 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); EXTERN unsigned long ENT_BH_ctr INIT(0); @@ -440,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); @@ -451,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} @@ -458,7 +559,14 @@ EXTERN unsigned long UPD_PAP_IN_NEW_hst[9] ; EXTERN unsigned long UPD_NEW_IND_ctr INIT(0); +EXTERN unsigned long UPD_NEW_PERM_IND_ctr INIT(0); EXTERN unsigned long UPD_OLD_IND_ctr INIT(0); +EXTERN unsigned long UPD_OLD_PERM_IND_ctr INIT(0); + +EXTERN unsigned long UPD_BH_UPDATABLE_ctr INIT(0); +EXTERN unsigned long UPD_BH_SINGLE_ENTRY_ctr INIT(0); +EXTERN unsigned long UPD_CAF_BH_UPDATABLE_ctr INIT(0); +EXTERN unsigned long UPD_CAF_BH_SINGLE_ENTRY_ctr INIT(0); EXTERN unsigned long GC_SEL_ABANDONED_ctr INIT(0); EXTERN unsigned long GC_SEL_MINOR_ctr INIT(0); @@ -477,10 +585,12 @@ 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_THK(g,s) +#define TICK_ALLOC_UP_THK(g,s) +#define TICK_ALLOC_SE_THK(g,s) #define TICK_ALLOC_CON(g,s) #define TICK_ALLOC_TUP(g,s) #define TICK_ALLOC_BH(g,s) @@ -494,12 +604,18 @@ 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) #define TICK_ENT_BH() @@ -513,20 +629,27 @@ EXTERN unsigned long GC_WORDS_COPIED_ctr INIT(0); #define TICK_VEC_RETURN(n) #define TICK_UPDF_OMITTED() -#define TICK_UPDF_PUSHED() +#define TICK_UPDF_PUSHED(tgt,inf) #define TICK_SEQF_PUSHED() #define TICK_CATCHF_PUSHED() #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() #define TICK_UPD_NEW_IND() +#define TICK_UPD_NEW_PERM_IND(tgt) #define TICK_UPD_OLD_IND() +#define TICK_UPD_OLD_PERM_IND() + +#define TICK_UPD_BH_UPDATABLE() +#define TICK_UPD_BH_SINGLE_ENTRY() +#define TICK_UPD_CAF_BH_UPDATABLE() +#define TICK_UPD_CAF_BH_SINGLE_ENTRY() #define TICK_GC_SEL_ABANDONED() #define TICK_GC_SEL_MINOR()