diff options
Diffstat (limited to 'src/mem/ruby/network/garnet/flexible-pipeline')
3 files changed, 10 insertions, 5 deletions
diff --git a/src/mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.cc b/src/mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.cc index 631c5ab21..20ddf86e5 100644 --- a/src/mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.cc +++ b/src/mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.cc @@ -28,6 +28,9 @@ * Authors: Niket Agarwal */ +#include <cassert> + +#include "base/cprintf.hh" #include "base/stl_helpers.hh" #include "mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.hh" #include "mem/protocol/MachineType.hh" @@ -188,9 +191,9 @@ void GarnetNetwork::checkNetworkAllocation(NodeID id, bool ordered, int network_num) { - printf ("id = %i, m_nodes = %i \n", id, m_nodes); - ASSERT(id < m_nodes); - ASSERT(network_num < m_virtual_networks); + cprintf ("id = %i, m_nodes = %i \n", id, m_nodes); + assert(id < m_nodes); + assert(network_num < m_virtual_networks); if (ordered) { m_ordered[network_num] = true; diff --git a/src/mem/ruby/network/garnet/flexible-pipeline/NetworkInterface.cc b/src/mem/ruby/network/garnet/flexible-pipeline/NetworkInterface.cc index 23efaa618..afc841a1b 100644 --- a/src/mem/ruby/network/garnet/flexible-pipeline/NetworkInterface.cc +++ b/src/mem/ruby/network/garnet/flexible-pipeline/NetworkInterface.cc @@ -28,6 +28,7 @@ * Authors: Niket Agarwal */ +#include <cassert> #include <cmath> #include "base/stl_helpers.hh" @@ -95,7 +96,7 @@ void NetworkInterface::addNode(vector<MessageBuffer*>& in, vector<MessageBuffer*>& out) { - ASSERT(in.size() == m_virtual_networks); + assert(in.size() == m_virtual_networks); inNode_ptr = in; outNode_ptr = out; diff --git a/src/mem/ruby/network/garnet/flexible-pipeline/flit.hh b/src/mem/ruby/network/garnet/flexible-pipeline/flit.hh index e0825f3ab..4c072b270 100644 --- a/src/mem/ruby/network/garnet/flexible-pipeline/flit.hh +++ b/src/mem/ruby/network/garnet/flexible-pipeline/flit.hh @@ -28,6 +28,7 @@ * Authors: Niket Agarwal */ +#include <cassert> #include <iostream> #include "mem/ruby/network/garnet/NetworkHeader.hh" @@ -57,7 +58,7 @@ class flit greater(flit* n1, flit* n2) { if (n1->get_time() == n2->get_time()) - //ASSERT(n1->flit_id != n2->flit_id); + //assert(n1->flit_id != n2->flit_id); return (n1->get_id() > n2->get_id()); else return (n1->get_time() > n2->get_time()); |