diff options
| -rw-r--r-- | src/mem/cache/base.cc | 19 | ||||
| -rw-r--r-- | src/mem/cache/cache_blk.cc | 10 | ||||
| -rw-r--r-- | src/mem/cache/cache_blk.hh | 29 | ||||
| -rw-r--r-- | src/mem/cache/tags/sector_blk.hh | 2 | ||||
| -rw-r--r-- | src/mem/cache/tags/sector_tags.cc | 7 |
5 files changed, 44 insertions, 23 deletions
diff --git a/src/mem/cache/base.cc b/src/mem/cache/base.cc index 497f75c88..244d7ce4e 100644 --- a/src/mem/cache/base.cc +++ b/src/mem/cache/base.cc @@ -1004,7 +1004,7 @@ BaseCache::access(PacketPtr pkt, CacheBlk *&blk, Cycles &lat, return false; } - blk->status |= (BlkValid | BlkReadable); + blk->status |= BlkReadable; } // only mark the block dirty if we got a writeback command, // and leave it as is for a clean writeback @@ -1062,7 +1062,7 @@ BaseCache::access(PacketPtr pkt, CacheBlk *&blk, Cycles &lat, return false; } - blk->status |= (BlkValid | BlkReadable); + blk->status |= BlkReadable; } } @@ -1149,26 +1149,23 @@ BaseCache::handleFill(PacketPtr pkt, CacheBlk *blk, PacketList &writebacks, // No replaceable block or a mostly exclusive // cache... just use temporary storage to complete the // current request and then get rid of it - assert(!tempBlock->isValid()); blk = tempBlock; tempBlock->insert(addr, is_secure); DPRINTF(Cache, "using temp block for %#llx (%s)\n", addr, is_secure ? "s" : "ns"); } - - // we should never be overwriting a valid block - assert(!blk->isValid()); } else { // existing block... probably an upgrade - assert(regenerateBlkAddr(blk) == addr); - assert(blk->isSecure() == is_secure); - // either we're getting new data or the block should already be valid - assert(pkt->hasData() || blk->isValid()); // don't clear block status... if block is already dirty we // don't want to lose that } - blk->status |= BlkValid | BlkReadable; + // Block is guaranteed to be valid at this point + assert(blk->isValid()); + assert(blk->isSecure() == is_secure); + assert(regenerateBlkAddr(blk) == addr); + + blk->status |= BlkReadable; // sanity check for whole-line writes, which should always be // marked as writable as part of the fill, and then later marked diff --git a/src/mem/cache/cache_blk.cc b/src/mem/cache/cache_blk.cc index a77fc630a..c4730caeb 100644 --- a/src/mem/cache/cache_blk.cc +++ b/src/mem/cache/cache_blk.cc @@ -46,6 +46,9 @@ void CacheBlk::insert(const Addr tag, const bool is_secure, const int src_master_ID, const uint32_t task_ID) { + // Make sure that the block has been properly invalidated + assert(status == 0); + // Set block tag this->tag = tag; @@ -63,10 +66,11 @@ CacheBlk::insert(const Addr tag, const bool is_secure, // Set secure state if (is_secure) { - status = BlkSecure; - } else { - status = 0; + setSecure(); } + + // Validate block + setValid(); } void diff --git a/src/mem/cache/cache_blk.hh b/src/mem/cache/cache_blk.hh index 80983a637..d7530d656 100644 --- a/src/mem/cache/cache_blk.hh +++ b/src/mem/cache/cache_blk.hh @@ -244,10 +244,27 @@ class CacheBlk : public ReplaceableEntry } /** + * Set valid bit. + */ + virtual void setValid() + { + assert(!isValid()); + status |= BlkValid; + } + + /** + * Set secure bit. + */ + virtual void setSecure() + { + status |= BlkSecure; + } + + /** * Set member variables when a block insertion occurs. Resets reference * count to 1 (the insertion counts as a reference), and touch block if * it hadn't been touched previously. Sets the insertion tick to the - * current tick. Does not make block valid. + * current tick. Marks the block valid. * * @param tag Block address tag. * @param is_secure Whether the block is in secure space or not. @@ -425,15 +442,19 @@ class TempCacheBlk final : public CacheBlk void insert(const Addr addr, const bool is_secure, const int src_master_ID=0, const uint32_t task_ID=0) override { + // Make sure that the block has been properly invalidated + assert(status == 0); + // Set block address _addr = addr; // Set secure state if (is_secure) { - status = BlkSecure; - } else { - status = 0; + setSecure(); } + + // Validate block + setValid(); } /** diff --git a/src/mem/cache/tags/sector_blk.hh b/src/mem/cache/tags/sector_blk.hh index 6eed04464..12649fce2 100644 --- a/src/mem/cache/tags/sector_blk.hh +++ b/src/mem/cache/tags/sector_blk.hh @@ -105,7 +105,7 @@ class SectorSubBlk : public CacheBlk * Set member variables when a block insertion occurs. Resets reference * count to 1 (the insertion counts as a reference), and touch block if * it hadn't been touched previously. Sets the insertion tick to the - * current tick. Does not make block valid. + * current tick. Marks the block valid. * * @param tag Block address tag. * @param is_secure Whether the block is in secure space or not. diff --git a/src/mem/cache/tags/sector_tags.cc b/src/mem/cache/tags/sector_tags.cc index 68440c2f2..ad374e5ee 100644 --- a/src/mem/cache/tags/sector_tags.cc +++ b/src/mem/cache/tags/sector_tags.cc @@ -171,16 +171,12 @@ SectorTags::insertBlock(const Addr addr, const bool is_secure, const int src_master_ID, const uint32_t task_ID, CacheBlk *blk) { - // Do common block insertion functionality - BaseTags::insertBlock(addr, is_secure, src_master_ID, task_ID, blk); - // Get block's sector SectorSubBlk* sub_blk = static_cast<SectorSubBlk*>(blk); const SectorBlk* sector_blk = sub_blk->getSectorBlock(); // When a block is inserted, the tag is only a newly used tag if the // sector was not previously present in the cache. - // This assumes BaseTags::insertBlock does not set the valid bit. if (sector_blk->isValid()) { // An existing entry's replacement data is just updated replacementPolicy->touch(sector_blk->replacementData); @@ -191,6 +187,9 @@ SectorTags::insertBlock(const Addr addr, const bool is_secure, // A new entry resets the replacement data replacementPolicy->reset(sector_blk->replacementData); } + + // Do common block insertion functionality + BaseTags::insertBlock(addr, is_secure, src_master_ID, task_ID, blk); } CacheBlk* |