[gcc(refs/users/kubaneko/heads/histogram)] fixed memory allocation for histogram_counters

[Ondrej Kubanek <kubaneko@gcc.gnu.org>]

https://gcc.gnu.org/g:06ae0bf3d1331e62d72a7e87722a7eece55a2e4e

commit 06ae0bf3d1331e62d72a7e87722a7eece55a2e4e
Author: kubaneko <kubanek0ondrej@gmail.com>
Date:   Tue Nov 22 13:12:55 2022 +0000

    fixed memory allocation for histogram_counters

Diff:
---
 gcc/cfgloop.cc |  4 ++++
 gcc/cfgloop.h  | 55 ++++++++++++++++---------------------------------------
 gcc/profile.cc |  2 +-
 3 files changed, 21 insertions(+), 40 deletions(-)

diff --git a/gcc/cfgloop.cc b/gcc/cfgloop.cc
index 6d5929b655a..d014ef817eb 100644
--- a/gcc/cfgloop.cc
+++ b/gcc/cfgloop.cc
@@ -199,6 +199,10 @@ flow_loop_free (class loop *loop)
     }
 
   ggc_free (loop->exits);
+  if (loop->counters)
+    {
+      ggc_free (loop->counters);
+    }
   ggc_free (loop);
 }
 
diff --git a/gcc/cfgloop.h b/gcc/cfgloop.h
index 8df82317c0f..3b795902e2e 100644
--- a/gcc/cfgloop.h
+++ b/gcc/cfgloop.h
@@ -94,50 +94,27 @@ struct loop_exit_hasher : ggc_ptr_hash<loop_exit>
 
 // Information about histogram of the loop from profiling
 
-struct histogram_counters{
-    gcov_type hist[69];
+struct GTY(()) histogram_counters{
     gcov_type sum;
+    int histogram_size;
+    gcov_type hist[69];
 
     // need to think about overflows
     // quantil function for the distribution
     // returns index under which is koef part of the distribution
-    int quantil(float koef){
-        gcc_assert(0<koef && koef<=1);
-        gcov_type quant=0;
-        int i=0;
-        for (;i<69;++i) {
-            if (quant+hist[i]<koef*sum) {
-                quant+=hist[i];
-            } else {
-                break;
-            }
-        }
-        return i;
-    };
-    // aproximate distribution mean value of the random variable to a power
-    float mean_value(int power){
-        gcov_type values=0;
-        for (int i=0;i<8;i++){
-            gcov_type val=1;
-            for (int j=1; j<=power;j++) {
-                val*=i;
-            }
-            values+=val*hist[i];
-        }
-        for (int i=8;i<69;i++){
-            gcov_type val=1;
-            for (int j=1; j<=power; j++) {
-                val*=1<<(i-5);
-            }
-            values+=val*hist[i];
-        }
-        return ((float)values)/sum;
-    };
-    // returns aproximate variance of the distribution
-    float variance(){
-        float one=mean_value(1);
-        return mean_value(2)-one*one;
-    };
+    // int quantil(float koef){
+    //     gcc_assert(0<koef && koef<=1);
+    //     gcov_type quant=0;
+    //     int i=0;
+    //     for (;i<69;++i) {
+    //         if (quant+hist[i]<koef*sum) {
+    //             quant+=hist[i];
+    //         } else {
+    //             break;
+    //         }
+    //     }
+    //     return i;
+    // };
 };
 
 
diff --git a/gcc/profile.cc b/gcc/profile.cc
index bb4eb7d1712..17f6aaa1573 100644
--- a/gcc/profile.cc
+++ b/gcc/profile.cc
@@ -928,7 +928,7 @@ compute_value_histograms (histogram_values values, unsigned cfg_checksum,
       {
         auto lp = hist->hvalue.lp;
         if (act_count[t]){
-           lp->counters=(histogram_counters*) xcalloc (1, sizeof (histogram_counters));
+           lp->counters=ggc_alloc<histogram_counters>();
            gcov_type sum=0;
            for (int i=0;i<69;++i){
                lp->counters->hist[i]=act_count[t][i];