From ffbdaa7cce32bfb18f0c97b9c5f19d1aa54da503 Mon Sep 17 00:00:00 2001 From: Amin Farmahini Date: Tue, 28 Jan 2014 18:00:50 -0600 Subject: mem: Remove redundant findVictim() input argument The patch (1) removes the redundant writeback argument from findVictim() (2) fixes the description of access() function Committed by: Nilay Vaish --- src/mem/cache/cache.hh | 2 +- src/mem/cache/cache_impl.hh | 2 +- src/mem/cache/tags/fa_lru.cc | 2 +- src/mem/cache/tags/fa_lru.hh | 3 +-- src/mem/cache/tags/lru.cc | 2 +- src/mem/cache/tags/lru.hh | 3 +-- 6 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/mem/cache/cache.hh b/src/mem/cache/cache.hh index 60f3650e7..3d7fc8fe3 100644 --- a/src/mem/cache/cache.hh +++ b/src/mem/cache/cache.hh @@ -195,9 +195,9 @@ class Cache : public BaseCache /** * Does all the processing necessary to perform the provided request. * @param pkt The memory request to perform. + * @param blk The cache block to be updated. * @param lat The latency of the access. * @param writebacks List for any writebacks that need to be performed. - * @param update True if the replacement data should be updated. * @return Boolean indicating whether the request was satisfied. */ bool access(PacketPtr pkt, BlkType *&blk, diff --git a/src/mem/cache/cache_impl.hh b/src/mem/cache/cache_impl.hh index acd3ef64f..b26473336 100644 --- a/src/mem/cache/cache_impl.hh +++ b/src/mem/cache/cache_impl.hh @@ -1192,7 +1192,7 @@ typename Cache::BlkType* Cache::allocateBlock(Addr addr, bool is_secure, PacketList &writebacks) { - BlkType *blk = tags->findVictim(addr, writebacks); + BlkType *blk = tags->findVictim(addr); if (blk->isValid()) { Addr repl_addr = tags->regenerateBlkAddr(blk->tag, blk->set); diff --git a/src/mem/cache/tags/fa_lru.cc b/src/mem/cache/tags/fa_lru.cc index c3e2b66e4..6526aadb8 100644 --- a/src/mem/cache/tags/fa_lru.cc +++ b/src/mem/cache/tags/fa_lru.cc @@ -224,7 +224,7 @@ FALRU::findBlock(Addr addr, bool is_secure) const } FALRUBlk* -FALRU::findVictim(Addr addr, PacketList &writebacks) +FALRU::findVictim(Addr addr) { FALRUBlk * blk = tail; assert(blk->inCache == 0); diff --git a/src/mem/cache/tags/fa_lru.hh b/src/mem/cache/tags/fa_lru.hh index 1465bd861..ef13b2c79 100644 --- a/src/mem/cache/tags/fa_lru.hh +++ b/src/mem/cache/tags/fa_lru.hh @@ -203,10 +203,9 @@ public: /** * Find a replacement block for the address provided. * @param pkt The request to a find a replacement candidate for. - * @param writebacks List for any writebacks to be performed. * @return The block to place the replacement in. */ - FALRUBlk* findVictim(Addr addr, PacketList & writebacks); + FALRUBlk* findVictim(Addr addr); void insertBlock(PacketPtr pkt, BlkType *blk); diff --git a/src/mem/cache/tags/lru.cc b/src/mem/cache/tags/lru.cc index ff0596987..744d7224a 100644 --- a/src/mem/cache/tags/lru.cc +++ b/src/mem/cache/tags/lru.cc @@ -172,7 +172,7 @@ LRU::findBlock(Addr addr, bool is_secure) const } LRU::BlkType* -LRU::findVictim(Addr addr, PacketList &writebacks) +LRU::findVictim(Addr addr) { unsigned set = extractSet(addr); // grab a replacement candidate diff --git a/src/mem/cache/tags/lru.hh b/src/mem/cache/tags/lru.hh index 9d438497a..121bdb292 100644 --- a/src/mem/cache/tags/lru.hh +++ b/src/mem/cache/tags/lru.hh @@ -169,10 +169,9 @@ public: /** * Find a block to evict for the address provided. * @param addr The addr to a find a replacement candidate for. - * @param writebacks List for any writebacks to be performed. * @return The candidate block. */ - BlkType* findVictim(Addr addr, PacketList &writebacks); + BlkType* findVictim(Addr addr); /** * Insert the new block into the cache. For LRU this means inserting into -- cgit v1.2.3