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

Merge in bus DPRINTF changes.

Browse source 
--HG--
extra : convert_revision : 3bbd7c0745b31bb2a628b604ab1627cd9c61643c
This commit is contained in:
Steve Reinhardt 2007-10-31 00:39:16 -07:00
commit 90f42bf3ad
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/mem/bus.cc
View file

@ -170,8 +170,6 @@ bool
Bus::recvTiming(PacketPtr pkt) Bus::recvTiming(PacketPtr pkt)
{ {
short src = pkt->getSrc(); short src = pkt->getSrc();
DPRINTF(Bus, "recvTiming: packet src %d dest %d addr 0x%x cmd %s\n",
src, pkt->getDest(), pkt->getAddr(), pkt->cmdString());
BusPort *src_port; BusPort *src_port;
if (src == defaultId) if (src == defaultId)
@ -191,10 +189,14 @@ Bus::recvTiming(PacketPtr pkt)
(retryList.size() && (!inRetry || src_port != retryList.front())))) (retryList.size() && (!inRetry || src_port != retryList.front()))))
{ {
addToRetryList(src_port); addToRetryList(src_port);
DPRINTF(Bus, "recvTiming: Bus is busy, returning false\n"); DPRINTF(Bus, "recvTiming: src %d dst %d %s 0x%x BUSY\n",
src, pkt->getDest(), pkt->cmdString(), pkt->getAddr());
return false; return false;
} }
DPRINTF(Bus, "recvTiming: src %d dst %d %s 0x%x\n",
src, pkt->getDest(), pkt->cmdString(), pkt->getAddr());
if (!pkt->isExpressSnoop()) { if (!pkt->isExpressSnoop()) {
occupyBus(pkt); occupyBus(pkt);
} }
@ -243,7 +245,8 @@ Bus::recvTiming(PacketPtr pkt)
// Packet not successfully sent. Leave or put it on the retry list. // Packet not successfully sent. Leave or put it on the retry list.
// illegal to block responses... can lead to deadlock // illegal to block responses... can lead to deadlock
assert(!pkt->isResponse()); assert(!pkt->isResponse());
DPRINTF(Bus, "Adding2 a retry to RETRY list %d\n", src); DPRINTF(Bus, "recvTiming: src %d dst %d %s 0x%x TGT RETRY\n",
src, pkt->getDest(), pkt->cmdString(), pkt->getAddr());
addToRetryList(src_port); addToRetryList(src_port);
return false; return false;
} }

11
src/mem/cache/cache_impl.hh vendored
View file

@ -994,6 +994,10 @@ Cache<TagStore>::handleSnoop(PacketPtr pkt, BlkType *blk,
blk->status &= ~bits_to_clear; blk->status &= ~bits_to_clear;
} }
DPRINTF(Cache, "snooped a %s request for addr %x, %snew state is %i\n",
pkt->cmdString(), blockAlign(pkt->getAddr()),
respond ? "responding, " : "", invalidate ? 0 : blk->status);
if (respond) { if (respond) {
assert(!pkt->memInhibitAsserted()); assert(!pkt->memInhibitAsserted());
pkt->assertMemInhibit(); pkt->assertMemInhibit();
@ -1013,10 +1017,6 @@ Cache<TagStore>::handleSnoop(PacketPtr pkt, BlkType *blk,
if (invalidate) { if (invalidate) {
tags->invalidateBlk(blk); tags->invalidateBlk(blk);
} }
DPRINTF(Cache, "snooped a %s request for addr %x, %snew state is %i\n",
pkt->cmdString(), blockAlign(pkt->getAddr()),
respond ? "responding, " : "", blk->status);
} }
@ -1384,9 +1384,6 @@ Cache<TagStore>::MemSidePort::sendPacket()
MSHR *mshr = dynamic_cast<MSHR*>(pkt->senderState); MSHR *mshr = dynamic_cast<MSHR*>(pkt->senderState);
bool success = sendTiming(pkt); bool success = sendTiming(pkt);
DPRINTF(CachePort,
"Address %x was %s in sending the timing request\n",
pkt->getAddr(), success ? "successful" : "unsuccessful");
waitingOnRetry = !success; waitingOnRetry = !success;
if (waitingOnRetry) { if (waitingOnRetry) {