changeset c9286580867a in /z/repo/m5
details: http://repo.m5sim.org/m5?cmd=changeset;node=c9286580867a
description:
inorder: change skidBuffer to list instead of queue
manage insertion and deletion like a queue but will need
access to internal elements for future changes
Currently, skidbuffer manages any instruction that was
in a stage but could not complete processing, however
we will want to manage all blocked instructions (from prev stage
and from cur. stage) in just one buffer.
diffstat:
src/cpu/inorder/pipeline_stage.cc | 26 +++++++++++++-------------
src/cpu/inorder/pipeline_stage.hh | 2 +-
2 files changed, 14 insertions(+), 14 deletions(-)
diffs (109 lines):
diff -r 3b4d595397fb -r c9286580867a src/cpu/inorder/pipeline_stage.cc
--- a/src/cpu/inorder/pipeline_stage.cc Fri Feb 04 00:08:13 2011 -0500
+++ b/src/cpu/inorder/pipeline_stage.cc Fri Feb 04 00:08:15 2011 -0500
@@ -194,8 +194,7 @@
while (!insts[tid].empty())
insts[tid].pop();
- while (!skidBuffer[tid].empty())
- skidBuffer[tid].pop();
+ skidBuffer[tid].clear();
}
wroteToTimeBuffer = false;
}
@@ -425,7 +424,7 @@
DPRINTF(InOrderStage, "[tid:%i]: Removing instruction, [sn:%i] "
" PC %s.\n", tid, skidBuffer[tid].front()->seqNum,
skidBuffer[tid].front()->pc);
- skidBuffer[tid].pop();
+ skidBuffer[tid].pop_front();
}
}
@@ -486,7 +485,7 @@
"skidBuffer %i\n", tid, inst->seqNum, inst->pcState(),
inst->threadNumber);
- skidBuffer[tid].push(inst);
+ skidBuffer[tid].push_back(inst);
}
}
@@ -570,7 +569,7 @@
inst->pcState(), inst->threadNumber);
// Make instruction available for pipeline processing
- skidBuffer[tid].push(inst);
+ skidBuffer[tid].push_back(inst);
// Update PC so that we start fetching after this instruction to
// prevent "double"-execution of instructions
@@ -626,7 +625,7 @@
DynInstPtr inst = prevStage->insts[i];
- skidBuffer[tid].push(prevStage->insts[i]);
+ skidBuffer[tid].push_back(prevStage->insts[i]);
prevStage->insts[i] = cpu->dummyBufferInst;
@@ -881,7 +880,7 @@
// instructions coming from fetch, depending on stage's status.
int insts_available = skidBuffer[tid].size();
- std::queue<DynInstPtr> &insts_to_stage = skidBuffer[tid];
+ std::list<DynInstPtr> &insts_to_stage = skidBuffer[tid];
if (insts_available == 0) {
DPRINTF(InOrderStage, "[tid:%u]: Nothing to do, breaking out"
@@ -908,7 +907,7 @@
"squashed, skipping.\n",
tid, inst->seqNum, inst->pcState());
- insts_to_stage.pop();
+ insts_to_stage.pop_front();
--insts_available;
@@ -936,7 +935,7 @@
break;
}
- insts_to_stage.pop();
+ insts_to_stage.pop_front();
--insts_available;
}
@@ -1134,15 +1133,16 @@
cprintf("Insts in Stage %i skidbuffers\n",stageNum);
for (ThreadID tid = 0; tid < ThePipeline::MaxThreads; tid++) {
- std::queue<DynInstPtr> copy_buff(skidBuffer[tid]);
+ std::list<DynInstPtr>::iterator cur_it = skidBuffer[tid].begin();
+ std::list<DynInstPtr>::iterator end_it = skidBuffer[tid].end();
- while (!copy_buff.empty()) {
- DynInstPtr inst = copy_buff.front();
+ while (cur_it != end_it) {
+ DynInstPtr inst = (*cur_it);
cprintf("Inst. PC:%s\n[tid:%i]\n[sn:%i]\n\n",
inst->pcState(), inst->threadNumber, inst->seqNum);
- copy_buff.pop();
+ cur_it++;
}
}
diff -r 3b4d595397fb -r c9286580867a src/cpu/inorder/pipeline_stage.hh
--- a/src/cpu/inorder/pipeline_stage.hh Fri Feb 04 00:08:13 2011 -0500
+++ b/src/cpu/inorder/pipeline_stage.hh Fri Feb 04 00:08:15 2011 -0500
@@ -284,7 +284,7 @@
std::list<DynInstPtr> instsToNextStage;
/** Skid buffer between previous stage and this one. */
- std::queue<DynInstPtr> skidBuffer[ThePipeline::MaxThreads];
+ std::list<DynInstPtr> skidBuffer[ThePipeline::MaxThreads];
/** Instruction used to signify that there is no *real* instruction in
* buffer slot */
_______________________________________________
m5-dev mailing list
m5-dev@m5sim.org
http://m5sim.org/mailman/listinfo/m5-dev
