diff options
| author | Andreas Hansson <andreas.hansson@arm.com> | 2012-08-21 05:49:01 -0400 |
|---|---|---|
| committer | Andreas Hansson <andreas.hansson@arm.com> | 2012-08-21 05:49:01 -0400 |
| commit | 452217817f421a64bc022a5977e795229af45b30 (patch) | |
| tree | 8f66c1802e5e22cfd4eee963d3cda37b77c5ca08 /src/cpu/testers | |
| parent | 4ebefc145adf818f8695c36a36daacca99f59eb8 (diff) | |
| download | gem5-452217817f421a64bc022a5977e795229af45b30.tar.xz | |
Clock: Move the clock and related functions to ClockedObject
This patch moves the clock of the CPU, bus, and numerous devices to
the new class ClockedObject, that sits in between the SimObject and
MemObject in the class hierarchy. Although there are currently a fair
amount of MemObjects that do not make use of the clock, they
potentially should do so, e.g. the caches should at some point have
the same clock as the CPU, potentially with a 1:n ratio. This patch
does not introduce any new clock objects or object hierarchies
(clusters, clock domains etc), but is still a step in the direction of
having a more structured approach clock domains.
The most contentious part of this patch is the serialisation of clocks
that some of the modules (but not all) did previously. This
serialisation should not be needed as the clock is set through the
parameters even when restoring from the checkpoint. In other words,
the state is "stored" in the Python code that creates the modules.
The nextCycle methods are also simplified and the clock phase
parameter of the CPU is removed (this could be part of a clock object
once they are introduced).
Diffstat (limited to 'src/cpu/testers')
| -rw-r--r-- | src/cpu/testers/memtest/memtest.hh | 2 | ||||
| -rw-r--r-- | src/cpu/testers/networktest/networktest.hh | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/src/cpu/testers/memtest/memtest.hh b/src/cpu/testers/memtest/memtest.hh index 52e32d72d..94617c876 100644 --- a/src/cpu/testers/memtest/memtest.hh +++ b/src/cpu/testers/memtest/memtest.hh @@ -56,8 +56,6 @@ class MemTest : public MemObject // register statistics virtual void regStats(); - inline Tick ticks(int numCycles) const { return numCycles; } - // main simulation loop (one cycle) void tick(); diff --git a/src/cpu/testers/networktest/networktest.hh b/src/cpu/testers/networktest/networktest.hh index aec74a484..76119e678 100644 --- a/src/cpu/testers/networktest/networktest.hh +++ b/src/cpu/testers/networktest/networktest.hh @@ -51,8 +51,6 @@ class NetworkTest : public MemObject virtual void init(); - inline Tick ticks(int numCycles) const { return numCycles; } - // main simulation loop (one cycle) void tick(); |