Hey Brad, I just did an update of my repo from revision 8107:2e269d6fb3e6 to the latest, and I got some warnings. I haven't encountered any problems yet, but I'm not sure if they might be problematic:
joel@vein:~/research/m5/m5$ hg pull -u pulling from http://repo.m5sim.org/m5 searching for changes adding changesets adding manifests adding file changes added 157 changesets with 2344 changes to 1326 files warning: detected divergent renames of src/mem/ruby/network/Network.cc to: src/mem/ruby/network/BasicLink.cc src/mem/ruby/network/garnet/fixed-pipeline/GarnetLink_d.cc src/mem/ruby/network/garnet/flexible-pipeline/GarnetLink.cc src/mem/ruby/network/simple/SimpleLink.cc warning: detected divergent renames of src/mem/ruby/network/Network.hh to: src/mem/ruby/network/BasicLink.hh src/mem/ruby/network/garnet/fixed-pipeline/GarnetLink_d.hh src/mem/ruby/network/garnet/flexible-pipeline/GarnetLink.hh src/mem/ruby/network/simple/SimpleLink.hh warning: detected divergent renames of src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.py to: src/mem/ruby/network/garnet/fixed-pipeline/GarnetLink_d.py src/mem/ruby/network/garnet/fixed-pipeline/GarnetRouter_d.py src/mem/ruby/network/garnet/flexible-pipeline/GarnetLink.py src/mem/ruby/network/garnet/flexible-pipeline/GarnetRouter.py 1306 files updated, 0 files merged, 50 files removed, 0 files unresolved Joel On Thu, Apr 28, 2011 at 7:31 PM, Brad Beckmann <brad.beckm...@amd.com>wrote: > changeset 89d0e7c17d1e in /z/repo/m5 > details: http://repo.m5sim.org/m5?cmd=changeset;node=89d0e7c17d1e > description: > garnet: removed flit_width from Routers > > diffstat: > > src/mem/ruby/network/garnet/fixed-pipeline/GarnetRouter_d.py | 1 - > src/mem/ruby/network/garnet/fixed-pipeline/Router_d.cc | 1 - > src/mem/ruby/network/garnet/fixed-pipeline/Router_d.hh | 1 - > src/mem/ruby/network/garnet/flexible-pipeline/GarnetRouter.py | 1 - > src/mem/ruby/network/orion/NetworkPower.cc | 3 ++- > 5 files changed, 2 insertions(+), 5 deletions(-) > > diffs (55 lines): > > diff -r 39e42ccddd63 -r 89d0e7c17d1e > src/mem/ruby/network/garnet/fixed-pipeline/GarnetRouter_d.py > --- a/src/mem/ruby/network/garnet/fixed-pipeline/GarnetRouter_d.py Thu > Apr 28 17:18:14 2011 -0700 > +++ b/src/mem/ruby/network/garnet/fixed-pipeline/GarnetRouter_d.py Thu > Apr 28 17:18:14 2011 -0700 > @@ -39,6 +39,5 @@ > "virtual channels per message class") > virt_nets = Param.Int(Parent.number_of_virtual_networks, > "number of virtual networks") > - flit_width = Param.Int(Parent.ni_flit_size, "flit width == flit size") > > > diff -r 39e42ccddd63 -r 89d0e7c17d1e > src/mem/ruby/network/garnet/fixed-pipeline/Router_d.cc > --- a/src/mem/ruby/network/garnet/fixed-pipeline/Router_d.cc Thu Apr 28 > 17:18:14 2011 -0700 > +++ b/src/mem/ruby/network/garnet/fixed-pipeline/Router_d.cc Thu Apr 28 > 17:18:14 2011 -0700 > @@ -49,7 +49,6 @@ > m_virtual_networks = p->virt_nets; > m_vc_per_vnet = p->vcs_per_class; > m_num_vcs = m_virtual_networks * m_vc_per_vnet; > - m_flit_width = p->flit_width; > > m_routing_unit = new RoutingUnit_d(this); > m_vc_alloc = new VCallocator_d(this); > diff -r 39e42ccddd63 -r 89d0e7c17d1e > src/mem/ruby/network/garnet/fixed-pipeline/Router_d.hh > --- a/src/mem/ruby/network/garnet/fixed-pipeline/Router_d.hh Thu Apr 28 > 17:18:14 2011 -0700 > +++ b/src/mem/ruby/network/garnet/fixed-pipeline/Router_d.hh Thu Apr 28 > 17:18:14 2011 -0700 > @@ -96,7 +96,6 @@ > private: > int m_virtual_networks, m_num_vcs, m_vc_per_vnet; > GarnetNetwork_d *m_network_ptr; > - int m_flit_width; > > std::vector<double> buf_read_count; > std::vector<double> buf_write_count; > diff -r 39e42ccddd63 -r 89d0e7c17d1e > src/mem/ruby/network/garnet/flexible-pipeline/GarnetRouter.py > --- a/src/mem/ruby/network/garnet/flexible-pipeline/GarnetRouter.py Thu > Apr 28 17:18:14 2011 -0700 > +++ b/src/mem/ruby/network/garnet/flexible-pipeline/GarnetRouter.py Thu > Apr 28 17:18:14 2011 -0700 > @@ -39,6 +39,5 @@ > "virtual channels per message class") > virt_nets = Param.Int(Parent.number_of_virtual_networks, > "number of virtual networks") > - flit_width = Param.Int(Parent.ni_flit_size, "flit width == flit size") > > > diff -r 39e42ccddd63 -r 89d0e7c17d1e > src/mem/ruby/network/orion/NetworkPower.cc > --- a/src/mem/ruby/network/orion/NetworkPower.cc Thu Apr 28 17:18:14 > 2011 -0700 > +++ b/src/mem/ruby/network/orion/NetworkPower.cc Thu Apr 28 17:18:14 > 2011 -0700 > @@ -96,7 +96,8 @@ > uint32_t num_vc_per_vclass = m_vc_per_vnet; > uint32_t in_buf_per_data_vc = m_network_ptr->getBuffersPerDataVC(); > uint32_t in_buf_per_ctrl_vc = m_network_ptr->getBuffersPerCtrlVC(); > - uint32_t flit_width = m_flit_width * 8; //flit width in bits > + //flit width in bits > + uint32_t flit_width = m_network_ptr->getNiFlitSize() * 8; > > orion_rtr_ptr = new OrionRouter( > num_in_port, > _______________________________________________ > m5-dev mailing list > m5-dev@m5sim.org > http://m5sim.org/mailman/listinfo/m5-dev > -- Joel Hestness PhD Student, Computer Architecture Dept. of Computer Science, University of Texas - Austin http://www.cs.utexas.edu/~hestness _______________________________________________ m5-dev mailing list m5-dev@m5sim.org http://m5sim.org/mailman/listinfo/m5-dev
