diff options
| author | Nilay Vaish <nilay@cs.wisc.edu> | 2013-01-14 10:05:10 -0600 |
|---|---|---|
| committer | Nilay Vaish <nilay@cs.wisc.edu> | 2013-01-14 10:05:10 -0600 |
| commit | 20129837186a5eb28a1b1e2f8dcd441934af68a6 (patch) | |
| tree | ab8daf1e72d64ec8ffadc6bdce4129c891dd3c8d /src/mem/ruby/network/garnet/fixed-pipeline/Switch_d.cc | |
| parent | cf232de4615f0fe9435d6e92a1d6319c972a8c88 (diff) | |
| download | gem5-20129837186a5eb28a1b1e2f8dcd441934af68a6.tar.xz | |
Ruby: remove reference to g_system_ptr from class Message
This patch was initiated so as to remove reference to g_system_ptr,
the pointer to Ruby System that is used for getting the current time.
That simple change actual requires changing a lot many things in slicc and
garnet. All these changes are related to how time is handled.
In most of the places, g_system_ptr has been replaced by another clock
object. The changes have been done under the assumption that all the
components in the memory system are on the same clock frequency, but the
actual clocks might be distributed.
Diffstat (limited to 'src/mem/ruby/network/garnet/fixed-pipeline/Switch_d.cc')
| -rw-r--r-- | src/mem/ruby/network/garnet/fixed-pipeline/Switch_d.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/mem/ruby/network/garnet/fixed-pipeline/Switch_d.cc b/src/mem/ruby/network/garnet/fixed-pipeline/Switch_d.cc index 1cb31c3e3..db7446f7a 100644 --- a/src/mem/ruby/network/garnet/fixed-pipeline/Switch_d.cc +++ b/src/mem/ruby/network/garnet/fixed-pipeline/Switch_d.cc @@ -65,16 +65,16 @@ void Switch_d::wakeup() { DPRINTF(RubyNetwork, "Switch woke up at time: %lld\n", - g_system_ptr->getTime()); + m_router->curCycle()); for (int inport = 0; inport < m_num_inports; inport++) { - if (!m_switch_buffer[inport]->isReady()) + if (!m_switch_buffer[inport]->isReady(m_router->curCycle())) continue; flit_d *t_flit = m_switch_buffer[inport]->peekTopFlit(); - if (t_flit->is_stage(ST_)) { + if (t_flit->is_stage(ST_, m_router->curCycle())) { int outport = t_flit->get_outport(); - t_flit->advance_stage(LT_); - t_flit->set_time(g_system_ptr->getTime() + 1); + t_flit->advance_stage(LT_, m_router->curCycle()); + t_flit->set_time(m_router->curCycle() + 1); // This will take care of waking up the Network Link m_output_unit[outport]->insert_flit(t_flit); @@ -89,7 +89,7 @@ void Switch_d::check_for_wakeup() { for (int inport = 0; inport < m_num_inports; inport++) { - if (m_switch_buffer[inport]->isReadyForNext()) { + if (m_switch_buffer[inport]->isReadyForNext(m_router->curCycle())) { scheduleEvent(1); break; } |