The major change is renaming the old ExecContext to CPUExecContext, and creating two new classes, ExecContext (an abstract class), and ProxyExecContext (a templated class that derives from ExecContext).
Code outside of the CPU continues to use ExecContext as normal (other than not being able to access variables within the XC). The CPU uses the CPUExecContext, or however else it stores its own state. It then creates a ProxyExecContext, templated on the class used to hold its state. This proxy is passed to any code outside of the CPU that needs to access the XC. This allows code outside of the CPU to use the ExecContext interface to access any state needed, without knowledge of how that state is laid out.
Note that these changes will not compile without the accompanying revision to automatically rename the shadow registers.
SConscript:
Include new file, cpu_exec_context.cc.
arch/alpha/alpha_linux_process.cc:
arch/alpha/alpha_memory.cc:
arch/alpha/alpha_tru64_process.cc:
arch/alpha/arguments.cc:
arch/alpha/isa/decoder.isa:
arch/alpha/stacktrace.cc:
arch/alpha/vtophys.cc:
base/remote_gdb.cc:
cpu/intr_control.cc:
Avoid directly accessing objects within the XC.
arch/alpha/ev5.cc:
Avoid directly accessing objects within the XC.
KernelStats have been moved to the BaseCPU instead of the XC.
arch/alpha/isa_traits.hh:
Remove clearIprs(). It wasn't used very often and it did not work well with the proxy ExecContext.
cpu/base.cc:
Place kernel stats within the BaseCPU instead of the ExecContext.
For now comment out the profiling code sampling until its exact location is decided upon.
cpu/base.hh:
Kernel stats are now in the BaseCPU instead of the ExecContext.
cpu/base_dyn_inst.cc:
cpu/base_dyn_inst.hh:
cpu/memtest/memtest.cc:
cpu/memtest/memtest.hh:
Changes to support rename of old ExecContext to CPUExecContext. See changeset for more details.
cpu/exetrace.cc:
Remove unneeded include of exec_context.hh.
cpu/intr_control.hh:
cpu/o3/alpha_cpu_builder.cc:
Remove unneeded include of exec_context.hh
cpu/o3/alpha_cpu.hh:
cpu/o3/alpha_cpu_impl.hh:
cpu/o3/cpu.cc:
cpu/o3/cpu.hh:
cpu/simple/cpu.cc:
cpu/simple/cpu.hh:
Changes to support rename of old ExecContext to CPUExecContext. See changeset for more details.
Also avoid accessing anything directly from the XC.
cpu/pc_event.cc:
Avoid accessing objects directly from the XC.
dev/tsunami_cchip.cc:
Avoid accessing objects directly within the XC>
kern/freebsd/freebsd_system.cc:
kern/linux/linux_system.cc:
kern/linux/linux_threadinfo.hh:
kern/tru64/dump_mbuf.cc:
kern/tru64/tru64.hh:
kern/tru64/tru64_events.cc:
sim/syscall_emul.cc:
sim/syscall_emul.hh:
Avoid accessing objects directly within the XC.
kern/kernel_stats.cc:
kern/kernel_stats.hh:
Kernel stats no longer exist within the XC.
kern/system_events.cc:
Avoid accessing objects directly within the XC. Also kernel stats are now in the BaseCPU.
sim/process.cc:
sim/process.hh:
Avoid accessing regs directly within an ExecContext. Instead use a CPUExecContext to initialize the registers and copy them over.
cpu/cpu_exec_context.cc:
Rename old ExecContext to CPUExecContext. This is used by the old CPU models to store any necessary architectural state. Also include the ProxyExecContext, which is used to access the CPUExecContext's state in code outside of the CPU.
cpu/cpu_exec_context.hh:
Rename old ExecContext to CPUExecContext. This is used by the old CPU models to store any necessary architectural state. Also include the ProxyExecContext, which is used to access the CPUExecContext's state in code outside of the CPU.
Remove kernel stats from the ExecContext.
sim/pseudo_inst.cc:
Kernel stats now live within the CPU.
Avoid accessing objects directly within the XC.
--HG--
rename : cpu/exec_context.cc => cpu/cpu_exec_context.cc
rename : cpu/exec_context.hh => cpu/cpu_exec_context.hh
extra : convert_revision : a75393a8945c80cca225b5e9d9c22a16609efb85
200 lines
5.4 KiB
C++
200 lines
5.4 KiB
C++
/*
|
|
* Copyright (c) 2004-2005 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 __KERNEL_STATS_HH__
|
|
#define __KERNEL_STATS_HH__
|
|
|
|
#include <map>
|
|
#include <stack>
|
|
#include <string>
|
|
#include <vector>
|
|
|
|
#include "cpu/static_inst.hh"
|
|
|
|
class BaseCPU;
|
|
class ExecContext;
|
|
class FnEvent;
|
|
// What does kernel stats expect is included?
|
|
class System;
|
|
|
|
namespace Kernel {
|
|
|
|
enum cpu_mode { kernel, user, idle, interrupt, cpu_mode_num };
|
|
extern const char *modestr[];
|
|
|
|
class Binning
|
|
{
|
|
private:
|
|
std::string myname;
|
|
System *system;
|
|
|
|
private:
|
|
// lisa's binning stuff
|
|
struct fnCall
|
|
{
|
|
Stats::MainBin *myBin;
|
|
std::string name;
|
|
};
|
|
|
|
struct SWContext
|
|
{
|
|
Counter calls;
|
|
std::stack<fnCall *> callStack;
|
|
};
|
|
|
|
std::map<const std::string, Stats::MainBin *> fnBins;
|
|
std::map<const Addr, SWContext *> swCtxMap;
|
|
|
|
std::multimap<const std::string, std::string> callerMap;
|
|
void populateMap(std::string caller, std::string callee);
|
|
|
|
std::vector<FnEvent *> fnEvents;
|
|
|
|
Stats::Scalar<> fnCalls;
|
|
|
|
Stats::MainBin *getBin(const std::string &name);
|
|
bool findCaller(std::string, std::string) const;
|
|
|
|
SWContext *findContext(Addr pcb);
|
|
bool addContext(Addr pcb, SWContext *ctx)
|
|
{
|
|
return (swCtxMap.insert(std::make_pair(pcb, ctx))).second;
|
|
}
|
|
|
|
void remContext(Addr pcb)
|
|
{
|
|
swCtxMap.erase(pcb);
|
|
}
|
|
|
|
void dumpState() const;
|
|
|
|
SWContext *swctx;
|
|
std::vector<std::string> binned_fns;
|
|
|
|
private:
|
|
Stats::MainBin *modeBin[cpu_mode_num];
|
|
|
|
public:
|
|
const bool bin;
|
|
const bool fnbin;
|
|
|
|
cpu_mode themode;
|
|
void palSwapContext(ExecContext *xc);
|
|
void execute(ExecContext *xc, StaticInstPtr inst);
|
|
void call(ExecContext *xc, Stats::MainBin *myBin);
|
|
void changeMode(cpu_mode mode);
|
|
|
|
public:
|
|
Binning(System *sys);
|
|
virtual ~Binning();
|
|
|
|
const std::string name() const { return myname; }
|
|
void regStats(const std::string &name);
|
|
|
|
public:
|
|
virtual void serialize(std::ostream &os);
|
|
virtual void unserialize(Checkpoint *cp, const std::string §ion);
|
|
};
|
|
|
|
class Statistics : public Serializable
|
|
{
|
|
private:
|
|
friend class Binning;
|
|
|
|
private:
|
|
std::string myname;
|
|
|
|
Addr idleProcess;
|
|
cpu_mode themode;
|
|
Tick lastModeTick;
|
|
bool bin_int;
|
|
|
|
void changeMode(cpu_mode newmode, ExecContext *xc);
|
|
|
|
private:
|
|
Stats::Scalar<> _arm;
|
|
Stats::Scalar<> _quiesce;
|
|
Stats::Scalar<> _ivlb;
|
|
Stats::Scalar<> _ivle;
|
|
Stats::Scalar<> _hwrei;
|
|
|
|
Stats::Vector<> _iplCount;
|
|
Stats::Vector<> _iplGood;
|
|
Stats::Vector<> _iplTicks;
|
|
Stats::Formula _iplUsed;
|
|
|
|
Stats::Vector<> _callpal;
|
|
Stats::Vector<> _syscall;
|
|
Stats::Vector<> _faults;
|
|
|
|
Stats::Vector<> _mode;
|
|
Stats::Vector<> _modeGood;
|
|
Stats::Formula _modeFraction;
|
|
Stats::Vector<> _modeTicks;
|
|
|
|
Stats::Scalar<> _swap_context;
|
|
|
|
private:
|
|
int iplLast;
|
|
Tick iplLastTick;
|
|
|
|
public:
|
|
Statistics(System *system);
|
|
|
|
const std::string name() const { return myname; }
|
|
void regStats(const std::string &name);
|
|
|
|
public:
|
|
void arm() { _arm++; }
|
|
void quiesce() { _quiesce++; }
|
|
void ivlb() { _ivlb++; }
|
|
void ivle() { _ivle++; }
|
|
void hwrei() { _hwrei++; }
|
|
void fault(Fault fault)
|
|
{
|
|
if(fault == NoFault) _faults[0]++;
|
|
else if(fault == MachineCheckFault) _faults[2]++;
|
|
else if(fault == AlignmentFault) _faults[7]++;
|
|
else _faults[fault->id]++;
|
|
}// FIXME: When there are no generic system fault objects, this will go back to _faults[fault]++; }
|
|
void swpipl(int ipl);
|
|
void mode(cpu_mode newmode, ExecContext *xc);
|
|
void context(Addr oldpcbb, Addr newpcbb, ExecContext *xc);
|
|
void callpal(int code, ExecContext *xc);
|
|
|
|
void setIdleProcess(Addr idle, ExecContext *xc);
|
|
|
|
public:
|
|
virtual void serialize(std::ostream &os);
|
|
virtual void unserialize(Checkpoint *cp, const std::string §ion);
|
|
};
|
|
|
|
/* end namespace Kernel */ }
|
|
|
|
#endif // __KERNEL_STATS_HH__
|