summaryrefslogtreecommitdiff
path: root/src/mem/ruby
diff options
context:
space:
mode:
Diffstat (limited to 'src/mem/ruby')
-rw-r--r--src/mem/ruby/buffers/MessageBuffer.cc4
-rw-r--r--src/mem/ruby/buffers/MessageBuffer.hh14
-rw-r--r--src/mem/ruby/buffers/MessageBufferNode.cc2
-rw-r--r--src/mem/ruby/buffers/MessageBufferNode.hh4
-rw-r--r--src/mem/ruby/common/Address.cc2
-rw-r--r--src/mem/ruby/common/Address.hh8
-rw-r--r--src/mem/ruby/common/BigSet.cc4
-rw-r--r--src/mem/ruby/common/BigSet.hh8
-rw-r--r--src/mem/ruby/common/Consumer.hh4
-rw-r--r--src/mem/ruby/common/DataBlock.cc2
-rw-r--r--src/mem/ruby/common/DataBlock.hh6
-rw-r--r--src/mem/ruby/common/Debug.cc6
-rw-r--r--src/mem/ruby/common/Driver.cc2
-rw-r--r--src/mem/ruby/common/Driver.hh14
-rw-r--r--src/mem/ruby/common/Global.cc2
-rw-r--r--src/mem/ruby/common/Global.hh4
-rw-r--r--src/mem/ruby/common/Histogram.cc2
-rw-r--r--src/mem/ruby/common/Histogram.hh4
-rw-r--r--src/mem/ruby/common/Message.cc2
-rw-r--r--src/mem/ruby/common/NetDest.cc6
-rw-r--r--src/mem/ruby/common/NetDest.hh14
-rw-r--r--src/mem/ruby/common/OptBigSet.cc4
-rw-r--r--src/mem/ruby/common/OptBigSet.hh8
-rw-r--r--src/mem/ruby/common/Set.cc4
-rw-r--r--src/mem/ruby/common/Set.hh12
-rw-r--r--src/mem/ruby/common/SubBlock.cc2
-rw-r--r--src/mem/ruby/common/SubBlock.hh10
-rw-r--r--src/mem/ruby/config/RubyConfig.cc10
-rw-r--r--src/mem/ruby/config/RubyConfig.hh6
-rw-r--r--src/mem/ruby/eventqueue/RubyEventQueue.cc14
-rw-r--r--src/mem/ruby/eventqueue/RubyEventQueue.hh4
-rw-r--r--src/mem/ruby/eventqueue/RubyEventQueueNode.cc2
-rw-r--r--src/mem/ruby/eventqueue/RubyEventQueueNode.hh2
-rw-r--r--src/mem/ruby/init.cc20
-rw-r--r--src/mem/ruby/network/Network.hh6
-rw-r--r--src/mem/ruby/network/garnet-fixed-pipeline/CreditLink_d.hh2
-rw-r--r--src/mem/ruby/network/garnet-fixed-pipeline/GarnetNetwork_d.cc18
-rw-r--r--src/mem/ruby/network/garnet-fixed-pipeline/GarnetNetwork_d.hh8
-rw-r--r--src/mem/ruby/network/garnet-fixed-pipeline/InputUnit_d.cc4
-rw-r--r--src/mem/ruby/network/garnet-fixed-pipeline/InputUnit_d.hh14
-rw-r--r--src/mem/ruby/network/garnet-fixed-pipeline/NetworkHeader.hh4
-rw-r--r--src/mem/ruby/network/garnet-fixed-pipeline/NetworkInterface_d.cc8
-rw-r--r--src/mem/ruby/network/garnet-fixed-pipeline/NetworkInterface_d.hh16
-rw-r--r--src/mem/ruby/network/garnet-fixed-pipeline/NetworkLink_d.cc6
-rw-r--r--src/mem/ruby/network/garnet-fixed-pipeline/NetworkLink_d.hh10
-rw-r--r--src/mem/ruby/network/garnet-fixed-pipeline/OutVcState_d.cc6
-rw-r--r--src/mem/ruby/network/garnet-fixed-pipeline/OutVcState_d.hh2
-rw-r--r--src/mem/ruby/network/garnet-fixed-pipeline/OutputUnit_d.cc6
-rw-r--r--src/mem/ruby/network/garnet-fixed-pipeline/OutputUnit_d.hh12
-rw-r--r--src/mem/ruby/network/garnet-fixed-pipeline/Router_d.cc20
-rw-r--r--src/mem/ruby/network/garnet-fixed-pipeline/Router_d.hh10
-rw-r--r--src/mem/ruby/network/garnet-fixed-pipeline/RoutingUnit_d.cc8
-rw-r--r--src/mem/ruby/network/garnet-fixed-pipeline/RoutingUnit_d.hh8
-rw-r--r--src/mem/ruby/network/garnet-fixed-pipeline/SWallocator_d.cc10
-rw-r--r--src/mem/ruby/network/garnet-fixed-pipeline/SWallocator_d.hh4
-rw-r--r--src/mem/ruby/network/garnet-fixed-pipeline/Switch_d.cc6
-rw-r--r--src/mem/ruby/network/garnet-fixed-pipeline/Switch_d.hh6
-rw-r--r--src/mem/ruby/network/garnet-fixed-pipeline/VCallocator_d.cc12
-rw-r--r--src/mem/ruby/network/garnet-fixed-pipeline/VCallocator_d.hh4
-rw-r--r--src/mem/ruby/network/garnet-fixed-pipeline/VirtualChannel_d.cc2
-rw-r--r--src/mem/ruby/network/garnet-fixed-pipeline/VirtualChannel_d.hh4
-rw-r--r--src/mem/ruby/network/garnet-fixed-pipeline/flitBuffer_d.cc2
-rw-r--r--src/mem/ruby/network/garnet-fixed-pipeline/flitBuffer_d.hh6
-rw-r--r--src/mem/ruby/network/garnet-fixed-pipeline/flit_d.cc2
-rw-r--r--src/mem/ruby/network/garnet-fixed-pipeline/flit_d.hh4
-rw-r--r--src/mem/ruby/network/garnet-flexible-pipeline/FlexibleConsumer.hh6
-rw-r--r--src/mem/ruby/network/garnet-flexible-pipeline/GarnetNetwork.cc20
-rw-r--r--src/mem/ruby/network/garnet-flexible-pipeline/GarnetNetwork.hh8
-rw-r--r--src/mem/ruby/network/garnet-flexible-pipeline/InVcState.cc2
-rw-r--r--src/mem/ruby/network/garnet-flexible-pipeline/InVcState.hh2
-rw-r--r--src/mem/ruby/network/garnet-flexible-pipeline/NetworkConfig.hh6
-rw-r--r--src/mem/ruby/network/garnet-flexible-pipeline/NetworkInterface.cc8
-rw-r--r--src/mem/ruby/network/garnet-flexible-pipeline/NetworkInterface.hh14
-rw-r--r--src/mem/ruby/network/garnet-flexible-pipeline/NetworkLink.cc6
-rw-r--r--src/mem/ruby/network/garnet-flexible-pipeline/NetworkLink.hh10
-rw-r--r--src/mem/ruby/network/garnet-flexible-pipeline/OutVcState.cc2
-rw-r--r--src/mem/ruby/network/garnet-flexible-pipeline/OutVcState.hh2
-rw-r--r--src/mem/ruby/network/garnet-flexible-pipeline/Router.cc10
-rw-r--r--src/mem/ruby/network/garnet-flexible-pipeline/Router.hh18
-rw-r--r--src/mem/ruby/network/garnet-flexible-pipeline/VCarbiter.cc4
-rw-r--r--src/mem/ruby/network/garnet-flexible-pipeline/VCarbiter.hh4
-rw-r--r--src/mem/ruby/network/garnet-flexible-pipeline/flit.cc2
-rw-r--r--src/mem/ruby/network/garnet-flexible-pipeline/flit.hh4
-rw-r--r--src/mem/ruby/network/garnet-flexible-pipeline/flitBuffer.cc2
-rw-r--r--src/mem/ruby/network/garnet-flexible-pipeline/flitBuffer.hh6
-rw-r--r--src/mem/ruby/network/orion/NetworkPower.cc22
-rw-r--r--src/mem/ruby/network/orion/SIM_power.hh2
-rw-r--r--src/mem/ruby/network/orion/power_arbiter.cc14
-rw-r--r--src/mem/ruby/network/orion/power_arbiter.hh2
-rw-r--r--src/mem/ruby/network/orion/power_array.cc12
-rw-r--r--src/mem/ruby/network/orion/power_bus.cc12
-rw-r--r--src/mem/ruby/network/orion/power_crossbar.cc12
-rw-r--r--src/mem/ruby/network/orion/power_ll.cc8
-rw-r--r--src/mem/ruby/network/orion/power_router_init.cc18
-rw-r--r--src/mem/ruby/network/orion/power_router_init.hh6
-rw-r--r--src/mem/ruby/network/orion/power_static.cc2
-rw-r--r--src/mem/ruby/network/orion/power_static.hh2
-rw-r--r--src/mem/ruby/network/orion/power_utils.cc4
-rw-r--r--src/mem/ruby/network/simple/PerfectSwitch.cc16
-rw-r--r--src/mem/ruby/network/simple/PerfectSwitch.hh8
-rw-r--r--src/mem/ruby/network/simple/SimpleNetwork.cc22
-rw-r--r--src/mem/ruby/network/simple/SimpleNetwork.hh8
-rw-r--r--src/mem/ruby/network/simple/Switch.cc14
-rw-r--r--src/mem/ruby/network/simple/Switch.hh4
-rw-r--r--src/mem/ruby/network/simple/Throttle.cc12
-rw-r--r--src/mem/ruby/network/simple/Throttle.hh10
-rw-r--r--src/mem/ruby/network/simple/Topology.cc16
-rw-r--r--src/mem/ruby/network/simple/Topology.hh6
-rw-r--r--src/mem/ruby/profiler/AccessTraceForAddress.cc4
-rw-r--r--src/mem/ruby/profiler/AccessTraceForAddress.hh14
-rw-r--r--src/mem/ruby/profiler/AddressProfiler.cc14
-rw-r--r--src/mem/ruby/profiler/AddressProfiler.hh12
-rw-r--r--src/mem/ruby/profiler/CacheProfiler.cc12
-rw-r--r--src/mem/ruby/profiler/CacheProfiler.hh12
-rw-r--r--src/mem/ruby/profiler/Profiler.cc26
-rw-r--r--src/mem/ruby/profiler/Profiler.hh28
-rw-r--r--src/mem/ruby/profiler/StoreTrace.cc4
-rw-r--r--src/mem/ruby/profiler/StoreTrace.hh8
-rw-r--r--src/mem/ruby/profiler/XactProfiler.cc12
-rw-r--r--src/mem/ruby/profiler/XactProfiler.hh28
-rw-r--r--src/mem/ruby/recorder/CacheRecorder.cc8
-rw-r--r--src/mem/ruby/recorder/CacheRecorder.hh6
-rw-r--r--src/mem/ruby/recorder/TraceRecord.cc10
-rw-r--r--src/mem/ruby/recorder/TraceRecord.hh8
-rw-r--r--src/mem/ruby/recorder/Tracer.cc10
-rw-r--r--src/mem/ruby/recorder/Tracer.hh6
-rw-r--r--src/mem/ruby/slicc_interface/AbstractCacheEntry.cc2
-rw-r--r--src/mem/ruby/slicc_interface/AbstractCacheEntry.hh6
-rw-r--r--src/mem/ruby/slicc_interface/AbstractChip.cc2
-rw-r--r--src/mem/ruby/slicc_interface/AbstractChip.hh12
-rw-r--r--src/mem/ruby/slicc_interface/Message.hh8
-rw-r--r--src/mem/ruby/slicc_interface/NetworkMessage.hh12
-rw-r--r--src/mem/ruby/slicc_interface/RubySlicc_ComponentMapping.hh16
-rw-r--r--src/mem/ruby/slicc_interface/RubySlicc_Profiler_interface.cc14
-rw-r--r--src/mem/ruby/slicc_interface/RubySlicc_Profiler_interface.hh16
-rw-r--r--src/mem/ruby/slicc_interface/RubySlicc_Util.hh34
-rw-r--r--src/mem/ruby/slicc_interface/RubySlicc_includes.hh6
-rw-r--r--src/mem/ruby/system/AbstractBloomFilter.hh8
-rw-r--r--src/mem/ruby/system/AbstractMemOrCache.hh8
-rw-r--r--src/mem/ruby/system/AbstractReplacementPolicy.hh2
-rw-r--r--src/mem/ruby/system/BlockBloomFilter.cc6
-rw-r--r--src/mem/ruby/system/BlockBloomFilter.hh12
-rw-r--r--src/mem/ruby/system/BulkBloomFilter.cc6
-rw-r--r--src/mem/ruby/system/BulkBloomFilter.hh12
-rw-r--r--src/mem/ruby/system/CacheMemory.hh24
-rw-r--r--src/mem/ruby/system/DirectoryMemory.cc12
-rw-r--r--src/mem/ruby/system/DirectoryMemory.hh6
-rw-r--r--src/mem/ruby/system/GenericBloomFilter.cc26
-rw-r--r--src/mem/ruby/system/GenericBloomFilter.hh10
-rw-r--r--src/mem/ruby/system/H3BloomFilter.cc6
-rw-r--r--src/mem/ruby/system/H3BloomFilter.hh16
-rw-r--r--src/mem/ruby/system/LRUPolicy.hh2
-rw-r--r--src/mem/ruby/system/LSB_CountingBloomFilter.cc6
-rw-r--r--src/mem/ruby/system/LSB_CountingBloomFilter.hh12
-rw-r--r--src/mem/ruby/system/MachineID.hh6
-rw-r--r--src/mem/ruby/system/MemoryControl.cc26
-rw-r--r--src/mem/ruby/system/MemoryControl.hh24
-rw-r--r--src/mem/ruby/system/MemoryNode.cc2
-rw-r--r--src/mem/ruby/system/MemoryNode.hh6
-rw-r--r--src/mem/ruby/system/MultiBitSelBloomFilter.cc6
-rw-r--r--src/mem/ruby/system/MultiBitSelBloomFilter.hh16
-rw-r--r--src/mem/ruby/system/MultiGrainBloomFilter.cc6
-rw-r--r--src/mem/ruby/system/MultiGrainBloomFilter.hh12
-rw-r--r--src/mem/ruby/system/NodeID.hh4
-rw-r--r--src/mem/ruby/system/NodePersistentTable.cc12
-rw-r--r--src/mem/ruby/system/NodePersistentTable.hh6
-rw-r--r--src/mem/ruby/system/NonCountingBloomFilter.cc6
-rw-r--r--src/mem/ruby/system/NonCountingBloomFilter.hh12
-rw-r--r--src/mem/ruby/system/PerfectCacheMemory.hh12
-rw-r--r--src/mem/ruby/system/PersistentArbiter.cc8
-rw-r--r--src/mem/ruby/system/PersistentArbiter.hh14
-rw-r--r--src/mem/ruby/system/PersistentTable.cc12
-rw-r--r--src/mem/ruby/system/PersistentTable.hh6
-rw-r--r--src/mem/ruby/system/PseudoLRUPolicy.hh2
-rw-r--r--src/mem/ruby/system/Sequencer.cc28
-rw-r--r--src/mem/ruby/system/Sequencer.hh18
-rw-r--r--src/mem/ruby/system/StoreBuffer.cc24
-rw-r--r--src/mem/ruby/system/StoreBuffer.hh12
-rw-r--r--src/mem/ruby/system/StoreCache.cc14
-rw-r--r--src/mem/ruby/system/StoreCache.hh4
-rw-r--r--src/mem/ruby/system/System.cc20
-rw-r--r--src/mem/ruby/system/System.hh12
-rw-r--r--src/mem/ruby/system/TBETable.hh12
-rw-r--r--src/mem/ruby/system/TimerTable.cc6
-rw-r--r--src/mem/ruby/system/TimerTable.hh6
-rw-r--r--src/mem/ruby/tester/BarrierGenerator.cc14
-rw-r--r--src/mem/ruby/tester/BarrierGenerator.hh8
-rw-r--r--src/mem/ruby/tester/Check.cc10
-rw-r--r--src/mem/ruby/tester/Check.hh10
-rw-r--r--src/mem/ruby/tester/CheckTable.cc6
-rw-r--r--src/mem/ruby/tester/CheckTable.hh4
-rw-r--r--src/mem/ruby/tester/DetermGETXGenerator.cc18
-rw-r--r--src/mem/ruby/tester/DetermGETXGenerator.hh12
-rw-r--r--src/mem/ruby/tester/DetermInvGenerator.cc18
-rw-r--r--src/mem/ruby/tester/DetermInvGenerator.hh12
-rw-r--r--src/mem/ruby/tester/DetermSeriesGETSGenerator.cc18
-rw-r--r--src/mem/ruby/tester/DetermSeriesGETSGenerator.hh12
-rw-r--r--src/mem/ruby/tester/DeterministicDriver.cc20
-rw-r--r--src/mem/ruby/tester/DeterministicDriver.hh8
-rw-r--r--src/mem/ruby/tester/Instruction.cc2
-rw-r--r--src/mem/ruby/tester/Instruction.hh2
-rw-r--r--src/mem/ruby/tester/RaceyDriver.cc10
-rw-r--r--src/mem/ruby/tester/RaceyDriver.hh4
-rw-r--r--src/mem/ruby/tester/RequestGenerator.cc18
-rw-r--r--src/mem/ruby/tester/RequestGenerator.hh10
-rw-r--r--src/mem/ruby/tester/SpecifiedGenerator.cc10
-rw-r--r--src/mem/ruby/tester/SpecifiedGenerator.hh6
-rw-r--r--src/mem/ruby/tester/SyntheticDriver.cc18
-rw-r--r--src/mem/ruby/tester/SyntheticDriver.hh8
-rw-r--r--src/mem/ruby/tester/Tester.cc14
-rw-r--r--src/mem/ruby/tester/Tester.hh8
-rw-r--r--src/mem/ruby/tester/XactAbortRequestGenerator.cc18
-rw-r--r--src/mem/ruby/tester/XactAbortRequestGenerator.hh8
-rw-r--r--src/mem/ruby/tester/XactRequestGenerator.cc18
-rw-r--r--src/mem/ruby/tester/XactRequestGenerator.hh8
-rw-r--r--src/mem/ruby/tester/main.cc8
-rw-r--r--src/mem/ruby/tester/main.hh9
-rw-r--r--src/mem/ruby/tester/test_framework.cc26
-rw-r--r--src/mem/ruby/tester/test_framework.hh4
219 files changed, 1030 insertions, 1037 deletions
diff --git a/src/mem/ruby/buffers/MessageBuffer.cc b/src/mem/ruby/buffers/MessageBuffer.cc
index ff2547f0f..eeba0def2 100644
--- a/src/mem/ruby/buffers/MessageBuffer.cc
+++ b/src/mem/ruby/buffers/MessageBuffer.cc
@@ -31,8 +31,8 @@
* $Id$
*/
-#include "MessageBuffer.hh"
-#include "RubyConfig.hh"
+#include "mem/ruby/buffers/MessageBuffer.hh"
+#include "mem/ruby/config/RubyConfig.hh"
MessageBuffer::MessageBuffer()
{
diff --git a/src/mem/ruby/buffers/MessageBuffer.hh b/src/mem/ruby/buffers/MessageBuffer.hh
index ea9933f8c..b58203a93 100644
--- a/src/mem/ruby/buffers/MessageBuffer.hh
+++ b/src/mem/ruby/buffers/MessageBuffer.hh
@@ -38,13 +38,13 @@
#ifndef MESSAGEBUFFER_H
#define MESSAGEBUFFER_H
-#include "Global.hh"
-#include "MessageBufferNode.hh"
-#include "Consumer.hh"
-#include "RubyEventQueue.hh"
-#include "Message.hh"
-#include "PrioHeap.hh"
-#include "util.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/buffers/MessageBufferNode.hh"
+#include "mem/ruby/common/Consumer.hh"
+#include "mem/ruby/eventqueue/RubyEventQueue.hh"
+#include "mem/ruby/slicc_interface/Message.hh"
+#include "mem/gems_common/PrioHeap.hh"
+#include "mem/gems_common/util.hh"
class Chip;
diff --git a/src/mem/ruby/buffers/MessageBufferNode.cc b/src/mem/ruby/buffers/MessageBufferNode.cc
index 31117dd0e..22b077363 100644
--- a/src/mem/ruby/buffers/MessageBufferNode.cc
+++ b/src/mem/ruby/buffers/MessageBufferNode.cc
@@ -27,7 +27,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "MessageBufferNode.hh"
+#include "mem/ruby/buffers/MessageBufferNode.hh"
void MessageBufferNode::print(ostream& out) const
{
diff --git a/src/mem/ruby/buffers/MessageBufferNode.hh b/src/mem/ruby/buffers/MessageBufferNode.hh
index c562c45eb..cb64974d5 100644
--- a/src/mem/ruby/buffers/MessageBufferNode.hh
+++ b/src/mem/ruby/buffers/MessageBufferNode.hh
@@ -30,8 +30,8 @@
#ifndef MESSAGEBUFFERNODE_H
#define MESSAGEBUFFERNODE_H
-#include "Global.hh"
-#include "Message.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/slicc_interface/Message.hh"
class MessageBufferNode {
public:
diff --git a/src/mem/ruby/common/Address.cc b/src/mem/ruby/common/Address.cc
index 5d38faae0..b4ad39294 100644
--- a/src/mem/ruby/common/Address.cc
+++ b/src/mem/ruby/common/Address.cc
@@ -31,7 +31,7 @@
* $Id$
*/
-#include "Address.hh"
+#include "mem/ruby/common/Address.hh"
void Address::output(ostream& out) const
{
diff --git a/src/mem/ruby/common/Address.hh b/src/mem/ruby/common/Address.hh
index 3c3c5ad30..da218f177 100644
--- a/src/mem/ruby/common/Address.hh
+++ b/src/mem/ruby/common/Address.hh
@@ -25,10 +25,10 @@
#define ADDRESS_H
#include <iomanip>
-#include "Global.hh"
-#include "RubyConfig.hh"
-#include "NodeID.hh"
-#include "MachineID.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/config/RubyConfig.hh"
+#include "mem/ruby/system/NodeID.hh"
+#include "mem/ruby/system/MachineID.hh"
const int ADDRESS_WIDTH = 64; // address width in bytes
diff --git a/src/mem/ruby/common/BigSet.cc b/src/mem/ruby/common/BigSet.cc
index e16284f15..f55d7b79c 100644
--- a/src/mem/ruby/common/BigSet.cc
+++ b/src/mem/ruby/common/BigSet.cc
@@ -27,8 +27,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "Set.hh"
-#include "RubyConfig.hh"
+#include "mem/ruby/common/Set.hh"
+#include "mem/ruby/config/RubyConfig.hh"
Set::Set()
{
diff --git a/src/mem/ruby/common/BigSet.hh b/src/mem/ruby/common/BigSet.hh
index 4eae01681..06ee6a66d 100644
--- a/src/mem/ruby/common/BigSet.hh
+++ b/src/mem/ruby/common/BigSet.hh
@@ -33,10 +33,10 @@
#ifndef SET_H
#define SET_H
-#include "Global.hh"
-#include "Vector.hh"
-#include "NodeID.hh"
-#include "RubyConfig.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/gems_common/Vector.hh"
+#include "mem/ruby/system/NodeID.hh"
+#include "mem/ruby/config/RubyConfig.hh"
enum PresenceBit {NotPresent, Present};
diff --git a/src/mem/ruby/common/Consumer.hh b/src/mem/ruby/common/Consumer.hh
index e8dada9ca..34cd7864c 100644
--- a/src/mem/ruby/common/Consumer.hh
+++ b/src/mem/ruby/common/Consumer.hh
@@ -39,8 +39,8 @@
#ifndef CONSUMER_H
#define CONSUMER_H
-#include "Global.hh"
-#include "RubyEventQueue.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/eventqueue/RubyEventQueue.hh"
class MessageBuffer;
diff --git a/src/mem/ruby/common/DataBlock.cc b/src/mem/ruby/common/DataBlock.cc
index c4d6d7a33..ce72bc7f4 100644
--- a/src/mem/ruby/common/DataBlock.cc
+++ b/src/mem/ruby/common/DataBlock.cc
@@ -31,7 +31,7 @@
* $Id$
*/
-#include "DataBlock.hh"
+#include "mem/ruby/common/DataBlock.hh"
DataBlock::DataBlock()
{
diff --git a/src/mem/ruby/common/DataBlock.hh b/src/mem/ruby/common/DataBlock.hh
index aae364078..8711cb740 100644
--- a/src/mem/ruby/common/DataBlock.hh
+++ b/src/mem/ruby/common/DataBlock.hh
@@ -30,9 +30,9 @@
#ifndef DATABLOCK_H
#define DATABLOCK_H
-#include "Global.hh"
-#include "RubyConfig.hh"
-#include "Vector.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/config/RubyConfig.hh"
+#include "mem/gems_common/Vector.hh"
class DataBlock {
public:
diff --git a/src/mem/ruby/common/Debug.cc b/src/mem/ruby/common/Debug.cc
index 4c2263b0c..02f4069ee 100644
--- a/src/mem/ruby/common/Debug.cc
+++ b/src/mem/ruby/common/Debug.cc
@@ -35,9 +35,9 @@
#include <fstream>
#include <stdarg.h>
-#include "Global.hh"
-#include "Debug.hh"
-#include "RubyEventQueue.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/common/Debug.hh"
+#include "mem/ruby/eventqueue/RubyEventQueue.hh"
class Debug;
extern Debug* g_debug_ptr;
diff --git a/src/mem/ruby/common/Driver.cc b/src/mem/ruby/common/Driver.cc
index 019ac6403..2d6034b02 100644
--- a/src/mem/ruby/common/Driver.cc
+++ b/src/mem/ruby/common/Driver.cc
@@ -27,7 +27,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "Driver.hh"
+#include "mem/ruby/common/Driver.hh"
Driver::Driver()
{
diff --git a/src/mem/ruby/common/Driver.hh b/src/mem/ruby/common/Driver.hh
index 1d5b883ac..c527e7d2b 100644
--- a/src/mem/ruby/common/Driver.hh
+++ b/src/mem/ruby/common/Driver.hh
@@ -30,10 +30,10 @@
#ifndef DRIVER_H
#define DRIVER_H
-#include "Global.hh"
-#include "Consumer.hh"
-#include "NodeID.hh"
-#include "CacheRequestType.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/common/Consumer.hh"
+#include "mem/ruby/system/NodeID.hh"
+#include "mem/protocol/CacheRequestType.hh"
class RubySystem;
class SubBlock;
@@ -62,15 +62,15 @@ public:
virtual void notifyTrapStart( int procID, const Address & handlerPC, int threadID, int smtThread ) { assert(0); } //called by Sequencer
virtual void notifyTrapComplete( int procID, const Address & newPC, int smtThread ) {assert(0); } // called by Sequencer
virtual int getOpalTransactionLevel(int procID, int thread) const {
- cout << "Driver.hh getOpalTransactionLevel() " << endl;
+ cout << "mem/ruby/common/Driver.hh getOpalTransactionLevel() " << endl;
return 0; } //called by Sequencer
virtual void addThreadDependency(int procID, int requestor_thread, int conflict_thread) const { assert(0);}
virtual uint64 getOpalTime(int procID) const{ return 0; } //called by Sequencer
virtual uint64 getOpalTimestamp(int procID, int thread) const{
- cout << "Driver.hh getOpalTimestamp " << endl;
+ cout << "mem/ruby/common/Driver.hh getOpalTimestamp " << endl;
return 0; } // called by Sequencer
virtual int inTransaction(int procID, int thread ) const{
- cout << "Driver.hh inTransaction " << endl;
+ cout << "mem/ruby/common/Driver.hh inTransaction " << endl;
return false; } //called by Sequencer
virtual void printDebug(){} //called by Sequencer
diff --git a/src/mem/ruby/common/Global.cc b/src/mem/ruby/common/Global.cc
index 73a26269a..7c7cab1e8 100644
--- a/src/mem/ruby/common/Global.cc
+++ b/src/mem/ruby/common/Global.cc
@@ -27,7 +27,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "Global.hh"
+#include "mem/ruby/common/Global.hh"
RubyEventQueue* g_eventQueue_ptr = NULL;
RubySystem* g_system_ptr = NULL;
diff --git a/src/mem/ruby/common/Global.hh b/src/mem/ruby/common/Global.hh
index e4014df9b..6b524bb70 100644
--- a/src/mem/ruby/common/Global.hh
+++ b/src/mem/ruby/common/Global.hh
@@ -78,8 +78,8 @@ typedef uint64 pa_t;
typedef integer_t simtime_t;
// external includes for all classes
-#include "std-includes.hh"
-#include "Debug.hh"
+#include "mem/gems_common/std-includes.hh"
+#include "mem/ruby/common/Debug.hh"
// simple type declarations
typedef Time LogicalTime;
diff --git a/src/mem/ruby/common/Histogram.cc b/src/mem/ruby/common/Histogram.cc
index 9c5e8e623..7f9a7027e 100644
--- a/src/mem/ruby/common/Histogram.cc
+++ b/src/mem/ruby/common/Histogram.cc
@@ -32,7 +32,7 @@
*
*/
-#include "Histogram.hh"
+#include "mem/ruby/common/Histogram.hh"
Histogram::Histogram(int binsize, int bins)
{
diff --git a/src/mem/ruby/common/Histogram.hh b/src/mem/ruby/common/Histogram.hh
index e48efc35f..59afde867 100644
--- a/src/mem/ruby/common/Histogram.hh
+++ b/src/mem/ruby/common/Histogram.hh
@@ -37,8 +37,8 @@
#ifndef HISTOGRAM_H
#define HISTOGRAM_H
-#include "Global.hh"
-#include "Vector.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/gems_common/Vector.hh"
class Histogram {
public:
diff --git a/src/mem/ruby/common/Message.cc b/src/mem/ruby/common/Message.cc
index baad8ac9b..bf3307687 100644
--- a/src/mem/ruby/common/Message.cc
+++ b/src/mem/ruby/common/Message.cc
@@ -31,4 +31,4 @@
* $Id$
*/
-#include "Message.hh"
+#include "mem/ruby/slicc_interface/Message.hh"
diff --git a/src/mem/ruby/common/NetDest.cc b/src/mem/ruby/common/NetDest.cc
index 79a6078e9..951307395 100644
--- a/src/mem/ruby/common/NetDest.cc
+++ b/src/mem/ruby/common/NetDest.cc
@@ -36,9 +36,9 @@
*
*/
-#include "NetDest.hh"
-#include "RubyConfig.hh"
-#include "Protocol.hh"
+#include "mem/ruby/common/NetDest.hh"
+#include "mem/ruby/config/RubyConfig.hh"
+#include "mem/protocol/Protocol.hh"
NetDest::NetDest()
{
diff --git a/src/mem/ruby/common/NetDest.hh b/src/mem/ruby/common/NetDest.hh
index 04f7871f6..17ede03e9 100644
--- a/src/mem/ruby/common/NetDest.hh
+++ b/src/mem/ruby/common/NetDest.hh
@@ -44,13 +44,13 @@
#ifndef NETDEST_H
#define NETDEST_H
-#include "Global.hh"
-#include "Vector.hh"
-#include "NodeID.hh"
-#include "MachineID.hh"
-#include "RubyConfig.hh"
-#include "Set.hh"
-#include "MachineType.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/gems_common/Vector.hh"
+#include "mem/ruby/system/NodeID.hh"
+#include "mem/ruby/system/MachineID.hh"
+#include "mem/ruby/config/RubyConfig.hh"
+#include "mem/ruby/common/Set.hh"
+#include "mem/protocol/MachineType.hh"
class Set;
diff --git a/src/mem/ruby/common/OptBigSet.cc b/src/mem/ruby/common/OptBigSet.cc
index 51214e936..b4c4e4789 100644
--- a/src/mem/ruby/common/OptBigSet.cc
+++ b/src/mem/ruby/common/OptBigSet.cc
@@ -39,8 +39,8 @@
// modified (rewritten) 05/20/05 by Dan Gibson to accomimdate FASTER >32 bit
// set sizes
-#include "Set.hh"
-#include "RubyConfig.hh"
+#include "mem/ruby/common/Set.hh"
+#include "mem/ruby/config/RubyConfig.hh"
#if __amd64__ || __LP64__
#define __64BITS__
diff --git a/src/mem/ruby/common/OptBigSet.hh b/src/mem/ruby/common/OptBigSet.hh
index a57a07e13..45f06e6aa 100644
--- a/src/mem/ruby/common/OptBigSet.hh
+++ b/src/mem/ruby/common/OptBigSet.hh
@@ -45,10 +45,10 @@
#ifndef SET_H
#define SET_H
-#include "Global.hh"
-#include "Vector.hh"
-#include "NodeID.hh"
-#include "RubyConfig.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/gems_common/Vector.hh"
+#include "mem/ruby/system/NodeID.hh"
+#include "mem/ruby/config/RubyConfig.hh"
// gibson 05/20/05
// enum PresenceBit {NotPresent, Present};
diff --git a/src/mem/ruby/common/Set.cc b/src/mem/ruby/common/Set.cc
index 1f5b49f90..ce4b4af04 100644
--- a/src/mem/ruby/common/Set.cc
+++ b/src/mem/ruby/common/Set.cc
@@ -36,8 +36,8 @@
*
*/
-#include "Set.hh"
-#include "RubyConfig.hh"
+#include "mem/ruby/common/Set.hh"
+#include "mem/ruby/config/RubyConfig.hh"
#ifdef OPTBIGSET
#include "OptBigSet.cc"
diff --git a/src/mem/ruby/common/Set.hh b/src/mem/ruby/common/Set.hh
index 7c33c840d..ea16c66a5 100644
--- a/src/mem/ruby/common/Set.hh
+++ b/src/mem/ruby/common/Set.hh
@@ -44,20 +44,20 @@
#define OPTBIGSET
#ifdef OPTBIGSET
-#include "OptBigSet.hh"
+#include "mem/ruby/common/OptBigSet.hh"
#else
#ifdef BIGSET
-#include "BigSet.hh" // code to supports sets larger than 32
+#include "mem/ruby/common/BigSet.hh" // code to supports sets larger than 32
#else
#ifndef SET_H
#define SET_H
-#include "Global.hh"
-#include "Vector.hh"
-#include "NodeID.hh"
-#include "RubyConfig.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/gems_common/Vector.hh"
+#include "mem/ruby/system/NodeID.hh"
+#include "mem/ruby/config/RubyConfig.hh"
class Set {
public:
diff --git a/src/mem/ruby/common/SubBlock.cc b/src/mem/ruby/common/SubBlock.cc
index f79e33d9c..568d3106a 100644
--- a/src/mem/ruby/common/SubBlock.cc
+++ b/src/mem/ruby/common/SubBlock.cc
@@ -31,7 +31,7 @@
* $Id$
*/
-#include "SubBlock.hh"
+#include "mem/ruby/common/SubBlock.hh"
SubBlock::SubBlock(const Address& addr, int size)
{
diff --git a/src/mem/ruby/common/SubBlock.hh b/src/mem/ruby/common/SubBlock.hh
index 43f91e191..5831be35a 100644
--- a/src/mem/ruby/common/SubBlock.hh
+++ b/src/mem/ruby/common/SubBlock.hh
@@ -35,11 +35,11 @@
#ifndef SubBlock_H
#define SubBlock_H
-#include "Global.hh"
-#include "Address.hh"
-#include "RubyConfig.hh"
-#include "DataBlock.hh"
-#include "Vector.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/common/Address.hh"
+#include "mem/ruby/config/RubyConfig.hh"
+#include "mem/ruby/common/DataBlock.hh"
+#include "mem/gems_common/Vector.hh"
class SubBlock {
public:
diff --git a/src/mem/ruby/config/RubyConfig.cc b/src/mem/ruby/config/RubyConfig.cc
index 0e94efb46..2d129bc7a 100644
--- a/src/mem/ruby/config/RubyConfig.cc
+++ b/src/mem/ruby/config/RubyConfig.cc
@@ -36,10 +36,10 @@
*
*/
-#include "RubyConfig.hh"
-#include "protocol_name.hh"
-#include "util.hh"
-#include "Protocol.hh"
+#include "mem/ruby/config/RubyConfig.hh"
+#include "mem/protocol/protocol_name.hh"
+#include "mem/gems_common/util.hh"
+#include "mem/protocol/Protocol.hh"
#define CHECK_POWER_OF_2(N) { if (!is_power_of_2(N)) { ERROR_MSG(#N " must be a power of 2."); }}
#define CHECK_ZERO(N) { if (N != 0) { ERROR_MSG(#N " must be zero at initialization."); }}
@@ -163,7 +163,7 @@ static void print_parameters(ostream& out)
} \
-#include "config.hh"
+#include "mem/ruby/config/config.hh"
#undef PARAM
#undef PARAM_UINT
#undef PARAM_ULONG
diff --git a/src/mem/ruby/config/RubyConfig.hh b/src/mem/ruby/config/RubyConfig.hh
index bb12d6426..c0e8ae59e 100644
--- a/src/mem/ruby/config/RubyConfig.hh
+++ b/src/mem/ruby/config/RubyConfig.hh
@@ -40,9 +40,9 @@
#ifndef RUBYCONFIG_H
#define RUBYCONFIG_H
-#include "Global.hh"
-#include "vardecl.hh"
-#include "NodeID.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/gems_common/ioutil/vardecl.hh"
+#include "mem/ruby/system/NodeID.hh"
#define MEMORY_LATENCY RubyConfig::memoryResponseLatency()
#define ABORT_DELAY m_chip_ptr->getTransactionManager(m_version)->getAbortDelay()
diff --git a/src/mem/ruby/eventqueue/RubyEventQueue.cc b/src/mem/ruby/eventqueue/RubyEventQueue.cc
index b267eb1d3..1ac32ccf2 100644
--- a/src/mem/ruby/eventqueue/RubyEventQueue.cc
+++ b/src/mem/ruby/eventqueue/RubyEventQueue.cc
@@ -31,13 +31,13 @@
* $Id$
*/
-#include "RubyEventQueue.hh"
-#include "RubyConfig.hh"
-#include "Consumer.hh"
-#include "Profiler.hh"
-#include "System.hh"
-#include "PrioHeap.hh"
-#include "RubyEventQueueNode.hh"
+#include "mem/ruby/eventqueue/RubyEventQueue.hh"
+#include "mem/ruby/config/RubyConfig.hh"
+#include "mem/ruby/common/Consumer.hh"
+#include "mem/ruby/profiler/Profiler.hh"
+#include "mem/ruby/system/System.hh"
+#include "mem/gems_common/PrioHeap.hh"
+#include "mem/ruby/eventqueue/RubyEventQueueNode.hh"
// Class public method definitions
diff --git a/src/mem/ruby/eventqueue/RubyEventQueue.hh b/src/mem/ruby/eventqueue/RubyEventQueue.hh
index dc8161cf1..7b2006535 100644
--- a/src/mem/ruby/eventqueue/RubyEventQueue.hh
+++ b/src/mem/ruby/eventqueue/RubyEventQueue.hh
@@ -59,8 +59,8 @@
#ifndef RUBYEVENTQUEUE_H
#define RUBYEVENTQUEUE_H
-#include "Global.hh"
-#include "Vector.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/gems_common/Vector.hh"
class Consumer;
template <class TYPE> class PrioHeap;
diff --git a/src/mem/ruby/eventqueue/RubyEventQueueNode.cc b/src/mem/ruby/eventqueue/RubyEventQueueNode.cc
index 086465558..2783f5ede 100644
--- a/src/mem/ruby/eventqueue/RubyEventQueueNode.cc
+++ b/src/mem/ruby/eventqueue/RubyEventQueueNode.cc
@@ -32,7 +32,7 @@
*
*/
-#include "RubyEventQueueNode.hh"
+#include "mem/ruby/eventqueue/RubyEventQueueNode.hh"
void RubyEventQueueNode::print(ostream& out) const
{
diff --git a/src/mem/ruby/eventqueue/RubyEventQueueNode.hh b/src/mem/ruby/eventqueue/RubyEventQueueNode.hh
index 2ed5a1d9a..fa66ab9a6 100644
--- a/src/mem/ruby/eventqueue/RubyEventQueueNode.hh
+++ b/src/mem/ruby/eventqueue/RubyEventQueueNode.hh
@@ -35,7 +35,7 @@
#ifndef RUBYEVENTQUEUENODE_H
#define RUBYEVENTQUEUENODE_H
-#include "Global.hh"
+#include "mem/ruby/common/Global.hh"
class Consumer;
class RubyEventQueueNode {
diff --git a/src/mem/ruby/init.cc b/src/mem/ruby/init.cc
index a2e874df8..22a048b5b 100644
--- a/src/mem/ruby/init.cc
+++ b/src/mem/ruby/init.cc
@@ -36,25 +36,25 @@
*
*/
-#include "Global.hh"
-#include "RubyEventQueue.hh"
-#include "System.hh"
-#include "Debug.hh"
-#include "Profiler.hh"
-#include "Tester.hh"
-#include "init.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/eventqueue/RubyEventQueue.hh"
+#include "mem/ruby/system/System.hh"
+#include "mem/ruby/common/Debug.hh"
+#include "mem/ruby/profiler/Profiler.hh"
+#include "mem/ruby/tester/Tester.hh"
+#include "mem/ruby/init.hh"
using namespace std;
#include <string>
#include <map>
#include <stdlib.h>
-#include "confio.hh"
-#include "initvar.hh"
+#include "mem/gems_common/ioutil/confio.hh"
+#include "mem/gems_common/ioutil/initvar.hh"
// A generated file containing the default parameters in string form
// The defaults are stored in the variable global_default_param
-#include "default_param.hh"
+#include "mem/protocol/default_param.hh"
static initvar_t *ruby_initvar_obj = NULL;
diff --git a/src/mem/ruby/network/Network.hh b/src/mem/ruby/network/Network.hh
index 662e54e93..f97ecce29 100644
--- a/src/mem/ruby/network/Network.hh
+++ b/src/mem/ruby/network/Network.hh
@@ -46,9 +46,9 @@
#ifndef NETWORK_H
#define NETWORK_H
-#include "Global.hh"
-#include "NodeID.hh"
-#include "MessageSizeType.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/system/NodeID.hh"
+#include "mem/protocol/MessageSizeType.hh"
class NetDest;
class MessageBuffer;
diff --git a/src/mem/ruby/network/garnet-fixed-pipeline/CreditLink_d.hh b/src/mem/ruby/network/garnet-fixed-pipeline/CreditLink_d.hh
index e3a9b7d2d..28da0ac73 100644
--- a/src/mem/ruby/network/garnet-fixed-pipeline/CreditLink_d.hh
+++ b/src/mem/ruby/network/garnet-fixed-pipeline/CreditLink_d.hh
@@ -7,7 +7,7 @@
#ifndef CREDIT_LINK_D_H
#define CREDIT_LINK_D_H
-#include "NetworkLink_d.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/NetworkLink_d.hh"
class CreditLink_d : public NetworkLink_d {
public:
diff --git a/src/mem/ruby/network/garnet-fixed-pipeline/GarnetNetwork_d.cc b/src/mem/ruby/network/garnet-fixed-pipeline/GarnetNetwork_d.cc
index 43f9a31bd..28d22c89d 100644
--- a/src/mem/ruby/network/garnet-fixed-pipeline/GarnetNetwork_d.cc
+++ b/src/mem/ruby/network/garnet-fixed-pipeline/GarnetNetwork_d.cc
@@ -33,15 +33,15 @@
*
* */
-#include "GarnetNetwork_d.hh"
-#include "MachineType.hh"
-#include "NetworkInterface_d.hh"
-#include "MessageBuffer.hh"
-#include "Router_d.hh"
-#include "Topology.hh"
-#include "NetworkLink_d.hh"
-#include "CreditLink_d.hh"
-#include "NetDest.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/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"
GarnetNetwork_d::GarnetNetwork_d(int nodes)
{
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 34486eab8..f1dd5d2c7 100644
--- a/src/mem/ruby/network/garnet-fixed-pipeline/GarnetNetwork_d.hh
+++ b/src/mem/ruby/network/garnet-fixed-pipeline/GarnetNetwork_d.hh
@@ -36,10 +36,10 @@
#ifndef GARNETNETWORK_D_H
#define GARNETNETWORK_D_H
-#include "NetworkHeader.hh"
-#include "Vector.hh"
-#include "NetworkConfig.hh"
-#include "Network.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/NetworkHeader.hh"
+#include "mem/gems_common/Vector.hh"
+#include "mem/ruby/network/garnet-flexible-pipeline/NetworkConfig.hh"
+#include "mem/ruby/network/Network.hh"
class NetworkInterface_d;
class MessageBuffer;
diff --git a/src/mem/ruby/network/garnet-fixed-pipeline/InputUnit_d.cc b/src/mem/ruby/network/garnet-fixed-pipeline/InputUnit_d.cc
index bedd801d5..0ae32de13 100644
--- a/src/mem/ruby/network/garnet-fixed-pipeline/InputUnit_d.cc
+++ b/src/mem/ruby/network/garnet-fixed-pipeline/InputUnit_d.cc
@@ -33,8 +33,8 @@
*
* */
-#include "InputUnit_d.hh"
-#include "Router_d.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/InputUnit_d.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/Router_d.hh"
InputUnit_d::InputUnit_d(int id, Router_d *router)
{
diff --git a/src/mem/ruby/network/garnet-fixed-pipeline/InputUnit_d.hh b/src/mem/ruby/network/garnet-fixed-pipeline/InputUnit_d.hh
index c22363fb1..fafa29135 100644
--- a/src/mem/ruby/network/garnet-fixed-pipeline/InputUnit_d.hh
+++ b/src/mem/ruby/network/garnet-fixed-pipeline/InputUnit_d.hh
@@ -36,13 +36,13 @@
#ifndef INPUT_UNIT_D_H
#define INPUT_UNIT_D_H
-#include "NetworkHeader.hh"
-#include "flitBuffer_d.hh"
-#include "Consumer.hh"
-#include "Vector.hh"
-#include "VirtualChannel_d.hh"
-#include "NetworkLink_d.hh"
-#include "CreditLink_d.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/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"
class Router_d;
diff --git a/src/mem/ruby/network/garnet-fixed-pipeline/NetworkHeader.hh b/src/mem/ruby/network/garnet-fixed-pipeline/NetworkHeader.hh
index 6a212ce99..4cc73a3d4 100644
--- a/src/mem/ruby/network/garnet-fixed-pipeline/NetworkHeader.hh
+++ b/src/mem/ruby/network/garnet-fixed-pipeline/NetworkHeader.hh
@@ -36,8 +36,8 @@
#ifndef NETWORK_HEADER_H
#define NETWORK_HEADER_H
-#include "Global.hh"
-#include "NodeID.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/system/NodeID.hh"
using namespace std;
using namespace __gnu_cxx;
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 edf2d4b95..e36504356 100644
--- a/src/mem/ruby/network/garnet-fixed-pipeline/NetworkInterface_d.cc
+++ b/src/mem/ruby/network/garnet-fixed-pipeline/NetworkInterface_d.cc
@@ -33,10 +33,10 @@
*
* */
-#include "NetworkInterface_d.hh"
-#include "MessageBuffer.hh"
-#include "flitBuffer_d.hh"
-#include "NetworkMessage.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/slicc_interface/NetworkMessage.hh"
NetworkInterface_d::NetworkInterface_d(int id, int virtual_networks, GarnetNetwork_d *network_ptr)
{
diff --git a/src/mem/ruby/network/garnet-fixed-pipeline/NetworkInterface_d.hh b/src/mem/ruby/network/garnet-fixed-pipeline/NetworkInterface_d.hh
index c776d343c..00aaff8d3 100644
--- a/src/mem/ruby/network/garnet-fixed-pipeline/NetworkInterface_d.hh
+++ b/src/mem/ruby/network/garnet-fixed-pipeline/NetworkInterface_d.hh
@@ -36,14 +36,14 @@
#ifndef NET_INTERFACE_D_H
#define NET_INTERFACE_D_H
-#include "NetworkHeader.hh"
-#include "GarnetNetwork_d.hh"
-#include "Vector.hh"
-#include "Consumer.hh"
-#include "Message.hh"
-#include "NetworkLink_d.hh"
-#include "CreditLink_d.hh"
-#include "OutVcState_d.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/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"
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 26794ebf2..931f0f3a7 100644
--- a/src/mem/ruby/network/garnet-fixed-pipeline/NetworkLink_d.cc
+++ b/src/mem/ruby/network/garnet-fixed-pipeline/NetworkLink_d.cc
@@ -33,9 +33,9 @@
*
* */
-#include "NetworkLink_d.hh"
-#include "NetworkConfig.hh"
-#include "GarnetNetwork_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"
NetworkLink_d::NetworkLink_d(int id)
{
diff --git a/src/mem/ruby/network/garnet-fixed-pipeline/NetworkLink_d.hh b/src/mem/ruby/network/garnet-fixed-pipeline/NetworkLink_d.hh
index 40695331e..28b613faa 100644
--- a/src/mem/ruby/network/garnet-fixed-pipeline/NetworkLink_d.hh
+++ b/src/mem/ruby/network/garnet-fixed-pipeline/NetworkLink_d.hh
@@ -36,11 +36,11 @@
#ifndef NETWORK_LINK_D_H
#define NETWORK_LINK_D_H
-#include "NetworkHeader.hh"
-#include "Consumer.hh"
-#include "flitBuffer_d.hh"
-#include "PrioHeap.hh"
-#include "power_bus.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/NetworkHeader.hh"
+#include "mem/ruby/common/Consumer.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"
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 c85abfd3a..4fd040099 100644
--- a/src/mem/ruby/network/garnet-fixed-pipeline/OutVcState_d.cc
+++ b/src/mem/ruby/network/garnet-fixed-pipeline/OutVcState_d.cc
@@ -33,9 +33,9 @@
*
* */
-#include "OutVcState_d.hh"
-#include "NetworkConfig.hh"
-#include "RubyEventQueue.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"
OutVcState_d::OutVcState_d(int id)
{
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 8c07ec796..0bb3d8ced 100644
--- a/src/mem/ruby/network/garnet-fixed-pipeline/OutVcState_d.hh
+++ b/src/mem/ruby/network/garnet-fixed-pipeline/OutVcState_d.hh
@@ -36,7 +36,7 @@
#ifndef OUT_VC_STATE_D_H
#define OUT_VC_STATE_D_H
-#include "NetworkHeader.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/NetworkHeader.hh"
class OutVcState_d {
public:
diff --git a/src/mem/ruby/network/garnet-fixed-pipeline/OutputUnit_d.cc b/src/mem/ruby/network/garnet-fixed-pipeline/OutputUnit_d.cc
index 43096c314..1b8b8097b 100644
--- a/src/mem/ruby/network/garnet-fixed-pipeline/OutputUnit_d.cc
+++ b/src/mem/ruby/network/garnet-fixed-pipeline/OutputUnit_d.cc
@@ -33,9 +33,9 @@
*
* */
-#include "OutputUnit_d.hh"
-#include "Router_d.hh"
-#include "NetworkConfig.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/OutputUnit_d.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/Router_d.hh"
+#include "mem/ruby/network/garnet-flexible-pipeline/NetworkConfig.hh"
OutputUnit_d::OutputUnit_d(int id, Router_d *router)
{
diff --git a/src/mem/ruby/network/garnet-fixed-pipeline/OutputUnit_d.hh b/src/mem/ruby/network/garnet-fixed-pipeline/OutputUnit_d.hh
index f23c06559..62de62a4f 100644
--- a/src/mem/ruby/network/garnet-fixed-pipeline/OutputUnit_d.hh
+++ b/src/mem/ruby/network/garnet-fixed-pipeline/OutputUnit_d.hh
@@ -36,12 +36,12 @@
#ifndef OUTPUT_UNIT_D_H
#define OUTPUT_UNIT_D_H
-#include "NetworkHeader.hh"
-#include "Consumer.hh"
-#include "flitBuffer_d.hh"
-#include "OutVcState_d.hh"
-#include "NetworkLink_d.hh"
-#include "CreditLink_d.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/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"
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 4f61487c7..60c9d36a9 100644
--- a/src/mem/ruby/network/garnet-fixed-pipeline/Router_d.cc
+++ b/src/mem/ruby/network/garnet-fixed-pipeline/Router_d.cc
@@ -33,16 +33,16 @@
*
* */
-#include "Router_d.hh"
-#include "GarnetNetwork_d.hh"
-#include "NetworkLink_d.hh"
-#include "CreditLink_d.hh"
-#include "InputUnit_d.hh"
-#include "OutputUnit_d.hh"
-#include "RoutingUnit_d.hh"
-#include "VCallocator_d.hh"
-#include "SWallocator_d.hh"
-#include "Switch_d.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/Router_d.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/GarnetNetwork_d.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/NetworkLink_d.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/CreditLink_d.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/InputUnit_d.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/OutputUnit_d.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/RoutingUnit_d.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/VCallocator_d.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/SWallocator_d.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/Switch_d.hh"
Router_d::Router_d(int id, GarnetNetwork_d *network_ptr)
{
diff --git a/src/mem/ruby/network/garnet-fixed-pipeline/Router_d.hh b/src/mem/ruby/network/garnet-fixed-pipeline/Router_d.hh
index 215055ea6..87b3f38e2 100644
--- a/src/mem/ruby/network/garnet-fixed-pipeline/Router_d.hh
+++ b/src/mem/ruby/network/garnet-fixed-pipeline/Router_d.hh
@@ -35,11 +35,11 @@
#ifndef ROUTER_D_H
#define ROUTER_D_H
-#include "NetworkHeader.hh"
-#include "Vector.hh"
-#include "flit_d.hh"
-#include "NetDest.hh"
-#include "power_router_init.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/NetworkHeader.hh"
+#include "mem/gems_common/Vector.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"
class GarnetNetwork_d;
class NetworkLink_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 ccced1d05..488741055 100644
--- a/src/mem/ruby/network/garnet-fixed-pipeline/RoutingUnit_d.cc
+++ b/src/mem/ruby/network/garnet-fixed-pipeline/RoutingUnit_d.cc
@@ -33,10 +33,10 @@
*
* */
-#include "RoutingUnit_d.hh"
-#include "Router_d.hh"
-#include "InputUnit_d.hh"
-#include "NetworkMessage.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/RoutingUnit_d.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/Router_d.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/InputUnit_d.hh"
+#include "mem/ruby/slicc_interface/NetworkMessage.hh"
RoutingUnit_d::RoutingUnit_d(Router_d *router)
{
diff --git a/src/mem/ruby/network/garnet-fixed-pipeline/RoutingUnit_d.hh b/src/mem/ruby/network/garnet-fixed-pipeline/RoutingUnit_d.hh
index f6eb9f906..093fd7abe 100644
--- a/src/mem/ruby/network/garnet-fixed-pipeline/RoutingUnit_d.hh
+++ b/src/mem/ruby/network/garnet-fixed-pipeline/RoutingUnit_d.hh
@@ -36,10 +36,10 @@
#ifndef ROUTING_UNIT_D_H
#define ROUTING_UNIT_D_H
-#include "NetworkHeader.hh"
-#include "Consumer.hh"
-#include "flit_d.hh"
-#include "NetDest.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/NetworkHeader.hh"
+#include "mem/ruby/common/Consumer.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/flit_d.hh"
+#include "mem/ruby/common/NetDest.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 7f6507047..02dee31a4 100644
--- a/src/mem/ruby/network/garnet-fixed-pipeline/SWallocator_d.cc
+++ b/src/mem/ruby/network/garnet-fixed-pipeline/SWallocator_d.cc
@@ -33,11 +33,11 @@
*
* */
-#include "SWallocator_d.hh"
-#include "Router_d.hh"
-#include "InputUnit_d.hh"
-#include "OutputUnit_d.hh"
-#include "GarnetNetwork_d.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/SWallocator_d.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/Router_d.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/InputUnit_d.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/OutputUnit_d.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/GarnetNetwork_d.hh"
SWallocator_d::SWallocator_d(Router_d *router)
{
diff --git a/src/mem/ruby/network/garnet-fixed-pipeline/SWallocator_d.hh b/src/mem/ruby/network/garnet-fixed-pipeline/SWallocator_d.hh
index ed8389650..16485c539 100644
--- a/src/mem/ruby/network/garnet-fixed-pipeline/SWallocator_d.hh
+++ b/src/mem/ruby/network/garnet-fixed-pipeline/SWallocator_d.hh
@@ -36,8 +36,8 @@
#ifndef SW_ALLOCATOR_D_H
#define SW_ALLOCATOR_D_H
-#include "NetworkHeader.hh"
-#include "Consumer.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/NetworkHeader.hh"
+#include "mem/ruby/common/Consumer.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 be5469696..e1ca64864 100644
--- a/src/mem/ruby/network/garnet-fixed-pipeline/Switch_d.cc
+++ b/src/mem/ruby/network/garnet-fixed-pipeline/Switch_d.cc
@@ -33,9 +33,9 @@
*
* */
-#include "Switch_d.hh"
-#include "Router_d.hh"
-#include "OutputUnit_d.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/Switch_d.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/Router_d.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/OutputUnit_d.hh"
Switch_d::Switch_d(Router_d *router)
{
diff --git a/src/mem/ruby/network/garnet-fixed-pipeline/Switch_d.hh b/src/mem/ruby/network/garnet-fixed-pipeline/Switch_d.hh
index 63f3995f5..0b45172b5 100644
--- a/src/mem/ruby/network/garnet-fixed-pipeline/Switch_d.hh
+++ b/src/mem/ruby/network/garnet-fixed-pipeline/Switch_d.hh
@@ -36,9 +36,9 @@
#ifndef SWITCH_D_H
#define SWITCH_D_H
-#include "NetworkHeader.hh"
-#include "Consumer.hh"
-#include "flitBuffer_d.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/NetworkHeader.hh"
+#include "mem/ruby/common/Consumer.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/flitBuffer_d.hh"
class Router_d;
class OutputUnit_d;
diff --git a/src/mem/ruby/network/garnet-fixed-pipeline/VCallocator_d.cc b/src/mem/ruby/network/garnet-fixed-pipeline/VCallocator_d.cc
index b444ebc02..dc6d170e5 100644
--- a/src/mem/ruby/network/garnet-fixed-pipeline/VCallocator_d.cc
+++ b/src/mem/ruby/network/garnet-fixed-pipeline/VCallocator_d.cc
@@ -33,12 +33,12 @@
*
* */
-#include "NetworkConfig.hh"
-#include "VCallocator_d.hh"
-#include "Router_d.hh"
-#include "InputUnit_d.hh"
-#include "OutputUnit_d.hh"
-#include "GarnetNetwork_d.hh"
+#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"
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 fc1bf1340..8b40d602d 100644
--- a/src/mem/ruby/network/garnet-fixed-pipeline/VCallocator_d.hh
+++ b/src/mem/ruby/network/garnet-fixed-pipeline/VCallocator_d.hh
@@ -36,8 +36,8 @@
#ifndef VC_ALLOCATOR_D_H
#define VC_ALLOCATOR_D_H
-#include "NetworkHeader.hh"
-#include "Consumer.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/NetworkHeader.hh"
+#include "mem/ruby/common/Consumer.hh"
class Router_d;
class InputUnit_d;
diff --git a/src/mem/ruby/network/garnet-fixed-pipeline/VirtualChannel_d.cc b/src/mem/ruby/network/garnet-fixed-pipeline/VirtualChannel_d.cc
index 60c6bef2a..2e4473a29 100644
--- a/src/mem/ruby/network/garnet-fixed-pipeline/VirtualChannel_d.cc
+++ b/src/mem/ruby/network/garnet-fixed-pipeline/VirtualChannel_d.cc
@@ -33,7 +33,7 @@
*
* */
-#include "VirtualChannel_d.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/VirtualChannel_d.hh"
VirtualChannel_d::VirtualChannel_d(int id)
{
diff --git a/src/mem/ruby/network/garnet-fixed-pipeline/VirtualChannel_d.hh b/src/mem/ruby/network/garnet-fixed-pipeline/VirtualChannel_d.hh
index 111837122..8c32482ea 100644
--- a/src/mem/ruby/network/garnet-fixed-pipeline/VirtualChannel_d.hh
+++ b/src/mem/ruby/network/garnet-fixed-pipeline/VirtualChannel_d.hh
@@ -36,8 +36,8 @@
#ifndef VIRTUAL_CHANNEL_D_H
#define VIRTUAL_CHANNEL_D_H
-#include "NetworkHeader.hh"
-#include "flitBuffer_d.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/NetworkHeader.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/flitBuffer_d.hh"
class VirtualChannel_d {
public:
diff --git a/src/mem/ruby/network/garnet-fixed-pipeline/flitBuffer_d.cc b/src/mem/ruby/network/garnet-fixed-pipeline/flitBuffer_d.cc
index e5e7226a2..f3ddca0f2 100644
--- a/src/mem/ruby/network/garnet-fixed-pipeline/flitBuffer_d.cc
+++ b/src/mem/ruby/network/garnet-fixed-pipeline/flitBuffer_d.cc
@@ -33,7 +33,7 @@
*
* */
-#include "flitBuffer_d.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/flitBuffer_d.hh"
flitBuffer_d::flitBuffer_d()
{
diff --git a/src/mem/ruby/network/garnet-fixed-pipeline/flitBuffer_d.hh b/src/mem/ruby/network/garnet-fixed-pipeline/flitBuffer_d.hh
index 7e7d07a5a..5ac69b22e 100644
--- a/src/mem/ruby/network/garnet-fixed-pipeline/flitBuffer_d.hh
+++ b/src/mem/ruby/network/garnet-fixed-pipeline/flitBuffer_d.hh
@@ -36,9 +36,9 @@
#ifndef FLIT_BUFFER_D_H
#define FLIT_BUFFER_D_H
-#include "NetworkHeader.hh"
-#include "PrioHeap.hh"
-#include "flit_d.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/NetworkHeader.hh"
+#include "mem/gems_common/PrioHeap.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/flit_d.hh"
class flitBuffer_d {
public:
diff --git a/src/mem/ruby/network/garnet-fixed-pipeline/flit_d.cc b/src/mem/ruby/network/garnet-fixed-pipeline/flit_d.cc
index e049c5537..3defb8029 100644
--- a/src/mem/ruby/network/garnet-fixed-pipeline/flit_d.cc
+++ b/src/mem/ruby/network/garnet-fixed-pipeline/flit_d.cc
@@ -33,7 +33,7 @@
*
* */
-#include "flit_d.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/flit_d.hh"
flit_d::flit_d(int id, int vc, int vnet, int size, MsgPtr msg_ptr)
{
diff --git a/src/mem/ruby/network/garnet-fixed-pipeline/flit_d.hh b/src/mem/ruby/network/garnet-fixed-pipeline/flit_d.hh
index 9a47e964f..4d69984d2 100644
--- a/src/mem/ruby/network/garnet-fixed-pipeline/flit_d.hh
+++ b/src/mem/ruby/network/garnet-fixed-pipeline/flit_d.hh
@@ -37,8 +37,8 @@
#ifndef FLIT_D_H
#define FLIT_D_H
-#include "NetworkHeader.hh"
-#include "Message.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/NetworkHeader.hh"
+#include "mem/ruby/slicc_interface/Message.hh"
class flit_d {
public:
diff --git a/src/mem/ruby/network/garnet-flexible-pipeline/FlexibleConsumer.hh b/src/mem/ruby/network/garnet-flexible-pipeline/FlexibleConsumer.hh
index 773d00323..e66858356 100644
--- a/src/mem/ruby/network/garnet-flexible-pipeline/FlexibleConsumer.hh
+++ b/src/mem/ruby/network/garnet-flexible-pipeline/FlexibleConsumer.hh
@@ -35,9 +35,9 @@
#ifndef FLEXIBLE_CONSUMER_H
#define FLEXIBLE_CONSUMER_H
-#include "Consumer.hh"
-#include "NetworkHeader.hh"
-#include "NetDest.hh"
+#include "mem/ruby/common/Consumer.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/NetworkHeader.hh"
+#include "mem/ruby/common/NetDest.hh"
class FlexibleConsumer : public Consumer {
public:
diff --git a/src/mem/ruby/network/garnet-flexible-pipeline/GarnetNetwork.cc b/src/mem/ruby/network/garnet-flexible-pipeline/GarnetNetwork.cc
index 3d7c555b5..a2482c330 100644
--- a/src/mem/ruby/network/garnet-flexible-pipeline/GarnetNetwork.cc
+++ b/src/mem/ruby/network/garnet-flexible-pipeline/GarnetNetwork.cc
@@ -33,16 +33,16 @@
*
* */
-#include "GarnetNetwork.hh"
-#include "MachineType.hh"
-#include "NetworkInterface.hh"
-#include "MessageBuffer.hh"
-#include "Router.hh"
-#include "Topology.hh"
-#include "SimpleNetwork.hh"
-#include "GarnetNetwork_d.hh"
-#include "NetworkLink.hh"
-#include "NetDest.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/network/garnet-fixed-pipeline/GarnetNetwork_d.hh"
+#include "mem/ruby/network/garnet-flexible-pipeline/NetworkLink.hh"
+#include "mem/ruby/common/NetDest.hh"
// calls new to abstract away from the network
Network* Network::createNetwork(int nodes)
diff --git a/src/mem/ruby/network/garnet-flexible-pipeline/GarnetNetwork.hh b/src/mem/ruby/network/garnet-flexible-pipeline/GarnetNetwork.hh
index cb9a8908a..52cdaa5d6 100644
--- a/src/mem/ruby/network/garnet-flexible-pipeline/GarnetNetwork.hh
+++ b/src/mem/ruby/network/garnet-flexible-pipeline/GarnetNetwork.hh
@@ -36,10 +36,10 @@
#ifndef GARNET_NETWORK_H
#define GARNET_NETWORK_H
-#include "NetworkHeader.hh"
-#include "Vector.hh"
-#include "NetworkConfig.hh"
-#include "Network.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/NetworkHeader.hh"
+#include "mem/gems_common/Vector.hh"
+#include "mem/ruby/network/garnet-flexible-pipeline/NetworkConfig.hh"
+#include "mem/ruby/network/Network.hh"
class NetworkInterface;
class MessageBuffer;
diff --git a/src/mem/ruby/network/garnet-flexible-pipeline/InVcState.cc b/src/mem/ruby/network/garnet-flexible-pipeline/InVcState.cc
index 52090cb2b..cecaf867e 100644
--- a/src/mem/ruby/network/garnet-flexible-pipeline/InVcState.cc
+++ b/src/mem/ruby/network/garnet-flexible-pipeline/InVcState.cc
@@ -33,7 +33,7 @@
*
* */
-#include "InVcState.hh"
+#include "mem/ruby/network/garnet-flexible-pipeline/InVcState.hh"
InVcState::InVcState(int id)
{
diff --git a/src/mem/ruby/network/garnet-flexible-pipeline/InVcState.hh b/src/mem/ruby/network/garnet-flexible-pipeline/InVcState.hh
index efbd0d513..af48674e9 100644
--- a/src/mem/ruby/network/garnet-flexible-pipeline/InVcState.hh
+++ b/src/mem/ruby/network/garnet-flexible-pipeline/InVcState.hh
@@ -37,7 +37,7 @@
#ifndef IN_VC_STATE_H
#define IN_VC_STATE_H
-#include "NetworkHeader.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/NetworkHeader.hh"
class InVcState {
public:
diff --git a/src/mem/ruby/network/garnet-flexible-pipeline/NetworkConfig.hh b/src/mem/ruby/network/garnet-flexible-pipeline/NetworkConfig.hh
index b35dfba67..433e2f686 100644
--- a/src/mem/ruby/network/garnet-flexible-pipeline/NetworkConfig.hh
+++ b/src/mem/ruby/network/garnet-flexible-pipeline/NetworkConfig.hh
@@ -38,9 +38,9 @@
#ifndef NETWORKCONFIG_H
#define NETWORKCONFIG_H
-#include "NetworkHeader.hh"
-#include "util.hh"
-#include "RubyConfig.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/NetworkHeader.hh"
+#include "mem/gems_common/util.hh"
+#include "mem/ruby/config/RubyConfig.hh"
class NetworkConfig {
public:
diff --git a/src/mem/ruby/network/garnet-flexible-pipeline/NetworkInterface.cc b/src/mem/ruby/network/garnet-flexible-pipeline/NetworkInterface.cc
index 3dfb5b4b9..b7bd2393c 100644
--- a/src/mem/ruby/network/garnet-flexible-pipeline/NetworkInterface.cc
+++ b/src/mem/ruby/network/garnet-flexible-pipeline/NetworkInterface.cc
@@ -33,10 +33,10 @@
*
* */
-#include "NetworkInterface.hh"
-#include "MessageBuffer.hh"
-#include "flitBuffer.hh"
-#include "NetworkMessage.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/slicc_interface/NetworkMessage.hh"
NetworkInterface::NetworkInterface(int id, int virtual_networks, GarnetNetwork *network_ptr)
{
diff --git a/src/mem/ruby/network/garnet-flexible-pipeline/NetworkInterface.hh b/src/mem/ruby/network/garnet-flexible-pipeline/NetworkInterface.hh
index d7932432b..3b98226c8 100644
--- a/src/mem/ruby/network/garnet-flexible-pipeline/NetworkInterface.hh
+++ b/src/mem/ruby/network/garnet-flexible-pipeline/NetworkInterface.hh
@@ -35,13 +35,13 @@
#ifndef NET_INTERFACE_H
#define NET_INTERFACE_H
-#include "NetworkHeader.hh"
-#include "GarnetNetwork.hh"
-#include "Vector.hh"
-#include "FlexibleConsumer.hh"
-#include "Message.hh"
-#include "NetworkLink.hh"
-#include "OutVcState.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/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/slicc_interface/Message.hh"
+#include "mem/ruby/network/garnet-flexible-pipeline/NetworkLink.hh"
+#include "mem/ruby/network/garnet-flexible-pipeline/OutVcState.hh"
class NetworkMessage;
class MessageBuffer;
diff --git a/src/mem/ruby/network/garnet-flexible-pipeline/NetworkLink.cc b/src/mem/ruby/network/garnet-flexible-pipeline/NetworkLink.cc
index e586ece9e..a170047ac 100644
--- a/src/mem/ruby/network/garnet-flexible-pipeline/NetworkLink.cc
+++ b/src/mem/ruby/network/garnet-flexible-pipeline/NetworkLink.cc
@@ -33,9 +33,9 @@
*
* */
-#include "NetworkLink.hh"
-#include "NetworkConfig.hh"
-#include "GarnetNetwork.hh"
+#include "mem/ruby/network/garnet-flexible-pipeline/NetworkLink.hh"
+#include "mem/ruby/network/garnet-flexible-pipeline/NetworkConfig.hh"
+#include "mem/ruby/network/garnet-flexible-pipeline/GarnetNetwork.hh"
NetworkLink::NetworkLink(int id, int latency, GarnetNetwork *net_ptr)
{
diff --git a/src/mem/ruby/network/garnet-flexible-pipeline/NetworkLink.hh b/src/mem/ruby/network/garnet-flexible-pipeline/NetworkLink.hh
index cdea89d79..a8278ae4c 100644
--- a/src/mem/ruby/network/garnet-flexible-pipeline/NetworkLink.hh
+++ b/src/mem/ruby/network/garnet-flexible-pipeline/NetworkLink.hh
@@ -35,11 +35,11 @@
#ifndef NETWORK_LINK_H
#define NETWORK_LINK_H
-#include "NetworkHeader.hh"
-#include "FlexibleConsumer.hh"
-#include "flitBuffer.hh"
-#include "PrioHeap.hh"
-#include "NetDest.hh"
+#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/gems_common/PrioHeap.hh"
+#include "mem/ruby/common/NetDest.hh"
class GarnetNetwork;
diff --git a/src/mem/ruby/network/garnet-flexible-pipeline/OutVcState.cc b/src/mem/ruby/network/garnet-flexible-pipeline/OutVcState.cc
index 5d43a7821..9a95971eb 100644
--- a/src/mem/ruby/network/garnet-flexible-pipeline/OutVcState.cc
+++ b/src/mem/ruby/network/garnet-flexible-pipeline/OutVcState.cc
@@ -33,7 +33,7 @@
*
* */
-#include "OutVcState.hh"
+#include "mem/ruby/network/garnet-flexible-pipeline/OutVcState.hh"
OutVcState::OutVcState(int id)
{
diff --git a/src/mem/ruby/network/garnet-flexible-pipeline/OutVcState.hh b/src/mem/ruby/network/garnet-flexible-pipeline/OutVcState.hh
index 81120ee8c..074d97d2e 100644
--- a/src/mem/ruby/network/garnet-flexible-pipeline/OutVcState.hh
+++ b/src/mem/ruby/network/garnet-flexible-pipeline/OutVcState.hh
@@ -36,7 +36,7 @@
#ifndef OUT_VC_STATE_H
#define OUT_VC_STATE_H
-#include "NetworkHeader.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/NetworkHeader.hh"
class OutVcState {
public:
diff --git a/src/mem/ruby/network/garnet-flexible-pipeline/Router.cc b/src/mem/ruby/network/garnet-flexible-pipeline/Router.cc
index 4809d43ed..2ee8fc5aa 100644
--- a/src/mem/ruby/network/garnet-flexible-pipeline/Router.cc
+++ b/src/mem/ruby/network/garnet-flexible-pipeline/Router.cc
@@ -33,11 +33,11 @@
*
* */
-#include "Router.hh"
-#include "NetworkMessage.hh"
-#include "InVcState.hh"
-#include "OutVcState.hh"
-#include "VCarbiter.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"
Router::Router(int id, GarnetNetwork *network_ptr)
{
diff --git a/src/mem/ruby/network/garnet-flexible-pipeline/Router.hh b/src/mem/ruby/network/garnet-flexible-pipeline/Router.hh
index c0d91e0dd..ce7dd4a8f 100644
--- a/src/mem/ruby/network/garnet-flexible-pipeline/Router.hh
+++ b/src/mem/ruby/network/garnet-flexible-pipeline/Router.hh
@@ -36,15 +36,15 @@
#ifndef ROUTER_H
#define ROUTER_H
-#include "NetworkHeader.hh"
-#include "GarnetNetwork.hh"
-#include "FlexibleConsumer.hh"
-#include "PrioHeap.hh"
-#include "NetworkLink.hh"
-#include "NetDest.hh"
-#include "flitBuffer.hh"
-#include "InVcState.hh"
-#include "OutVcState.hh"
+#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/gems_common/PrioHeap.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"
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 7ebd83de3..271d6dd38 100644
--- a/src/mem/ruby/network/garnet-flexible-pipeline/VCarbiter.cc
+++ b/src/mem/ruby/network/garnet-flexible-pipeline/VCarbiter.cc
@@ -33,8 +33,8 @@
*
* */
-#include "VCarbiter.hh"
-#include "Router.hh"
+#include "mem/ruby/network/garnet-flexible-pipeline/VCarbiter.hh"
+#include "mem/ruby/network/garnet-flexible-pipeline/Router.hh"
VCarbiter::VCarbiter(Router *router)
{
diff --git a/src/mem/ruby/network/garnet-flexible-pipeline/VCarbiter.hh b/src/mem/ruby/network/garnet-flexible-pipeline/VCarbiter.hh
index 10368f2b4..6dcb80873 100644
--- a/src/mem/ruby/network/garnet-flexible-pipeline/VCarbiter.hh
+++ b/src/mem/ruby/network/garnet-flexible-pipeline/VCarbiter.hh
@@ -36,8 +36,8 @@
#ifndef VC_ARBITER_H
#define VC_ARBITER_H
-#include "NetworkHeader.hh"
-#include "Consumer.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/NetworkHeader.hh"
+#include "mem/ruby/common/Consumer.hh"
class Router;
diff --git a/src/mem/ruby/network/garnet-flexible-pipeline/flit.cc b/src/mem/ruby/network/garnet-flexible-pipeline/flit.cc
index f3cba2035..51b8af6c6 100644
--- a/src/mem/ruby/network/garnet-flexible-pipeline/flit.cc
+++ b/src/mem/ruby/network/garnet-flexible-pipeline/flit.cc
@@ -33,7 +33,7 @@
*
* */
-#include "flit.hh"
+#include "mem/ruby/network/garnet-flexible-pipeline/flit.hh"
flit::flit(int id, int vc, int vnet, int size, MsgPtr msg_ptr)
{
diff --git a/src/mem/ruby/network/garnet-flexible-pipeline/flit.hh b/src/mem/ruby/network/garnet-flexible-pipeline/flit.hh
index fc8042cfc..b9ee9a807 100644
--- a/src/mem/ruby/network/garnet-flexible-pipeline/flit.hh
+++ b/src/mem/ruby/network/garnet-flexible-pipeline/flit.hh
@@ -33,8 +33,8 @@
*
* */
-#include "NetworkHeader.hh"
-#include "Message.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/NetworkHeader.hh"
+#include "mem/ruby/slicc_interface/Message.hh"
#ifndef FLIT_H
#define FLIT_H
diff --git a/src/mem/ruby/network/garnet-flexible-pipeline/flitBuffer.cc b/src/mem/ruby/network/garnet-flexible-pipeline/flitBuffer.cc
index e0fb26e0a..a0bb71c9d 100644
--- a/src/mem/ruby/network/garnet-flexible-pipeline/flitBuffer.cc
+++ b/src/mem/ruby/network/garnet-flexible-pipeline/flitBuffer.cc
@@ -33,7 +33,7 @@
*
* */
-#include "flitBuffer.hh"
+#include "mem/ruby/network/garnet-flexible-pipeline/flitBuffer.hh"
flitBuffer::flitBuffer()
{
diff --git a/src/mem/ruby/network/garnet-flexible-pipeline/flitBuffer.hh b/src/mem/ruby/network/garnet-flexible-pipeline/flitBuffer.hh
index 1eb122a51..fa011ecaf 100644
--- a/src/mem/ruby/network/garnet-flexible-pipeline/flitBuffer.hh
+++ b/src/mem/ruby/network/garnet-flexible-pipeline/flitBuffer.hh
@@ -36,9 +36,9 @@
#ifndef FLIT_BUFFER_H
#define FLIT_BUFFER_H
-#include "NetworkHeader.hh"
-#include "PrioHeap.hh"
-#include "flit.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/NetworkHeader.hh"
+#include "mem/gems_common/PrioHeap.hh"
+#include "mem/ruby/network/garnet-flexible-pipeline/flit.hh"
class flitBuffer {
public:
diff --git a/src/mem/ruby/network/orion/NetworkPower.cc b/src/mem/ruby/network/orion/NetworkPower.cc
index 6e5994071..9d10d5136 100644
--- a/src/mem/ruby/network/orion/NetworkPower.cc
+++ b/src/mem/ruby/network/orion/NetworkPower.cc
@@ -29,17 +29,17 @@
#include <stdio.h>
#include <math.h>
-#include "power_router_init.hh"
-#include "power_array.hh"
-#include "power_crossbar.hh"
-#include "power_arbiter.hh"
-#include "power_bus.hh"
-#include "NetworkPower.hh"
-#include "Router_d.hh"
-#include "NetworkLink_d.hh"
-#include "GarnetNetwork_d.hh"
-#include "SIM_port.hh"
-#include "parm_technology.hh"
+#include "mem/ruby/network/orion/power_router_init.hh"
+#include "mem/ruby/network/orion/power_array.hh"
+#include "mem/ruby/network/orion/power_crossbar.hh"
+#include "mem/ruby/network/orion/power_arbiter.hh"
+#include "mem/ruby/network/orion/power_bus.hh"
+#include "mem/ruby/network/orion/NetworkPower.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/Router_d.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/NetworkLink_d.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/GarnetNetwork_d.hh"
+#include "mem/ruby/network/orion/SIM_port.hh"
+#include "mem/ruby/network/orion/parm_technology.hh"
/* --------- Static energy calculation functions ------------ */
diff --git a/src/mem/ruby/network/orion/SIM_power.hh b/src/mem/ruby/network/orion/SIM_power.hh
index 1f0ddd36c..250e710e3 100644
--- a/src/mem/ruby/network/orion/SIM_power.hh
+++ b/src/mem/ruby/network/orion/SIM_power.hh
@@ -30,7 +30,7 @@
#define _SIM_POWER_H
#include <sys/types.h>
-#include "SIM_power_test.hh"
+#include "mem/ruby/network/orion/SIM_power_test.hh"
#define SIM_NO_MODEL 0
diff --git a/src/mem/ruby/network/orion/power_arbiter.cc b/src/mem/ruby/network/orion/power_arbiter.cc
index ba68fbe1c..d382ebfb2 100644
--- a/src/mem/ruby/network/orion/power_arbiter.cc
+++ b/src/mem/ruby/network/orion/power_arbiter.cc
@@ -28,13 +28,13 @@
#include <stdio.h>
-#include "power_arbiter.hh"
-#include "power_array.hh"
-#include "power_ll.hh"
-#include "parm_technology.hh"
-#include "SIM_port.hh"
-#include "power_static.hh"
-#include "power_utils.hh"
+#include "mem/ruby/network/orion/power_arbiter.hh"
+#include "mem/ruby/network/orion/power_array.hh"
+#include "mem/ruby/network/orion/power_ll.hh"
+#include "mem/ruby/network/orion/parm_technology.hh"
+#include "mem/ruby/network/orion/SIM_port.hh"
+#include "mem/ruby/network/orion/power_static.hh"
+#include "mem/ruby/network/orion/power_utils.hh"
diff --git a/src/mem/ruby/network/orion/power_arbiter.hh b/src/mem/ruby/network/orion/power_arbiter.hh
index 671608c2f..f2c3a9eab 100644
--- a/src/mem/ruby/network/orion/power_arbiter.hh
+++ b/src/mem/ruby/network/orion/power_arbiter.hh
@@ -32,7 +32,7 @@
#ifndef _POWER_ARBITER_H
#define _POWER_ARBITER_H
-#include "power_array.hh"
+#include "mem/ruby/network/orion/power_array.hh"
typedef enum {
RR_ARBITER =1,
diff --git a/src/mem/ruby/network/orion/power_array.cc b/src/mem/ruby/network/orion/power_array.cc
index 225f45377..9ac08ffb0 100644
--- a/src/mem/ruby/network/orion/power_array.cc
+++ b/src/mem/ruby/network/orion/power_array.cc
@@ -29,12 +29,12 @@
#include <stdio.h>
#include <math.h>
-#include "power_array.hh"
-#include "power_ll.hh"
-#include "parm_technology.hh"
-#include "SIM_port.hh"
-#include "power_static.hh"
-#include "power_utils.hh"
+#include "mem/ruby/network/orion/power_array.hh"
+#include "mem/ruby/network/orion/power_ll.hh"
+#include "mem/ruby/network/orion/parm_technology.hh"
+#include "mem/ruby/network/orion/SIM_port.hh"
+#include "mem/ruby/network/orion/power_static.hh"
+#include "mem/ruby/network/orion/power_utils.hh"
/* local macros */
diff --git a/src/mem/ruby/network/orion/power_bus.cc b/src/mem/ruby/network/orion/power_bus.cc
index 032c3c519..7060752a5 100644
--- a/src/mem/ruby/network/orion/power_bus.cc
+++ b/src/mem/ruby/network/orion/power_bus.cc
@@ -28,12 +28,12 @@
#include <stdio.h>
-#include "power_bus.hh"
-#include "power_ll.hh"
-#include "parm_technology.hh"
-#include "SIM_port.hh"
-#include "power_static.hh"
-#include "power_utils.hh"
+#include "mem/ruby/network/orion/power_bus.hh"
+#include "mem/ruby/network/orion/power_ll.hh"
+#include "mem/ruby/network/orion/parm_technology.hh"
+#include "mem/ruby/network/orion/SIM_port.hh"
+#include "mem/ruby/network/orion/power_static.hh"
+#include "mem/ruby/network/orion/power_utils.hh"
/* ------- bus(link) model ---------- */
diff --git a/src/mem/ruby/network/orion/power_crossbar.cc b/src/mem/ruby/network/orion/power_crossbar.cc
index d3e2232ae..a9f3e2e39 100644
--- a/src/mem/ruby/network/orion/power_crossbar.cc
+++ b/src/mem/ruby/network/orion/power_crossbar.cc
@@ -29,12 +29,12 @@
#include <stdio.h>
#include <math.h>
-#include "power_ll.hh"
-#include "power_crossbar.hh"
-#include "parm_technology.hh"
-#include "SIM_port.hh"
-#include "power_static.hh"
-#include "power_utils.hh"
+#include "mem/ruby/network/orion/power_ll.hh"
+#include "mem/ruby/network/orion/power_crossbar.hh"
+#include "mem/ruby/network/orion/parm_technology.hh"
+#include "mem/ruby/network/orion/SIM_port.hh"
+#include "mem/ruby/network/orion/power_static.hh"
+#include "mem/ruby/network/orion/power_utils.hh"
/*-------------------- CROSSBAR power model -------------------*/
diff --git a/src/mem/ruby/network/orion/power_ll.cc b/src/mem/ruby/network/orion/power_ll.cc
index 3628989d0..aab98cc8c 100644
--- a/src/mem/ruby/network/orion/power_ll.cc
+++ b/src/mem/ruby/network/orion/power_ll.cc
@@ -70,10 +70,10 @@
#include <math.h>
#include <assert.h>
-#include "parm_technology.hh"
-#include "SIM_port.hh"
-#include "power_static.hh"
-#include "power_ll.hh"
+#include "mem/ruby/network/orion/parm_technology.hh"
+#include "mem/ruby/network/orion/SIM_port.hh"
+#include "mem/ruby/network/orion/power_static.hh"
+#include "mem/ruby/network/orion/power_ll.hh"
/*----------------------------------------------------------------------*/
diff --git a/src/mem/ruby/network/orion/power_router_init.cc b/src/mem/ruby/network/orion/power_router_init.cc
index be58fbdbf..9a8bc7f28 100644
--- a/src/mem/ruby/network/orion/power_router_init.cc
+++ b/src/mem/ruby/network/orion/power_router_init.cc
@@ -28,15 +28,15 @@
#include <stdio.h>
-#include "power_router_init.hh"
-#include "power_array.hh"
-#include "power_arbiter.hh"
-#include "power_crossbar.hh"
-#include "power_ll.hh"
-#include "parm_technology.hh"
-#include "SIM_port.hh"
-#include "power_static.hh"
-#include "power_utils.hh"
+#include "mem/ruby/network/orion/power_router_init.hh"
+#include "mem/ruby/network/orion/power_array.hh"
+#include "mem/ruby/network/orion/power_arbiter.hh"
+#include "mem/ruby/network/orion/power_crossbar.hh"
+#include "mem/ruby/network/orion/power_ll.hh"
+#include "mem/ruby/network/orion/parm_technology.hh"
+#include "mem/ruby/network/orion/SIM_port.hh"
+#include "mem/ruby/network/orion/power_static.hh"
+#include "mem/ruby/network/orion/power_utils.hh"
/* -------------------------------------------------------------------------------------------- */
// Set buffer parameters
diff --git a/src/mem/ruby/network/orion/power_router_init.hh b/src/mem/ruby/network/orion/power_router_init.hh
index 2d95cea0b..df0b8fb18 100644
--- a/src/mem/ruby/network/orion/power_router_init.hh
+++ b/src/mem/ruby/network/orion/power_router_init.hh
@@ -29,9 +29,9 @@
#ifndef _POWER_ROUTER_INIT_H
#define _POWER_ROUTER_INIT_H
-#include "power_array.hh"
-#include "power_arbiter.hh"
-#include "power_crossbar.hh"
+#include "mem/ruby/network/orion/power_array.hh"
+#include "mem/ruby/network/orion/power_arbiter.hh"
+#include "mem/ruby/network/orion/power_crossbar.hh"
/* ------------ Models ------------------------ */
/*typedef enum {
diff --git a/src/mem/ruby/network/orion/power_static.cc b/src/mem/ruby/network/orion/power_static.cc
index c0ae394a6..ded399000 100644
--- a/src/mem/ruby/network/orion/power_static.cc
+++ b/src/mem/ruby/network/orion/power_static.cc
@@ -26,7 +26,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "power_static.hh"
+#include "mem/ruby/network/orion/power_static.hh"
#if (PARM_TECH_POINT == 18)
double NMOS_TAB[1] = {20.5e-9};
diff --git a/src/mem/ruby/network/orion/power_static.hh b/src/mem/ruby/network/orion/power_static.hh
index 6bc58ca01..09f989aa2 100644
--- a/src/mem/ruby/network/orion/power_static.hh
+++ b/src/mem/ruby/network/orion/power_static.hh
@@ -29,7 +29,7 @@
#ifndef _POWER_STATIC_H
#define _POWER_STATIC_H
-#include "parm_technology.hh"
+#include "mem/ruby/network/orion/parm_technology.hh"
extern double NMOS_TAB[1];
extern double PMOS_TAB[1];
diff --git a/src/mem/ruby/network/orion/power_utils.cc b/src/mem/ruby/network/orion/power_utils.cc
index 1f592fff0..be308be88 100644
--- a/src/mem/ruby/network/orion/power_utils.cc
+++ b/src/mem/ruby/network/orion/power_utils.cc
@@ -27,8 +27,8 @@
*/
#include <stdio.h>
-#include "parm_technology.hh"
-#include "power_utils.hh"
+#include "mem/ruby/network/orion/parm_technology.hh"
+#include "mem/ruby/network/orion/power_utils.hh"
#include <assert.h>
#include <math.h>
diff --git a/src/mem/ruby/network/simple/PerfectSwitch.cc b/src/mem/ruby/network/simple/PerfectSwitch.cc
index a88a29e83..02725148f 100644
--- a/src/mem/ruby/network/simple/PerfectSwitch.cc
+++ b/src/mem/ruby/network/simple/PerfectSwitch.cc
@@ -37,14 +37,14 @@
*/
-#include "PerfectSwitch.hh"
-#include "NetworkMessage.hh"
-#include "Profiler.hh"
-#include "System.hh"
-#include "SimpleNetwork.hh"
-#include "util.hh"
-#include "MessageBuffer.hh"
-#include "Protocol.hh"
+#include "mem/ruby/network/simple/PerfectSwitch.hh"
+#include "mem/ruby/slicc_interface/NetworkMessage.hh"
+#include "mem/ruby/profiler/Profiler.hh"
+#include "mem/ruby/system/System.hh"
+#include "mem/ruby/network/simple/SimpleNetwork.hh"
+#include "mem/gems_common/util.hh"
+#include "mem/ruby/buffers/MessageBuffer.hh"
+#include "mem/protocol/Protocol.hh"
const int PRIORITY_SWITCH_LIMIT = 128;
diff --git a/src/mem/ruby/network/simple/PerfectSwitch.hh b/src/mem/ruby/network/simple/PerfectSwitch.hh
index 4d381ccc9..9cc28fff8 100644
--- a/src/mem/ruby/network/simple/PerfectSwitch.hh
+++ b/src/mem/ruby/network/simple/PerfectSwitch.hh
@@ -41,10 +41,10 @@
#ifndef PerfectSwitch_H
#define PerfectSwitch_H
-#include "Global.hh"
-#include "Vector.hh"
-#include "Consumer.hh"
-#include "NodeID.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/gems_common/Vector.hh"
+#include "mem/ruby/common/Consumer.hh"
+#include "mem/ruby/system/NodeID.hh"
class MessageBuffer;
class NetDest;
diff --git a/src/mem/ruby/network/simple/SimpleNetwork.cc b/src/mem/ruby/network/simple/SimpleNetwork.cc
index 549503e47..1258edb60 100644
--- a/src/mem/ruby/network/simple/SimpleNetwork.cc
+++ b/src/mem/ruby/network/simple/SimpleNetwork.cc
@@ -36,17 +36,17 @@
*
*/
-#include "SimpleNetwork.hh"
-#include "Profiler.hh"
-#include "System.hh"
-#include "Switch.hh"
-#include "NetDest.hh"
-#include "Topology.hh"
-#include "TopologyType.hh"
-#include "MachineType.hh"
-#include "MessageBuffer.hh"
-#include "Protocol.hh"
-#include "Map.hh"
+#include "mem/ruby/network/simple/SimpleNetwork.hh"
+#include "mem/ruby/profiler/Profiler.hh"
+#include "mem/ruby/system/System.hh"
+#include "mem/ruby/network/simple/Switch.hh"
+#include "mem/ruby/common/NetDest.hh"
+#include "mem/ruby/network/simple/Topology.hh"
+#include "mem/protocol/TopologyType.hh"
+#include "mem/protocol/MachineType.hh"
+#include "mem/ruby/buffers/MessageBuffer.hh"
+#include "mem/protocol/Protocol.hh"
+#include "mem/gems_common/Map.hh"
// ***BIG HACK*** - This is actually code that _should_ be in Network.C
diff --git a/src/mem/ruby/network/simple/SimpleNetwork.hh b/src/mem/ruby/network/simple/SimpleNetwork.hh
index a28904227..8d2f64b7a 100644
--- a/src/mem/ruby/network/simple/SimpleNetwork.hh
+++ b/src/mem/ruby/network/simple/SimpleNetwork.hh
@@ -69,10 +69,10 @@
#ifndef SIMPLENETWORK_H
#define SIMPLENETWORK_H
-#include "Global.hh"
-#include "Vector.hh"
-#include "Network.hh"
-#include "NodeID.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/gems_common/Vector.hh"
+#include "mem/ruby/network/Network.hh"
+#include "mem/ruby/system/NodeID.hh"
class NetDest;
class MessageBuffer;
diff --git a/src/mem/ruby/network/simple/Switch.cc b/src/mem/ruby/network/simple/Switch.cc
index 3b55d156f..648b6ca01 100644
--- a/src/mem/ruby/network/simple/Switch.cc
+++ b/src/mem/ruby/network/simple/Switch.cc
@@ -37,13 +37,13 @@
*/
-#include "Switch.hh"
-#include "PerfectSwitch.hh"
-#include "MessageBuffer.hh"
-#include "Throttle.hh"
-#include "MessageSizeType.hh"
-#include "Network.hh"
-#include "Protocol.hh"
+#include "mem/ruby/network/simple/Switch.hh"
+#include "mem/ruby/network/simple/PerfectSwitch.hh"
+#include "mem/ruby/buffers/MessageBuffer.hh"
+#include "mem/ruby/network/simple/Throttle.hh"
+#include "mem/protocol/MessageSizeType.hh"
+#include "mem/ruby/network/Network.hh"
+#include "mem/protocol/Protocol.hh"
Switch::Switch(SwitchID sid, SimpleNetwork* network_ptr)
{
diff --git a/src/mem/ruby/network/simple/Switch.hh b/src/mem/ruby/network/simple/Switch.hh
index a408155c0..58bde05ea 100644
--- a/src/mem/ruby/network/simple/Switch.hh
+++ b/src/mem/ruby/network/simple/Switch.hh
@@ -44,8 +44,8 @@
#ifndef Switch_H
#define Switch_H
-#include "Global.hh"
-#include "Vector.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/gems_common/Vector.hh"
class MessageBuffer;
class PerfectSwitch;
diff --git a/src/mem/ruby/network/simple/Throttle.cc b/src/mem/ruby/network/simple/Throttle.cc
index 2f6e68afd..1d9ec0dc6 100644
--- a/src/mem/ruby/network/simple/Throttle.cc
+++ b/src/mem/ruby/network/simple/Throttle.cc
@@ -34,12 +34,12 @@
*
*/
-#include "Throttle.hh"
-#include "MessageBuffer.hh"
-#include "Network.hh"
-#include "System.hh"
-#include "NetworkMessage.hh"
-#include "Protocol.hh"
+#include "mem/ruby/network/simple/Throttle.hh"
+#include "mem/ruby/buffers/MessageBuffer.hh"
+#include "mem/ruby/network/Network.hh"
+#include "mem/ruby/system/System.hh"
+#include "mem/ruby/slicc_interface/NetworkMessage.hh"
+#include "mem/protocol/Protocol.hh"
const int HIGH_RANGE = 256;
const int ADJUST_INTERVAL = 50000;
diff --git a/src/mem/ruby/network/simple/Throttle.hh b/src/mem/ruby/network/simple/Throttle.hh
index 67cfabcdc..067c7af5f 100644
--- a/src/mem/ruby/network/simple/Throttle.hh
+++ b/src/mem/ruby/network/simple/Throttle.hh
@@ -42,11 +42,11 @@
#ifndef THROTTLE_H
#define THROTTLE_H
-#include "Global.hh"
-#include "Vector.hh"
-#include "Consumer.hh"
-#include "NodeID.hh"
-#include "RubyConfig.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/gems_common/Vector.hh"
+#include "mem/ruby/common/Consumer.hh"
+#include "mem/ruby/system/NodeID.hh"
+#include "mem/ruby/config/RubyConfig.hh"
class MessageBuffer;
diff --git a/src/mem/ruby/network/simple/Topology.cc b/src/mem/ruby/network/simple/Topology.cc
index a7454a5af..7c52af1ce 100644
--- a/src/mem/ruby/network/simple/Topology.cc
+++ b/src/mem/ruby/network/simple/Topology.cc
@@ -36,14 +36,14 @@
*
* */
-#include "Topology.hh"
-#include "NetDest.hh"
-#include "Network.hh"
-#include "TopologyType.hh"
-#include "RubyConfig.hh"
-#include "util.hh"
-#include "MachineType.hh"
-#include "Protocol.hh"
+#include "mem/ruby/network/simple/Topology.hh"
+#include "mem/ruby/common/NetDest.hh"
+#include "mem/ruby/network/Network.hh"
+#include "mem/protocol/TopologyType.hh"
+#include "mem/ruby/config/RubyConfig.hh"
+#include "mem/gems_common/util.hh"
+#include "mem/protocol/MachineType.hh"
+#include "mem/protocol/Protocol.hh"
#include <string>
static const int INFINITE_LATENCY = 10000; // Yes, this is a big hack
diff --git a/src/mem/ruby/network/simple/Topology.hh b/src/mem/ruby/network/simple/Topology.hh
index bfc503087..ee6be1ebf 100644
--- a/src/mem/ruby/network/simple/Topology.hh
+++ b/src/mem/ruby/network/simple/Topology.hh
@@ -47,9 +47,9 @@
#ifndef TOPOLOGY_H
#define TOPOLOGY_H
-#include "Global.hh"
-#include "Vector.hh"
-#include "NodeID.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/gems_common/Vector.hh"
+#include "mem/ruby/system/NodeID.hh"
class Network;
class NetDest;
diff --git a/src/mem/ruby/profiler/AccessTraceForAddress.cc b/src/mem/ruby/profiler/AccessTraceForAddress.cc
index 13aa3bc59..48b28b735 100644
--- a/src/mem/ruby/profiler/AccessTraceForAddress.cc
+++ b/src/mem/ruby/profiler/AccessTraceForAddress.cc
@@ -32,8 +32,8 @@
*
*/
-#include "AccessTraceForAddress.hh"
-#include "Histogram.hh"
+#include "mem/ruby/profiler/AccessTraceForAddress.hh"
+#include "mem/ruby/common/Histogram.hh"
AccessTraceForAddress::AccessTraceForAddress()
{
diff --git a/src/mem/ruby/profiler/AccessTraceForAddress.hh b/src/mem/ruby/profiler/AccessTraceForAddress.hh
index 8ed47c2ee..5bb0cc545 100644
--- a/src/mem/ruby/profiler/AccessTraceForAddress.hh
+++ b/src/mem/ruby/profiler/AccessTraceForAddress.hh
@@ -37,13 +37,13 @@
#ifndef ACCESSTRACEFORADDRESS_H
#define ACCESSTRACEFORADDRESS_H
-#include "Global.hh"
-#include "RubyConfig.hh"
-#include "Address.hh"
-#include "CacheRequestType.hh"
-#include "AccessModeType.hh"
-#include "NodeID.hh"
-#include "Set.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/config/RubyConfig.hh"
+#include "mem/ruby/common/Address.hh"
+#include "mem/protocol/CacheRequestType.hh"
+#include "mem/protocol/AccessModeType.hh"
+#include "mem/ruby/system/NodeID.hh"
+#include "mem/ruby/common/Set.hh"
class Histogram;
class AccessTraceForAddress {
diff --git a/src/mem/ruby/profiler/AddressProfiler.cc b/src/mem/ruby/profiler/AddressProfiler.cc
index 2d14b458f..b0cc3cfd5 100644
--- a/src/mem/ruby/profiler/AddressProfiler.cc
+++ b/src/mem/ruby/profiler/AddressProfiler.cc
@@ -36,13 +36,13 @@
*
*/
-#include "AddressProfiler.hh"
-#include "CacheMsg.hh"
-#include "AccessTraceForAddress.hh"
-#include "PrioHeap.hh"
-#include "Map.hh"
-#include "System.hh"
-#include "Profiler.hh"
+#include "mem/ruby/profiler/AddressProfiler.hh"
+#include "mem/protocol/CacheMsg.hh"
+#include "mem/ruby/profiler/AccessTraceForAddress.hh"
+#include "mem/gems_common/PrioHeap.hh"
+#include "mem/gems_common/Map.hh"
+#include "mem/ruby/system/System.hh"
+#include "mem/ruby/profiler/Profiler.hh"
// Helper functions
static AccessTraceForAddress& lookupTraceForAddress(const Address& addr, Map<Address, AccessTraceForAddress>* record_map);
diff --git a/src/mem/ruby/profiler/AddressProfiler.hh b/src/mem/ruby/profiler/AddressProfiler.hh
index 4895a7857..b000fb5d5 100644
--- a/src/mem/ruby/profiler/AddressProfiler.hh
+++ b/src/mem/ruby/profiler/AddressProfiler.hh
@@ -39,12 +39,12 @@
#ifndef ADDRESSPROFILER_H
#define ADDRESSPROFILER_H
-#include "Global.hh"
-#include "NodeID.hh"
-#include "Histogram.hh"
-#include "Address.hh"
-#include "CacheMsg.hh"
-#include "AccessType.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/system/NodeID.hh"
+#include "mem/ruby/common/Histogram.hh"
+#include "mem/ruby/common/Address.hh"
+#include "mem/protocol/CacheMsg.hh"
+#include "mem/protocol/AccessType.hh"
class AccessTraceForAddress;
class Set;
diff --git a/src/mem/ruby/profiler/CacheProfiler.cc b/src/mem/ruby/profiler/CacheProfiler.cc
index 666a99632..edc4bbd6d 100644
--- a/src/mem/ruby/profiler/CacheProfiler.cc
+++ b/src/mem/ruby/profiler/CacheProfiler.cc
@@ -36,12 +36,12 @@
*
*/
-#include "CacheProfiler.hh"
-#include "AccessTraceForAddress.hh"
-#include "PrioHeap.hh"
-#include "System.hh"
-#include "Profiler.hh"
-#include "Vector.hh"
+#include "mem/ruby/profiler/CacheProfiler.hh"
+#include "mem/ruby/profiler/AccessTraceForAddress.hh"
+#include "mem/gems_common/PrioHeap.hh"
+#include "mem/ruby/system/System.hh"
+#include "mem/ruby/profiler/Profiler.hh"
+#include "mem/gems_common/Vector.hh"
CacheProfiler::CacheProfiler(string description)
: m_requestSize(-1)
diff --git a/src/mem/ruby/profiler/CacheProfiler.hh b/src/mem/ruby/profiler/CacheProfiler.hh
index 2d538d0e3..4dcff4243 100644
--- a/src/mem/ruby/profiler/CacheProfiler.hh
+++ b/src/mem/ruby/profiler/CacheProfiler.hh
@@ -39,12 +39,12 @@
#ifndef CACHEPROFILER_H
#define CACHEPROFILER_H
-#include "Global.hh"
-#include "NodeID.hh"
-#include "Histogram.hh"
-#include "AccessModeType.hh"
-#include "PrefetchBit.hh"
-#include "GenericRequestType.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/system/NodeID.hh"
+#include "mem/ruby/common/Histogram.hh"
+#include "mem/protocol/AccessModeType.hh"
+#include "mem/protocol/PrefetchBit.hh"
+#include "mem/protocol/GenericRequestType.hh"
template <class TYPE> class Vector;
diff --git a/src/mem/ruby/profiler/Profiler.cc b/src/mem/ruby/profiler/Profiler.cc
index 456123a68..558402bf5 100644
--- a/src/mem/ruby/profiler/Profiler.cc
+++ b/src/mem/ruby/profiler/Profiler.cc
@@ -51,19 +51,19 @@
*
*/
-#include "Profiler.hh"
-#include "CacheProfiler.hh"
-#include "AddressProfiler.hh"
-#include "System.hh"
-#include "Network.hh"
-#include "PrioHeap.hh"
-#include "CacheMsg.hh"
-#include "Driver.hh"
-#include "Protocol.hh"
-#include "util.hh"
-#include "Map.hh"
-#include "Debug.hh"
-#include "MachineType.hh"
+#include "mem/ruby/profiler/Profiler.hh"
+#include "mem/ruby/profiler/CacheProfiler.hh"
+#include "mem/ruby/profiler/AddressProfiler.hh"
+#include "mem/ruby/system/System.hh"
+#include "mem/ruby/network/Network.hh"
+#include "mem/gems_common/PrioHeap.hh"
+#include "mem/protocol/CacheMsg.hh"
+#include "mem/ruby/common/Driver.hh"
+#include "mem/protocol/Protocol.hh"
+#include "mem/gems_common/util.hh"
+#include "mem/gems_common/Map.hh"
+#include "mem/ruby/common/Debug.hh"
+#include "mem/protocol/MachineType.hh"
// Allows use of times() library call, which determines virtual runtime
#include <sys/times.h>
diff --git a/src/mem/ruby/profiler/Profiler.hh b/src/mem/ruby/profiler/Profiler.hh
index aa018029c..cb038a051 100644
--- a/src/mem/ruby/profiler/Profiler.hh
+++ b/src/mem/ruby/profiler/Profiler.hh
@@ -54,20 +54,20 @@
#ifndef PROFILER_H
#define PROFILER_H
-#include "Global.hh"
-#include "GenericMachineType.hh"
-#include "RubyConfig.hh"
-#include "Histogram.hh"
-#include "Consumer.hh"
-#include "AccessModeType.hh"
-#include "AccessType.hh"
-#include "NodeID.hh"
-#include "MachineID.hh"
-#include "PrefetchBit.hh"
-#include "Address.hh"
-#include "Set.hh"
-#include "CacheRequestType.hh"
-#include "GenericRequestType.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/protocol/GenericMachineType.hh"
+#include "mem/ruby/config/RubyConfig.hh"
+#include "mem/ruby/common/Histogram.hh"
+#include "mem/ruby/common/Consumer.hh"
+#include "mem/protocol/AccessModeType.hh"
+#include "mem/protocol/AccessType.hh"
+#include "mem/ruby/system/NodeID.hh"
+#include "mem/ruby/system/MachineID.hh"
+#include "mem/protocol/PrefetchBit.hh"
+#include "mem/ruby/common/Address.hh"
+#include "mem/ruby/common/Set.hh"
+#include "mem/protocol/CacheRequestType.hh"
+#include "mem/protocol/GenericRequestType.hh"
class CacheMsg;
class CacheProfiler;
diff --git a/src/mem/ruby/profiler/StoreTrace.cc b/src/mem/ruby/profiler/StoreTrace.cc
index 7a1347a89..4d4e4798d 100644
--- a/src/mem/ruby/profiler/StoreTrace.cc
+++ b/src/mem/ruby/profiler/StoreTrace.cc
@@ -32,8 +32,8 @@
*
*/
-#include "StoreTrace.hh"
-#include "RubyEventQueue.hh"
+#include "mem/ruby/profiler/StoreTrace.hh"
+#include "mem/ruby/eventqueue/RubyEventQueue.hh"
bool StoreTrace::s_init = false; // Total number of store lifetimes of all lines
int64 StoreTrace::s_total_samples = 0; // Total number of store lifetimes of all lines
diff --git a/src/mem/ruby/profiler/StoreTrace.hh b/src/mem/ruby/profiler/StoreTrace.hh
index 821345aba..a71636364 100644
--- a/src/mem/ruby/profiler/StoreTrace.hh
+++ b/src/mem/ruby/profiler/StoreTrace.hh
@@ -37,10 +37,10 @@
#ifndef StoreTrace_H
#define StoreTrace_H
-#include "Global.hh"
-#include "RubyConfig.hh"
-#include "Address.hh"
-#include "Histogram.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/config/RubyConfig.hh"
+#include "mem/ruby/common/Address.hh"
+#include "mem/ruby/common/Histogram.hh"
class StoreTrace {
public:
diff --git a/src/mem/ruby/profiler/XactProfiler.cc b/src/mem/ruby/profiler/XactProfiler.cc
index 55fb86472..8a3a7cd79 100644
--- a/src/mem/ruby/profiler/XactProfiler.cc
+++ b/src/mem/ruby/profiler/XactProfiler.cc
@@ -26,13 +26,13 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "XactProfiler.hh"
-#include "CacheMsg.hh"
-#include "Map.hh"
-#include "Debug.hh"
-#include "MachineType.hh"
+#include "mem/ruby/profiler/XactProfiler.hh"
+#include "mem/protocol/CacheMsg.hh"
+#include "mem/gems_common/Map.hh"
+#include "mem/ruby/common/Debug.hh"
+#include "mem/protocol/MachineType.hh"
#include "TransactionInterfaceManager.hh"
-#include "Driver.hh"
+#include "mem/ruby/common/Driver.hh"
#include "interface.hh"
extern std::ostream * debug_cout_ptr;
diff --git a/src/mem/ruby/profiler/XactProfiler.hh b/src/mem/ruby/profiler/XactProfiler.hh
index 46584de65..b90e95c01 100644
--- a/src/mem/ruby/profiler/XactProfiler.hh
+++ b/src/mem/ruby/profiler/XactProfiler.hh
@@ -30,20 +30,20 @@
#ifndef XACTPROFILER_H
#define XACTPROFILER_H
-#include "Global.hh"
-#include "GenericMachineType.hh"
-#include "RubyConfig.hh"
-#include "Histogram.hh"
-#include "Consumer.hh"
-#include "AccessModeType.hh"
-#include "AccessType.hh"
-#include "NodeID.hh"
-#include "MachineID.hh"
-#include "PrefetchBit.hh"
-#include "Address.hh"
-#include "Set.hh"
-#include "CacheRequestType.hh"
-#include "GenericRequestType.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/protocol/GenericMachineType.hh"
+#include "mem/ruby/config/RubyConfig.hh"
+#include "mem/ruby/common/Histogram.hh"
+#include "mem/ruby/common/Consumer.hh"
+#include "mem/protocol/AccessModeType.hh"
+#include "mem/protocol/AccessType.hh"
+#include "mem/ruby/system/NodeID.hh"
+#include "mem/ruby/system/MachineID.hh"
+#include "mem/protocol/PrefetchBit.hh"
+#include "mem/ruby/common/Address.hh"
+#include "mem/ruby/common/Set.hh"
+#include "mem/protocol/CacheRequestType.hh"
+#include "mem/protocol/GenericRequestType.hh"
template <class KEY_TYPE, class VALUE_TYPE> class Map;
diff --git a/src/mem/ruby/recorder/CacheRecorder.cc b/src/mem/ruby/recorder/CacheRecorder.cc
index ba7ca8966..21193ba68 100644
--- a/src/mem/ruby/recorder/CacheRecorder.cc
+++ b/src/mem/ruby/recorder/CacheRecorder.cc
@@ -32,10 +32,10 @@
*
*/
-#include "CacheRecorder.hh"
-#include "TraceRecord.hh"
-#include "RubyEventQueue.hh"
-#include "PrioHeap.hh"
+#include "mem/ruby/recorder/CacheRecorder.hh"
+#include "mem/ruby/recorder/TraceRecord.hh"
+#include "mem/ruby/eventqueue/RubyEventQueue.hh"
+#include "mem/gems_common/PrioHeap.hh"
CacheRecorder::CacheRecorder()
{
diff --git a/src/mem/ruby/recorder/CacheRecorder.hh b/src/mem/ruby/recorder/CacheRecorder.hh
index b8b56ff09..0f69f8478 100644
--- a/src/mem/ruby/recorder/CacheRecorder.hh
+++ b/src/mem/ruby/recorder/CacheRecorder.hh
@@ -38,9 +38,9 @@
#ifndef CACHERECORDER_H
#define CACHERECORDER_H
-#include "Global.hh"
-#include "NodeID.hh"
-#include "CacheRequestType.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/system/NodeID.hh"
+#include "mem/protocol/CacheRequestType.hh"
template <class TYPE> class PrioHeap;
class Address;
diff --git a/src/mem/ruby/recorder/TraceRecord.cc b/src/mem/ruby/recorder/TraceRecord.cc
index fd5f25ab9..ab1069582 100644
--- a/src/mem/ruby/recorder/TraceRecord.cc
+++ b/src/mem/ruby/recorder/TraceRecord.cc
@@ -32,11 +32,11 @@
*
*/
-#include "TraceRecord.hh"
-#include "Sequencer.hh"
-#include "System.hh"
-#include "AbstractChip.hh"
-#include "CacheMsg.hh"
+#include "mem/ruby/recorder/TraceRecord.hh"
+#include "mem/ruby/system/Sequencer.hh"
+#include "mem/ruby/system/System.hh"
+#include "mem/ruby/slicc_interface/AbstractChip.hh"
+#include "mem/protocol/CacheMsg.hh"
TraceRecord::TraceRecord(NodeID id, const Address& data_addr, const Address& pc_addr, CacheRequestType type, Time time)
{
diff --git a/src/mem/ruby/recorder/TraceRecord.hh b/src/mem/ruby/recorder/TraceRecord.hh
index df526156b..cfe2ff9e3 100644
--- a/src/mem/ruby/recorder/TraceRecord.hh
+++ b/src/mem/ruby/recorder/TraceRecord.hh
@@ -39,10 +39,10 @@
#ifndef TRACERECORD_H
#define TRACERECORD_H
-#include "Global.hh"
-#include "Address.hh"
-#include "NodeID.hh"
-#include "CacheRequestType.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/common/Address.hh"
+#include "mem/ruby/system/NodeID.hh"
+#include "mem/protocol/CacheRequestType.hh"
class CacheMsg;
class TraceRecord {
diff --git a/src/mem/ruby/recorder/Tracer.cc b/src/mem/ruby/recorder/Tracer.cc
index 0a4a290b3..896bfd31e 100644
--- a/src/mem/ruby/recorder/Tracer.cc
+++ b/src/mem/ruby/recorder/Tracer.cc
@@ -32,11 +32,11 @@
*
*/
-#include "Tracer.hh"
-#include "TraceRecord.hh"
-#include "RubyEventQueue.hh"
-#include "PrioHeap.hh"
-#include "System.hh"
+#include "mem/ruby/recorder/Tracer.hh"
+#include "mem/ruby/recorder/TraceRecord.hh"
+#include "mem/ruby/eventqueue/RubyEventQueue.hh"
+#include "mem/gems_common/PrioHeap.hh"
+#include "mem/ruby/system/System.hh"
Tracer::Tracer()
{
diff --git a/src/mem/ruby/recorder/Tracer.hh b/src/mem/ruby/recorder/Tracer.hh
index eb05ae12d..0f78f54b2 100644
--- a/src/mem/ruby/recorder/Tracer.hh
+++ b/src/mem/ruby/recorder/Tracer.hh
@@ -38,9 +38,9 @@
#ifndef TRACER_H
#define TRACER_H
-#include "Global.hh"
-#include "NodeID.hh"
-#include "CacheRequestType.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/system/NodeID.hh"
+#include "mem/protocol/CacheRequestType.hh"
#include "gzstream.hh"
template <class TYPE> class PrioHeap;
diff --git a/src/mem/ruby/slicc_interface/AbstractCacheEntry.cc b/src/mem/ruby/slicc_interface/AbstractCacheEntry.cc
index 3d0e70408..6bb936248 100644
--- a/src/mem/ruby/slicc_interface/AbstractCacheEntry.cc
+++ b/src/mem/ruby/slicc_interface/AbstractCacheEntry.cc
@@ -34,7 +34,7 @@
*
*/
-#include "AbstractCacheEntry.hh"
+#include "mem/ruby/slicc_interface/AbstractCacheEntry.hh"
AbstractCacheEntry::AbstractCacheEntry() {
}
diff --git a/src/mem/ruby/slicc_interface/AbstractCacheEntry.hh b/src/mem/ruby/slicc_interface/AbstractCacheEntry.hh
index ff678d342..18dc16ca8 100644
--- a/src/mem/ruby/slicc_interface/AbstractCacheEntry.hh
+++ b/src/mem/ruby/slicc_interface/AbstractCacheEntry.hh
@@ -37,9 +37,9 @@
#ifndef AbstractCacheEntry_H
#define AbstractCacheEntry_H
-#include "Global.hh"
-#include "Address.hh"
-#include "AccessPermission.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/common/Address.hh"
+#include "mem/protocol/AccessPermission.hh"
class AbstractCacheEntry {
public:
diff --git a/src/mem/ruby/slicc_interface/AbstractChip.cc b/src/mem/ruby/slicc_interface/AbstractChip.cc
index 1f2eda741..5ef39b238 100644
--- a/src/mem/ruby/slicc_interface/AbstractChip.cc
+++ b/src/mem/ruby/slicc_interface/AbstractChip.cc
@@ -34,7 +34,7 @@
*
*/
-#include "AbstractChip.hh"
+#include "mem/ruby/slicc_interface/AbstractChip.hh"
AbstractChip::AbstractChip(NodeID id, Network* net_ptr) {
m_id = id;
diff --git a/src/mem/ruby/slicc_interface/AbstractChip.hh b/src/mem/ruby/slicc_interface/AbstractChip.hh
index 05039d09d..d47dd6306 100644
--- a/src/mem/ruby/slicc_interface/AbstractChip.hh
+++ b/src/mem/ruby/slicc_interface/AbstractChip.hh
@@ -37,12 +37,12 @@
#ifndef ABSTRACT_CHIP_H
#define ABSTRACT_CHIP_H
-#include "Global.hh"
-#include "NodeID.hh"
-#include "RubyConfig.hh"
-#include "L1Cache_Entry.hh"
-#include "Address.hh"
-#include "Vector.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/system/NodeID.hh"
+#include "mem/ruby/config/RubyConfig.hh"
+#include "mem/protocol/L1Cache_Entry.hh"
+#include "mem/ruby/common/Address.hh"
+#include "mem/gems_common/Vector.hh"
class Network;
class Sequencer;
diff --git a/src/mem/ruby/slicc_interface/Message.hh b/src/mem/ruby/slicc_interface/Message.hh
index 596e1c12f..c8917795b 100644
--- a/src/mem/ruby/slicc_interface/Message.hh
+++ b/src/mem/ruby/slicc_interface/Message.hh
@@ -34,10 +34,10 @@
#ifndef MESSAGE_H
#define MESSAGE_H
-#include "Global.hh"
-#include "RefCnt.hh"
-#include "RefCountable.hh"
-#include "RubyEventQueue.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/gems_common/RefCnt.hh"
+#include "mem/gems_common/RefCountable.hh"
+#include "mem/ruby/eventqueue/RubyEventQueue.hh"
class Message;
typedef RefCnt<Message> MsgPtr;
diff --git a/src/mem/ruby/slicc_interface/NetworkMessage.hh b/src/mem/ruby/slicc_interface/NetworkMessage.hh
index 357b89402..81c7dc2b0 100644
--- a/src/mem/ruby/slicc_interface/NetworkMessage.hh
+++ b/src/mem/ruby/slicc_interface/NetworkMessage.hh
@@ -39,12 +39,12 @@
#ifndef NetworkMessage_H
#define NetworkMessage_H
-#include "Global.hh"
-#include "RefCnt.hh"
-#include "RefCountable.hh"
-#include "Message.hh"
-#include "MessageSizeType.hh"
-#include "NetDest.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/gems_common/RefCnt.hh"
+#include "mem/gems_common/RefCountable.hh"
+#include "mem/ruby/slicc_interface/Message.hh"
+#include "mem/protocol/MessageSizeType.hh"
+#include "mem/ruby/common/NetDest.hh"
class Address;
diff --git a/src/mem/ruby/slicc_interface/RubySlicc_ComponentMapping.hh b/src/mem/ruby/slicc_interface/RubySlicc_ComponentMapping.hh
index 90f7a702b..bf5778479 100644
--- a/src/mem/ruby/slicc_interface/RubySlicc_ComponentMapping.hh
+++ b/src/mem/ruby/slicc_interface/RubySlicc_ComponentMapping.hh
@@ -34,14 +34,14 @@
#ifndef COMPONENTMAPPINGFNS_H
#define COMPONENTMAPPINGFNS_H
-#include "Global.hh"
-#include "RubyConfig.hh"
-#include "NodeID.hh"
-#include "MachineID.hh"
-#include "Address.hh"
-#include "Set.hh"
-#include "NetDest.hh"
-#include "GenericMachineType.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/config/RubyConfig.hh"
+#include "mem/ruby/system/NodeID.hh"
+#include "mem/ruby/system/MachineID.hh"
+#include "mem/ruby/common/Address.hh"
+#include "mem/ruby/common/Set.hh"
+#include "mem/ruby/common/NetDest.hh"
+#include "mem/protocol/GenericMachineType.hh"
#ifdef MACHINETYPE_L1Cache
#define MACHINETYPE_L1CACHE_ENUM MachineType_L1Cache
diff --git a/src/mem/ruby/slicc_interface/RubySlicc_Profiler_interface.cc b/src/mem/ruby/slicc_interface/RubySlicc_Profiler_interface.cc
index 19018c218..0d5b48c34 100644
--- a/src/mem/ruby/slicc_interface/RubySlicc_Profiler_interface.cc
+++ b/src/mem/ruby/slicc_interface/RubySlicc_Profiler_interface.cc
@@ -36,13 +36,13 @@
*
*/
-#include "Global.hh"
-#include "System.hh"
-#include "Profiler.hh"
-#include "AddressProfiler.hh"
-#include "Protocol.hh"
-#include "RubySlicc_Profiler_interface.hh"
-#include "RubySlicc_ComponentMapping.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/system/System.hh"
+#include "mem/ruby/profiler/Profiler.hh"
+#include "mem/ruby/profiler/AddressProfiler.hh"
+#include "mem/protocol/Protocol.hh"
+#include "mem/ruby/slicc_interface/RubySlicc_Profiler_interface.hh"
+#include "mem/ruby/slicc_interface/RubySlicc_ComponentMapping.hh"
// #include "TransactionInterfaceManager.hh"
void profile_request(int cache_state, Directory_State directory_state, GenericRequestType request_type)
diff --git a/src/mem/ruby/slicc_interface/RubySlicc_Profiler_interface.hh b/src/mem/ruby/slicc_interface/RubySlicc_Profiler_interface.hh
index fa83c84c1..6cc3c6cd2 100644
--- a/src/mem/ruby/slicc_interface/RubySlicc_Profiler_interface.hh
+++ b/src/mem/ruby/slicc_interface/RubySlicc_Profiler_interface.hh
@@ -39,14 +39,14 @@
#ifndef RUBYSLICC_PROFILER_INTERFACE_H
#define RUBYSLICC_PROFILER_INTERFACE_H
-#include "Global.hh"
-#include "Profiler.hh"
-#include "Address.hh"
-#include "L1Cache_State.hh"
-#include "AccessType.hh"
-#include "GenericRequestType.hh"
-#include "Directory_State.hh"
-#include "NodeID.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/profiler/Profiler.hh"
+#include "mem/ruby/common/Address.hh"
+#include "mem/protocol/L1Cache_State.hh"
+#include "mem/protocol/AccessType.hh"
+#include "mem/protocol/GenericRequestType.hh"
+#include "mem/protocol/Directory_State.hh"
+#include "mem/ruby/system/NodeID.hh"
class Set;
diff --git a/src/mem/ruby/slicc_interface/RubySlicc_Util.hh b/src/mem/ruby/slicc_interface/RubySlicc_Util.hh
index a3233af5d..d4db1bb28 100644
--- a/src/mem/ruby/slicc_interface/RubySlicc_Util.hh
+++ b/src/mem/ruby/slicc_interface/RubySlicc_Util.hh
@@ -39,23 +39,23 @@
#ifndef SLICC_UTIL_H
#define SLICC_UTIL_H
-#include "Global.hh"
-#include "Address.hh"
-#include "NodeID.hh"
-#include "MachineID.hh"
-#include "RubyConfig.hh"
-#include "CacheMsg.hh"
-#include "GenericRequestType.hh"
-#include "CacheRequestType.hh"
-#include "AccessType.hh"
-#include "MachineType.hh"
-#include "Directory_State.hh"
-#include "L1Cache_State.hh"
-#include "MessageSizeType.hh"
-#include "Network.hh"
-#include "PrefetchBit.hh"
-
-#include "RubySlicc_ComponentMapping.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/common/Address.hh"
+#include "mem/ruby/system/NodeID.hh"
+#include "mem/ruby/system/MachineID.hh"
+#include "mem/ruby/config/RubyConfig.hh"
+#include "mem/protocol/CacheMsg.hh"
+#include "mem/protocol/GenericRequestType.hh"
+#include "mem/protocol/CacheRequestType.hh"
+#include "mem/protocol/AccessType.hh"
+#include "mem/protocol/MachineType.hh"
+#include "mem/protocol/Directory_State.hh"
+#include "mem/protocol/L1Cache_State.hh"
+#include "mem/protocol/MessageSizeType.hh"
+#include "mem/ruby/network/Network.hh"
+#include "mem/protocol/PrefetchBit.hh"
+
+#include "mem/ruby/slicc_interface/RubySlicc_ComponentMapping.hh"
class Set;
class NetDest;
diff --git a/src/mem/ruby/slicc_interface/RubySlicc_includes.hh b/src/mem/ruby/slicc_interface/RubySlicc_includes.hh
index 8f552db29..0ac5496c4 100644
--- a/src/mem/ruby/slicc_interface/RubySlicc_includes.hh
+++ b/src/mem/ruby/slicc_interface/RubySlicc_includes.hh
@@ -1,9 +1,9 @@
#ifndef RUBYSLICC_INCLUDES_H
#define RUBYSLICC_INCLUDES_H
-#include "RubySlicc_ComponentMapping.hh"
-#include "RubySlicc_Util.hh"
-#include "RubySlicc_Profiler_interface.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"
#endif
diff --git a/src/mem/ruby/system/AbstractBloomFilter.hh b/src/mem/ruby/system/AbstractBloomFilter.hh
index 3b0c703ae..f5fe209c0 100644
--- a/src/mem/ruby/system/AbstractBloomFilter.hh
+++ b/src/mem/ruby/system/AbstractBloomFilter.hh
@@ -38,10 +38,10 @@
#ifndef ABSTRACT_BLOOM_FILTER_H
#define ABSTRACT_BLOOM_FILTER_H
-#include "Global.hh"
-#include "AbstractChip.hh"
-#include "RubyConfig.hh"
-#include "Address.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/slicc_interface/AbstractChip.hh"
+#include "mem/ruby/config/RubyConfig.hh"
+#include "mem/ruby/common/Address.hh"
class AbstractBloomFilter {
public:
diff --git a/src/mem/ruby/system/AbstractMemOrCache.hh b/src/mem/ruby/system/AbstractMemOrCache.hh
index a96a1328f..8e214c74b 100644
--- a/src/mem/ruby/system/AbstractMemOrCache.hh
+++ b/src/mem/ruby/system/AbstractMemOrCache.hh
@@ -10,10 +10,10 @@
#ifndef ABSTRACT_MEM_OR_CACHE_H
#define ABSTRACT_MEM_OR_CACHE_H
-#include "Global.hh"
-#include "AbstractChip.hh"
-#include "RubyConfig.hh"
-#include "Address.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/slicc_interface/AbstractChip.hh"
+#include "mem/ruby/config/RubyConfig.hh"
+#include "mem/ruby/common/Address.hh"
class AbstractMemOrCache {
public:
diff --git a/src/mem/ruby/system/AbstractReplacementPolicy.hh b/src/mem/ruby/system/AbstractReplacementPolicy.hh
index 497226fad..e8b504b8a 100644
--- a/src/mem/ruby/system/AbstractReplacementPolicy.hh
+++ b/src/mem/ruby/system/AbstractReplacementPolicy.hh
@@ -2,7 +2,7 @@
#ifndef ABSTRACTREPLACEMENTPOLICY_H
#define ABSTRACTREPLACEMENTPOLICY_H
-#include "Global.hh"
+#include "mem/ruby/common/Global.hh"
class AbstractReplacementPolicy {
diff --git a/src/mem/ruby/system/BlockBloomFilter.cc b/src/mem/ruby/system/BlockBloomFilter.cc
index dbb0b5458..d81f34ab1 100644
--- a/src/mem/ruby/system/BlockBloomFilter.cc
+++ b/src/mem/ruby/system/BlockBloomFilter.cc
@@ -35,9 +35,9 @@
*
*/
-#include "BlockBloomFilter.hh"
-#include "Map.hh"
-#include "Address.hh"
+#include "mem/ruby/system/BlockBloomFilter.hh"
+#include "mem/gems_common/Map.hh"
+#include "mem/ruby/common/Address.hh"
BlockBloomFilter::BlockBloomFilter(string str)
{
diff --git a/src/mem/ruby/system/BlockBloomFilter.hh b/src/mem/ruby/system/BlockBloomFilter.hh
index 82f457157..ea7c0807a 100644
--- a/src/mem/ruby/system/BlockBloomFilter.hh
+++ b/src/mem/ruby/system/BlockBloomFilter.hh
@@ -38,12 +38,12 @@
#ifndef BLOCK_BLOOM_FILTER_H
#define BLOCK_BLOOM_FILTER_H
-#include "Map.hh"
-#include "Global.hh"
-#include "AbstractChip.hh"
-#include "RubyConfig.hh"
-#include "Address.hh"
-#include "AbstractBloomFilter.hh"
+#include "mem/gems_common/Map.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/slicc_interface/AbstractChip.hh"
+#include "mem/ruby/config/RubyConfig.hh"
+#include "mem/ruby/common/Address.hh"
+#include "mem/ruby/system/AbstractBloomFilter.hh"
class BlockBloomFilter : public AbstractBloomFilter {
public:
diff --git a/src/mem/ruby/system/BulkBloomFilter.cc b/src/mem/ruby/system/BulkBloomFilter.cc
index 3408dfada..6d5c3f240 100644
--- a/src/mem/ruby/system/BulkBloomFilter.cc
+++ b/src/mem/ruby/system/BulkBloomFilter.cc
@@ -35,9 +35,9 @@
*
*/
-#include "BulkBloomFilter.hh"
-#include "Map.hh"
-#include "Address.hh"
+#include "mem/ruby/system/BulkBloomFilter.hh"
+#include "mem/gems_common/Map.hh"
+#include "mem/ruby/common/Address.hh"
BulkBloomFilter::BulkBloomFilter(string str)
{
diff --git a/src/mem/ruby/system/BulkBloomFilter.hh b/src/mem/ruby/system/BulkBloomFilter.hh
index f05b83a87..8c5276517 100644
--- a/src/mem/ruby/system/BulkBloomFilter.hh
+++ b/src/mem/ruby/system/BulkBloomFilter.hh
@@ -38,12 +38,12 @@
#ifndef BULK_BLOOM_FILTER_H
#define BULK_BLOOM_FILTER_H
-#include "Map.hh"
-#include "Global.hh"
-#include "AbstractChip.hh"
-#include "RubyConfig.hh"
-#include "Address.hh"
-#include "AbstractBloomFilter.hh"
+#include "mem/gems_common/Map.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/slicc_interface/AbstractChip.hh"
+#include "mem/ruby/config/RubyConfig.hh"
+#include "mem/ruby/common/Address.hh"
+#include "mem/ruby/system/AbstractBloomFilter.hh"
class BulkBloomFilter : public AbstractBloomFilter {
public:
diff --git a/src/mem/ruby/system/CacheMemory.hh b/src/mem/ruby/system/CacheMemory.hh
index 9344f1463..4217a8685 100644
--- a/src/mem/ruby/system/CacheMemory.hh
+++ b/src/mem/ruby/system/CacheMemory.hh
@@ -38,18 +38,18 @@
#ifndef CACHEMEMORY_H
#define CACHEMEMORY_H
-#include "AbstractChip.hh"
-#include "Global.hh"
-#include "AccessPermission.hh"
-#include "Address.hh"
-#include "CacheRecorder.hh"
-#include "CacheRequestType.hh"
-#include "Vector.hh"
-#include "DataBlock.hh"
-#include "MachineType.hh"
-#include "RubySlicc_ComponentMapping.hh"
-#include "PseudoLRUPolicy.hh"
-#include "LRUPolicy.hh"
+#include "mem/ruby/slicc_interface/AbstractChip.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/protocol/AccessPermission.hh"
+#include "mem/ruby/common/Address.hh"
+#include "mem/ruby/recorder/CacheRecorder.hh"
+#include "mem/protocol/CacheRequestType.hh"
+#include "mem/gems_common/Vector.hh"
+#include "mem/ruby/common/DataBlock.hh"
+#include "mem/protocol/MachineType.hh"
+#include "mem/ruby/slicc_interface/RubySlicc_ComponentMapping.hh"
+#include "mem/ruby/system/PseudoLRUPolicy.hh"
+#include "mem/ruby/system/LRUPolicy.hh"
#include <vector>
template<class ENTRY>
diff --git a/src/mem/ruby/system/DirectoryMemory.cc b/src/mem/ruby/system/DirectoryMemory.cc
index 3a37884db..d4c85cbea 100644
--- a/src/mem/ruby/system/DirectoryMemory.cc
+++ b/src/mem/ruby/system/DirectoryMemory.cc
@@ -36,12 +36,12 @@
*
*/
-#include "System.hh"
-#include "Driver.hh"
-#include "DirectoryMemory.hh"
-#include "RubySlicc_Util.hh"
-#include "RubyConfig.hh"
-#include "Chip.hh"
+#include "mem/ruby/system/System.hh"
+#include "mem/ruby/common/Driver.hh"
+#include "mem/ruby/system/DirectoryMemory.hh"
+#include "mem/ruby/slicc_interface/RubySlicc_Util.hh"
+#include "mem/ruby/config/RubyConfig.hh"
+#include "mem/protocol/Chip.hh"
DirectoryMemory::DirectoryMemory(Chip* chip_ptr, int version)
{
diff --git a/src/mem/ruby/system/DirectoryMemory.hh b/src/mem/ruby/system/DirectoryMemory.hh
index 7c0831af6..94b7de9aa 100644
--- a/src/mem/ruby/system/DirectoryMemory.hh
+++ b/src/mem/ruby/system/DirectoryMemory.hh
@@ -39,9 +39,9 @@
#ifndef DIRECTORYMEMORY_H
#define DIRECTORYMEMORY_H
-#include "Global.hh"
-#include "Address.hh"
-#include "Directory_Entry.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/common/Address.hh"
+#include "mem/protocol/Directory_Entry.hh"
class Chip;
diff --git a/src/mem/ruby/system/GenericBloomFilter.cc b/src/mem/ruby/system/GenericBloomFilter.cc
index 38dd7f437..da8ec4262 100644
--- a/src/mem/ruby/system/GenericBloomFilter.cc
+++ b/src/mem/ruby/system/GenericBloomFilter.cc
@@ -35,19 +35,19 @@
*
*/
-#include "Global.hh"
-#include "AbstractChip.hh"
-#include "RubyConfig.hh"
-#include "Address.hh"
-
-#include "GenericBloomFilter.hh"
-#include "LSB_CountingBloomFilter.hh"
-#include "NonCountingBloomFilter.hh"
-#include "BulkBloomFilter.hh"
-#include "BlockBloomFilter.hh"
-#include "MultiGrainBloomFilter.hh"
-#include "MultiBitSelBloomFilter.hh"
-#include "H3BloomFilter.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/slicc_interface/AbstractChip.hh"
+#include "mem/ruby/config/RubyConfig.hh"
+#include "mem/ruby/common/Address.hh"
+
+#include "mem/ruby/system/GenericBloomFilter.hh"
+#include "mem/ruby/system/LSB_CountingBloomFilter.hh"
+#include "mem/ruby/system/NonCountingBloomFilter.hh"
+#include "mem/ruby/system/BulkBloomFilter.hh"
+#include "mem/ruby/system/BlockBloomFilter.hh"
+#include "mem/ruby/system/MultiGrainBloomFilter.hh"
+#include "mem/ruby/system/MultiBitSelBloomFilter.hh"
+#include "mem/ruby/system/H3BloomFilter.hh"
GenericBloomFilter::GenericBloomFilter(AbstractChip* chip_ptr, string config)
{
diff --git a/src/mem/ruby/system/GenericBloomFilter.hh b/src/mem/ruby/system/GenericBloomFilter.hh
index 91cfdfd6e..11603b06f 100644
--- a/src/mem/ruby/system/GenericBloomFilter.hh
+++ b/src/mem/ruby/system/GenericBloomFilter.hh
@@ -38,11 +38,11 @@
#ifndef GENERIC_BLOOM_FILTER_H
#define GENERIC_BLOOM_FILTER_H
-#include "Global.hh"
-#include "AbstractChip.hh"
-#include "RubyConfig.hh"
-#include "Address.hh"
-#include "AbstractBloomFilter.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/slicc_interface/AbstractChip.hh"
+#include "mem/ruby/config/RubyConfig.hh"
+#include "mem/ruby/common/Address.hh"
+#include "mem/ruby/system/AbstractBloomFilter.hh"
class GenericBloomFilter {
public:
diff --git a/src/mem/ruby/system/H3BloomFilter.cc b/src/mem/ruby/system/H3BloomFilter.cc
index 43a47e873..8fed32814 100644
--- a/src/mem/ruby/system/H3BloomFilter.cc
+++ b/src/mem/ruby/system/H3BloomFilter.cc
@@ -35,9 +35,9 @@
*
*/
-#include "H3BloomFilter.hh"
-#include "Map.hh"
-#include "Address.hh"
+#include "mem/ruby/system/H3BloomFilter.hh"
+#include "mem/gems_common/Map.hh"
+#include "mem/ruby/common/Address.hh"
H3BloomFilter::H3BloomFilter(string str)
{
diff --git a/src/mem/ruby/system/H3BloomFilter.hh b/src/mem/ruby/system/H3BloomFilter.hh
index 9da6cdef5..0797b0c08 100644
--- a/src/mem/ruby/system/H3BloomFilter.hh
+++ b/src/mem/ruby/system/H3BloomFilter.hh
@@ -38,14 +38,14 @@
#ifndef H3_BLOOM_FILTER_H
#define H3_BLOOM_FILTER_H
-#include "Map.hh"
-#include "Global.hh"
-#include "AbstractChip.hh"
-#include "System.hh"
-#include "Profiler.hh"
-#include "RubyConfig.hh"
-#include "Address.hh"
-#include "AbstractBloomFilter.hh"
+#include "mem/gems_common/Map.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/slicc_interface/AbstractChip.hh"
+#include "mem/ruby/system/System.hh"
+#include "mem/ruby/profiler/Profiler.hh"
+#include "mem/ruby/config/RubyConfig.hh"
+#include "mem/ruby/common/Address.hh"
+#include "mem/ruby/system/AbstractBloomFilter.hh"
static int H3[64][16] = {
{
diff --git a/src/mem/ruby/system/LRUPolicy.hh b/src/mem/ruby/system/LRUPolicy.hh
index ea621bf4b..184eb876d 100644
--- a/src/mem/ruby/system/LRUPolicy.hh
+++ b/src/mem/ruby/system/LRUPolicy.hh
@@ -2,7 +2,7 @@
#ifndef LRUPOLICY_H
#define LRUPOLICY_H
-#include "AbstractReplacementPolicy.hh"
+#include "mem/ruby/system/AbstractReplacementPolicy.hh"
/* Simple true LRU replacement policy */
diff --git a/src/mem/ruby/system/LSB_CountingBloomFilter.cc b/src/mem/ruby/system/LSB_CountingBloomFilter.cc
index ddfa97f5f..f3b533b90 100644
--- a/src/mem/ruby/system/LSB_CountingBloomFilter.cc
+++ b/src/mem/ruby/system/LSB_CountingBloomFilter.cc
@@ -35,9 +35,9 @@
*
*/
-#include "LSB_CountingBloomFilter.hh"
-#include "Map.hh"
-#include "Address.hh"
+#include "mem/ruby/system/LSB_CountingBloomFilter.hh"
+#include "mem/gems_common/Map.hh"
+#include "mem/ruby/common/Address.hh"
LSB_CountingBloomFilter::LSB_CountingBloomFilter(string str)
{
diff --git a/src/mem/ruby/system/LSB_CountingBloomFilter.hh b/src/mem/ruby/system/LSB_CountingBloomFilter.hh
index 5b0cdc87c..fb039cea7 100644
--- a/src/mem/ruby/system/LSB_CountingBloomFilter.hh
+++ b/src/mem/ruby/system/LSB_CountingBloomFilter.hh
@@ -38,12 +38,12 @@
#ifndef LSB_COUNTING_BLOOM_FILTER_H
#define LSB_COUNTING_BLOOM_FILTER_H
-#include "Map.hh"
-#include "Global.hh"
-#include "AbstractChip.hh"
-#include "RubyConfig.hh"
-#include "Address.hh"
-#include "AbstractBloomFilter.hh"
+#include "mem/gems_common/Map.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/slicc_interface/AbstractChip.hh"
+#include "mem/ruby/config/RubyConfig.hh"
+#include "mem/ruby/common/Address.hh"
+#include "mem/ruby/system/AbstractBloomFilter.hh"
class LSB_CountingBloomFilter : public AbstractBloomFilter {
public:
diff --git a/src/mem/ruby/system/MachineID.hh b/src/mem/ruby/system/MachineID.hh
index 2f294dc54..4515fe7fa 100644
--- a/src/mem/ruby/system/MachineID.hh
+++ b/src/mem/ruby/system/MachineID.hh
@@ -39,9 +39,9 @@
#ifndef MACHINEID_H
#define MACHINEID_H
-#include "Global.hh"
-#include "util.hh"
-#include "MachineType.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/gems_common/util.hh"
+#include "mem/protocol/MachineType.hh"
struct MachineID {
MachineType type;
diff --git a/src/mem/ruby/system/MemoryControl.cc b/src/mem/ruby/system/MemoryControl.cc
index e9f8a5ca8..eeb2f2fef 100644
--- a/src/mem/ruby/system/MemoryControl.cc
+++ b/src/mem/ruby/system/MemoryControl.cc
@@ -110,19 +110,19 @@
*
*/
-#include "Global.hh"
-#include "Map.hh"
-#include "Address.hh"
-#include "Profiler.hh"
-#include "AbstractChip.hh"
-#include "System.hh"
-#include "RubySlicc_ComponentMapping.hh"
-#include "NetworkMessage.hh"
-#include "Network.hh"
-
-#include "Consumer.hh"
-
-#include "MemoryControl.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/gems_common/Map.hh"
+#include "mem/ruby/common/Address.hh"
+#include "mem/ruby/profiler/Profiler.hh"
+#include "mem/ruby/slicc_interface/AbstractChip.hh"
+#include "mem/ruby/system/System.hh"
+#include "mem/ruby/slicc_interface/RubySlicc_ComponentMapping.hh"
+#include "mem/ruby/slicc_interface/NetworkMessage.hh"
+#include "mem/ruby/network/Network.hh"
+
+#include "mem/ruby/common/Consumer.hh"
+
+#include "mem/ruby/system/MemoryControl.hh"
#include <list>
diff --git a/src/mem/ruby/system/MemoryControl.hh b/src/mem/ruby/system/MemoryControl.hh
index ee71b8f51..a98181b0b 100644
--- a/src/mem/ruby/system/MemoryControl.hh
+++ b/src/mem/ruby/system/MemoryControl.hh
@@ -39,19 +39,19 @@
#ifndef MEMORY_CONTROL_H
#define MEMORY_CONTROL_H
-#include "Global.hh"
-#include "Map.hh"
-#include "Address.hh"
-#include "Profiler.hh"
-#include "AbstractChip.hh"
-#include "System.hh"
-#include "Message.hh"
-#include "util.hh"
-#include "MemoryNode.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/gems_common/Map.hh"
+#include "mem/ruby/common/Address.hh"
+#include "mem/ruby/profiler/Profiler.hh"
+#include "mem/ruby/slicc_interface/AbstractChip.hh"
+#include "mem/ruby/system/System.hh"
+#include "mem/ruby/slicc_interface/Message.hh"
+#include "mem/gems_common/util.hh"
+#include "mem/ruby/system/MemoryNode.hh"
// Note that "MemoryMsg" is in the "generated" directory:
-#include "MemoryMsg.hh"
-#include "Consumer.hh"
-#include "AbstractMemOrCache.hh"
+#include "mem/protocol/MemoryMsg.hh"
+#include "mem/ruby/common/Consumer.hh"
+#include "mem/ruby/system/AbstractMemOrCache.hh"
#include <list>
diff --git a/src/mem/ruby/system/MemoryNode.cc b/src/mem/ruby/system/MemoryNode.cc
index 5cba14eff..be93fae85 100644
--- a/src/mem/ruby/system/MemoryNode.cc
+++ b/src/mem/ruby/system/MemoryNode.cc
@@ -25,7 +25,7 @@
*
*/
-#include "MemoryNode.hh"
+#include "mem/ruby/system/MemoryNode.hh"
void MemoryNode::print(ostream& out) const
{
diff --git a/src/mem/ruby/system/MemoryNode.hh b/src/mem/ruby/system/MemoryNode.hh
index e6cce6c45..95d4227f9 100644
--- a/src/mem/ruby/system/MemoryNode.hh
+++ b/src/mem/ruby/system/MemoryNode.hh
@@ -28,9 +28,9 @@
#ifndef MEMORYNODE_H
#define MEMORYNODE_H
-#include "Global.hh"
-#include "Message.hh"
-#include "MemoryRequestType.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/slicc_interface/Message.hh"
+#include "mem/protocol/MemoryRequestType.hh"
class MemoryNode {
diff --git a/src/mem/ruby/system/MultiBitSelBloomFilter.cc b/src/mem/ruby/system/MultiBitSelBloomFilter.cc
index a42463d1e..8083506db 100644
--- a/src/mem/ruby/system/MultiBitSelBloomFilter.cc
+++ b/src/mem/ruby/system/MultiBitSelBloomFilter.cc
@@ -35,9 +35,9 @@
*
*/
-#include "MultiBitSelBloomFilter.hh"
-#include "Map.hh"
-#include "Address.hh"
+#include "mem/ruby/system/MultiBitSelBloomFilter.hh"
+#include "mem/gems_common/Map.hh"
+#include "mem/ruby/common/Address.hh"
MultiBitSelBloomFilter::MultiBitSelBloomFilter(string str)
{
diff --git a/src/mem/ruby/system/MultiBitSelBloomFilter.hh b/src/mem/ruby/system/MultiBitSelBloomFilter.hh
index eaf4ff943..1fa7e7e63 100644
--- a/src/mem/ruby/system/MultiBitSelBloomFilter.hh
+++ b/src/mem/ruby/system/MultiBitSelBloomFilter.hh
@@ -38,14 +38,14 @@
#ifndef MULTIBITSEL_BLOOM_FILTER_H
#define MULTIBITSEL_BLOOM_FILTER_H
-#include "Map.hh"
-#include "Global.hh"
-#include "AbstractChip.hh"
-#include "System.hh"
-#include "Profiler.hh"
-#include "RubyConfig.hh"
-#include "Address.hh"
-#include "AbstractBloomFilter.hh"
+#include "mem/gems_common/Map.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/slicc_interface/AbstractChip.hh"
+#include "mem/ruby/system/System.hh"
+#include "mem/ruby/profiler/Profiler.hh"
+#include "mem/ruby/config/RubyConfig.hh"
+#include "mem/ruby/common/Address.hh"
+#include "mem/ruby/system/AbstractBloomFilter.hh"
class MultiBitSelBloomFilter : public AbstractBloomFilter {
public:
diff --git a/src/mem/ruby/system/MultiGrainBloomFilter.cc b/src/mem/ruby/system/MultiGrainBloomFilter.cc
index f1e110b12..2af95514f 100644
--- a/src/mem/ruby/system/MultiGrainBloomFilter.cc
+++ b/src/mem/ruby/system/MultiGrainBloomFilter.cc
@@ -35,9 +35,9 @@
*
*/
-#include "MultiGrainBloomFilter.hh"
-#include "Map.hh"
-#include "Address.hh"
+#include "mem/ruby/system/MultiGrainBloomFilter.hh"
+#include "mem/gems_common/Map.hh"
+#include "mem/ruby/common/Address.hh"
MultiGrainBloomFilter::MultiGrainBloomFilter(string str)
{
diff --git a/src/mem/ruby/system/MultiGrainBloomFilter.hh b/src/mem/ruby/system/MultiGrainBloomFilter.hh
index 692960853..943e5283b 100644
--- a/src/mem/ruby/system/MultiGrainBloomFilter.hh
+++ b/src/mem/ruby/system/MultiGrainBloomFilter.hh
@@ -38,12 +38,12 @@
#ifndef MULTIGRAIN_BLOOM_FILTER_H
#define MULTIGRAIN_BLOOM_FILTER_H
-#include "Map.hh"
-#include "Global.hh"
-#include "AbstractChip.hh"
-#include "RubyConfig.hh"
-#include "Address.hh"
-#include "AbstractBloomFilter.hh"
+#include "mem/gems_common/Map.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/slicc_interface/AbstractChip.hh"
+#include "mem/ruby/config/RubyConfig.hh"
+#include "mem/ruby/common/Address.hh"
+#include "mem/ruby/system/AbstractBloomFilter.hh"
class MultiGrainBloomFilter : public AbstractBloomFilter {
public:
diff --git a/src/mem/ruby/system/NodeID.hh b/src/mem/ruby/system/NodeID.hh
index 23df8bb46..04c339acc 100644
--- a/src/mem/ruby/system/NodeID.hh
+++ b/src/mem/ruby/system/NodeID.hh
@@ -39,8 +39,8 @@
#ifndef NODEID_H
#define NODEID_H
-#include "Global.hh"
-#include "util.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/gems_common/util.hh"
typedef int NodeID;
diff --git a/src/mem/ruby/system/NodePersistentTable.cc b/src/mem/ruby/system/NodePersistentTable.cc
index df2076c1e..0edd66c6b 100644
--- a/src/mem/ruby/system/NodePersistentTable.cc
+++ b/src/mem/ruby/system/NodePersistentTable.cc
@@ -32,12 +32,12 @@
*
*/
-#include "NodePersistentTable.hh"
-#include "Set.hh"
-#include "Map.hh"
-#include "Address.hh"
-#include "AbstractChip.hh"
-#include "util.hh"
+#include "mem/ruby/system/NodePersistentTable.hh"
+#include "mem/ruby/common/Set.hh"
+#include "mem/gems_common/Map.hh"
+#include "mem/ruby/common/Address.hh"
+#include "mem/ruby/slicc_interface/AbstractChip.hh"
+#include "mem/gems_common/util.hh"
// randomize so that handoffs are not locality-aware
// int persistent_randomize[] = {0, 4, 8, 12, 1, 5, 9, 13, 2, 6, 10, 14, 3, 7, 11, 15};
diff --git a/src/mem/ruby/system/NodePersistentTable.hh b/src/mem/ruby/system/NodePersistentTable.hh
index ac25552b8..32de2613e 100644
--- a/src/mem/ruby/system/NodePersistentTable.hh
+++ b/src/mem/ruby/system/NodePersistentTable.hh
@@ -37,9 +37,9 @@
#ifndef NodePersistentTable_H
#define NodePersistentTable_H
-#include "Global.hh"
-#include "NodeID.hh"
-#include "AccessType.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/system/NodeID.hh"
+#include "mem/protocol/AccessType.hh"
class AbstractChip;
diff --git a/src/mem/ruby/system/NonCountingBloomFilter.cc b/src/mem/ruby/system/NonCountingBloomFilter.cc
index 81e4adbcd..b8f35322d 100644
--- a/src/mem/ruby/system/NonCountingBloomFilter.cc
+++ b/src/mem/ruby/system/NonCountingBloomFilter.cc
@@ -35,9 +35,9 @@
*
*/
-#include "NonCountingBloomFilter.hh"
-#include "Map.hh"
-#include "Address.hh"
+#include "mem/ruby/system/NonCountingBloomFilter.hh"
+#include "mem/gems_common/Map.hh"
+#include "mem/ruby/common/Address.hh"
NonCountingBloomFilter::NonCountingBloomFilter(string str)
{
diff --git a/src/mem/ruby/system/NonCountingBloomFilter.hh b/src/mem/ruby/system/NonCountingBloomFilter.hh
index f2912c08c..46ae3e84a 100644
--- a/src/mem/ruby/system/NonCountingBloomFilter.hh
+++ b/src/mem/ruby/system/NonCountingBloomFilter.hh
@@ -38,12 +38,12 @@
#ifndef NONCOUNTING_BLOOM_FILTER_H
#define NONCOUNTING_BLOOM_FILTER_H
-#include "Map.hh"
-#include "Global.hh"
-#include "AbstractChip.hh"
-#include "RubyConfig.hh"
-#include "Address.hh"
-#include "AbstractBloomFilter.hh"
+#include "mem/gems_common/Map.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/slicc_interface/AbstractChip.hh"
+#include "mem/ruby/config/RubyConfig.hh"
+#include "mem/ruby/common/Address.hh"
+#include "mem/ruby/system/AbstractBloomFilter.hh"
class NonCountingBloomFilter : public AbstractBloomFilter {
public:
diff --git a/src/mem/ruby/system/PerfectCacheMemory.hh b/src/mem/ruby/system/PerfectCacheMemory.hh
index 39ad7a7b3..4578d0a44 100644
--- a/src/mem/ruby/system/PerfectCacheMemory.hh
+++ b/src/mem/ruby/system/PerfectCacheMemory.hh
@@ -39,12 +39,12 @@
#ifndef PERFECTCACHEMEMORY_H
#define PERFECTCACHEMEMORY_H
-#include "Global.hh"
-#include "Map.hh"
-#include "AccessPermission.hh"
-#include "RubyConfig.hh"
-#include "Address.hh"
-#include "AbstractChip.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/gems_common/Map.hh"
+#include "mem/protocol/AccessPermission.hh"
+#include "mem/ruby/config/RubyConfig.hh"
+#include "mem/ruby/common/Address.hh"
+#include "mem/ruby/slicc_interface/AbstractChip.hh"
template<class ENTRY>
class PerfectCacheLineState {
diff --git a/src/mem/ruby/system/PersistentArbiter.cc b/src/mem/ruby/system/PersistentArbiter.cc
index a0bbf6979..b44393301 100644
--- a/src/mem/ruby/system/PersistentArbiter.cc
+++ b/src/mem/ruby/system/PersistentArbiter.cc
@@ -27,10 +27,10 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "PersistentArbiter.hh"
-#include "Address.hh"
-#include "AbstractChip.hh"
-#include "util.hh"
+#include "mem/ruby/system/PersistentArbiter.hh"
+#include "mem/ruby/common/Address.hh"
+#include "mem/ruby/slicc_interface/AbstractChip.hh"
+#include "mem/gems_common/util.hh"
PersistentArbiter::PersistentArbiter(AbstractChip* chip_ptr)
{
diff --git a/src/mem/ruby/system/PersistentArbiter.hh b/src/mem/ruby/system/PersistentArbiter.hh
index cf78a5920..705d833f4 100644
--- a/src/mem/ruby/system/PersistentArbiter.hh
+++ b/src/mem/ruby/system/PersistentArbiter.hh
@@ -39,13 +39,13 @@
#ifndef PERSISTENTARBITER_H
#define PERSISTENTARBITER_H
-#include "Global.hh"
-#include "Vector.hh"
-#include "AbstractChip.hh"
-#include "AccessPermission.hh"
-#include "AccessType.hh"
-#include "RubyConfig.hh"
-#include "Address.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/gems_common/Vector.hh"
+#include "mem/ruby/slicc_interface/AbstractChip.hh"
+#include "mem/protocol/AccessPermission.hh"
+#include "mem/protocol/AccessType.hh"
+#include "mem/ruby/config/RubyConfig.hh"
+#include "mem/ruby/common/Address.hh"
struct ArbiterEntry {
bool valid;
diff --git a/src/mem/ruby/system/PersistentTable.cc b/src/mem/ruby/system/PersistentTable.cc
index 18c8b5736..146b91fed 100644
--- a/src/mem/ruby/system/PersistentTable.cc
+++ b/src/mem/ruby/system/PersistentTable.cc
@@ -32,12 +32,12 @@
*
*/
-#include "PersistentTable.hh"
-#include "NetDest.hh"
-#include "Map.hh"
-#include "Address.hh"
-#include "AbstractChip.hh"
-#include "util.hh"
+#include "mem/ruby/system/PersistentTable.hh"
+#include "mem/ruby/common/NetDest.hh"
+#include "mem/gems_common/Map.hh"
+#include "mem/ruby/common/Address.hh"
+#include "mem/ruby/slicc_interface/AbstractChip.hh"
+#include "mem/gems_common/util.hh"
// randomize so that handoffs are not locality-aware
// int persistent_randomize[] = {0, 4, 8, 12, 1, 5, 9, 13, 2, 6, 10, 14, 3, 7, 11, 15};
diff --git a/src/mem/ruby/system/PersistentTable.hh b/src/mem/ruby/system/PersistentTable.hh
index 306f66e1d..9f2e38fd7 100644
--- a/src/mem/ruby/system/PersistentTable.hh
+++ b/src/mem/ruby/system/PersistentTable.hh
@@ -37,9 +37,9 @@
#ifndef PersistentTable_H
#define PersistentTable_H
-#include "Global.hh"
-#include "MachineID.hh"
-#include "AccessType.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/system/MachineID.hh"
+#include "mem/protocol/AccessType.hh"
class AbstractChip;
diff --git a/src/mem/ruby/system/PseudoLRUPolicy.hh b/src/mem/ruby/system/PseudoLRUPolicy.hh
index 9d4d13a95..57a0b40e9 100644
--- a/src/mem/ruby/system/PseudoLRUPolicy.hh
+++ b/src/mem/ruby/system/PseudoLRUPolicy.hh
@@ -2,7 +2,7 @@
#ifndef PSEUDOLRUPOLICY_H
#define PSEUDOLRUPOLICY_H
-#include "AbstractReplacementPolicy.hh"
+#include "mem/ruby/system/AbstractReplacementPolicy.hh"
/**
* Implementation of tree-based pseudo-LRU replacement
diff --git a/src/mem/ruby/system/Sequencer.cc b/src/mem/ruby/system/Sequencer.cc
index 23efb9a0c..980152589 100644
--- a/src/mem/ruby/system/Sequencer.cc
+++ b/src/mem/ruby/system/Sequencer.cc
@@ -32,20 +32,20 @@
*
*/
-#include "Global.hh"
-#include "Sequencer.hh"
-#include "System.hh"
-#include "Protocol.hh"
-#include "Profiler.hh"
-#include "CacheMemory.hh"
-#include "RubyConfig.hh"
-//#include "Tracer.hh"
-#include "AbstractChip.hh"
-#include "Chip.hh"
-#include "Tester.hh"
-#include "SubBlock.hh"
-#include "Protocol.hh"
-#include "Map.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/system/Sequencer.hh"
+#include "mem/ruby/system/System.hh"
+#include "mem/protocol/Protocol.hh"
+#include "mem/ruby/profiler/Profiler.hh"
+#include "mem/ruby/system/CacheMemory.hh"
+#include "mem/ruby/config/RubyConfig.hh"
+//#include "mem/ruby/recorder/Tracer.hh"
+#include "mem/ruby/slicc_interface/AbstractChip.hh"
+#include "mem/protocol/Chip.hh"
+#include "mem/ruby/tester/Tester.hh"
+#include "mem/ruby/common/SubBlock.hh"
+#include "mem/protocol/Protocol.hh"
+#include "mem/gems_common/Map.hh"
Sequencer::Sequencer(AbstractChip* chip_ptr, int version) {
m_chip_ptr = chip_ptr;
diff --git a/src/mem/ruby/system/Sequencer.hh b/src/mem/ruby/system/Sequencer.hh
index a3924b949..f4cc03131 100644
--- a/src/mem/ruby/system/Sequencer.hh
+++ b/src/mem/ruby/system/Sequencer.hh
@@ -37,15 +37,15 @@
#ifndef SEQUENCER_H
#define SEQUENCER_H
-#include "Global.hh"
-#include "RubyConfig.hh"
-#include "Consumer.hh"
-#include "CacheRequestType.hh"
-#include "AccessModeType.hh"
-#include "GenericMachineType.hh"
-#include "PrefetchBit.hh"
-#include "Map.hh"
-#include "packet.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/config/RubyConfig.hh"
+#include "mem/ruby/common/Consumer.hh"
+#include "mem/protocol/CacheRequestType.hh"
+#include "mem/protocol/AccessModeType.hh"
+#include "mem/protocol/GenericMachineType.hh"
+#include "mem/protocol/PrefetchBit.hh"
+#include "mem/gems_common/Map.hh"
+#include "mem/packet.hh"
class DataBlock;
class AbstractChip;
diff --git a/src/mem/ruby/system/StoreBuffer.cc b/src/mem/ruby/system/StoreBuffer.cc
index 7e5682fde..4d67e55a5 100644
--- a/src/mem/ruby/system/StoreBuffer.cc
+++ b/src/mem/ruby/system/StoreBuffer.cc
@@ -32,18 +32,18 @@
*
*/
-#include "Global.hh"
-#include "RubyConfig.hh"
-#include "StoreBuffer.hh"
-#include "AbstractChip.hh"
-#include "System.hh"
-#include "Driver.hh"
-#include "Vector.hh"
-#include "RubyEventQueue.hh"
-#include "AddressProfiler.hh"
-#include "Sequencer.hh"
-#include "SubBlock.hh"
-#include "Profiler.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/config/RubyConfig.hh"
+#include "mem/ruby/system/StoreBuffer.hh"
+#include "mem/ruby/slicc_interface/AbstractChip.hh"
+#include "mem/ruby/system/System.hh"
+#include "mem/ruby/common/Driver.hh"
+#include "mem/gems_common/Vector.hh"
+#include "mem/ruby/eventqueue/RubyEventQueue.hh"
+#include "mem/ruby/profiler/AddressProfiler.hh"
+#include "mem/ruby/system/Sequencer.hh"
+#include "mem/ruby/common/SubBlock.hh"
+#include "mem/ruby/profiler/Profiler.hh"
// *** Begin Helper class ***
struct StoreBufferEntry {
diff --git a/src/mem/ruby/system/StoreBuffer.hh b/src/mem/ruby/system/StoreBuffer.hh
index 832e4f0bb..2fae52643 100644
--- a/src/mem/ruby/system/StoreBuffer.hh
+++ b/src/mem/ruby/system/StoreBuffer.hh
@@ -37,12 +37,12 @@
#ifndef StoreBuffer_H
#define StoreBuffer_H
-#include "Global.hh"
-#include "Consumer.hh"
-#include "Address.hh"
-#include "AccessModeType.hh"
-#include "CacheRequestType.hh"
-#include "StoreCache.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/common/Consumer.hh"
+#include "mem/ruby/common/Address.hh"
+#include "mem/protocol/AccessModeType.hh"
+#include "mem/protocol/CacheRequestType.hh"
+#include "mem/ruby/system/StoreCache.hh"
class CacheMsg;
class DataBlock;
diff --git a/src/mem/ruby/system/StoreCache.cc b/src/mem/ruby/system/StoreCache.cc
index bc25c50d6..a11b2ac50 100644
--- a/src/mem/ruby/system/StoreCache.cc
+++ b/src/mem/ruby/system/StoreCache.cc
@@ -32,13 +32,13 @@
*
*/
-#include "StoreCache.hh"
-#include "System.hh"
-#include "Driver.hh"
-#include "Vector.hh"
-#include "DataBlock.hh"
-#include "SubBlock.hh"
-#include "Map.hh"
+#include "mem/ruby/system/StoreCache.hh"
+#include "mem/ruby/system/System.hh"
+#include "mem/ruby/common/Driver.hh"
+#include "mem/gems_common/Vector.hh"
+#include "mem/ruby/common/DataBlock.hh"
+#include "mem/ruby/common/SubBlock.hh"
+#include "mem/gems_common/Map.hh"
// Helper class
struct StoreCacheEntry {
diff --git a/src/mem/ruby/system/StoreCache.hh b/src/mem/ruby/system/StoreCache.hh
index d92d39888..81eecde38 100644
--- a/src/mem/ruby/system/StoreCache.hh
+++ b/src/mem/ruby/system/StoreCache.hh
@@ -37,8 +37,8 @@
#ifndef StoreCache_H
#define StoreCache_H
-#include "Global.hh"
-#include "Address.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/common/Address.hh"
class DataBlock;
diff --git a/src/mem/ruby/system/System.cc b/src/mem/ruby/system/System.cc
index a38809e94..ae77d2a85 100644
--- a/src/mem/ruby/system/System.cc
+++ b/src/mem/ruby/system/System.cc
@@ -37,19 +37,19 @@
*/
-#include "System.hh"
-#include "Profiler.hh"
-#include "Network.hh"
-#include "Tester.hh"
-#include "SyntheticDriver.hh"
-#include "DeterministicDriver.hh"
-#include "Chip.hh"
-//#include "Tracer.hh"
-#include "Protocol.hh"
+#include "mem/ruby/system/System.hh"
+#include "mem/ruby/profiler/Profiler.hh"
+#include "mem/ruby/network/Network.hh"
+#include "mem/ruby/tester/Tester.hh"
+#include "mem/ruby/tester/SyntheticDriver.hh"
+#include "mem/ruby/tester/DeterministicDriver.hh"
+#include "mem/protocol/Chip.hh"
+//#include "mem/ruby/recorder/Tracer.hh"
+#include "mem/protocol/Protocol.hh"
//#include "XactIsolationChecker.hh" // gem5:Arka for decomissioning of log_tm
//#include "XactCommitArbiter.hh"
//#include "XactVisualizer.hh"
-#include "M5Driver.hh"
+#include "mem/ruby/interfaces/M5Driver.hh"
RubySystem::RubySystem()
{
diff --git a/src/mem/ruby/system/System.hh b/src/mem/ruby/system/System.hh
index f5b107240..12063eeed 100644
--- a/src/mem/ruby/system/System.hh
+++ b/src/mem/ruby/system/System.hh
@@ -41,12 +41,12 @@
#ifndef SYSTEM_H
#define SYSTEM_H
-#include "Global.hh"
-#include "Vector.hh"
-#include "Address.hh"
-#include "RubyConfig.hh"
-#include "MachineType.hh"
-#include "AbstractChip.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/gems_common/Vector.hh"
+#include "mem/ruby/common/Address.hh"
+#include "mem/ruby/config/RubyConfig.hh"
+#include "mem/protocol/MachineType.hh"
+#include "mem/ruby/slicc_interface/AbstractChip.hh"
class Profiler;
class Network;
diff --git a/src/mem/ruby/system/TBETable.hh b/src/mem/ruby/system/TBETable.hh
index ad1674dca..aa7e0df6e 100644
--- a/src/mem/ruby/system/TBETable.hh
+++ b/src/mem/ruby/system/TBETable.hh
@@ -39,12 +39,12 @@
#ifndef TBETABLE_H
#define TBETABLE_H
-#include "Global.hh"
-#include "Map.hh"
-#include "Address.hh"
-#include "Profiler.hh"
-#include "AbstractChip.hh"
-#include "System.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/gems_common/Map.hh"
+#include "mem/ruby/common/Address.hh"
+#include "mem/ruby/profiler/Profiler.hh"
+#include "mem/ruby/slicc_interface/AbstractChip.hh"
+#include "mem/ruby/system/System.hh"
template<class ENTRY>
class TBETable {
diff --git a/src/mem/ruby/system/TimerTable.cc b/src/mem/ruby/system/TimerTable.cc
index 48e548b5c..edc2de230 100644
--- a/src/mem/ruby/system/TimerTable.cc
+++ b/src/mem/ruby/system/TimerTable.cc
@@ -31,9 +31,9 @@
* $Id$
*/
-#include "Global.hh"
-#include "TimerTable.hh"
-#include "RubyEventQueue.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/system/TimerTable.hh"
+#include "mem/ruby/eventqueue/RubyEventQueue.hh"
TimerTable::TimerTable(Chip* chip_ptr)
{
diff --git a/src/mem/ruby/system/TimerTable.hh b/src/mem/ruby/system/TimerTable.hh
index c7f77efb1..36ac83fc6 100644
--- a/src/mem/ruby/system/TimerTable.hh
+++ b/src/mem/ruby/system/TimerTable.hh
@@ -39,9 +39,9 @@
#ifndef TIMERTABLE_H
#define TIMERTABLE_H
-#include "Global.hh"
-#include "Map.hh"
-#include "Address.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/gems_common/Map.hh"
+#include "mem/ruby/common/Address.hh"
class Consumer;
class Chip;
diff --git a/src/mem/ruby/tester/BarrierGenerator.cc b/src/mem/ruby/tester/BarrierGenerator.cc
index 79b9c6d2b..9dbcf39fd 100644
--- a/src/mem/ruby/tester/BarrierGenerator.cc
+++ b/src/mem/ruby/tester/BarrierGenerator.cc
@@ -32,13 +32,13 @@
*
*/
-#include "BarrierGenerator.hh"
-#include "Sequencer.hh"
-#include "System.hh"
-#include "RubyConfig.hh"
-#include "SubBlock.hh"
-#include "SyntheticDriver.hh"
-#include "Chip.hh"
+#include "mem/ruby/tester/BarrierGenerator.hh"
+#include "mem/ruby/system/Sequencer.hh"
+#include "mem/ruby/system/System.hh"
+#include "mem/ruby/config/RubyConfig.hh"
+#include "mem/ruby/common/SubBlock.hh"
+#include "mem/ruby/tester/SyntheticDriver.hh"
+#include "mem/protocol/Chip.hh"
BarrierGenerator::BarrierGenerator(NodeID node, SyntheticDriver& driver) :
m_driver(driver)
diff --git a/src/mem/ruby/tester/BarrierGenerator.hh b/src/mem/ruby/tester/BarrierGenerator.hh
index 1b16755a5..e0fa497da 100644
--- a/src/mem/ruby/tester/BarrierGenerator.hh
+++ b/src/mem/ruby/tester/BarrierGenerator.hh
@@ -37,10 +37,10 @@
#ifndef BARRIERGENERATOR_H
#define BARRIERGENERATOR_H
-#include "Global.hh"
-#include "Consumer.hh"
-#include "NodeID.hh"
-#include "Address.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/common/Consumer.hh"
+#include "mem/ruby/system/NodeID.hh"
+#include "mem/ruby/common/Address.hh"
class Sequencer;
class SubBlock;
diff --git a/src/mem/ruby/tester/Check.cc b/src/mem/ruby/tester/Check.cc
index 0b278d110..ea26489a3 100644
--- a/src/mem/ruby/tester/Check.cc
+++ b/src/mem/ruby/tester/Check.cc
@@ -32,11 +32,11 @@
*
*/
-#include "Check.hh"
-#include "Sequencer.hh"
-#include "System.hh"
-#include "SubBlock.hh"
-#include "Chip.hh"
+#include "mem/ruby/tester/Check.hh"
+#include "mem/ruby/system/Sequencer.hh"
+#include "mem/ruby/system/System.hh"
+#include "mem/ruby/common/SubBlock.hh"
+#include "mem/protocol/Chip.hh"
Check::Check(const Address& address, const Address& pc)
{
diff --git a/src/mem/ruby/tester/Check.hh b/src/mem/ruby/tester/Check.hh
index 31959262d..8f08b3f40 100644
--- a/src/mem/ruby/tester/Check.hh
+++ b/src/mem/ruby/tester/Check.hh
@@ -37,11 +37,11 @@
#ifndef CHECK_H
#define CHECK_H
-#include "Global.hh"
-#include "Address.hh"
-#include "NodeID.hh"
-#include "TesterStatus.hh"
-#include "AccessModeType.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/common/Address.hh"
+#include "mem/ruby/system/NodeID.hh"
+#include "mem/protocol/TesterStatus.hh"
+#include "mem/protocol/AccessModeType.hh"
class Sequencer;
class SubBlock;
diff --git a/src/mem/ruby/tester/CheckTable.cc b/src/mem/ruby/tester/CheckTable.cc
index 488b58144..b8e57a646 100644
--- a/src/mem/ruby/tester/CheckTable.cc
+++ b/src/mem/ruby/tester/CheckTable.cc
@@ -32,9 +32,9 @@
*
*/
-#include "CheckTable.hh"
-#include "Check.hh"
-#include "Map.hh"
+#include "mem/ruby/tester/CheckTable.hh"
+#include "mem/ruby/tester/Check.hh"
+#include "mem/gems_common/Map.hh"
CheckTable::CheckTable()
{
diff --git a/src/mem/ruby/tester/CheckTable.hh b/src/mem/ruby/tester/CheckTable.hh
index 4a162f5bc..a7f486315 100644
--- a/src/mem/ruby/tester/CheckTable.hh
+++ b/src/mem/ruby/tester/CheckTable.hh
@@ -37,8 +37,8 @@
#ifndef CHECKTABLE_H
#define CHECKTABLE_H
-#include "Global.hh"
-#include "Vector.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/gems_common/Vector.hh"
class Address;
class Check;
diff --git a/src/mem/ruby/tester/DetermGETXGenerator.cc b/src/mem/ruby/tester/DetermGETXGenerator.cc
index 7e9c500c9..d496cbe3a 100644
--- a/src/mem/ruby/tester/DetermGETXGenerator.cc
+++ b/src/mem/ruby/tester/DetermGETXGenerator.cc
@@ -35,15 +35,15 @@
// This Deterministic Generator generates GETX requests for all nodes in the system
// The GETX requests are generated one at a time in round-robin fashion 0...1...2...etc.
-#include "DetermGETXGenerator.hh"
-#include "DetermGETXGeneratorStatus.hh"
-#include "LockStatus.hh"
-#include "Sequencer.hh"
-#include "System.hh"
-#include "RubyConfig.hh"
-#include "SubBlock.hh"
-#include "DeterministicDriver.hh"
-#include "Chip.hh"
+#include "mem/ruby/tester/DetermGETXGenerator.hh"
+#include "mem/protocol/DetermGETXGeneratorStatus.hh"
+#include "mem/protocol/LockStatus.hh"
+#include "mem/ruby/system/Sequencer.hh"
+#include "mem/ruby/system/System.hh"
+#include "mem/ruby/config/RubyConfig.hh"
+#include "mem/ruby/common/SubBlock.hh"
+#include "mem/ruby/tester/DeterministicDriver.hh"
+#include "mem/protocol/Chip.hh"
DetermGETXGenerator::DetermGETXGenerator(NodeID node, DeterministicDriver& driver) :
m_driver(driver)
diff --git a/src/mem/ruby/tester/DetermGETXGenerator.hh b/src/mem/ruby/tester/DetermGETXGenerator.hh
index eff1eb6b3..1f5b67653 100644
--- a/src/mem/ruby/tester/DetermGETXGenerator.hh
+++ b/src/mem/ruby/tester/DetermGETXGenerator.hh
@@ -40,12 +40,12 @@
#ifndef DETERMGETXGENERATOR_H
#define DETERMGETXGENERATOR_H
-#include "Global.hh"
-#include "Consumer.hh"
-#include "DetermGETXGeneratorStatus.hh"
-#include "NodeID.hh"
-#include "Address.hh"
-#include "SpecifiedGenerator.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/common/Consumer.hh"
+#include "mem/protocol/DetermGETXGeneratorStatus.hh"
+#include "mem/ruby/system/NodeID.hh"
+#include "mem/ruby/common/Address.hh"
+#include "mem/ruby/tester/SpecifiedGenerator.hh"
class Sequencer;
class SubBlock;
diff --git a/src/mem/ruby/tester/DetermInvGenerator.cc b/src/mem/ruby/tester/DetermInvGenerator.cc
index 07c1a4b01..50d7162ab 100644
--- a/src/mem/ruby/tester/DetermInvGenerator.cc
+++ b/src/mem/ruby/tester/DetermInvGenerator.cc
@@ -36,15 +36,15 @@
// then Invalidates them with a GETX. The GETS and GETX request are generated one
// at a time in round-robin fashion 0...1...2...etc.
-#include "DetermInvGenerator.hh"
-#include "DetermInvGeneratorStatus.hh"
-#include "LockStatus.hh"
-#include "Sequencer.hh"
-#include "System.hh"
-#include "RubyConfig.hh"
-#include "SubBlock.hh"
-#include "DeterministicDriver.hh"
-#include "Chip.hh"
+#include "mem/ruby/tester/DetermInvGenerator.hh"
+#include "mem/protocol/DetermInvGeneratorStatus.hh"
+#include "mem/protocol/LockStatus.hh"
+#include "mem/ruby/system/Sequencer.hh"
+#include "mem/ruby/system/System.hh"
+#include "mem/ruby/config/RubyConfig.hh"
+#include "mem/ruby/common/SubBlock.hh"
+#include "mem/ruby/tester/DeterministicDriver.hh"
+#include "mem/protocol/Chip.hh"
DetermInvGenerator::DetermInvGenerator(NodeID node, DeterministicDriver& driver) :
m_driver(driver)
diff --git a/src/mem/ruby/tester/DetermInvGenerator.hh b/src/mem/ruby/tester/DetermInvGenerator.hh
index a72895f3f..4f0712fbe 100644
--- a/src/mem/ruby/tester/DetermInvGenerator.hh
+++ b/src/mem/ruby/tester/DetermInvGenerator.hh
@@ -41,12 +41,12 @@
#ifndef DETERMINVGENERATOR_H
#define DETERMINVGENERATOR_H
-#include "Global.hh"
-#include "Consumer.hh"
-#include "DetermInvGeneratorStatus.hh"
-#include "NodeID.hh"
-#include "Address.hh"
-#include "SpecifiedGenerator.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/common/Consumer.hh"
+#include "mem/protocol/DetermInvGeneratorStatus.hh"
+#include "mem/ruby/system/NodeID.hh"
+#include "mem/ruby/common/Address.hh"
+#include "mem/ruby/tester/SpecifiedGenerator.hh"
class Sequencer;
class SubBlock;
diff --git a/src/mem/ruby/tester/DetermSeriesGETSGenerator.cc b/src/mem/ruby/tester/DetermSeriesGETSGenerator.cc
index 479b8b617..67fca6fe0 100644
--- a/src/mem/ruby/tester/DetermSeriesGETSGenerator.cc
+++ b/src/mem/ruby/tester/DetermSeriesGETSGenerator.cc
@@ -32,15 +32,15 @@
*
*/
-#include "DetermSeriesGETSGenerator.hh"
-#include "DetermSeriesGETSGeneratorStatus.hh"
-#include "LockStatus.hh"
-#include "Sequencer.hh"
-#include "System.hh"
-#include "RubyConfig.hh"
-#include "SubBlock.hh"
-#include "DeterministicDriver.hh"
-#include "Chip.hh"
+#include "mem/ruby/tester/DetermSeriesGETSGenerator.hh"
+#include "mem/protocol/DetermSeriesGETSGeneratorStatus.hh"
+#include "mem/protocol/LockStatus.hh"
+#include "mem/ruby/system/Sequencer.hh"
+#include "mem/ruby/system/System.hh"
+#include "mem/ruby/config/RubyConfig.hh"
+#include "mem/ruby/common/SubBlock.hh"
+#include "mem/ruby/tester/DeterministicDriver.hh"
+#include "mem/protocol/Chip.hh"
DetermSeriesGETSGenerator::DetermSeriesGETSGenerator(NodeID node, DeterministicDriver& driver) :
m_driver(driver)
diff --git a/src/mem/ruby/tester/DetermSeriesGETSGenerator.hh b/src/mem/ruby/tester/DetermSeriesGETSGenerator.hh
index 25d4886a0..1e44dc3bc 100644
--- a/src/mem/ruby/tester/DetermSeriesGETSGenerator.hh
+++ b/src/mem/ruby/tester/DetermSeriesGETSGenerator.hh
@@ -42,12 +42,12 @@
#ifndef DETERMSERIESGETSGENERATOR_H
#define DETERMSERIESGETSGENERATOR_H
-#include "Global.hh"
-#include "Consumer.hh"
-#include "DetermSeriesGETSGeneratorStatus.hh"
-#include "NodeID.hh"
-#include "Address.hh"
-#include "SpecifiedGenerator.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/common/Consumer.hh"
+#include "mem/protocol/DetermSeriesGETSGeneratorStatus.hh"
+#include "mem/ruby/system/NodeID.hh"
+#include "mem/ruby/common/Address.hh"
+#include "mem/ruby/tester/SpecifiedGenerator.hh"
class Sequencer;
class SubBlock;
diff --git a/src/mem/ruby/tester/DeterministicDriver.cc b/src/mem/ruby/tester/DeterministicDriver.cc
index ff9d3da14..2ea82c77c 100644
--- a/src/mem/ruby/tester/DeterministicDriver.cc
+++ b/src/mem/ruby/tester/DeterministicDriver.cc
@@ -32,16 +32,16 @@
*
*/
-#include "Global.hh"
-#include "System.hh"
-#include "DeterministicDriver.hh"
-#include "RubyEventQueue.hh"
-#include "SpecifiedGenerator.hh"
-#include "DetermGETXGenerator.hh"
-#include "DetermInvGenerator.hh"
-#include "DetermSeriesGETSGenerator.hh"
-#include "SubBlock.hh"
-#include "Chip.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/system/System.hh"
+#include "mem/ruby/tester/DeterministicDriver.hh"
+#include "mem/ruby/eventqueue/RubyEventQueue.hh"
+#include "mem/ruby/tester/SpecifiedGenerator.hh"
+#include "mem/ruby/tester/DetermGETXGenerator.hh"
+#include "mem/ruby/tester/DetermInvGenerator.hh"
+#include "mem/ruby/tester/DetermSeriesGETSGenerator.hh"
+#include "mem/ruby/common/SubBlock.hh"
+#include "mem/protocol/Chip.hh"
DeterministicDriver::DeterministicDriver(RubySystem* sys_ptr)
{
diff --git a/src/mem/ruby/tester/DeterministicDriver.hh b/src/mem/ruby/tester/DeterministicDriver.hh
index d501a2fce..d253b7e51 100644
--- a/src/mem/ruby/tester/DeterministicDriver.hh
+++ b/src/mem/ruby/tester/DeterministicDriver.hh
@@ -37,10 +37,10 @@
#ifndef DETERMINISTICDRIVER_H
#define DETERMINISTICDRIVER_H
-#include "Global.hh"
-#include "Driver.hh"
-#include "Histogram.hh"
-#include "CacheRequestType.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/common/Driver.hh"
+#include "mem/ruby/common/Histogram.hh"
+#include "mem/protocol/CacheRequestType.hh"
class RubySystem;
class SpecifiedGenerator;
diff --git a/src/mem/ruby/tester/Instruction.cc b/src/mem/ruby/tester/Instruction.cc
index 8528a4094..1f4d56fc2 100644
--- a/src/mem/ruby/tester/Instruction.cc
+++ b/src/mem/ruby/tester/Instruction.cc
@@ -23,7 +23,7 @@
*
*/
-#include "Instruction.hh"
+#include "mem/ruby/tester/Instruction.hh"
Instruction::Instruction(){
m_opcode = Opcode_NUM_OPCODES;
diff --git a/src/mem/ruby/tester/Instruction.hh b/src/mem/ruby/tester/Instruction.hh
index 674447056..fe5540b00 100644
--- a/src/mem/ruby/tester/Instruction.hh
+++ b/src/mem/ruby/tester/Instruction.hh
@@ -26,7 +26,7 @@
#ifndef INSTRUCTION_H
#define INSTRUCTION_H
-#include "Address.hh"
+#include "mem/ruby/common/Address.hh"
enum Opcode {
diff --git a/src/mem/ruby/tester/RaceyDriver.cc b/src/mem/ruby/tester/RaceyDriver.cc
index c5cdcaa4b..6ea9ec795 100644
--- a/src/mem/ruby/tester/RaceyDriver.cc
+++ b/src/mem/ruby/tester/RaceyDriver.cc
@@ -32,12 +32,12 @@
*
*/
-#include "Global.hh"
-#include "System.hh"
-#include "RaceyDriver.hh"
-#include "RubyEventQueue.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/system/System.hh"
+#include "mem/ruby/tester/RaceyDriver.hh"
+#include "mem/ruby/eventqueue/RubyEventQueue.hh"
#include "RaceyPseudoThread.hh"
-#include "SubBlock.hh"
+#include "mem/ruby/common/SubBlock.hh"
RaceyDriver::RaceyDriver()
{
diff --git a/src/mem/ruby/tester/RaceyDriver.hh b/src/mem/ruby/tester/RaceyDriver.hh
index a1a821b96..a3e35b47c 100644
--- a/src/mem/ruby/tester/RaceyDriver.hh
+++ b/src/mem/ruby/tester/RaceyDriver.hh
@@ -38,8 +38,8 @@
#ifndef RACEYDRIVER_H
#define RACEYDRIVER_H
-#include "Global.hh"
-#include "Driver.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/common/Driver.hh"
class RaceyPseudoThread;
diff --git a/src/mem/ruby/tester/RequestGenerator.cc b/src/mem/ruby/tester/RequestGenerator.cc
index b216e06fe..c1772f905 100644
--- a/src/mem/ruby/tester/RequestGenerator.cc
+++ b/src/mem/ruby/tester/RequestGenerator.cc
@@ -32,15 +32,15 @@
*
*/
-#include "RequestGenerator.hh"
-#include "RequestGeneratorStatus.hh"
-#include "LockStatus.hh"
-#include "Sequencer.hh"
-#include "System.hh"
-#include "RubyConfig.hh"
-#include "SubBlock.hh"
-#include "SyntheticDriver.hh"
-#include "Chip.hh"
+#include "mem/ruby/tester/RequestGenerator.hh"
+#include "mem/protocol/RequestGeneratorStatus.hh"
+#include "mem/protocol/LockStatus.hh"
+#include "mem/ruby/system/Sequencer.hh"
+#include "mem/ruby/system/System.hh"
+#include "mem/ruby/config/RubyConfig.hh"
+#include "mem/ruby/common/SubBlock.hh"
+#include "mem/ruby/tester/SyntheticDriver.hh"
+#include "mem/protocol/Chip.hh"
RequestGenerator::RequestGenerator(NodeID node, SyntheticDriver& driver) :
m_driver(driver)
diff --git a/src/mem/ruby/tester/RequestGenerator.hh b/src/mem/ruby/tester/RequestGenerator.hh
index 3296f7951..2859eb436 100644
--- a/src/mem/ruby/tester/RequestGenerator.hh
+++ b/src/mem/ruby/tester/RequestGenerator.hh
@@ -37,11 +37,11 @@
#ifndef REQUESTGENERATOR_H
#define REQUESTGENERATOR_H
-#include "Global.hh"
-#include "Consumer.hh"
-#include "RequestGeneratorStatus.hh"
-#include "NodeID.hh"
-#include "Address.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/common/Consumer.hh"
+#include "mem/protocol/RequestGeneratorStatus.hh"
+#include "mem/ruby/system/NodeID.hh"
+#include "mem/ruby/common/Address.hh"
class Sequencer;
class SubBlock;
diff --git a/src/mem/ruby/tester/SpecifiedGenerator.cc b/src/mem/ruby/tester/SpecifiedGenerator.cc
index e6ee802d4..17f827ee8 100644
--- a/src/mem/ruby/tester/SpecifiedGenerator.cc
+++ b/src/mem/ruby/tester/SpecifiedGenerator.cc
@@ -32,11 +32,11 @@
*
*/
-#include "SpecifiedGenerator.hh"
-#include "Sequencer.hh"
-#include "System.hh"
-#include "SubBlock.hh"
-#include "SyntheticDriver.hh"
+#include "mem/ruby/tester/SpecifiedGenerator.hh"
+#include "mem/ruby/system/Sequencer.hh"
+#include "mem/ruby/system/System.hh"
+#include "mem/ruby/common/SubBlock.hh"
+#include "mem/ruby/tester/SyntheticDriver.hh"
SpecifiedGenerator::SpecifiedGenerator()
{
diff --git a/src/mem/ruby/tester/SpecifiedGenerator.hh b/src/mem/ruby/tester/SpecifiedGenerator.hh
index d22c56f49..9b4c71623 100644
--- a/src/mem/ruby/tester/SpecifiedGenerator.hh
+++ b/src/mem/ruby/tester/SpecifiedGenerator.hh
@@ -37,9 +37,9 @@
#ifndef SPECIFIEDGENERATOR_H
#define SPECIFIEDGENERATOR_H
-#include "Global.hh"
-#include "Consumer.hh"
-#include "NodeID.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/common/Consumer.hh"
+#include "mem/ruby/system/NodeID.hh"
class Sequencer;
class SubBlock;
diff --git a/src/mem/ruby/tester/SyntheticDriver.cc b/src/mem/ruby/tester/SyntheticDriver.cc
index f5986de15..f74b69d0b 100644
--- a/src/mem/ruby/tester/SyntheticDriver.cc
+++ b/src/mem/ruby/tester/SyntheticDriver.cc
@@ -32,17 +32,17 @@
*
*/
-#include "Global.hh"
-#include "System.hh"
-#include "SyntheticDriver.hh"
-#include "RubyEventQueue.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/system/System.hh"
+#include "mem/ruby/tester/SyntheticDriver.hh"
+#include "mem/ruby/eventqueue/RubyEventQueue.hh"
//#ifndef XACT_MEM
-#include "RequestGenerator.hh"
+#include "mem/ruby/tester/RequestGenerator.hh"
//#endif
-//#include "XactAbortRequestGenerator.hh"
-//#include "XactRequestGenerator.hh"
-#include "SubBlock.hh"
-#include "Chip.hh"
+//#include "mem/ruby/tester/XactAbortRequestGenerator.hh"
+//#include "mem/ruby/tester/XactRequestGenerator.hh"
+#include "mem/ruby/common/SubBlock.hh"
+#include "mem/protocol/Chip.hh"
SyntheticDriver::SyntheticDriver(RubySystem* sys_ptr)
{
diff --git a/src/mem/ruby/tester/SyntheticDriver.hh b/src/mem/ruby/tester/SyntheticDriver.hh
index fa40326e2..dc0f1be1d 100644
--- a/src/mem/ruby/tester/SyntheticDriver.hh
+++ b/src/mem/ruby/tester/SyntheticDriver.hh
@@ -37,10 +37,10 @@
#ifndef SYNTHETICDRIVER_H
#define SYNTHETICDRIVER_H
-#include "Global.hh"
-#include "Driver.hh"
-#include "Histogram.hh"
-#include "CacheRequestType.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/common/Driver.hh"
+#include "mem/ruby/common/Histogram.hh"
+#include "mem/protocol/CacheRequestType.hh"
class RubySystem;
class RequestGenerator;
diff --git a/src/mem/ruby/tester/Tester.cc b/src/mem/ruby/tester/Tester.cc
index 60b625120..53d6bc670 100644
--- a/src/mem/ruby/tester/Tester.cc
+++ b/src/mem/ruby/tester/Tester.cc
@@ -32,13 +32,13 @@
*
*/
-#include "Global.hh"
-#include "System.hh"
-#include "Tester.hh"
-#include "RubyEventQueue.hh"
-#include "SubBlock.hh"
-#include "Check.hh"
-#include "Chip.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/system/System.hh"
+#include "mem/ruby/tester/Tester.hh"
+#include "mem/ruby/eventqueue/RubyEventQueue.hh"
+#include "mem/ruby/common/SubBlock.hh"
+#include "mem/ruby/tester/Check.hh"
+#include "mem/protocol/Chip.hh"
Tester::Tester(RubySystem* sys_ptr)
{
diff --git a/src/mem/ruby/tester/Tester.hh b/src/mem/ruby/tester/Tester.hh
index 76fe0684a..7b721e038 100644
--- a/src/mem/ruby/tester/Tester.hh
+++ b/src/mem/ruby/tester/Tester.hh
@@ -37,10 +37,10 @@
#ifndef TESTER_H
#define TESTER_H
-#include "Global.hh"
-#include "Driver.hh"
-#include "CheckTable.hh"
-#include "CacheRequestType.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/common/Driver.hh"
+#include "mem/ruby/tester/CheckTable.hh"
+#include "mem/protocol/CacheRequestType.hh"
class RubySystem;
diff --git a/src/mem/ruby/tester/XactAbortRequestGenerator.cc b/src/mem/ruby/tester/XactAbortRequestGenerator.cc
index e562aa760..0b00a6342 100644
--- a/src/mem/ruby/tester/XactAbortRequestGenerator.cc
+++ b/src/mem/ruby/tester/XactAbortRequestGenerator.cc
@@ -23,15 +23,15 @@
#ifdef XACT_MEM
-#include "XactAbortRequestGenerator.hh"
-#include "LockStatus.hh"
-#include "Sequencer.hh"
-#include "System.hh"
-#include "RubyConfig.hh"
-#include "SubBlock.hh"
-#include "SyntheticDriver.hh"
-#include "Chip.hh"
-#include "Instruction.hh"
+#include "mem/ruby/tester/XactAbortRequestGenerator.hh"
+#include "mem/protocol/LockStatus.hh"
+#include "mem/ruby/system/Sequencer.hh"
+#include "mem/ruby/system/System.hh"
+#include "mem/ruby/config/RubyConfig.hh"
+#include "mem/ruby/common/SubBlock.hh"
+#include "mem/ruby/tester/SyntheticDriver.hh"
+#include "mem/protocol/Chip.hh"
+#include "mem/ruby/tester/Instruction.hh"
#include "TransactionManager.hh"
//uint8 XactAbortRequestGenerator::testArray[MAX_ADDRESS];
diff --git a/src/mem/ruby/tester/XactAbortRequestGenerator.hh b/src/mem/ruby/tester/XactAbortRequestGenerator.hh
index 90ec1bf1b..14c7c3fec 100644
--- a/src/mem/ruby/tester/XactAbortRequestGenerator.hh
+++ b/src/mem/ruby/tester/XactAbortRequestGenerator.hh
@@ -28,11 +28,11 @@
#ifdef XACT_MEM
-#include "RequestGenerator.hh"
+#include "mem/ruby/tester/RequestGenerator.hh"
#include "global.hh"
-#include "Consumer.hh"
-#include "NodeID.hh"
-#include "Address.hh"
+#include "mem/ruby/common/Consumer.hh"
+#include "mem/ruby/system/NodeID.hh"
+#include "mem/ruby/common/Address.hh"
class Sequencer;
class SubBlock;
diff --git a/src/mem/ruby/tester/XactRequestGenerator.cc b/src/mem/ruby/tester/XactRequestGenerator.cc
index c7870bb25..383eb280a 100644
--- a/src/mem/ruby/tester/XactRequestGenerator.cc
+++ b/src/mem/ruby/tester/XactRequestGenerator.cc
@@ -21,15 +21,15 @@
*
*/
-#include "XactRequestGenerator.hh"
-#include "LockStatus.hh"
-#include "Sequencer.hh"
-#include "System.hh"
-#include "RubyConfig.hh"
-#include "SubBlock.hh"
-#include "SyntheticDriver.hh"
-#include "Chip.hh"
-#include "Instruction.hh"
+#include "mem/ruby/tester/XactRequestGenerator.hh"
+#include "mem/protocol/LockStatus.hh"
+#include "mem/ruby/system/Sequencer.hh"
+#include "mem/ruby/system/System.hh"
+#include "mem/ruby/config/RubyConfig.hh"
+#include "mem/ruby/common/SubBlock.hh"
+#include "mem/ruby/tester/SyntheticDriver.hh"
+#include "mem/protocol/Chip.hh"
+#include "mem/ruby/tester/Instruction.hh"
XactRequestGenerator::XactRequestGenerator(NodeID node, SyntheticDriver& driver) :
m_driver(driver), RequestGenerator(node, driver)
diff --git a/src/mem/ruby/tester/XactRequestGenerator.hh b/src/mem/ruby/tester/XactRequestGenerator.hh
index 826a257ce..09d75b7e9 100644
--- a/src/mem/ruby/tester/XactRequestGenerator.hh
+++ b/src/mem/ruby/tester/XactRequestGenerator.hh
@@ -27,10 +27,10 @@
#define XACTREQUESTGENERATOR_H
#include "global.hh"
-#include "RequestGenerator.hh"
-#include "Consumer.hh"
-#include "NodeID.hh"
-#include "Address.hh"
+#include "mem/ruby/tester/RequestGenerator.hh"
+#include "mem/ruby/common/Consumer.hh"
+#include "mem/ruby/system/NodeID.hh"
+#include "mem/ruby/common/Address.hh"
#include "TransactionManager.hh"
class Sequencer;
diff --git a/src/mem/ruby/tester/main.cc b/src/mem/ruby/tester/main.cc
index 10cc526be..f36168c8e 100644
--- a/src/mem/ruby/tester/main.cc
+++ b/src/mem/ruby/tester/main.cc
@@ -32,10 +32,10 @@
*
*/
-#include "main.hh"
-#include "RubyEventQueue.hh"
-#include "RubyConfig.hh"
-#include "test_framework.hh"
+#include "mem/ruby/tester/main.hh"
+#include "mem/ruby/eventqueue/RubyEventQueue.hh"
+#include "mem/ruby/config/RubyConfig.hh"
+#include "mem/ruby/tester/test_framework.hh"
// *******************
// *** tester main ***
diff --git a/src/mem/ruby/tester/main.hh b/src/mem/ruby/tester/main.hh
index 05e3a0e8d..3708d770d 100644
--- a/src/mem/ruby/tester/main.hh
+++ b/src/mem/ruby/tester/main.hh
@@ -27,16 +27,9 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-/*
- * $Id$
- *
- * Description:
- *
- */
-
#ifndef MAIN_H
#define MAIN_H
-#include "Global.hh"
+#include "mem/ruby/common/Global.hh"
#endif //MAIN_H
diff --git a/src/mem/ruby/tester/test_framework.cc b/src/mem/ruby/tester/test_framework.cc
index e3a16920b..9886adc8d 100644
--- a/src/mem/ruby/tester/test_framework.cc
+++ b/src/mem/ruby/tester/test_framework.cc
@@ -32,16 +32,16 @@
*
*/
-#include "protocol_name.hh"
-#include "test_framework.hh"
-#include "System.hh"
-#include "init.hh"
-#include "Tester.hh"
-#include "RubyEventQueue.hh"
+#include "mem/protocol/protocol_name.hh"
+#include "mem/ruby/tester/test_framework.hh"
+#include "mem/ruby/system/System.hh"
+#include "mem/ruby/init.hh"
+#include "mem/ruby/tester/Tester.hh"
+#include "mem/ruby/eventqueue/RubyEventQueue.hh"
#include "getopt.hh"
-#include "Network.hh"
-#include "CacheRecorder.hh"
-#include "Tracer.hh"
+#include "mem/ruby/network/Network.hh"
+#include "mem/ruby/recorder/CacheRecorder.hh"
+#include "mem/ruby/recorder/Tracer.hh"
using namespace std;
#include <string>
@@ -52,14 +52,14 @@ using namespace std;
// #include "simics/api.hh"
// };
-#include "confio.hh"
-#include "initvar.hh"
+#include "mem/gems_common/ioutil/confio.hh"
+#include "mem/gems_common/ioutil/initvar.hh"
// A generated file containing the default tester parameters in string form
// The defaults are stored in the variables
// global_default_param and global_default_tester_param
-#include "default_param.hh"
-#include "tester_param.hh"
+#include "mem/ruby/default_param.hh"
+#include "mem/ruby/tester_param.hh"
static void parseOptions(int argc, char **argv);
static void usageInstructions();
diff --git a/src/mem/ruby/tester/test_framework.hh b/src/mem/ruby/tester/test_framework.hh
index 7464cc274..5e9e9363b 100644
--- a/src/mem/ruby/tester/test_framework.hh
+++ b/src/mem/ruby/tester/test_framework.hh
@@ -37,8 +37,8 @@
#ifndef TESTFRAMEWORK_H
#define TESTFRAMEWORK_H
-#include "Global.hh"
-#include "mf_api.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/interfaces/mf_api.hh"
void tester_main(int argc, char **argv);
void tester_install_opal( mf_opal_api_t *opal_api, mf_ruby_api_t *ruby_api );