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

Add in capability to return to unblocking after a squash. This is needed because if you don't squash -all- the instructions, you need to keep clearing out whatever is left in the skid buffer.

Browse Source 
--HG--
extra : convert_revision : 7308eda27f4366348cf5fce71ddfa4b217bc172d
This commit is contained in:
Gabe Black
2006-12-16 07:35:56 -05:00
parent 244506ae12
commit c6944e320c
2 changed files with 40 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/cpu/o3/rename.hh
View File

@@ -415,6 +415,10 @@ class DefaultRename
* after squashing. */
bool resumeSerialize;
/** Whether or not rename needs to resume clearing out the skidbuffer
* after squashing. */
bool resumeUnblocking;
/** The number of threads active in rename. */
unsigned numThreads;

44
src/cpu/o3/rename_impl.hh
View File

@@ -44,6 +44,7 @@ DefaultRename<Impl>::DefaultRename(Params *params)
renameWidth(params->renameWidth),
commitWidth(params->commitWidth),
resumeSerialize(false),
resumeUnblocking(false),
numThreads(params->numberOfThreads),
maxPhysicalRegs(params->numPhysIntRegs + params->numPhysFloatRegs)
{
@@ -405,6 +406,9 @@ DefaultRename<Impl>::squash(const InstSeqNum &squash_seq_num, unsigned tid)
}
slist_it++;
}
resumeUnblocking = (skidBuffer[tid].size() != 0);
DPRINTF(Rename, "Resume unblocking set to %s\n",
resumeUnblocking ? "true" : "false");
#else
skidBuffer[tid].clear();
#endif
@@ -496,6 +500,12 @@ DefaultRename<Impl>::rename(bool &status_change, unsigned tid)
block(tid);
toDecode->renameUnblock[tid] = false;
}
} else if (renameStatus[tid] == Unblocking) {
if (resumeUnblocking) {
block(tid);
resumeUnblocking = false;
toDecode->renameUnblock[tid] = false;
}
}
if (renameStatus[tid] == Running ||
@@ -761,7 +771,17 @@ DefaultRename<Impl>::skidInsert(unsigned tid)
}
if (skidBuffer[tid].size() > skidBufferMax)
{
typename InstQueue::iterator it;
warn("Skidbuffer contents:\n");
for(it = skidBuffer[tid].begin(); it != skidBuffer[tid].end(); it++)
{
warn("[tid:%u]: %s [sn:%i].\n", tid,
(*it)->staticInst->disassemble(inst->readPC()),
(*it)->seqNum);
}
panic("Skidbuffer Exceeded Max Size");
}
}
template <class Impl>
@@ -848,7 +868,10 @@ DefaultRename<Impl>::block(unsigned tid)
// Only signal backwards to block if the previous stages do not think
// rename is already blocked.
if (renameStatus[tid] != Blocked) {
if (renameStatus[tid] != Unblocking) {
// If resumeUnblocking is set, we unblocked during the squash,
// but now we're have unblocking status. We need to tell earlier
// stages to block.
if (resumeUnblocking || renameStatus[tid] != Unblocking) {
toDecode->renameBlock[tid] = true;
toDecode->renameUnblock[tid] = false;
wroteToTimeBuffer = true;
@@ -1264,18 +1287,23 @@ DefaultRename<Impl>::checkSignalsAndUpdate(unsigned tid)
if (renameStatus[tid] == Squashing) {
// Switch status to running if rename isn't being told to block or
// squash this cycle.
if (!resumeSerialize) {
DPRINTF(Rename, "[tid:%u]: Done squashing, switching to running.\n",
tid);
renameStatus[tid] = Running;
return false;
} else {
if (resumeSerialize) {
DPRINTF(Rename, "[tid:%u]: Done squashing, switching to serialize.\n",
tid);
renameStatus[tid] = SerializeStall;
return true;
} else if (resumeUnblocking) {
DPRINTF(Rename, "[tid:%u]: Done squashing, switching to unblocking.\n",
tid);
renameStatus[tid] = Unblocking;
return true;
} else {
DPRINTF(Rename, "[tid:%u]: Done squashing, switching to running.\n",
tid);
renameStatus[tid] = Running;
return false;
}
}