[gem5-dev] Change in gem5/gem5[develop]: misc: get rid of TickedObject

[Ayaz Akram (Gerrit) via gem5-dev]

Ayaz Akram has uploaded this change for review. (  
https://gem5-review.googlesource.com/c/public/gem5/+/37395 )

Change subject: misc: get rid of TickedObject
......................................................................

misc: get rid of TickedObject

TickedObject is not used by anything else.
This change removes TickedObject and keeps only
Ticked class which is used by MinorCPU only.

Change-Id: I625052f466ab27aca74f55b706dc12929af44ab6
---
M src/sim/SConscript
R src/sim/Ticked.py
R src/sim/ticked.cc
R src/sim/ticked.hh
4 files changed, 10 insertions(+), 59 deletions(-)



diff --git a/src/sim/SConscript b/src/sim/SConscript
index 78d9bf5..fcde7ee 100644
--- a/src/sim/SConscript
+++ b/src/sim/SConscript
@@ -29,7 +29,7 @@
 Import('*')

 SimObject('ClockedObject.py')
-SimObject('TickedObject.py')
+SimObject('Ticked.py')
 SimObject('Workload.py')
 SimObject('Root.py')
 SimObject('ClockDomain.py')
@@ -67,7 +67,7 @@
 Source('sim_events.cc')
 Source('sim_object.cc')
 Source('sub_system.cc')
-Source('ticked_object.cc')
+Source('ticked.cc')
 Source('simulate.cc')
 Source('stat_control.cc')
 Source('stat_register.cc', add_tags='python')
diff --git a/src/sim/TickedObject.py b/src/sim/Ticked.py
similarity index 96%
rename from src/sim/TickedObject.py
rename to src/sim/Ticked.py
index 283edff..5161b9c 100644
--- a/src/sim/TickedObject.py
+++ b/src/sim/Ticked.py
@@ -36,6 +36,6 @@
 from m5.objects.ClockedObject import ClockedObject

 class TickedObject(ClockedObject):
-    type = 'TickedObject'
+    type = 'Ticked'
     abstract = True
-    cxx_header = "sim/ticked_object.hh"
+    cxx_header = "sim/ticked.hh"
diff --git a/src/sim/ticked_object.cc b/src/sim/ticked.cc
similarity index 87%
rename from src/sim/ticked_object.cc
rename to src/sim/ticked.cc
index 3564b4d..11dfc70 100644
--- a/src/sim/ticked_object.cc
+++ b/src/sim/ticked.cc
@@ -35,9 +35,9 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */

-#include "sim/ticked_object.hh"
+#include "sim/ticked.hh"

-#include "params/TickedObject.hh"
+#include "params/Ticked.hh"
 #include "sim/clocked_object.hh"

 Ticked::Ticked(ClockedObject &object_,
@@ -105,30 +105,3 @@

     lastStopped = Cycles(lastStoppedUint);
 }
-
-TickedObject::TickedObject(const TickedObjectParams &params,
-    Event::Priority priority) :
-    ClockedObject(params),
-    /* Make numCycles in Ticked */
-    Ticked(*this, NULL, priority)
-{ }
-
-void
-TickedObject::regStats()
-{
-    Ticked::regStats();
-    ClockedObject::regStats();
-}
-
-void
-TickedObject::serialize(CheckpointOut &cp) const
-{
-    Ticked::serialize(cp);
-    ClockedObject::serialize(cp);
-}
-void
-TickedObject::unserialize(CheckpointIn &cp)
-{
-    Ticked::unserialize(cp);
-    ClockedObject::unserialize(cp);
-}
diff --git a/src/sim/ticked_object.hh b/src/sim/ticked.hh
similarity index 84%
rename from src/sim/ticked_object.hh
rename to src/sim/ticked.hh
index 3991618..b89befe 100644
--- a/src/sim/ticked_object.hh
+++ b/src/sim/ticked.hh
@@ -39,17 +39,14 @@
  * @file
  *
  *  Base classes for ClockedObjects which have evaluate functions to
- *  look like clock ticking operations.  TickedObject attaches gem5's event
- *  queue to Ticked to apply actual scheduling.
+ *  look like clock ticking operations.
  */

-#ifndef __SIM_TICKED_OBJECT_HH__
-#define __SIM_TICKED_OBJECT_HH__
+#ifndef __SIM_TICKED_HH__
+#define __SIM_TICKED_HH__

 #include "sim/clocked_object.hh"

-class TickedObjectParams;
-
 /** Ticked attaches gem5's event queue/scheduler to evaluate
  *  calls and provides a start/stop interface to ticking.
  *
@@ -158,23 +155,4 @@
     virtual void countCycles(Cycles delta) {}
 };

-/** TickedObject attaches Ticked to ClockedObject and can be used as
- *  a base class where ticked operation */
-class TickedObject : public ClockedObject, public Ticked
-{
-  public:
-    TickedObject(const TickedObjectParams &params,
-        Event::Priority priority = Event::CPU_Tick_Pri);
-
-    /** Disambiguate to make these functions overload correctly */
-    using ClockedObject::regStats;
-    using ClockedObject::serialize;
-    using ClockedObject::unserialize;
-
-    /** Pass on regStats, serialize etc. onto Ticked */
-    void regStats() override;
-    void serialize(CheckpointOut &cp) const override;
-    void unserialize(CheckpointIn &cp) override;
-};
-
-#endif /* __SIM_TICKED_OBJECT_HH__ */
+#endif /* __SIM_TICKED_HH__ */

--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/37395
To unsubscribe, or for help writing mail filters, visit  
https://gem5-review.googlesource.com/settings

Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: I625052f466ab27aca74f55b706dc12929af44ab6
Gerrit-Change-Number: 37395
Gerrit-PatchSet: 1
Gerrit-Owner: Ayaz Akram <yazak...@ucdavis.edu>
Gerrit-MessageType: newchange
_______________________________________________
gem5-dev mailing list -- gem5-dev@gem5.org
To unsubscribe send an email to gem5-dev-le...@gem5.org
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s