25a358983a
Add support for generic visitors for stats and use them to implement independent output functions. Support for mysql output and some initial code for hacking on mysql output with python arch/alpha/pseudo_inst.cc: base/hybrid_pred.cc: base/hybrid_pred.hh: base/sat_counter.cc: base/sat_counter.hh: cpu/simple_cpu/simple_cpu.cc: kern/tru64/tru64_events.cc: sim/main.cc: sim/process.cc: sim/process.hh: sim/sim_events.cc: sim/sim_object.cc: sim/system.hh: update for changes in stats package base/statistics.cc: move the python output code to base/stats/puthon.(cc|hh) and reimplement it as a visitor. move the text output code to base/stats/text.(cc|hh) and reimplement it as a visitor. move the database stuff into base/stats/statdb.(cc|hh) and get rid of the class. Put everything as globals in the Statistics::Database namespace. allocate unique ids for all stats. directly implement the check routine and get rid of the various dumping routines since they're now in separate files. make sure that no two stats have the same name clean up some loops base/statistics.hh: major changes to the statistics package again lots of code was factored out of statistics.hh into several separate files in base/stats/ (this will continue) There are now two Stat package types Result and Counter that are specified to allow the user to keep the counted type separate from the result type. They are currently both doubles but that's an experiment. There is no more per stat ability to set the type. Statistics::Counter is not the same as Counter! Implement a visitor for statistics output so that new output types can be implemented independently from the stats package itself. Add a unique id to each stat so that it can be used to keep track of stats more simply. This number can also be used in debugging problems with stats. Tweak the bucket size stuff a bit to make it work better. fixed VectorDist size bug cpu/memtest/memtest.cc: Fix up for changes in stats package Don't use value() since it doesn't work with binning. If you want a number as a stat, and to use it in the program itself, you really want two separate variables, one that's a stat, and one that's not. cpu/memtest/memtest.hh: Fix up for changes in stats package test/Makefile: Try to build stuff now that directories matter test/stattest.cc: test all new output types choose which one with command line options --HG-- extra : convert_revision : e3a3f5f0828c67c0e2de415d936ad240adaddc89
207 lines
4.9 KiB
C++
207 lines
4.9 KiB
C++
/*
|
|
* Copyright (c) 2003 The Regents of The University of Michigan
|
|
* All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions are
|
|
* met: redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer;
|
|
* redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution;
|
|
* neither the name of the copyright holders nor the names of its
|
|
* contributors may be used to endorse or promote products derived from
|
|
* this software without specific prior written permission.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
|
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
|
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
|
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
|
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
|
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
|
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
|
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
*/
|
|
|
|
// This file will contain default statistics for the simulator that
|
|
// don't really belong to a specific simulator object
|
|
|
|
#include <fstream>
|
|
#include <iostream>
|
|
#include <list>
|
|
|
|
#include "base/callback.hh"
|
|
#include "base/hostinfo.hh"
|
|
#include "base/statistics.hh"
|
|
#include "base/str.hh"
|
|
#include "base/time.hh"
|
|
#include "base/stats/output.hh"
|
|
#include "sim/eventq.hh"
|
|
#include "sim/sim_object.hh"
|
|
#include "sim/stat_control.hh"
|
|
#include "sim/universe.hh"
|
|
|
|
using namespace std;
|
|
|
|
Statistics::Formula hostInstRate;
|
|
Statistics::Formula hostMemory;
|
|
Statistics::Formula hostSeconds;
|
|
Statistics::Formula hostTickRate;
|
|
|
|
Statistics::Formula simInsts;
|
|
Statistics::Formula simSeconds;
|
|
Statistics::Formula simTicks;
|
|
|
|
namespace Statistics {
|
|
|
|
Time statTime(true);
|
|
Tick startTick;
|
|
|
|
class SimTicksReset : public Callback
|
|
{
|
|
public:
|
|
void process()
|
|
{
|
|
statTime.set();
|
|
startTick = curTick;
|
|
}
|
|
};
|
|
|
|
double
|
|
statElapsedTime()
|
|
{
|
|
Time now(true);
|
|
Time elapsed = now - statTime;
|
|
return elapsed();
|
|
}
|
|
|
|
SimTicksReset simTicksReset;
|
|
|
|
void
|
|
InitSimStats()
|
|
{
|
|
simInsts
|
|
.name("sim_insts")
|
|
.desc("Number of instructions simulated")
|
|
.precision(0)
|
|
.prereq(simInsts)
|
|
;
|
|
|
|
simSeconds
|
|
.name("sim_seconds")
|
|
.desc("Number of seconds simulated")
|
|
;
|
|
|
|
simTicks
|
|
.name("sim_ticks")
|
|
.desc("Number of ticks simulated")
|
|
;
|
|
|
|
hostInstRate
|
|
.name("host_inst_rate")
|
|
.desc("Simulator instruction rate (inst/s)")
|
|
.precision(0)
|
|
.prereq(simInsts)
|
|
;
|
|
|
|
hostMemory
|
|
.name("host_mem_usage")
|
|
.desc("Number of bytes of host memory used")
|
|
.prereq(hostMemory)
|
|
;
|
|
|
|
hostSeconds
|
|
.name("host_seconds")
|
|
.desc("Real time elapsed on the host")
|
|
.precision(2)
|
|
;
|
|
|
|
hostTickRate
|
|
.name("host_tick_rate")
|
|
.desc("Simulator tick rate (ticks/s)")
|
|
.precision(0)
|
|
;
|
|
|
|
simInsts = constant(0);
|
|
simTicks = scalar(curTick) - scalar(startTick);
|
|
simSeconds = simTicks / scalar(ticksPerSecond);
|
|
hostMemory = functor(memUsage);
|
|
hostSeconds = functor(statElapsedTime);
|
|
hostInstRate = simInsts / hostSeconds;
|
|
hostTickRate = simTicks / hostSeconds;
|
|
|
|
registerResetCallback(&simTicksReset);
|
|
}
|
|
|
|
class StatEvent : public Event
|
|
{
|
|
protected:
|
|
int flags;
|
|
Tick repeat;
|
|
|
|
public:
|
|
StatEvent(int _flags, Tick _when, Tick _repeat);
|
|
virtual void process();
|
|
virtual const char *description();
|
|
};
|
|
|
|
StatEvent::StatEvent(int _flags, Tick _when, Tick _repeat)
|
|
: Event(&mainEventQueue, Stat_Event_Pri),
|
|
flags(_flags), repeat(_repeat)
|
|
{
|
|
setFlags(AutoDelete);
|
|
schedule(_when);
|
|
}
|
|
|
|
const char *
|
|
StatEvent::description()
|
|
{
|
|
return "Statistics dump and/or reset";
|
|
}
|
|
|
|
void
|
|
StatEvent::process()
|
|
{
|
|
if (flags & Statistics::Dump)
|
|
DumpNow();
|
|
|
|
if (flags & Statistics::Reset)
|
|
reset();
|
|
|
|
if (repeat)
|
|
schedule(curTick + repeat);
|
|
}
|
|
|
|
list<Output *> OutputList;
|
|
|
|
void
|
|
DumpNow()
|
|
{
|
|
list<Output *>::iterator i = OutputList.begin();
|
|
list<Output *>::iterator end = OutputList.end();
|
|
for (; i != end; ++i) {
|
|
Output *output = *i;
|
|
if (!output->valid())
|
|
continue;
|
|
|
|
output->output();
|
|
}
|
|
}
|
|
|
|
void
|
|
SetupEvent(int flags, Tick when, Tick repeat)
|
|
{
|
|
new StatEvent(flags, when, repeat);
|
|
}
|
|
|
|
/* namespace Statistics */ }
|
|
|
|
extern "C" void
|
|
debugDumpStats()
|
|
{
|
|
Statistics::DumpNow();
|
|
}
|
|
|