changeset a47c4db94389 in /z/repo/gem5
details: http://repo.gem5.org/gem5?cmd=changeset;node=a47c4db94389
description:
ruby: change advance_stage for flit_d
Sets m_stage.second to the second parameter of the function.
Then, for every place where advance_stage is called, adds
a cycle to the argument being passed.
diffstat:
src/mem/ruby/network/garnet/fixed-pipeline/InputUnit_d.cc | 2 +-
src/mem/ruby/network/garnet/fixed-pipeline/RoutingUnit_d.cc | 2 +-
src/mem/ruby/network/garnet/fixed-pipeline/SWallocator_d.cc | 2 +-
src/mem/ruby/network/garnet/fixed-pipeline/Switch_d.cc | 2 +-
src/mem/ruby/network/garnet/fixed-pipeline/VirtualChannel_d.cc | 2 +-
src/mem/ruby/network/garnet/fixed-pipeline/flit_d.hh | 4 ++--
6 files changed, 7 insertions(+), 7 deletions(-)
diffs (76 lines):
diff -r b300dcda5896 -r a47c4db94389
src/mem/ruby/network/garnet/fixed-pipeline/InputUnit_d.cc
--- a/src/mem/ruby/network/garnet/fixed-pipeline/InputUnit_d.cc Mon Jul 20
09:15:18 2015 -0500
+++ b/src/mem/ruby/network/garnet/fixed-pipeline/InputUnit_d.cc Mon Jul 20
09:15:18 2015 -0500
@@ -81,7 +81,7 @@
m_vcs[vc]->set_enqueue_time(m_router->curCycle());
} else {
- t_flit->advance_stage(SA_, m_router->curCycle());
+ t_flit->advance_stage(SA_, m_router->curCycle() + Cycles(1));
m_router->swarb_req();
}
// write flit into input buffer
diff -r b300dcda5896 -r a47c4db94389
src/mem/ruby/network/garnet/fixed-pipeline/RoutingUnit_d.cc
--- a/src/mem/ruby/network/garnet/fixed-pipeline/RoutingUnit_d.cc Mon Jul
20 09:15:18 2015 -0500
+++ b/src/mem/ruby/network/garnet/fixed-pipeline/RoutingUnit_d.cc Mon Jul
20 09:15:18 2015 -0500
@@ -58,7 +58,7 @@
{
int outport = routeCompute(t_flit);
in_unit->updateRoute(invc, outport, m_router->curCycle());
- t_flit->advance_stage(VA_, m_router->curCycle());
+ t_flit->advance_stage(VA_, m_router->curCycle() + Cycles(1));
m_router->vcarb_req();
}
diff -r b300dcda5896 -r a47c4db94389
src/mem/ruby/network/garnet/fixed-pipeline/SWallocator_d.cc
--- a/src/mem/ruby/network/garnet/fixed-pipeline/SWallocator_d.cc Mon Jul
20 09:15:18 2015 -0500
+++ b/src/mem/ruby/network/garnet/fixed-pipeline/SWallocator_d.cc Mon Jul
20 09:15:18 2015 -0500
@@ -178,7 +178,7 @@
// remove flit from Input Unit
flit_d *t_flit = m_input_unit[inport]->getTopFlit(invc);
- t_flit->advance_stage(ST_, m_router->curCycle());
+ t_flit->advance_stage(ST_, m_router->curCycle() + Cycles(1));
t_flit->set_vc(outvc);
t_flit->set_outport(outport);
t_flit->set_time(m_router->curCycle() + Cycles(1));
diff -r b300dcda5896 -r a47c4db94389
src/mem/ruby/network/garnet/fixed-pipeline/Switch_d.cc
--- a/src/mem/ruby/network/garnet/fixed-pipeline/Switch_d.cc Mon Jul 20
09:15:18 2015 -0500
+++ b/src/mem/ruby/network/garnet/fixed-pipeline/Switch_d.cc Mon Jul 20
09:15:18 2015 -0500
@@ -73,7 +73,7 @@
flit_d *t_flit = m_switch_buffer[inport]->peekTopFlit();
if (t_flit->is_stage(ST_, m_router->curCycle())) {
int outport = t_flit->get_outport();
- t_flit->advance_stage(LT_, m_router->curCycle());
+ t_flit->advance_stage(LT_, m_router->curCycle() + Cycles(1));
t_flit->set_time(m_router->curCycle() + Cycles(1));
// This will take care of waking up the Network Link
diff -r b300dcda5896 -r a47c4db94389
src/mem/ruby/network/garnet/fixed-pipeline/VirtualChannel_d.cc
--- a/src/mem/ruby/network/garnet/fixed-pipeline/VirtualChannel_d.cc Mon Jul
20 09:15:18 2015 -0500
+++ b/src/mem/ruby/network/garnet/fixed-pipeline/VirtualChannel_d.cc Mon Jul
20 09:15:18 2015 -0500
@@ -57,7 +57,7 @@
m_vc_state.first = ACTIVE_;
m_vc_state.second = curTime + Cycles(1);
flit_d *t_flit = m_input_buffer->peekTopFlit();
- t_flit->advance_stage(SA_, curTime);
+ t_flit->advance_stage(SA_, curTime + Cycles(1));
}
bool
diff -r b300dcda5896 -r a47c4db94389
src/mem/ruby/network/garnet/fixed-pipeline/flit_d.hh
--- a/src/mem/ruby/network/garnet/fixed-pipeline/flit_d.hh Mon Jul 20
09:15:18 2015 -0500
+++ b/src/mem/ruby/network/garnet/fixed-pipeline/flit_d.hh Mon Jul 20
09:15:18 2015 -0500
@@ -66,10 +66,10 @@
}
void
- advance_stage(flit_stage t_stage, Cycles curTime)
+ advance_stage(flit_stage t_stage, Cycles newTime)
{
m_stage.first = t_stage;
- m_stage.second = curTime + Cycles(1);
+ m_stage.second = newTime;
}
std::pair<flit_stage, Cycles> get_stage() { return m_stage; }
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
