changeset e53972f72165 in /z/repo/gem5
details: http://repo.gem5.org/gem5?cmd=changeset;node=e53972f72165
description:
CPU: Unify initMemProxies across CPUs and simulation modes
This patch unifies where initMemProxies is called, in the init()
method of each BaseCPU subclass, before TheISA::initCPU is
called. Moreover, it also ensures that initMemProxies is called in
both full-system and syscall-emulation mode, thus unifying also across
the modes. An additional check is added in the ThreadState to ensure
that initMemProxies is only called once.
diffstat:
src/cpu/inorder/cpu.cc | 17 ++++++++---------
src/cpu/o3/cpu.cc | 11 ++++++-----
src/cpu/simple/atomic.cc | 7 ++++---
src/cpu/simple/timing.cc | 7 ++++---
src/cpu/thread_state.cc | 34 ++++++++++++++++------------------
src/cpu/thread_state.hh | 4 ++--
6 files changed, 40 insertions(+), 40 deletions(-)
diffs (182 lines):
diff -r 99083b5b7ed4 -r e53972f72165 src/cpu/inorder/cpu.cc
--- a/src/cpu/inorder/cpu.cc Wed Mar 28 11:01:53 2012 -0500
+++ b/src/cpu/inorder/cpu.cc Fri Mar 30 09:38:35 2012 -0400
@@ -787,21 +787,20 @@
void
InOrderCPU::init()
{
- if (!deferRegistration) {
- registerThreadContexts();
+ BaseCPU::init();
+
+ for (ThreadID tid = 0; tid < numThreads; ++tid) {
+ // Set inSyscall so that the CPU doesn't squash when initially
+ // setting up registers.
+ thread[tid]->inSyscall = true;
+ // Initialise the ThreadContext's memory proxies
+ thread[tid]->initMemProxies(thread[tid]->getTC());
}
- // Set inSyscall so that the CPU doesn't squash when initially
- // setting up registers.
- for (ThreadID tid = 0; tid < numThreads; ++tid)
- thread[tid]->inSyscall = true;
-
if (FullSystem) {
for (ThreadID tid = 0; tid < numThreads; tid++) {
ThreadContext *src_tc = threadContexts[tid];
TheISA::initCPU(src_tc, src_tc->contextId());
- // Initialise the ThreadContext's memory proxies
- thread[tid]->initMemProxies(thread[tid]->getTC());
}
}
diff -r 99083b5b7ed4 -r e53972f72165 src/cpu/o3/cpu.cc
--- a/src/cpu/o3/cpu.cc Wed Mar 28 11:01:53 2012 -0500
+++ b/src/cpu/o3/cpu.cc Fri Mar 30 09:38:35 2012 -0400
@@ -639,10 +639,13 @@
{
BaseCPU::init();
- // Set inSyscall so that the CPU doesn't squash when initially
- // setting up registers.
- for (ThreadID tid = 0; tid < numThreads; ++tid)
+ for (ThreadID tid = 0; tid < numThreads; ++tid) {
+ // Set inSyscall so that the CPU doesn't squash when initially
+ // setting up registers.
thread[tid]->inSyscall = true;
+ // Initialise the ThreadContext's memory proxies
+ thread[tid]->initMemProxies(thread[tid]->getTC());
+ }
// this CPU could still be unconnected if we are restoring from a
// checkpoint and this CPU is to be switched in, thus we can only
@@ -655,8 +658,6 @@
for (ThreadID tid = 0; tid < numThreads; tid++) {
ThreadContext *src_tc = threadContexts[tid];
TheISA::initCPU(src_tc, src_tc->contextId());
- // Initialise the ThreadContext's memory proxies
- thread[tid]->initMemProxies(thread[tid]->getTC());
}
}
diff -r 99083b5b7ed4 -r e53972f72165 src/cpu/simple/atomic.cc
--- a/src/cpu/simple/atomic.cc Wed Mar 28 11:01:53 2012 -0500
+++ b/src/cpu/simple/atomic.cc Fri Mar 30 09:38:35 2012 -0400
@@ -80,6 +80,10 @@
AtomicSimpleCPU::init()
{
BaseCPU::init();
+
+ // Initialise the ThreadContext's memory proxies
+ tcBase()->initMemProxies(tcBase());
+
if (FullSystem) {
ThreadID size = threadContexts.size();
for (ThreadID i = 0; i < size; ++i) {
@@ -89,9 +93,6 @@
}
}
- // Initialise the ThreadContext's memory proxies
- tcBase()->initMemProxies(tcBase());
-
if (hasPhysMemPort) {
AddrRangeList pmAddrList = physmemPort.getPeer()->getAddrRanges();
physMemAddr = *pmAddrList.begin();
diff -r 99083b5b7ed4 -r e53972f72165 src/cpu/simple/timing.cc
--- a/src/cpu/simple/timing.cc Wed Mar 28 11:01:53 2012 -0500
+++ b/src/cpu/simple/timing.cc Fri Mar 30 09:38:35 2012 -0400
@@ -64,6 +64,10 @@
TimingSimpleCPU::init()
{
BaseCPU::init();
+
+ // Initialise the ThreadContext's memory proxies
+ tcBase()->initMemProxies(tcBase());
+
if (FullSystem) {
for (int i = 0; i < threadContexts.size(); ++i) {
ThreadContext *tc = threadContexts[i];
@@ -71,9 +75,6 @@
TheISA::initCPU(tc, _cpuId);
}
}
-
- // Initialise the ThreadContext's memory proxies
- tcBase()->initMemProxies(tcBase());
}
void
diff -r 99083b5b7ed4 -r e53972f72165 src/cpu/thread_state.cc
--- a/src/cpu/thread_state.cc Wed Mar 28 11:01:53 2012 -0500
+++ b/src/cpu/thread_state.cc Fri Mar 30 09:38:35 2012 -0400
@@ -101,17 +101,25 @@
void
ThreadState::initMemProxies(ThreadContext *tc)
{
- // Note that this only refers to the port on the CPU side and can
- // safely be done at init() time even if the CPU is not connected
- // (i.e. due to restoring from a checkpoint and later switching
- // in.
- if (physProxy == NULL)
- // this cannot be done in the constructor as the thread state
+ // The port proxies only refer to the data port on the CPU side
+ // and can safely be done at init() time even if the CPU is not
+ // connected, i.e. when restoring from a checkpoint and later
+ // switching the CPU in.
+ if (FullSystem) {
+ assert(physProxy == NULL);
+ // This cannot be done in the constructor as the thread state
// itself is created in the base cpu constructor and the
- // getPort is a virtual function at the moment
+ // getDataPort is a virtual function
physProxy = new PortProxy(baseCpu->getDataPort());
- if (virtProxy == NULL)
+
+ assert(virtProxy == NULL);
virtProxy = new FSTranslatingPortProxy(tc);
+ } else {
+ assert(proxy == NULL);
+ proxy = new SETranslatingPortProxy(baseCpu->getDataPort(),
+ process,
+ SETranslatingPortProxy::NextPage);
+ }
}
void
@@ -127,13 +135,3 @@
if (profile)
profile->sample(profileNode, profilePC);
}
-
-SETranslatingPortProxy &
-ThreadState::getMemProxy()
-{
- if (proxy == NULL)
- proxy = new SETranslatingPortProxy(baseCpu->getDataPort(),
- process,
- SETranslatingPortProxy::NextPage);
- return *proxy;
-}
diff -r 99083b5b7ed4 -r e53972f72165 src/cpu/thread_state.hh
--- a/src/cpu/thread_state.hh Wed Mar 28 11:01:53 2012 -0500
+++ b/src/cpu/thread_state.hh Fri Mar 30 09:38:35 2012 -0400
@@ -85,7 +85,7 @@
* Initialise the physical and virtual port proxies and tie them to
* the data port of the CPU.
*
- * tc ThreadContext for the virtual-to-physical translation
+ * @param tc ThreadContext for the virtual-to-physical translation
*/
void initMemProxies(ThreadContext *tc);
@@ -105,7 +105,7 @@
Process *getProcessPtr() { return process; }
- SETranslatingPortProxy &getMemProxy();
+ SETranslatingPortProxy &getMemProxy() { return *proxy; }
/** Reads the number of instructions functionally executed and
* committed.
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
