From f6f6ae461ee5060127fd42830fc04e5a5f4153a6 Mon Sep 17 00:00:00 2001 From: Mitch Hayenga Date: Wed, 13 Aug 2014 06:57:24 -0400 Subject: mem: Properly set cache block status fields on writebacks When a cacheline is written back to a lower-level cache, tags->insertBlock() sets various status parameters. However these status bits were cleared immediately after calling. This patch makes it so that these status fields are not cleared by moving them outside of the tags->insertBlock() call. --- src/mem/cache/cache_impl.hh | 6 +++++- src/mem/cache/tags/base_set_assoc.hh | 5 ++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/mem/cache/cache_impl.hh b/src/mem/cache/cache_impl.hh index 00ba0d24f..5ef45ea2f 100644 --- a/src/mem/cache/cache_impl.hh +++ b/src/mem/cache/cache_impl.hh @@ -336,7 +336,11 @@ Cache::access(PacketPtr pkt, BlkType *&blk, return false; } tags->insertBlock(pkt, blk); - blk->status = BlkValid | BlkReadable; + + blk->status = (BlkValid | BlkReadable); + if (pkt->isSecure()) { + blk->status |= BlkSecure; + } } std::memcpy(blk->data, pkt->getPtr(), blkSize); blk->status |= BlkDirty; diff --git a/src/mem/cache/tags/base_set_assoc.hh b/src/mem/cache/tags/base_set_assoc.hh index 218d9cdd9..ac575d2ff 100644 --- a/src/mem/cache/tags/base_set_assoc.hh +++ b/src/mem/cache/tags/base_set_assoc.hh @@ -247,7 +247,7 @@ public: Addr addr = pkt->getAddr(); MasterID master_id = pkt->req->masterId(); uint32_t task_id = pkt->req->taskId(); - bool is_secure = pkt->isSecure(); + if (!blk->isTouched) { tagsInUse++; blk->isTouched = true; @@ -275,10 +275,9 @@ public: } blk->isTouched = true; + // Set tag for new block. Caller is responsible for setting status. blk->tag = extractTag(addr); - if (is_secure) - blk->status |= BlkSecure; // deal with what we are bringing in assert(master_id < cache->system->maxMasters()); -- cgit v1.2.3