diff options
| author | Derek Hower <drh5@cs.wisc.edu> | 2010-01-22 17:23:21 -0600 |
|---|---|---|
| committer | Derek Hower <drh5@cs.wisc.edu> | 2010-01-22 17:23:21 -0600 |
| commit | 589218168c5ae1ed143372e43dbc468369a1bb8f (patch) | |
| tree | 5e5154c08e7def83b49b16769c213b0e78ea41fb /src/mem/ruby/network | |
| parent | 1c448e2ab00acb05d368c9de62c5cf08e64c6213 (diff) | |
| parent | f7de30ab1a9e1655de8bf7d4c15007a682a2a629 (diff) | |
| download | gem5-589218168c5ae1ed143372e43dbc468369a1bb8f.tar.xz | |
Automated merge with ssh://hg@m5sim.org/m5
Diffstat (limited to 'src/mem/ruby/network')
| -rw-r--r-- | src/mem/ruby/network/simple/PerfectSwitch.cc | 2 | ||||
| -rw-r--r-- | src/mem/ruby/network/simple/Topology.cc | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/mem/ruby/network/simple/PerfectSwitch.cc b/src/mem/ruby/network/simple/PerfectSwitch.cc index 02fc8db2a..467e1bf87 100644 --- a/src/mem/ruby/network/simple/PerfectSwitch.cc +++ b/src/mem/ruby/network/simple/PerfectSwitch.cc @@ -184,7 +184,7 @@ void PerfectSwitch::wakeup() assert(m_link_order.size() == m_routing_table.size()); assert(m_link_order.size() == m_out.size()); -//changed by SS + if (m_network_ptr->getAdaptiveRouting()) { if (m_network_ptr->isVNetOrdered(vnet)) { // Don't adaptively route diff --git a/src/mem/ruby/network/simple/Topology.cc b/src/mem/ruby/network/simple/Topology.cc index dedf79d58..563a1b01c 100644 --- a/src/mem/ruby/network/simple/Topology.cc +++ b/src/mem/ruby/network/simple/Topology.cc @@ -79,7 +79,6 @@ void Topology::init(const vector<string> & argv) m_connections = argv[i+1]; else if (argv[i] == "print_config") { m_print_config = string_to_bool(argv[i+1]); - cerr << "print config: " << m_print_config << endl; } } assert(m_network_ptr != NULL); |