Daniel Carvalho has uploaded this change for review. (
https://gem5-review.googlesource.com/9782
Change subject: mem-cache: Remove CacheSet.hh
......................................................................
mem-cache: Remove CacheSet.hh
Replacement policies aren't aware of cache sets and do not
organize blocks based on replacement data. Block search is
independent of block placement. Therefore there is no need
to use this class anymore.
BlkType has been removed, as it wasn't being used.
Change-Id: Ia79c2a491e59f295c8d60a0466c317eb0e2bdab9
---
M src/mem/cache/tags/base_set_assoc.cc
M src/mem/cache/tags/base_set_assoc.hh
D src/mem/cache/tags/cacheset.hh
3 files changed, 9 insertions(+), 174 deletions(-)
diff --git a/src/mem/cache/tags/base_set_assoc.cc
b/src/mem/cache/tags/base_set_assoc.cc
index 7fd3857..69b9123 100644
--- a/src/mem/cache/tags/base_set_assoc.cc
+++ b/src/mem/cache/tags/base_set_assoc.cc
@@ -76,14 +76,12 @@
unsigned blkIndex = 0; // index into blks array
for (unsigned i = 0; i < numSets; ++i) {
- sets[i].assoc = assoc;
-
sets[i].blks.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];
+ CacheBlk*& blk = sets[i].blks[j];
// Locate next cache block
blk = &blks[blkIndex];
@@ -120,7 +118,7 @@
for (unsigned i = 0; i < numSets; ++i) {
// link in the data blocks
for (unsigned j = 0; j < assoc; ++j) {
- BlkType *blk = sets[i].blks[j];
+ CacheBlk *blk = sets[i].blks[j];
if (blk->isValid())
cache_state += csprintf("\tset: %d block: %d %s\n", i, j,
blk->print());
diff --git a/src/mem/cache/tags/base_set_assoc.hh
b/src/mem/cache/tags/base_set_assoc.hh
index c681b7b..67cfa90 100644
--- a/src/mem/cache/tags/base_set_assoc.hh
+++ b/src/mem/cache/tags/base_set_assoc.hh
@@ -56,7 +56,6 @@
#include "mem/cache/base.hh"
#include "mem/cache/blk.hh"
#include "mem/cache/tags/base.hh"
-#include "mem/cache/tags/cacheset.hh"
#include "mem/packet.hh"
#include "params/BaseSetAssoc.hh"
@@ -70,20 +69,19 @@
*/
class BaseSetAssoc : public BaseTags
{
- public:
- /** Typedef the block type used in this tag store. */
- typedef CacheBlk BlkType;
- /** Typedef the set type used in this tag store. */
- typedef CacheSet<CacheBlk> SetType;
-
protected:
+ /** A set is composed of blocks. */
+ struct SetType {
+ std::vector<CacheBlk*> blks;
+ };
+
/** The associativity of the cache. */
const unsigned assoc;
/** The allocatable associativity of the cache (alloc mask). */
unsigned allocAssoc;
/** The cache blocks. */
- std::vector<BlkType> blks;
+ std::vector<CacheBlk> blks;
/** The number of sets in the cache. */
const unsigned numSets;
@@ -138,7 +136,7 @@
*/
CacheBlk* accessBlock(Addr addr, bool is_secure, Cycles &lat) override
{
- BlkType *blk = findBlock(addr, is_secure);
+ CacheBlk *blk = findBlock(addr, is_secure);
// Access all tags in parallel, hence one in each way. The data
side
// either accesses all blocks in parallel, or one block
sequentially on
diff --git a/src/mem/cache/tags/cacheset.hh b/src/mem/cache/tags/cacheset.hh
deleted file mode 100644
index 5a34456..0000000
--- a/src/mem/cache/tags/cacheset.hh
+++ /dev/null
@@ -1,161 +0,0 @@
-/*
- * Copyright (c) 2013 ARM Limited
- * All rights reserved.
- *
- * The license below extends only to copyright in the software and shall
- * not be construed as granting a license to any other intellectual
- * property including but not limited to intellectual property relating
- * to a hardware implementation of the functionality of the software
- * licensed hereunder. You may use the software subject to the license
- * terms below provided that you ensure that this notice is replicated
- * unmodified and in its entirety in all distributions of the software,
- * modified or unmodified, in source code or in binary form.
- *
- * Copyright (c) 2009 The Regents of The University of Michigan
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met: redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer;
- * redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution;
- * neither the name of the copyright holders nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * Authors: Lisa Hsu
- */
-
-/**
- * @file
- * Declaration of an associative set
- */
-
-#ifndef __MEM_CACHE_TAGS_CACHESET_HH__
-#define __MEM_CACHE_TAGS_CACHESET_HH__
-
-#include <cassert>
-
-/**
- * An associative set of cache blocks.
- */
-template <class Blktype>
-class CacheSet
-{
- public:
- /** The associativity of this set. */
- int assoc;
-
- /** Cache blocks in this set, maintained in LRU order 0 = MRU. */
- std::vector<Blktype*> blks;
-
- /**
- * Find a block matching the tag in this set.
- * @param way_id The id of the way that matches the tag.
- * @param tag The Tag to find.
- * @param is_secure True if the target memory space is secure.
- * @return Pointer to the block if found. Set way_id to assoc if none
found
- */
- Blktype* findBlk(Addr tag, bool is_secure, int& way_id) const ;
- Blktype* findBlk(Addr tag, bool is_secure) const ;
-
- /**
- * Move the given block to the head of the list.
- * @param blk The block to move.
- */
- void moveToHead(Blktype *blk);
-
- /**
- * Move the given block to the tail of the list.
- * @param blk The block to move
- */
- void moveToTail(Blktype *blk);
-
-};
-
-template <class Blktype>
-Blktype*
-CacheSet<Blktype>::findBlk(Addr tag, bool is_secure, int& way_id) const
-{
- /**
- * Way_id returns the id of the way that matches the block
- * If no block is found way_id is set to assoc.
- */
- way_id = assoc;
- for (int i = 0; i < assoc; ++i) {
- if (blks[i]->tag == tag && blks[i]->isValid() &&
- blks[i]->isSecure() == is_secure) {
- way_id = i;
- return blks[i];
- }
- }
- return nullptr;
-}
-
-template <class Blktype>
-Blktype*
-CacheSet<Blktype>::findBlk(Addr tag, bool is_secure) const
-{
- int ignored_way_id;
- return findBlk(tag, is_secure, ignored_way_id);
-}
-
-template <class Blktype>
-void
-CacheSet<Blktype>::moveToHead(Blktype *blk)
-{
- // nothing to do if blk is already head
- if (blks[0] == blk)
- return;
-
- // write 'next' block into blks[i], moving up from MRU toward LRU
- // until we overwrite the block we moved to head.
-
- // start by setting up to write 'blk' into blks[0]
- int i = 0;
- Blktype *next = blk;
-
- do {
- assert(i < assoc);
- std::swap(blks[i], next);
- ++i;
- } while (next != blk);
-}
-
-template <class Blktype>
-void
-CacheSet<Blktype>::moveToTail(Blktype *blk)
-{
- // nothing to do if blk is already tail
- if (blks[assoc - 1] == blk)
- return;
-
- // write 'next' block into blks[i], moving from LRU to MRU
- // until we overwrite the block we moved to tail.
-
- // start by setting up to write 'blk' into tail
- int i = assoc - 1;
- Blktype *next = blk;
-
- do {
- assert(i >= 0);
- std::swap(blks[i], next);
- --i;
- } while (next != blk);
-}
-
-#endif
--
To view, visit https://gem5-review.googlesource.com/9782
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: master
Gerrit-Change-Id: Ia79c2a491e59f295c8d60a0466c317eb0e2bdab9
Gerrit-Change-Number: 9782
Gerrit-PatchSet: 1
Gerrit-Owner: Daniel Carvalho <oda...@yahoo.com.br>
Gerrit-MessageType: newchange
_______________________________________________
gem5-dev mailing list
gem5-dev@gem5.org
http://m5sim.org/mailman/listinfo/gem5-dev
