sanchayanmaity/gem5
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

inorder: double delete inst bug

Browse source 
Make sure that instructions are dereferenced/deleted twice by marking they are
on the remove list
This commit is contained in:
Korey Sewell 2010-01-31 18:30:59 -05:00
parent 9357e353fc
commit c7f6e2661c
5 changed files with 102 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
src/cpu/inorder/cpu.cc
View file

@ -1190,8 +1190,18 @@ void
InOrderCPU::addToRemoveList(DynInstPtr &inst) InOrderCPU::addToRemoveList(DynInstPtr &inst)
{ {
removeInstsThisCycle = true; removeInstsThisCycle = true;
if (!inst->isRemoveList()) {
removeList.push(inst->getInstListIt()); 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 void
@ -1204,11 +1214,18 @@ InOrderCPU::removeInst(DynInstPtr &inst)
removeInstsThisCycle = true; removeInstsThisCycle = true;
// Remove the instruction. // 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 void
@ -1252,11 +1269,22 @@ InOrderCPU::squashInstIt(const ListIt &instIt, ThreadID tid)
(*instIt)->setSquashed(); (*instIt)->setSquashed();
DPRINTF(RefCount, "Pushing instruction [tid:%i] PC %#x " if (!(*instIt)->isRemoveList()) {
"[sn:%lli] to remove list\n", DPRINTF(InOrderCPU, "Pushing instruction [tid:%i] PC %#x "
(*instIt)->threadNumber, (*instIt)->readPC(), (*instIt)->seqNum); "[sn:%lli] to remove list\n",
removeList.push(instIt); (*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);
}
} }
} }

1
src/cpu/inorder/inorder_dyn_inst.cc
View file

@ -115,6 +115,7 @@ InOrderDynInst::initVars()
split2ndAddr = 0; split2ndAddr = 0;
split2ndAccess = false; split2ndAccess = false;
splitInst = false; splitInst = false;
splitInstSked = false;
splitFinishCnt = 0; splitFinishCnt = 0;
effAddr = 0; effAddr = 0;

10
src/cpu/inorder/inorder_dyn_inst.hh
View file

@ -164,6 +164,7 @@ class InOrderDynInst : public FastAlloc, public RefCounted
/// instructions ahead of it /// instructions ahead of it
SerializeAfter, /// Needs to serialize instructions behind it SerializeAfter, /// Needs to serialize instructions behind it
SerializeHandled, /// Serialization has been handled SerializeHandled, /// Serialization has been handled
RemoveList, /// Is Instruction on Remove List?
NumStatus NumStatus
}; };
@ -342,7 +343,8 @@ class InOrderDynInst : public FastAlloc, public RefCounted
bool splitInst; bool splitInst;
int splitFinishCnt; int splitFinishCnt;
uint64_t *split2ndStoreDataPtr; uint64_t *split2ndStoreDataPtr;
bool splitInstSked;
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// //
// BASE INSTRUCTION INFORMATION. // BASE INSTRUCTION INFORMATION.
@ -915,6 +917,12 @@ class InOrderDynInst : public FastAlloc, public RefCounted
/** Returns whether or not the entry is on the CPU Reg Dep Map */ /** Returns whether or not the entry is on the CPU Reg Dep Map */
bool isRegDepEntry() const { return status[RegDepMapEntry]; } 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. */ /** Sets this instruction as completed. */
void setCompleted() { status.set(Completed); } void setCompleted() { status.set(Completed); }

1
src/cpu/inorder/pipeline_stage.cc
View file

@ -380,6 +380,7 @@ PipelineStage::squashPrevStageInsts(InstSeqNum squash_seq_num, ThreadID tid)
for (int i=0; i < prevStage->size; i++) { for (int i=0; i < prevStage->size; i++) {
if (prevStage->insts[i]->threadNumber == tid && if (prevStage->insts[i]->threadNumber == tid &&
prevStage->insts[i]->seqNum > squash_seq_num) { prevStage->insts[i]->seqNum > squash_seq_num) {
// Change Comment to Annulling previous instruction
DPRINTF(InOrderStage, "[tid:%i]: Squashing instruction, " DPRINTF(InOrderStage, "[tid:%i]: Squashing instruction, "
"[sn:%i] PC %08p.\n", "[sn:%i] PC %08p.\n",
tid, tid,

91
src/cpu/inorder/resources/cache_unit.cc
View file

@ -140,7 +140,8 @@ CacheUnit::getSlot(DynInstPtr inst)
// For a Split-Load, the instruction would have processed once already // For a Split-Load, the instruction would have processed once already
// causing the address to be unset. // causing the address to be unset.
if (!inst->validMemAddr() && !inst->splitInst) { 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(); Addr req_addr = inst->getMemAddr();
@ -439,7 +440,7 @@ CacheUnit::read(DynInstPtr inst, Addr addr, T &data, unsigned flags)
cache_req->splitAccess = true; cache_req->splitAccess = true;
cache_req->split2ndAccess = 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); inst->getMemAddr(), inst->split2ndAddr);
} }
@ -459,27 +460,31 @@ CacheUnit::read(DynInstPtr inst, Addr addr, T &data, unsigned flags)
inst->splitMemData = new uint8_t[dataSize]; inst->splitMemData = new uint8_t[dataSize];
inst->splitTotalSize = dataSize; inst->splitTotalSize = dataSize;
if (!inst->splitInstSked) {
// Schedule Split Read/Complete for Instruction // Schedule Split Read/Complete for Instruction
// ============================== // ==============================
int stage_num = cache_req->getStageNum(); 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, inst->resSched.push(new ScheduleEntry(stage_num,
stage_pri, stage_pri,
cpu->resPool->getResIdx(DCache), cpu->resPool->getResIdx(DCache),
CacheUnit::InitSecondSplitRead, CacheUnit::InitSecondSplitRead,
1) 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 // Split Information for First Access
// ============================== // ==============================
@ -533,7 +538,7 @@ CacheUnit::write(DynInstPtr inst, T data, Addr addr, unsigned flags,
cache_req->splitAccess = true; cache_req->splitAccess = true;
cache_req->split2ndAccess = 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); inst->getMemAddr(), inst->split2ndAddr);
} }
@ -542,7 +547,8 @@ CacheUnit::write(DynInstPtr inst, T data, Addr addr, unsigned flags,
Addr secondAddr = roundDown(addr + dataSize - 1, blockSize); Addr secondAddr = roundDown(addr + dataSize - 1, blockSize);
if (secondAddr > addr && !inst->split2ndAccess) { 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); addr, secondAddr);
// Save All "Total" Split Information // Save All "Total" Split Information
@ -550,25 +556,33 @@ CacheUnit::write(DynInstPtr inst, T data, Addr addr, unsigned flags,
inst->splitInst = true; inst->splitInst = true;
inst->splitTotalSize = dataSize; inst->splitTotalSize = dataSize;
// Schedule Split Read/Complete for Instruction if (!inst->splitInstSked) {
// ============================== // Schedule Split Read/Complete for Instruction
int stage_num = cache_req->getStageNum(); // ==============================
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, inst->resSched.push(new ScheduleEntry(stage_num,
stage_pri, stage_pri,
cpu->resPool->getResIdx(DCache), cpu->resPool->getResIdx(DCache),
CacheUnit::InitSecondSplitWrite, CacheUnit::InitSecondSplitWrite,
1) 1)
); );
inst->resSched.push(new ScheduleEntry(stage_num + 1, inst->resSched.push(new ScheduleEntry(stage_num + 1,
1/*stage_pri*/, 1/*stage_pri*/,
cpu->resPool->getResIdx(DCache), cpu->resPool->getResIdx(DCache),
CacheUnit::CompleteSecondSplitWrite, CacheUnit::CompleteSecondSplitWrite,
1) 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 // Split Information for First Access
// ============================== // ==============================
@ -582,6 +596,7 @@ CacheUnit::write(DynInstPtr inst, T data, Addr addr, unsigned flags,
inst->split2ndStoreDataPtr = &cache_req->inst->storeData; inst->split2ndStoreDataPtr = &cache_req->inst->storeData;
inst->split2ndStoreDataPtr += dataSize; inst->split2ndStoreDataPtr += dataSize;
inst->split2ndFlags = flags; inst->split2ndFlags = flags;
inst->splitInstSked = true;
} }
doTLBAccess(inst, cache_req, dataSize, flags, TheISA::TLB::Write); doTLBAccess(inst, cache_req, dataSize, flags, TheISA::TLB::Write);