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
This commit is contained in:
Steve Reinhardt
parent
6c867f8263
commit
b544462505
|
|
@ -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:
|
||||
|
|
@ -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)
|
||||
|
|
@ -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"
|
||||
|
|
@ -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)
|
||||
{
|
||||
|
|
@ -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;
|
||||
|
||||
|
|
@ -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)
|
||||
|
|
@ -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;
|
||||
|
|
@ -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)
|
||||
|
|
@ -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"
|
||||
|
||||
|
|
@ -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"
|
||||
|
||||
|
|
@ -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:
|
||||
|
|
@ -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)
|
||||
|
|
@ -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;
|
||||
|
||||
|
|
@ -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)
|
||||
{
|
||||
|
|
@ -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"
|
||||
|
||||
|
|
@ -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)
|
||||
|
|
@ -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;
|
||||
|
|
@ -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)
|
||||
{
|
||||
|
|
@ -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;
|
||||
|
|
@ -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)
|
||||
{
|
||||
|
|
@ -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;
|
||||
|
|
@ -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)
|
||||
{
|
||||
|
|
@ -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;
|
||||
|
|
@ -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)
|
||||
{
|
||||
|
|
@ -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:
|
||||
|
|
@ -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()
|
||||
{
|
||||
|
|
@ -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:
|
||||
|
|
@ -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)
|
||||
{
|
||||
|
|
@ -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 {
|
||||
|
|
@ -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 {
|
||||
|
|
@ -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)
|
||||
|
|
@ -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;
|
||||
|
|
@ -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)
|
||||
{
|
||||
|
|
@ -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:
|
||||
|
|
@ -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 {
|
||||
|
|
@ -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)
|
||||
|
|
@ -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;
|
||||
|
|
@ -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)
|
||||
{
|
||||
|
|
@ -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"
|
||||
|
||||
|
|
@ -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)
|
||||
{
|
||||
|
|
@ -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:
|
||||
|
|
@ -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)
|
||||
{
|
||||
|
|
@ -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;
|
||||
|
||||
|
|
@ -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)
|
||||
{
|
||||
|
|
@ -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;
|
||||
|
|
@ -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)
|
||||
{
|
||||
|
|
@ -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
|
||||
|
|
@ -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()
|
||||
{
|
||||
|
|
@ -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:
|
||||
Loading…
Reference in a new issue