sanchayanmaity/gem5
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ruby: register multiple memory controllers

Browse source 
Currently the Ruby System maintains pointer to only one of the memory
controllers. But there can be multiple controllers in the system. This
patch adds a vector of memory controllers.
This commit is contained in:
Nilay Vaish 2012-10-15 17:27:17 -05:00
parent c14e6cfc4e
commit 61434a9943
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/mem/ruby/system/System.cc
View file

@ -119,7 +119,7 @@ RubySystem::registerSparseMemory(SparseMemory* s)
void
RubySystem::registerMemController(MemoryControl *mc) {
m_memory_controller = mc;
m_memory_controller_vec.push_back(mc);
}
RubySystem::~RubySystem()
@ -365,9 +365,13 @@ RubySystem::startup()
delete m_cache_recorder;
m_cache_recorder = NULL;
m_warmup_enabled = false;
// reset DRAM so that it's not waiting for events on the old event
// queue
m_memory_controller->reset();
for (int i = 0; i < m_memory_controller_vec.size(); ++i) {
m_memory_controller_vec[i]->reset();
}
// Restore eventq head
eventq_head = eventq->replaceHead(eventq_head);
// Restore curTick and Ruby System's clock

4
src/mem/ruby/system/System.hh
View file

@ -152,12 +152,12 @@ class RubySystem : public ClockedObject
static int m_memory_size_bits;
Network* m_network_ptr;
MemoryControl *m_memory_controller;
std::vector<MemoryControl *> m_memory_controller_vec;
std::vector<AbstractController *> m_abs_cntrl_vec;
public:
Profiler* m_profiler_ptr;
MemoryVector* m_mem_vec_ptr;
std::vector<AbstractController*> m_abs_cntrl_vec;
bool m_warmup_enabled;
bool m_cooldown_enabled;
CacheRecorder* m_cache_recorder;