diff options
Diffstat (limited to 'src/mem/cache')
-rw-r--r-- | src/mem/cache/cache.hh | 12 | ||||
-rw-r--r-- | src/mem/cache/tags/base_set_assoc.hh | 32 | ||||
-rw-r--r-- | src/mem/cache/tags/fa_lru.hh | 26 |
3 files changed, 35 insertions, 35 deletions
diff --git a/src/mem/cache/cache.hh b/src/mem/cache/cache.hh index 0ee0696d8..ec436201b 100644 --- a/src/mem/cache/cache.hh +++ b/src/mem/cache/cache.hh @@ -334,9 +334,9 @@ class Cache : public BaseCache PacketPtr cleanEvictBlk(CacheBlk *blk); - void memWriteback(); - void memInvalidate(); - bool isDirty() const; + void memWriteback() override; + void memInvalidate() override; + bool isDirty() const override; /** * Cache block visitor that writes back dirty cache blocks using @@ -410,11 +410,11 @@ class Cache : public BaseCache return tags->findBlock(addr, is_secure); } - bool inCache(Addr addr, bool is_secure) const { + bool inCache(Addr addr, bool is_secure) const override { return (tags->findBlock(addr, is_secure) != 0); } - bool inMissQueue(Addr addr, bool is_secure) const { + bool inMissQueue(Addr addr, bool is_secure) const override { return (mshrQueue.findMatch(addr, is_secure) != 0); } @@ -430,7 +430,7 @@ class Cache : public BaseCache /** Non-default destructor is needed to deallocate memory. */ virtual ~Cache(); - void regStats(); + void regStats() override; /** serialize the state of the caches * We currently don't support checkpointing cache state, so this panics. diff --git a/src/mem/cache/tags/base_set_assoc.hh b/src/mem/cache/tags/base_set_assoc.hh index e415603d9..910d44b36 100644 --- a/src/mem/cache/tags/base_set_assoc.hh +++ b/src/mem/cache/tags/base_set_assoc.hh @@ -152,7 +152,7 @@ public: * @return The number of sets. */ unsigned - getNumSets() const + getNumSets() const override { return numSets; } @@ -162,7 +162,7 @@ public: * @return The number of ways. */ unsigned - getNumWays() const + getNumWays() const override { return assoc; } @@ -173,13 +173,13 @@ public: * @param way The way of the block. * @return The cache block. */ - CacheBlk *findBlockBySetAndWay(int set, int way) const; + CacheBlk *findBlockBySetAndWay(int set, int way) const override; /** * Invalidate the given block. * @param blk The block to invalidate. */ - void invalidate(CacheBlk *blk) + void invalidate(CacheBlk *blk) override { assert(blk); assert(blk->isValid()); @@ -203,7 +203,7 @@ public: * @return Pointer to the cache block if found. */ CacheBlk* accessBlock(Addr addr, bool is_secure, Cycles &lat, - int context_src) + int context_src) override { Addr tag = extractTag(addr); int set = extractSet(addr); @@ -242,7 +242,7 @@ public: * @param asid The address space ID. * @return Pointer to the cache block if found. */ - CacheBlk* findBlock(Addr addr, bool is_secure) const; + CacheBlk* findBlock(Addr addr, bool is_secure) const override; /** * Find an invalid block to evict for the address provided. @@ -251,7 +251,7 @@ public: * @param addr The addr to a find a replacement candidate for. * @return The candidate block. */ - CacheBlk* findVictim(Addr addr) + CacheBlk* findVictim(Addr addr) override { BlkType *blk = NULL; int set = extractSet(addr); @@ -271,7 +271,7 @@ public: * @param pkt Packet holding the address to update * @param blk The block to update. */ - void insertBlock(PacketPtr pkt, CacheBlk *blk) + void insertBlock(PacketPtr pkt, CacheBlk *blk) override { Addr addr = pkt->getAddr(); MasterID master_id = pkt->req->masterId(); @@ -324,7 +324,7 @@ public: * Limit the allocation for the cache ways. * @param ways The maximum number of ways available for replacement. */ - virtual void setWayAllocationMax(int ways) + virtual void setWayAllocationMax(int ways) override { fatal_if(ways < 1, "Allocation limit must be greater than zero"); allocAssoc = ways; @@ -334,7 +334,7 @@ public: * Get the way allocation mask limit. * @return The maximum number of ways available for replacement. */ - virtual int getWayAllocationMax() const + virtual int getWayAllocationMax() const override { return allocAssoc; } @@ -344,7 +344,7 @@ public: * @param addr The address to get the tag from. * @return The tag of the address. */ - Addr extractTag(Addr addr) const + Addr extractTag(Addr addr) const override { return (addr >> tagShift); } @@ -354,7 +354,7 @@ public: * @param addr The address to get the set from. * @return The set index of the address. */ - int extractSet(Addr addr) const + int extractSet(Addr addr) const override { return ((addr >> setShift) & setMask); } @@ -375,7 +375,7 @@ public: * @param set The set of the block. * @return The block address. */ - Addr regenerateBlkAddr(Addr tag, unsigned set) const + Addr regenerateBlkAddr(Addr tag, unsigned set) const override { return ((tag << tagShift) | ((Addr)set << setShift)); } @@ -383,17 +383,17 @@ public: /** * Called at end of simulation to complete average block reference stats. */ - virtual void cleanupRefs(); + void cleanupRefs() override; /** * Print all tags used */ - virtual std::string print() const; + std::string print() const override; /** * Called prior to dumping stats to compute task occupancy */ - virtual void computeStats(); + void computeStats() override; /** * Visit each block in the tag store and apply a visitor to the diff --git a/src/mem/cache/tags/fa_lru.hh b/src/mem/cache/tags/fa_lru.hh index 1728ee48a..2c34be08f 100644 --- a/src/mem/cache/tags/fa_lru.hh +++ b/src/mem/cache/tags/fa_lru.hh @@ -168,13 +168,13 @@ public: * Register the stats for this object. * @param name The name to prepend to the stats name. */ - void regStats(); + void regStats() override; /** * Invalidate a cache block. * @param blk The block to invalidate. */ - void invalidate(CacheBlk *blk); + void invalidate(CacheBlk *blk) override; /** * Access block and update replacement data. May not succeed, in which case @@ -195,7 +195,7 @@ public: * Just a wrapper of above function to conform with the base interface. */ CacheBlk* accessBlock(Addr addr, bool is_secure, Cycles &lat, - int context_src); + int context_src) override; /** * Find the block in the cache, do not update the replacement data. @@ -204,16 +204,16 @@ public: * @param asid The address space ID. * @return Pointer to the cache block. */ - CacheBlk* findBlock(Addr addr, bool is_secure) const; + CacheBlk* findBlock(Addr addr, bool is_secure) const override; /** * Find a replacement block for the address provided. * @param pkt The request to a find a replacement candidate for. * @return The block to place the replacement in. */ - CacheBlk* findVictim(Addr addr); + CacheBlk* findVictim(Addr addr) override; - void insertBlock(PacketPtr pkt, CacheBlk *blk); + void insertBlock(PacketPtr pkt, CacheBlk *blk) override; /** * Return the block size of this cache. @@ -240,7 +240,7 @@ public: * @return The number of sets. */ unsigned - getNumSets() const + getNumSets() const override { return 1; } @@ -250,7 +250,7 @@ public: * @return The number of ways. */ unsigned - getNumWays() const + getNumWays() const override { return numBlocks; } @@ -261,7 +261,7 @@ public: * @param way The way of the block. * @return The cache block. */ - CacheBlk* findBlockBySetAndWay(int set, int way) const; + CacheBlk* findBlockBySetAndWay(int set, int way) const override; /** * Align an address to the block size. @@ -279,7 +279,7 @@ public: * @param addr The address to get the tag from. * @return The tag. */ - Addr extractTag(Addr addr) const + Addr extractTag(Addr addr) const override { return blkAlign(addr); } @@ -289,7 +289,7 @@ public: * @param addr The address to get the set from. * @return 0. */ - int extractSet(Addr addr) const + int extractSet(Addr addr) const override { return 0; } @@ -300,7 +300,7 @@ public: * @param set The set the block belongs to. * @return the block address. */ - Addr regenerateBlkAddr(Addr tag, unsigned set) const + Addr regenerateBlkAddr(Addr tag, unsigned set) const override { return (tag); } @@ -308,7 +308,7 @@ public: /** * @todo Implement as in lru. Currently not used */ - virtual std::string print() const { return ""; } + virtual std::string print() const override { return ""; } /** * Visit each block in the tag store and apply a visitor to the |