From: Brad Beckmann <Brad.Beckmann@amd.com>
Date: Mon, 22 Mar 2010 04:22:21 +0000 (-0700)
Subject: ruby: Finally removed bash code cira. 2001ish!
X-Git-Tag: stable_2012_02_02~1458
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b5e4c3cbf2de32e18029b44b16b307a773b6ecf7;p=gem5.git

ruby: Finally removed bash code cira. 2001ish!
---

diff --git a/src/mem/ruby/network/simple/Throttle.cc b/src/mem/ruby/network/simple/Throttle.cc
index 29269c7d4..ceba47411 100644
--- a/src/mem/ruby/network/simple/Throttle.cc
+++ b/src/mem/ruby/network/simple/Throttle.cc
@@ -73,9 +73,6 @@ void Throttle::init(NodeID node, int link_latency, int link_bandwidth_multiplier
   m_link_bandwidth_multiplier = link_bandwidth_multiplier;
   m_link_latency = link_latency;
 
-  m_bash_counter = HIGH_RANGE;
-  m_bandwidth_since_sample = 0;
-  m_last_bandwidth_sample = 0;
   m_wakeups_wo_switch = 0;
   clearStats();
 }
@@ -191,28 +188,6 @@ void Throttle::wakeup()
   // If ratio = 0, we used no bandwidth, if ratio = 1, we used all
   linkUtilized(ratio);
 
-  // Sample the link bandwidth utilization over a number of cycles
-  int bw_used = getLinkBandwidth()-bw_remaining;
-  m_bandwidth_since_sample += bw_used;
-
-  // FIXME - comment out the bash specific code for faster performance
-  // Start Bash code
-  // Update the predictor
-  Time current_time = g_eventQueue_ptr->getTime();
-  while ((current_time - m_last_bandwidth_sample) > ADJUST_INTERVAL) {
-    // Used less bandwidth
-    m_bash_counter--;
-
-    // Make sure we don't overflow
-    m_bash_counter = min(HIGH_RANGE, m_bash_counter);
-    m_bash_counter = max(0, m_bash_counter);
-
-    // Reset samples
-    m_last_bandwidth_sample += ADJUST_INTERVAL;
-    m_bandwidth_since_sample = 0;
-  }
-  // End Bash code
-
   if ((bw_remaining > 0) && !schedule_wakeup) {
     // We have extra bandwidth and our output buffer was available, so we must not have anything else to do until another message arrives.
     DEBUG_MSG(NETWORK_COMP,LowPrio,*this);
@@ -225,12 +200,6 @@ void Throttle::wakeup()
   }
 }
 
-bool Throttle::broadcastBandwidthAvailable(int rand) const
-{
-  bool result =  !(m_bash_counter > ((HIGH_RANGE/4) + (rand % (HIGH_RANGE/2))));
-  return result;
-}
-
 void Throttle::printStats(ostream& out) const
 {
   out << "utilized_percent: " << getUtilization() << endl;
diff --git a/src/mem/ruby/network/simple/Throttle.hh b/src/mem/ruby/network/simple/Throttle.hh
index 7b6d04353..20aeed820 100644
--- a/src/mem/ruby/network/simple/Throttle.hh
+++ b/src/mem/ruby/network/simple/Throttle.hh
@@ -63,7 +63,6 @@ public:
   // Public Methods
   void addLinks(const Vector<MessageBuffer*>& in_vec, const Vector<MessageBuffer*>& out_vec);
   void wakeup();
-  bool broadcastBandwidthAvailable(int rand) const;
 
   void printStats(ostream& out) const;
   void clearStats();
@@ -96,9 +95,6 @@ private:
   Vector<int> m_units_remaining;
   int m_sID;
   NodeID m_node;
-  int m_bash_counter;
-  int m_bandwidth_since_sample;
-  Time m_last_bandwidth_sample;
   int m_link_bandwidth_multiplier;
   int m_link_latency;
   int m_wakeups_wo_switch;