changeset 30883414ad10 in /z/repo/m5
details: http://repo.m5sim.org/m5?cmd=changeset;node=30883414ad10
description:
ruby: Finally removed bash code cira. 2001ish!
diffstat:
2 files changed, 35 deletions(-)
src/mem/ruby/network/simple/Throttle.cc | 31 -------------------------------
src/mem/ruby/network/simple/Throttle.hh | 4 ----
diffs (76 lines):
diff -r 185ad61a4117 -r 30883414ad10 src/mem/ruby/network/simple/Throttle.cc
--- a/src/mem/ruby/network/simple/Throttle.cc Sun Mar 21 21:22:21 2010 -0700
+++ b/src/mem/ruby/network/simple/Throttle.cc Sun Mar 21 21:22:21 2010 -0700
@@ -73,9 +73,6 @@
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 @@
// 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 @@
}
}
-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 -r 185ad61a4117 -r 30883414ad10 src/mem/ruby/network/simple/Throttle.hh
--- a/src/mem/ruby/network/simple/Throttle.hh Sun Mar 21 21:22:21 2010 -0700
+++ b/src/mem/ruby/network/simple/Throttle.hh Sun Mar 21 21:22:21 2010 -0700
@@ -63,7 +63,6 @@
// 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 @@
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;
_______________________________________________
m5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/m5-dev
