From b5444625056a93cd676c512a891b0c13c44cf58b Mon Sep 17 00:00:00 2001 From: Steve Reinhardt Date: Fri, 29 Jan 2010 20:29:30 -0800 Subject: [PATCH] Garnet: reorganize directory tree. Rename the ruby/network/garnet-foo directories to garnet/foo. Move the common NetworkHeader.hh file from garnet-fixed-pipeline up to the common garnet directory. Fix up include paths. --HG-- rename : src/mem/ruby/network/garnet-fixed-pipeline/NetworkHeader.hh => src/mem/ruby/network/garnet/NetworkHeader.hh rename : src/mem/ruby/network/garnet-fixed-pipeline/CreditLink_d.hh => src/mem/ruby/network/garnet/fixed-pipeline/CreditLink_d.hh rename : src/mem/ruby/network/garnet-fixed-pipeline/GarnetNetwork_d.cc => src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.cc rename : src/mem/ruby/network/garnet-fixed-pipeline/GarnetNetwork_d.hh => src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.hh rename : src/mem/ruby/network/garnet-fixed-pipeline/InputUnit_d.cc => src/mem/ruby/network/garnet/fixed-pipeline/InputUnit_d.cc rename : src/mem/ruby/network/garnet-fixed-pipeline/InputUnit_d.hh => src/mem/ruby/network/garnet/fixed-pipeline/InputUnit_d.hh rename : src/mem/ruby/network/garnet-fixed-pipeline/NetworkInterface_d.cc => src/mem/ruby/network/garnet/fixed-pipeline/NetworkInterface_d.cc rename : src/mem/ruby/network/garnet-fixed-pipeline/NetworkInterface_d.hh => src/mem/ruby/network/garnet/fixed-pipeline/NetworkInterface_d.hh rename : src/mem/ruby/network/garnet-fixed-pipeline/NetworkLink_d.cc => src/mem/ruby/network/garnet/fixed-pipeline/NetworkLink_d.cc rename : src/mem/ruby/network/garnet-fixed-pipeline/NetworkLink_d.hh => src/mem/ruby/network/garnet/fixed-pipeline/NetworkLink_d.hh rename : src/mem/ruby/network/garnet-fixed-pipeline/OutVcState_d.cc => src/mem/ruby/network/garnet/fixed-pipeline/OutVcState_d.cc rename : src/mem/ruby/network/garnet-fixed-pipeline/OutVcState_d.hh => src/mem/ruby/network/garnet/fixed-pipeline/OutVcState_d.hh rename : src/mem/ruby/network/garnet-fixed-pipeline/OutputUnit_d.cc => src/mem/ruby/network/garnet/fixed-pipeline/OutputUnit_d.cc rename : src/mem/ruby/network/garnet-fixed-pipeline/OutputUnit_d.hh => src/mem/ruby/network/garnet/fixed-pipeline/OutputUnit_d.hh rename : src/mem/ruby/network/garnet-fixed-pipeline/Router_d.cc => src/mem/ruby/network/garnet/fixed-pipeline/Router_d.cc rename : src/mem/ruby/network/garnet-fixed-pipeline/Router_d.hh => src/mem/ruby/network/garnet/fixed-pipeline/Router_d.hh rename : src/mem/ruby/network/garnet-fixed-pipeline/RoutingUnit_d.cc => src/mem/ruby/network/garnet/fixed-pipeline/RoutingUnit_d.cc rename : src/mem/ruby/network/garnet-fixed-pipeline/RoutingUnit_d.hh => src/mem/ruby/network/garnet/fixed-pipeline/RoutingUnit_d.hh rename : src/mem/ruby/network/garnet-fixed-pipeline/SConscript => src/mem/ruby/network/garnet/fixed-pipeline/SConscript rename : src/mem/ruby/network/garnet-fixed-pipeline/SWallocator_d.cc => src/mem/ruby/network/garnet/fixed-pipeline/SWallocator_d.cc rename : src/mem/ruby/network/garnet-fixed-pipeline/SWallocator_d.hh => src/mem/ruby/network/garnet/fixed-pipeline/SWallocator_d.hh rename : src/mem/ruby/network/garnet-fixed-pipeline/Switch_d.cc => src/mem/ruby/network/garnet/fixed-pipeline/Switch_d.cc rename : src/mem/ruby/network/garnet-fixed-pipeline/Switch_d.hh => src/mem/ruby/network/garnet/fixed-pipeline/Switch_d.hh rename : src/mem/ruby/network/garnet-fixed-pipeline/VCallocator_d.cc => src/mem/ruby/network/garnet/fixed-pipeline/VCallocator_d.cc rename : src/mem/ruby/network/garnet-fixed-pipeline/VCallocator_d.hh => src/mem/ruby/network/garnet/fixed-pipeline/VCallocator_d.hh rename : src/mem/ruby/network/garnet-fixed-pipeline/VirtualChannel_d.cc => src/mem/ruby/network/garnet/fixed-pipeline/VirtualChannel_d.cc rename : src/mem/ruby/network/garnet-fixed-pipeline/VirtualChannel_d.hh => src/mem/ruby/network/garnet/fixed-pipeline/VirtualChannel_d.hh rename : src/mem/ruby/network/garnet-fixed-pipeline/flitBuffer_d.cc => src/mem/ruby/network/garnet/fixed-pipeline/flitBuffer_d.cc rename : src/mem/ruby/network/garnet-fixed-pipeline/flitBuffer_d.hh => src/mem/ruby/network/garnet/fixed-pipeline/flitBuffer_d.hh rename : src/mem/ruby/network/garnet-fixed-pipeline/flit_d.cc => src/mem/ruby/network/garnet/fixed-pipeline/flit_d.cc rename : src/mem/ruby/network/garnet-fixed-pipeline/flit_d.hh => src/mem/ruby/network/garnet/fixed-pipeline/flit_d.hh rename : src/mem/ruby/network/garnet-flexible-pipeline/FlexibleConsumer.hh => src/mem/ruby/network/garnet/flexible-pipeline/FlexibleConsumer.hh rename : src/mem/ruby/network/garnet-flexible-pipeline/GarnetNetwork.cc => src/mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.cc rename : src/mem/ruby/network/garnet-flexible-pipeline/GarnetNetwork.hh => src/mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.hh rename : src/mem/ruby/network/garnet-flexible-pipeline/InVcState.cc => src/mem/ruby/network/garnet/flexible-pipeline/InVcState.cc rename : src/mem/ruby/network/garnet-flexible-pipeline/InVcState.hh => src/mem/ruby/network/garnet/flexible-pipeline/InVcState.hh rename : src/mem/ruby/network/garnet-flexible-pipeline/NetworkConfig.hh => src/mem/ruby/network/garnet/flexible-pipeline/NetworkConfig.hh rename : src/mem/ruby/network/garnet-flexible-pipeline/NetworkInterface.cc => src/mem/ruby/network/garnet/flexible-pipeline/NetworkInterface.cc rename : src/mem/ruby/network/garnet-flexible-pipeline/NetworkInterface.hh => src/mem/ruby/network/garnet/flexible-pipeline/NetworkInterface.hh rename : src/mem/ruby/network/garnet-flexible-pipeline/NetworkLink.cc => src/mem/ruby/network/garnet/flexible-pipeline/NetworkLink.cc rename : src/mem/ruby/network/garnet-flexible-pipeline/NetworkLink.hh => src/mem/ruby/network/garnet/flexible-pipeline/NetworkLink.hh rename : src/mem/ruby/network/garnet-flexible-pipeline/OutVcState.cc => src/mem/ruby/network/garnet/flexible-pipeline/OutVcState.cc rename : src/mem/ruby/network/garnet-flexible-pipeline/OutVcState.hh => src/mem/ruby/network/garnet/flexible-pipeline/OutVcState.hh rename : src/mem/ruby/network/garnet-flexible-pipeline/Router.cc => src/mem/ruby/network/garnet/flexible-pipeline/Router.cc rename : src/mem/ruby/network/garnet-flexible-pipeline/Router.hh => src/mem/ruby/network/garnet/flexible-pipeline/Router.hh rename : src/mem/ruby/network/garnet-flexible-pipeline/SConscript => src/mem/ruby/network/garnet/flexible-pipeline/SConscript rename : src/mem/ruby/network/garnet-flexible-pipeline/VCarbiter.cc => src/mem/ruby/network/garnet/flexible-pipeline/VCarbiter.cc rename : src/mem/ruby/network/garnet-flexible-pipeline/VCarbiter.hh => src/mem/ruby/network/garnet/flexible-pipeline/VCarbiter.hh rename : src/mem/ruby/network/garnet-flexible-pipeline/flit.cc => src/mem/ruby/network/garnet/flexible-pipeline/flit.cc rename : src/mem/ruby/network/garnet-flexible-pipeline/flit.hh => src/mem/ruby/network/garnet/flexible-pipeline/flit.hh rename : src/mem/ruby/network/garnet-flexible-pipeline/flitBuffer.cc => src/mem/ruby/network/garnet/flexible-pipeline/flitBuffer.cc rename : src/mem/ruby/network/garnet-flexible-pipeline/flitBuffer.hh => src/mem/ruby/network/garnet/flexible-pipeline/flitBuffer.hh rename : src/mem/ruby/network/garnet-flexible-pipeline/netconfig.defaults => src/mem/ruby/network/garnet/flexible-pipeline/netconfig.defaults --- .../NetworkHeader.hh | 0 .../fixed-pipeline}/CreditLink_d.hh | 2 +- .../fixed-pipeline}/GarnetNetwork_d.cc | 10 +++++----- .../fixed-pipeline}/GarnetNetwork_d.hh | 2 +- .../fixed-pipeline}/InputUnit_d.cc | 4 ++-- .../fixed-pipeline}/InputUnit_d.hh | 10 +++++----- .../fixed-pipeline}/NetworkInterface_d.cc | 4 ++-- .../fixed-pipeline}/NetworkInterface_d.hh | 10 +++++----- .../fixed-pipeline}/NetworkLink_d.cc | 4 ++-- .../fixed-pipeline}/NetworkLink_d.hh | 4 ++-- .../fixed-pipeline}/OutVcState_d.cc | 2 +- .../fixed-pipeline}/OutVcState_d.hh | 4 ++-- .../fixed-pipeline}/OutputUnit_d.cc | 4 ++-- .../fixed-pipeline}/OutputUnit_d.hh | 10 +++++----- .../fixed-pipeline}/Router_d.cc | 20 +++++++++---------- .../fixed-pipeline}/Router_d.hh | 4 ++-- .../fixed-pipeline}/RoutingUnit_d.cc | 6 +++--- .../fixed-pipeline}/RoutingUnit_d.hh | 4 ++-- .../fixed-pipeline}/SConscript | 0 .../fixed-pipeline}/SWallocator_d.cc | 10 +++++----- .../fixed-pipeline}/SWallocator_d.hh | 2 +- .../fixed-pipeline}/Switch_d.cc | 6 +++--- .../fixed-pipeline}/Switch_d.hh | 4 ++-- .../fixed-pipeline}/VCallocator_d.cc | 10 +++++----- .../fixed-pipeline}/VCallocator_d.hh | 2 +- .../fixed-pipeline}/VirtualChannel_d.cc | 2 +- .../fixed-pipeline}/VirtualChannel_d.hh | 4 ++-- .../fixed-pipeline}/flitBuffer_d.cc | 2 +- .../fixed-pipeline}/flitBuffer_d.hh | 4 ++-- .../fixed-pipeline}/flit_d.cc | 2 +- .../fixed-pipeline}/flit_d.hh | 2 +- .../flexible-pipeline}/FlexibleConsumer.hh | 2 +- .../flexible-pipeline}/GarnetNetwork.cc | 10 +++++----- .../flexible-pipeline}/GarnetNetwork.hh | 4 ++-- .../flexible-pipeline}/InVcState.cc | 2 +- .../flexible-pipeline}/InVcState.hh | 2 +- .../flexible-pipeline}/NetworkConfig.hh | 2 +- .../flexible-pipeline}/NetworkInterface.cc | 4 ++-- .../flexible-pipeline}/NetworkInterface.hh | 10 +++++----- .../flexible-pipeline}/NetworkLink.cc | 6 +++--- .../flexible-pipeline}/NetworkLink.hh | 6 +++--- .../flexible-pipeline}/OutVcState.cc | 2 +- .../flexible-pipeline}/OutVcState.hh | 2 +- .../flexible-pipeline}/Router.cc | 8 ++++---- .../flexible-pipeline}/Router.hh | 14 ++++++------- .../flexible-pipeline}/SConscript | 0 .../flexible-pipeline}/VCarbiter.cc | 4 ++-- .../flexible-pipeline}/VCarbiter.hh | 2 +- .../flexible-pipeline}/flit.cc | 2 +- .../flexible-pipeline}/flit.hh | 2 +- .../flexible-pipeline}/flitBuffer.cc | 2 +- .../flexible-pipeline}/flitBuffer.hh | 4 ++-- .../flexible-pipeline}/netconfig.defaults | 0 53 files changed, 122 insertions(+), 122 deletions(-) rename src/mem/ruby/network/{garnet-fixed-pipeline => garnet}/NetworkHeader.hh (100%) rename src/mem/ruby/network/{garnet-fixed-pipeline => garnet/fixed-pipeline}/CreditLink_d.hh (96%) rename src/mem/ruby/network/{garnet-fixed-pipeline => garnet/fixed-pipeline}/GarnetNetwork_d.cc (97%) rename src/mem/ruby/network/{garnet-fixed-pipeline => garnet/fixed-pipeline}/GarnetNetwork_d.hh (98%) rename src/mem/ruby/network/{garnet-fixed-pipeline => garnet/fixed-pipeline}/InputUnit_d.cc (96%) rename src/mem/ruby/network/{garnet-fixed-pipeline => garnet/fixed-pipeline}/InputUnit_d.hh (93%) rename src/mem/ruby/network/{garnet-fixed-pipeline => garnet/fixed-pipeline}/NetworkInterface_d.cc (99%) rename src/mem/ruby/network/{garnet-fixed-pipeline => garnet/fixed-pipeline}/NetworkInterface_d.hh (91%) rename src/mem/ruby/network/{garnet-fixed-pipeline => garnet/fixed-pipeline}/NetworkLink_d.cc (96%) rename src/mem/ruby/network/{garnet-fixed-pipeline => garnet/fixed-pipeline}/NetworkLink_d.hh (95%) rename src/mem/ruby/network/{garnet-fixed-pipeline => garnet/fixed-pipeline}/OutVcState_d.cc (96%) rename src/mem/ruby/network/{garnet-fixed-pipeline => garnet/fixed-pipeline}/OutVcState_d.hh (95%) rename src/mem/ruby/network/{garnet-fixed-pipeline => garnet/fixed-pipeline}/OutputUnit_d.cc (96%) rename src/mem/ruby/network/{garnet-fixed-pipeline => garnet/fixed-pipeline}/OutputUnit_d.hh (90%) rename src/mem/ruby/network/{garnet-fixed-pipeline => garnet/fixed-pipeline}/Router_d.cc (89%) rename src/mem/ruby/network/{garnet-fixed-pipeline => garnet/fixed-pipeline}/Router_d.hh (96%) rename src/mem/ruby/network/{garnet-fixed-pipeline => garnet/fixed-pipeline}/RoutingUnit_d.cc (94%) rename src/mem/ruby/network/{garnet-fixed-pipeline => garnet/fixed-pipeline}/RoutingUnit_d.hh (94%) rename src/mem/ruby/network/{garnet-fixed-pipeline => garnet/fixed-pipeline}/SConscript (100%) rename src/mem/ruby/network/{garnet-fixed-pipeline => garnet/fixed-pipeline}/SWallocator_d.cc (96%) rename src/mem/ruby/network/{garnet-fixed-pipeline => garnet/fixed-pipeline}/SWallocator_d.hh (97%) rename src/mem/ruby/network/{garnet-fixed-pipeline => garnet/fixed-pipeline}/Switch_d.cc (94%) rename src/mem/ruby/network/{garnet-fixed-pipeline => garnet/fixed-pipeline}/Switch_d.hh (94%) rename src/mem/ruby/network/{garnet-fixed-pipeline => garnet/fixed-pipeline}/VCallocator_d.cc (97%) rename src/mem/ruby/network/{garnet-fixed-pipeline => garnet/fixed-pipeline}/VCallocator_d.hh (97%) rename src/mem/ruby/network/{garnet-fixed-pipeline => garnet/fixed-pipeline}/VirtualChannel_d.cc (97%) rename src/mem/ruby/network/{garnet-fixed-pipeline => garnet/fixed-pipeline}/VirtualChannel_d.hh (96%) rename src/mem/ruby/network/{garnet-fixed-pipeline => garnet/fixed-pipeline}/flitBuffer_d.cc (97%) rename src/mem/ruby/network/{garnet-fixed-pipeline => garnet/fixed-pipeline}/flitBuffer_d.hh (95%) rename src/mem/ruby/network/{garnet-fixed-pipeline => garnet/fixed-pipeline}/flit_d.cc (98%) rename src/mem/ruby/network/{garnet-fixed-pipeline => garnet/fixed-pipeline}/flit_d.hh (98%) rename src/mem/ruby/network/{garnet-flexible-pipeline => garnet/flexible-pipeline}/FlexibleConsumer.hh (96%) rename src/mem/ruby/network/{garnet-flexible-pipeline => garnet/flexible-pipeline}/GarnetNetwork.cc (97%) rename src/mem/ruby/network/{garnet-flexible-pipeline => garnet/flexible-pipeline}/GarnetNetwork.hh (97%) rename src/mem/ruby/network/{garnet-flexible-pipeline => garnet/flexible-pipeline}/InVcState.cc (97%) rename src/mem/ruby/network/{garnet-flexible-pipeline => garnet/flexible-pipeline}/InVcState.hh (96%) rename src/mem/ruby/network/{garnet-flexible-pipeline => garnet/flexible-pipeline}/NetworkConfig.hh (97%) rename src/mem/ruby/network/{garnet-flexible-pipeline => garnet/flexible-pipeline}/NetworkInterface.cc (99%) rename src/mem/ruby/network/{garnet-flexible-pipeline => garnet/flexible-pipeline}/NetworkInterface.hh (91%) rename src/mem/ruby/network/{garnet-flexible-pipeline => garnet/flexible-pipeline}/NetworkLink.cc (95%) rename src/mem/ruby/network/{garnet-flexible-pipeline => garnet/flexible-pipeline}/NetworkLink.hh (93%) rename src/mem/ruby/network/{garnet-flexible-pipeline => garnet/flexible-pipeline}/OutVcState.cc (96%) rename src/mem/ruby/network/{garnet-flexible-pipeline => garnet/flexible-pipeline}/OutVcState.hh (96%) rename src/mem/ruby/network/{garnet-flexible-pipeline => garnet/flexible-pipeline}/Router.cc (98%) rename src/mem/ruby/network/{garnet-flexible-pipeline => garnet/flexible-pipeline}/Router.hh (88%) rename src/mem/ruby/network/{garnet-flexible-pipeline => garnet/flexible-pipeline}/SConscript (100%) rename src/mem/ruby/network/{garnet-flexible-pipeline => garnet/flexible-pipeline}/VCarbiter.cc (93%) rename src/mem/ruby/network/{garnet-flexible-pipeline => garnet/flexible-pipeline}/VCarbiter.hh (96%) rename src/mem/ruby/network/{garnet-flexible-pipeline => garnet/flexible-pipeline}/flit.cc (97%) rename src/mem/ruby/network/{garnet-flexible-pipeline => garnet/flexible-pipeline}/flit.hh (97%) rename src/mem/ruby/network/{garnet-flexible-pipeline => garnet/flexible-pipeline}/flitBuffer.cc (97%) rename src/mem/ruby/network/{garnet-flexible-pipeline => garnet/flexible-pipeline}/flitBuffer.hh (94%) rename src/mem/ruby/network/{garnet-flexible-pipeline => garnet/flexible-pipeline}/netconfig.defaults (100%) diff --git a/src/mem/ruby/network/garnet-fixed-pipeline/NetworkHeader.hh b/src/mem/ruby/network/garnet/NetworkHeader.hh similarity index 100% rename from src/mem/ruby/network/garnet-fixed-pipeline/NetworkHeader.hh rename to src/mem/ruby/network/garnet/NetworkHeader.hh diff --git a/src/mem/ruby/network/garnet-fixed-pipeline/CreditLink_d.hh b/src/mem/ruby/network/garnet/fixed-pipeline/CreditLink_d.hh similarity index 96% rename from src/mem/ruby/network/garnet-fixed-pipeline/CreditLink_d.hh rename to src/mem/ruby/network/garnet/fixed-pipeline/CreditLink_d.hh index c554d7216..eda87da1a 100644 --- a/src/mem/ruby/network/garnet-fixed-pipeline/CreditLink_d.hh +++ b/src/mem/ruby/network/garnet/fixed-pipeline/CreditLink_d.hh @@ -31,7 +31,7 @@ #ifndef CREDIT_LINK_D_H #define CREDIT_LINK_D_H -#include "mem/ruby/network/garnet-fixed-pipeline/NetworkLink_d.hh" +#include "mem/ruby/network/garnet/fixed-pipeline/NetworkLink_d.hh" class CreditLink_d : public NetworkLink_d { public: diff --git a/src/mem/ruby/network/garnet-fixed-pipeline/GarnetNetwork_d.cc b/src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.cc similarity index 97% rename from src/mem/ruby/network/garnet-fixed-pipeline/GarnetNetwork_d.cc rename to src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.cc index 765dd1b29..11a34c0ce 100644 --- a/src/mem/ruby/network/garnet-fixed-pipeline/GarnetNetwork_d.cc +++ b/src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.cc @@ -28,14 +28,14 @@ * Authors: Niket Agarwal */ -#include "mem/ruby/network/garnet-fixed-pipeline/GarnetNetwork_d.hh" +#include "mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.hh" #include "mem/protocol/MachineType.hh" -#include "mem/ruby/network/garnet-fixed-pipeline/NetworkInterface_d.hh" +#include "mem/ruby/network/garnet/fixed-pipeline/NetworkInterface_d.hh" #include "mem/ruby/buffers/MessageBuffer.hh" -#include "mem/ruby/network/garnet-fixed-pipeline/Router_d.hh" +#include "mem/ruby/network/garnet/fixed-pipeline/Router_d.hh" #include "mem/ruby/network/simple/Topology.hh" -#include "mem/ruby/network/garnet-fixed-pipeline/NetworkLink_d.hh" -#include "mem/ruby/network/garnet-fixed-pipeline/CreditLink_d.hh" +#include "mem/ruby/network/garnet/fixed-pipeline/NetworkLink_d.hh" +#include "mem/ruby/network/garnet/fixed-pipeline/CreditLink_d.hh" #include "mem/ruby/common/NetDest.hh" GarnetNetwork_d::GarnetNetwork_d(const string & name) diff --git a/src/mem/ruby/network/garnet-fixed-pipeline/GarnetNetwork_d.hh b/src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.hh similarity index 98% rename from src/mem/ruby/network/garnet-fixed-pipeline/GarnetNetwork_d.hh rename to src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.hh index 33f13b836..ccd3e379a 100644 --- a/src/mem/ruby/network/garnet-fixed-pipeline/GarnetNetwork_d.hh +++ b/src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.hh @@ -31,7 +31,7 @@ #ifndef GARNETNETWORK_D_H #define GARNETNETWORK_D_H -#include "mem/ruby/network/garnet-fixed-pipeline/NetworkHeader.hh" +#include "mem/ruby/network/garnet/NetworkHeader.hh" #include "mem/gems_common/Vector.hh" #include "mem/ruby/network/garnet-flexible-pipeline/NetworkConfig.hh" #include "mem/ruby/network/Network.hh" diff --git a/src/mem/ruby/network/garnet-fixed-pipeline/InputUnit_d.cc b/src/mem/ruby/network/garnet/fixed-pipeline/InputUnit_d.cc similarity index 96% rename from src/mem/ruby/network/garnet-fixed-pipeline/InputUnit_d.cc rename to src/mem/ruby/network/garnet/fixed-pipeline/InputUnit_d.cc index 7f344b0b7..ce7a0152d 100644 --- a/src/mem/ruby/network/garnet-fixed-pipeline/InputUnit_d.cc +++ b/src/mem/ruby/network/garnet/fixed-pipeline/InputUnit_d.cc @@ -28,8 +28,8 @@ * Authors: Niket Agarwal */ -#include "mem/ruby/network/garnet-fixed-pipeline/InputUnit_d.hh" -#include "mem/ruby/network/garnet-fixed-pipeline/Router_d.hh" +#include "mem/ruby/network/garnet/fixed-pipeline/InputUnit_d.hh" +#include "mem/ruby/network/garnet/fixed-pipeline/Router_d.hh" InputUnit_d::InputUnit_d(int id, Router_d *router) { diff --git a/src/mem/ruby/network/garnet-fixed-pipeline/InputUnit_d.hh b/src/mem/ruby/network/garnet/fixed-pipeline/InputUnit_d.hh similarity index 93% rename from src/mem/ruby/network/garnet-fixed-pipeline/InputUnit_d.hh rename to src/mem/ruby/network/garnet/fixed-pipeline/InputUnit_d.hh index beee79b3e..bca7b10f0 100644 --- a/src/mem/ruby/network/garnet-fixed-pipeline/InputUnit_d.hh +++ b/src/mem/ruby/network/garnet/fixed-pipeline/InputUnit_d.hh @@ -31,13 +31,13 @@ #ifndef INPUT_UNIT_D_H #define INPUT_UNIT_D_H -#include "mem/ruby/network/garnet-fixed-pipeline/NetworkHeader.hh" -#include "mem/ruby/network/garnet-fixed-pipeline/flitBuffer_d.hh" +#include "mem/ruby/network/garnet/NetworkHeader.hh" +#include "mem/ruby/network/garnet/fixed-pipeline/flitBuffer_d.hh" #include "mem/ruby/common/Consumer.hh" #include "mem/gems_common/Vector.hh" -#include "mem/ruby/network/garnet-fixed-pipeline/VirtualChannel_d.hh" -#include "mem/ruby/network/garnet-fixed-pipeline/NetworkLink_d.hh" -#include "mem/ruby/network/garnet-fixed-pipeline/CreditLink_d.hh" +#include "mem/ruby/network/garnet/fixed-pipeline/VirtualChannel_d.hh" +#include "mem/ruby/network/garnet/fixed-pipeline/NetworkLink_d.hh" +#include "mem/ruby/network/garnet/fixed-pipeline/CreditLink_d.hh" class Router_d; diff --git a/src/mem/ruby/network/garnet-fixed-pipeline/NetworkInterface_d.cc b/src/mem/ruby/network/garnet/fixed-pipeline/NetworkInterface_d.cc similarity index 99% rename from src/mem/ruby/network/garnet-fixed-pipeline/NetworkInterface_d.cc rename to src/mem/ruby/network/garnet/fixed-pipeline/NetworkInterface_d.cc index c31b76d62..4ba885f60 100644 --- a/src/mem/ruby/network/garnet-fixed-pipeline/NetworkInterface_d.cc +++ b/src/mem/ruby/network/garnet/fixed-pipeline/NetworkInterface_d.cc @@ -28,9 +28,9 @@ * Authors: Niket Agarwal */ -#include "mem/ruby/network/garnet-fixed-pipeline/NetworkInterface_d.hh" +#include "mem/ruby/network/garnet/fixed-pipeline/NetworkInterface_d.hh" #include "mem/ruby/buffers/MessageBuffer.hh" -#include "mem/ruby/network/garnet-fixed-pipeline/flitBuffer_d.hh" +#include "mem/ruby/network/garnet/fixed-pipeline/flitBuffer_d.hh" #include "mem/ruby/slicc_interface/NetworkMessage.hh" NetworkInterface_d::NetworkInterface_d(int id, int virtual_networks, GarnetNetwork_d *network_ptr) diff --git a/src/mem/ruby/network/garnet-fixed-pipeline/NetworkInterface_d.hh b/src/mem/ruby/network/garnet/fixed-pipeline/NetworkInterface_d.hh similarity index 91% rename from src/mem/ruby/network/garnet-fixed-pipeline/NetworkInterface_d.hh rename to src/mem/ruby/network/garnet/fixed-pipeline/NetworkInterface_d.hh index 12b8d57e1..1ca4a7a9c 100644 --- a/src/mem/ruby/network/garnet-fixed-pipeline/NetworkInterface_d.hh +++ b/src/mem/ruby/network/garnet/fixed-pipeline/NetworkInterface_d.hh @@ -31,14 +31,14 @@ #ifndef NET_INTERFACE_D_H #define NET_INTERFACE_D_H -#include "mem/ruby/network/garnet-fixed-pipeline/NetworkHeader.hh" -#include "mem/ruby/network/garnet-fixed-pipeline/GarnetNetwork_d.hh" +#include "mem/ruby/network/garnet/NetworkHeader.hh" +#include "mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.hh" #include "mem/gems_common/Vector.hh" #include "mem/ruby/common/Consumer.hh" #include "mem/ruby/slicc_interface/Message.hh" -#include "mem/ruby/network/garnet-fixed-pipeline/NetworkLink_d.hh" -#include "mem/ruby/network/garnet-fixed-pipeline/CreditLink_d.hh" -#include "mem/ruby/network/garnet-fixed-pipeline/OutVcState_d.hh" +#include "mem/ruby/network/garnet/fixed-pipeline/NetworkLink_d.hh" +#include "mem/ruby/network/garnet/fixed-pipeline/CreditLink_d.hh" +#include "mem/ruby/network/garnet/fixed-pipeline/OutVcState_d.hh" class NetworkMessage; class MessageBuffer; diff --git a/src/mem/ruby/network/garnet-fixed-pipeline/NetworkLink_d.cc b/src/mem/ruby/network/garnet/fixed-pipeline/NetworkLink_d.cc similarity index 96% rename from src/mem/ruby/network/garnet-fixed-pipeline/NetworkLink_d.cc rename to src/mem/ruby/network/garnet/fixed-pipeline/NetworkLink_d.cc index dc3c73b0c..229497085 100644 --- a/src/mem/ruby/network/garnet-fixed-pipeline/NetworkLink_d.cc +++ b/src/mem/ruby/network/garnet/fixed-pipeline/NetworkLink_d.cc @@ -28,9 +28,9 @@ * Authors: Niket Agarwal */ -#include "mem/ruby/network/garnet-fixed-pipeline/NetworkLink_d.hh" +#include "mem/ruby/network/garnet/fixed-pipeline/NetworkLink_d.hh" #include "mem/ruby/network/garnet-flexible-pipeline/NetworkConfig.hh" -#include "mem/ruby/network/garnet-fixed-pipeline/GarnetNetwork_d.hh" +#include "mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.hh" /* NetworkLink_d::NetworkLink_d(int id) diff --git a/src/mem/ruby/network/garnet-fixed-pipeline/NetworkLink_d.hh b/src/mem/ruby/network/garnet/fixed-pipeline/NetworkLink_d.hh similarity index 95% rename from src/mem/ruby/network/garnet-fixed-pipeline/NetworkLink_d.hh rename to src/mem/ruby/network/garnet/fixed-pipeline/NetworkLink_d.hh index fed8afbd3..1fad7509d 100644 --- a/src/mem/ruby/network/garnet-fixed-pipeline/NetworkLink_d.hh +++ b/src/mem/ruby/network/garnet/fixed-pipeline/NetworkLink_d.hh @@ -31,9 +31,9 @@ #ifndef NETWORK_LINK_D_H #define NETWORK_LINK_D_H -#include "mem/ruby/network/garnet-fixed-pipeline/NetworkHeader.hh" +#include "mem/ruby/network/garnet/NetworkHeader.hh" #include "mem/ruby/common/Consumer.hh" -#include "mem/ruby/network/garnet-fixed-pipeline/flitBuffer_d.hh" +#include "mem/ruby/network/garnet/fixed-pipeline/flitBuffer_d.hh" #include "mem/gems_common/PrioHeap.hh" #include "mem/ruby/network/orion/power_bus.hh" diff --git a/src/mem/ruby/network/garnet-fixed-pipeline/OutVcState_d.cc b/src/mem/ruby/network/garnet/fixed-pipeline/OutVcState_d.cc similarity index 96% rename from src/mem/ruby/network/garnet-fixed-pipeline/OutVcState_d.cc rename to src/mem/ruby/network/garnet/fixed-pipeline/OutVcState_d.cc index 42d9af861..958886573 100644 --- a/src/mem/ruby/network/garnet-fixed-pipeline/OutVcState_d.cc +++ b/src/mem/ruby/network/garnet/fixed-pipeline/OutVcState_d.cc @@ -28,7 +28,7 @@ * Authors: Niket Agarwal */ -#include "mem/ruby/network/garnet-fixed-pipeline/OutVcState_d.hh" +#include "mem/ruby/network/garnet/fixed-pipeline/OutVcState_d.hh" #include "mem/ruby/network/garnet-flexible-pipeline/NetworkConfig.hh" #include "mem/ruby/eventqueue/RubyEventQueue.hh" diff --git a/src/mem/ruby/network/garnet-fixed-pipeline/OutVcState_d.hh b/src/mem/ruby/network/garnet/fixed-pipeline/OutVcState_d.hh similarity index 95% rename from src/mem/ruby/network/garnet-fixed-pipeline/OutVcState_d.hh rename to src/mem/ruby/network/garnet/fixed-pipeline/OutVcState_d.hh index fe6b5fc79..a6b063d4a 100644 --- a/src/mem/ruby/network/garnet-fixed-pipeline/OutVcState_d.hh +++ b/src/mem/ruby/network/garnet/fixed-pipeline/OutVcState_d.hh @@ -31,8 +31,8 @@ #ifndef OUT_VC_STATE_D_H #define OUT_VC_STATE_D_H -#include "mem/ruby/network/garnet-fixed-pipeline/NetworkHeader.hh" -#include "mem/ruby/network/garnet-fixed-pipeline/GarnetNetwork_d.hh" +#include "mem/ruby/network/garnet/NetworkHeader.hh" +#include "mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.hh" class OutVcState_d { public: diff --git a/src/mem/ruby/network/garnet-fixed-pipeline/OutputUnit_d.cc b/src/mem/ruby/network/garnet/fixed-pipeline/OutputUnit_d.cc similarity index 96% rename from src/mem/ruby/network/garnet-fixed-pipeline/OutputUnit_d.cc rename to src/mem/ruby/network/garnet/fixed-pipeline/OutputUnit_d.cc index e672009c9..8a371bb5f 100644 --- a/src/mem/ruby/network/garnet-fixed-pipeline/OutputUnit_d.cc +++ b/src/mem/ruby/network/garnet/fixed-pipeline/OutputUnit_d.cc @@ -28,8 +28,8 @@ * Authors: Niket Agarwal */ -#include "mem/ruby/network/garnet-fixed-pipeline/OutputUnit_d.hh" -#include "mem/ruby/network/garnet-fixed-pipeline/Router_d.hh" +#include "mem/ruby/network/garnet/fixed-pipeline/OutputUnit_d.hh" +#include "mem/ruby/network/garnet/fixed-pipeline/Router_d.hh" #include "mem/ruby/network/garnet-flexible-pipeline/NetworkConfig.hh" OutputUnit_d::OutputUnit_d(int id, Router_d *router) diff --git a/src/mem/ruby/network/garnet-fixed-pipeline/OutputUnit_d.hh b/src/mem/ruby/network/garnet/fixed-pipeline/OutputUnit_d.hh similarity index 90% rename from src/mem/ruby/network/garnet-fixed-pipeline/OutputUnit_d.hh rename to src/mem/ruby/network/garnet/fixed-pipeline/OutputUnit_d.hh index beeab8c7f..25747a1f8 100644 --- a/src/mem/ruby/network/garnet-fixed-pipeline/OutputUnit_d.hh +++ b/src/mem/ruby/network/garnet/fixed-pipeline/OutputUnit_d.hh @@ -31,12 +31,12 @@ #ifndef OUTPUT_UNIT_D_H #define OUTPUT_UNIT_D_H -#include "mem/ruby/network/garnet-fixed-pipeline/NetworkHeader.hh" +#include "mem/ruby/network/garnet/NetworkHeader.hh" #include "mem/ruby/common/Consumer.hh" -#include "mem/ruby/network/garnet-fixed-pipeline/flitBuffer_d.hh" -#include "mem/ruby/network/garnet-fixed-pipeline/OutVcState_d.hh" -#include "mem/ruby/network/garnet-fixed-pipeline/NetworkLink_d.hh" -#include "mem/ruby/network/garnet-fixed-pipeline/CreditLink_d.hh" +#include "mem/ruby/network/garnet/fixed-pipeline/flitBuffer_d.hh" +#include "mem/ruby/network/garnet/fixed-pipeline/OutVcState_d.hh" +#include "mem/ruby/network/garnet/fixed-pipeline/NetworkLink_d.hh" +#include "mem/ruby/network/garnet/fixed-pipeline/CreditLink_d.hh" class Router_d; diff --git a/src/mem/ruby/network/garnet-fixed-pipeline/Router_d.cc b/src/mem/ruby/network/garnet/fixed-pipeline/Router_d.cc similarity index 89% rename from src/mem/ruby/network/garnet-fixed-pipeline/Router_d.cc rename to src/mem/ruby/network/garnet/fixed-pipeline/Router_d.cc index 5334de7b9..89a893e3a 100644 --- a/src/mem/ruby/network/garnet-fixed-pipeline/Router_d.cc +++ b/src/mem/ruby/network/garnet/fixed-pipeline/Router_d.cc @@ -28,16 +28,16 @@ * Authors: Niket Agarwal */ -#include "mem/ruby/network/garnet-fixed-pipeline/Router_d.hh" -#include "mem/ruby/network/garnet-fixed-pipeline/GarnetNetwork_d.hh" -#include "mem/ruby/network/garnet-fixed-pipeline/NetworkLink_d.hh" -#include "mem/ruby/network/garnet-fixed-pipeline/CreditLink_d.hh" -#include "mem/ruby/network/garnet-fixed-pipeline/InputUnit_d.hh" -#include "mem/ruby/network/garnet-fixed-pipeline/OutputUnit_d.hh" -#include "mem/ruby/network/garnet-fixed-pipeline/RoutingUnit_d.hh" -#include "mem/ruby/network/garnet-fixed-pipeline/VCallocator_d.hh" -#include "mem/ruby/network/garnet-fixed-pipeline/SWallocator_d.hh" -#include "mem/ruby/network/garnet-fixed-pipeline/Switch_d.hh" +#include "mem/ruby/network/garnet/fixed-pipeline/Router_d.hh" +#include "mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.hh" +#include "mem/ruby/network/garnet/fixed-pipeline/NetworkLink_d.hh" +#include "mem/ruby/network/garnet/fixed-pipeline/CreditLink_d.hh" +#include "mem/ruby/network/garnet/fixed-pipeline/InputUnit_d.hh" +#include "mem/ruby/network/garnet/fixed-pipeline/OutputUnit_d.hh" +#include "mem/ruby/network/garnet/fixed-pipeline/RoutingUnit_d.hh" +#include "mem/ruby/network/garnet/fixed-pipeline/VCallocator_d.hh" +#include "mem/ruby/network/garnet/fixed-pipeline/SWallocator_d.hh" +#include "mem/ruby/network/garnet/fixed-pipeline/Switch_d.hh" Router_d::Router_d(int id, GarnetNetwork_d *network_ptr) { diff --git a/src/mem/ruby/network/garnet-fixed-pipeline/Router_d.hh b/src/mem/ruby/network/garnet/fixed-pipeline/Router_d.hh similarity index 96% rename from src/mem/ruby/network/garnet-fixed-pipeline/Router_d.hh rename to src/mem/ruby/network/garnet/fixed-pipeline/Router_d.hh index f9af1abfb..eca621479 100644 --- a/src/mem/ruby/network/garnet-fixed-pipeline/Router_d.hh +++ b/src/mem/ruby/network/garnet/fixed-pipeline/Router_d.hh @@ -31,9 +31,9 @@ #ifndef ROUTER_D_H #define ROUTER_D_H -#include "mem/ruby/network/garnet-fixed-pipeline/NetworkHeader.hh" +#include "mem/ruby/network/garnet/NetworkHeader.hh" #include "mem/gems_common/Vector.hh" -#include "mem/ruby/network/garnet-fixed-pipeline/flit_d.hh" +#include "mem/ruby/network/garnet/fixed-pipeline/flit_d.hh" #include "mem/ruby/common/NetDest.hh" #include "mem/ruby/network/orion/power_router_init.hh" diff --git a/src/mem/ruby/network/garnet-fixed-pipeline/RoutingUnit_d.cc b/src/mem/ruby/network/garnet/fixed-pipeline/RoutingUnit_d.cc similarity index 94% rename from src/mem/ruby/network/garnet-fixed-pipeline/RoutingUnit_d.cc rename to src/mem/ruby/network/garnet/fixed-pipeline/RoutingUnit_d.cc index 9f12ac9cc..0c215efd3 100644 --- a/src/mem/ruby/network/garnet-fixed-pipeline/RoutingUnit_d.cc +++ b/src/mem/ruby/network/garnet/fixed-pipeline/RoutingUnit_d.cc @@ -28,9 +28,9 @@ * Authors: Niket Agarwal */ -#include "mem/ruby/network/garnet-fixed-pipeline/RoutingUnit_d.hh" -#include "mem/ruby/network/garnet-fixed-pipeline/Router_d.hh" -#include "mem/ruby/network/garnet-fixed-pipeline/InputUnit_d.hh" +#include "mem/ruby/network/garnet/fixed-pipeline/RoutingUnit_d.hh" +#include "mem/ruby/network/garnet/fixed-pipeline/Router_d.hh" +#include "mem/ruby/network/garnet/fixed-pipeline/InputUnit_d.hh" #include "mem/ruby/slicc_interface/NetworkMessage.hh" RoutingUnit_d::RoutingUnit_d(Router_d *router) diff --git a/src/mem/ruby/network/garnet-fixed-pipeline/RoutingUnit_d.hh b/src/mem/ruby/network/garnet/fixed-pipeline/RoutingUnit_d.hh similarity index 94% rename from src/mem/ruby/network/garnet-fixed-pipeline/RoutingUnit_d.hh rename to src/mem/ruby/network/garnet/fixed-pipeline/RoutingUnit_d.hh index 33c9f3cc4..9688623a7 100644 --- a/src/mem/ruby/network/garnet-fixed-pipeline/RoutingUnit_d.hh +++ b/src/mem/ruby/network/garnet/fixed-pipeline/RoutingUnit_d.hh @@ -31,9 +31,9 @@ #ifndef ROUTING_UNIT_D_H #define ROUTING_UNIT_D_H -#include "mem/ruby/network/garnet-fixed-pipeline/NetworkHeader.hh" +#include "mem/ruby/network/garnet/NetworkHeader.hh" #include "mem/ruby/common/Consumer.hh" -#include "mem/ruby/network/garnet-fixed-pipeline/flit_d.hh" +#include "mem/ruby/network/garnet/fixed-pipeline/flit_d.hh" #include "mem/ruby/common/NetDest.hh" class InputUnit_d; diff --git a/src/mem/ruby/network/garnet-fixed-pipeline/SConscript b/src/mem/ruby/network/garnet/fixed-pipeline/SConscript similarity index 100% rename from src/mem/ruby/network/garnet-fixed-pipeline/SConscript rename to src/mem/ruby/network/garnet/fixed-pipeline/SConscript diff --git a/src/mem/ruby/network/garnet-fixed-pipeline/SWallocator_d.cc b/src/mem/ruby/network/garnet/fixed-pipeline/SWallocator_d.cc similarity index 96% rename from src/mem/ruby/network/garnet-fixed-pipeline/SWallocator_d.cc rename to src/mem/ruby/network/garnet/fixed-pipeline/SWallocator_d.cc index c7308597a..4d607619f 100644 --- a/src/mem/ruby/network/garnet-fixed-pipeline/SWallocator_d.cc +++ b/src/mem/ruby/network/garnet/fixed-pipeline/SWallocator_d.cc @@ -28,11 +28,11 @@ * Authors: Niket Agarwal */ -#include "mem/ruby/network/garnet-fixed-pipeline/SWallocator_d.hh" -#include "mem/ruby/network/garnet-fixed-pipeline/Router_d.hh" -#include "mem/ruby/network/garnet-fixed-pipeline/InputUnit_d.hh" -#include "mem/ruby/network/garnet-fixed-pipeline/OutputUnit_d.hh" -#include "mem/ruby/network/garnet-fixed-pipeline/GarnetNetwork_d.hh" +#include "mem/ruby/network/garnet/fixed-pipeline/SWallocator_d.hh" +#include "mem/ruby/network/garnet/fixed-pipeline/Router_d.hh" +#include "mem/ruby/network/garnet/fixed-pipeline/InputUnit_d.hh" +#include "mem/ruby/network/garnet/fixed-pipeline/OutputUnit_d.hh" +#include "mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.hh" SWallocator_d::SWallocator_d(Router_d *router) { diff --git a/src/mem/ruby/network/garnet-fixed-pipeline/SWallocator_d.hh b/src/mem/ruby/network/garnet/fixed-pipeline/SWallocator_d.hh similarity index 97% rename from src/mem/ruby/network/garnet-fixed-pipeline/SWallocator_d.hh rename to src/mem/ruby/network/garnet/fixed-pipeline/SWallocator_d.hh index f0ec5d77e..a6c838e8a 100644 --- a/src/mem/ruby/network/garnet-fixed-pipeline/SWallocator_d.hh +++ b/src/mem/ruby/network/garnet/fixed-pipeline/SWallocator_d.hh @@ -31,7 +31,7 @@ #ifndef SW_ALLOCATOR_D_H #define SW_ALLOCATOR_D_H -#include "mem/ruby/network/garnet-fixed-pipeline/NetworkHeader.hh" +#include "mem/ruby/network/garnet/NetworkHeader.hh" #include "mem/ruby/common/Consumer.hh" class Router_d; diff --git a/src/mem/ruby/network/garnet-fixed-pipeline/Switch_d.cc b/src/mem/ruby/network/garnet/fixed-pipeline/Switch_d.cc similarity index 94% rename from src/mem/ruby/network/garnet-fixed-pipeline/Switch_d.cc rename to src/mem/ruby/network/garnet/fixed-pipeline/Switch_d.cc index 11a196906..9b999341d 100644 --- a/src/mem/ruby/network/garnet-fixed-pipeline/Switch_d.cc +++ b/src/mem/ruby/network/garnet/fixed-pipeline/Switch_d.cc @@ -28,9 +28,9 @@ * Authors: Niket Agarwal */ -#include "mem/ruby/network/garnet-fixed-pipeline/Switch_d.hh" -#include "mem/ruby/network/garnet-fixed-pipeline/Router_d.hh" -#include "mem/ruby/network/garnet-fixed-pipeline/OutputUnit_d.hh" +#include "mem/ruby/network/garnet/fixed-pipeline/Switch_d.hh" +#include "mem/ruby/network/garnet/fixed-pipeline/Router_d.hh" +#include "mem/ruby/network/garnet/fixed-pipeline/OutputUnit_d.hh" Switch_d::Switch_d(Router_d *router) { diff --git a/src/mem/ruby/network/garnet-fixed-pipeline/Switch_d.hh b/src/mem/ruby/network/garnet/fixed-pipeline/Switch_d.hh similarity index 94% rename from src/mem/ruby/network/garnet-fixed-pipeline/Switch_d.hh rename to src/mem/ruby/network/garnet/fixed-pipeline/Switch_d.hh index 936972714..0e3c17b3b 100644 --- a/src/mem/ruby/network/garnet-fixed-pipeline/Switch_d.hh +++ b/src/mem/ruby/network/garnet/fixed-pipeline/Switch_d.hh @@ -31,9 +31,9 @@ #ifndef SWITCH_D_H #define SWITCH_D_H -#include "mem/ruby/network/garnet-fixed-pipeline/NetworkHeader.hh" +#include "mem/ruby/network/garnet/NetworkHeader.hh" #include "mem/ruby/common/Consumer.hh" -#include "mem/ruby/network/garnet-fixed-pipeline/flitBuffer_d.hh" +#include "mem/ruby/network/garnet/fixed-pipeline/flitBuffer_d.hh" class Router_d; class OutputUnit_d; diff --git a/src/mem/ruby/network/garnet-fixed-pipeline/VCallocator_d.cc b/src/mem/ruby/network/garnet/fixed-pipeline/VCallocator_d.cc similarity index 97% rename from src/mem/ruby/network/garnet-fixed-pipeline/VCallocator_d.cc rename to src/mem/ruby/network/garnet/fixed-pipeline/VCallocator_d.cc index 4150907d1..7bfb4948d 100644 --- a/src/mem/ruby/network/garnet-fixed-pipeline/VCallocator_d.cc +++ b/src/mem/ruby/network/garnet/fixed-pipeline/VCallocator_d.cc @@ -29,11 +29,11 @@ */ #include "mem/ruby/network/garnet-flexible-pipeline/NetworkConfig.hh" -#include "mem/ruby/network/garnet-fixed-pipeline/VCallocator_d.hh" -#include "mem/ruby/network/garnet-fixed-pipeline/Router_d.hh" -#include "mem/ruby/network/garnet-fixed-pipeline/InputUnit_d.hh" -#include "mem/ruby/network/garnet-fixed-pipeline/OutputUnit_d.hh" -#include "mem/ruby/network/garnet-fixed-pipeline/GarnetNetwork_d.hh" +#include "mem/ruby/network/garnet/fixed-pipeline/VCallocator_d.hh" +#include "mem/ruby/network/garnet/fixed-pipeline/Router_d.hh" +#include "mem/ruby/network/garnet/fixed-pipeline/InputUnit_d.hh" +#include "mem/ruby/network/garnet/fixed-pipeline/OutputUnit_d.hh" +#include "mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.hh" VCallocator_d::VCallocator_d(Router_d *router) { diff --git a/src/mem/ruby/network/garnet-fixed-pipeline/VCallocator_d.hh b/src/mem/ruby/network/garnet/fixed-pipeline/VCallocator_d.hh similarity index 97% rename from src/mem/ruby/network/garnet-fixed-pipeline/VCallocator_d.hh rename to src/mem/ruby/network/garnet/fixed-pipeline/VCallocator_d.hh index ad3c2c95f..c9247c6d0 100644 --- a/src/mem/ruby/network/garnet-fixed-pipeline/VCallocator_d.hh +++ b/src/mem/ruby/network/garnet/fixed-pipeline/VCallocator_d.hh @@ -31,7 +31,7 @@ #ifndef VC_ALLOCATOR_D_H #define VC_ALLOCATOR_D_H -#include "mem/ruby/network/garnet-fixed-pipeline/NetworkHeader.hh" +#include "mem/ruby/network/garnet/NetworkHeader.hh" #include "mem/ruby/common/Consumer.hh" class Router_d; diff --git a/src/mem/ruby/network/garnet-fixed-pipeline/VirtualChannel_d.cc b/src/mem/ruby/network/garnet/fixed-pipeline/VirtualChannel_d.cc similarity index 97% rename from src/mem/ruby/network/garnet-fixed-pipeline/VirtualChannel_d.cc rename to src/mem/ruby/network/garnet/fixed-pipeline/VirtualChannel_d.cc index 5ce3ca4e5..94e78196c 100644 --- a/src/mem/ruby/network/garnet-fixed-pipeline/VirtualChannel_d.cc +++ b/src/mem/ruby/network/garnet/fixed-pipeline/VirtualChannel_d.cc @@ -28,7 +28,7 @@ * Authors: Niket Agarwal */ -#include "mem/ruby/network/garnet-fixed-pipeline/VirtualChannel_d.hh" +#include "mem/ruby/network/garnet/fixed-pipeline/VirtualChannel_d.hh" VirtualChannel_d::VirtualChannel_d(int id) { diff --git a/src/mem/ruby/network/garnet-fixed-pipeline/VirtualChannel_d.hh b/src/mem/ruby/network/garnet/fixed-pipeline/VirtualChannel_d.hh similarity index 96% rename from src/mem/ruby/network/garnet-fixed-pipeline/VirtualChannel_d.hh rename to src/mem/ruby/network/garnet/fixed-pipeline/VirtualChannel_d.hh index 2d81cb7e3..2b4779038 100644 --- a/src/mem/ruby/network/garnet-fixed-pipeline/VirtualChannel_d.hh +++ b/src/mem/ruby/network/garnet/fixed-pipeline/VirtualChannel_d.hh @@ -31,8 +31,8 @@ #ifndef VIRTUAL_CHANNEL_D_H #define VIRTUAL_CHANNEL_D_H -#include "mem/ruby/network/garnet-fixed-pipeline/NetworkHeader.hh" -#include "mem/ruby/network/garnet-fixed-pipeline/flitBuffer_d.hh" +#include "mem/ruby/network/garnet/NetworkHeader.hh" +#include "mem/ruby/network/garnet/fixed-pipeline/flitBuffer_d.hh" class VirtualChannel_d { public: diff --git a/src/mem/ruby/network/garnet-fixed-pipeline/flitBuffer_d.cc b/src/mem/ruby/network/garnet/fixed-pipeline/flitBuffer_d.cc similarity index 97% rename from src/mem/ruby/network/garnet-fixed-pipeline/flitBuffer_d.cc rename to src/mem/ruby/network/garnet/fixed-pipeline/flitBuffer_d.cc index fa189a8cc..9578f0a8f 100644 --- a/src/mem/ruby/network/garnet-fixed-pipeline/flitBuffer_d.cc +++ b/src/mem/ruby/network/garnet/fixed-pipeline/flitBuffer_d.cc @@ -28,7 +28,7 @@ * Authors: Niket Agarwal */ -#include "mem/ruby/network/garnet-fixed-pipeline/flitBuffer_d.hh" +#include "mem/ruby/network/garnet/fixed-pipeline/flitBuffer_d.hh" flitBuffer_d::flitBuffer_d() { diff --git a/src/mem/ruby/network/garnet-fixed-pipeline/flitBuffer_d.hh b/src/mem/ruby/network/garnet/fixed-pipeline/flitBuffer_d.hh similarity index 95% rename from src/mem/ruby/network/garnet-fixed-pipeline/flitBuffer_d.hh rename to src/mem/ruby/network/garnet/fixed-pipeline/flitBuffer_d.hh index 2edea9d76..11a3cda9c 100644 --- a/src/mem/ruby/network/garnet-fixed-pipeline/flitBuffer_d.hh +++ b/src/mem/ruby/network/garnet/fixed-pipeline/flitBuffer_d.hh @@ -31,9 +31,9 @@ #ifndef FLIT_BUFFER_D_H #define FLIT_BUFFER_D_H -#include "mem/ruby/network/garnet-fixed-pipeline/NetworkHeader.hh" +#include "mem/ruby/network/garnet/NetworkHeader.hh" #include "mem/gems_common/PrioHeap.hh" -#include "mem/ruby/network/garnet-fixed-pipeline/flit_d.hh" +#include "mem/ruby/network/garnet/fixed-pipeline/flit_d.hh" class flitBuffer_d { public: diff --git a/src/mem/ruby/network/garnet-fixed-pipeline/flit_d.cc b/src/mem/ruby/network/garnet/fixed-pipeline/flit_d.cc similarity index 98% rename from src/mem/ruby/network/garnet-fixed-pipeline/flit_d.cc rename to src/mem/ruby/network/garnet/fixed-pipeline/flit_d.cc index 15e0b0394..c6a58a839 100644 --- a/src/mem/ruby/network/garnet-fixed-pipeline/flit_d.cc +++ b/src/mem/ruby/network/garnet/fixed-pipeline/flit_d.cc @@ -28,7 +28,7 @@ * Authors: Niket Agarwal */ -#include "mem/ruby/network/garnet-fixed-pipeline/flit_d.hh" +#include "mem/ruby/network/garnet/fixed-pipeline/flit_d.hh" flit_d::flit_d(int id, int vc, int vnet, int size, MsgPtr msg_ptr) { diff --git a/src/mem/ruby/network/garnet-fixed-pipeline/flit_d.hh b/src/mem/ruby/network/garnet/fixed-pipeline/flit_d.hh similarity index 98% rename from src/mem/ruby/network/garnet-fixed-pipeline/flit_d.hh rename to src/mem/ruby/network/garnet/fixed-pipeline/flit_d.hh index 39f04052d..3f9afcdca 100644 --- a/src/mem/ruby/network/garnet-fixed-pipeline/flit_d.hh +++ b/src/mem/ruby/network/garnet/fixed-pipeline/flit_d.hh @@ -31,7 +31,7 @@ #ifndef FLIT_D_H #define FLIT_D_H -#include "mem/ruby/network/garnet-fixed-pipeline/NetworkHeader.hh" +#include "mem/ruby/network/garnet/NetworkHeader.hh" #include "mem/ruby/slicc_interface/Message.hh" class flit_d { diff --git a/src/mem/ruby/network/garnet-flexible-pipeline/FlexibleConsumer.hh b/src/mem/ruby/network/garnet/flexible-pipeline/FlexibleConsumer.hh similarity index 96% rename from src/mem/ruby/network/garnet-flexible-pipeline/FlexibleConsumer.hh rename to src/mem/ruby/network/garnet/flexible-pipeline/FlexibleConsumer.hh index 82179ec21..fd12b4ec8 100644 --- a/src/mem/ruby/network/garnet-flexible-pipeline/FlexibleConsumer.hh +++ b/src/mem/ruby/network/garnet/flexible-pipeline/FlexibleConsumer.hh @@ -32,7 +32,7 @@ #define FLEXIBLE_CONSUMER_H #include "mem/ruby/common/Consumer.hh" -#include "mem/ruby/network/garnet-fixed-pipeline/NetworkHeader.hh" +#include "mem/ruby/network/garnet/NetworkHeader.hh" #include "mem/ruby/common/NetDest.hh" class FlexibleConsumer : public Consumer { diff --git a/src/mem/ruby/network/garnet-flexible-pipeline/GarnetNetwork.cc b/src/mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.cc similarity index 97% rename from src/mem/ruby/network/garnet-flexible-pipeline/GarnetNetwork.cc rename to src/mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.cc index d93d8ef48..a88263c62 100644 --- a/src/mem/ruby/network/garnet-flexible-pipeline/GarnetNetwork.cc +++ b/src/mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.cc @@ -28,15 +28,15 @@ * Authors: Niket Agarwal */ -#include "mem/ruby/network/garnet-flexible-pipeline/GarnetNetwork.hh" +#include "mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.hh" #include "mem/protocol/MachineType.hh" -#include "mem/ruby/network/garnet-flexible-pipeline/NetworkInterface.hh" +#include "mem/ruby/network/garnet/flexible-pipeline/NetworkInterface.hh" #include "mem/ruby/buffers/MessageBuffer.hh" -#include "mem/ruby/network/garnet-flexible-pipeline/Router.hh" +#include "mem/ruby/network/garnet/flexible-pipeline/Router.hh" #include "mem/ruby/network/simple/Topology.hh" #include "mem/ruby/network/simple/SimpleNetwork.hh" -#include "mem/ruby/network/garnet-fixed-pipeline/GarnetNetwork_d.hh" -#include "mem/ruby/network/garnet-flexible-pipeline/NetworkLink.hh" +#include "mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.hh" +#include "mem/ruby/network/garnet/flexible-pipeline/NetworkLink.hh" #include "mem/ruby/common/NetDest.hh" GarnetNetwork::GarnetNetwork(const string & name) diff --git a/src/mem/ruby/network/garnet-flexible-pipeline/GarnetNetwork.hh b/src/mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.hh similarity index 97% rename from src/mem/ruby/network/garnet-flexible-pipeline/GarnetNetwork.hh rename to src/mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.hh index fbebcc7bd..03a17037f 100644 --- a/src/mem/ruby/network/garnet-flexible-pipeline/GarnetNetwork.hh +++ b/src/mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.hh @@ -31,9 +31,9 @@ #ifndef GARNET_NETWORK_H #define GARNET_NETWORK_H -#include "mem/ruby/network/garnet-fixed-pipeline/NetworkHeader.hh" +#include "mem/ruby/network/garnet/NetworkHeader.hh" #include "mem/gems_common/Vector.hh" -#include "mem/ruby/network/garnet-flexible-pipeline/NetworkConfig.hh" +#include "mem/ruby/network/garnet/flexible-pipeline/NetworkConfig.hh" #include "mem/ruby/network/Network.hh" class NetworkInterface; diff --git a/src/mem/ruby/network/garnet-flexible-pipeline/InVcState.cc b/src/mem/ruby/network/garnet/flexible-pipeline/InVcState.cc similarity index 97% rename from src/mem/ruby/network/garnet-flexible-pipeline/InVcState.cc rename to src/mem/ruby/network/garnet/flexible-pipeline/InVcState.cc index 7fdff46b9..84196e45e 100644 --- a/src/mem/ruby/network/garnet-flexible-pipeline/InVcState.cc +++ b/src/mem/ruby/network/garnet/flexible-pipeline/InVcState.cc @@ -28,7 +28,7 @@ * Authors: Niket Agarwal */ -#include "mem/ruby/network/garnet-flexible-pipeline/InVcState.hh" +#include "mem/ruby/network/garnet/flexible-pipeline/InVcState.hh" InVcState::InVcState(int id) { diff --git a/src/mem/ruby/network/garnet-flexible-pipeline/InVcState.hh b/src/mem/ruby/network/garnet/flexible-pipeline/InVcState.hh similarity index 96% rename from src/mem/ruby/network/garnet-flexible-pipeline/InVcState.hh rename to src/mem/ruby/network/garnet/flexible-pipeline/InVcState.hh index 67ff6b459..d84bbe81f 100644 --- a/src/mem/ruby/network/garnet-flexible-pipeline/InVcState.hh +++ b/src/mem/ruby/network/garnet/flexible-pipeline/InVcState.hh @@ -31,7 +31,7 @@ #ifndef IN_VC_STATE_H #define IN_VC_STATE_H -#include "mem/ruby/network/garnet-fixed-pipeline/NetworkHeader.hh" +#include "mem/ruby/network/garnet/NetworkHeader.hh" class InVcState { public: diff --git a/src/mem/ruby/network/garnet-flexible-pipeline/NetworkConfig.hh b/src/mem/ruby/network/garnet/flexible-pipeline/NetworkConfig.hh similarity index 97% rename from src/mem/ruby/network/garnet-flexible-pipeline/NetworkConfig.hh rename to src/mem/ruby/network/garnet/flexible-pipeline/NetworkConfig.hh index b23e9a88a..44900d25e 100644 --- a/src/mem/ruby/network/garnet-flexible-pipeline/NetworkConfig.hh +++ b/src/mem/ruby/network/garnet/flexible-pipeline/NetworkConfig.hh @@ -36,7 +36,7 @@ #ifndef NETWORKCONFIG_H #define NETWORKCONFIG_H -#include "mem/ruby/network/garnet-fixed-pipeline/NetworkHeader.hh" +#include "mem/ruby/network/garnet/NetworkHeader.hh" #include "mem/gems_common/util.hh" class NetworkConfig { diff --git a/src/mem/ruby/network/garnet-flexible-pipeline/NetworkInterface.cc b/src/mem/ruby/network/garnet/flexible-pipeline/NetworkInterface.cc similarity index 99% rename from src/mem/ruby/network/garnet-flexible-pipeline/NetworkInterface.cc rename to src/mem/ruby/network/garnet/flexible-pipeline/NetworkInterface.cc index 4af5b296f..a8a8fd137 100644 --- a/src/mem/ruby/network/garnet-flexible-pipeline/NetworkInterface.cc +++ b/src/mem/ruby/network/garnet/flexible-pipeline/NetworkInterface.cc @@ -28,9 +28,9 @@ * Authors: Niket Agarwal */ -#include "mem/ruby/network/garnet-flexible-pipeline/NetworkInterface.hh" +#include "mem/ruby/network/garnet/flexible-pipeline/NetworkInterface.hh" #include "mem/ruby/buffers/MessageBuffer.hh" -#include "mem/ruby/network/garnet-flexible-pipeline/flitBuffer.hh" +#include "mem/ruby/network/garnet/flexible-pipeline/flitBuffer.hh" #include "mem/ruby/slicc_interface/NetworkMessage.hh" NetworkInterface::NetworkInterface(int id, int virtual_networks, GarnetNetwork *network_ptr) diff --git a/src/mem/ruby/network/garnet-flexible-pipeline/NetworkInterface.hh b/src/mem/ruby/network/garnet/flexible-pipeline/NetworkInterface.hh similarity index 91% rename from src/mem/ruby/network/garnet-flexible-pipeline/NetworkInterface.hh rename to src/mem/ruby/network/garnet/flexible-pipeline/NetworkInterface.hh index 8444658ea..67bba5f04 100644 --- a/src/mem/ruby/network/garnet-flexible-pipeline/NetworkInterface.hh +++ b/src/mem/ruby/network/garnet/flexible-pipeline/NetworkInterface.hh @@ -31,13 +31,13 @@ #ifndef NET_INTERFACE_H #define NET_INTERFACE_H -#include "mem/ruby/network/garnet-fixed-pipeline/NetworkHeader.hh" -#include "mem/ruby/network/garnet-flexible-pipeline/GarnetNetwork.hh" +#include "mem/ruby/network/garnet/NetworkHeader.hh" +#include "mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.hh" #include "mem/gems_common/Vector.hh" -#include "mem/ruby/network/garnet-flexible-pipeline/FlexibleConsumer.hh" +#include "mem/ruby/network/garnet/flexible-pipeline/FlexibleConsumer.hh" #include "mem/ruby/slicc_interface/Message.hh" -#include "mem/ruby/network/garnet-flexible-pipeline/NetworkLink.hh" -#include "mem/ruby/network/garnet-flexible-pipeline/OutVcState.hh" +#include "mem/ruby/network/garnet/flexible-pipeline/NetworkLink.hh" +#include "mem/ruby/network/garnet/flexible-pipeline/OutVcState.hh" class NetworkMessage; class MessageBuffer; diff --git a/src/mem/ruby/network/garnet-flexible-pipeline/NetworkLink.cc b/src/mem/ruby/network/garnet/flexible-pipeline/NetworkLink.cc similarity index 95% rename from src/mem/ruby/network/garnet-flexible-pipeline/NetworkLink.cc rename to src/mem/ruby/network/garnet/flexible-pipeline/NetworkLink.cc index 598c9e2a4..3b1c84eb6 100644 --- a/src/mem/ruby/network/garnet-flexible-pipeline/NetworkLink.cc +++ b/src/mem/ruby/network/garnet/flexible-pipeline/NetworkLink.cc @@ -28,9 +28,9 @@ * Authors: Niket Agarwal */ -#include "mem/ruby/network/garnet-flexible-pipeline/NetworkLink.hh" -#include "mem/ruby/network/garnet-flexible-pipeline/NetworkConfig.hh" -#include "mem/ruby/network/garnet-flexible-pipeline/GarnetNetwork.hh" +#include "mem/ruby/network/garnet/flexible-pipeline/NetworkLink.hh" +#include "mem/ruby/network/garnet/flexible-pipeline/NetworkConfig.hh" +#include "mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.hh" NetworkLink::NetworkLink(int id, int latency, GarnetNetwork *net_ptr) { diff --git a/src/mem/ruby/network/garnet-flexible-pipeline/NetworkLink.hh b/src/mem/ruby/network/garnet/flexible-pipeline/NetworkLink.hh similarity index 93% rename from src/mem/ruby/network/garnet-flexible-pipeline/NetworkLink.hh rename to src/mem/ruby/network/garnet/flexible-pipeline/NetworkLink.hh index 9f5640a2e..e371d9265 100644 --- a/src/mem/ruby/network/garnet-flexible-pipeline/NetworkLink.hh +++ b/src/mem/ruby/network/garnet/flexible-pipeline/NetworkLink.hh @@ -31,9 +31,9 @@ #ifndef NETWORK_LINK_H #define NETWORK_LINK_H -#include "mem/ruby/network/garnet-fixed-pipeline/NetworkHeader.hh" -#include "mem/ruby/network/garnet-flexible-pipeline/FlexibleConsumer.hh" -#include "mem/ruby/network/garnet-flexible-pipeline/flitBuffer.hh" +#include "mem/ruby/network/garnet/NetworkHeader.hh" +#include "mem/ruby/network/garnet/flexible-pipeline/FlexibleConsumer.hh" +#include "mem/ruby/network/garnet/flexible-pipeline/flitBuffer.hh" #include "mem/gems_common/PrioHeap.hh" #include "mem/ruby/common/NetDest.hh" diff --git a/src/mem/ruby/network/garnet-flexible-pipeline/OutVcState.cc b/src/mem/ruby/network/garnet/flexible-pipeline/OutVcState.cc similarity index 96% rename from src/mem/ruby/network/garnet-flexible-pipeline/OutVcState.cc rename to src/mem/ruby/network/garnet/flexible-pipeline/OutVcState.cc index a00dd19c1..e17db5dcf 100644 --- a/src/mem/ruby/network/garnet-flexible-pipeline/OutVcState.cc +++ b/src/mem/ruby/network/garnet/flexible-pipeline/OutVcState.cc @@ -28,7 +28,7 @@ * Authors: Niket Agarwal */ -#include "mem/ruby/network/garnet-flexible-pipeline/OutVcState.hh" +#include "mem/ruby/network/garnet/flexible-pipeline/OutVcState.hh" OutVcState::OutVcState(int id) { diff --git a/src/mem/ruby/network/garnet-flexible-pipeline/OutVcState.hh b/src/mem/ruby/network/garnet/flexible-pipeline/OutVcState.hh similarity index 96% rename from src/mem/ruby/network/garnet-flexible-pipeline/OutVcState.hh rename to src/mem/ruby/network/garnet/flexible-pipeline/OutVcState.hh index ba68bf2db..a1c0fdfac 100644 --- a/src/mem/ruby/network/garnet-flexible-pipeline/OutVcState.hh +++ b/src/mem/ruby/network/garnet/flexible-pipeline/OutVcState.hh @@ -31,7 +31,7 @@ #ifndef OUT_VC_STATE_H #define OUT_VC_STATE_H -#include "mem/ruby/network/garnet-fixed-pipeline/NetworkHeader.hh" +#include "mem/ruby/network/garnet/NetworkHeader.hh" class OutVcState { public: diff --git a/src/mem/ruby/network/garnet-flexible-pipeline/Router.cc b/src/mem/ruby/network/garnet/flexible-pipeline/Router.cc similarity index 98% rename from src/mem/ruby/network/garnet-flexible-pipeline/Router.cc rename to src/mem/ruby/network/garnet/flexible-pipeline/Router.cc index 628f19349..63f0373f8 100644 --- a/src/mem/ruby/network/garnet-flexible-pipeline/Router.cc +++ b/src/mem/ruby/network/garnet/flexible-pipeline/Router.cc @@ -28,11 +28,11 @@ * Authors: Niket Agarwal */ -#include "mem/ruby/network/garnet-flexible-pipeline/Router.hh" +#include "mem/ruby/network/garnet/flexible-pipeline/Router.hh" #include "mem/ruby/slicc_interface/NetworkMessage.hh" -#include "mem/ruby/network/garnet-flexible-pipeline/InVcState.hh" -#include "mem/ruby/network/garnet-flexible-pipeline/OutVcState.hh" -#include "mem/ruby/network/garnet-flexible-pipeline/VCarbiter.hh" +#include "mem/ruby/network/garnet/flexible-pipeline/InVcState.hh" +#include "mem/ruby/network/garnet/flexible-pipeline/OutVcState.hh" +#include "mem/ruby/network/garnet/flexible-pipeline/VCarbiter.hh" Router::Router(int id, GarnetNetwork *network_ptr) { diff --git a/src/mem/ruby/network/garnet-flexible-pipeline/Router.hh b/src/mem/ruby/network/garnet/flexible-pipeline/Router.hh similarity index 88% rename from src/mem/ruby/network/garnet-flexible-pipeline/Router.hh rename to src/mem/ruby/network/garnet/flexible-pipeline/Router.hh index 69d405ad4..5ec7590a6 100644 --- a/src/mem/ruby/network/garnet-flexible-pipeline/Router.hh +++ b/src/mem/ruby/network/garnet/flexible-pipeline/Router.hh @@ -31,15 +31,15 @@ #ifndef ROUTER_H #define ROUTER_H -#include "mem/ruby/network/garnet-fixed-pipeline/NetworkHeader.hh" -#include "mem/ruby/network/garnet-flexible-pipeline/GarnetNetwork.hh" -#include "mem/ruby/network/garnet-flexible-pipeline/FlexibleConsumer.hh" +#include "mem/ruby/network/garnet/NetworkHeader.hh" +#include "mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.hh" +#include "mem/ruby/network/garnet/flexible-pipeline/FlexibleConsumer.hh" #include "mem/gems_common/PrioHeap.hh" -#include "mem/ruby/network/garnet-flexible-pipeline/NetworkLink.hh" +#include "mem/ruby/network/garnet/flexible-pipeline/NetworkLink.hh" #include "mem/ruby/common/NetDest.hh" -#include "mem/ruby/network/garnet-flexible-pipeline/flitBuffer.hh" -#include "mem/ruby/network/garnet-flexible-pipeline/InVcState.hh" -#include "mem/ruby/network/garnet-flexible-pipeline/OutVcState.hh" +#include "mem/ruby/network/garnet/flexible-pipeline/flitBuffer.hh" +#include "mem/ruby/network/garnet/flexible-pipeline/InVcState.hh" +#include "mem/ruby/network/garnet/flexible-pipeline/OutVcState.hh" class VCarbiter; diff --git a/src/mem/ruby/network/garnet-flexible-pipeline/SConscript b/src/mem/ruby/network/garnet/flexible-pipeline/SConscript similarity index 100% rename from src/mem/ruby/network/garnet-flexible-pipeline/SConscript rename to src/mem/ruby/network/garnet/flexible-pipeline/SConscript diff --git a/src/mem/ruby/network/garnet-flexible-pipeline/VCarbiter.cc b/src/mem/ruby/network/garnet/flexible-pipeline/VCarbiter.cc similarity index 93% rename from src/mem/ruby/network/garnet-flexible-pipeline/VCarbiter.cc rename to src/mem/ruby/network/garnet/flexible-pipeline/VCarbiter.cc index 9064cc4a2..fdf9aadb0 100644 --- a/src/mem/ruby/network/garnet-flexible-pipeline/VCarbiter.cc +++ b/src/mem/ruby/network/garnet/flexible-pipeline/VCarbiter.cc @@ -28,8 +28,8 @@ * Authors: Niket Agarwal */ -#include "mem/ruby/network/garnet-flexible-pipeline/VCarbiter.hh" -#include "mem/ruby/network/garnet-flexible-pipeline/Router.hh" +#include "mem/ruby/network/garnet/flexible-pipeline/VCarbiter.hh" +#include "mem/ruby/network/garnet/flexible-pipeline/Router.hh" VCarbiter::VCarbiter(Router *router) { diff --git a/src/mem/ruby/network/garnet-flexible-pipeline/VCarbiter.hh b/src/mem/ruby/network/garnet/flexible-pipeline/VCarbiter.hh similarity index 96% rename from src/mem/ruby/network/garnet-flexible-pipeline/VCarbiter.hh rename to src/mem/ruby/network/garnet/flexible-pipeline/VCarbiter.hh index 7f7e5e814..6a8c356f1 100644 --- a/src/mem/ruby/network/garnet-flexible-pipeline/VCarbiter.hh +++ b/src/mem/ruby/network/garnet/flexible-pipeline/VCarbiter.hh @@ -31,7 +31,7 @@ #ifndef VC_ARBITER_H #define VC_ARBITER_H -#include "mem/ruby/network/garnet-fixed-pipeline/NetworkHeader.hh" +#include "mem/ruby/network/garnet/NetworkHeader.hh" #include "mem/ruby/common/Consumer.hh" class Router; diff --git a/src/mem/ruby/network/garnet-flexible-pipeline/flit.cc b/src/mem/ruby/network/garnet/flexible-pipeline/flit.cc similarity index 97% rename from src/mem/ruby/network/garnet-flexible-pipeline/flit.cc rename to src/mem/ruby/network/garnet/flexible-pipeline/flit.cc index 549726348..e73a8b9b5 100644 --- a/src/mem/ruby/network/garnet-flexible-pipeline/flit.cc +++ b/src/mem/ruby/network/garnet/flexible-pipeline/flit.cc @@ -28,7 +28,7 @@ * Authors: Niket Agarwal */ -#include "mem/ruby/network/garnet-flexible-pipeline/flit.hh" +#include "mem/ruby/network/garnet/flexible-pipeline/flit.hh" flit::flit(int id, int vc, int vnet, int size, MsgPtr msg_ptr) { diff --git a/src/mem/ruby/network/garnet-flexible-pipeline/flit.hh b/src/mem/ruby/network/garnet/flexible-pipeline/flit.hh similarity index 97% rename from src/mem/ruby/network/garnet-flexible-pipeline/flit.hh rename to src/mem/ruby/network/garnet/flexible-pipeline/flit.hh index a2e628443..2cf3eaade 100644 --- a/src/mem/ruby/network/garnet-flexible-pipeline/flit.hh +++ b/src/mem/ruby/network/garnet/flexible-pipeline/flit.hh @@ -28,7 +28,7 @@ * Authors: Niket Agarwal */ -#include "mem/ruby/network/garnet-fixed-pipeline/NetworkHeader.hh" +#include "mem/ruby/network/garnet/NetworkHeader.hh" #include "mem/ruby/slicc_interface/Message.hh" #ifndef FLIT_H diff --git a/src/mem/ruby/network/garnet-flexible-pipeline/flitBuffer.cc b/src/mem/ruby/network/garnet/flexible-pipeline/flitBuffer.cc similarity index 97% rename from src/mem/ruby/network/garnet-flexible-pipeline/flitBuffer.cc rename to src/mem/ruby/network/garnet/flexible-pipeline/flitBuffer.cc index c68f8c78b..d2f9244de 100644 --- a/src/mem/ruby/network/garnet-flexible-pipeline/flitBuffer.cc +++ b/src/mem/ruby/network/garnet/flexible-pipeline/flitBuffer.cc @@ -28,7 +28,7 @@ * Authors: Niket Agarwal */ -#include "mem/ruby/network/garnet-flexible-pipeline/flitBuffer.hh" +#include "mem/ruby/network/garnet/flexible-pipeline/flitBuffer.hh" flitBuffer::flitBuffer() { diff --git a/src/mem/ruby/network/garnet-flexible-pipeline/flitBuffer.hh b/src/mem/ruby/network/garnet/flexible-pipeline/flitBuffer.hh similarity index 94% rename from src/mem/ruby/network/garnet-flexible-pipeline/flitBuffer.hh rename to src/mem/ruby/network/garnet/flexible-pipeline/flitBuffer.hh index c722e161c..f8b34720c 100644 --- a/src/mem/ruby/network/garnet-flexible-pipeline/flitBuffer.hh +++ b/src/mem/ruby/network/garnet/flexible-pipeline/flitBuffer.hh @@ -31,9 +31,9 @@ #ifndef FLIT_BUFFER_H #define FLIT_BUFFER_H -#include "mem/ruby/network/garnet-fixed-pipeline/NetworkHeader.hh" +#include "mem/ruby/network/garnet/NetworkHeader.hh" #include "mem/gems_common/PrioHeap.hh" -#include "mem/ruby/network/garnet-flexible-pipeline/flit.hh" +#include "mem/ruby/network/garnet/flexible-pipeline/flit.hh" class flitBuffer { public: diff --git a/src/mem/ruby/network/garnet-flexible-pipeline/netconfig.defaults b/src/mem/ruby/network/garnet/flexible-pipeline/netconfig.defaults similarity index 100% rename from src/mem/ruby/network/garnet-flexible-pipeline/netconfig.defaults rename to src/mem/ruby/network/garnet/flexible-pipeline/netconfig.defaults