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
192 lines
6.2 KiB
C++
192 lines
6.2 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.
|
|
*/
|
|
|
|
#ifndef __PROCESS_HH__
|
|
#define __PROCESS_HH__
|
|
|
|
//
|
|
// The purpose of this code is to fake the loader & syscall mechanism
|
|
// when there's no OS: thus there's no reason to use it in FULL_SYSTEM
|
|
// mode when we do have an OS.
|
|
//
|
|
#ifndef FULL_SYSTEM
|
|
|
|
#include <vector>
|
|
|
|
#include "targetarch/isa_traits.hh"
|
|
#include "sim/sim_object.hh"
|
|
#include "sim/stats.hh"
|
|
#include "base/statistics.hh"
|
|
|
|
class ExecContext;
|
|
class FunctionalMemory;
|
|
class Process : public SimObject
|
|
{
|
|
public:
|
|
|
|
// have we initialized an execution context from this process? If
|
|
// yes, subsequent contexts are assumed to be for dynamically
|
|
// created threads and are not initialized.
|
|
bool initialContextLoaded;
|
|
|
|
// execution contexts associated with this process
|
|
std::vector<ExecContext *> execContexts;
|
|
|
|
// number of CPUs (esxec contexts, really) assigned to this process.
|
|
unsigned int numCpus() { return execContexts.size(); }
|
|
|
|
// record of blocked context
|
|
struct WaitRec
|
|
{
|
|
Addr waitChan;
|
|
ExecContext *waitingContext;
|
|
|
|
WaitRec(Addr chan, ExecContext *ctx)
|
|
: waitChan(chan), waitingContext(ctx)
|
|
{
|
|
}
|
|
};
|
|
|
|
// list of all blocked contexts
|
|
std::list<WaitRec> waitList;
|
|
|
|
RegFile *init_regs; // initial register contents
|
|
|
|
Addr text_base; // text (code) segment base
|
|
unsigned text_size; // text (code) size in bytes
|
|
|
|
Addr data_base; // initialized data segment base
|
|
unsigned data_size; // initialized data + bss size in bytes
|
|
|
|
Addr brk_point; // top of the data segment
|
|
|
|
Addr stack_base; // stack segment base (highest address)
|
|
unsigned stack_size; // initial stack size
|
|
Addr stack_min; // lowest address accessed on the stack
|
|
|
|
// addr to use for next stack region (for multithreaded apps)
|
|
Addr next_thread_stack_base;
|
|
|
|
// Base of region for mmaps (when user doesn't specify an address).
|
|
Addr mmap_base;
|
|
|
|
std::string prog_fname; // file name
|
|
Addr prog_entry; // entry point (initial PC)
|
|
|
|
Statistics::Scalar<> num_syscalls; // number of syscalls executed
|
|
|
|
|
|
protected:
|
|
// constructor
|
|
Process(const std::string &name,
|
|
int stdin_fd, // initial I/O descriptors
|
|
int stdout_fd,
|
|
int stderr_fd);
|
|
|
|
|
|
protected:
|
|
FunctionalMemory *memory;
|
|
|
|
private:
|
|
// file descriptor remapping support
|
|
static const int MAX_FD = 100; // max legal fd value
|
|
int fd_map[MAX_FD+1];
|
|
|
|
public:
|
|
// static helper functions to generate file descriptors for constructor
|
|
static int openInputFile(const std::string &filename);
|
|
static int openOutputFile(const std::string &filename);
|
|
|
|
// override of virtual SimObject method: register statistics
|
|
virtual void regStats();
|
|
|
|
// register an execution context for this process.
|
|
// returns xc's cpu number (index into execContexts[])
|
|
int registerExecContext(ExecContext *xc);
|
|
|
|
|
|
void replaceExecContext(int xcIndex, ExecContext *xc);
|
|
|
|
// map simulator fd sim_fd to target fd tgt_fd
|
|
void dup_fd(int sim_fd, int tgt_fd);
|
|
|
|
// generate new target fd for sim_fd
|
|
int open_fd(int sim_fd);
|
|
|
|
// look up simulator fd for given target fd
|
|
int sim_fd(int tgt_fd);
|
|
|
|
// is this a valid instruction fetch address?
|
|
bool validInstAddr(Addr addr)
|
|
{
|
|
return (text_base <= addr &&
|
|
addr < text_base + text_size &&
|
|
!(addr & (sizeof(MachInst)-1)));
|
|
}
|
|
|
|
// is this a valid address? (used to filter data fetches)
|
|
// note that we just assume stack size <= 16MB
|
|
// this may be alpha-specific
|
|
bool validDataAddr(Addr addr)
|
|
{
|
|
return ((data_base <= addr && addr < brk_point) ||
|
|
((stack_base - 16*1024*1024) <= addr && addr < stack_base) ||
|
|
(text_base <= addr && addr < (text_base + text_size)));
|
|
}
|
|
|
|
virtual void syscall(ExecContext *xc) = 0;
|
|
|
|
virtual FunctionalMemory *getMemory() { return memory; }
|
|
};
|
|
|
|
//
|
|
// "Live" process with system calls redirected to host system
|
|
//
|
|
class ObjectFile;
|
|
class LiveProcess : public Process
|
|
{
|
|
protected:
|
|
LiveProcess(const std::string &name, ObjectFile *objFile,
|
|
int stdin_fd, int stdout_fd, int stderr_fd,
|
|
std::vector<std::string> &argv,
|
|
std::vector<std::string> &envp);
|
|
|
|
public:
|
|
// this function is used to create the LiveProcess object, since
|
|
// we can't tell which subclass of LiveProcess to use until we
|
|
// open and look at the object file.
|
|
static LiveProcess *create(const std::string &name,
|
|
int stdin_fd, int stdout_fd, int stderr_fd,
|
|
std::vector<std::string> &argv,
|
|
std::vector<std::string> &envp);
|
|
};
|
|
|
|
|
|
#endif // !FULL_SYSTEM
|
|
|
|
#endif // __PROCESS_HH__
|