cpu, arm: Allow the specification of a socket field

Allow the specification of a socket ID for every core that is reflected in the
MPIDR field in ARM systems.  This allows studying multi-socket / cluster
systems with ARM CPUs.
This commit is contained in:
Akash Bagdia 2014-05-09 18:58:46 -04:00
parent e940bac278
commit 2b1a01ee6c
10 changed files with 46 additions and 4 deletions

View file

@ -195,13 +195,26 @@ longDescFormatInUse(ThreadContext *tc)
uint32_t uint32_t
getMPIDR(ArmSystem *arm_sys, ThreadContext *tc) getMPIDR(ArmSystem *arm_sys, ThreadContext *tc)
{ {
// Multiprocessor Affinity Register MPIDR from Cortex(tm)-A15 Technical
// Reference Manual
//
// bit 31 - Multi-processor extensions available
// bit 30 - Uni-processor system
// bit 24 - Multi-threaded cores
// bit 11-8 - Cluster ID
// bit 1-0 - CPU ID
//
// We deliberately extend both the Cluster ID and CPU ID fields to allow
// for simulation of larger systems
assert((0 <= tc->cpuId()) && (tc->cpuId() < 256));
assert((0 <= tc->socketId()) && (tc->socketId() < 65536));
if (arm_sys->multiProc) { if (arm_sys->multiProc) {
return 0x80000000 | // multiprocessor extensions available return 0x80000000 | // multiprocessor extensions available
tc->cpuId(); tc->cpuId() | tc->socketId() << 8;
} else { } else {
return 0x80000000 | // multiprocessor extensions available return 0x80000000 | // multiprocessor extensions available
0x40000000 | // in up system 0x40000000 | // in up system
tc->cpuId(); tc->cpuId() | tc->socketId() << 8;
} }
} }

View file

@ -128,6 +128,7 @@ class BaseCPU(MemObject):
system = Param.System(Parent.any, "system object") system = Param.System(Parent.any, "system object")
cpu_id = Param.Int(-1, "CPU identifier") cpu_id = Param.Int(-1, "CPU identifier")
socket_id = Param.Unsigned(0, "Physical Socket identifier")
numThreads = Param.Unsigned(1, "number of HW thread contexts") numThreads = Param.Unsigned(1, "number of HW thread contexts")
function_trace = Param.Bool(False, "Enable function trace") function_trace = Param.Bool(False, "Enable function trace")

View file

@ -117,7 +117,7 @@ CPUProgressEvent::description() const
} }
BaseCPU::BaseCPU(Params *p, bool is_checker) BaseCPU::BaseCPU(Params *p, bool is_checker)
: MemObject(p), instCnt(0), _cpuId(p->cpu_id), : MemObject(p), instCnt(0), _cpuId(p->cpu_id), _socketId(p->socket_id),
_instMasterId(p->system->getMasterId(name() + ".inst")), _instMasterId(p->system->getMasterId(name() + ".inst")),
_dataMasterId(p->system->getMasterId(name() + ".data")), _dataMasterId(p->system->getMasterId(name() + ".data")),
_taskId(ContextSwitchTaskId::Unknown), _pid(Request::invldPid), _taskId(ContextSwitchTaskId::Unknown), _pid(Request::invldPid),
@ -133,7 +133,8 @@ BaseCPU::BaseCPU(Params *p, bool is_checker)
// add self to global list of CPUs // add self to global list of CPUs
cpuList.push_back(this); cpuList.push_back(this);
DPRINTF(SyscallVerbose, "Constructing CPU with id %d\n", _cpuId); DPRINTF(SyscallVerbose, "Constructing CPU with id %d, socket id %d\n",
_cpuId, _socketId);
if (numThreads > maxThreadsPerCPU) if (numThreads > maxThreadsPerCPU)
maxThreadsPerCPU = numThreads; maxThreadsPerCPU = numThreads;

View file

@ -101,6 +101,13 @@ class BaseCPU : public MemObject
// therefore no setCpuId() method is provided // therefore no setCpuId() method is provided
int _cpuId; int _cpuId;
/** Each cpu will have a socket ID that corresponds to its physical location
* in the system. This is usually used to bucket cpu cores under single DVFS
* domain. This information may also be required by the OS to identify the
* cpu core grouping (as in the case of ARM via MPIDR register)
*/
const uint32_t _socketId;
/** instruction side request id that must be placed in all requests */ /** instruction side request id that must be placed in all requests */
MasterID _instMasterId; MasterID _instMasterId;
@ -145,6 +152,9 @@ class BaseCPU : public MemObject
/** Reads this CPU's ID. */ /** Reads this CPU's ID. */
int cpuId() const { return _cpuId; } int cpuId() const { return _cpuId; }
/** Reads this CPU's Socket ID. */
uint32_t socketId() const { return _socketId; }
/** Reads this CPU's unique data requestor ID */ /** Reads this CPU's unique data requestor ID */
MasterID dataMasterId() { return _dataMasterId; } MasterID dataMasterId() { return _dataMasterId; }
/** Reads this CPU's unique instruction requestor ID */ /** Reads this CPU's unique instruction requestor ID */

View file

@ -456,6 +456,9 @@ class BaseDynInst : public RefCounted
/** Read this CPU's ID. */ /** Read this CPU's ID. */
int cpuId() const { return cpu->cpuId(); } int cpuId() const { return cpu->cpuId(); }
/** Read this CPU's Socket ID. */
uint32_t socketId() const { return cpu->socketId(); }
/** Read this CPU's data requestor ID */ /** Read this CPU's data requestor ID */
MasterID masterId() const { return cpu->dataMasterId(); } MasterID masterId() const { return cpu->dataMasterId(); }

View file

@ -92,6 +92,8 @@ class CheckerThreadContext : public ThreadContext
BaseCPU *getCpuPtr() { return actualTC->getCpuPtr(); } BaseCPU *getCpuPtr() { return actualTC->getCpuPtr(); }
uint32_t socketId() const { return actualTC->socketId(); }
int cpuId() const { return actualTC->cpuId(); } int cpuId() const { return actualTC->cpuId(); }
int contextId() const { return actualTC->contextId(); } int contextId() const { return actualTC->contextId(); }

View file

@ -113,6 +113,9 @@ class InOrderThreadContext : public ThreadContext
/** Reads this CPU's ID. */ /** Reads this CPU's ID. */
int cpuId() const { return cpu->cpuId(); } int cpuId() const { return cpu->cpuId(); }
/** Reads this CPU's Socket ID. */
uint32_t socketId() const { return cpu->socketId(); }
int contextId() const { return thread->contextId(); } int contextId() const { return thread->contextId(); }
void setContextId(int id) { thread->setContextId(id); } void setContextId(int id) { thread->setContextId(id); }

View file

@ -98,6 +98,9 @@ class O3ThreadContext : public ThreadContext
/** Reads this CPU's ID. */ /** Reads this CPU's ID. */
virtual int cpuId() const { return cpu->cpuId(); } virtual int cpuId() const { return cpu->cpuId(); }
/** Reads this CPU's Socket ID. */
virtual uint32_t socketId() const { return cpu->socketId(); }
virtual int contextId() const { return thread->contextId(); } virtual int contextId() const { return thread->contextId(); }
virtual void setContextId(int id) { thread->setContextId(id); } virtual void setContextId(int id) { thread->setContextId(id); }

View file

@ -123,6 +123,8 @@ class ThreadContext
virtual int cpuId() const = 0; virtual int cpuId() const = 0;
virtual uint32_t socketId() const = 0;
virtual int threadId() const = 0; virtual int threadId() const = 0;
virtual void setThreadId(int id) = 0; virtual void setThreadId(int id) = 0;
@ -323,6 +325,8 @@ class ProxyThreadContext : public ThreadContext
int cpuId() const { return actualTC->cpuId(); } int cpuId() const { return actualTC->cpuId(); }
uint32_t socketId() const { return actualTC->socketId(); }
int threadId() const { return actualTC->threadId(); } int threadId() const { return actualTC->threadId(); }
void setThreadId(int id) { actualTC->setThreadId(id); } void setThreadId(int id) { actualTC->setThreadId(id); }

View file

@ -69,6 +69,8 @@ struct ThreadState {
int cpuId() const { return baseCpu->cpuId(); } int cpuId() const { return baseCpu->cpuId(); }
uint32_t socketId() const { return baseCpu->socketId(); }
int contextId() const { return _contextId; } int contextId() const { return _contextId; }
void setContextId(int id) { _contextId = id; } void setContextId(int id) { _contextId = id; }