garnet: added orion2.0 for network power calculation

[gem5.git] / src / base / statistics.cc

diff --git a/src/base/statistics.cc b/src/base/statistics.cc
index abe3b53bb70b5d86d9b2f7338c6ebaeb7f95ba94..95402a2217ec0877eb94d649820d760c893627f7 100644 (file)
--- a/src/base/statistics.cc
+++ b/src/base/statistics.cc
@@ -192,7 +192,7 @@ Info::baseCheck() const
         return false;
     }
 
-    if ((flags & print) && name.empty()) {
+    if ((flags & display) && name.empty()) {
         panic("all printable stats must be named");
         return false;
     }
@@ -236,14 +236,97 @@ Vector2dInfo::enable()
         y_subnames.resize(y);
 }
 
+void
+HistStor::grow_out()
+{
+    int size = cvec.size();
+    int zero = size / 2; // round down!
+    int top_half = zero + (size - zero + 1) / 2; // round up!
+    int bottom_half = (size - zero) / 2; // round down!
+
+    // grow down
+    int low_pair = zero - 1;
+    for (int i = zero - 1; i >= bottom_half; i--) {
+        cvec[i] = cvec[low_pair];
+        if (low_pair - 1 >= 0)
+            cvec[i] += cvec[low_pair - 1];
+        low_pair -= 2;
+    }
+    assert(low_pair == 0 || low_pair == -1 || low_pair == -2);
+
+    for (int i = bottom_half - 1; i >= 0; i--)
+        cvec[i] = Counter();
+
+    // grow up
+    int high_pair = zero;
+    for (int i = zero; i < top_half; i++) {
+        cvec[i] = cvec[high_pair];
+        if (high_pair + 1 < size)
+            cvec[i] += cvec[high_pair + 1];
+        high_pair += 2;
+    }
+    assert(high_pair == size || high_pair == size + 1);
+
+    for (int i = top_half; i < size; i++)
+        cvec[i] = Counter();
+
+    max_bucket *= 2;
+    min_bucket *= 2;
+    bucket_size *= 2;
+}
+
+void
+HistStor::grow_convert()
+{
+    int size = cvec.size();
+    int half = (size + 1) / 2; // round up!
+    //bool even = (size & 1) == 0;
+
+    int pair = size - 1;
+    for (int i = size - 1; i >= half; --i) {
+        cvec[i] = cvec[pair];
+        if (pair - 1 >= 0)
+            cvec[i] += cvec[pair - 1];
+        pair -= 2;
+    }
+
+    for (int i = half - 1; i >= 0; i--)
+        cvec[i] = Counter();
+
+    min_bucket = -max_bucket;// - (even ? bucket_size : 0);
+    bucket_size *= 2;
+}
+
+void
+HistStor::grow_up()
+{
+    int size = cvec.size();
+    int half = (size + 1) / 2; // round up!
+
+    int pair = 0;
+    for (int i = 0; i < half; i++) {
+        cvec[i] = cvec[pair];
+        if (pair + 1 < size)
+            cvec[i] += cvec[pair + 1];
+        pair += 2;
+    }
+    assert(pair == size || pair == size + 1);
+
+    for (int i = half; i < size; i++)
+        cvec[i] = Counter();
+
+    max_bucket *= 2;
+    bucket_size *= 2;
+}
+
 Formula::Formula()
 {
-    setInit();
 }
 
 Formula::Formula(Temp r)
 {
     root = r;
+    setInit();
     assert(size());
 }
 
@@ -252,6 +335,7 @@ Formula::operator=(Temp r)
 {
     assert(!root && "Can't change formulas");
     root = r;
+    setInit();
     assert(size());
     return *this;
 }
@@ -261,8 +345,11 @@ Formula::operator+=(Temp r)
 {
     if (root)
         root = NodePtr(new BinaryNode<std::plus<Result> >(root, r));
-    else
+    else {
         root = r;
+        setInit();
+    }
+
     assert(size());
     return *this;
 }
@@ -299,7 +386,7 @@ Formula::zero() const
 {
     VResult vec;
     result(vec);
-    for (off_t i = 0; i < vec.size(); ++i)
+    for (VResult::size_type i = 0; i < vec.size(); ++i)
         if (vec[i] != 0.0)
             return false;
     return true;
@@ -327,7 +414,7 @@ enable()
     off_t j = 0;
     for (i = statsList().begin(); i != end; ++i) {
         Info *info = *i;
-        if (!(info->flags & print))
+        if (!(info->flags & display))
             info->name = "__Stat" + to_string(j++);
     }
 
@@ -373,4 +460,4 @@ registerResetCallback(Callback *cb)
     resetQueue.add(cb);
 }
 
-/* namespace Stats */ }
+} // namespace Stats