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
This commit is contained in:
Lisa Hsu
parent
959f0b228b
commit
921b1ee87b
12 changed files with 652 additions and 12 deletions
|
|
@ -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 *
|
||||
|
|
|
|||
|
|
@ -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.
|
||||
|
|
|
|||
|
|
@ -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(®s, 0, sizeof(RegFile));
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
||||
|
|
|
|||
|
|
@ -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++;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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())
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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__
|
||||
|
|
|
|||
|
|
@ -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),
|
||||
|
|
@ -234,13 +600,14 @@ BEGIN_INIT_SIM_OBJECT_PARAMS(Tru64System)
|
|||
INIT_PARAM_DFLT(boot_osflags, "flags to pass to the kernel during boot",
|
||||
"a")
|
||||
|
||||
|
||||
END_INIT_SIM_OBJECT_PARAMS(Tru64System)
|
||||
|
||||
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;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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__
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
||||
|
|
|
|||
|
|
@ -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:
|
||||
////////////////////////////////////////////
|
||||
|
|
|
|||
Loading…
Reference in a new issue