Merge zizzer:/bk/m5 into zower.eecs.umich.edu:/z/hsul/bk/clean

--HG--
extra : convert_revision : 0074df284e85bc2ebe6ccc2dbe765fabda9ab041

12 files changed, 653 insertions, 13 deletions

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.
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())
diff --git a/kern/tru64/tru64_events.cc b/kern/tru64/tru64_events.cc
index 538246333..bb6588e62 100644
--- a/kern/tru64/tru64_events.cc
+++ b/kern/tru64/tru64_events.cc
@@ -36,6 +36,11 @@
 #include "mem/functional_mem/memory_control.hh"
 #include "targetarch/arguments.hh"
 
+#ifdef FS_MEASURE
+#include "sim/system.hh"
+#include "sim/sw_context.hh"
+#endif
+
 void
 SkipFuncEvent::process(ExecContext *xc)
 {
@@ -105,3 +110,48 @@ DumpMbufEvent::process(ExecContext *xc)
     }
 }
 
+#ifdef FS_MEASURE
+FnEvent::FnEvent(PCEventQueue *q, const std::string & desc, System *system)
+    : PCEvent(q, desc), _name(desc)
+{
+    myBin = system->getBin(desc);
+    assert(myBin);
+}
+
+void
+FnEvent::process(ExecContext *xc)
+{
+    if (xc->misspeculating())
+        return;
+    assert(xc->system->bin && "FnEvent must be in a binned system");
+    SWContext *ctx = xc->swCtx;
+    DPRINTF(TCPIP, "%s: %s Event!!!\n", xc->system->name(), description);
+
+    if (ctx && !ctx->callStack.empty()) {
+        fnCall *last = ctx->callStack.top();
+        if (!xc->system->findCaller(myname(), last->name)) {
+            // assert(!xc->system->findCaller(myname(), "")  &&
+            //     "should not have head of path in middle of stack!");
+            return;
+        }
+        ctx->calls--;
+    } else {
+        if (!xc->system->findCaller(myname(), "")) {
+            return;
+        }
+        if (!ctx)  {
+            DPRINTF(TCPIP, "creating new context for %s\n", myname());
+            ctx = new SWContext;
+            xc->swCtx = ctx;
+        }
+    }
+    DPRINTF(TCPIP, "adding fn %s to context\n", myname());
+    fnCall *call = new fnCall;
+    call->myBin = myBin;
+    call->name = myname();
+    ctx->callStack.push(call);
+    myBin->activate();
+    xc->system->fnCalls++;
+    xc->system->dumpState(xc);
+}
+#endif //FS_MEASURE
diff --git a/kern/tru64/tru64_events.hh b/kern/tru64/tru64_events.hh
index d41f82f5b..a8f0eb865 100644
--- a/kern/tru64/tru64_events.hh
+++ b/kern/tru64/tru64_events.hh
@@ -35,6 +35,10 @@
 
 class ExecContext;
 
+#ifdef FS_MEASURE
+class System;
+#endif
+
 class SkipFuncEvent : public PCEvent
 {
   public:
@@ -78,4 +82,17 @@ class DumpMbufEvent : public PCEvent
     virtual void process(ExecContext *xc);
 };
 
+#ifdef FS_MEASURE
+class FnEvent : public PCEvent
+{
+  public:
+    FnEvent(PCEventQueue *q, const std::string &desc, System *system);
+    virtual void process(ExecContext *xc);
+    std::string myname() const { return _name; }
+
+  private:
+    std::string _name;
+    Statistics::GenBin *myBin;
+};
+#endif //FS_MEASURE
 #endif // __TRU64_EVENTS_HH__
diff --git a/kern/tru64/tru64_system.cc b/kern/tru64/tru64_system.cc
index a7940ed1f..6f4a0b169 100644
--- a/kern/tru64/tru64_system.cc
+++ b/kern/tru64/tru64_system.cc
@@ -41,13 +41,17 @@
 #include "targetarch/isa_traits.hh"
 #include "targetarch/vtophys.hh"
 
+//un-comment this to see the state of call stack when it changes.
+//#define SW_DEBUG
+
 using namespace std;
 
 Tru64System::Tru64System(const string _name, const uint64_t _init_param,
                          MemoryController *_memCtrl, PhysicalMemory *_physmem,
                          const string &kernel_path, const string &console_path,
-                         const string &palcode, const string &boot_osflags)
-     : System(_name, _init_param, _memCtrl, _physmem)
+                         const string &palcode, const string &boot_osflags,
+                         const bool _bin)
+     : System(_name, _init_param, _memCtrl, _physmem, _bin), bin(_bin)
 {
     kernelSymtab = new SymbolTable;
     consoleSymtab = new SymbolTable;
@@ -88,6 +92,88 @@ Tru64System::Tru64System(const string _name, const uint64_t _init_param,
 
     DPRINTF(Loader, "Kernel loaded...\n");
 
+#ifdef FS_MEASURE
+    //INSTRUMENTATION CODEGEN BEGIN ONE
+    if (bin == true) {
+        esIntrBin = new Statistics::MainBin(name() + " es_intr");
+        fnBins.insert(make_pair("es_intr", esIntrBin));
+
+        esRxeofBin = new Statistics::MainBin(name() + " es_rxeof");
+        fnBins.insert(make_pair("es_rxeof", esRxeofBin));
+
+        esNewbufBin = new Statistics::MainBin(name() + " es_newbuf");
+        fnBins.insert(make_pair("es_newbuf", esNewbufBin));
+
+        esDmaLoadBin = new Statistics::MainBin(name() + " es_dma_load");
+        fnBins.insert(make_pair("es_dma_load", esDmaLoadBin));
+
+        dmaMapLoadBin = new Statistics::MainBin(name() + " dma_map_load");
+        fnBins.insert(make_pair("dma_map_load", dmaMapLoadBin));
+
+        etherInputBin = new Statistics::MainBin(name() + " ether_input");
+        fnBins.insert(make_pair("ether_input", etherInputBin));
+
+        netisrInputBin = new Statistics::MainBin(name() + " netisr_input");
+        fnBins.insert(make_pair("netisr_input", netisrInputBin));
+
+        schednetisrIsrBin = new Statistics::MainBin(name() + " schednetisr_isr");
+        fnBins.insert(make_pair("schednetisr_isr", schednetisrIsrBin));
+
+        ipintrBin = new Statistics::MainBin(name() + " ipintr");
+        fnBins.insert(make_pair("ipintr", ipintrBin));
+
+        ipDooptionsBin = new Statistics::MainBin(name() + " ip_dooptions");
+        fnBins.insert(make_pair("ip_dooptions", ipDooptionsBin));
+
+        ipReassBin = new Statistics::MainBin(name() + " ip_reass");
+        fnBins.insert(make_pair("ip_reass", ipReassBin));
+
+        tcpInputBin = new Statistics::MainBin(name() + " tcp_input");
+        fnBins.insert(make_pair("tcp_input", tcpInputBin));
+
+        sbappendBin = new Statistics::MainBin(name() + " sbappend");
+        fnBins.insert(make_pair("sbappend", sbappendBin));
+
+        orecvBin = new Statistics::MainBin(name() + " orecv");
+        fnBins.insert(make_pair("orecv", orecvBin));
+
+        recvitBin = new Statistics::MainBin(name() + " recvit");
+        fnBins.insert(make_pair("recvit", recvitBin));
+
+        soreceiveBin = new Statistics::MainBin(name() + " soreceive");
+        fnBins.insert(make_pair("soreceive", soreceiveBin));
+
+        osendBin = new Statistics::MainBin(name() + " osend");
+        fnBins.insert(make_pair("osend", osendBin));
+
+        senditBin = new Statistics::MainBin(name() + " sendit");
+        fnBins.insert(make_pair("sendit", senditBin));
+
+        sosendBin = new Statistics::MainBin(name() + " sosend");
+        fnBins.insert(make_pair("sosend", sosendBin));
+
+        tcpOutputBin = new Statistics::MainBin(name() + " tcp_output");
+        fnBins.insert(make_pair("tcp_output", tcpOutputBin));
+
+        ipOutputBin = new Statistics::MainBin(name() + " ip_output");
+        fnBins.insert(make_pair("ip_output", ipOutputBin));
+
+        etherOutputBin = new Statistics::MainBin(name() + " ether_output");
+        fnBins.insert(make_pair("ether_output", etherOutputBin));
+
+        esStartBin = new Statistics::MainBin(name() + " es_start");
+        fnBins.insert(make_pair("es_start", esStartBin));
+
+        esTransmitBin = new Statistics::MainBin(name() + " es_transmit");
+        fnBins.insert(make_pair("es_transmit", esTransmitBin));
+
+        esTxeofBin = new Statistics::MainBin(name() + " es_txeof");
+        fnBins.insert(make_pair("es_txeof", esTxeofBin));
+
+    }
+    //INSTRUMENTATION CODEGEN END
+#endif //FS_MEASURE
+
     kernelPanicEvent = new BreakPCEvent(&pcEventQueue, "kernel panic");
     consolePanicEvent = new BreakPCEvent(&pcEventQueue, "console panic");
     badaddrEvent = new BadAddrEvent(&pcEventQueue, "badaddr");
@@ -102,6 +188,38 @@ Tru64System::Tru64System(const string _name, const uint64_t _init_param,
                                              "debug_printfr", true);
     dumpMbufEvent = new DumpMbufEvent(&pcEventQueue, "dump_mbuf");
 
+#ifdef FS_MEASURE
+    //INSTRUMENTATION CODEGEN BEGIN TWO
+    if (bin == true) {
+          esIntrEvent = new FnEvent(&pcEventQueue, "es_intr", this);
+          esRxeofEvent = new FnEvent(&pcEventQueue, "es_rxeof", this);
+          esNewbufEvent = new FnEvent(&pcEventQueue, "es_newbuf", this);
+          esDmaLoadEvent = new FnEvent(&pcEventQueue, "es_dma_load", this);
+          dmaMapLoadEvent = new FnEvent(&pcEventQueue, "dma_map_load", this);
+          etherInputEvent = new FnEvent(&pcEventQueue, "ether_input", this);
+          netisrInputEvent = new FnEvent(&pcEventQueue, "netisr_input", this);
+          schednetisrIsrEvent = new FnEvent(&pcEventQueue, "schednetisr_isr", this);
+          ipintrEvent = new FnEvent(&pcEventQueue, "ipintr", this);
+          ipDooptionsEvent = new FnEvent(&pcEventQueue, "ip_dooptions", this);
+          ipReassEvent = new FnEvent(&pcEventQueue, "ip_reass", this);
+          tcpInputEvent = new FnEvent(&pcEventQueue, "tcp_input", this);
+          sbappendEvent = new FnEvent(&pcEventQueue, "sbappend", this);
+          orecvEvent = new FnEvent(&pcEventQueue, "orecv", this);
+          recvitEvent = new FnEvent(&pcEventQueue, "recvit", this);
+          soreceiveEvent = new FnEvent(&pcEventQueue, "soreceive", this);
+          osendEvent = new FnEvent(&pcEventQueue, "osend", this);
+          senditEvent = new FnEvent(&pcEventQueue, "sendit", this);
+          sosendEvent = new FnEvent(&pcEventQueue, "sosend", this);
+          tcpOutputEvent = new FnEvent(&pcEventQueue, "tcp_output", this);
+          ipOutputEvent = new FnEvent(&pcEventQueue, "ip_output", this);
+          etherOutputEvent = new FnEvent(&pcEventQueue, "ether_output", this);
+          esStartEvent = new FnEvent(&pcEventQueue, "es_start", this);
+          esTransmitEvent = new FnEvent(&pcEventQueue, "es_transmit", this);
+          esTxeofEvent = new FnEvent(&pcEventQueue, "es_txeof", this);
+    }
+    //INSTRUMENTATION CODEGEN END
+#endif //FS_MEASURE
+
     Addr addr = 0;
     if (kernelSymtab->findAddress("enable_async_printf", addr)) {
         Addr paddr = vtophys(physmem, addr);
@@ -152,6 +270,177 @@ Tru64System::Tru64System(const string _name, const uint64_t _init_param,
     if (kernelSymtab->findAddress("m5_dump_mbuf", addr))
         dumpMbufEvent->schedule(addr);
 #endif
+
+#ifdef FS_MEASURE
+    //INSTRUMENTATION CODEGEN BEGIN THREE
+    if (bin == true) {
+        if (kernelSymtab->findAddress("es_intr", addr))
+            esIntrEvent->schedule(addr);
+        else
+            panic("could not find kernel symbol \'es_intr\'");
+
+        if (kernelSymtab->findAddress("es_rxeof", addr))
+            esRxeofEvent->schedule(addr);
+        else
+            panic("could not find kernel symbol \'es_rxeof\'");
+
+        if (kernelSymtab->findAddress("es_newbuf", addr))
+            esNewbufEvent->schedule(addr);
+        else
+            panic("could not find kernel symbol \'es_newbuf\'");
+
+        if (kernelSymtab->findAddress("es_dma_load", addr))
+            esDmaLoadEvent->schedule(addr);
+        else
+            panic("could not find kernel symbol \'es_dma_load\'");
+
+        if (kernelSymtab->findAddress("dma_map_load", addr))
+            dmaMapLoadEvent->schedule(addr);
+        else
+            panic("could not find kernel symbol \'dma_map_load\'");
+
+        if (kernelSymtab->findAddress("ether_input", addr))
+            etherInputEvent->schedule(addr);
+        else
+            panic("could not find kernel symbol \'ether_input\'");
+
+        if (kernelSymtab->findAddress("netisr_input", addr))
+            netisrInputEvent->schedule(addr);
+        else
+            panic("could not find kernel symbol \'netisr_input\'");
+
+        if (kernelSymtab->findAddress("schednetisr_isr", addr))
+            schednetisrIsrEvent->schedule(addr);
+        else
+            panic("could not find kernel symbol \'schednetisr_isr\'");
+
+        if (kernelSymtab->findAddress("ipintr", addr))
+            ipintrEvent->schedule(addr);
+        else
+            panic("could not find kernel symbol \'ipintr\'");
+
+        if (kernelSymtab->findAddress("ip_dooptions", addr))
+            ipDooptionsEvent->schedule(addr);
+        else
+            panic("could not find kernel symbol \'ip_dooptions\'");
+
+        if (kernelSymtab->findAddress("ip_reass", addr))
+            ipReassEvent->schedule(addr);
+        else
+            panic("could not find kernel symbol \'ip_reass\'");
+
+        if (kernelSymtab->findAddress("tcp_input", addr))
+            tcpInputEvent->schedule(addr);
+        else
+            panic("could not find kernel symbol \'tcp_input\'");
+
+        if (kernelSymtab->findAddress("sbappend", addr))
+            sbappendEvent->schedule(addr);
+        else
+            panic("could not find kernel symbol \'sbappend\'");
+
+        if (kernelSymtab->findAddress("orecv", addr))
+            orecvEvent->schedule(addr);
+        else
+            panic("could not find kernel symbol \'orecv\'");
+
+        if (kernelSymtab->findAddress("recvit", addr))
+            recvitEvent->schedule(addr);
+        else
+            panic("could not find kernel symbol \'recvit\'");
+
+        if (kernelSymtab->findAddress("soreceive", addr))
+            soreceiveEvent->schedule(addr);
+        else
+            panic("could not find kernel symbol \'soreceive\'");
+
+        if (kernelSymtab->findAddress("osend", addr))
+            osendEvent->schedule(addr);
+        else
+            panic("could not find kernel symbol \'osend\'");
+
+        if (kernelSymtab->findAddress("sendit", addr))
+            senditEvent->schedule(addr);
+        else
+            panic("could not find kernel symbol \'sendit\'");
+
+        if (kernelSymtab->findAddress("sosend", addr))
+            sosendEvent->schedule(addr);
+        else
+            panic("could not find kernel symbol \'sosend\'");
+
+        if (kernelSymtab->findAddress("tcp_output", addr))
+            tcpOutputEvent->schedule(addr);
+        else
+            panic("could not find kernel symbol \'tcp_output\'");
+
+        if (kernelSymtab->findAddress("ip_output", addr))
+            ipOutputEvent->schedule(addr);
+        else
+            panic("could not find kernel symbol \'ip_output\'");
+
+        if (kernelSymtab->findAddress("ether_output", addr))
+            etherOutputEvent->schedule(addr);
+        else
+            panic("could not find kernel symbol \'ether_output\'");
+
+        if (kernelSymtab->findAddress("es_start", addr))
+            esStartEvent->schedule(addr);
+        else
+            panic("could not find kernel symbol \'es_start\'");
+
+        if (kernelSymtab->findAddress("es_transmit", addr))
+            esTransmitEvent->schedule(addr);
+        else
+            panic("could not find kernel symbol \'es_transmit\'");
+
+        if (kernelSymtab->findAddress("es_txeof", addr))
+            esTxeofEvent->schedule(addr);
+        else
+            panic("could not find kernel symbol \'es_txeof\'");
+
+    }
+    //INSTRUMENTATION CODEGEN END
+     if (bin == true) {
+        fnCalls
+            .name(name() + ":fnCalls")
+            .desc("all fn calls being tracked")
+            ;
+
+        populateMap("es_intr", "");
+        populateMap("es_rxeof", "es_intr");
+        populateMap("es_newbuf", "es_rxeof");
+        populateMap("es_dma_load", "es_newbuf");
+        populateMap("dma_map_load", "es_dma_load");
+        populateMap("ether_input", "es_rxeof");
+        populateMap("netisr_input", "ether_input");
+        populateMap("schednetisr_isr", "netisr_input");
+
+        populateMap("ipintr", "");
+        populateMap("ip_dooptions", "ipintr");
+        populateMap("ip_reass", "ipintr");
+        populateMap("tcp_input", "ipintr");
+        populateMap("sbappend", "tcp_input");
+
+        populateMap("read", "");
+        populateMap("orecv", "");
+        populateMap("recvit", "read");
+        populateMap("recvit", "orecv");
+        populateMap("soreceive", "recvit");
+
+        populateMap("write", "");
+        populateMap("sendit", "write");
+        populateMap("sosend", "sendit");
+
+        populateMap("tcp_output", "");
+        populateMap("ip_output", "tcp_output");
+        populateMap("ether_output", "ip_output");
+        populateMap("es_start", "ether_output");
+        populateMap("es_transmit", "es_start");
+
+        populateMap("es_txeof", "es_intr");
+    }
+#endif //FS_MEASURE
 }
 
 Tru64System::~Tru64System()
@@ -172,6 +461,37 @@ Tru64System::~Tru64System()
     delete debugPrintfrEvent;
     delete dumpMbufEvent;
 
+#ifdef FS_MEASURE
+    //INSTRUMENTATION CODEGEN BEGIN FOUR
+    if (bin == true) {
+        delete esIntrEvent;
+        delete esRxeofEvent;
+        delete esNewbufEvent;
+        delete esDmaLoadEvent;
+        delete dmaMapLoadEvent;
+        delete etherInputEvent;
+        delete netisrInputEvent;
+        delete schednetisrIsrEvent;
+        delete ipintrEvent;
+        delete ipDooptionsEvent;
+        delete ipReassEvent;
+        delete tcpInputEvent;
+        delete sbappendEvent;
+        delete orecvEvent;
+        delete recvitEvent;
+        delete soreceiveEvent;
+        delete osendEvent;
+        delete senditEvent;
+        delete sosendEvent;
+        delete tcpOutputEvent;
+        delete ipOutputEvent;
+        delete etherOutputEvent;
+        delete esStartEvent;
+        delete esTransmitEvent;
+        delete esTxeofEvent;
+    }
+    //INSTRUMENTATION CODEGEN END
+#endif //FS_MEASURE
 }
 
 int
@@ -210,8 +530,53 @@ Tru64System::breakpoint()
     return remoteGDB[0]->trap(ALPHA_KENTRY_IF);
 }
 
+#ifdef FS_MEASURE
+void
+Tru64System::populateMap(std::string callee, std::string caller)
+{
+    multimap<const string, string>::const_iterator i;
+    i = callerMap.insert(make_pair(callee, caller));
+    assert(i != callerMap.end() && "should not fail populating callerMap");
+}
+
+bool
+Tru64System::findCaller(std::string callee, std::string caller) const
+{
+    typedef multimap<const std::string, std::string>::const_iterator iter;
+    pair<iter, iter> range;
+
+    range = callerMap.equal_range(callee);
+    for (iter i = range.first; i != range.second; ++i) {
+        if ((*i).second == caller)
+            return true;
+    }
+    return false;
+}
+
+void
+Tru64System::dumpState(ExecContext *xc) const
+{
+#ifndef SW_DEBUG
+    return;
+#endif
+    if (xc->swCtx) {
+        stack<fnCall *> copy(xc->swCtx->callStack);
+        if (copy.empty())
+            return;
+        cprintf("xc->swCtx:\n");
+        fnCall *top;
+        cprintf("||   call: %d\n",xc->swCtx->calls);
+        for (top = copy.top(); !copy.empty(); copy.pop() ) {
+            top = copy.top();
+            cprintf("||  %13s : %s \n", top->name, top->myBin->name());
+        }
+    }
+}
+#endif //FS_MEASURE
+
 BEGIN_DECLARE_SIM_OBJECT_PARAMS(Tru64System)
 
+    Param<bool> bin;
     SimObjectParam<MemoryController *> mem_ctl;
     SimObjectParam<PhysicalMemory *> physmem;
     Param<uint64_t> init_param;
@@ -225,6 +590,7 @@ END_DECLARE_SIM_OBJECT_PARAMS(Tru64System)
 
 BEGIN_INIT_SIM_OBJECT_PARAMS(Tru64System)
 
+    INIT_PARAM_DFLT(bin, "is this system to be binned", false),
     INIT_PARAM(mem_ctl, "memory controller"),
     INIT_PARAM(physmem, "phsyical memory"),
     INIT_PARAM_DFLT(init_param, "numerical value to pass into simulator", 0),
@@ -232,7 +598,8 @@ BEGIN_INIT_SIM_OBJECT_PARAMS(Tru64System)
     INIT_PARAM(console_code, "file that contains the console code"),
     INIT_PARAM(pal_code, "file that contains palcode"),
     INIT_PARAM_DFLT(boot_osflags, "flags to pass to the kernel during boot",
-                    "a")
+                                   "a")
+
 
 END_INIT_SIM_OBJECT_PARAMS(Tru64System)
 
@@ -240,7 +607,7 @@ CREATE_SIM_OBJECT(Tru64System)
 {
     Tru64System *sys = new Tru64System(getInstanceName(), init_param, mem_ctl,
                                        physmem, kernel_code, console_code,
-                                       pal_code, boot_osflags);
+                                       pal_code, boot_osflags, bin);
 
     return sys;
 }
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__
diff --git a/sim/system.cc b/sim/system.cc
index af4a4c151..58e290d1a 100644
--- a/sim/system.cc
+++ b/sim/system.cc
@@ -40,14 +40,23 @@ int System::numSystemsRunning = 0;
 System::System(const std::string _name,
                const uint64_t _init_param,
                MemoryController *_memCtrl,
-               PhysicalMemory *_physmem)
+               PhysicalMemory *_physmem,
+               const bool _bin)
     : SimObject(_name),
       init_param(_init_param),
       memCtrl(_memCtrl),
-      physmem(_physmem)
+      physmem(_physmem),
+      bin(_bin)
 {
     // add self to global system list
     systemList.push_back(this);
+#ifdef FS_MEASURE
+    if (bin == true) {
+        nonPath = new Statistics::MainBin("non TCPIP path stats");
+        nonPath->activate();
+    } else
+        nonPath = NULL;
+#endif
 }
 
 
@@ -95,5 +104,30 @@ printSystems()
     System::printSystems();
 }
 
+#ifdef FS_MEASURE
+Statistics::GenBin *
+System::getBin(const std::string &name)
+{
+    std::map<const std::string, Statistics::GenBin *>::const_iterator i;
+    i = fnBins.find(name);
+    if (i == fnBins.end())
+        panic("trying to getBin that is not on system map!");
+    return (*i).second;
+}
+
+SWContext *
+System::findContext(Addr pcb)
+{
+  std::map<Addr, SWContext *>::const_iterator iter;
+  iter = swCtxMap.find(pcb);
+  if (iter != swCtxMap.end()) {
+      SWContext *ctx = (*iter).second;
+      assert(ctx != NULL && "should never have a null ctx in ctxMap");
+      return ctx;
+  } else
+      return NULL;
+}
+#endif //FS_MEASURE
+
 DEFINE_SIM_OBJECT_CLASS_NAME("System", System)
 
diff --git a/sim/system.hh b/sim/system.hh
index 081aa3eb7..741dea0db 100644
--- a/sim/system.hh
+++ b/sim/system.hh
@@ -36,6 +36,11 @@
 #include "cpu/pc_event.hh"
 #include "base/loader/symtab.hh"
 
+#ifdef FS_MEASURE
+#include "base/statistics.hh"
+#include "sim/sw_context.hh"
+#endif
+
 class MemoryController;
 class PhysicalMemory;
 class RemoteGDB;
@@ -45,10 +50,17 @@ class ExecContext;
 
 class System : public SimObject
 {
+#ifdef FS_MEASURE
+  protected:
+    std::map<const std::string, Statistics::GenBin *> fnBins;
+    std::map<const Addr, SWContext *> swCtxMap;
+#endif //FS_MEASURE
+
   public:
     const uint64_t init_param;
     MemoryController *memCtrl;
     PhysicalMemory *physmem;
+    bool bin;
 
     PCEventQueue pcEventQueue;
 
@@ -57,9 +69,14 @@ class System : public SimObject
     virtual int registerExecContext(ExecContext *xc);
     virtual void replaceExecContext(int xcIndex, ExecContext *xc);
 
+#ifdef FS_MEASURE
+    Statistics::Scalar<Counter, Statistics::MainBin> fnCalls;
+    Statistics::MainBin *nonPath;
+#endif //FS_MEASURE
+
   public:
     System(const std::string _name, const uint64_t _init_param,
-           MemoryController *, PhysicalMemory *);
+           MemoryController *, PhysicalMemory *, const bool);
     ~System();
 
     virtual Addr getKernelStart() const = 0;
@@ -67,6 +84,21 @@ class System : public SimObject
     virtual Addr getKernelEntry() const = 0;
     virtual bool breakpoint() = 0;
 
+#ifdef FS_MEASURE
+    Statistics::GenBin * getBin(const std::string &name);
+    virtual bool findCaller(std::string, std::string) const = 0;
+
+    SWContext *findContext(Addr pcb);
+    bool addContext(Addr pcb, SWContext *ctx) {
+        return (swCtxMap.insert(make_pair(pcb, ctx))).second;
+    }
+    void remContext(Addr pcb) {
+        swCtxMap.erase(pcb);
+        return;
+    }
+
+    virtual void dumpState(ExecContext *xc) const = 0;
+#endif //FS_MEASURE
 
   public:
     ////////////////////////////////////////////