Sungkeun Kim has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/59009 )
Change subject: mem-garnet: Packet Tracing of garnet network
......................................................................
mem-garnet: Packet Tracing of garnet network
Move m_next_packet_id to GarnetNetwork class.
Jira Issue: https://gem5.atlassian.net/browse/GEM5-1181
Change-Id: I4302bd4c8aebf14f64ba263e129ba69eea71969b
---
M src/mem/ruby/network/garnet/GarnetNetwork.cc
M src/mem/ruby/network/garnet/GarnetNetwork.hh
M src/mem/ruby/network/garnet/NetworkInterface.cc
M src/mem/ruby/network/garnet/NetworkInterface.hh
4 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/src/mem/ruby/network/garnet/GarnetNetwork.cc
b/src/mem/ruby/network/garnet/GarnetNetwork.cc
index de566a5..01b2473 100644
--- a/src/mem/ruby/network/garnet/GarnetNetwork.cc
+++ b/src/mem/ruby/network/garnet/GarnetNetwork.cc
@@ -70,6 +70,7 @@
m_buffers_per_data_vc = p.buffers_per_data_vc;
m_buffers_per_ctrl_vc = p.buffers_per_ctrl_vc;
m_routing_algorithm = p.routing_algorithm;
+ m_next_packet_id = 0;
m_enable_fault_model = p.enable_fault_model;
if (m_enable_fault_model)
diff --git a/src/mem/ruby/network/garnet/GarnetNetwork.hh
b/src/mem/ruby/network/garnet/GarnetNetwork.hh
index 912445b..0aec4ae 100644
--- a/src/mem/ruby/network/garnet/GarnetNetwork.hh
+++ b/src/mem/ruby/network/garnet/GarnetNetwork.hh
@@ -154,6 +154,8 @@
void update_traffic_distribution(RouteInfo route);
+ int getNextPacketID() { return m_next_packet_id++; }
+
protected:
// Configuration
int m_num_rows;
@@ -209,6 +211,7 @@
std::vector<NetworkLink *> m_networklinks; // All flit links in the
network
std::vector<CreditLink *> m_creditlinks; // All credit links in the
network
std::vector<NetworkInterface *> m_nis; // All NI's in Network
+ int m_next_packet_id; // static vairable for packet id allocation
};
inline std::ostream&
diff --git a/src/mem/ruby/network/garnet/NetworkInterface.cc
b/src/mem/ruby/network/garnet/NetworkInterface.cc
index 93f5276..b77a573 100644
--- a/src/mem/ruby/network/garnet/NetworkInterface.cc
+++ b/src/mem/ruby/network/garnet/NetworkInterface.cc
@@ -51,7 +51,6 @@
namespace garnet
{
-int NetworkInterface::m_next_packet_id = 0;
NetworkInterface::NetworkInterface(const Params &p)
: ClockedObject(p), Consumer(this), m_id(p.id),
m_virtual_networks(p.virt_nets), m_vc_per_vnet(0),
@@ -437,7 +436,7 @@
m_net_ptr->increment_injected_packets(vnet);
m_net_ptr->update_traffic_distribution(route);
- const int packet_id = m_next_packet_id++;
+ const int packet_id = m_net_ptr->getNextPacketID();
for (int i = 0; i < num_flits; i++) {
m_net_ptr->increment_injected_flits(vnet);
flit *fl = new flit(packet_id,
diff --git a/src/mem/ruby/network/garnet/NetworkInterface.hh
b/src/mem/ruby/network/garnet/NetworkInterface.hh
index b52c7f8..b5affa0 100644
--- a/src/mem/ruby/network/garnet/NetworkInterface.hh
+++ b/src/mem/ruby/network/garnet/NetworkInterface.hh
@@ -291,8 +291,6 @@
std::vector<MessageBuffer *> outNode_ptr;
// When a vc stays busy for a long time, it indicates a deadlock
std::vector<int> vc_busy_counter;
- // static vairable for packet id allocation
- static int m_next_packet_id;
void checkStallQueue();
bool flitisizeMessage(MsgPtr msg_ptr, int vnet);
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/59009
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: I4302bd4c8aebf14f64ba263e129ba69eea71969b
Gerrit-Change-Number: 59009
Gerrit-PatchSet: 1
Gerrit-Owner: Sungkeun Kim <ksungkeu...@tamu.edu>
Gerrit-MessageType: newchange
_______________________________________________
gem5-dev mailing list -- gem5-dev@gem5.org
To unsubscribe send an email to gem5-dev-le...@gem5.org
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s
