From e88cffb30a808bcfe30858167ae704ca890c72df Mon Sep 17 00:00:00 2001 From: Prakash Ramrakhyani Date: Fri, 7 Mar 2014 15:56:23 -0500 Subject: mem: Fix incorrect assert failure in the Cache This patch fixes an assert condition that is not true at all times. There are valid situations that arise in dual-core dual-workload runs where the assert condition is false. The function call following the assert however needs to be called only when the condition is true (a block cannot be invalidated in the tags structure if has not been allocated in the structure, and the tempBlock is never allocated). Hence the 'assert' has been replaced with an 'if'. --- src/mem/cache/cache_impl.hh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/mem/cache/cache_impl.hh') diff --git a/src/mem/cache/cache_impl.hh b/src/mem/cache/cache_impl.hh index b482d6314..e8e1876a0 100644 --- a/src/mem/cache/cache_impl.hh +++ b/src/mem/cache/cache_impl.hh @@ -183,8 +183,8 @@ Cache::satisfyCpuSideRequest(PacketPtr pkt, BlkType *blk, pkt->assertMemInhibit(); } // on ReadExReq we give up our copy unconditionally - assert(blk != tempBlock); - tags->invalidate(blk); + if (blk != tempBlock) + tags->invalidate(blk); blk->invalidate(); } else if (blk->isWritable() && !pending_downgrade && !pkt->sharedAsserted() && !pkt->req->isInstFetch()) { @@ -1456,8 +1456,8 @@ Cache::handleSnoop(PacketPtr pkt, BlkType *blk, // Do this last in case it deallocates block data or something // like that if (invalidate) { - assert(blk != tempBlock); - tags->invalidate(blk); + if (blk != tempBlock) + tags->invalidate(blk); blk->invalidate(); } -- cgit v1.2.3