garnet: rename and rearrange config parameters.

Renamed (message) class to vnet for consistency with rest of ruby.
Moved some parameters specific to fixed/flexible garnet networks into their
corresponding py files.

1 files changed, 8 insertions, 2 deletions

diff --git a/src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.hh b/src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.hh
index b4e264be1..6254bd383 100644
--- a/src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.hh
+++ b/src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.hh
@@ -59,6 +59,9 @@ class GarnetNetwork_d : public BaseGarnetNetwork
 
     int getNumNodes() { return m_nodes; }
 
+    int getBuffersPerDataVC() {return m_buffers_per_data_vc; }
+    int getBuffersPerCtrlVC() {return m_buffers_per_ctrl_vc; }
+
     // returns the queue requested for the given component
     MessageBuffer* getToNetQueue(NodeID id, bool ordered, int network_num);
     MessageBuffer* getFromNetQueue(NodeID id, bool ordered, int network_num);
@@ -71,14 +74,14 @@ class GarnetNetwork_d : public BaseGarnetNetwork
     void
     set_vnet_type(int vc, VNET_type vnet_type)
     {
-        int vnet = vc/getVCsPerClass();
+        int vnet = vc/getVCsPerVnet();
         m_vnet_type[vnet] = vnet_type;
     }
 
     VNET_type
     get_vnet_type(int vc)
     {
-        int vnet = vc/getVCsPerClass();
+        int vnet = vc/getVCsPerVnet();
         return m_vnet_type[vnet];
     }
 
@@ -130,6 +133,9 @@ class GarnetNetwork_d : public BaseGarnetNetwork
     std::vector<NetworkLink_d *> m_link_ptr_vector; // All links in the network
     std::vector<CreditLink_d *> m_creditlink_ptr_vector; // All links in net
     std::vector<NetworkInterface_d *> m_ni_ptr_vector;   // All NI's in Network
+
+    int m_buffers_per_data_vc;
+    int m_buffers_per_ctrl_vc;
 };
 
 inline std::ostream&