Ruby System: Convert to Clocked Object

This patch moves Ruby System from being a SimObject to recently introduced
ClockedObject.

10 files changed, 24 insertions, 30 deletions

diff --git a/src/mem/ruby/buffers/MessageBuffer.cc b/src/mem/ruby/buffers/MessageBuffer.cc
index ee1c709f1..f0d372a52 100644
--- a/src/mem/ruby/buffers/MessageBuffer.cc
+++ b/src/mem/ruby/buffers/MessageBuffer.cc
@@ -192,10 +192,10 @@ MessageBuffer::enqueue(MsgPtr message, Time delta)
             panic("FIFO ordering violated: %s name: %s current time: %d "
                   "delta: %d arrival_time: %d last arrival_time: %d\n",
                   *this, m_name,
-                  current_time * g_system_ptr->getClock(),
-                  delta * g_system_ptr->getClock(),
-                  arrival_time * g_system_ptr->getClock(),
-                  m_last_arrival_time * g_system_ptr->getClock());
+                  current_time * g_system_ptr->clockPeriod(),
+                  delta * g_system_ptr->clockPeriod(),
+                  arrival_time * g_system_ptr->clockPeriod(),
+                  m_last_arrival_time * g_system_ptr->clockPeriod());
         }
     }
 
@@ -223,7 +223,7 @@ MessageBuffer::enqueue(MsgPtr message, Time delta)
         greater<MessageBufferNode>());
 
     DPRINTF(RubyQueue, "Enqueue with arrival_time %lld.\n",
-            arrival_time * g_system_ptr->getClock());
+            arrival_time * g_system_ptr->clockPeriod());
     DPRINTF(RubyQueue, "Enqueue Message: %s.\n", (*(message.get())));
 
     // Schedule the wakeup
diff --git a/src/mem/ruby/common/Consumer.cc b/src/mem/ruby/common/Consumer.cc
index a81396217..1f7aeebd5 100644
--- a/src/mem/ruby/common/Consumer.cc
+++ b/src/mem/ruby/common/Consumer.cc
@@ -51,7 +51,7 @@ Consumer::scheduleEventAbsolute(Time timeAbs)
 void
 Consumer::scheduleEventAbsolute(EventManager *em, Time timeAbs)
 {
-    Tick evt_time = timeAbs * g_system_ptr->getClock();
+    Tick evt_time = g_system_ptr->clockPeriod() * timeAbs;
     if (!alreadyScheduled(evt_time)) {
         // This wakeup is not redundant
         ConsumerEvent *evt = new ConsumerEvent(this);
diff --git a/src/mem/ruby/profiler/Profiler.cc b/src/mem/ruby/profiler/Profiler.cc
index 2ab68d249..b6982aca9 100644
--- a/src/mem/ruby/profiler/Profiler.cc
+++ b/src/mem/ruby/profiler/Profiler.cc
@@ -137,7 +137,7 @@ Profiler::wakeup()
     }
 
     //g_system_ptr->getNetwork()->printStats(out);
-    schedule(m_event, curTick() + m_stats_period * g_system_ptr->getClock());
+    schedule(m_event, g_system_ptr->clockEdge(Cycles(m_stats_period )));
 }
 
 void
@@ -151,7 +151,7 @@ Profiler::setPeriodicStatsFile(const string& filename)
     }
 
     m_periodic_output_file_ptr = new ofstream(filename.c_str());
-    schedule(m_event, curTick() + g_system_ptr->getClock());
+    schedule(m_event, g_system_ptr->clockEdge(Cycles(1)));
 }
 
 void
@@ -161,7 +161,7 @@ Profiler::setPeriodicStatsInterval(integer_t period)
          << " Ruby cycles" << endl;
 
     m_stats_period = period;
-    schedule(m_event, curTick() + g_system_ptr->getClock());
+    schedule(m_event, g_system_ptr->clockEdge(Cycles(1)));
 }
 
 void
diff --git a/src/mem/ruby/system/RubyMemoryControl.cc b/src/mem/ruby/system/RubyMemoryControl.cc
index f931e4618..cfdaaaef7 100644
--- a/src/mem/ruby/system/RubyMemoryControl.cc
+++ b/src/mem/ruby/system/RubyMemoryControl.cc
@@ -301,7 +301,7 @@ RubyMemoryControl::enqueueMemRef(MemoryNode& memRef)
     DPRINTF(RubyMemory,
             "New memory request%7d: %#08x %c arrived at %10d bank = %3x sched %c\n",
             m_msg_counter, addr, memRef.m_is_mem_read ? 'R':'W',
-            memRef.m_time * g_system_ptr->getClock(),
+            memRef.m_time * g_system_ptr->clockPeriod(),
             bank, m_event.scheduled() ? 'Y':'N');
 
     m_profiler_ptr->profileMemReq(bank);
@@ -377,7 +377,7 @@ void
 RubyMemoryControl::enqueueToDirectory(MemoryNode req, int latency)
 {
     Time arrival_time = curTick() + (latency * clock);
-    Time ruby_arrival_time = arrival_time / g_system_ptr->getClock();
+    Time ruby_arrival_time = arrival_time / g_system_ptr->clockPeriod();
     req.m_time = ruby_arrival_time;
     m_response_queue.push_back(req);
 
diff --git a/src/mem/ruby/system/RubyPort.cc b/src/mem/ruby/system/RubyPort.cc
index b24f649a5..d14b3dba7 100644
--- a/src/mem/ruby/system/RubyPort.cc
+++ b/src/mem/ruby/system/RubyPort.cc
@@ -197,8 +197,8 @@ RubyPort::M5Port::recvTimingReq(PacketPtr pkt)
                 pkt->getAddr());
 
         // send next cycle
-        ruby_port->pio_port.schedTimingReq(pkt, curTick() +
-                                           g_system_ptr->getClock());
+        ruby_port->pio_port.schedTimingReq(pkt,
+            curTick() + g_system_ptr->clockPeriod());
         return true;
     }
 
@@ -651,7 +651,7 @@ RubyPort::M5Port::hitCallback(PacketPtr pkt)
     if (needsResponse) {
         DPRINTF(RubyPort, "Sending packet back over port\n");
         // send next cycle
-        schedTimingResp(pkt, curTick() + g_system_ptr->getClock());
+        schedTimingResp(pkt, curTick() + g_system_ptr->clockPeriod());
     } else {
         delete pkt;
     }
diff --git a/src/mem/ruby/system/RubySystem.py b/src/mem/ruby/system/RubySystem.py
index d66ada4b9..c9d2e96ac 100644
--- a/src/mem/ruby/system/RubySystem.py
+++ b/src/mem/ruby/system/RubySystem.py
@@ -28,14 +28,14 @@
 #          Brad Beckmann
 
 from m5.params import *
-from m5.SimObject import SimObject
+from ClockedObject import ClockedObject
 
-class RubySystem(SimObject):
+class RubySystem(ClockedObject):
     type = 'RubySystem'
     random_seed = Param.Int(1234, "random seed used by the simulation");
     randomization = Param.Bool(False,
         "insert random delays on message enqueue times");
-    clock = Param.Clock('1GHz', "")
+    clock = '1GHz'
     block_size_bytes = Param.Int(64,
         "default cache block size; must be a power of two");
     mem_size = Param.MemorySize("total memory size of the system");
diff --git a/src/mem/ruby/system/Sequencer.cc b/src/mem/ruby/system/Sequencer.cc
index 01d34814f..c48ff59cf 100644
--- a/src/mem/ruby/system/Sequencer.cc
+++ b/src/mem/ruby/system/Sequencer.cc
@@ -129,8 +129,7 @@ Sequencer::wakeup()
     if (m_outstanding_count > 0) {
         // If there are still outstanding requests, keep checking
         schedule(deadlockCheckEvent,
-                 m_deadlock_threshold * g_system_ptr->getClock() +
-                 curTick());
+            g_system_ptr->clockPeriod() * m_deadlock_threshold + curTick());
     }
 }
 
@@ -210,8 +209,7 @@ Sequencer::insertRequest(PacketPtr pkt, RubyRequestType request_type)
     // See if we should schedule a deadlock check
     if (deadlockCheckEvent.scheduled() == false) {
         schedule(deadlockCheckEvent,
-                 m_deadlock_threshold * g_system_ptr->getClock()
-                 + curTick());
+            g_system_ptr->clockPeriod() * m_deadlock_threshold + curTick());
     }
 
     Address line_addr(pkt->getAddr());
diff --git a/src/mem/ruby/system/System.cc b/src/mem/ruby/system/System.cc
index 7921d306d..c22272e03 100644
--- a/src/mem/ruby/system/System.cc
+++ b/src/mem/ruby/system/System.cc
@@ -45,7 +45,6 @@ using namespace std;
 
 int RubySystem::m_random_seed;
 bool RubySystem::m_randomization;
-Tick RubySystem::m_clock;
 int RubySystem::m_block_size_bytes;
 int RubySystem::m_block_size_bits;
 uint64 RubySystem::m_memory_size_bytes;
@@ -56,7 +55,7 @@ Profiler* RubySystem::m_profiler_ptr;
 MemoryVector* RubySystem::m_mem_vec_ptr;
 
 RubySystem::RubySystem(const Params *p)
-    : SimObject(p)
+    : ClockedObject(p)
 {
     if (g_system_ptr != NULL)
         fatal("Only one RubySystem object currently allowed.\n");
@@ -64,7 +63,6 @@ RubySystem::RubySystem(const Params *p)
     m_random_seed = p->random_seed;
     srandom(m_random_seed);
     m_randomization = p->randomization;
-    m_clock = p->clock;
 
     m_block_size_bytes = p->block_size_bytes;
     assert(isPowerOf2(m_block_size_bytes));
diff --git a/src/mem/ruby/system/System.hh b/src/mem/ruby/system/System.hh
index e6501f7bf..7426894d8 100644
--- a/src/mem/ruby/system/System.hh
+++ b/src/mem/ruby/system/System.hh
@@ -42,13 +42,13 @@
 #include "mem/ruby/system/MemoryVector.hh"
 #include "mem/ruby/system/SparseMemory.hh"
 #include "params/RubySystem.hh"
-#include "sim/sim_object.hh"
+#include "sim/clocked_object.hh"
 
 class Network;
 class Profiler;
 class MemoryControl;
 
-class RubySystem : public SimObject
+class RubySystem : public ClockedObject
 {
   public:
     class RubyEvent : public Event
@@ -77,8 +77,7 @@ class RubySystem : public SimObject
     static int getBlockSizeBits() { return m_block_size_bits; }
     static uint64 getMemorySizeBytes() { return m_memory_size_bytes; }
     static int getMemorySizeBits() { return m_memory_size_bits; }
-    Tick getTime() const { return curTick() / m_clock; }
-    Tick getClock() const { return m_clock; }
+    Cycles getTime() const { return curCycle(); }
 
     // Public Methods
     static Network*
@@ -145,7 +144,6 @@ class RubySystem : public SimObject
     // configuration parameters
     static int m_random_seed;
     static bool m_randomization;
-    static Tick m_clock;
     static int m_block_size_bytes;
     static int m_block_size_bits;
     static uint64 m_memory_size_bytes;
diff --git a/src/mem/slicc/symbols/Type.py b/src/mem/slicc/symbols/Type.py
index 42ee8894a..3285b767f 100644
--- a/src/mem/slicc/symbols/Type.py
+++ b/src/mem/slicc/symbols/Type.py
@@ -415,7 +415,7 @@ ${{self.c_ident}}::print(ostream& out) const
             code('out << "${{dm.ident}} = " << m_${{dm.ident}} << " ";''')
 
         if self.isMessage:
-            code('out << "Time = " << getTime() * g_system_ptr->getClock() << " ";')
+            code('out << "Time = " << g_system_ptr->clockPeriod() * getTime() << " ";')
         code.dedent()
 
         # Trailer