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.

Besides, indexing policies have their own way of addressing
the sets, therefore there is no need to use this class anymore.

BlkType has been removed, as it wasn't being used.

Change-Id: Ia79c2a491e59f295c8d60a0466c317eb0e2bdab9
Signed-off-by: Daniel R. Carvalho <odanrc@yahoo.com.br>
Reviewed-on: https://gem5-review.googlesource.com/c/9782
Reviewed-by: Nikos Nikoleris <nikos.nikoleris@arm.com>
Reviewed-by: Jason Lowe-Power <jason@lowepower.com>
Maintainer: Nikos Nikoleris <nikos.nikoleris@arm.com>

diff --git a/src/mem/cache/tags/base_set_assoc.cc b/src/mem/cache/tags/base_set_assoc.cc
index 1a04c08a9905ba1cef25d5b24199e29a6c8a5ae3..74fb247a63e718283c62ff92a8e671812f564ea6 100644 (file)
--- a/src/mem/cache/tags/base_set_assoc.cc
+++ b/src/mem/cache/tags/base_set_assoc.cc
@@ -71,7 +71,7 @@ BaseSetAssoc::init(BaseCache* cache)
     // Initialize all blocks
     for (unsigned blk_index = 0; blk_index < numBlocks; blk_index++) {
         // Locate next cache block
-        BlkType* blk = &blks[blk_index];
+        CacheBlk* blk = &blks[blk_index];
 
         // Link block to indexing policy
         indexingPolicy->setEntry(blk, blk_index);

diff --git a/src/mem/cache/tags/base_set_assoc.hh b/src/mem/cache/tags/base_set_assoc.hh
index e064172248ec445fb9f7e0a06fe6cfdb3cddb5d1..01bfa05b24408d9507cad75ba7a2f023e00d96b9 100644 (file)
--- a/src/mem/cache/tags/base_set_assoc.hh
+++ b/src/mem/cache/tags/base_set_assoc.hh
@@ -71,16 +71,12 @@
  */
 class BaseSetAssoc : public BaseTags
 {
-  public:
-    /** Typedef the block type used in this tag store. */
-    typedef CacheBlk BlkType;
-
   protected:
     /** The allocatable associativity of the cache (alloc mask). */
     unsigned allocAssoc;
 
     /** The cache blocks. */
-    std::vector<BlkType> blks;
+    std::vector<CacheBlk> blks;
 
     /** Whether tags and data are accessed sequentially. */
     const bool sequentialAccess;
@@ -129,7 +125,7 @@ class BaseSetAssoc : public BaseTags
      */
     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 (file)
index 2675d45..0000000
--- a/src/mem/cache/tags/cacheset.hh
+++ /dev/null
@@ -1,164 +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>
-#include <vector>
-
-#include "base/types.hh"
-
-/**
- * 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