diff options
| -rw-r--r-- | gcc/ChangeLog | 15 | ||||
| -rw-r--r-- | gcc/ggc-page.c | 3 | ||||
| -rw-r--r-- | gcc/ggc-zone.c | 2 | ||||
| -rw-r--r-- | gcc/timevar.c | 24 | ||||
| -rw-r--r-- | gcc/timevar.def | 14 | ||||
| -rw-r--r-- | gcc/timevar.h | 5 |
6 files changed, 54 insertions, 9 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index e475fd9a331..23086faad7a 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,18 @@ +2005-05-17 Zdenek Dvorak <dvorakz@suse.cz> + + * ggc-page.c (ggc_alloc_stat): Record amount of memory allocated. + * ggc-zone.c (ggc_alloc_zone_1): Ditto. + * timevar.c (timevar_ggc_mem_total): New variable. + (GGC_MEM_BOUND): New constant. + (get_time): Record ggc memory status. + (timevar_accumulate): Accumulate amount of ggc memory. + (timevar_print): Print consumption of ggc memory. + * timevar.def (TV_FIND_REFERENCED_VARS, TV_TREE_REDPHI, + TV_TREE_LOOP_BOUNDS, TV_TREE_LOOP_IVCANON, TV_TREE_VECTORIZATION, + TV_TREE_LINEAR_TRANSFORM): Shorten strings to fit in 22 characters. + * timevar.h (struct timevar_time_def): Add ggc_mem field. + (timevar_ggc_mem_total): Declare. + 2005-05-17 Kazu Hirata <kazu@cs.umass.edu> * tree-into-ssa.c (update_ssa): Clean up by shortening the diff --git a/gcc/ggc-page.c b/gcc/ggc-page.c index c97b84eff03..15f22c9f7f4 100644 --- a/gcc/ggc-page.c +++ b/gcc/ggc-page.c @@ -1203,6 +1203,9 @@ ggc_alloc_stat (size_t size MEM_STAT_DECL) information is used in deciding when to collect. */ G.allocated += object_size; + /* For timevar statistics. */ + timevar_ggc_mem_total += object_size; + #ifdef GATHER_STATISTICS { size_t overhead = object_size - size; diff --git a/gcc/ggc-zone.c b/gcc/ggc-zone.c index 596bbbab7f4..e3c72679d51 100644 --- a/gcc/ggc-zone.c +++ b/gcc/ggc-zone.c @@ -1228,6 +1228,8 @@ ggc_alloc_zone_stat (size_t orig_size, struct alloc_zone *zone /* Keep track of how many bytes are being allocated. This information is used in deciding when to collect. */ zone->allocated += size; + + timevar_ggc_mem_total += (size + CHUNK_OVERHEAD); #ifdef GATHER_STATISTICS ggc_record_overhead (orig_size, size - orig_size, result PASS_MEM_STAT); diff --git a/gcc/timevar.c b/gcc/timevar.c index ffcd9e00876..589b59cf820 100644 --- a/gcc/timevar.c +++ b/gcc/timevar.c @@ -115,6 +115,15 @@ static double clocks_to_msec; bool timevar_enable; +/* Total amount of memory allocated by garbage collector. */ + +size_t timevar_ggc_mem_total; + +/* The amount of memory that will cause us to report the timevar even + if the time spent is not significant. */ + +#define GGC_MEM_BOUND (1 << 20) + /* See timevar.h for an explanation of timing variables. */ /* A timing variable. */ @@ -183,6 +192,7 @@ get_time (struct timevar_time_def *now) now->user = 0; now->sys = 0; now->wall = 0; + now->ggc_mem = timevar_ggc_mem_total; if (!timevar_enable) return; @@ -216,6 +226,7 @@ timevar_accumulate (struct timevar_time_def *timer, timer->user += stop_time->user - start_time->user; timer->sys += stop_time->sys - start_time->sys; timer->wall += stop_time->wall - start_time->wall; + timer->ggc_mem += stop_time->ggc_mem - start_time->ggc_mem; } /* Initialize timing variables. */ @@ -417,7 +428,8 @@ timevar_print (FILE *fp) zeroes. */ if (tv->elapsed.user < tiny && tv->elapsed.sys < tiny - && tv->elapsed.wall < tiny) + && tv->elapsed.wall < tiny + && tv->elapsed.ggc_mem < GGC_MEM_BOUND) continue; /* The timing variable name. */ @@ -444,6 +456,13 @@ timevar_print (FILE *fp) (total->wall == 0 ? 0 : tv->elapsed.wall / total->wall) * 100); #endif /* HAVE_WALL_TIME */ + /* Print the amount of ggc memory allocated. */ + fprintf (fp, "%8u kB (%2.0f%%) ggc", + (unsigned) (tv->elapsed.ggc_mem >> 10), + (total->ggc_mem == 0 + ? 0 + : (float) tv->elapsed.ggc_mem / total->ggc_mem) * 100); + putc ('\n', fp); } @@ -456,8 +475,9 @@ timevar_print (FILE *fp) fprintf (fp, "%7.2f ", total->sys); #endif #ifdef HAVE_WALL_TIME - fprintf (fp, "%7.2f\n", total->wall); + fprintf (fp, "%7.2f ", total->wall); #endif + fprintf (fp, "%8u kB\n", (unsigned) (total->ggc_mem >> 10)); #ifdef ENABLE_CHECKING fprintf (fp, "Extra diagnostic checks enabled; compiler may run slowly.\n"); diff --git a/gcc/timevar.def b/gcc/timevar.def index a90afea3940..d7bed9297ee 100644 --- a/gcc/timevar.def +++ b/gcc/timevar.def @@ -67,8 +67,8 @@ DEFTIMEVAR (TV_TREE_CFG , "tree CFG construction") DEFTIMEVAR (TV_TREE_CLEANUP_CFG , "tree CFG cleanup") DEFTIMEVAR (TV_TREE_VRP , "tree VRP") DEFTIMEVAR (TV_TREE_COPY_PROP , "tree copy propagation") -DEFTIMEVAR (TV_TREE_STORE_COPY_PROP , "tree store copy propagation") -DEFTIMEVAR (TV_FIND_REFERENCED_VARS , "tree find referenced vars") +DEFTIMEVAR (TV_TREE_STORE_COPY_PROP , "tree store copy prop") +DEFTIMEVAR (TV_FIND_REFERENCED_VARS , "tree find ref. vars") DEFTIMEVAR (TV_TREE_PTA , "tree PTA") DEFTIMEVAR (TV_TREE_MAY_ALIAS , "tree alias analysis") DEFTIMEVAR (TV_TREE_INSERT_PHI_NODES , "tree PHI insertion") @@ -82,7 +82,7 @@ DEFTIMEVAR (TV_TREE_STORE_CCP , "tree STORE-CCP") DEFTIMEVAR (TV_TREE_CCP , "tree CCP") DEFTIMEVAR (TV_TREE_SPLIT_EDGES , "tree split crit edges") DEFTIMEVAR (TV_TREE_PRE , "tree PRE") -DEFTIMEVAR (TV_TREE_REDPHI , "tree remove redundant PHIs") +DEFTIMEVAR (TV_TREE_REDPHI , "tree redundant PHIs") DEFTIMEVAR (TV_TREE_FRE , "tree FRE") DEFTIMEVAR (TV_TREE_SINK , "tree code sinking") DEFTIMEVAR (TV_TREE_PHIOPT , "tree linearize phis") @@ -92,13 +92,13 @@ DEFTIMEVAR (TV_TREE_CD_DCE , "tree aggressive DCE") DEFTIMEVAR (TV_TREE_DSE , "tree DSE") DEFTIMEVAR (TV_TREE_MERGE_PHI , "PHI merge") DEFTIMEVAR (TV_TREE_LOOP , "tree loop optimization") -DEFTIMEVAR (TV_TREE_LOOP_BOUNDS , "tree record loop bounds") +DEFTIMEVAR (TV_TREE_LOOP_BOUNDS , "tree loop bounds") DEFTIMEVAR (TV_LIM , "loop invariant motion") -DEFTIMEVAR (TV_TREE_LOOP_IVCANON , "tree canonical iv creation") +DEFTIMEVAR (TV_TREE_LOOP_IVCANON , "tree canonical iv") DEFTIMEVAR (TV_TREE_LOOP_UNSWITCH , "tree loop unswitching") DEFTIMEVAR (TV_COMPLETE_UNROLL , "complete unrolling") -DEFTIMEVAR (TV_TREE_VECTORIZATION , "tree loop vectorization") -DEFTIMEVAR (TV_TREE_LINEAR_TRANSFORM , "tree loop linear transforms") +DEFTIMEVAR (TV_TREE_VECTORIZATION , "tree vectorization") +DEFTIMEVAR (TV_TREE_LINEAR_TRANSFORM , "tree loop linear") DEFTIMEVAR (TV_TREE_LOOP_IVOPTS , "tree iv optimization") DEFTIMEVAR (TV_TREE_LOOP_INIT , "tree loop init") DEFTIMEVAR (TV_TREE_LOOP_FINI , "tree loop fini") diff --git a/gcc/timevar.h b/gcc/timevar.h index e8366004c01..f62f76e6383 100644 --- a/gcc/timevar.h +++ b/gcc/timevar.h @@ -61,6 +61,9 @@ struct timevar_time_def /* Wall clock time. */ double wall; + + /* Garbage collector memory. */ + unsigned ggc_mem; }; /* An enumeration of timing variable identifiers. Constructed from @@ -93,4 +96,6 @@ extern void print_time (const char *, long); extern bool timevar_enable; +extern size_t timevar_ggc_mem_total; + #endif /* ! GCC_TIMEVAR_H */ |