From 921b1ee87b6927e7310c747e03efd223d8c65642 Mon Sep 17 00:00:00 2001
From: Lisa Hsu <hsul@eecs.umich.edu>
Date: Tue, 4 Nov 2003 15:15:12 -0500
Subject: 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
---
 base/statistics.cc | 15 +++++++++++++++
 base/statistics.hh | 16 ++++++++++++++--
 2 files changed, 29 insertions(+), 2 deletions(-)

(limited to 'base')

diff --git a/base/statistics.cc b/base/statistics.cc
index c1a5b2626..fbb056498 100644
--- a/base/statistics.cc
+++ b/base/statistics.cc
@@ -161,6 +161,7 @@ void
 Database::dump(ostream &stream)
 {
 
+#ifndef FS_MEASURE
     list_t::iterator i = printStats.begin();
     list_t::iterator end = printStats.end();
     while (i != end) {
@@ -169,6 +170,7 @@ Database::dump(ostream &stream)
             binnedStats.push_back(stat);
         ++i;
     }
+#endif //FS_MEASURE
 
     list<GenBin *>::iterator j = bins.begin();
     list<GenBin *>::iterator bins_end=bins.end();
@@ -183,8 +185,13 @@ Database::dump(ostream &stream)
                 panic("a binned stat not found in names map!");
             ccprintf(stream,"---%s Bin------------\n", (*iter).second);
 
+#ifdef FS_MEASURE
+            list_t::iterator i = printStats.begin();
+                    list_t::iterator end = printStats.end();
+#else
            list_t::iterator i = binnedStats.begin();
            list_t::iterator end = binnedStats.end();
+#endif
            while (i != end) {
                Stat *stat = *i;
                if (stat->dodisplay())
@@ -194,9 +201,16 @@ Database::dump(ostream &stream)
            ++j;
            ccprintf(stream, "---------------------------------\n");
         }
+#ifndef FS_MEASURE
         ccprintf(stream, "**************ALL STATS************\n");
+#endif
     }
 
+/**
+ * get bin totals working, then print the stat here (as total), even if
+ * its' binned.  (this is only for the case you selectively bin a few stats
+ */
+#ifndef FS_MEASURE
     list_t::iterator k = printStats.begin();
     list_t::iterator endprint = printStats.end();
     while (k != endprint) {
@@ -205,6 +219,7 @@ Database::dump(ostream &stream)
             stat->display(stream);
         ++k;
     }
+#endif
 }
 
 StatData *
diff --git a/base/statistics.hh b/base/statistics.hh
index 2fe6988b0..aa3489727 100644
--- a/base/statistics.hh
+++ b/base/statistics.hh
@@ -60,6 +60,9 @@
 #include <math.h>
 #include "sim/host.hh"
 
+#ifdef FS_MEASURE
+#include "base/trace.hh"
+#endif
 //
 //  Un-comment this to enable weirdo-stat debugging
 //
@@ -2167,6 +2170,7 @@ class GenBin : public Detail::BinBase
     virtual ~GenBin() {};
 
     virtual void activate() = 0;
+    virtual std::string name() const = 0;
     void regBin(GenBin *bin, std::string name);
 };
 
@@ -2198,7 +2202,6 @@ struct StatBin : public GenBin
 
         // That one is for the last trailing flags byte.
         offset() += (size + 1 + mask) & ~mask;
-
         return off;
     }
 
@@ -2212,7 +2215,12 @@ struct StatBin : public GenBin
         return Detail::BinBase::memory() + off;
     }
 
-    virtual void activate()  { setCurBin(this); }
+    virtual void activate()  {
+        setCurBin(this);
+#ifdef FS_MEASURE
+        DPRINTF(TCPIP, "activating %s Bin\n", name());
+#endif
+    }
     static void activate(StatBin &bin) { setCurBin(&bin); }
 
     class BinBase
@@ -2426,7 +2434,11 @@ struct NoBin
  * is NoBin, nothing is binned.  If it is MainBin (or whatever *Bin), then all stats are binned
  * under that Bin.
  */
+#ifdef FS_MEASURE
+typedef MainBin DefaultBin;
+#else
 typedef NoBin DefaultBin;
+#endif
 
 /**
  * This is a simple scalar statistic, like a counter.
-- 
cgit v1.2.3