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

mem-ruby: Fix two NetDest locals using default constructor (#1746)

Browse Source 
Two NetDest locally declared variables are using default constructor
instead of constructor with RubySystem pointer. This will cause asserts
when (1) garnet is used or (2) a protocol that uses `broadcast()` is
built.

Fix these two by passing the appropriate RubySystem pointers.
This commit is contained in:
Matthew Poremba
2024-11-02 08:37:04 -07:00
committed by GitHub
parent 956b164a43
commit 2ed724b670
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/mem/ruby/network/garnet/NetworkInterface.cc
View File

@@ -404,7 +404,7 @@ NetworkInterface::flitisizeMessage(MsgPtr msg_ptr, int vnet)
Message *new_net_msg_ptr = new_msg_ptr.get(); Message *new_net_msg_ptr = new_msg_ptr.get();
if (dest_nodes.size() > 1) { if (dest_nodes.size() > 1) {
NetDest personal_dest; NetDest personal_dest(m_net_ptr->getRubySystem());
for (int m = 0; m < (int) MachineType_NUM; m++) { for (int m = 0; m < (int) MachineType_NUM; m++) {
if ((destID >= MachineType_base_number((MachineType) m)) && if ((destID >= MachineType_base_number((MachineType) m)) &&
destID < MachineType_base_number((MachineType) (m+1))) { destID < MachineType_base_number((MachineType) (m+1))) {

2
src/mem/ruby/slicc_interface/AbstractController.cc
View File

@@ -502,7 +502,7 @@ AbstractController::broadcast(MachineType type)
assert(m_ruby_system != nullptr); assert(m_ruby_system != nullptr);
NodeID type_count = m_ruby_system->MachineType_base_count(type); NodeID type_count = m_ruby_system->MachineType_base_count(type);
NetDest dest; NetDest dest(m_ruby_system);
for (NodeID i = 0; i < type_count; i++) { for (NodeID i = 0; i < type_count; i++) {
MachineID mach = {type, i}; MachineID mach = {type, i};
dest.add(mach); dest.add(mach);