mem-cache: Rename the tag class init function to tagsInit.

Since the tag classes are subclasses of SimObject, they inherit an
init function which does generic initialization at simulation startup
and which doesn't take any parameters. A new function was added which
does take a parameter, and which is just for doing tag specific
initialization as triggered by the base cache. These two names clashed,
and clang complained that the tag local name was hiding the SimObject
name (which it was).

Change-Id: I399775aceaf8f1a8e2646d434facef22e6d3e7d0
Reviewed-on: https://gem5-review.googlesource.com/c/13875
Reviewed-by: Gabe Black <gabeblack@google.com>
Reviewed-by: Nikos Nikoleris <nikos.nikoleris@arm.com>
Maintainer: Gabe Black <gabeblack@google.com>
Maintainer: Nikos Nikoleris <nikos.nikoleris@arm.com>

diff --git a/src/mem/cache/base.cc b/src/mem/cache/base.cc
index a7c21069745c3f1f8dcd9881256c4599fd8870af..8f7a8922d49e3caca8d034685a79edf0fee52ba4 100644 (file)
--- a/src/mem/cache/base.cc
+++ b/src/mem/cache/base.cc
@@ -118,7 +118,7 @@ BaseCache::BaseCache(const BaseCacheParams *p, unsigned blk_size)
 
     tempBlock = new TempCacheBlk(blkSize);
 
-    tags->init(this);
+    tags->tagsInit(this);
     if (prefetcher)
         prefetcher->setCache(this);
 }

diff --git a/src/mem/cache/tags/base.hh b/src/mem/cache/tags/base.hh
index 257b1bd29bfc543272064332a0e5615eb25bd89a..a7a35ffbbaba2465f1b5da2220b5a3b6cf2c3a99 100644 (file)
--- a/src/mem/cache/tags/base.hh
+++ b/src/mem/cache/tags/base.hh
@@ -179,7 +179,7 @@ class BaseTags : public ClockedObject
      *
      * @param _cache Pointer to parent cache.
      */
-    virtual void init(BaseCache *_cache) = 0;
+    virtual void tagsInit(BaseCache *_cache) = 0;
 
     /**
      * Register local statistics.

diff --git a/src/mem/cache/tags/base_set_assoc.cc b/src/mem/cache/tags/base_set_assoc.cc
index 74fb247a63e718283c62ff92a8e671812f564ea6..b3b773106e7ebc2212626b0782806d626b06f3a3 100644 (file)
--- a/src/mem/cache/tags/base_set_assoc.cc
+++ b/src/mem/cache/tags/base_set_assoc.cc
@@ -63,7 +63,7 @@ BaseSetAssoc::BaseSetAssoc(const Params *p)
 }
 
 void
-BaseSetAssoc::init(BaseCache* cache)
+BaseSetAssoc::tagsInit(BaseCache* cache)
 {
     // Set parent cache
     setCache(cache);

diff --git a/src/mem/cache/tags/base_set_assoc.hh b/src/mem/cache/tags/base_set_assoc.hh
index 70e90711971f19e5d738fa1cd4a3b9e9f12aa0c9..58aceb0878cc882ec9c932fcce1a180fd0af44e8 100644 (file)
--- a/src/mem/cache/tags/base_set_assoc.hh
+++ b/src/mem/cache/tags/base_set_assoc.hh
@@ -103,7 +103,7 @@ class BaseSetAssoc : public BaseTags
      *
      * @param _cache Pointer to parent cache.
      */
-    void init(BaseCache *_cache) override;
+    void tagsInit(BaseCache *_cache) override;
 
     /**
      * This function updates the tags when a block is invalidated. It also

diff --git a/src/mem/cache/tags/fa_lru.cc b/src/mem/cache/tags/fa_lru.cc
index 01f0aa256ebc4f76a372c6a1c378973c590268c4..2c92a940fef205b54f0a42921948a4d0b83da978 100644 (file)
--- a/src/mem/cache/tags/fa_lru.cc
+++ b/src/mem/cache/tags/fa_lru.cc
@@ -84,7 +84,7 @@ FALRU::~FALRU()
 }
 
 void
-FALRU::init(BaseCache* cache)
+FALRU::tagsInit(BaseCache* cache)
 {
     // Set parent cache
     setCache(cache);

diff --git a/src/mem/cache/tags/fa_lru.hh b/src/mem/cache/tags/fa_lru.hh
index 15043995f716993a41beabb2bb7236f1c7778fa3..6ea4c8d6a3a8e0a071572fd23405876f1493f4aa 100644 (file)
--- a/src/mem/cache/tags/fa_lru.hh
+++ b/src/mem/cache/tags/fa_lru.hh
@@ -163,7 +163,7 @@ class FALRU : public BaseTags
      *
      * @param _cache Pointer to parent cache.
      */
-    void init(BaseCache *_cache) override;
+    void tagsInit(BaseCache *_cache) override;
 
     /**
      * Register the stats for this object.

diff --git a/src/mem/cache/tags/sector_tags.cc b/src/mem/cache/tags/sector_tags.cc
index 8c87074ec96dd09f28126310087f94b05758da2f..24751c97dcc07edd38090c8457097cb48654a9c6 100644 (file)
--- a/src/mem/cache/tags/sector_tags.cc
+++ b/src/mem/cache/tags/sector_tags.cc
@@ -64,7 +64,7 @@ SectorTags::SectorTags(const SectorTagsParams *p)
 }
 
 void
-SectorTags::init(BaseCache* cache)
+SectorTags::tagsInit(BaseCache* cache)
 {
     // Set parent cache
     setCache(cache);

diff --git a/src/mem/cache/tags/sector_tags.hh b/src/mem/cache/tags/sector_tags.hh
index 40df7829dbf1d2ba6f0cc0249c4dff220b782084..1149ba1e074ff50b8a4f8fdea52bbb0d66eacb89 100644 (file)
--- a/src/mem/cache/tags/sector_tags.hh
+++ b/src/mem/cache/tags/sector_tags.hh
@@ -105,7 +105,7 @@ class SectorTags : public BaseTags
      *
      * @param _cache Pointer to parent cache.
      */
-    void init(BaseCache *_cache) override;
+    void tagsInit(BaseCache *_cache) override;
 
     /**
      * This function updates the tags when a block is invalidated but does