summaryrefslogtreecommitdiff
path: root/cpu
diff options
context:
space:
mode:
authorLisa Hsu <hsul@eecs.umich.edu>2003-11-04 15:15:12 -0500
committerLisa Hsu <hsul@eecs.umich.edu>2003-11-04 15:15:12 -0500
commit921b1ee87b6927e7310c747e03efd223d8c65642 (patch)
tree8583c8e95a6cfd99b26afe3586e00b576544f17a /cpu
parent959f0b228b1658b5c0776bd9d91c16bc62cd1f1c (diff)
downloadgem5-921b1ee87b6927e7310c747e03efd223d8c65642.tar.xz
Add the ability to track stats in user defined sets of function calls. code can be generated via the base/instrum_codegen.pl script to easily change the functions being tracked. the only thing the user needs to do is add code in tru64System to change how the callerMap is populated.
command line: m5.* <config file> <args> --server.system:bin=true to track function calls in the server m5.* <config file> <args> --client.system:bin=true to track function calls in the client base/statistics.cc: make an adjustment to the way stats are printed for FS_MEASURE base/statistics.hh: add a name() virtual function to GenBin. add a debug printf for activate(). add amake MainBin the default bin when FS_MEASURE. cpu/exec_context.cc: initialize swCtx to null upon creation of an xc cpu/exec_context.hh: add a SWContext pointer to every execution context. cpu/simple_cpu/simple_cpu.cc: process calls and returns for FS_MEASURE cpu/simple_cpu/simple_cpu.hh: add this so idleCycles will not be accessed before all stats are constructed kern/tru64/tru64_events.cc: add a FnEvent that fires whenever a function we're tracking is called. implement the process() virtual function for it. kern/tru64/tru64_events.hh: add FnEvent kern/tru64/tru64_system.cc: send bin parameter to System constructor. add bin parameter to Tru64System object. initialize all the FnEvent and MainBin members of Tru64system. also, populate the calling map that indicates whether a function call is on the path we're tracking. kern/tru64/tru64_system.hh: modify the Tru64System class to support FS_MEASURE sim/system.cc: add a bin parameter to System class. initialize a MainBin to hold the stats for nonPath. sim/system.hh: add a map of to match bins to function names. add a swCtx map to map pcb addresses to SWContext *s. Add some supporting functions. --HG-- extra : convert_revision : af3eadd798cb2d2aed9b54e1059dcedf244dd526
Diffstat (limited to 'cpu')
-rw-r--r--cpu/exec_context.cc3
-rw-r--r--cpu/exec_context.hh8
-rw-r--r--cpu/simple_cpu/simple_cpu.cc27
-rw-r--r--cpu/simple_cpu/simple_cpu.hh2
4 files changed, 38 insertions, 2 deletions
diff --git a/cpu/exec_context.cc b/cpu/exec_context.cc
index 195c9daad..92144bd93 100644
--- a/cpu/exec_context.cc
+++ b/cpu/exec_context.cc
@@ -48,6 +48,9 @@ ExecContext::ExecContext(BaseCPU *_cpu, int _thread_num, System *_sys,
kernelStats(this, _cpu), cpu(_cpu), thread_num(_thread_num),
cpu_id(-1), mem(_mem), itb(_itb), dtb(_dtb), system(_sys),
memCtrl(_sys->memCtrl), physmem(_sys->physmem),
+#ifdef FS_MEASURE
+ swCtx(NULL),
+#endif
func_exe_insn(0), storeCondFailures(0)
{
memset(&regs, 0, sizeof(RegFile));
diff --git a/cpu/exec_context.hh b/cpu/exec_context.hh
index e008e3e13..274a3778b 100644
--- a/cpu/exec_context.hh
+++ b/cpu/exec_context.hh
@@ -46,6 +46,10 @@ class MemoryController;
#include "kern/tru64/kernel_stats.hh"
#include "sim/system.hh"
+#ifdef FS_MEASURE
+#include "sim/sw_context.hh"
+#endif
+
#else // !FULL_SYSTEM
#include "sim/prog.hh"
@@ -122,6 +126,10 @@ class ExecContext
MemoryController *memCtrl;
PhysicalMemory *physmem;
+#ifdef FS_MEASURE
+ SWContext *swCtx;
+#endif
+
#else
Process *process;
diff --git a/cpu/simple_cpu/simple_cpu.cc b/cpu/simple_cpu/simple_cpu.cc
index 60d704604..814902390 100644
--- a/cpu/simple_cpu/simple_cpu.cc
+++ b/cpu/simple_cpu/simple_cpu.cc
@@ -627,7 +627,32 @@ SimpleCPU::tick()
xc->func_exe_insn++;
fault = si->execute(this, xc, traceData);
-
+#ifdef FS_MEASURE
+ if (!(xc->misspeculating()) && (xc->system->bin)) {
+ SWContext *ctx = xc->swCtx;
+ if (ctx && !ctx->callStack.empty()) {
+ if (si->isCall()) {
+ ctx->calls++;
+ }
+ if (si->isReturn()) {
+ if (ctx->calls == 0) {
+ fnCall *top = ctx->callStack.top();
+ DPRINTF(TCPIP, "Removing %s from callstack.\n", top->name);
+ delete top;
+ ctx->callStack.pop();
+ if (ctx->callStack.empty())
+ xc->system->nonPath->activate();
+ else
+ ctx->callStack.top()->myBin->activate();
+
+ xc->system->dumpState(xc);
+ } else {
+ ctx->calls--;
+ }
+ }
+ }
+ }
+#endif
if (si->isMemRef()) {
numMemRefs++;
}
diff --git a/cpu/simple_cpu/simple_cpu.hh b/cpu/simple_cpu/simple_cpu.hh
index 61c9143ba..6ad831218 100644
--- a/cpu/simple_cpu/simple_cpu.hh
+++ b/cpu/simple_cpu/simple_cpu.hh
@@ -216,7 +216,7 @@ class SimpleCPU : public BaseCPU
assert(old_status == Idle ||
old_status == DcacheMissStall ||
old_status == IcacheMissComplete);
- if (old_status == Idle)
+ if (old_status == Idle && curTick != 0)
idleCycles += curTick - last_idle;
if (tickEvent.squashed())