diff options
Diffstat (limited to 'src/mem/ruby/tester')
34 files changed, 186 insertions, 193 deletions
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 ); |