diff options
Diffstat (limited to 'src/mem/ruby/network/garnet/flexible-pipeline/NetworkInterface.cc')
-rw-r--r-- | src/mem/ruby/network/garnet/flexible-pipeline/NetworkInterface.cc | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/src/mem/ruby/network/garnet/flexible-pipeline/NetworkInterface.cc b/src/mem/ruby/network/garnet/flexible-pipeline/NetworkInterface.cc index 73425802b..cc7dd7146 100644 --- a/src/mem/ruby/network/garnet/flexible-pipeline/NetworkInterface.cc +++ b/src/mem/ruby/network/garnet/flexible-pipeline/NetworkInterface.cc @@ -67,7 +67,7 @@ NetworkInterface::NetworkInterface(int id, int virtual_networks, for (int i = 0; i < m_num_vcs; i++) { m_out_vc_state.push_back(new OutVcState(i)); - m_out_vc_state[i]->setState(IDLE_, g_eventQueue_ptr->getTime()); + m_out_vc_state[i]->setState(IDLE_, g_system_ptr->getTime()); } } @@ -166,18 +166,18 @@ NetworkInterface::flitisizeMessage(MsgPtr msg_ptr, int vnet) for (int i = 0; i < num_flits; i++) { m_net_ptr->increment_injected_flits(vnet); flit *fl = new flit(i, vc, vnet, num_flits, new_msg_ptr); - fl->set_delay(g_eventQueue_ptr->getTime() - msg_ptr->getTime()); + fl->set_delay(g_system_ptr->getTime() - msg_ptr->getTime()); m_ni_buffers[vc]->insert(fl); } - m_out_vc_state[vc]->setState(VC_AB_, g_eventQueue_ptr->getTime()); + m_out_vc_state[vc]->setState(VC_AB_, g_system_ptr->getTime()); // setting an output vc request for the next hop. // This flit will be ready to traverse the link and into the next hop // only when an output vc is acquired at the next hop outNetLink->request_vc_link(vc, new_net_msg_ptr->getInternalDestination(), - g_eventQueue_ptr->getTime()); + g_system_ptr->getTime()); } return true ; @@ -190,7 +190,7 @@ NetworkInterface::grant_vc(int out_port, int vc, Time grant_time) { assert(m_out_vc_state[vc]->isInState(VC_AB_, grant_time)); m_out_vc_state[vc]->grant_vc(grant_time); - g_eventQueue_ptr->scheduleEvent(this, 1); + scheduleEvent(1); } // The tail flit corresponding to this vc has been buffered at the next hop @@ -200,7 +200,7 @@ NetworkInterface::release_vc(int out_port, int vc, Time release_time) { assert(m_out_vc_state[vc]->isInState(ACTIVE_, release_time)); m_out_vc_state[vc]->setState(IDLE_, release_time); - g_eventQueue_ptr->scheduleEvent(this, 1); + scheduleEvent(1); } // Looking for a free output vc @@ -220,7 +220,7 @@ NetworkInterface::calculateVC(int vnet) m_vc_allocator[vnet] = 0; if (m_out_vc_state[(vnet*m_vc_per_vnet) + delta]->isInState(IDLE_, - g_eventQueue_ptr->getTime())) { + g_system_ptr->getTime())) { return ((vnet*m_vc_per_vnet) + delta); } } @@ -264,18 +264,18 @@ NetworkInterface::wakeup() flit *t_flit = inNetLink->consumeLink(); if (t_flit->get_type() == TAIL_ || t_flit->get_type() == HEAD_TAIL_) { DPRINTF(RubyNetwork, "m_id: %d, Message delivered at time: %lld\n", - m_id, g_eventQueue_ptr->getTime()); + m_id, g_system_ptr->getTime()); outNode_ptr[t_flit->get_vnet()]->enqueue( t_flit->get_msg_ptr(), 1); // signal the upstream router that this vc can be freed now inNetLink->release_vc_link(t_flit->get_vc(), - g_eventQueue_ptr->getTime() + 1); + g_system_ptr->getTime() + 1); } int vnet = t_flit->get_vnet(); m_net_ptr->increment_received_flits(vnet); - int network_delay = g_eventQueue_ptr->getTime() - + int network_delay = g_system_ptr->getTime() - t_flit->get_enqueue_time(); int queueing_delay = t_flit->get_delay(); m_net_ptr->increment_network_latency(network_delay, vnet); @@ -304,16 +304,16 @@ NetworkInterface::scheduleOutputLink() vc = 0; if (m_ni_buffers[vc]->isReady()) { if (m_out_vc_state[vc]->isInState(ACTIVE_, - g_eventQueue_ptr->getTime()) && + g_system_ptr->getTime()) && outNetLink->isBufferNotFull_link(vc)) { // buffer backpressure // Just removing the flit flit *t_flit = m_ni_buffers[vc]->getTopFlit(); - t_flit->set_time(g_eventQueue_ptr->getTime() + 1); + t_flit->set_time(g_system_ptr->getTime() + 1); outSrcQueue->insert(t_flit); // schedule the out link - g_eventQueue_ptr->scheduleEvent(outNetLink, 1); + outNetLink->scheduleEvent(1); return; } } @@ -325,13 +325,13 @@ NetworkInterface::checkReschedule() { for (int vnet = 0; vnet < m_virtual_networks; vnet++) { if (inNode_ptr[vnet]->isReady()) { // Is there a message waiting - g_eventQueue_ptr->scheduleEvent(this, 1); + scheduleEvent(1); return; } } for (int vc = 0; vc < m_num_vcs; vc++) { if (m_ni_buffers[vc]->isReadyForNext()) { - g_eventQueue_ptr->scheduleEvent(this, 1); + scheduleEvent(1); return; } } |