derek/gem5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mem-ruby: Fix switch storage in SimpleNetwork

Browse Source 
In SimpleNetwork, switches were assigned an index depending on their
position in params().routers. But switches are also referenced by their
router_id parameter in other locations of the ruby network system (e.g.,
src and dst node parameter in links). If the router_id does not match the
position in SimpleNetwork::m_switches, the network initialization might
fail or implement a different topology from what the user intended. This
patch fixes this issue by storing switches in a map instead of a vector.

Change-Id: I398f950ad404efbf9516ea9bbced598970a2bc24
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/55723
Reviewed-by: Jason Lowe-Power <power.jg@gmail.com>
Maintainer: Jason Lowe-Power <power.jg@gmail.com>
Tested-by: kokoro <noreply+kokoro@google.com>
This commit is contained in:
Gabriel Busnot
2022-01-21 15:12:56 +01:00
committed by Meatboy 106
parent 85a1d43c10
commit 748b613c94
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/mem/ruby/network/simple/SimpleNetwork.cc
View File

@@ -66,9 +66,10 @@ SimpleNetwork::SimpleNetwork(const Params &p)
// record the routers
for (std::vector<BasicRouter*>::const_iterator i = p.routers.begin();
i != p.routers.end(); ++i) {
Switch* s = safe_cast<Switch*>(*i);
m_switches.push_back(s);
auto* s = safe_cast<Switch*>(*i);
s->init_net_ptr(this);
auto id = static_cast<size_t>(s->params().router_id);
m_switches[id] = s;
}
const std::vector<int> &physical_vnets_channels =
@@ -108,7 +109,6 @@ SimpleNetwork::makeExtOutLink(SwitchID src, NodeID global_dest,
{
NodeID local_dest = getLocalNodeID(global_dest);
assert(local_dest < m_nodes);
assert(src < m_switches.size());
assert(m_switches[src] != NULL);
SimpleExtLink *simple_link = safe_cast<SimpleExtLink*>(link);
@@ -179,9 +179,9 @@ SimpleNetwork::regStats()
;
// Now state what the formula is.
for (int i = 0; i < m_switches.size(); i++) {
for (auto& [id, sw]: m_switches) {
*(networkStats.m_msg_counts[(unsigned int) type]) +=
sum(m_switches[i]->getMsgCount(type));
sum(sw->getMsgCount(type));
}
*(networkStats.m_msg_bytes[(unsigned int) type]) =
@@ -193,8 +193,8 @@ SimpleNetwork::regStats()
void
SimpleNetwork::collateStats()
{
for (int i = 0; i < m_switches.size(); i++) {
m_switches[i]->collateStats();
for (auto& [id, sw]: m_switches) {
sw->collateStats();
}
}
@@ -212,8 +212,8 @@ SimpleNetwork::print(std::ostream& out) const
bool
SimpleNetwork::functionalRead(Packet *pkt)
{
for (unsigned int i = 0; i < m_switches.size(); i++) {
if (m_switches[i]->functionalRead(pkt))
for (auto& [id, sw]: m_switches) {
if (sw->functionalRead(pkt))
return true;
}
for (unsigned int i = 0; i < m_int_link_buffers.size(); ++i) {
@@ -228,8 +228,8 @@ bool
SimpleNetwork::functionalRead(Packet *pkt, WriteMask &mask)
{
bool read = false;
for (unsigned int i = 0; i < m_switches.size(); i++) {
if (m_switches[i]->functionalRead(pkt, mask))
for (auto& [id, sw]: m_switches) {
if (sw->functionalRead(pkt, mask))
read = true;
}
for (unsigned int i = 0; i < m_int_link_buffers.size(); ++i) {
@@ -244,8 +244,8 @@ SimpleNetwork::functionalWrite(Packet *pkt)
{
uint32_t num_functional_writes = 0;
for (unsigned int i = 0; i < m_switches.size(); i++) {
num_functional_writes += m_switches[i]->functionalWrite(pkt);
for (auto& [id, sw]: m_switches) {
num_functional_writes += sw->functionalWrite(pkt);
}
for (unsigned int i = 0; i < m_int_link_buffers.size(); ++i) {

2
src/mem/ruby/network/simple/SimpleNetwork.hh
View File

@@ -102,7 +102,7 @@ class SimpleNetwork : public Network
SimpleNetwork(const SimpleNetwork& obj);
SimpleNetwork& operator=(const SimpleNetwork& obj);
std::vector<Switch*> m_switches;
std::unordered_map<int, Switch*> m_switches;
std::vector<MessageBuffer*> m_int_link_buffers;
const int m_buffer_size;
const int m_endpoint_bandwidth;