diff options
37 files changed, 46 insertions, 41 deletions
diff --git a/src/mem/ruby/common/Address.cc b/src/mem/ruby/common/Address.cc index 8d8800501..d9fadf128 100644 --- a/src/mem/ruby/common/Address.cc +++ b/src/mem/ruby/common/Address.cc @@ -27,7 +27,8 @@ */ #include "mem/ruby/common/Address.hh" -#include "mem/ruby/system/System.hh" + +#include "mem/ruby/system/RubySystem.hh" Addr bitSelect(Addr addr, unsigned int small, unsigned int big) diff --git a/src/mem/ruby/common/DataBlock.cc b/src/mem/ruby/common/DataBlock.cc index 2a292444a..fb2e956e0 100644 --- a/src/mem/ruby/common/DataBlock.cc +++ b/src/mem/ruby/common/DataBlock.cc @@ -27,7 +27,7 @@ */ #include "mem/ruby/common/DataBlock.hh" -#include "mem/ruby/system/System.hh" +#include "mem/ruby/system/RubySystem.hh" DataBlock::DataBlock(const DataBlock &cp) { diff --git a/src/mem/ruby/filters/BlockBloomFilter.cc b/src/mem/ruby/filters/BlockBloomFilter.cc index c902f9f38..94e748d6e 100644 --- a/src/mem/ruby/filters/BlockBloomFilter.cc +++ b/src/mem/ruby/filters/BlockBloomFilter.cc @@ -29,7 +29,7 @@ #include "base/intmath.hh" #include "base/str.hh" #include "mem/ruby/filters/BlockBloomFilter.hh" -#include "mem/ruby/system/System.hh" +#include "mem/ruby/system/RubySystem.hh" using namespace std; diff --git a/src/mem/ruby/filters/BulkBloomFilter.cc b/src/mem/ruby/filters/BulkBloomFilter.cc index 953add219..c656776a4 100644 --- a/src/mem/ruby/filters/BulkBloomFilter.cc +++ b/src/mem/ruby/filters/BulkBloomFilter.cc @@ -31,7 +31,7 @@ #include "base/intmath.hh" #include "base/str.hh" #include "mem/ruby/filters/BulkBloomFilter.hh" -#include "mem/ruby/system/System.hh" +#include "mem/ruby/system/RubySystem.hh" using namespace std; diff --git a/src/mem/ruby/filters/LSB_CountingBloomFilter.cc b/src/mem/ruby/filters/LSB_CountingBloomFilter.cc index 265e58625..1c2d4fea6 100644 --- a/src/mem/ruby/filters/LSB_CountingBloomFilter.cc +++ b/src/mem/ruby/filters/LSB_CountingBloomFilter.cc @@ -29,7 +29,7 @@ #include "base/intmath.hh" #include "base/str.hh" #include "mem/ruby/filters/LSB_CountingBloomFilter.hh" -#include "mem/ruby/system/System.hh" +#include "mem/ruby/system/RubySystem.hh" using namespace std; diff --git a/src/mem/ruby/filters/MultiGrainBloomFilter.cc b/src/mem/ruby/filters/MultiGrainBloomFilter.cc index 33d80f0c4..52aae0b55 100644 --- a/src/mem/ruby/filters/MultiGrainBloomFilter.cc +++ b/src/mem/ruby/filters/MultiGrainBloomFilter.cc @@ -29,7 +29,7 @@ #include "base/intmath.hh" #include "base/str.hh" #include "mem/ruby/filters/MultiGrainBloomFilter.hh" -#include "mem/ruby/system/System.hh" +#include "mem/ruby/system/RubySystem.hh" using namespace std; diff --git a/src/mem/ruby/filters/NonCountingBloomFilter.cc b/src/mem/ruby/filters/NonCountingBloomFilter.cc index 14bb3a245..a8d00c8d7 100644 --- a/src/mem/ruby/filters/NonCountingBloomFilter.cc +++ b/src/mem/ruby/filters/NonCountingBloomFilter.cc @@ -29,7 +29,7 @@ #include "base/intmath.hh" #include "base/str.hh" #include "mem/ruby/filters/NonCountingBloomFilter.hh" -#include "mem/ruby/system/System.hh" +#include "mem/ruby/system/RubySystem.hh" using namespace std; diff --git a/src/mem/ruby/network/MessageBuffer.cc b/src/mem/ruby/network/MessageBuffer.cc index a72d8509e..b07bdbdca 100644 --- a/src/mem/ruby/network/MessageBuffer.cc +++ b/src/mem/ruby/network/MessageBuffer.cc @@ -34,7 +34,7 @@ #include "base/stl_helpers.hh" #include "debug/RubyQueue.hh" #include "mem/ruby/network/MessageBuffer.hh" -#include "mem/ruby/system/System.hh" +#include "mem/ruby/system/RubySystem.hh" using namespace std; using m5::stl_helpers::operator<<; diff --git a/src/mem/ruby/network/Network.cc b/src/mem/ruby/network/Network.cc index 5d0ff980c..d35b909d9 100644 --- a/src/mem/ruby/network/Network.cc +++ b/src/mem/ruby/network/Network.cc @@ -29,7 +29,7 @@ #include "base/misc.hh" #include "mem/ruby/network/BasicLink.hh" #include "mem/ruby/network/Network.hh" -#include "mem/ruby/system/System.hh" +#include "mem/ruby/system/RubySystem.hh" uint32_t Network::m_virtual_networks; uint32_t Network::m_control_msg_size; 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 196ebb089..4d5846f55 100644 --- a/src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.cc +++ b/src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.cc @@ -39,7 +39,7 @@ #include "mem/ruby/network/garnet/fixed-pipeline/NetworkInterface_d.hh" #include "mem/ruby/network/garnet/fixed-pipeline/NetworkLink_d.hh" #include "mem/ruby/network/garnet/fixed-pipeline/Router_d.hh" -#include "mem/ruby/system/System.hh" +#include "mem/ruby/system/RubySystem.hh" using namespace std; using m5::stl_helpers::deletePointers; 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 d0a422f1f..39cfc00b5 100644 --- a/src/mem/ruby/network/garnet/fixed-pipeline/OutVcState_d.cc +++ b/src/mem/ruby/network/garnet/fixed-pipeline/OutVcState_d.cc @@ -29,7 +29,8 @@ */ #include "mem/ruby/network/garnet/fixed-pipeline/OutVcState_d.hh" -#include "mem/ruby/system/System.hh" + +#include "mem/ruby/system/RubySystem.hh" OutVcState_d::OutVcState_d(int id, GarnetNetwork_d *network_ptr) : m_time(0) diff --git a/src/mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.cc b/src/mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.cc index 87418b6b1..83cbe8d51 100644 --- a/src/mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.cc +++ b/src/mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.cc @@ -39,7 +39,7 @@ #include "mem/ruby/network/garnet/flexible-pipeline/NetworkInterface.hh" #include "mem/ruby/network/garnet/flexible-pipeline/NetworkLink.hh" #include "mem/ruby/network/garnet/flexible-pipeline/Router.hh" -#include "mem/ruby/system/System.hh" +#include "mem/ruby/system/RubySystem.hh" using namespace std; using m5::stl_helpers::deletePointers; diff --git a/src/mem/ruby/network/simple/SimpleNetwork.cc b/src/mem/ruby/network/simple/SimpleNetwork.cc index eb3bec256..c10d1cce8 100644 --- a/src/mem/ruby/network/simple/SimpleNetwork.cc +++ b/src/mem/ruby/network/simple/SimpleNetwork.cc @@ -38,7 +38,7 @@ #include "mem/ruby/network/simple/Switch.hh" #include "mem/ruby/network/simple/Throttle.hh" #include "mem/ruby/profiler/Profiler.hh" -#include "mem/ruby/system/System.hh" +#include "mem/ruby/system/RubySystem.hh" using namespace std; using m5::stl_helpers::deletePointers; diff --git a/src/mem/ruby/network/simple/Throttle.cc b/src/mem/ruby/network/simple/Throttle.cc index c97531e58..01d1f6fbe 100644 --- a/src/mem/ruby/network/simple/Throttle.cc +++ b/src/mem/ruby/network/simple/Throttle.cc @@ -36,7 +36,7 @@ #include "mem/ruby/network/MessageBuffer.hh" #include "mem/ruby/network/Network.hh" #include "mem/ruby/slicc_interface/Message.hh" -#include "mem/ruby/system/System.hh" +#include "mem/ruby/system/RubySystem.hh" using namespace std; diff --git a/src/mem/ruby/network/simple/Throttle.hh b/src/mem/ruby/network/simple/Throttle.hh index 405593bb1..bf70c3075 100644 --- a/src/mem/ruby/network/simple/Throttle.hh +++ b/src/mem/ruby/network/simple/Throttle.hh @@ -44,7 +44,7 @@ #include "mem/ruby/common/Consumer.hh" #include "mem/ruby/network/Network.hh" -#include "mem/ruby/system/System.hh" +#include "mem/ruby/system/RubySystem.hh" class MessageBuffer; class Switch; diff --git a/src/mem/ruby/slicc_interface/AbstractController.cc b/src/mem/ruby/slicc_interface/AbstractController.cc index 9ed8b08d0..5bd38195a 100644 --- a/src/mem/ruby/slicc_interface/AbstractController.cc +++ b/src/mem/ruby/slicc_interface/AbstractController.cc @@ -30,8 +30,8 @@ #include "debug/RubyQueue.hh" #include "mem/protocol/MemoryMsg.hh" +#include "mem/ruby/system/RubySystem.hh" #include "mem/ruby/system/Sequencer.hh" -#include "mem/ruby/system/System.hh" #include "sim/system.hh" AbstractController::AbstractController(const Params *p) diff --git a/src/mem/ruby/structures/BankedArray.cc b/src/mem/ruby/structures/BankedArray.cc index b25962df6..550693ca2 100644 --- a/src/mem/ruby/structures/BankedArray.cc +++ b/src/mem/ruby/structures/BankedArray.cc @@ -31,7 +31,7 @@ #include "base/intmath.hh" #include "mem/ruby/structures/BankedArray.hh" -#include "mem/ruby/system/System.hh" +#include "mem/ruby/system/RubySystem.hh" BankedArray::BankedArray(unsigned int banks, Cycles accessLatency, unsigned int startIndexBit, RubySystem *rs) diff --git a/src/mem/ruby/structures/BankedArray.hh b/src/mem/ruby/structures/BankedArray.hh index 179676f19..e2359afc9 100644 --- a/src/mem/ruby/structures/BankedArray.hh +++ b/src/mem/ruby/structures/BankedArray.hh @@ -35,7 +35,7 @@ #include <vector> #include "mem/ruby/common/TypeDefines.hh" -#include "mem/ruby/system/System.hh" +#include "mem/ruby/system/RubySystem.hh" #include "sim/core.hh" class BankedArray diff --git a/src/mem/ruby/structures/CacheMemory.cc b/src/mem/ruby/structures/CacheMemory.cc index 931f58a8e..a269d4f5b 100644 --- a/src/mem/ruby/structures/CacheMemory.cc +++ b/src/mem/ruby/structures/CacheMemory.cc @@ -34,7 +34,7 @@ #include "debug/RubyStats.hh" #include "mem/protocol/AccessPermission.hh" #include "mem/ruby/structures/CacheMemory.hh" -#include "mem/ruby/system/System.hh" +#include "mem/ruby/system/RubySystem.hh" using namespace std; diff --git a/src/mem/ruby/structures/DirectoryMemory.cc b/src/mem/ruby/structures/DirectoryMemory.cc index 82388a895..267c07174 100644 --- a/src/mem/ruby/structures/DirectoryMemory.cc +++ b/src/mem/ruby/structures/DirectoryMemory.cc @@ -31,7 +31,7 @@ #include "debug/RubyStats.hh" #include "mem/ruby/slicc_interface/RubySlicc_Util.hh" #include "mem/ruby/structures/DirectoryMemory.hh" -#include "mem/ruby/system/System.hh" +#include "mem/ruby/system/RubySystem.hh" using namespace std; diff --git a/src/mem/ruby/structures/Prefetcher.cc b/src/mem/ruby/structures/Prefetcher.cc index fbf027bef..d12665ae9 100644 --- a/src/mem/ruby/structures/Prefetcher.cc +++ b/src/mem/ruby/structures/Prefetcher.cc @@ -29,7 +29,7 @@ #include "debug/RubyPrefetcher.hh" #include "mem/ruby/slicc_interface/RubySlicc_ComponentMapping.hh" #include "mem/ruby/structures/Prefetcher.hh" -#include "mem/ruby/system/System.hh" +#include "mem/ruby/system/RubySystem.hh" Prefetcher* PrefetcherParams::create() diff --git a/src/mem/ruby/structures/Prefetcher.hh b/src/mem/ruby/structures/Prefetcher.hh index d5c3d4b58..9c3c06851 100644 --- a/src/mem/ruby/structures/Prefetcher.hh +++ b/src/mem/ruby/structures/Prefetcher.hh @@ -38,7 +38,7 @@ #include "mem/ruby/network/MessageBuffer.hh" #include "mem/ruby/slicc_interface/AbstractController.hh" #include "mem/ruby/slicc_interface/RubyRequest.hh" -#include "mem/ruby/system/System.hh" +#include "mem/ruby/system/RubySystem.hh" #include "params/Prefetcher.hh" #include "sim/sim_object.hh" #include "sim/system.hh" diff --git a/src/mem/ruby/structures/RubyMemoryControl.cc b/src/mem/ruby/structures/RubyMemoryControl.cc index 413850627..452606451 100644 --- a/src/mem/ruby/structures/RubyMemoryControl.cc +++ b/src/mem/ruby/structures/RubyMemoryControl.cc @@ -114,7 +114,7 @@ #include "mem/ruby/slicc_interface/Message.hh" #include "mem/ruby/slicc_interface/RubySlicc_ComponentMapping.hh" #include "mem/ruby/structures/RubyMemoryControl.hh" -#include "mem/ruby/system/System.hh" +#include "mem/ruby/system/RubySystem.hh" using namespace std; diff --git a/src/mem/ruby/structures/RubyMemoryControl.hh b/src/mem/ruby/structures/RubyMemoryControl.hh index 376ce4d75..f5f31458b 100644 --- a/src/mem/ruby/structures/RubyMemoryControl.hh +++ b/src/mem/ruby/structures/RubyMemoryControl.hh @@ -39,7 +39,7 @@ #include "mem/ruby/common/Address.hh" #include "mem/ruby/profiler/MemCntrlProfiler.hh" #include "mem/ruby/structures/MemoryNode.hh" -#include "mem/ruby/system/System.hh" +#include "mem/ruby/system/RubySystem.hh" #include "params/RubyMemoryControl.hh" // This constant is part of the definition of tFAW; see diff --git a/src/mem/ruby/structures/TimerTable.cc b/src/mem/ruby/structures/TimerTable.cc index 7d0dd3c01..17dac6fc0 100644 --- a/src/mem/ruby/structures/TimerTable.cc +++ b/src/mem/ruby/structures/TimerTable.cc @@ -27,7 +27,8 @@ */ #include "mem/ruby/structures/TimerTable.hh" -#include "mem/ruby/system/System.hh" + +#include "mem/ruby/system/RubySystem.hh" TimerTable::TimerTable() : m_next_time(0) diff --git a/src/mem/ruby/structures/WireBuffer.cc b/src/mem/ruby/structures/WireBuffer.cc index 0375d9446..e2f113643 100644 --- a/src/mem/ruby/structures/WireBuffer.cc +++ b/src/mem/ruby/structures/WireBuffer.cc @@ -35,7 +35,7 @@ #include "base/cprintf.hh" #include "base/stl_helpers.hh" #include "mem/ruby/structures/WireBuffer.hh" -#include "mem/ruby/system/System.hh" +#include "mem/ruby/system/RubySystem.hh" using namespace std; @@ -121,7 +121,8 @@ WireBuffer::recycle() push_heap(m_message_queue.begin(), m_message_queue.end(), greater<MsgPtr>()); m_consumer_ptr-> - scheduleEventAbsolute(m_ruby_system->curCycle() + Cycles(1)); + scheduleEventAbsolute(m_ruby_system->clockPeriod() + * (m_ruby_system->curCycle() + Cycles(1))); } bool diff --git a/src/mem/ruby/system/CacheRecorder.cc b/src/mem/ruby/system/CacheRecorder.cc index 339cf1b4f..78d6939fc 100644 --- a/src/mem/ruby/system/CacheRecorder.cc +++ b/src/mem/ruby/system/CacheRecorder.cc @@ -29,8 +29,8 @@ #include "debug/RubyCacheTrace.hh" #include "mem/ruby/system/CacheRecorder.hh" +#include "mem/ruby/system/RubySystem.hh" #include "mem/ruby/system/Sequencer.hh" -#include "mem/ruby/system/System.hh" using namespace std; diff --git a/src/mem/ruby/system/DMASequencer.cc b/src/mem/ruby/system/DMASequencer.cc index e263fefdb..85b476cfd 100644 --- a/src/mem/ruby/system/DMASequencer.cc +++ b/src/mem/ruby/system/DMASequencer.cc @@ -34,7 +34,7 @@ #include "debug/RubyStats.hh" #include "mem/protocol/SequencerMsg.hh" #include "mem/ruby/system/DMASequencer.hh" -#include "mem/ruby/system/System.hh" +#include "mem/ruby/system/RubySystem.hh" #include "sim/system.hh" DMASequencer::DMASequencer(const Params *p) diff --git a/src/mem/ruby/system/DMASequencer.hh b/src/mem/ruby/system/DMASequencer.hh index 1539c3999..f9d1b630e 100644 --- a/src/mem/ruby/system/DMASequencer.hh +++ b/src/mem/ruby/system/DMASequencer.hh @@ -37,7 +37,7 @@ #include "mem/protocol/RequestStatus.hh" #include "mem/ruby/common/DataBlock.hh" #include "mem/ruby/network/MessageBuffer.hh" -#include "mem/ruby/system/System.hh" +#include "mem/ruby/system/RubySystem.hh" #include "mem/simple_mem.hh" #include "mem/tport.hh" #include "params/DMASequencer.hh" diff --git a/src/mem/ruby/system/RubyPort.hh b/src/mem/ruby/system/RubyPort.hh index f2841e561..cbcc678d3 100644 --- a/src/mem/ruby/system/RubyPort.hh +++ b/src/mem/ruby/system/RubyPort.hh @@ -47,7 +47,7 @@ #include "mem/protocol/RequestStatus.hh" #include "mem/ruby/network/MessageBuffer.hh" -#include "mem/ruby/system/System.hh" +#include "mem/ruby/system/RubySystem.hh" #include "mem/mem_object.hh" #include "mem/tport.hh" #include "params/RubyPort.hh" diff --git a/src/mem/ruby/system/System.cc b/src/mem/ruby/system/RubySystem.cc index 490a1f085..454775178 100644 --- a/src/mem/ruby/system/System.cc +++ b/src/mem/ruby/system/RubySystem.cc @@ -26,6 +26,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "mem/ruby/system/RubySystem.hh" + #include <fcntl.h> #include <zlib.h> @@ -38,7 +40,6 @@ #include "debug/RubySystem.hh" #include "mem/ruby/common/Address.hh" #include "mem/ruby/network/Network.hh" -#include "mem/ruby/system/System.hh" #include "mem/simple_mem.hh" #include "sim/eventq.hh" #include "sim/simulate.hh" diff --git a/src/mem/ruby/system/System.hh b/src/mem/ruby/system/RubySystem.hh index c79732651..7026f6756 100644 --- a/src/mem/ruby/system/System.hh +++ b/src/mem/ruby/system/RubySystem.hh @@ -37,10 +37,10 @@ #include "base/callback.hh" #include "base/output.hh" +#include "mem/packet.hh" #include "mem/ruby/profiler/Profiler.hh" #include "mem/ruby/slicc_interface/AbstractController.hh" #include "mem/ruby/system/CacheRecorder.hh" -#include "mem/packet.hh" #include "params/RubySystem.hh" #include "sim/clocked_object.hh" diff --git a/src/mem/ruby/system/RubySystem.py b/src/mem/ruby/system/RubySystem.py index c10f8117f..5b13f2ea6 100644 --- a/src/mem/ruby/system/RubySystem.py +++ b/src/mem/ruby/system/RubySystem.py @@ -33,7 +33,7 @@ from SimpleMemory import * class RubySystem(ClockedObject): type = 'RubySystem' - cxx_header = "mem/ruby/system/System.hh" + cxx_header = "mem/ruby/system/RubySystem.hh" randomization = Param.Bool(False, "insert random delays on message enqueue times"); block_size_bytes = Param.UInt32(64, diff --git a/src/mem/ruby/system/SConscript b/src/mem/ruby/system/SConscript index 55fe11d39..8c5077362 100644 --- a/src/mem/ruby/system/SConscript +++ b/src/mem/ruby/system/SConscript @@ -33,12 +33,12 @@ Import('*') if env['PROTOCOL'] == 'None': Return() -SimObject('Sequencer.py') SimObject('RubySystem.py') +SimObject('Sequencer.py') Source('CacheRecorder.cc') Source('DMASequencer.cc') Source('RubyPort.cc') Source('RubyPortProxy.cc') +Source('RubySystem.cc') Source('Sequencer.cc') -Source('System.cc') diff --git a/src/mem/ruby/system/Sequencer.cc b/src/mem/ruby/system/Sequencer.cc index 740db7d8d..8e41204b7 100644 --- a/src/mem/ruby/system/Sequencer.cc +++ b/src/mem/ruby/system/Sequencer.cc @@ -38,8 +38,8 @@ #include "mem/protocol/RubyAccessMode.hh" #include "mem/ruby/profiler/Profiler.hh" #include "mem/ruby/slicc_interface/RubyRequest.hh" +#include "mem/ruby/system/RubySystem.hh" #include "mem/ruby/system/Sequencer.hh" -#include "mem/ruby/system/System.hh" #include "mem/packet.hh" #include "sim/system.hh" diff --git a/src/mem/slicc/symbols/StateMachine.py b/src/mem/slicc/symbols/StateMachine.py index b5d9c2afe..42a81c096 100644 --- a/src/mem/slicc/symbols/StateMachine.py +++ b/src/mem/slicc/symbols/StateMachine.py @@ -464,7 +464,7 @@ void unset_tbe(${{self.TBEType.c_ident}}*& m_tbe_ptr); #include "mem/protocol/${ident}_Event.hh" #include "mem/protocol/${ident}_State.hh" #include "mem/protocol/Types.hh" -#include "mem/ruby/system/System.hh" +#include "mem/ruby/system/RubySystem.hh" ''') for include_path in includes: @@ -1029,7 +1029,7 @@ $c_ident::functionalWriteBuffers(PacketPtr& pkt) code(''' #include "mem/protocol/Types.hh" -#include "mem/ruby/system/System.hh" +#include "mem/ruby/system/RubySystem.hh" ''') @@ -1137,7 +1137,7 @@ ${ident}_Controller::wakeup() #include "mem/protocol/${ident}_Event.hh" #include "mem/protocol/${ident}_State.hh" #include "mem/protocol/Types.hh" -#include "mem/ruby/system/System.hh" +#include "mem/ruby/system/RubySystem.hh" #define HASH_FUN(state, event) ((int(state)*${ident}_Event_NUM)+int(event)) diff --git a/src/mem/slicc/symbols/Type.py b/src/mem/slicc/symbols/Type.py index 08fe94ef8..2dc35784a 100644 --- a/src/mem/slicc/symbols/Type.py +++ b/src/mem/slicc/symbols/Type.py @@ -397,7 +397,7 @@ operator<<(std::ostream& out, const ${{self.c_ident}}& obj) #include <memory> #include "mem/protocol/${{self.c_ident}}.hh" -#include "mem/ruby/system/System.hh" +#include "mem/ruby/system/RubySystem.hh" using namespace std; ''') |