From 58fa2857e123a44b1633628b898847773153c047 Mon Sep 17 00:00:00 2001 From: Nilay Vaish Date: Wed, 22 Dec 2010 23:15:24 -0600 Subject: This patch removes the WARN_* and ERROR_* from src/mem/ruby/common/Debug.hh file. These statements have been replaced with warn(), panic() and fatal() defined in src/base/misc.hh --- src/mem/ruby/network/Network.cc | 6 +++--- src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.cc | 6 +++--- src/mem/ruby/network/garnet/fixed-pipeline/NetworkInterface_d.cc | 3 +-- src/mem/ruby/network/garnet/fixed-pipeline/RoutingUnit_d.cc | 2 +- src/mem/ruby/network/garnet/fixed-pipeline/SWallocator_d.cc | 3 +-- src/mem/ruby/network/garnet/fixed-pipeline/VCallocator_d.cc | 3 +-- src/mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.cc | 6 +++--- 7 files changed, 13 insertions(+), 16 deletions(-) (limited to 'src/mem/ruby/network') diff --git a/src/mem/ruby/network/Network.cc b/src/mem/ruby/network/Network.cc index 91800d5bb..3e866907f 100644 --- a/src/mem/ruby/network/Network.cc +++ b/src/mem/ruby/network/Network.cc @@ -26,6 +26,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "base/misc.hh" #include "mem/protocol/MachineType.hh" #include "mem/ruby/network/Network.hh" #include "mem/ruby/network/simple/Topology.hh" @@ -64,7 +65,7 @@ Network::MessageSizeType_to_int(MessageSizeType size_type) { switch(size_type) { case MessageSizeType_Undefined: - ERROR_MSG("Can't convert Undefined MessageSizeType to integer"); + panic("Can't convert Undefined MessageSizeType to integer"); break; case MessageSizeType_Control: case MessageSizeType_Request_Control: @@ -85,10 +86,9 @@ Network::MessageSizeType_to_int(MessageSizeType size_type) case MessageSizeType_Writeback_Data: return m_data_msg_size; default: - ERROR_MSG("Invalid range for type MessageSizeType"); + panic("Invalid range for type MessageSizeType"); break; } - return 0; } const std::vector* diff --git a/src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.cc b/src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.cc index befa09407..69fc416e6 100644 --- a/src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.cc +++ b/src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.cc @@ -156,7 +156,7 @@ GarnetNetwork_d::makeInLink(NodeID src, SwitchID dest, m_router_ptr_vector[dest]->addInPort(net_link, credit_link); m_ni_ptr_vector[src]->addOutPort(net_link, credit_link); } else { - ERROR_MSG("Fatal Error:: Reconfiguration not allowed here"); + panic("Fatal Error:: Reconfiguration not allowed here"); // do nothing } } @@ -188,7 +188,7 @@ GarnetNetwork_d::makeOutLink(SwitchID src, NodeID dest, link_weight, credit_link); m_ni_ptr_vector[dest]->addInPort(net_link, credit_link); } else { - ERROR_MSG("Fatal Error:: Reconfiguration not allowed here"); + fatal("Fatal Error:: Reconfiguration not allowed here"); // do nothing } } @@ -214,7 +214,7 @@ GarnetNetwork_d::makeInternalLink(SwitchID src, SwitchID dest, m_router_ptr_vector[src]->addOutPort(net_link, routing_table_entry, link_weight, credit_link); } else { - ERROR_MSG("Fatal Error:: Reconfiguration not allowed here"); + fatal("Fatal Error:: Reconfiguration not allowed here"); // do nothing } } diff --git a/src/mem/ruby/network/garnet/fixed-pipeline/NetworkInterface_d.cc b/src/mem/ruby/network/garnet/fixed-pipeline/NetworkInterface_d.cc index 16792ef2b..0bcefe337 100644 --- a/src/mem/ruby/network/garnet/fixed-pipeline/NetworkInterface_d.cc +++ b/src/mem/ruby/network/garnet/fixed-pipeline/NetworkInterface_d.cc @@ -333,8 +333,7 @@ NetworkInterface_d::get_vnet(int vc) return i; } } - ERROR_MSG("Could not determine vc"); - return -1; + fatal("Could not determine vc"); } void diff --git a/src/mem/ruby/network/garnet/fixed-pipeline/RoutingUnit_d.cc b/src/mem/ruby/network/garnet/fixed-pipeline/RoutingUnit_d.cc index 5d7dc9015..13491184c 100644 --- a/src/mem/ruby/network/garnet/fixed-pipeline/RoutingUnit_d.cc +++ b/src/mem/ruby/network/garnet/fixed-pipeline/RoutingUnit_d.cc @@ -81,7 +81,7 @@ RoutingUnit_d::routeCompute(flit_d *t_flit) } if (output_link == -1) { - ERROR_MSG("Fatal Error:: No Route exists from this Router."); + fatal("Fatal Error:: No Route exists from this Router."); exit(0); } diff --git a/src/mem/ruby/network/garnet/fixed-pipeline/SWallocator_d.cc b/src/mem/ruby/network/garnet/fixed-pipeline/SWallocator_d.cc index 17daad1de..72ea7524f 100644 --- a/src/mem/ruby/network/garnet/fixed-pipeline/SWallocator_d.cc +++ b/src/mem/ruby/network/garnet/fixed-pipeline/SWallocator_d.cc @@ -211,8 +211,7 @@ SWallocator_d::get_vnet(int invc) return i; } } - ERROR_MSG("Could not determine vc"); - return -1; + fatal("Could not determine vc"); } void diff --git a/src/mem/ruby/network/garnet/fixed-pipeline/VCallocator_d.cc b/src/mem/ruby/network/garnet/fixed-pipeline/VCallocator_d.cc index b3954e3bc..9148cdf9d 100644 --- a/src/mem/ruby/network/garnet/fixed-pipeline/VCallocator_d.cc +++ b/src/mem/ruby/network/garnet/fixed-pipeline/VCallocator_d.cc @@ -241,8 +241,7 @@ VCallocator_d::get_vnet(int invc) return i; } } - ERROR_MSG("Could not determine vc"); - return -1; + fatal("Could not determine vc"); } void diff --git a/src/mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.cc b/src/mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.cc index 9ce02d63e..631c5ab21 100644 --- a/src/mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.cc +++ b/src/mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.cc @@ -138,7 +138,7 @@ GarnetNetwork::makeInLink(NodeID src, SwitchID dest, m_router_ptr_vector[dest]->addInPort(net_link); m_ni_ptr_vector[src]->addOutPort(net_link); } else { - ERROR_MSG("Fatal Error:: Reconfiguration not allowed here"); + fatal("Fatal Error:: Reconfiguration not allowed here"); // do nothing } } @@ -160,7 +160,7 @@ GarnetNetwork::makeOutLink(SwitchID src, NodeID dest, link_weight); m_ni_ptr_vector[dest]->addInPort(net_link); } else { - ERROR_MSG("Fatal Error:: Reconfiguration not allowed here"); + fatal("Fatal Error:: Reconfiguration not allowed here"); //do nothing } } @@ -178,7 +178,7 @@ GarnetNetwork::makeInternalLink(SwitchID src, SwitchID dest, m_router_ptr_vector[src]->addOutPort(net_link, routing_table_entry, link_weight); } else { - ERROR_MSG("Fatal Error:: Reconfiguration not allowed here"); + fatal("Fatal Error:: Reconfiguration not allowed here"); // do nothing } -- cgit v1.2.3