changeset 4466307b8a2a in /z/repo/gem5
details: http://repo.gem5.org/gem5?cmd=changeset;node=4466307b8a2a
description:
ruby: network: revert some of the changes from ad9c042dce54
The changeset ad9c042dce54 made changes to the structures under the
network
directory to use a map of buffers instead of vector of buffers.
The reasoning was that not all vnets that are created are used and we
needlessly allocate more buffers than required and then iterate over
them
while processing network messages. But the move to map resulted in a
slow
down which was pointed out by Andreas Hansson. This patch moves things
back to using vector of message buffers.
diffstat:
src/mem/ruby/network/Network.cc | 4 +-
src/mem/ruby/network/Network.hh | 4 +-
src/mem/ruby/network/garnet/BaseGarnetNetwork.cc | 6 +
src/mem/ruby/network/garnet/fixed-pipeline/NetworkInterface_d.cc | 29 ++++--
src/mem/ruby/network/garnet/fixed-pipeline/NetworkInterface_d.hh | 8 +-
src/mem/ruby/network/garnet/flexible-pipeline/NetworkInterface.cc | 29 ++++--
src/mem/ruby/network/garnet/flexible-pipeline/NetworkInterface.hh | 8 +-
src/mem/ruby/network/simple/PerfectSwitch.cc | 34
+++++---
src/mem/ruby/network/simple/PerfectSwitch.hh | 8 +-
src/mem/ruby/network/simple/SimpleNetwork.cc | 9 ++-
src/mem/ruby/network/simple/Switch.cc | 18 ++-
src/mem/ruby/network/simple/Switch.hh | 4 +-
src/mem/ruby/network/simple/Throttle.cc | 39
++++-----
src/mem/ruby/network/simple/Throttle.hh | 11 +-
14 files changed, 124 insertions(+), 87 deletions(-)
diffs (truncated from 522 to 300 lines):
diff -r cc10d6851778 -r 4466307b8a2a src/mem/ruby/network/Network.cc
--- a/src/mem/ruby/network/Network.cc Fri Sep 12 10:22:50 2014 -0400
+++ b/src/mem/ruby/network/Network.cc Mon Sep 15 16:19:38 2014 -0500
@@ -85,11 +85,11 @@
// Delete the Message Buffers
for (auto& it : m_toNetQueues[node]) {
- delete it.second;
+ delete it;
}
for (auto& it : m_fromNetQueues[node]) {
- delete it.second;
+ delete it;
}
}
diff -r cc10d6851778 -r 4466307b8a2a src/mem/ruby/network/Network.hh
--- a/src/mem/ruby/network/Network.hh Fri Sep 12 10:22:50 2014 -0400
+++ b/src/mem/ruby/network/Network.hh Mon Sep 15 16:19:38 2014 -0500
@@ -112,8 +112,8 @@
static uint32_t m_data_msg_size;
// vector of queues from the components
- std::vector<std::map<int, MessageBuffer*> > m_toNetQueues;
- std::vector<std::map<int, MessageBuffer*> > m_fromNetQueues;
+ std::vector<std::vector<MessageBuffer*> > m_toNetQueues;
+ std::vector<std::vector<MessageBuffer*> > m_fromNetQueues;
std::vector<bool> m_in_use;
std::vector<bool> m_ordered;
diff -r cc10d6851778 -r 4466307b8a2a
src/mem/ruby/network/garnet/BaseGarnetNetwork.cc
--- a/src/mem/ruby/network/garnet/BaseGarnetNetwork.cc Fri Sep 12 10:22:50
2014 -0400
+++ b/src/mem/ruby/network/garnet/BaseGarnetNetwork.cc Mon Sep 15 16:19:38
2014 -0500
@@ -71,6 +71,9 @@
string vnet_type, MessageBuffer *b)
{
checkNetworkAllocation(id, ordered, network_num, vnet_type);
+ while (m_toNetQueues[id].size() <= network_num) {
+ m_toNetQueues[id].push_back(nullptr);
+ }
m_toNetQueues[id][network_num] = b;
}
@@ -79,6 +82,9 @@
string vnet_type, MessageBuffer *b)
{
checkNetworkAllocation(id, ordered, network_num, vnet_type);
+ while (m_fromNetQueues[id].size() <= network_num) {
+ m_fromNetQueues[id].push_back(nullptr);
+ }
m_fromNetQueues[id][network_num] = b;
}
diff -r cc10d6851778 -r 4466307b8a2a
src/mem/ruby/network/garnet/fixed-pipeline/NetworkInterface_d.cc
--- a/src/mem/ruby/network/garnet/fixed-pipeline/NetworkInterface_d.cc Fri Sep
12 10:22:50 2014 -0400
+++ b/src/mem/ruby/network/garnet/fixed-pipeline/NetworkInterface_d.cc Mon Sep
15 16:19:38 2014 -0500
@@ -106,20 +106,23 @@
}
void
-NetworkInterface_d::addNode(map<int, MessageBuffer *>& in,
- map<int, MessageBuffer *>& out)
+NetworkInterface_d::addNode(vector<MessageBuffer *>& in,
+ vector<MessageBuffer *>& out)
{
inNode_ptr = in;
outNode_ptr = out;
for (auto& it : in) {
- // the protocol injects messages into the NI
- it.second->setConsumer(this);
- it.second->setReceiver(this);
+ if (it != nullptr) {
+ it->setConsumer(this);
+ it->setReceiver(this);
+ }
}
for (auto& it : out) {
- it.second->setSender(this);
+ if (it != nullptr) {
+ it->setSender(this);
+ }
}
}
@@ -223,9 +226,11 @@
// Checking for messages coming from the protocol
// can pick up a message/cycle for each virtual net
- for (auto it = inNode_ptr.begin(); it != inNode_ptr.end(); ++it) {
- int vnet = (*it).first;
- MessageBuffer *b = (*it).second;
+ for (int vnet = 0; vnet < inNode_ptr.size(); ++vnet) {
+ MessageBuffer *b = inNode_ptr[vnet];
+ if (b == nullptr) {
+ continue;
+ }
while (b->isReady()) { // Is there a message waiting
msg_ptr = b->peekMsgPtr();
@@ -355,9 +360,11 @@
NetworkInterface_d::checkReschedule()
{
for (const auto& it : inNode_ptr) {
- MessageBuffer *b = it.second;
+ if (it == nullptr) {
+ continue;
+ }
- while (b->isReady()) { // Is there a message waiting
+ while (it->isReady()) { // Is there a message waiting
scheduleEvent(Cycles(1));
return;
}
diff -r cc10d6851778 -r 4466307b8a2a
src/mem/ruby/network/garnet/fixed-pipeline/NetworkInterface_d.hh
--- a/src/mem/ruby/network/garnet/fixed-pipeline/NetworkInterface_d.hh Fri Sep
12 10:22:50 2014 -0400
+++ b/src/mem/ruby/network/garnet/fixed-pipeline/NetworkInterface_d.hh Mon Sep
15 16:19:38 2014 -0500
@@ -60,8 +60,8 @@
void addOutPort(NetworkLink_d *out_link, CreditLink_d *credit_link);
void wakeup();
- void addNode(std::map<int, MessageBuffer *> &inNode,
- std::map<int, MessageBuffer *> &outNode);
+ void addNode(std::vector<MessageBuffer *> &inNode,
+ std::vector<MessageBuffer *> &outNode);
void print(std::ostream& out) const;
int get_vnet(int vc);
@@ -90,9 +90,9 @@
std::vector<Cycles> m_ni_enqueue_time;
// The Message buffers that takes messages from the protocol
- std::map<int, MessageBuffer *> inNode_ptr;
+ std::vector<MessageBuffer *> inNode_ptr;
// The Message buffers that provides messages to the protocol
- std::map<int, MessageBuffer *> outNode_ptr;
+ std::vector<MessageBuffer *> outNode_ptr;
bool flitisizeMessage(MsgPtr msg_ptr, int vnet);
int calculateVC(int vnet);
diff -r cc10d6851778 -r 4466307b8a2a
src/mem/ruby/network/garnet/flexible-pipeline/NetworkInterface.cc
--- a/src/mem/ruby/network/garnet/flexible-pipeline/NetworkInterface.cc Fri Sep
12 10:22:50 2014 -0400
+++ b/src/mem/ruby/network/garnet/flexible-pipeline/NetworkInterface.cc Mon Sep
15 16:19:38 2014 -0500
@@ -90,20 +90,23 @@
}
void
-NetworkInterface::addNode(map<int, MessageBuffer*>& in,
- map<int, MessageBuffer*>& out)
+NetworkInterface::addNode(vector<MessageBuffer*>& in,
+ vector<MessageBuffer*>& out)
{
inNode_ptr = in;
outNode_ptr = out;
for (auto& it: in) {
- // the protocol injects messages into the NI
- it.second->setConsumer(this);
- it.second->setReceiver(this);
+ if (it != nullptr) {
+ it->setConsumer(this);
+ it->setReceiver(this);
+ }
}
for (auto& it : out) {
- it.second->setSender(this);
+ if (it != nullptr) {
+ it->setSender(this);
+ }
}
}
@@ -242,9 +245,11 @@
//Checking for messages coming from the protocol
// can pick up a message/cycle for each virtual net
- for (auto it = inNode_ptr.begin(); it != inNode_ptr.end(); ++it) {
- int vnet = (*it).first;
- MessageBuffer *b = (*it).second;
+ for (int vnet = 0; vnet < inNode_ptr.size(); ++vnet) {
+ MessageBuffer *b = inNode_ptr[vnet];
+ if (b == nullptr) {
+ continue;
+ }
while (b->isReady()) { // Is there a message waiting
msg_ptr = b->peekMsgPtr();
@@ -326,9 +331,11 @@
NetworkInterface::checkReschedule()
{
for (const auto& it : inNode_ptr) {
- MessageBuffer *b = it.second;
+ if (it == nullptr) {
+ continue;
+ }
- while (b->isReady()) { // Is there a message waiting
+ while (it->isReady()) { // Is there a message waiting
scheduleEvent(Cycles(1));
return;
}
diff -r cc10d6851778 -r 4466307b8a2a
src/mem/ruby/network/garnet/flexible-pipeline/NetworkInterface.hh
--- a/src/mem/ruby/network/garnet/flexible-pipeline/NetworkInterface.hh Fri Sep
12 10:22:50 2014 -0400
+++ b/src/mem/ruby/network/garnet/flexible-pipeline/NetworkInterface.hh Mon Sep
15 16:19:38 2014 -0500
@@ -56,8 +56,8 @@
void addInPort(NetworkLink *in_link);
void addOutPort(NetworkLink *out_link);
- void addNode(std::map<int, MessageBuffer *> &inNode,
- std::map<int, MessageBuffer *> &outNode);
+ void addNode(std::vector<MessageBuffer *> &inNode,
+ std::vector<MessageBuffer *> &outNode);
void wakeup();
void grant_vc(int out_port, int vc, Cycles grant_time);
@@ -93,10 +93,10 @@
std::vector<flitBuffer *> m_ni_buffers;
// The Message buffers that takes messages from the protocol
- std::map<int, MessageBuffer *> inNode_ptr;
+ std::vector<MessageBuffer *> inNode_ptr;
// The Message buffers that provides messages to the protocol
- std::map<int, MessageBuffer *> outNode_ptr;
+ std::vector<MessageBuffer *> outNode_ptr;
bool flitisizeMessage(MsgPtr msg_ptr, int vnet);
int calculateVC(int vnet);
diff -r cc10d6851778 -r 4466307b8a2a
src/mem/ruby/network/simple/PerfectSwitch.cc
--- a/src/mem/ruby/network/simple/PerfectSwitch.cc Fri Sep 12 10:22:50
2014 -0400
+++ b/src/mem/ruby/network/simple/PerfectSwitch.cc Mon Sep 15 16:19:38
2014 -0500
@@ -68,26 +68,30 @@
}
void
-PerfectSwitch::addInPort(const map<int, MessageBuffer*>& in)
+PerfectSwitch::addInPort(const vector<MessageBuffer*>& in)
{
NodeID port = m_in.size();
m_in.push_back(in);
- for (auto& it : in) {
- it.second->setConsumer(this);
+ for (int i = 0; i < in.size(); ++i) {
+ if (in[i] != nullptr) {
+ in[i]->setConsumer(this);
- string desc = csprintf("[Queue from port %s %s %s to PerfectSwitch]",
- to_string(m_switch_id), to_string(port), to_string(it.first));
+ string desc =
+ csprintf("[Queue from port %s %s %s to PerfectSwitch]",
+ to_string(m_switch_id), to_string(port),
+ to_string(i));
- it.second->setDescription(desc);
- it.second->setIncomingLink(port);
- it.second->setVnet(it.first);
+ in[i]->setDescription(desc);
+ in[i]->setIncomingLink(port);
+ in[i]->setVnet(i);
+ }
}
}
void
-PerfectSwitch::addOutPort(const map<int, MessageBuffer*>& out,
- const NetDest& routing_table_entry)
+PerfectSwitch::addOutPort(const vector<MessageBuffer*>& out,
+ const NetDest& routing_table_entry)
{
// Setup link order
LinkOrder l;
@@ -131,10 +135,14 @@
vector<NetDest> output_link_destinations;
// Is there a message waiting?
- auto it = m_in[incoming].find(vnet);
- if (it == m_in[incoming].end())
+ if (m_in[incoming].size() <= vnet) {
continue;
- MessageBuffer *buffer = (*it).second;
+ }
+
+ MessageBuffer *buffer = m_in[incoming][vnet];
+ if (buffer == nullptr) {
+ continue;
+ }
while (buffer->isReady()) {
DPRINTF(RubyNetwork, "incoming: %d\n", incoming);
diff -r cc10d6851778 -r 4466307b8a2a
src/mem/ruby/network/simple/PerfectSwitch.hh
--- a/src/mem/ruby/network/simple/PerfectSwitch.hh Fri Sep 12 10:22:50
2014 -0400
+++ b/src/mem/ruby/network/simple/PerfectSwitch.hh Mon Sep 15 16:19:38
2014 -0500
@@ -65,8 +65,8 @@
{ return csprintf("PerfectSwitch-%i", m_switch_id); }
void init(SimpleNetwork *);
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
