diff options
Diffstat (limited to 'src/mem/ruby')
92 files changed, 166 insertions, 174 deletions
diff --git a/src/mem/ruby/buffers/MessageBuffer.hh b/src/mem/ruby/buffers/MessageBuffer.hh index a59b82077..dc9fb1a9e 100644 --- a/src/mem/ruby/buffers/MessageBuffer.hh +++ b/src/mem/ruby/buffers/MessageBuffer.hh @@ -38,15 +38,15 @@ #include <cassert> #include <functional> #include <iostream> -#include <vector> #include <string> +#include <vector> #include "mem/ruby/buffers/MessageBufferNode.hh" +#include "mem/ruby/common/Address.hh" #include "mem/ruby/common/Consumer.hh" #include "mem/ruby/common/Global.hh" #include "mem/ruby/eventqueue/RubyEventQueue.hh" #include "mem/ruby/slicc_interface/Message.hh" -#include "mem/ruby/common/Address.hh" class MessageBuffer { diff --git a/src/mem/ruby/common/NetDest.cc b/src/mem/ruby/common/NetDest.cc index 657df08b2..12eaa0321 100644 --- a/src/mem/ruby/common/NetDest.cc +++ b/src/mem/ruby/common/NetDest.cc @@ -26,8 +26,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "mem/ruby/common/NetDest.hh" #include "mem/protocol/Protocol.hh" +#include "mem/ruby/common/NetDest.hh" NetDest::NetDest() { diff --git a/src/mem/ruby/common/Set.hh b/src/mem/ruby/common/Set.hh index a0178178a..5481c2ec7 100644 --- a/src/mem/ruby/common/Set.hh +++ b/src/mem/ruby/common/Set.hh @@ -35,9 +35,9 @@ #include <iostream> #include <limits> -#include "mem/ruby/system/System.hh" #include "mem/ruby/common/Global.hh" #include "mem/ruby/system/NodeID.hh" +#include "mem/ruby/system/System.hh" class Set { diff --git a/src/mem/ruby/filters/GenericBloomFilter.hh b/src/mem/ruby/filters/GenericBloomFilter.hh index 606f55d4f..a9d6b9ea2 100644 --- a/src/mem/ruby/filters/GenericBloomFilter.hh +++ b/src/mem/ruby/filters/GenericBloomFilter.hh @@ -32,8 +32,8 @@ #include <iostream> #include <string> -#include "mem/ruby/common/Global.hh" #include "mem/ruby/common/Address.hh" +#include "mem/ruby/common/Global.hh" #include "mem/ruby/filters/AbstractBloomFilter.hh" class GenericBloomFilter diff --git a/src/mem/ruby/network/Network.cc b/src/mem/ruby/network/Network.cc index 34ee18fea..3003ce7d9 100644 --- a/src/mem/ruby/network/Network.cc +++ b/src/mem/ruby/network/Network.cc @@ -28,8 +28,8 @@ #include "base/misc.hh" #include "mem/protocol/MachineType.hh" -#include "mem/ruby/network/Network.hh" #include "mem/ruby/network/simple/Topology.hh" +#include "mem/ruby/network/Network.hh" Network::Network(const Params *p) : SimObject(p) diff --git a/src/mem/ruby/network/garnet/BaseGarnetNetwork.hh b/src/mem/ruby/network/garnet/BaseGarnetNetwork.hh index d01225232..81b77ceea 100644 --- a/src/mem/ruby/network/garnet/BaseGarnetNetwork.hh +++ b/src/mem/ruby/network/garnet/BaseGarnetNetwork.hh @@ -36,10 +36,10 @@ #ifndef __MEM_RUBY_NETWORK_GARNET_BASEGARNETNETWORK_HH__ #define __MEM_RUBY_NETWORK_GARNET_BASEGARNETNETWORK_HH__ -#include "math.h" #include "mem/ruby/network/garnet/NetworkHeader.hh" #include "mem/ruby/network/Network.hh" #include "params/BaseGarnetNetwork.hh" +#include "math.h" class BaseGarnetNetwork : public Network { diff --git a/src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.cc b/src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.cc index 5cbff7db6..ad0c06452 100644 --- a/src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.cc +++ b/src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.cc @@ -31,15 +31,15 @@ #include <cassert> #include "base/stl_helpers.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/buffers/MessageBuffer.hh" +#include "mem/ruby/common/NetDest.hh" +#include "mem/ruby/network/garnet/fixed-pipeline/CreditLink_d.hh" +#include "mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.hh" +#include "mem/ruby/network/garnet/fixed-pipeline/NetworkInterface_d.hh" +#include "mem/ruby/network/garnet/fixed-pipeline/NetworkLink_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/common/NetDest.hh" using namespace std; using m5::stl_helpers::deletePointers; diff --git a/src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.hh b/src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.hh index 1fe65f18d..f403660ea 100644 --- a/src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.hh +++ b/src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.hh @@ -34,8 +34,8 @@ #include <iostream> #include <vector> -#include "mem/ruby/network/garnet/NetworkHeader.hh" #include "mem/ruby/network/garnet/BaseGarnetNetwork.hh" +#include "mem/ruby/network/garnet/NetworkHeader.hh" #include "mem/ruby/network/Network.hh" #include "params/GarnetNetwork_d.hh" diff --git a/src/mem/ruby/network/garnet/fixed-pipeline/InputUnit_d.hh b/src/mem/ruby/network/garnet/fixed-pipeline/InputUnit_d.hh index 81c60f7e1..de3fa9d40 100644 --- a/src/mem/ruby/network/garnet/fixed-pipeline/InputUnit_d.hh +++ b/src/mem/ruby/network/garnet/fixed-pipeline/InputUnit_d.hh @@ -34,12 +34,12 @@ #include <iostream> #include <vector> -#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/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/NetworkLink_d.hh" +#include "mem/ruby/network/garnet/fixed-pipeline/VirtualChannel_d.hh" +#include "mem/ruby/network/garnet/fixed-pipeline/flitBuffer_d.hh" +#include "mem/ruby/network/garnet/NetworkHeader.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 index 14105a38c..d7f275fc2 100644 --- a/src/mem/ruby/network/garnet/fixed-pipeline/NetworkInterface_d.cc +++ b/src/mem/ruby/network/garnet/fixed-pipeline/NetworkInterface_d.cc @@ -32,8 +32,8 @@ #include <cmath> #include "base/stl_helpers.hh" -#include "mem/ruby/network/garnet/fixed-pipeline/NetworkInterface_d.hh" #include "mem/ruby/buffers/MessageBuffer.hh" +#include "mem/ruby/network/garnet/fixed-pipeline/NetworkInterface_d.hh" #include "mem/ruby/network/garnet/fixed-pipeline/flitBuffer_d.hh" #include "mem/ruby/slicc_interface/NetworkMessage.hh" diff --git a/src/mem/ruby/network/garnet/fixed-pipeline/NetworkInterface_d.hh b/src/mem/ruby/network/garnet/fixed-pipeline/NetworkInterface_d.hh index f1a577e4c..3802082a6 100644 --- a/src/mem/ruby/network/garnet/fixed-pipeline/NetworkInterface_d.hh +++ b/src/mem/ruby/network/garnet/fixed-pipeline/NetworkInterface_d.hh @@ -34,13 +34,13 @@ #include <iostream> #include <vector> -#include "mem/ruby/network/garnet/NetworkHeader.hh" -#include "mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.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/GarnetNetwork_d.hh" +#include "mem/ruby/network/garnet/fixed-pipeline/NetworkLink_d.hh" #include "mem/ruby/network/garnet/fixed-pipeline/OutVcState_d.hh" +#include "mem/ruby/network/garnet/NetworkHeader.hh" +#include "mem/ruby/slicc_interface/Message.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 index 518281414..72439a67b 100644 --- a/src/mem/ruby/network/garnet/fixed-pipeline/NetworkLink_d.cc +++ b/src/mem/ruby/network/garnet/fixed-pipeline/NetworkLink_d.cc @@ -28,8 +28,8 @@ * Authors: Niket Agarwal */ -#include "mem/ruby/network/garnet/fixed-pipeline/NetworkLink_d.hh" #include "mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.hh" +#include "mem/ruby/network/garnet/fixed-pipeline/NetworkLink_d.hh" NetworkLink_d::NetworkLink_d(int id, int link_latency, GarnetNetwork_d *net_ptr) { diff --git a/src/mem/ruby/network/garnet/fixed-pipeline/NetworkLink_d.hh b/src/mem/ruby/network/garnet/fixed-pipeline/NetworkLink_d.hh index 8024ebd9c..a46c59f41 100644 --- a/src/mem/ruby/network/garnet/fixed-pipeline/NetworkLink_d.hh +++ b/src/mem/ruby/network/garnet/fixed-pipeline/NetworkLink_d.hh @@ -34,9 +34,9 @@ #include <iostream> #include <vector> -#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/NetworkHeader.hh" #include "mem/ruby/network/orion/NetworkPower.hh" class GarnetNetwork_d; diff --git a/src/mem/ruby/network/garnet/fixed-pipeline/OutVcState_d.cc b/src/mem/ruby/network/garnet/fixed-pipeline/OutVcState_d.cc index ee89ec004..8a2022a4f 100644 --- a/src/mem/ruby/network/garnet/fixed-pipeline/OutVcState_d.cc +++ b/src/mem/ruby/network/garnet/fixed-pipeline/OutVcState_d.cc @@ -28,8 +28,8 @@ * Authors: Niket Agarwal */ -#include "mem/ruby/network/garnet/fixed-pipeline/OutVcState_d.hh" #include "mem/ruby/eventqueue/RubyEventQueue.hh" +#include "mem/ruby/network/garnet/fixed-pipeline/OutVcState_d.hh" OutVcState_d::OutVcState_d(int id, GarnetNetwork_d *network_ptr) { diff --git a/src/mem/ruby/network/garnet/fixed-pipeline/OutVcState_d.hh b/src/mem/ruby/network/garnet/fixed-pipeline/OutVcState_d.hh index 39b2cb5fe..5b1328fcf 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 __MEM_RUBY_NETWORK_GARNET_FIXED_PIPELINE_OUT_VC_STATE_D_HH__ #define __MEM_RUBY_NETWORK_GARNET_FIXED_PIPELINE_OUT_VC_STATE_D_HH__ -#include "mem/ruby/network/garnet/NetworkHeader.hh" #include "mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.hh" +#include "mem/ruby/network/garnet/NetworkHeader.hh" class OutVcState_d { diff --git a/src/mem/ruby/network/garnet/fixed-pipeline/OutputUnit_d.hh b/src/mem/ruby/network/garnet/fixed-pipeline/OutputUnit_d.hh index 98d6147de..3ed1cb4b2 100644 --- a/src/mem/ruby/network/garnet/fixed-pipeline/OutputUnit_d.hh +++ b/src/mem/ruby/network/garnet/fixed-pipeline/OutputUnit_d.hh @@ -34,12 +34,12 @@ #include <iostream> #include <vector> -#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/NetworkLink_d.hh" +#include "mem/ruby/network/garnet/fixed-pipeline/OutVcState_d.hh" +#include "mem/ruby/network/garnet/fixed-pipeline/flitBuffer_d.hh" +#include "mem/ruby/network/garnet/NetworkHeader.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 index 4ee176653..15cddd3b7 100644 --- a/src/mem/ruby/network/garnet/fixed-pipeline/Router_d.cc +++ b/src/mem/ruby/network/garnet/fixed-pipeline/Router_d.cc @@ -29,16 +29,16 @@ */ #include "base/stl_helpers.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/GarnetNetwork_d.hh" #include "mem/ruby/network/garnet/fixed-pipeline/InputUnit_d.hh" +#include "mem/ruby/network/garnet/fixed-pipeline/NetworkLink_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/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/VCallocator_d.hh" using namespace std; using m5::stl_helpers::deletePointers; diff --git a/src/mem/ruby/network/garnet/fixed-pipeline/Router_d.hh b/src/mem/ruby/network/garnet/fixed-pipeline/Router_d.hh index f7af30ce9..4c2b83312 100644 --- a/src/mem/ruby/network/garnet/fixed-pipeline/Router_d.hh +++ b/src/mem/ruby/network/garnet/fixed-pipeline/Router_d.hh @@ -34,9 +34,9 @@ #include <iostream> #include <vector> -#include "mem/ruby/network/garnet/NetworkHeader.hh" -#include "mem/ruby/network/garnet/fixed-pipeline/flit_d.hh" #include "mem/ruby/common/NetDest.hh" +#include "mem/ruby/network/garnet/fixed-pipeline/flit_d.hh" +#include "mem/ruby/network/garnet/NetworkHeader.hh" #include "mem/ruby/network/orion/NetworkPower.hh" class GarnetNetwork_d; diff --git a/src/mem/ruby/network/garnet/fixed-pipeline/RoutingUnit_d.cc b/src/mem/ruby/network/garnet/fixed-pipeline/RoutingUnit_d.cc index 13491184c..7c7a7d428 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/Router_d.hh" +#include "mem/ruby/network/garnet/fixed-pipeline/RoutingUnit_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 index 7ae216049..15e893150 100644 --- a/src/mem/ruby/network/garnet/fixed-pipeline/RoutingUnit_d.hh +++ b/src/mem/ruby/network/garnet/fixed-pipeline/RoutingUnit_d.hh @@ -31,10 +31,10 @@ #ifndef __MEM_RUBY_NETWORK_GARNET_FIXED_PIPELINE_ROUTING_UNIT_D_HH__ #define __MEM_RUBY_NETWORK_GARNET_FIXED_PIPELINE_ROUTING_UNIT_D_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/common/NetDest.hh" +#include "mem/ruby/network/garnet/fixed-pipeline/flit_d.hh" +#include "mem/ruby/network/garnet/NetworkHeader.hh" class InputUnit_d; class Router_d; diff --git a/src/mem/ruby/network/garnet/fixed-pipeline/SWallocator_d.cc b/src/mem/ruby/network/garnet/fixed-pipeline/SWallocator_d.cc index 704157589..afed4b205 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/GarnetNetwork_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/Router_d.hh" +#include "mem/ruby/network/garnet/fixed-pipeline/SWallocator_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 index 66b522950..15f7b8bfe 100644 --- a/src/mem/ruby/network/garnet/fixed-pipeline/SWallocator_d.hh +++ b/src/mem/ruby/network/garnet/fixed-pipeline/SWallocator_d.hh @@ -34,8 +34,8 @@ #include <iostream> #include <vector> -#include "mem/ruby/network/garnet/NetworkHeader.hh" #include "mem/ruby/common/Consumer.hh" +#include "mem/ruby/network/garnet/NetworkHeader.hh" class Router_d; class InputUnit_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 index 50aa16cea..62510a45c 100644 --- a/src/mem/ruby/network/garnet/fixed-pipeline/Switch_d.cc +++ b/src/mem/ruby/network/garnet/fixed-pipeline/Switch_d.cc @@ -29,9 +29,9 @@ */ #include "base/stl_helpers.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" +#include "mem/ruby/network/garnet/fixed-pipeline/Router_d.hh" +#include "mem/ruby/network/garnet/fixed-pipeline/Switch_d.hh" using m5::stl_helpers::deletePointers; diff --git a/src/mem/ruby/network/garnet/fixed-pipeline/Switch_d.hh b/src/mem/ruby/network/garnet/fixed-pipeline/Switch_d.hh index 2ba761c69..7ffaf423e 100644 --- a/src/mem/ruby/network/garnet/fixed-pipeline/Switch_d.hh +++ b/src/mem/ruby/network/garnet/fixed-pipeline/Switch_d.hh @@ -34,9 +34,9 @@ #include <iostream> #include <vector> -#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/NetworkHeader.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 index 326c7fa92..03eed6ce2 100644 --- a/src/mem/ruby/network/garnet/fixed-pipeline/VCallocator_d.cc +++ b/src/mem/ruby/network/garnet/fixed-pipeline/VCallocator_d.cc @@ -28,11 +28,11 @@ * Authors: Niket Agarwal */ -#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/GarnetNetwork_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/Router_d.hh" +#include "mem/ruby/network/garnet/fixed-pipeline/VCallocator_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 index 789338244..d28c6f82f 100644 --- a/src/mem/ruby/network/garnet/fixed-pipeline/VCallocator_d.hh +++ b/src/mem/ruby/network/garnet/fixed-pipeline/VCallocator_d.hh @@ -32,11 +32,11 @@ #define __MEM_RUBY_NETWORK_GARNET_FIXED_PIPELINE_VC_ALLOCATOR_D_HH__ #include <iostream> -#include <vector> #include <utility> +#include <vector> -#include "mem/ruby/network/garnet/NetworkHeader.hh" #include "mem/ruby/common/Consumer.hh" +#include "mem/ruby/network/garnet/NetworkHeader.hh" class Router_d; class InputUnit_d; diff --git a/src/mem/ruby/network/garnet/fixed-pipeline/VirtualChannel_d.hh b/src/mem/ruby/network/garnet/fixed-pipeline/VirtualChannel_d.hh index 075e2ee02..3f5c02f84 100644 --- a/src/mem/ruby/network/garnet/fixed-pipeline/VirtualChannel_d.hh +++ b/src/mem/ruby/network/garnet/fixed-pipeline/VirtualChannel_d.hh @@ -33,8 +33,8 @@ #include <utility> -#include "mem/ruby/network/garnet/NetworkHeader.hh" #include "mem/ruby/network/garnet/fixed-pipeline/flitBuffer_d.hh" +#include "mem/ruby/network/garnet/NetworkHeader.hh" class VirtualChannel_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 index 3cfd9144f..23cbd0bb3 100644 --- a/src/mem/ruby/network/garnet/fixed-pipeline/flitBuffer_d.hh +++ b/src/mem/ruby/network/garnet/fixed-pipeline/flitBuffer_d.hh @@ -35,8 +35,8 @@ #include <iostream> #include <vector> -#include "mem/ruby/network/garnet/NetworkHeader.hh" #include "mem/ruby/network/garnet/fixed-pipeline/flit_d.hh" +#include "mem/ruby/network/garnet/NetworkHeader.hh" class flitBuffer_d { diff --git a/src/mem/ruby/network/garnet/flexible-pipeline/FlexibleConsumer.hh b/src/mem/ruby/network/garnet/flexible-pipeline/FlexibleConsumer.hh index 2f38fc158..04a4ac95a 100644 --- a/src/mem/ruby/network/garnet/flexible-pipeline/FlexibleConsumer.hh +++ b/src/mem/ruby/network/garnet/flexible-pipeline/FlexibleConsumer.hh @@ -32,8 +32,8 @@ #define __MEM_RUBY_NETWORK_GARNET_FLEXIBLE_PIPELINE_FLEXIBLE_CONSUMER_HH__ #include "mem/ruby/common/Consumer.hh" -#include "mem/ruby/network/garnet/NetworkHeader.hh" #include "mem/ruby/common/NetDest.hh" +#include "mem/ruby/network/garnet/NetworkHeader.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 index 205eb1472..b6a9d599d 100644 --- a/src/mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.cc +++ b/src/mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.cc @@ -31,16 +31,16 @@ #include <cassert> #include "base/stl_helpers.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/buffers/MessageBuffer.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/common/NetDest.hh" #include "mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.hh" +#include "mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.hh" +#include "mem/ruby/network/garnet/flexible-pipeline/NetworkInterface.hh" #include "mem/ruby/network/garnet/flexible-pipeline/NetworkLink.hh" -#include "mem/ruby/common/NetDest.hh" +#include "mem/ruby/network/garnet/flexible-pipeline/Router.hh" +#include "mem/ruby/network/simple/SimpleNetwork.hh" +#include "mem/ruby/network/simple/Topology.hh" using namespace std; using m5::stl_helpers::deletePointers; diff --git a/src/mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.hh b/src/mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.hh index 51a9380cb..b04e649df 100644 --- a/src/mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.hh +++ b/src/mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.hh @@ -34,8 +34,8 @@ #include <iostream> #include <vector> -#include "mem/ruby/network/garnet/NetworkHeader.hh" #include "mem/ruby/network/garnet/BaseGarnetNetwork.hh" +#include "mem/ruby/network/garnet/NetworkHeader.hh" #include "mem/ruby/network/Network.hh" #include "params/GarnetNetwork.hh" diff --git a/src/mem/ruby/network/garnet/flexible-pipeline/NetworkInterface.cc b/src/mem/ruby/network/garnet/flexible-pipeline/NetworkInterface.cc index 11da465a8..c4c804206 100644 --- a/src/mem/ruby/network/garnet/flexible-pipeline/NetworkInterface.cc +++ b/src/mem/ruby/network/garnet/flexible-pipeline/NetworkInterface.cc @@ -32,8 +32,8 @@ #include <cmath> #include "base/stl_helpers.hh" -#include "mem/ruby/network/garnet/flexible-pipeline/NetworkInterface.hh" #include "mem/ruby/buffers/MessageBuffer.hh" +#include "mem/ruby/network/garnet/flexible-pipeline/NetworkInterface.hh" #include "mem/ruby/network/garnet/flexible-pipeline/flitBuffer.hh" #include "mem/ruby/slicc_interface/NetworkMessage.hh" diff --git a/src/mem/ruby/network/garnet/flexible-pipeline/NetworkInterface.hh b/src/mem/ruby/network/garnet/flexible-pipeline/NetworkInterface.hh index 401a8bc23..c358f420f 100644 --- a/src/mem/ruby/network/garnet/flexible-pipeline/NetworkInterface.hh +++ b/src/mem/ruby/network/garnet/flexible-pipeline/NetworkInterface.hh @@ -34,12 +34,12 @@ #include <iostream> #include <vector> -#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/ruby/slicc_interface/Message.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/OutVcState.hh" +#include "mem/ruby/network/garnet/NetworkHeader.hh" +#include "mem/ruby/slicc_interface/Message.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 index 24b93c975..8badcb812 100644 --- a/src/mem/ruby/network/garnet/flexible-pipeline/NetworkLink.cc +++ b/src/mem/ruby/network/garnet/flexible-pipeline/NetworkLink.cc @@ -28,8 +28,8 @@ * Authors: Niket Agarwal */ -#include "mem/ruby/network/garnet/flexible-pipeline/NetworkLink.hh" #include "mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.hh" +#include "mem/ruby/network/garnet/flexible-pipeline/NetworkLink.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 index 3915448c5..cf2903a19 100644 --- a/src/mem/ruby/network/garnet/flexible-pipeline/NetworkLink.hh +++ b/src/mem/ruby/network/garnet/flexible-pipeline/NetworkLink.hh @@ -34,10 +34,10 @@ #include <iostream> #include <vector> -#include "mem/ruby/network/garnet/NetworkHeader.hh" +#include "mem/ruby/common/NetDest.hh" #include "mem/ruby/network/garnet/flexible-pipeline/FlexibleConsumer.hh" #include "mem/ruby/network/garnet/flexible-pipeline/flitBuffer.hh" -#include "mem/ruby/common/NetDest.hh" +#include "mem/ruby/network/garnet/NetworkHeader.hh" class GarnetNetwork; diff --git a/src/mem/ruby/network/garnet/flexible-pipeline/Router.cc b/src/mem/ruby/network/garnet/flexible-pipeline/Router.cc index 4a0d59973..d7d242b96 100644 --- a/src/mem/ruby/network/garnet/flexible-pipeline/Router.cc +++ b/src/mem/ruby/network/garnet/flexible-pipeline/Router.cc @@ -29,11 +29,11 @@ */ #include "base/stl_helpers.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/Router.hh" #include "mem/ruby/network/garnet/flexible-pipeline/VCarbiter.hh" +#include "mem/ruby/slicc_interface/NetworkMessage.hh" using namespace std; using m5::stl_helpers::deletePointers; diff --git a/src/mem/ruby/network/garnet/flexible-pipeline/Router.hh b/src/mem/ruby/network/garnet/flexible-pipeline/Router.hh index 8f240551c..99b9cc1c3 100644 --- a/src/mem/ruby/network/garnet/flexible-pipeline/Router.hh +++ b/src/mem/ruby/network/garnet/flexible-pipeline/Router.hh @@ -34,14 +34,14 @@ #include <iostream> #include <vector> -#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/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/FlexibleConsumer.hh" +#include "mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.hh" #include "mem/ruby/network/garnet/flexible-pipeline/InVcState.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/flitBuffer.hh" +#include "mem/ruby/network/garnet/NetworkHeader.hh" class VCarbiter; diff --git a/src/mem/ruby/network/garnet/flexible-pipeline/VCarbiter.cc b/src/mem/ruby/network/garnet/flexible-pipeline/VCarbiter.cc index f1960d62d..e68e1b12f 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" 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 index 7aa6f9fc1..a56bfae0d 100644 --- a/src/mem/ruby/network/garnet/flexible-pipeline/VCarbiter.hh +++ b/src/mem/ruby/network/garnet/flexible-pipeline/VCarbiter.hh @@ -33,8 +33,8 @@ #include <iostream> -#include "mem/ruby/network/garnet/NetworkHeader.hh" #include "mem/ruby/common/Consumer.hh" +#include "mem/ruby/network/garnet/NetworkHeader.hh" class Router; diff --git a/src/mem/ruby/network/garnet/flexible-pipeline/flitBuffer.hh b/src/mem/ruby/network/garnet/flexible-pipeline/flitBuffer.hh index 619f3285f..e5628e93e 100644 --- a/src/mem/ruby/network/garnet/flexible-pipeline/flitBuffer.hh +++ b/src/mem/ruby/network/garnet/flexible-pipeline/flitBuffer.hh @@ -34,8 +34,8 @@ #include <iostream> #include <vector> -#include "mem/ruby/network/garnet/NetworkHeader.hh" #include "mem/ruby/network/garnet/flexible-pipeline/flit.hh" +#include "mem/ruby/network/garnet/NetworkHeader.hh" class flitBuffer { diff --git a/src/mem/ruby/network/orion/Allocator/Arbiter.cc b/src/mem/ruby/network/orion/Allocator/Arbiter.cc index 2f6c60301..a4f480ae5 100644 --- a/src/mem/ruby/network/orion/Allocator/Arbiter.cc +++ b/src/mem/ruby/network/orion/Allocator/Arbiter.cc @@ -33,8 +33,8 @@ * Kambiz Samadi (Orion 2.0, UC San Diego) */ -#include <iostream> #include <cassert> +#include <iostream> #include "mem/ruby/network/orion/Allocator/Arbiter.hh" #include "mem/ruby/network/orion/Allocator/MatrixArbiter.hh" diff --git a/src/mem/ruby/network/orion/Allocator/MatrixArbiter.hh b/src/mem/ruby/network/orion/Allocator/MatrixArbiter.hh index 7cb277a50..a4a74f25f 100644 --- a/src/mem/ruby/network/orion/Allocator/MatrixArbiter.hh +++ b/src/mem/ruby/network/orion/Allocator/MatrixArbiter.hh @@ -36,9 +36,8 @@ #ifndef __MATRIXARBITER_H__ #define __MATRIXARBITER_H__ -#include "mem/ruby/network/orion/Type.hh" - #include "mem/ruby/network/orion/Allocator/Arbiter.hh" +#include "mem/ruby/network/orion/Type.hh" class TechParameter; diff --git a/src/mem/ruby/network/orion/Allocator/RRArbiter.cc b/src/mem/ruby/network/orion/Allocator/RRArbiter.cc index 0dad2c5b7..c30be475a 100644 --- a/src/mem/ruby/network/orion/Allocator/RRArbiter.cc +++ b/src/mem/ruby/network/orion/Allocator/RRArbiter.cc @@ -33,12 +33,12 @@ * Kambiz Samadi (Orion 2.0, UC San Diego) */ -#include <iostream> #include <cmath> +#include <iostream> #include "mem/ruby/network/orion/Allocator/RRArbiter.hh" -#include "mem/ruby/network/orion/TechParameter.hh" #include "mem/ruby/network/orion/FlipFlop.hh" +#include "mem/ruby/network/orion/TechParameter.hh" using namespace std; diff --git a/src/mem/ruby/network/orion/Allocator/RRArbiter.hh b/src/mem/ruby/network/orion/Allocator/RRArbiter.hh index 24b4d38b8..e3d392e01 100644 --- a/src/mem/ruby/network/orion/Allocator/RRArbiter.hh +++ b/src/mem/ruby/network/orion/Allocator/RRArbiter.hh @@ -36,8 +36,8 @@ #ifndef __RRARBITER_H__ #define __RRARBITER_H__ -#include "mem/ruby/network/orion/Type.hh" #include "mem/ruby/network/orion/Allocator/Arbiter.hh" +#include "mem/ruby/network/orion/Type.hh" class TechParameter; diff --git a/src/mem/ruby/network/orion/Allocator/SWAllocator.cc b/src/mem/ruby/network/orion/Allocator/SWAllocator.cc index 366779e45..0211d5ea9 100644 --- a/src/mem/ruby/network/orion/Allocator/SWAllocator.cc +++ b/src/mem/ruby/network/orion/Allocator/SWAllocator.cc @@ -33,13 +33,13 @@ * Kambiz Samadi (Orion 2.0, UC San Diego) */ -#include <iostream> #include <cassert> +#include <iostream> -#include "mem/ruby/network/orion/Allocator/SWAllocator.hh" -#include "mem/ruby/network/orion/OrionConfig.hh" #include "mem/ruby/network/orion/Allocator/Arbiter.hh" +#include "mem/ruby/network/orion/Allocator/SWAllocator.hh" #include "mem/ruby/network/orion/Crossbar/Crossbar.hh" +#include "mem/ruby/network/orion/OrionConfig.hh" using namespace std; diff --git a/src/mem/ruby/network/orion/Allocator/VCAllocator.cc b/src/mem/ruby/network/orion/Allocator/VCAllocator.cc index 38ac985f3..2f3ae2df2 100644 --- a/src/mem/ruby/network/orion/Allocator/VCAllocator.cc +++ b/src/mem/ruby/network/orion/Allocator/VCAllocator.cc @@ -33,15 +33,15 @@ * Kambiz Samadi (Orion 2.0, UC San Diego) */ -#include <iostream> #include <cassert> -#include <cstdlib> #include <cmath> +#include <cstdlib> +#include <iostream> -#include "mem/ruby/network/orion/Allocator/VCAllocator.hh" -#include "mem/ruby/network/orion/OrionConfig.hh" #include "mem/ruby/network/orion/Allocator/Arbiter.hh" +#include "mem/ruby/network/orion/Allocator/VCAllocator.hh" #include "mem/ruby/network/orion/Buffer/Buffer.hh" +#include "mem/ruby/network/orion/OrionConfig.hh" using namespace std; diff --git a/src/mem/ruby/network/orion/Buffer/Buffer.cc b/src/mem/ruby/network/orion/Buffer/Buffer.cc index 11c92094f..b46aef6fd 100644 --- a/src/mem/ruby/network/orion/Buffer/Buffer.cc +++ b/src/mem/ruby/network/orion/Buffer/Buffer.cc @@ -33,14 +33,14 @@ * Kambiz Samadi (Orion 2.0, UC San Diego) */ -#include <iostream> #include <cassert> +#include <iostream> #include "mem/ruby/network/orion/Buffer/Buffer.hh" -#include "mem/ruby/network/orion/TechParameter.hh" -#include "mem/ruby/network/orion/OrionConfig.hh" -#include "mem/ruby/network/orion/Buffer/SRAM.hh" #include "mem/ruby/network/orion/Buffer/Register.hh" +#include "mem/ruby/network/orion/Buffer/SRAM.hh" +#include "mem/ruby/network/orion/OrionConfig.hh" +#include "mem/ruby/network/orion/TechParameter.hh" using namespace std; diff --git a/src/mem/ruby/network/orion/Buffer/DecoderUnit.hh b/src/mem/ruby/network/orion/Buffer/DecoderUnit.hh index 93bee26ae..2ab32cd7a 100644 --- a/src/mem/ruby/network/orion/Buffer/DecoderUnit.hh +++ b/src/mem/ruby/network/orion/Buffer/DecoderUnit.hh @@ -36,8 +36,8 @@ #ifndef __DECODERUNIT_H__ #define __DECODERUNIT_H__ -#include "mem/ruby/network/orion/Type.hh" #include "mem/ruby/network/orion/TechParameter.hh" +#include "mem/ruby/network/orion/Type.hh" class DecoderUnit { diff --git a/src/mem/ruby/network/orion/Buffer/OutdrvUnit.cc b/src/mem/ruby/network/orion/Buffer/OutdrvUnit.cc index ce1707491..07ab5f202 100644 --- a/src/mem/ruby/network/orion/Buffer/OutdrvUnit.cc +++ b/src/mem/ruby/network/orion/Buffer/OutdrvUnit.cc @@ -35,8 +35,8 @@ #include "base/misc.hh" #include "mem/ruby/network/orion/Buffer/OutdrvUnit.hh" -#include "mem/ruby/network/orion/TechParameter.hh" #include "mem/ruby/network/orion/Buffer/SRAM.hh" +#include "mem/ruby/network/orion/TechParameter.hh" OutdrvUnit::OutdrvUnit( const string& outdrv_model_str_, diff --git a/src/mem/ruby/network/orion/Buffer/PrechargeUnit.cc b/src/mem/ruby/network/orion/Buffer/PrechargeUnit.cc index 480ebe82c..9d15843c6 100644 --- a/src/mem/ruby/network/orion/Buffer/PrechargeUnit.cc +++ b/src/mem/ruby/network/orion/Buffer/PrechargeUnit.cc @@ -35,8 +35,8 @@ #include "base/misc.hh" #include "mem/ruby/network/orion/Buffer/PrechargeUnit.hh" -#include "mem/ruby/network/orion/TechParameter.hh" #include "mem/ruby/network/orion/Buffer/SRAM.hh" +#include "mem/ruby/network/orion/TechParameter.hh" PrechargeUnit::PrechargeUnit( const string& pre_model_str_, diff --git a/src/mem/ruby/network/orion/Buffer/Register.cc b/src/mem/ruby/network/orion/Buffer/Register.cc index 364e5a833..933480f1e 100644 --- a/src/mem/ruby/network/orion/Buffer/Register.cc +++ b/src/mem/ruby/network/orion/Buffer/Register.cc @@ -33,12 +33,12 @@ * Kambiz Samadi (Orion 2.0, UC San Diego) */ -#include <iostream> #include <cassert> +#include <iostream> #include "mem/ruby/network/orion/Buffer/Register.hh" -#include "mem/ruby/network/orion/TechParameter.hh" #include "mem/ruby/network/orion/FlipFlop.hh" +#include "mem/ruby/network/orion/TechParameter.hh" using namespace std; diff --git a/src/mem/ruby/network/orion/Buffer/SRAM.cc b/src/mem/ruby/network/orion/Buffer/SRAM.cc index d8f500de5..00460a32a 100644 --- a/src/mem/ruby/network/orion/Buffer/SRAM.cc +++ b/src/mem/ruby/network/orion/Buffer/SRAM.cc @@ -33,18 +33,18 @@ * Kambiz Samadi (Orion 2.0, UC San Diego) */ -#include <iostream> -#include <cmath> #include <cassert> +#include <cmath> +#include <iostream> -#include "mem/ruby/network/orion/Buffer/SRAM.hh" -#include "mem/ruby/network/orion/Buffer/OutdrvUnit.hh" #include "mem/ruby/network/orion/Buffer/AmpUnit.hh" #include "mem/ruby/network/orion/Buffer/BitlineUnit.hh" +#include "mem/ruby/network/orion/Buffer/DecoderUnit.hh" #include "mem/ruby/network/orion/Buffer/MemUnit.hh" +#include "mem/ruby/network/orion/Buffer/OutdrvUnit.hh" #include "mem/ruby/network/orion/Buffer/PrechargeUnit.hh" +#include "mem/ruby/network/orion/Buffer/SRAM.hh" #include "mem/ruby/network/orion/Buffer/WordlineUnit.hh" -#include "mem/ruby/network/orion/Buffer/DecoderUnit.hh" using namespace std; diff --git a/src/mem/ruby/network/orion/Buffer/SRAM.hh b/src/mem/ruby/network/orion/Buffer/SRAM.hh index 7b3f46698..959cc8278 100644 --- a/src/mem/ruby/network/orion/Buffer/SRAM.hh +++ b/src/mem/ruby/network/orion/Buffer/SRAM.hh @@ -36,9 +36,9 @@ #ifndef __SRAM_H__ #define __SRAM_H__ -#include "mem/ruby/network/orion/Type.hh" #include "mem/ruby/network/orion/OrionConfig.hh" #include "mem/ruby/network/orion/TechParameter.hh" +#include "mem/ruby/network/orion/Type.hh" class OutdrvUnit; class AmpUnit; diff --git a/src/mem/ruby/network/orion/Buffer/WordlineUnit.cc b/src/mem/ruby/network/orion/Buffer/WordlineUnit.cc index 3f2cdc34b..f56dc0631 100644 --- a/src/mem/ruby/network/orion/Buffer/WordlineUnit.cc +++ b/src/mem/ruby/network/orion/Buffer/WordlineUnit.cc @@ -34,8 +34,8 @@ */ #include "base/misc.hh" -#include "mem/ruby/network/orion/Buffer/WordlineUnit.hh" #include "mem/ruby/network/orion/Buffer/SRAM.hh" +#include "mem/ruby/network/orion/Buffer/WordlineUnit.hh" #include "mem/ruby/network/orion/TechParameter.hh" WordlineUnit::WordlineUnit( diff --git a/src/mem/ruby/network/orion/Clock.cc b/src/mem/ruby/network/orion/Clock.cc index 27c6e2332..303469e0c 100644 --- a/src/mem/ruby/network/orion/Clock.cc +++ b/src/mem/ruby/network/orion/Clock.cc @@ -34,8 +34,8 @@ */ #include "mem/ruby/network/orion/Clock.hh" -#include "mem/ruby/network/orion/TechParameter.hh" #include "mem/ruby/network/orion/OrionConfig.hh" +#include "mem/ruby/network/orion/TechParameter.hh" #include "mem/ruby/network/orion/Wire.hh" Clock::Clock( diff --git a/src/mem/ruby/network/orion/ConfigFile.hh b/src/mem/ruby/network/orion/ConfigFile.hh index 65cf50069..b159bba8c 100644 --- a/src/mem/ruby/network/orion/ConfigFile.hh +++ b/src/mem/ruby/network/orion/ConfigFile.hh @@ -42,11 +42,11 @@ #ifndef CONFIGFILE_H #define CONFIGFILE_H -#include <string> -#include <map> -#include <iostream> #include <fstream> +#include <iostream> +#include <map> #include <sstream> +#include <string> using std::string; diff --git a/src/mem/ruby/network/orion/Crossbar/Crossbar.cc b/src/mem/ruby/network/orion/Crossbar/Crossbar.cc index 65f1c20f9..7bb29a5c7 100644 --- a/src/mem/ruby/network/orion/Crossbar/Crossbar.cc +++ b/src/mem/ruby/network/orion/Crossbar/Crossbar.cc @@ -33,14 +33,14 @@ * Kambiz Samadi (Orion 2.0, UC San Diego) */ -#include <iostream> #include <cassert> +#include <iostream> #include "mem/ruby/network/orion/Crossbar/Crossbar.hh" -#include "mem/ruby/network/orion/TechParameter.hh" -#include "mem/ruby/network/orion/OrionConfig.hh" #include "mem/ruby/network/orion/Crossbar/MatrixCrossbar.hh" #include "mem/ruby/network/orion/Crossbar/MultreeCrossbar.hh" +#include "mem/ruby/network/orion/OrionConfig.hh" +#include "mem/ruby/network/orion/TechParameter.hh" using namespace std; diff --git a/src/mem/ruby/network/orion/Crossbar/MatrixCrossbar.cc b/src/mem/ruby/network/orion/Crossbar/MatrixCrossbar.cc index f283f6176..3e379bac2 100644 --- a/src/mem/ruby/network/orion/Crossbar/MatrixCrossbar.cc +++ b/src/mem/ruby/network/orion/Crossbar/MatrixCrossbar.cc @@ -33,8 +33,8 @@ * Kambiz Samadi (Orion 2.0, UC San Diego) */ -#include <iostream> #include <cassert> +#include <iostream> #include "mem/ruby/network/orion/Crossbar/MatrixCrossbar.hh" #include "mem/ruby/network/orion/TechParameter.hh" diff --git a/src/mem/ruby/network/orion/Crossbar/MatrixCrossbar.hh b/src/mem/ruby/network/orion/Crossbar/MatrixCrossbar.hh index cbfcf9fc7..af08834ac 100644 --- a/src/mem/ruby/network/orion/Crossbar/MatrixCrossbar.hh +++ b/src/mem/ruby/network/orion/Crossbar/MatrixCrossbar.hh @@ -36,8 +36,8 @@ #ifndef __MATRIXCROSSBAR_H__ #define __MATRIXCROSSBAR_H__ -#include "mem/ruby/network/orion/Type.hh" #include "mem/ruby/network/orion/Crossbar/Crossbar.hh" +#include "mem/ruby/network/orion/Type.hh" class TechParameter; diff --git a/src/mem/ruby/network/orion/Crossbar/MultreeCrossbar.cc b/src/mem/ruby/network/orion/Crossbar/MultreeCrossbar.cc index 44fa43cac..4c610ebaf 100644 --- a/src/mem/ruby/network/orion/Crossbar/MultreeCrossbar.cc +++ b/src/mem/ruby/network/orion/Crossbar/MultreeCrossbar.cc @@ -33,8 +33,8 @@ * Kambiz Samadi (Orion 2.0, UC San Diego) */ -#include <iostream> #include <cmath> +#include <iostream> #include "mem/ruby/network/orion/Crossbar/MultreeCrossbar.hh" #include "mem/ruby/network/orion/TechParameter.hh" diff --git a/src/mem/ruby/network/orion/Crossbar/MultreeCrossbar.hh b/src/mem/ruby/network/orion/Crossbar/MultreeCrossbar.hh index bac8b22cd..6a3395036 100644 --- a/src/mem/ruby/network/orion/Crossbar/MultreeCrossbar.hh +++ b/src/mem/ruby/network/orion/Crossbar/MultreeCrossbar.hh @@ -36,8 +36,8 @@ #ifndef __MULTREECROSSBAR_H__ #define __MULTREECROSSBAR_H__ -#include "mem/ruby/network/orion/Type.hh" #include "mem/ruby/network/orion/Crossbar/Crossbar.hh" +#include "mem/ruby/network/orion/Type.hh" class TechParameter; diff --git a/src/mem/ruby/network/orion/FlipFlop.cc b/src/mem/ruby/network/orion/FlipFlop.cc index 5b76d0a23..2b44b0fb4 100644 --- a/src/mem/ruby/network/orion/FlipFlop.cc +++ b/src/mem/ruby/network/orion/FlipFlop.cc @@ -33,8 +33,8 @@ * Kambiz Samadi (Orion 2.0, UC San Diego) */ -#include <iostream> #include <cassert> +#include <iostream> #include "mem/ruby/network/orion/FlipFlop.hh" #include "mem/ruby/network/orion/TechParameter.hh" diff --git a/src/mem/ruby/network/orion/NetworkPower.cc b/src/mem/ruby/network/orion/NetworkPower.cc index a28b8fd07..81d611f63 100644 --- a/src/mem/ruby/network/orion/NetworkPower.cc +++ b/src/mem/ruby/network/orion/NetworkPower.cc @@ -31,8 +31,8 @@ #include "mem/ruby/network/orion/NetworkPower.hh" #include "mem/ruby/network/orion/OrionConfig.hh" -#include "mem/ruby/network/orion/OrionRouter.hh" #include "mem/ruby/network/orion/OrionLink.hh" +#include "mem/ruby/network/orion/OrionRouter.hh" double Router_d::calculate_power() diff --git a/src/mem/ruby/network/orion/NetworkPower.hh b/src/mem/ruby/network/orion/NetworkPower.hh index 591f45362..eee7d03bc 100644 --- a/src/mem/ruby/network/orion/NetworkPower.hh +++ b/src/mem/ruby/network/orion/NetworkPower.hh @@ -32,12 +32,12 @@ #ifndef POWER_TRACE_H #define POWER_TRACE_H -#include <stdio.h> -#include <stdlib.h> -#include <assert.h> +#include <cassert> +#include <cstdio> +#include <cstdlib> -#include "mem/ruby/network/garnet/fixed-pipeline/NetworkLink_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/Router_d.hh" //int RW : diff --git a/src/mem/ruby/network/orion/OrionConfig.cc b/src/mem/ruby/network/orion/OrionConfig.cc index a4ac55a36..ca30bca3b 100644 --- a/src/mem/ruby/network/orion/OrionConfig.cc +++ b/src/mem/ruby/network/orion/OrionConfig.cc @@ -31,8 +31,8 @@ #include <iostream> #include <string> -#include "mem/ruby/network/orion/OrionConfig.hh" #include "mem/ruby/network/orion/ConfigFile.hh" +#include "mem/ruby/network/orion/OrionConfig.hh" #include "mem/ruby/network/orion/TechParameter.hh" using namespace std; diff --git a/src/mem/ruby/network/orion/OrionConfig.hh b/src/mem/ruby/network/orion/OrionConfig.hh index 78131e3c5..7138fd8a2 100644 --- a/src/mem/ruby/network/orion/OrionConfig.hh +++ b/src/mem/ruby/network/orion/OrionConfig.hh @@ -32,8 +32,8 @@ #define __ORIONCONFIG_H__ #include <iostream> -#include <sstream> #include <map> +#include <sstream> #include "mem/ruby/network/orion/Type.hh" diff --git a/src/mem/ruby/network/orion/OrionLink.cc b/src/mem/ruby/network/orion/OrionLink.cc index 38ddd0459..c10552d7a 100644 --- a/src/mem/ruby/network/orion/OrionLink.cc +++ b/src/mem/ruby/network/orion/OrionLink.cc @@ -33,11 +33,11 @@ * Kambiz Samadi (Orion 2.0, UC San Diego) */ -#include <iostream> #include <cassert> +#include <iostream> -#include "mem/ruby/network/orion/OrionLink.hh" #include "mem/ruby/network/orion/OrionConfig.hh" +#include "mem/ruby/network/orion/OrionLink.hh" #include "mem/ruby/network/orion/Wire.hh" using namespace std; diff --git a/src/mem/ruby/network/orion/OrionRouter.cc b/src/mem/ruby/network/orion/OrionRouter.cc index 1dd92d885..579114f3d 100644 --- a/src/mem/ruby/network/orion/OrionRouter.cc +++ b/src/mem/ruby/network/orion/OrionRouter.cc @@ -35,13 +35,13 @@ #include <cassert> -#include "OrionRouter.hh" -#include "mem/ruby/network/orion/OrionConfig.hh" +#include "mem/ruby/network/orion/Allocator/SWAllocator.hh" +#include "mem/ruby/network/orion/Allocator/VCAllocator.hh" #include "mem/ruby/network/orion/Buffer/Buffer.hh" #include "mem/ruby/network/orion/Crossbar/Crossbar.hh" -#include "mem/ruby/network/orion/Allocator/VCAllocator.hh" -#include "mem/ruby/network/orion/Allocator/SWAllocator.hh" #include "mem/ruby/network/orion/Clock.hh" +#include "mem/ruby/network/orion/OrionConfig.hh" +#include "OrionRouter.hh" OrionRouter::OrionRouter( uint32_t num_in_port_, diff --git a/src/mem/ruby/network/orion/TechParameter.cc b/src/mem/ruby/network/orion/TechParameter.cc index d1a107e18..5147eaec1 100644 --- a/src/mem/ruby/network/orion/TechParameter.cc +++ b/src/mem/ruby/network/orion/TechParameter.cc @@ -33,13 +33,13 @@ * Kambiz Samadi (Orion 2.0, UC San Diego) */ -#include <iostream> -#include <string> #include <cmath> #include <cstdlib> +#include <iostream> +#include <string> -#include "mem/ruby/network/orion/TechParameter.hh" #include "mem/ruby/network/orion/OrionConfig.hh" +#include "mem/ruby/network/orion/TechParameter.hh" using namespace std; diff --git a/src/mem/ruby/network/orion/Wire.cc b/src/mem/ruby/network/orion/Wire.cc index c704fa8da..d7333dd19 100644 --- a/src/mem/ruby/network/orion/Wire.cc +++ b/src/mem/ruby/network/orion/Wire.cc @@ -33,13 +33,13 @@ * Kambiz Samadi (Orion 2.0, UC San Diego) */ -#include <iostream> #include <cmath> #include <cstdlib> +#include <iostream> #include "base/misc.hh" -#include "mem/ruby/network/orion/Wire.hh" #include "mem/ruby/network/orion/TechParameter.hh" +#include "mem/ruby/network/orion/Wire.hh" using namespace std; diff --git a/src/mem/ruby/network/orion/orion.hh b/src/mem/ruby/network/orion/orion.hh index a9cc2a5b6..215398583 100644 --- a/src/mem/ruby/network/orion/orion.hh +++ b/src/mem/ruby/network/orion/orion.hh @@ -32,8 +32,8 @@ #define __ORION_H__ #include "mem/ruby/network/orion/OrionConfig.hh" -#include "mem/ruby/network/orion/OrionRouter.hh" #include "mem/ruby/network/orion/OrionLink.hh" +#include "mem/ruby/network/orion/OrionRouter.hh" #endif diff --git a/src/mem/ruby/network/simple/PerfectSwitch.hh b/src/mem/ruby/network/simple/PerfectSwitch.hh index 41125083f..15abec020 100644 --- a/src/mem/ruby/network/simple/PerfectSwitch.hh +++ b/src/mem/ruby/network/simple/PerfectSwitch.hh @@ -37,8 +37,8 @@ #define __MEM_RUBY_NETWORK_SIMPLE_PERFECTSWITCH_HH__ #include <iostream> -#include <vector> #include <string> +#include <vector> #include "mem/ruby/common/Consumer.hh" #include "mem/ruby/common/Global.hh" diff --git a/src/mem/ruby/network/simple/Switch.cc b/src/mem/ruby/network/simple/Switch.cc index 3439bf44b..391e08724 100644 --- a/src/mem/ruby/network/simple/Switch.cc +++ b/src/mem/ruby/network/simple/Switch.cc @@ -32,10 +32,10 @@ #include "mem/protocol/MessageSizeType.hh" #include "mem/protocol/Protocol.hh" #include "mem/ruby/buffers/MessageBuffer.hh" -#include "mem/ruby/network/Network.hh" #include "mem/ruby/network/simple/PerfectSwitch.hh" #include "mem/ruby/network/simple/Switch.hh" #include "mem/ruby/network/simple/Throttle.hh" +#include "mem/ruby/network/Network.hh" using namespace std; using m5::stl_helpers::deletePointers; diff --git a/src/mem/ruby/network/simple/Throttle.cc b/src/mem/ruby/network/simple/Throttle.cc index 28638cca9..0274a9771 100644 --- a/src/mem/ruby/network/simple/Throttle.cc +++ b/src/mem/ruby/network/simple/Throttle.cc @@ -31,8 +31,8 @@ #include "base/cprintf.hh" #include "mem/protocol/Protocol.hh" #include "mem/ruby/buffers/MessageBuffer.hh" -#include "mem/ruby/network/Network.hh" #include "mem/ruby/network/simple/Throttle.hh" +#include "mem/ruby/network/Network.hh" #include "mem/ruby/slicc_interface/NetworkMessage.hh" #include "mem/ruby/system/System.hh" diff --git a/src/mem/ruby/network/simple/Throttle.hh b/src/mem/ruby/network/simple/Throttle.hh index b4e6c867e..0a1fc9a30 100644 --- a/src/mem/ruby/network/simple/Throttle.hh +++ b/src/mem/ruby/network/simple/Throttle.hh @@ -39,8 +39,8 @@ #define __MEM_RUBY_NETWORK_SIMPLE_THROTTLE_HH__ #include <iostream> -#include <vector> #include <string> +#include <vector> #include "mem/ruby/common/Consumer.hh" #include "mem/ruby/common/Global.hh" diff --git a/src/mem/ruby/network/simple/Topology.cc b/src/mem/ruby/network/simple/Topology.cc index d79491ef2..a06c1578d 100644 --- a/src/mem/ruby/network/simple/Topology.cc +++ b/src/mem/ruby/network/simple/Topology.cc @@ -32,8 +32,8 @@ #include "mem/protocol/Protocol.hh" #include "mem/protocol/TopologyType.hh" #include "mem/ruby/common/NetDest.hh" -#include "mem/ruby/network/Network.hh" #include "mem/ruby/network/simple/Topology.hh" +#include "mem/ruby/network/Network.hh" #include "mem/ruby/slicc_interface/AbstractController.hh" #include "mem/ruby/system/System.hh" diff --git a/src/mem/ruby/profiler/CacheProfiler.hh b/src/mem/ruby/profiler/CacheProfiler.hh index 1ae6ba7a8..33cb45e85 100644 --- a/src/mem/ruby/profiler/CacheProfiler.hh +++ b/src/mem/ruby/profiler/CacheProfiler.hh @@ -33,10 +33,10 @@ #include <string> #include <vector> -#include "mem/protocol/RubyAccessMode.hh" -#include "mem/protocol/RubyRequestType.hh" #include "mem/protocol/GenericRequestType.hh" #include "mem/protocol/PrefetchBit.hh" +#include "mem/protocol/RubyAccessMode.hh" +#include "mem/protocol/RubyRequestType.hh" #include "mem/ruby/common/Global.hh" #include "mem/ruby/common/Histogram.hh" #include "mem/ruby/system/NodeID.hh" diff --git a/src/mem/ruby/profiler/Profiler.cc b/src/mem/ruby/profiler/Profiler.cc index ed7c25c9d..afb77f09f 100644 --- a/src/mem/ruby/profiler/Profiler.cc +++ b/src/mem/ruby/profiler/Profiler.cc @@ -51,14 +51,13 @@ #include "base/stl_helpers.hh" #include "base/str.hh" -#include "mem/protocol/RubyRequest.hh" #include "mem/protocol/MachineType.hh" #include "mem/protocol/Protocol.hh" +#include "mem/protocol/RubyRequest.hh" #include "mem/ruby/network/Network.hh" #include "mem/ruby/profiler/AddressProfiler.hh" #include "mem/ruby/profiler/Profiler.hh" #include "mem/ruby/system/System.hh" -#include "mem/ruby/system/System.hh" using namespace std; using m5::stl_helpers::operator<<; diff --git a/src/mem/ruby/profiler/Profiler.hh b/src/mem/ruby/profiler/Profiler.hh index 352ba453f..9efaf4be1 100644 --- a/src/mem/ruby/profiler/Profiler.hh +++ b/src/mem/ruby/profiler/Profiler.hh @@ -51,12 +51,12 @@ #include <vector> #include "base/hashmap.hh" -#include "mem/protocol/RubyAccessMode.hh" #include "mem/protocol/AccessType.hh" -#include "mem/protocol/RubyRequestType.hh" #include "mem/protocol/GenericMachineType.hh" #include "mem/protocol/GenericRequestType.hh" #include "mem/protocol/PrefetchBit.hh" +#include "mem/protocol/RubyAccessMode.hh" +#include "mem/protocol/RubyRequestType.hh" #include "mem/ruby/common/Address.hh" #include "mem/ruby/common/Consumer.hh" #include "mem/ruby/common/Global.hh" diff --git a/src/mem/ruby/recorder/CacheRecorder.cc b/src/mem/ruby/recorder/CacheRecorder.cc index 1d08eef12..fc6ad0975 100644 --- a/src/mem/ruby/recorder/CacheRecorder.cc +++ b/src/mem/ruby/recorder/CacheRecorder.cc @@ -28,10 +28,9 @@ #include <algorithm> -#include "gzstream.hh" - #include "mem/ruby/eventqueue/RubyEventQueue.hh" #include "mem/ruby/recorder/CacheRecorder.hh" +#include "gzstream.hh" using namespace std; diff --git a/src/mem/ruby/recorder/CacheRecorder.hh b/src/mem/ruby/recorder/CacheRecorder.hh index 1aac9a7e2..97a20af28 100644 --- a/src/mem/ruby/recorder/CacheRecorder.hh +++ b/src/mem/ruby/recorder/CacheRecorder.hh @@ -40,8 +40,8 @@ #include "mem/protocol/RubyRequestType.hh" #include "mem/ruby/common/Global.hh" -#include "mem/ruby/system/NodeID.hh" #include "mem/ruby/recorder/TraceRecord.hh" +#include "mem/ruby/system/NodeID.hh" class Address; class TraceRecord; diff --git a/src/mem/ruby/recorder/Tracer.hh b/src/mem/ruby/recorder/Tracer.hh index 39bab72a1..e050b3812 100644 --- a/src/mem/ruby/recorder/Tracer.hh +++ b/src/mem/ruby/recorder/Tracer.hh @@ -37,13 +37,12 @@ #include <iostream> #include <string> -#include "gzstream.hh" - #include "mem/protocol/RubyRequestType.hh" #include "mem/ruby/common/Global.hh" #include "mem/ruby/system/NodeID.hh" #include "params/RubyTracer.hh" #include "sim/sim_object.hh" +#include "gzstream.hh" class Address; class TraceRecord; diff --git a/src/mem/ruby/slicc_interface/AbstractEntry.hh b/src/mem/ruby/slicc_interface/AbstractEntry.hh index 6752bf6c4..7076d2e4c 100644 --- a/src/mem/ruby/slicc_interface/AbstractEntry.hh +++ b/src/mem/ruby/slicc_interface/AbstractEntry.hh @@ -31,9 +31,9 @@ #include <iostream> +#include "mem/protocol/AccessPermission.hh" #include "mem/ruby/common/Address.hh" #include "mem/ruby/common/Global.hh" -#include "mem/protocol/AccessPermission.hh" class DataBlock; diff --git a/src/mem/ruby/slicc_interface/RubyRequest.hh b/src/mem/ruby/slicc_interface/RubyRequest.hh index 8ac43a8e1..0e7ab039d 100644 --- a/src/mem/ruby/slicc_interface/RubyRequest.hh +++ b/src/mem/ruby/slicc_interface/RubyRequest.hh @@ -31,12 +31,12 @@ #include <ostream> -#include "mem/packet.hh" -#include "mem/protocol/RubyAccessMode.hh" -#include "mem/protocol/RubyRequestType.hh" #include "mem/protocol/Message.hh" #include "mem/protocol/PrefetchBit.hh" +#include "mem/protocol/RubyAccessMode.hh" +#include "mem/protocol/RubyRequestType.hh" #include "mem/ruby/common/Address.hh" +#include "mem/packet.hh" typedef void* RubyPortHandle; diff --git a/src/mem/ruby/slicc_interface/RubySlicc_ComponentMapping.cc b/src/mem/ruby/slicc_interface/RubySlicc_ComponentMapping.cc index 79b9821ba..06c036a10 100644 --- a/src/mem/ruby/slicc_interface/RubySlicc_ComponentMapping.cc +++ b/src/mem/ruby/slicc_interface/RubySlicc_ComponentMapping.cc @@ -28,5 +28,3 @@ #include "mem/ruby/slicc_interface/RubySlicc_ComponentMapping.hh" #include "mem/ruby/system/CacheMemory.hh" - - diff --git a/src/mem/ruby/slicc_interface/RubySlicc_includes.hh b/src/mem/ruby/slicc_interface/RubySlicc_includes.hh index ae98b3084..6defbbaa8 100644 --- a/src/mem/ruby/slicc_interface/RubySlicc_includes.hh +++ b/src/mem/ruby/slicc_interface/RubySlicc_includes.hh @@ -30,8 +30,8 @@ #define __MEM_RUBY_SLICC_INTERFACE_RUBYSLICC_INCLUDES_HH__ #include "mem/ruby/slicc_interface/RubySlicc_ComponentMapping.hh" -#include "mem/ruby/slicc_interface/RubySlicc_Util.hh" #include "mem/ruby/slicc_interface/RubySlicc_Profiler_interface.hh" +#include "mem/ruby/slicc_interface/RubySlicc_Util.hh" #endif // __MEM_RUBY_SLICC_INTERFACE_RUBYSLICC_INCLUDES_HH__ diff --git a/src/mem/ruby/system/CacheMemory.hh b/src/mem/ruby/system/CacheMemory.hh index e2e9a429e..4e4206e8d 100644 --- a/src/mem/ruby/system/CacheMemory.hh +++ b/src/mem/ruby/system/CacheMemory.hh @@ -35,10 +35,10 @@ #include "base/hashmap.hh" #include "mem/protocol/AccessPermission.hh" -#include "mem/protocol/RubyRequest.hh" -#include "mem/protocol/RubyRequestType.hh" #include "mem/protocol/GenericRequestType.hh" #include "mem/protocol/MachineType.hh" +#include "mem/protocol/RubyRequest.hh" +#include "mem/protocol/RubyRequestType.hh" #include "mem/ruby/common/Address.hh" #include "mem/ruby/common/DataBlock.hh" #include "mem/ruby/common/Global.hh" diff --git a/src/mem/ruby/system/RubyPort.cc b/src/mem/ruby/system/RubyPort.cc index 6d5cb71bf..354634358 100644 --- a/src/mem/ruby/system/RubyPort.cc +++ b/src/mem/ruby/system/RubyPort.cc @@ -31,9 +31,9 @@ #include "arch/x86/insts/microldstop.hh" #endif // X86_ISA #include "cpu/testers/rubytest/RubyTester.hh" -#include "mem/physical.hh" #include "mem/ruby/slicc_interface/AbstractController.hh" #include "mem/ruby/system/RubyPort.hh" +#include "mem/physical.hh" RubyPort::RubyPort(const Params *p) : MemObject(p) diff --git a/src/mem/ruby/system/RubyPort.hh b/src/mem/ruby/system/RubyPort.hh index 82ddc682a..dc7a141c3 100644 --- a/src/mem/ruby/system/RubyPort.hh +++ b/src/mem/ruby/system/RubyPort.hh @@ -32,11 +32,11 @@ #include <cassert> #include <string> -#include "mem/mem_object.hh" -#include "mem/physical.hh" #include "mem/protocol/RequestStatus.hh" #include "mem/ruby/slicc_interface/RubyRequest.hh" #include "mem/ruby/system/System.hh" +#include "mem/mem_object.hh" +#include "mem/physical.hh" #include "mem/tport.hh" #include "params/RubyPort.hh" diff --git a/src/mem/ruby/system/Sequencer.cc b/src/mem/ruby/system/Sequencer.cc index 0d8120330..db30b179f 100644 --- a/src/mem/ruby/system/Sequencer.cc +++ b/src/mem/ruby/system/Sequencer.cc @@ -26,18 +26,17 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "base/str.hh" #include "base/misc.hh" +#include "base/str.hh" #include "cpu/testers/rubytest/RubyTester.hh" #include "mem/protocol/Protocol.hh" -#include "mem/protocol/Protocol.hh" #include "mem/ruby/buffers/MessageBuffer.hh" #include "mem/ruby/common/Global.hh" #include "mem/ruby/common/SubBlock.hh" -#include "mem/ruby/slicc_interface/RubyRequest.hh" #include "mem/ruby/profiler/Profiler.hh" #include "mem/ruby/recorder/Tracer.hh" #include "mem/ruby/slicc_interface/AbstractController.hh" +#include "mem/ruby/slicc_interface/RubyRequest.hh" #include "mem/ruby/system/CacheMemory.hh" #include "mem/ruby/system/Sequencer.hh" #include "mem/ruby/system/System.hh" diff --git a/src/mem/ruby/system/Sequencer.hh b/src/mem/ruby/system/Sequencer.hh index ff3a0d5b1..885910251 100644 --- a/src/mem/ruby/system/Sequencer.hh +++ b/src/mem/ruby/system/Sequencer.hh @@ -32,10 +32,10 @@ #include <iostream> #include "base/hashmap.hh" -#include "mem/protocol/RubyAccessMode.hh" -#include "mem/protocol/RubyRequestType.hh" #include "mem/protocol/GenericMachineType.hh" #include "mem/protocol/PrefetchBit.hh" +#include "mem/protocol/RubyAccessMode.hh" +#include "mem/protocol/RubyRequestType.hh" #include "mem/ruby/common/Address.hh" #include "mem/ruby/common/Consumer.hh" #include "mem/ruby/common/Global.hh" diff --git a/src/mem/ruby/system/WireBuffer.hh b/src/mem/ruby/system/WireBuffer.hh index b34488fb1..648019aeb 100644 --- a/src/mem/ruby/system/WireBuffer.hh +++ b/src/mem/ruby/system/WireBuffer.hh @@ -33,8 +33,8 @@ #define __MEM_RUBY_SYSTEM_WIREBUFFER_HH__ #include <iostream> -#include <vector> #include <string> +#include <vector> #include "mem/ruby/buffers/MessageBufferNode.hh" #include "mem/ruby/common/Global.hh" @@ -42,7 +42,6 @@ #include "params/RubyWireBuffer.hh" #include "sim/sim_object.hh" - ////////////////////////////////////////////////////////////////////////////// // This object was written to literally mimic a Wire in Ruby, in the sense // that there is no way for messages to get reordered en route on the WireBuffer. |