From d204e56b2b9b8ad561fc258ebdc50ae8365159e1 Mon Sep 17 00:00:00 2001 From: "Daniel R. Carvalho" Date: Fri, 9 Mar 2018 15:04:20 +0100 Subject: mem-cache: Use possible locations to find block Use possible locations to find block to make it placement policy independent. Change-Id: I4c9d9e1e1ff91ce12e85ca1970f927d8f4f5a93b Reviewed-on: https://gem5-review.googlesource.com/c/8884 Reviewed-by: Jason Lowe-Power Maintainer: Jason Lowe-Power --- src/mem/cache/tags/base_set_assoc.cc | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) (limited to 'src/mem/cache/tags/base_set_assoc.cc') diff --git a/src/mem/cache/tags/base_set_assoc.cc b/src/mem/cache/tags/base_set_assoc.cc index 8bd65e03b..05712ec8f 100644 --- a/src/mem/cache/tags/base_set_assoc.cc +++ b/src/mem/cache/tags/base_set_assoc.cc @@ -84,14 +84,12 @@ BaseSetAssoc::init(BaseCache* cache) // Initialize blocks unsigned blkIndex = 0; // index into blks array for (unsigned i = 0; i < numSets; ++i) { - sets[i].assoc = assoc; - - sets[i].blks.resize(assoc); + sets[i].resize(assoc); // link in the data blocks for (unsigned j = 0; j < assoc; ++j) { // Select block within the set to be linked - BlkType*& blk = sets[i].blks[j]; + BlkType*& blk = sets[i][j]; // Locate next cache block blk = &blks[blkIndex]; @@ -128,19 +126,10 @@ BaseSetAssoc::invalidate(CacheBlk *blk) replacementPolicy->invalidate(blk->replacementData); } -CacheBlk* -BaseSetAssoc::findBlock(Addr addr, bool is_secure) const -{ - Addr tag = extractTag(addr); - unsigned set = extractSet(addr); - BlkType *blk = sets[set].findBlk(tag, is_secure); - return blk; -} - ReplaceableEntry* BaseSetAssoc::findBlockBySetAndWay(int set, int way) const { - return sets[set].blks[way]; + return sets[set][way]; } BaseSetAssoc * -- cgit v1.2.3