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

1 files changed, 79 insertions, 2 deletions

diff --git a/kern/tru64/tru64_system.hh b/kern/tru64/tru64_system.hh
index e0d2bedf7..638fabf1d 100644
--- a/kern/tru64/tru64_system.hh
+++ b/kern/tru64/tru64_system.hh
@@ -34,6 +34,10 @@
 #include "sim/system.hh"
 #include "targetarch/isa_traits.hh"
 
+#ifdef FS_MEASURE
+#include <map>
+#endif
+
 class ExecContext;
 class EcoffObject;
 class SymbolTable;
@@ -44,7 +48,9 @@ class SkipFuncEvent;
 class PrintfEvent;
 class DebugPrintfEvent;
 class DumpMbufEvent;
-
+#ifdef FS_MEASURE
+class FnEvent;
+#endif
 class AlphaArguments;
 
 class Tru64System : public System
@@ -56,6 +62,36 @@ class Tru64System : public System
     SymbolTable *kernelSymtab;
     SymbolTable *consoleSymtab;
 
+#ifdef FS_MEASURE
+    //INSTRUMENTATION CODEGEN BEGIN ONE
+    Statistics::MainBin *esIntrBin;
+    Statistics::MainBin *esRxeofBin;
+    Statistics::MainBin *esNewbufBin;
+    Statistics::MainBin *esDmaLoadBin;
+    Statistics::MainBin *dmaMapLoadBin;
+    Statistics::MainBin *etherInputBin;
+    Statistics::MainBin *netisrInputBin;
+    Statistics::MainBin *schednetisrIsrBin;
+    Statistics::MainBin *ipintrBin;
+    Statistics::MainBin *ipDooptionsBin;
+    Statistics::MainBin *ipReassBin;
+    Statistics::MainBin *tcpInputBin;
+    Statistics::MainBin *sbappendBin;
+    Statistics::MainBin *orecvBin;
+    Statistics::MainBin *recvitBin;
+    Statistics::MainBin *soreceiveBin;
+    Statistics::MainBin *osendBin;
+    Statistics::MainBin *senditBin;
+    Statistics::MainBin *sosendBin;
+    Statistics::MainBin *tcpOutputBin;
+    Statistics::MainBin *ipOutputBin;
+    Statistics::MainBin *etherOutputBin;
+    Statistics::MainBin *esStartBin;
+    Statistics::MainBin *esTransmitBin;
+    Statistics::MainBin *esTxeofBin;
+    //INSTRUMENTATION CODEGEN END
+#endif //FS_MEASURE
+
     BreakPCEvent *kernelPanicEvent;
     BreakPCEvent *consolePanicEvent;
     BadAddrEvent *badaddrEvent;
@@ -65,12 +101,47 @@ class Tru64System : public System
     DebugPrintfEvent *debugPrintfEvent;
     DebugPrintfEvent *debugPrintfrEvent;
     DumpMbufEvent *dumpMbufEvent;
+#ifdef FS_MEASURE
+    //INSTRUMENTATION CODEGEN BEGIN TWO
+    FnEvent *esIntrEvent;
+    FnEvent *esRxeofEvent;
+    FnEvent *esNewbufEvent;
+    FnEvent *esDmaLoadEvent;
+    FnEvent *dmaMapLoadEvent;
+    FnEvent *etherInputEvent;
+    FnEvent *netisrInputEvent;
+    FnEvent *schednetisrIsrEvent;
+    FnEvent *ipintrEvent;
+    FnEvent *ipDooptionsEvent;
+    FnEvent *ipReassEvent;
+    FnEvent *tcpInputEvent;
+    FnEvent *sbappendEvent;
+    FnEvent *orecvEvent;
+    FnEvent *recvitEvent;
+    FnEvent *soreceiveEvent;
+    FnEvent *osendEvent;
+    FnEvent *senditEvent;
+    FnEvent *sosendEvent;
+    FnEvent *tcpOutputEvent;
+    FnEvent *ipOutputEvent;
+    FnEvent *etherOutputEvent;
+    FnEvent *esStartEvent;
+    FnEvent *esTransmitEvent;
+    FnEvent *esTxeofEvent;
+    //INSTRUMENTATION CODEGEN END
+#endif //FS_MEASURE
 
   private:
 
     Addr kernelStart;
     Addr kernelEnd;
     Addr kernelEntry;
+    bool bin;
+
+#ifdef FS_MEASURE
+    std::multimap<const std::string, std::string> callerMap;
+    void populateMap(std::string caller, std::string callee);
+#endif
 
   public:
     std::vector<RemoteGDB *>   remoteGDB;
@@ -84,7 +155,8 @@ class Tru64System : public System
                 const std::string &kernel_path,
                 const std::string &console_path,
                 const std::string &palcode,
-                const std::string &boot_osflags);
+                const std::string &boot_osflags,
+                                const bool _bin);
     ~Tru64System();
 
     int registerExecContext(ExecContext *xc);
@@ -97,6 +169,11 @@ class Tru64System : public System
 
     static void Printf(AlphaArguments args);
     static void DumpMbuf(AlphaArguments args);
+
+#ifdef FS_MEASURE
+    bool findCaller(std::string callee, std::string caller) const;
+    void dumpState(ExecContext *xc) const;
+#endif //FS_MEASURE
 };
 
 #endif // __TRU64_SYSTEM_HH__