sanchayanmaity/gem5
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Moved the switched version of kernel_stats.hh back to kern, and moved the base kernel_stats to base_kernel_stats

Browse source 
--HG--
extra : convert_revision : 2a010d2eb7ea2586ff063b99b8bcde6eb1e8e017
This commit is contained in:
Gabe Black 2006-11-07 05:36:54 -05:00
parent 5424156516
commit 4bfb8547bb
12 changed files with 44 additions and 197 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/arch/alpha/ev5.cc
View file

@ -40,7 +40,7 @@
#include "cpu/base.hh"
#include "cpu/simple_thread.hh"
#include "cpu/thread_context.hh"
#include "kern/kernel_stats.hh"
#include "kern/alpha/kernel_stats.hh"
#include "sim/debug.hh"
#include "sim/sim_exit.hh"
@ -379,10 +379,10 @@ AlphaISA::MiscRegFile::setIpr(int idx, uint64_t val, ThreadContext *tc)
case AlphaISA::IPR_DTB_CM:
if (val & 0x18) {
if (tc->getKernelStats())
tc->getKernelStats()->mode(Kernel::user, tc);
tc->getKernelStats()->mode(TheISA::Kernel::user, tc);
} else {
if (tc->getKernelStats())
tc->getKernelStats()->mode(Kernel::kernel, tc);
tc->getKernelStats()->mode(TheISA::Kernel::kernel, tc);
}
case AlphaISA::IPR_ICM:

9
src/cpu/checker/thread_context.hh
View file

@ -37,8 +37,10 @@
#include "cpu/thread_context.hh"
class EndQuiesceEvent;
namespace Kernel {
class Statistics;
namespace TheISA {
namespace Kernel {
class Statistics;
};
};
/**
@ -91,7 +93,8 @@ class CheckerThreadContext : public ThreadContext
TheISA::DTB *getDTBPtr() { return actualTC->getDTBPtr(); }
Kernel::Statistics *getKernelStats() { return actualTC->getKernelStats(); }
TheISA::Kernel::Statistics *getKernelStats()
{ return actualTC->getKernelStats(); }
FunctionalPort *getPhysPort() { return actualTC->getPhysPort(); }

2
src/cpu/o3/thread_context.hh
View file

@ -83,7 +83,7 @@ class O3ThreadContext : public ThreadContext
virtual PhysicalMemory *getPhysMemPtr() { return cpu->physmem; }
/** Returns a pointer to this thread's kernel statistics. */
virtual Kernel::Statistics *getKernelStats()
virtual TheISA::Kernel::Statistics *getKernelStats()
{ return thread->kernelStats; }
virtual FunctionalPort *getPhysPort() { return thread->getPhysPort(); }

2
src/cpu/o3/thread_context_impl.hh
View file

@ -194,7 +194,7 @@ void
O3ThreadContext<Impl>::regStats(const std::string &name)
{
#if FULL_SYSTEM
thread->kernelStats = new Kernel::Statistics(cpu->system);
thread->kernelStats = new TheISA::Kernel::Statistics(cpu->system);
thread->kernelStats->regStats(name + ".kern");
#endif
}

8
src/cpu/ozone/cpu.hh
View file

@ -62,8 +62,10 @@ class MemoryController;
class RemoteGDB;
class GDBListener;
namespace Kernel {
class Statistics;
namespace TheISA {
namespace Kernel {
class Statistics;
};
};
#else
@ -127,7 +129,7 @@ class OzoneCPU : public BaseCPU
TheISA::DTB * getDTBPtr() { return cpu->dtb; }
Kernel::Statistics *getKernelStats()
TheISA::Kernel::Statistics *getKernelStats()
{ return thread->getKernelStats(); }
FunctionalPort *getPhysPort() { return thread->getPhysPort(); }

2
src/cpu/ozone/cpu_impl.hh
View file

@ -891,7 +891,7 @@ void
OzoneCPU<Impl>::OzoneTC::regStats(const std::string &name)
{
#if FULL_SYSTEM
thread->kernelStats = new Kernel::Statistics(cpu->system);
thread->kernelStats = new TheISA::Kernel::Statistics(cpu->system);
thread->kernelStats->regStats(name + ".kern");
#endif
}

6
src/cpu/simple_thread.cc
View file

@ -87,7 +87,7 @@ SimpleThread::SimpleThread(BaseCPU *_cpu, int _thread_num, System *_sys,
profilePC = 3;
if (use_kernel_stats) {
kernelStats = new Kernel::Statistics(system);
kernelStats = new TheISA::Kernel::Statistics(system);
} else {
kernelStats = NULL;
}
@ -158,7 +158,7 @@ SimpleThread::takeOverFrom(ThreadContext *oldContext)
quiesceEvent->tc = tc;
}
Kernel::Statistics *stats = oldContext->getKernelStats();
TheISA::Kernel::Statistics *stats = oldContext->getKernelStats();
if (stats) {
kernelStats = stats;
}
@ -179,7 +179,7 @@ SimpleThread::copyTC(ThreadContext *context)
if (quiesce) {
quiesceEvent = quiesce;
}
Kernel::Statistics *stats = context->getKernelStats();
TheISA::Kernel::Statistics *stats = context->getKernelStats();
if (stats) {
kernelStats = stats;
}

6
src/cpu/simple_thread.hh
View file

@ -55,8 +55,10 @@ class ProfileNode;
class FunctionalPort;
class PhysicalPort;
namespace Kernel {
class Statistics;
namespace TheISA {
namespace Kernel {
class Statistics;
};
};
#else // !FULL_SYSTEM

11
src/cpu/thread_context.hh
View file

@ -56,8 +56,10 @@ class FunctionalPort;
class VirtualPort;
class Process;
class System;
namespace Kernel {
class Statistics;
namespace TheISA {
namespace Kernel {
class Statistics;
};
};
/**
@ -124,7 +126,7 @@ class ThreadContext
virtual TheISA::DTB *getDTBPtr() = 0;
virtual Kernel::Statistics *getKernelStats() = 0;
virtual TheISA::Kernel::Statistics *getKernelStats() = 0;
virtual FunctionalPort *getPhysPort() = 0;
@ -295,7 +297,8 @@ class ProxyThreadContext : public ThreadContext
TheISA::DTB *getDTBPtr() { return actualTC->getDTBPtr(); }
Kernel::Statistics *getKernelStats() { return actualTC->getKernelStats(); }
TheISA::Kernel::Statistics *getKernelStats()
{ return actualTC->getKernelStats(); }
FunctionalPort *getPhysPort() { return actualTC->getPhysPort(); }

10
src/cpu/thread_state.hh
View file

@ -44,8 +44,10 @@
class EndQuiesceEvent;
class FunctionProfile;
class ProfileNode;
namespace Kernel {
class Statistics;
namespace TheISA {
namespace Kernel {
class Statistics;
};
};
#endif
@ -97,7 +99,7 @@ struct ThreadState {
void profileSample();
Kernel::Statistics *getKernelStats() { return kernelStats; }
TheISA::Kernel::Statistics *getKernelStats() { return kernelStats; }
FunctionalPort *getPhysPort() { return physPort; }
@ -187,7 +189,7 @@ struct ThreadState {
Addr profilePC;
EndQuiesceEvent *quiesceEvent;
Kernel::Statistics *kernelStats;
TheISA::Kernel::Statistics *kernelStats;
protected:
/** A functional port outgoing only for functional accesses to physical
* addresses.*/

147
src/kern/base_kernel_stats.cc
View file

@ -29,14 +29,11 @@
* Nathan Binkert
*/
#include <map>
#include <stack>
#include <string>
#include "arch/alpha/osfpal.hh"
#include "base/trace.hh"
#include "cpu/thread_context.hh"
#include "kern/kernel_stats.hh"
#include "kern/base_kernel_stats.hh"
#include "kern/tru64/tru64_syscalls.hh"
#include "sim/system.hh"
@ -45,11 +42,8 @@ using namespace Stats;
namespace Kernel {
const char *modestr[] = { "kernel", "user", "idle" };
Statistics::Statistics(System *system)
: idleProcess((Addr)-1), themode(kernel), lastModeTick(0),
iplLast(0), iplLastTick(0)
: iplLast(0), iplLastTick(0)
{
}
@ -68,11 +62,6 @@ Statistics::regStats(const string &_name)
.desc("number of quiesce instructions executed")
;
_hwrei
.name(name() + ".inst.hwrei")
.desc("number of hwrei instructions executed")
;
_iplCount
.init(32)
.name(name() + ".ipl_count")
@ -102,19 +91,6 @@ Statistics::regStats(const string &_name)
_iplUsed = _iplGood / _iplCount;
_callpal
.init(256)
.name(name() + ".callpal")
.desc("number of callpals executed")
.flags(total | pdf | nozero | nonan)
;
for (int i = 0; i < PAL::NumCodes; ++i) {
const char *str = PAL::name(i);
if (str)
_callpal.subname(i, str);
}
_syscall
.init(SystemCalls<Tru64>::Number)
.name(name() + ".syscall")
@ -123,80 +99,11 @@ Statistics::regStats(const string &_name)
;
for (int i = 0; i < SystemCalls<Tru64>::Number; ++i) {
const char *str = SystemCalls<Tru64>::name(i);
const char *str = "Please fix me";//SystemCalls<Tru64>::name(i);
if (str) {
_syscall.subname(i, str);
}
}
_mode
.init(cpu_mode_num)
.name(name() + ".mode_switch")
.desc("number of protection mode switches")
;
for (int i = 0; i < cpu_mode_num; ++i)
_mode.subname(i, modestr[i]);
_modeGood
.init(cpu_mode_num)
.name(name() + ".mode_good")
;
for (int i = 0; i < cpu_mode_num; ++i)
_modeGood.subname(i, modestr[i]);
_modeFraction
.name(name() + ".mode_switch_good")
.desc("fraction of useful protection mode switches")
.flags(total)
;
for (int i = 0; i < cpu_mode_num; ++i)
_modeFraction.subname(i, modestr[i]);
_modeFraction = _modeGood / _mode;
_modeTicks
.init(cpu_mode_num)
.name(name() + ".mode_ticks")
.desc("number of ticks spent at the given mode")
.flags(pdf)
;
for (int i = 0; i < cpu_mode_num; ++i)
_modeTicks.subname(i, modestr[i]);
_swap_context
.name(name() + ".swap_context")
.desc("number of times the context was actually changed")
;
}
void
Statistics::setIdleProcess(Addr idlepcbb, ThreadContext *tc)
{
assert(themode == kernel);
idleProcess = idlepcbb;
themode = idle;
changeMode(themode, tc);
}
void
Statistics::changeMode(cpu_mode newmode, ThreadContext *tc)
{
_mode[newmode]++;
if (newmode == themode)
return;
DPRINTF(Context, "old mode=%-8s new mode=%-8s\n",
modestr[themode], modestr[newmode]);
_modeGood[newmode]++;
_modeTicks[themode] += curTick - lastModeTick;
lastModeTick = curTick;
themode = newmode;
}
void
@ -215,66 +122,18 @@ Statistics::swpipl(int ipl)
iplLast = ipl;
}
void
Statistics::mode(cpu_mode newmode, ThreadContext *tc)
{
Addr pcbb = tc->readMiscReg(AlphaISA::IPR_PALtemp23);
if (newmode == kernel && pcbb == idleProcess)
newmode = idle;
changeMode(newmode, tc);
}
void
Statistics::context(Addr oldpcbb, Addr newpcbb, ThreadContext *tc)
{
assert(themode != user);
_swap_context++;
changeMode(newpcbb == idleProcess ? idle : kernel, tc);
}
void
Statistics::callpal(int code, ThreadContext *tc)
{
if (!PAL::name(code))
return;
_callpal[code]++;
switch (code) {
case PAL::callsys: {
int number = tc->readIntReg(0);
if (SystemCalls<Tru64>::validSyscallNumber(number)) {
int cvtnum = SystemCalls<Tru64>::convert(number);
_syscall[cvtnum]++;
}
} break;
}
}
void
Statistics::serialize(ostream &os)
{
int exemode = themode;
SERIALIZE_SCALAR(exemode);
SERIALIZE_SCALAR(idleProcess);
SERIALIZE_SCALAR(iplLast);
SERIALIZE_SCALAR(iplLastTick);
SERIALIZE_SCALAR(lastModeTick);
}
void
Statistics::unserialize(Checkpoint *cp, const string &section)
{
int exemode;
UNSERIALIZE_SCALAR(exemode);
UNSERIALIZE_SCALAR(idleProcess);
UNSERIALIZE_SCALAR(iplLast);
UNSERIALIZE_SCALAR(iplLastTick);
UNSERIALIZE_SCALAR(lastModeTick);
themode = (cpu_mode)exemode;
}
/* end namespace Kernel */ }

32
src/kern/base_kernel_stats.hh
View file

@ -32,12 +32,10 @@
#ifndef __KERNEL_STATS_HH__
#define __KERNEL_STATS_HH__
#include <map>
#include <stack>
#include <string>
#include <vector>
#include "cpu/static_inst.hh"
#include "sim/serialize.hh"
class BaseCPU;
class ThreadContext;
@ -47,21 +45,12 @@ class System;
namespace Kernel {
enum cpu_mode { kernel, user, idle, cpu_mode_num };
extern const char *modestr[];
class Statistics : public Serializable
{
private:
protected:
std::string myname;
Addr idleProcess;
cpu_mode themode;
Tick lastModeTick;
void changeMode(cpu_mode newmode, ThreadContext *tc);
private:
protected:
Stats::Scalar<> _arm;
Stats::Scalar<> _quiesce;
Stats::Scalar<> _hwrei;
@ -71,23 +60,16 @@ class Statistics : public Serializable
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);
virtual ~Statistics() {}
const std::string name() const { return myname; }
void regStats(const std::string &name);
@ -95,13 +77,7 @@ class Statistics : public Serializable
public:
void arm() { _arm++; }
void quiesce() { _quiesce++; }
void hwrei() { _hwrei++; }
void swpipl(int ipl);
void mode(cpu_mode newmode, ThreadContext *tc);
void context(Addr oldpcbb, Addr newpcbb, ThreadContext *tc);
void callpal(int code, ThreadContext *tc);
void setIdleProcess(Addr idle, ThreadContext *tc);
public:
virtual void serialize(std::ostream &os);