Implement more m5 pseduo opcodes:

resetstats
dumpstats
dumpresetstats
m5checkpoint

Lots of cleanup of serialization and stats dumping/resetting to
work with these new instructions

arch/alpha/isa_desc:
    Implement more m5 pseduo opcodes:
    resetstats
    dumpstats
    dumpresetstats
    m5checkpoint

    All of these functions take two optional parameters, the first is a delay,
    and the second is a period.  The delay tells the simulator to wait the
    specified number of nanoseconds before triggering the event, the period
    tells the simulator to repeat the event with a specified frequency
base/statistics.cc:
base/statistics.hh:
    regReset RegResetCallback
dev/disk_image.cc:
    serializeFilename -> CheckpointFile()
sim/debug.cc:
    Move this debugging statement to sim_stats.cc
sim/eventq.cc:
    Don't AutoDelete an event if it is scheduled since the process()
    function could potentially schedule the event again.
sim/main.cc:
    DumpStatsEvent is now Statistics::SetupEvent(Dump, curTick)
sim/serialize.cc:
    Change the serialize event so that it's possible to cause the
    event to repeat.  Also make the priority such that the event
    happens just before the simulator would exit if both events
    were scheduled for the same cycle.

    get rid of the serializeFilename variable and provide a CheckpointFile()
    function.  This function takes a basename that is set in the
    configuration, and appends the current cycle to the name so that
    multiple checkpoints can be dumped from the same simulation.

    Also, don't exit the simulation when a checkpoint file is dumped.
sim/serialize.hh:
    serializeFilename -> CheckpointFile()
    SetupCheckpoint function to tell the simulator to prepare
    to checkpoint at a certain time with a certain period
sim/sim_events.cc:
    DumpStatsEvent stuff gets move to sim_stats.(cc|hh)
    The context stuff gets moved into the already existing
    stats context in stat_context.cc
sim/sim_events.hh:
    DumpStatsEvent stuff gets move to sim_stats.(cc|hh)
sim/universe.cc:
    Provide some simple functions for converting times into
    ticks.  These use floating point math to get as close as
    possible to the real values.  Multipliers are set up ahead
    of time

--HG--
extra : convert_revision : d06ef26a9237529a1e5060cb1ac2dcc04d4ec252

1 files changed, 48 insertions, 8 deletions

diff --git a/arch/alpha/isa_desc b/arch/alpha/isa_desc
index aaf0cb0a7..e34739b86 100644
--- a/arch/alpha/isa_desc
+++ b/arch/alpha/isa_desc
@@ -28,7 +28,9 @@ let {{
 #include "cpu/simple_cpu/simple_cpu.hh"
 #include "cpu/static_inst.hh"
 #include "sim/annotation.hh"
+#include "sim/serialize.hh"
 #include "sim/sim_events.hh"
+#include "sim/sim_stats.hh"
 
 #ifdef FULL_SYSTEM
 #include "targetarch/ev5.hh"
@@ -2431,20 +2433,58 @@ decode OPCODE default Unknown::unknown() {
 	    }}, No_OpClass);
 	    0x21: m5exit({{
 		if (!xc->misspeculating()) {
-		    Tick when = curTick;
 		    Tick delay = xc->regs.intRegFile[16];
-		    if (delay != 0) {
-			delay *= ticksPerUS;
-			delay /= 1000;
-			when += delay;
-		    }
+		    Tick when = curTick + NS2Ticks(delay);
 		    SimExit(when, "m5_exit instruction encountered");
 		}
 	    }}, No_OpClass);
             0x30: initparam({{ Ra = xc->cpu->system->init_param; }});
             0x40: resetstats({{
-		if (!xc->misspeculating())
-		    Statistics::reset();
+		if (!xc->misspeculating()) {
+		    using namespace Statistics;
+		    Tick delay = xc->regs.intRegFile[16];
+		    Tick period = xc->regs.intRegFile[17];
+
+		    Tick when = curTick + NS2Ticks(delay);
+		    Tick repeat = NS2Ticks(period);
+
+		    SetupEvent(Reset, when, repeat);
+		}
+	    }});
+            0x41: dumpstats({{
+		if (!xc->misspeculating()) {
+		    using namespace Statistics;
+		    Tick delay = xc->regs.intRegFile[16];
+		    Tick period = xc->regs.intRegFile[17];
+
+		    Tick when = curTick + NS2Ticks(delay);
+		    Tick repeat = NS2Ticks(period);
+
+		    SetupEvent(Dump, when, repeat);
+		}
+	    }});
+            0x42: dumpresetstats({{
+		if (!xc->misspeculating()) {
+		    using namespace Statistics;
+		    Tick delay = xc->regs.intRegFile[16];
+		    Tick period = xc->regs.intRegFile[17];
+
+		    Tick when = curTick + NS2Ticks(delay);
+		    Tick repeat = NS2Ticks(period);
+
+		    SetupEvent(Dump|Reset, when, repeat);
+		}
+	    }});
+            0x43: m5checkpoint({{
+		if (!xc->misspeculating()) {
+		    Tick delay = xc->regs.intRegFile[16];
+		    Tick period = xc->regs.intRegFile[17];
+
+		    Tick when = curTick + NS2Ticks(delay);
+		    Tick repeat = NS2Ticks(period);
+
+		    SetupCheckpoint(when, repeat);
+		}
 	    }});
 	}
     }