changeset f81d94b53661 in /z/repo/gem5
details: http://repo.gem5.org/gem5?cmd=changeset;node=f81d94b53661
description:
ruby: network: removes unused code.
diffstat:
src/mem/ruby/network/Network.cc | 6 ------
src/mem/ruby/network/Network.hh | 1 -
src/mem/ruby/network/garnet/fixed-pipeline/NetworkInterface_d.cc | 2 +-
src/mem/ruby/network/simple/SimpleNetwork.cc | 9 ---------
src/mem/ruby/network/simple/SimpleNetwork.hh | 1 -
src/mem/ruby/network/simple/Switch.cc | 6 ------
src/mem/ruby/network/simple/Switch.hh | 1 -
src/mem/ruby/network/simple/Throttle.cc | 2 --
8 files changed, 1 insertions(+), 27 deletions(-)
diffs (105 lines):
diff -r 7322d2b2ec76 -r f81d94b53661 src/mem/ruby/network/Network.cc
--- a/src/mem/ruby/network/Network.cc Thu Feb 20 17:26:49 2014 -0600
+++ b/src/mem/ruby/network/Network.cc Thu Feb 20 17:27:07 2014 -0600
@@ -98,9 +98,3 @@
break;
}
}
-
-const std::vector<Throttle*>*
-Network::getThrottles(NodeID id) const
-{
- return NULL;
-}
diff -r 7322d2b2ec76 -r f81d94b53661 src/mem/ruby/network/Network.hh
--- a/src/mem/ruby/network/Network.hh Thu Feb 20 17:26:49 2014 -0600
+++ b/src/mem/ruby/network/Network.hh Thu Feb 20 17:27:07 2014 -0600
@@ -75,7 +75,6 @@
int netNumber, std::string vnet_type) = 0;
virtual MessageBuffer* getFromNetQueue(NodeID id, bool ordered,
int netNumber, std::string vnet_type) = 0;
- virtual const std::vector<Throttle*>* getThrottles(NodeID id) const;
virtual int getNumNodes() {return 1;}
virtual void makeOutLink(SwitchID src, NodeID dest, BasicLink* link,
diff -r 7322d2b2ec76 -r f81d94b53661
src/mem/ruby/network/garnet/fixed-pipeline/NetworkInterface_d.cc
--- a/src/mem/ruby/network/garnet/fixed-pipeline/NetworkInterface_d.cc Thu Feb
20 17:26:49 2014 -0600
+++ b/src/mem/ruby/network/garnet/fixed-pipeline/NetworkInterface_d.cc Thu Feb
20 17:27:07 2014 -0600
@@ -343,7 +343,7 @@
int
NetworkInterface_d::get_vnet(int vc)
{
- for (int i = 0; i < m_net_ptr->getNumberOfVirtualNetworks(); i++) {
+ for (int i = 0; i < m_virtual_networks; i++) {
if (vc >= (i*m_vc_per_vnet) && vc < ((i+1)*m_vc_per_vnet)) {
return i;
}
diff -r 7322d2b2ec76 -r f81d94b53661
src/mem/ruby/network/simple/SimpleNetwork.cc
--- a/src/mem/ruby/network/simple/SimpleNetwork.cc Thu Feb 20 17:26:49
2014 -0600
+++ b/src/mem/ruby/network/simple/SimpleNetwork.cc Thu Feb 20 17:27:07
2014 -0600
@@ -196,15 +196,6 @@
return m_fromNetQueues[id][network_num];
}
-const std::vector<Throttle*>*
-SimpleNetwork::getThrottles(NodeID id) const
-{
- assert(id >= 0);
- assert(id < m_nodes);
- assert(m_endpoint_switches[id] != NULL);
- return m_endpoint_switches[id]->getThrottles();
-}
-
void
SimpleNetwork::regStats()
{
diff -r 7322d2b2ec76 -r f81d94b53661
src/mem/ruby/network/simple/SimpleNetwork.hh
--- a/src/mem/ruby/network/simple/SimpleNetwork.hh Thu Feb 20 17:26:49
2014 -0600
+++ b/src/mem/ruby/network/simple/SimpleNetwork.hh Thu Feb 20 17:27:07
2014 -0600
@@ -62,7 +62,6 @@
// returns the queue requested for the given component
MessageBuffer* getToNetQueue(NodeID id, bool ordered, int network_num,
std::string vnet_type);
MessageBuffer* getFromNetQueue(NodeID id, bool ordered, int network_num,
std::string vnet_type);
- virtual const std::vector<Throttle*>* getThrottles(NodeID id) const;
bool isVNetOrdered(int vnet) { return m_ordered[vnet]; }
bool validVirtualNetwork(int vnet) { return m_in_use[vnet]; }
diff -r 7322d2b2ec76 -r f81d94b53661 src/mem/ruby/network/simple/Switch.cc
--- a/src/mem/ruby/network/simple/Switch.cc Thu Feb 20 17:26:49 2014 -0600
+++ b/src/mem/ruby/network/simple/Switch.cc Thu Feb 20 17:27:07 2014 -0600
@@ -116,12 +116,6 @@
return m_throttles[link_number];
}
-const vector<Throttle*>*
-Switch::getThrottles() const
-{
- return &m_throttles;
-}
-
void
Switch::regStats()
{
diff -r 7322d2b2ec76 -r f81d94b53661 src/mem/ruby/network/simple/Switch.hh
--- a/src/mem/ruby/network/simple/Switch.hh Thu Feb 20 17:26:49 2014 -0600
+++ b/src/mem/ruby/network/simple/Switch.hh Thu Feb 20 17:27:07 2014 -0600
@@ -67,7 +67,6 @@
const NetDest& routing_table_entry, Cycles link_latency,
int bw_multiplier);
const Throttle* getThrottle(LinkID link_number) const;
- const std::vector<Throttle*>* getThrottles() const;
void resetStats();
void collateStats();
diff -r 7322d2b2ec76 -r f81d94b53661 src/mem/ruby/network/simple/Throttle.cc
--- a/src/mem/ruby/network/simple/Throttle.cc Thu Feb 20 17:26:49 2014 -0600
+++ b/src/mem/ruby/network/simple/Throttle.cc Thu Feb 20 17:27:07 2014 -0600
@@ -39,8 +39,6 @@
using namespace std;
-const int HIGH_RANGE = 256;
-const int ADJUST_INTERVAL = 50000;
const int MESSAGE_SIZE_MULTIPLIER = 1000;
//const int BROADCAST_SCALING = 4; // Have a 16p system act like a 64p systems
const int BROADCAST_SCALING = 1;
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
