From 3c076e4d69b38be9e4ce7ca9cfb7145ae6f27393 Mon Sep 17 00:00:00 2001 From: "Daniel R. Carvalho" Date: Mon, 26 Feb 2018 15:22:33 +0100 Subject: mem-cache: Vectorize C arrays in BaseSetAssoc. Transform BaseSetAssoc's arrays into C++ vectors to avoid unnecessary resource management. Change-Id: I656f42f29e5f9589eba491b410ca1df5a64f2f34 Reviewed-on: https://gem5-review.googlesource.com/8621 Reviewed-by: Nikos Nikoleris Reviewed-by: Jason Lowe-Power Maintainer: Jason Lowe-Power --- src/mem/cache/tags/base_set_assoc.cc | 18 ++++-------------- 1 file changed, 4 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 c39822929..728f5a5f9 100644 --- a/src/mem/cache/tags/base_set_assoc.cc +++ b/src/mem/cache/tags/base_set_assoc.cc @@ -56,8 +56,11 @@ using namespace std; BaseSetAssoc::BaseSetAssoc(const Params *p) :BaseTags(p), assoc(p->assoc), allocAssoc(p->assoc), + blks(p->size / p->block_size), + dataBlks(new uint8_t[p->size]), // Allocate data storage in one big chunk numSets(p->size / (p->block_size * p->assoc)), - sequentialAccess(p->sequential_access) + sequentialAccess(p->sequential_access), + sets(p->size / (p->block_size * p->assoc)) { // Check parameters if (blkSize < 4 || !isPowerOf2(blkSize)) { @@ -74,12 +77,6 @@ BaseSetAssoc::BaseSetAssoc(const Params *p) setMask = numSets - 1; tagShift = setShift + floorLog2(numSets); - sets = new SetType[numSets]; - blks = new BlkType[numSets * assoc]; - // allocate data storage in one big chunk - numBlocks = numSets * assoc; - dataBlks = new uint8_t[numBlocks * blkSize]; - unsigned blkIndex = 0; // index into blks array for (unsigned i = 0; i < numSets; ++i) { sets[i].assoc = assoc; @@ -110,13 +107,6 @@ BaseSetAssoc::BaseSetAssoc(const Params *p) } } -BaseSetAssoc::~BaseSetAssoc() -{ - delete [] dataBlks; - delete [] blks; - delete [] sets; -} - CacheBlk* BaseSetAssoc::findBlock(Addr addr, bool is_secure) const { -- cgit v1.2.3