From beb0c9cc7873713b83a6d8ecfe8a92adbfc3a787 Mon Sep 17 00:00:00 2001 From: Kenneth Zadeck Date: Wed, 8 Oct 2008 02:52:28 +0000 Subject: [PATCH] re PR middle-end/37448 (cannot compile big function) 2008-10-07 Kenneth Zadeck PR rtl-optimization/37448 alloc_pool_desc (elt_size): New field. alloc_pool_desc (created, allocated, current, peak): Make unsigned long. output_info (count): Renamed total_created and made unsigned long. output_info (size): Renamed total_allocated and made unsigned long. alloc-pool.c (create_alloc_pool, empty_alloc_pool, pool_alloc, pool_free): Properly keep track of desc->size. (print_statistics, dump_alloc_pool_statistics): Enhance the printing of statistics to print the number of elements and to use unsigned longs. From-SVN: r140960 --- gcc/ChangeLog | 14 +++++++++ gcc/alloc-pool.c | 76 ++++++++++++++++++++++++++++++------------------ 2 files changed, 62 insertions(+), 28 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index d14a5765b32..9e891381eaf 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,17 @@ +2008-10-07 Kenneth Zadeck + + PR rtl-optimization/37448 + alloc_pool_desc (elt_size): New field. + alloc_pool_desc (created, allocated, current, peak): Make unsigned + long. + output_info (count): Renamed total_created and made unsigned long. + output_info (size): Renamed total_allocated and made unsigned long. + alloc-pool.c (create_alloc_pool, empty_alloc_pool, pool_alloc, + pool_free): Properly keep track of desc->size. + (print_statistics, dump_alloc_pool_statistics): Enhance the + printing of statistics to print the number of elements and to use + unsigned longs. + 2008-10-07 Jakub Jelinek PR middle-end/37576 diff --git a/gcc/alloc-pool.c b/gcc/alloc-pool.c index 7f0dc8ce7d2..f098a84b19c 100644 --- a/gcc/alloc-pool.c +++ b/gcc/alloc-pool.c @@ -64,14 +64,25 @@ static ALLOC_POOL_ID_TYPE last_id; #ifdef GATHER_STATISTICS -/* Store information about each particular alloc_pool. */ +/* Store information about each particular alloc_pool. Note that this + will underestimate the amount the amount of storage used by a small amount: + 1) The overhead in a pool is not accounted for. + 2) The unallocated elements in a block are not accounted for. Note + that this can at worst case be one element smaller that the block + size for that pool. */ struct alloc_pool_descriptor { const char *name; - int allocated; - int created; - int peak; - int current; + /* Number of pools allocated. */ + unsigned long created; + /* Gross allocated storage. */ + unsigned long allocated; + /* Amount of currently active storage. */ + unsigned long current; + /* Peak amount of storage used. */ + unsigned long peak; + /* Size of element in the pool. */ + int elt_size; }; /* Hashtable mapping alloc_pool names to descriptors. */ @@ -150,6 +161,7 @@ create_alloc_pool (const char *name, size_t size, size_t num) pool->name = /*xstrdup (name)*/name; #ifdef GATHER_STATISTICS desc = alloc_pool_descriptor (name); + desc->elt_size = size; desc->created++; #endif pool->elt_size = size; @@ -196,11 +208,11 @@ empty_alloc_pool (alloc_pool pool) { next_block = block->next; free (block); -#ifdef GATHER_STATISTICS - desc->current -= pool->block_size; -#endif } +#ifdef GATHER_STATISTICS + desc->current -= (pool->elts_allocated - pool->elts_free) * pool->elt_size; +#endif pool->returned_free_list = NULL; pool->virgin_free_list = NULL; pool->virgin_elts_remaining = 0; @@ -242,7 +254,10 @@ pool_alloc (alloc_pool pool) #ifdef GATHER_STATISTICS struct alloc_pool_descriptor *desc = alloc_pool_descriptor (pool->name); - desc->allocated+=pool->elt_size; + desc->allocated += pool->elt_size; + desc->current += pool->elt_size; + if (desc->peak < desc->current) + desc->peak = desc->current; #endif gcc_assert (pool); @@ -259,11 +274,6 @@ pool_alloc (alloc_pool pool) block = XNEWVEC (char, pool->block_size); block_header = (alloc_pool_list) block; block += align_eight (sizeof (struct alloc_pool_list_def)); -#ifdef GATHER_STATISTICS - desc->current += pool->block_size; - if (desc->peak < desc->current) - desc->peak = desc->current; -#endif /* Throw it on the block list. */ block_header->next = pool->block_list; @@ -314,6 +324,9 @@ void pool_free (alloc_pool pool, void *ptr) { alloc_pool_list header; +#ifdef GATHER_STATISTICS + struct alloc_pool_descriptor *desc = alloc_pool_descriptor (pool->name); +#endif gcc_assert (ptr); @@ -334,6 +347,11 @@ pool_free (alloc_pool pool, void *ptr) header->next = pool->returned_free_list; pool->returned_free_list = header; pool->elts_free++; + +#ifdef GATHER_STATISTICS + desc->current -= pool->elt_size; +#endif + } /* Output per-alloc_pool statistics. */ #ifdef GATHER_STATISTICS @@ -341,8 +359,8 @@ pool_free (alloc_pool pool, void *ptr) /* Used to accumulate statistics about alloc_pool sizes. */ struct output_info { - int count; - int size; + unsigned long total_created; + unsigned long total_allocated; }; /* Called via htab_traverse. Output alloc_pool descriptor pointed out by SLOT @@ -355,10 +373,12 @@ print_statistics (void **slot, void *b) if (d->allocated) { - fprintf (stderr, "%-21s %6d %10d %10d %10d\n", d->name, - d->created, d->allocated, d->peak, d->current); - i->size += d->allocated; - i->count += d->created; + fprintf (stderr, "%-22s %6d %10lu %10lu(%10lu) %10lu(%10lu) %10lu(%10lu)\n", d->name, + d->elt_size, d->created, d->allocated, d->allocated / d->elt_size, + d->peak, d->peak / d->elt_size, + d->current, d->current / d->elt_size); + i->total_allocated += d->allocated; + i->total_created += d->created; } return 1; } @@ -374,14 +394,14 @@ dump_alloc_pool_statistics (void) if (!alloc_pool_hash) return; - fprintf (stderr, "\nAlloc-pool Kind Pools Allocated Peak Leak\n"); - fprintf (stderr, "-------------------------------------------------------------\n"); - info.count = 0; - info.size = 0; + fprintf (stderr, "\nAlloc-pool Kind Elt size Pools Allocated (elts) Peak (elts) Leak (elts)\n"); + fprintf (stderr, "--------------------------------------------------------------------------------------------------------------\n"); + info.total_created = 0; + info.total_allocated = 0; htab_traverse (alloc_pool_hash, print_statistics, &info); - fprintf (stderr, "-------------------------------------------------------------\n"); - fprintf (stderr, "%-20s %7d %10d\n", - "Total", info.count, info.size); - fprintf (stderr, "-------------------------------------------------------------\n"); + fprintf (stderr, "--------------------------------------------------------------------------------------------------------------\n"); + fprintf (stderr, "%-22s %7lu %10lu\n", + "Total", info.total_created, info.total_allocated); + fprintf (stderr, "--------------------------------------------------------------------------------------------------------------\n"); #endif }