changeset 969e03f6c2ea in /z/repo/m5
details: http://repo.m5sim.org/m5?cmd=changeset;node=969e03f6c2ea
description:
inorder: cache packet handling
-use a pointer to CacheReqPacket instead of PacketPtr so correct
destructors
get called on packet deletion
- make sure to delete the packet if the cache blocks the sendTiming
request
or for some reason we dont use the packet
- dont overwrite memory requests since in the worst case an instruction
will
be replaying a request so no need to keep allocating a new request
- we dont use retryPkt so delete it
- fetch code was split out already, so just assert that this is a memory
reference inst. and that the staticInst is available
diffstat:
src/cpu/inorder/inorder_dyn_inst.cc | 13 +-
src/cpu/inorder/resources/cache_unit.cc | 159 ++++++++++++++++---------------
src/cpu/inorder/resources/cache_unit.hh | 12 +-
src/cpu/inorder/resources/fetch_unit.cc | 4 +-
4 files changed, 95 insertions(+), 93 deletions(-)
diffs (truncated from 309 to 300 lines):
diff -r 9dc17725f795 -r 969e03f6c2ea src/cpu/inorder/inorder_dyn_inst.cc
--- a/src/cpu/inorder/inorder_dyn_inst.cc Wed Feb 23 15:10:50 2011 -0600
+++ b/src/cpu/inorder/inorder_dyn_inst.cc Wed Feb 23 16:30:45 2011 -0500
@@ -195,14 +195,17 @@
dataMemReq = NULL;
}
- if (traceData) {
- delete traceData;
+ if (splitMemReq != 0x0) {
+ delete dataMemReq;
+ dataMemReq = NULL;
}
- if (splitMemData) {
+ if (traceData)
+ delete traceData;
+
+ if (splitMemData)
delete [] splitMemData;
- }
-
+
fault = NoFault;
--instcount;
diff -r 9dc17725f795 -r 969e03f6c2ea src/cpu/inorder/resources/cache_unit.cc
--- a/src/cpu/inorder/resources/cache_unit.cc Wed Feb 23 15:10:50 2011 -0600
+++ b/src/cpu/inorder/resources/cache_unit.cc Wed Feb 23 16:30:45 2011 -0500
@@ -383,14 +383,17 @@
Addr aligned_addr = inst->getMemAddr();
if (!cache_req->is2ndSplit()) {
+ if (inst->dataMemReq == NULL) {
inst->dataMemReq =
new Request(cpu->asid[tid], aligned_addr, acc_size, flags,
inst->instAddr(), cpu->readCpuId(),
tid);
cache_req->memReq = inst->dataMemReq;
+ }
} else {
- assert(inst->splitInst);
-
+ assert(inst->splitInst);
+
+ if (inst->splitMemReq == NULL) {
inst->splitMemReq = new Request(cpu->asid[tid],
inst->split2ndAddr,
acc_size,
@@ -398,7 +401,9 @@
inst->instAddr(),
cpu->readCpuId(),
tid);
- cache_req->memReq = inst->splitMemReq;
+ }
+
+ cache_req->memReq = inst->splitMemReq;
}
}
@@ -870,6 +875,7 @@
"[tid:%i] [sn:%i] cannot access cache, because port "
"is blocked. now waiting to retry request\n", tid,
inst->seqNum);
+ delete cache_req->dataPkt;
cache_req->done(false);
cachePortBlocked = true;
} else {
@@ -891,6 +897,7 @@
processCacheCompletion(cache_req->dataPkt);
} else {
+ delete cache_req->dataPkt;
// Make cache request again since access due to
// inability to access
DPRINTF(InOrderStall, "STALL: \n");
@@ -950,96 +957,90 @@
DynInstPtr inst = cache_req->inst;
ThreadID tid = cache_req->inst->readTid();
- if (!cache_req->isSquashed()) {
- if (inst->staticInst && inst->isMemRef()) {
- DPRINTF(InOrderCachePort,
- "[tid:%u]: [sn:%i]: Processing cache access\n",
- tid, inst->seqNum);
- PacketPtr dataPkt = NULL;
-
- if (inst->splitInst) {
- inst->splitFinishCnt++;
-
- if (inst->splitFinishCnt == 2) {
- cache_req->memReq->setVirt(0/*inst->tid*/,
- inst->getMemAddr(),
- inst->totalSize,
- 0,
- 0);
-
- Packet split_pkt(cache_req->memReq, cache_req->pktCmd,
- Packet::Broadcast);
+ assert(!cache_req->isSquashed());
+ assert(inst->staticInst && inst->isMemRef());
- if (inst->isLoad()) {
- split_pkt.dataStatic(inst->splitMemData);
- } else {
- split_pkt.dataStatic(&inst->storeData);
- }
-
- dataPkt = &split_pkt;
- }
- } else {
- dataPkt = pkt;
- }
- inst->completeAcc(dataPkt);
-
+ DPRINTF(InOrderCachePort,
+ "[tid:%u]: [sn:%i]: Processing cache access\n",
+ tid, inst->seqNum);
+ PacketPtr dataPkt = NULL;
+
+ if (inst->splitInst) {
+ inst->splitFinishCnt++;
+
+ if (inst->splitFinishCnt == 2) {
+ cache_req->memReq->setVirt(0/*inst->tid*/,
+ inst->getMemAddr(),
+ inst->totalSize,
+ 0,
+ 0);
+
+ Packet split_pkt(cache_req->memReq, cache_req->pktCmd,
+ Packet::Broadcast);
+
+
if (inst->isLoad()) {
- assert(cache_pkt->isRead());
-
- if (cache_pkt->req->isLLSC()) {
- DPRINTF(InOrderCachePort,
- "[tid:%u]: Handling Load-Linked for [sn:%u]\n",
- tid, inst->seqNum);
- TheISA::handleLockedRead(cpu, cache_pkt->req);
- }
-
- DPRINTF(InOrderCachePort,
- "[tid:%u]: [sn:%i]: Bytes loaded were: %s\n",
- tid, inst->seqNum,
- printMemData(dataPkt->getPtr<uint8_t>(),
- dataPkt->getSize()));
- } else if(inst->isStore()) {
- assert(cache_pkt->isWrite());
-
- DPRINTF(InOrderCachePort,
- "[tid:%u]: [sn:%i]: Bytes stored were: %s\n",
- tid, inst->seqNum,
- printMemData(dataPkt->getPtr<uint8_t>(),
- dataPkt->getSize()));
+ split_pkt.dataStatic(inst->splitMemData);
+ } else {
+ split_pkt.dataStatic(&inst->storeData);
}
- delete cache_pkt;
+ dataPkt = &split_pkt;
+ }
+ } else {
+ dataPkt = pkt;
+ }
+ inst->completeAcc(dataPkt);
+
+ if (inst->isLoad()) {
+ assert(cache_pkt->isRead());
+
+ if (cache_pkt->req->isLLSC()) {
+ DPRINTF(InOrderCachePort,
+ "[tid:%u]: Handling Load-Linked for [sn:%u]\n",
+ tid, inst->seqNum);
+ TheISA::handleLockedRead(cpu, cache_pkt->req);
}
- cache_req->setMemAccPending(false);
- cache_req->setMemAccCompleted();
+ DPRINTF(InOrderCachePort,
+ "[tid:%u]: [sn:%i]: Bytes loaded were: %s\n",
+ tid, inst->seqNum,
+ printMemData(dataPkt->getPtr<uint8_t>(),
+ dataPkt->getSize()));
+ } else if(inst->isStore()) {
+ assert(cache_pkt->isWrite());
- if (cache_req->isMemStall() &&
- cpu->threadModel == InOrderCPU::SwitchOnCacheMiss) {
- DPRINTF(InOrderCachePort, "[tid:%u] Waking up from Cache Miss.\n",
- tid);
+ DPRINTF(InOrderCachePort,
+ "[tid:%u]: [sn:%i]: Bytes stored were: %s\n",
+ tid, inst->seqNum,
+ printMemData(dataPkt->getPtr<uint8_t>(),
+ dataPkt->getSize()));
+ }
+
+ delete cache_pkt;
+ cache_req->setMemAccPending(false);
+ cache_req->setMemAccCompleted();
+
+ if (cache_req->isMemStall() &&
+ cpu->threadModel == InOrderCPU::SwitchOnCacheMiss) {
+ DPRINTF(InOrderCachePort, "[tid:%u] Waking up from Cache Miss.\n",
+ tid);
- cpu->activateContext(tid);
+ cpu->activateContext(tid);
- DPRINTF(ThreadModel, "Activating [tid:%i] after return from cache"
- "miss.\n", tid);
- }
+ DPRINTF(ThreadModel, "Activating [tid:%i] after return from cache"
+ "miss.\n", tid);
+ }
- // Wake up the CPU (if it went to sleep and was waiting on this
- // completion event).
- cpu->wakeCPU();
+ // Wake up the CPU (if it went to sleep and was waiting on this
+ // completion event).
+ cpu->wakeCPU();
- DPRINTF(Activity, "[tid:%u] Activating %s due to cache completion\n",
+ DPRINTF(Activity, "[tid:%u] Activating %s due to cache completion\n",
tid, cpu->pipelineStage[stage_num]->name());
- cpu->switchToActive(stage_num);
- } else {
- DPRINTF(InOrderCachePort,
- "[tid:%u] Miss on block @ %08p completed, but squashed\n",
- tid, cache_req->inst->instAddr());
- cache_req->setMemAccCompleted();
- }
+ cpu->switchToActive(stage_num);
}
void
diff -r 9dc17725f795 -r 969e03f6c2ea src/cpu/inorder/resources/cache_unit.hh
--- a/src/cpu/inorder/resources/cache_unit.hh Wed Feb 23 15:10:50 2011 -0600
+++ b/src/cpu/inorder/resources/cache_unit.hh Wed Feb 23 16:30:45 2011 -0500
@@ -225,7 +225,7 @@
public:
CacheRequest(CacheUnit *cres)
: ResourceRequest(cres), memReq(NULL), reqData(NULL),
- dataPkt(NULL), retryPkt(NULL), memAccComplete(false),
+ dataPkt(NULL), memAccComplete(false),
memAccPending(false), tlbStall(false), splitAccess(false),
splitAccessNum(-1), split2ndAccess(false),
fetchBufferFill(false)
@@ -233,9 +233,8 @@
virtual ~CacheRequest()
{
- if (reqData && !splitAccess) {
+ if (reqData && !splitAccess)
delete [] reqData;
- }
}
void setRequest(DynInstPtr _inst, int stage_num, int res_idx, int slot_num,
@@ -249,14 +248,12 @@
void clearRequest()
{
- if (reqData && !splitAccess) {
+ if (reqData && !splitAccess)
delete [] reqData;
- }
memReq = NULL;
reqData = NULL;
dataPkt = NULL;
- retryPkt = NULL;
memAccComplete = false;
memAccPending = false;
tlbStall = false;
@@ -292,8 +289,7 @@
MemCmd::Command pktCmd;
RequestPtr memReq;
PacketDataPtr reqData;
- PacketPtr dataPkt;
- PacketPtr retryPkt;
+ CacheReqPacket *dataPkt;
bool memAccComplete;
bool memAccPending;
diff -r 9dc17725f795 -r 969e03f6c2ea src/cpu/inorder/resources/fetch_unit.cc
--- a/src/cpu/inorder/resources/fetch_unit.cc Wed Feb 23 15:10:50 2011 -0600
+++ b/src/cpu/inorder/resources/fetch_unit.cc Wed Feb 23 16:30:45 2011 -0500
@@ -170,10 +170,12 @@
ThreadID tid = inst->readTid();
Addr aligned_addr = cacheBlockAlign(inst->getMemAddr());
- inst->fetchMemReq =
_______________________________________________
m5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/m5-dev
