derek/gem5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cpu,sim: Don't tie ThreadContext contextId to the CPU ID.

Browse Source 
The contextId is generally treated as (and should be) an opaque index
into the System objects threadContext array. When forcing it to
particular values, that introduces gaps in the threadContext array which
trips up other code which is expecting the array to have only valid
entries.

Change-Id: I4997e989b436a3008f65f348722dfb843b2f110a
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/57089
Maintainer: Gabe Black <gabe.black@gmail.com>
Tested-by: kokoro <noreply+kokoro@google.com>
Reviewed-by: Yu-hsin Wang <yuhsingw@google.com>
This commit is contained in:
Gabe Black
2022-02-24 02:15:52 -08:00
parent e7f1acc0dc
commit 412ae3f8df
3 changed files with 11 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/cpu/base.cc
View File

@@ -431,15 +431,10 @@ BaseCPU::registerThreadContexts()
"per thread (%i)\n",
name(), interrupts.size(), numThreads);
ThreadID size = threadContexts.size();
for (ThreadID tid = 0; tid < size; ++tid) {
for (ThreadID tid = 0; tid < threadContexts.size(); ++tid) {
ThreadContext *tc = threadContexts[tid];
if (system->multiThread) {
system->registerThreadContext(tc);
} else {
system->registerThreadContext(tc, _cpuId);
}
system->registerThreadContext(tc);
if (!FullSystem)
tc->getProcessPtr()->assignThreadContext(tc->contextId());

27
src/sim/system.cc
View File

@@ -95,31 +95,18 @@ System::Threads::Thread::quiesce() const
}
void
System::Threads::insert(ThreadContext *tc, ContextID id)
System::Threads::insert(ThreadContext *tc)
{
if (id == InvalidContextID) {
for (id = 0; id < size(); id++) {
if (!threads[id].context)
break;
}
}
ContextID id = size();
tc->setContextId(id);
if (id >= size())
threads.resize(id + 1);
fatal_if(threads[id].context,
"Cannot have two thread contexts with the same id (%d).", id);
auto *sys = tc->getSystemPtr();
auto &t = thread(id);
auto &t = threads.emplace_back();
t.context = tc;
// Look up this thread again on resume, in case the threads vector has
// been reallocated.
t.resumeEvent = new EventFunctionWrapper(
[this, id](){ thread(id).resume(); }, sys->name());
[this, id](){ thread(id).resume(); },
tc->getSystemPtr()->name());
}
void
@@ -258,9 +245,9 @@ System::setMemoryMode(enums::MemoryMode mode)
}
void
System::registerThreadContext(ThreadContext *tc, ContextID assigned)
System::registerThreadContext(ThreadContext *tc)
{
threads.insert(tc, assigned);
threads.insert(tc);
workload->registerThreadContext(tc);

5
src/sim/system.hh
View File

@@ -144,7 +144,7 @@ class System : public SimObject, public PCEventScope
return threads[id];
}
void insert(ThreadContext *tc, ContextID id=InvalidContextID);
void insert(ThreadContext *tc);
void replace(ThreadContext *tc, ContextID id);
friend class System;
@@ -578,8 +578,7 @@ class System : public SimObject, public PCEventScope
public:
void registerThreadContext(
ThreadContext *tc, ContextID assigned=InvalidContextID);
void registerThreadContext(ThreadContext *tc);
void replaceThreadContext(ThreadContext *tc, ContextID context_id);
void serialize(CheckpointOut &cp) const override;