diff options
Diffstat (limited to 'src/mem/ruby/system')
-rw-r--r-- | src/mem/ruby/system/RubySystem.py | 2 | ||||
-rw-r--r-- | src/mem/ruby/system/System.cc | 7 | ||||
-rw-r--r-- | src/mem/ruby/system/System.hh | 3 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/mem/ruby/system/RubySystem.py b/src/mem/ruby/system/RubySystem.py index 2e3b7f871..21443cbd8 100644 --- a/src/mem/ruby/system/RubySystem.py +++ b/src/mem/ruby/system/RubySystem.py @@ -8,7 +8,7 @@ class RubySystem(SimObject): "insert random delays on message enqueue times"); tech_nm = Param.Int(45, "device size used to calculate latency and area information"); - freq_mhz = Param.Int(3000, "default frequency for the system"); + clock = Param.Clock('1GHz', "") block_size_bytes = Param.Int(64, "default cache block size; must be a power of two"); mem_size_mb = Param.Int(""); diff --git a/src/mem/ruby/system/System.cc b/src/mem/ruby/system/System.cc index e27b03041..18404bd71 100644 --- a/src/mem/ruby/system/System.cc +++ b/src/mem/ruby/system/System.cc @@ -60,7 +60,7 @@ int RubySystem::m_random_seed; bool RubySystem::m_randomization; int RubySystem::m_tech_nm; -int RubySystem::m_freq_mhz; +Tick RubySystem::m_clock; int RubySystem::m_block_size_bytes; int RubySystem::m_block_size_bits; uint64 RubySystem::m_memory_size_bytes; @@ -93,7 +93,7 @@ RubySystem::RubySystem(const Params *p) srandom(m_random_seed); m_randomization = p->randomization; m_tech_nm = p->tech_nm; - m_freq_mhz = p->freq_mhz; + m_clock = p->clock; m_block_size_bytes = p->block_size_bytes; assert(is_power_of_2(m_block_size_bytes)); @@ -107,6 +107,7 @@ RubySystem::RubySystem(const Params *p) m_profiler_ptr = p->profiler; m_tracer_ptr = p->tracer; + g_eventQueue_ptr = new RubyEventQueue(m_clock); g_system_ptr = this; m_mem_vec_ptr = new MemoryVector; m_mem_vec_ptr->setSize(m_memory_size_bytes); @@ -129,7 +130,7 @@ void RubySystem::printSystemConfig(ostream & out) out << " random_seed: " << m_random_seed << endl; out << " randomization: " << m_randomization << endl; out << " tech_nm: " << m_tech_nm << endl; - out << " freq_mhz: " << m_freq_mhz << endl; + out << " cycle_period: " << m_clock << endl; out << " block_size_bytes: " << m_block_size_bytes << endl; out << " block_size_bits: " << m_block_size_bits << endl; out << " memory_size_bytes: " << m_memory_size_bytes << endl; diff --git a/src/mem/ruby/system/System.hh b/src/mem/ruby/system/System.hh index 6f0261888..3ef70df18 100644 --- a/src/mem/ruby/system/System.hh +++ b/src/mem/ruby/system/System.hh @@ -97,7 +97,6 @@ public: static int getRandomSeed() { return m_random_seed; } static int getRandomization() { return m_randomization; } static int getTechNm() { return m_tech_nm; } - static int getFreqMhz() { return m_freq_mhz; } static int getBlockSizeBytes() { return m_block_size_bytes; } static int getBlockSizeBits() { return m_block_size_bits; } static uint64 getMemorySizeBytes() { return m_memory_size_bytes; } @@ -164,7 +163,7 @@ private: static int m_random_seed; static bool m_randomization; static int m_tech_nm; - static int m_freq_mhz; + static Tick m_clock; static int m_block_size_bytes; static int m_block_size_bits; static uint64 m_memory_size_bytes; |