changeset 2b656c4a5770 in /z/repo/m5
details: http://repo.m5sim.org/m5?cmd=changeset;node=2b656c4a5770
description:
inorder: double delete inst bug
Make sure that instructions are dereferenced/deleted twice by marking
they are
on the remove list
diffstat:
5 files changed, 104 insertions(+), 51 deletions(-)
src/cpu/inorder/cpu.cc | 48 ++++++++++++---
src/cpu/inorder/inorder_dyn_inst.cc | 1
src/cpu/inorder/inorder_dyn_inst.hh | 10 ++-
src/cpu/inorder/pipeline_stage.cc | 1
src/cpu/inorder/resources/cache_unit.cc | 95 +++++++++++++++++--------------
diffs (281 lines):
diff -r 7b99564233cd -r 2b656c4a5770 src/cpu/inorder/cpu.cc
--- a/src/cpu/inorder/cpu.cc Sun Jan 31 18:30:48 2010 -0500
+++ b/src/cpu/inorder/cpu.cc Sun Jan 31 18:30:59 2010 -0500
@@ -1190,8 +1190,18 @@
InOrderCPU::addToRemoveList(DynInstPtr &inst)
{
removeInstsThisCycle = true;
-
- removeList.push(inst->getInstListIt());
+ if (!inst->isRemoveList()) {
+ DPRINTF(InOrderCPU, "Pushing instruction [tid:%i] PC %#x "
+ "[sn:%lli] to remove list\n",
+ inst->threadNumber, inst->readPC(), inst->seqNum);
+ inst->setRemoveList();
+ removeList.push(inst->getInstListIt());
+ } else {
+ DPRINTF(InOrderCPU, "Ignoring instruction removal for [tid:%i] PC %#x "
+ "[sn:%lli], already remove list\n",
+ inst->threadNumber, inst->readPC(), inst->seqNum);
+ }
+
}
void
@@ -1204,11 +1214,18 @@
removeInstsThisCycle = true;
// Remove the instruction.
+ if (!inst->isRemoveList()) {
+ DPRINTF(InOrderCPU, "Pushing instruction [tid:%i] PC %#x "
+ "[sn:%lli] to remove list\n",
+ inst->threadNumber, inst->readPC(), inst->seqNum);
+ inst->setRemoveList();
+ removeList.push(inst->getInstListIt());
+ } else {
+ DPRINTF(InOrderCPU, "Ignoring instruction removal for [tid:%i] PC %#x "
+ "[sn:%lli], already on remove list\n",
+ inst->threadNumber, inst->readPC(), inst->seqNum);
+ }
- DPRINTF(RefCount, "Pushing instruction [tid:%i] PC %#x "
- "[sn:%lli] to remove list\n",
- inst->threadNumber, inst->readPC(), inst->seqNum);
- removeList.push(inst->getInstListIt());
}
void
@@ -1252,11 +1269,22 @@
(*instIt)->setSquashed();
- DPRINTF(RefCount, "Pushing instruction [tid:%i] PC %#x "
- "[sn:%lli] to remove list\n",
- (*instIt)->threadNumber, (*instIt)->readPC(),
(*instIt)->seqNum);
- removeList.push(instIt);
+ if (!(*instIt)->isRemoveList()) {
+ DPRINTF(InOrderCPU, "Pushing instruction [tid:%i] PC %#x "
+ "[sn:%lli] to remove list\n",
+ (*instIt)->threadNumber, (*instIt)->readPC(),
+ (*instIt)->seqNum);
+ (*instIt)->setRemoveList();
+ removeList.push(instIt);
+ } else {
+ DPRINTF(InOrderCPU, "Ignoring instruction removal for [tid:%i] PC
%#x "
+ "[sn:%lli], already on remove list\n",
+ (*instIt)->threadNumber, (*instIt)->readPC(),
+ (*instIt)->seqNum);
+ }
+
}
+
}
diff -r 7b99564233cd -r 2b656c4a5770 src/cpu/inorder/inorder_dyn_inst.cc
--- a/src/cpu/inorder/inorder_dyn_inst.cc Sun Jan 31 18:30:48 2010 -0500
+++ b/src/cpu/inorder/inorder_dyn_inst.cc Sun Jan 31 18:30:59 2010 -0500
@@ -115,6 +115,7 @@
split2ndAddr = 0;
split2ndAccess = false;
splitInst = false;
+ splitInstSked = false;
splitFinishCnt = 0;
effAddr = 0;
diff -r 7b99564233cd -r 2b656c4a5770 src/cpu/inorder/inorder_dyn_inst.hh
--- a/src/cpu/inorder/inorder_dyn_inst.hh Sun Jan 31 18:30:48 2010 -0500
+++ b/src/cpu/inorder/inorder_dyn_inst.hh Sun Jan 31 18:30:59 2010 -0500
@@ -164,6 +164,7 @@
/// instructions ahead of it
SerializeAfter, /// Needs to serialize instructions behind it
SerializeHandled, /// Serialization has been handled
+ RemoveList, /// Is Instruction on Remove List?
NumStatus
};
@@ -342,7 +343,8 @@
bool splitInst;
int splitFinishCnt;
uint64_t *split2ndStoreDataPtr;
-
+ bool splitInstSked;
+
////////////////////////////////////////////////////////////
//
// BASE INSTRUCTION INFORMATION.
@@ -915,6 +917,12 @@
/** Returns whether or not the entry is on the CPU Reg Dep Map */
bool isRegDepEntry() const { return status[RegDepMapEntry]; }
+ /** Sets this instruction as entered on the CPU Reg Dep Map */
+ void setRemoveList() { status.set(RemoveList); }
+
+ /** Returns whether or not the entry is on the CPU Reg Dep Map */
+ bool isRemoveList() const { return status[RemoveList]; }
+
/** Sets this instruction as completed. */
void setCompleted() { status.set(Completed); }
diff -r 7b99564233cd -r 2b656c4a5770 src/cpu/inorder/pipeline_stage.cc
--- a/src/cpu/inorder/pipeline_stage.cc Sun Jan 31 18:30:48 2010 -0500
+++ b/src/cpu/inorder/pipeline_stage.cc Sun Jan 31 18:30:59 2010 -0500
@@ -380,6 +380,7 @@
for (int i=0; i < prevStage->size; i++) {
if (prevStage->insts[i]->threadNumber == tid &&
prevStage->insts[i]->seqNum > squash_seq_num) {
+ // Change Comment to Annulling previous instruction
DPRINTF(InOrderStage, "[tid:%i]: Squashing instruction, "
"[sn:%i] PC %08p.\n",
tid,
diff -r 7b99564233cd -r 2b656c4a5770 src/cpu/inorder/resources/cache_unit.cc
--- a/src/cpu/inorder/resources/cache_unit.cc Sun Jan 31 18:30:48 2010 -0500
+++ b/src/cpu/inorder/resources/cache_unit.cc Sun Jan 31 18:30:59 2010 -0500
@@ -140,7 +140,8 @@
// For a Split-Load, the instruction would have processed once already
// causing the address to be unset.
if (!inst->validMemAddr() && !inst->splitInst) {
- panic("Mem. Addr. must be set before requesting cache access\n");
+ panic("[tid:%i][sn:%i] Mem. Addr. must be set before requesting cache
access\n",
+ inst->readTid(), inst->seqNum);
}
Addr req_addr = inst->getMemAddr();
@@ -439,7 +440,7 @@
cache_req->splitAccess = true;
cache_req->split2ndAccess = true;
- DPRINTF(InOrderCachePort, "%i: sn[%i] Split Read Access (2 of 2) for
(%#x, %#x).\n", curTick, inst->seqNum,
+ DPRINTF(InOrderCachePort, "[sn:%i] Split Read Access (2 of 2) for
(%#x, %#x).\n", inst->seqNum,
inst->getMemAddr(), inst->split2ndAddr);
}
@@ -459,27 +460,31 @@
inst->splitMemData = new uint8_t[dataSize];
inst->splitTotalSize = dataSize;
+ if (!inst->splitInstSked) {
+ // Schedule Split Read/Complete for Instruction
+ // ==============================
+ int stage_num = cache_req->getStageNum();
+
+ int stage_pri = ThePipeline::getNextPriority(inst, stage_num);
+
+ inst->resSched.push(new ScheduleEntry(stage_num,
+ stage_pri,
+
cpu->resPool->getResIdx(DCache),
+
CacheUnit::InitSecondSplitRead,
+ 1)
+ );
- // Schedule Split Read/Complete for Instruction
- // ==============================
- int stage_num = cache_req->getStageNum();
-
- int stage_pri = ThePipeline::getNextPriority(inst, stage_num);
-
- inst->resSched.push(new ScheduleEntry(stage_num,
- stage_pri,
- cpu->resPool->getResIdx(DCache),
- CacheUnit::InitSecondSplitRead,
- 1)
- );
-
- inst->resSched.push(new ScheduleEntry(stage_num + 1,
- 1/*stage_pri*/,
- cpu->resPool->getResIdx(DCache),
-
CacheUnit::CompleteSecondSplitRead,
- 1)
- );
-
+ inst->resSched.push(new ScheduleEntry(stage_num + 1,
+ 1/*stage_pri*/,
+
cpu->resPool->getResIdx(DCache),
+
CacheUnit::CompleteSecondSplitRead,
+ 1)
+ );
+ inst->splitInstSked = true;
+ } else {
+ DPRINTF(InOrderCachePort, "[tid:%i] [sn:%i] Retrying Split Read
Access (1 of 2) for (%#x, %#x).\n",
+ inst->readTid(), inst->seqNum, addr, secondAddr);
+ }
// Split Information for First Access
// ==============================
@@ -533,7 +538,7 @@
cache_req->splitAccess = true;
cache_req->split2ndAccess = true;
- DPRINTF(InOrderCachePort, "%i: sn[%i] Split Write Access (2 of 2) for
(%#x, %#x).\n", curTick, inst->seqNum,
+ DPRINTF(InOrderCachePort, "[sn:%i] Split Write Access (2 of 2) for
(%#x, %#x).\n", inst->seqNum,
inst->getMemAddr(), inst->split2ndAddr);
}
@@ -542,7 +547,8 @@
Addr secondAddr = roundDown(addr + dataSize - 1, blockSize);
if (secondAddr > addr && !inst->split2ndAccess) {
- DPRINTF(InOrderCachePort, "%i: sn[%i] Split Write Access (1 of 2) for
(%#x, %#x).\n", curTick, inst->seqNum,
+
+ DPRINTF(InOrderCachePort, "[sn:%i] Split Write Access (1 of 2) for
(%#x, %#x).\n", inst->seqNum,
addr, secondAddr);
// Save All "Total" Split Information
@@ -550,25 +556,33 @@
inst->splitInst = true;
inst->splitTotalSize = dataSize;
- // Schedule Split Read/Complete for Instruction
- // ==============================
- int stage_num = cache_req->getStageNum();
+ if (!inst->splitInstSked) {
+ // Schedule Split Read/Complete for Instruction
+ // ==============================
+ int stage_num = cache_req->getStageNum();
- int stage_pri = ThePipeline::getNextPriority(inst, stage_num);
+ int stage_pri = ThePipeline::getNextPriority(inst, stage_num);
- inst->resSched.push(new ScheduleEntry(stage_num,
- stage_pri,
- cpu->resPool->getResIdx(DCache),
- CacheUnit::InitSecondSplitWrite,
- 1)
- );
+ inst->resSched.push(new ScheduleEntry(stage_num,
+ stage_pri,
+
cpu->resPool->getResIdx(DCache),
+
CacheUnit::InitSecondSplitWrite,
+ 1)
+ );
- inst->resSched.push(new ScheduleEntry(stage_num + 1,
- 1/*stage_pri*/,
- cpu->resPool->getResIdx(DCache),
-
CacheUnit::CompleteSecondSplitWrite,
- 1)
- );
+ inst->resSched.push(new ScheduleEntry(stage_num + 1,
+ 1/*stage_pri*/,
+
cpu->resPool->getResIdx(DCache),
+
CacheUnit::CompleteSecondSplitWrite,
+ 1)
+ );
+ inst->splitInstSked = true;
+ } else {
+ DPRINTF(InOrderCachePort, "[tid:%i] sn:%i] Retrying Split Read
Access (1 of 2) for (%#x, %#x).\n",
+ inst->readTid(), inst->seqNum, addr, secondAddr);
+ }
+
+
// Split Information for First Access
// ==============================
@@ -582,6 +596,7 @@
inst->split2ndStoreDataPtr = &cache_req->inst->storeData;
inst->split2ndStoreDataPtr += dataSize;
inst->split2ndFlags = flags;
+ inst->splitInstSked = true;
}
doTLBAccess(inst, cache_req, dataSize, flags, TheISA::TLB::Write);
_______________________________________________
m5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/m5-dev
