* 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.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@99848 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 22 insertions, 2 deletions

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");