Daniel Carvalho has submitted this change and it was merged. (
https://gem5-review.googlesource.com/c/public/gem5/+/13416 )
Change subject: mem-cache: Rename blk.cc/hh to cache_blk.cc/hh
......................................................................
mem-cache: Rename blk.cc/hh to cache_blk.cc/hh
Rename the files blk.cc and blk.hh to cache_blk.cc and cache_blk.hh
to comply with the usual file-class naming rules.
Change-Id: I8af45df3e4b8dd934fd9929ec914fb230cb2cb09
Signed-off-by: Daniel R. Carvalho <[email protected]>
Reviewed-on: https://gem5-review.googlesource.com/c/13416
Reviewed-by: Nikos Nikoleris <[email protected]>
Maintainer: Nikos Nikoleris <[email protected]>
---
M src/mem/cache/SConscript
M src/mem/cache/base.hh
M src/mem/cache/cache.cc
R src/mem/cache/cache_blk.cc
R src/mem/cache/cache_blk.hh
M src/mem/cache/noncoherent_cache.cc
M src/mem/cache/sector_blk.hh
M src/mem/cache/tags/base.hh
M src/mem/cache/tags/base_set_assoc.hh
M src/mem/cache/tags/fa_lru.hh
10 files changed, 12 insertions(+), 12 deletions(-)
Approvals:
Nikos Nikoleris: Looks good to me, approved; Looks good to me, approved
diff --git a/src/mem/cache/SConscript b/src/mem/cache/SConscript
index 24eea96..8a4602b 100644
--- a/src/mem/cache/SConscript
+++ b/src/mem/cache/SConscript
@@ -33,8 +33,8 @@
SimObject('Cache.py')
Source('base.cc')
-Source('blk.cc')
Source('cache.cc')
+Source('cache_blk.cc')
Source('mshr.cc')
Source('mshr_queue.cc')
Source('noncoherent_cache.cc')
diff --git a/src/mem/cache/base.hh b/src/mem/cache/base.hh
index 4ebc524..92748a3 100644
--- a/src/mem/cache/base.hh
+++ b/src/mem/cache/base.hh
@@ -63,7 +63,7 @@
#include "debug/Cache.hh"
#include "debug/CachePort.hh"
#include "enums/Clusivity.hh"
-#include "mem/cache/blk.hh"
+#include "mem/cache/cache_blk.hh"
#include "mem/cache/mshr_queue.hh"
#include "mem/cache/tags/base.hh"
#include "mem/cache/write_queue.hh"
diff --git a/src/mem/cache/cache.cc b/src/mem/cache/cache.cc
index 1b53163..116b543 100644
--- a/src/mem/cache/cache.cc
+++ b/src/mem/cache/cache.cc
@@ -64,7 +64,7 @@
#include "debug/CacheTags.hh"
#include "debug/CacheVerbose.hh"
#include "enums/Clusivity.hh"
-#include "mem/cache/blk.hh"
+#include "mem/cache/cache_blk.hh"
#include "mem/cache/mshr.hh"
#include "mem/cache/tags/base.hh"
#include "mem/cache/write_queue_entry.hh"
diff --git a/src/mem/cache/blk.cc b/src/mem/cache/cache_blk.cc
similarity index 98%
rename from src/mem/cache/blk.cc
rename to src/mem/cache/cache_blk.cc
index 45bd9bf..a77fc63 100644
--- a/src/mem/cache/blk.cc
+++ b/src/mem/cache/cache_blk.cc
@@ -38,7 +38,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "mem/cache/blk.hh"
+#include "mem/cache/cache_blk.hh"
#include "base/cprintf.hh"
diff --git a/src/mem/cache/blk.hh b/src/mem/cache/cache_blk.hh
similarity index 99%
rename from src/mem/cache/blk.hh
rename to src/mem/cache/cache_blk.hh
index 6d91e55..80983a6 100644
--- a/src/mem/cache/blk.hh
+++ b/src/mem/cache/cache_blk.hh
@@ -45,8 +45,8 @@
* Definitions of a simple cache block class.
*/
-#ifndef __MEM_CACHE_BLK_HH__
-#define __MEM_CACHE_BLK_HH__
+#ifndef __MEM_CACHE_CACHE_BLK_HH__
+#define __MEM_CACHE_CACHE_BLK_HH__
#include <cassert>
#include <cstdint>
@@ -463,4 +463,4 @@
const std::string &prefix = "") const;
};
-#endif //__MEM_CACHE_BLK_HH__
+#endif //__MEM_CACHE_CACHE_BLK_HH__
diff --git a/src/mem/cache/noncoherent_cache.cc
b/src/mem/cache/noncoherent_cache.cc
index fb8193a..b4ffed7 100644
--- a/src/mem/cache/noncoherent_cache.cc
+++ b/src/mem/cache/noncoherent_cache.cc
@@ -60,7 +60,7 @@
#include "base/trace.hh"
#include "base/types.hh"
#include "debug/Cache.hh"
-#include "mem/cache/blk.hh"
+#include "mem/cache/cache_blk.hh"
#include "mem/cache/mshr.hh"
#include "params/NoncoherentCache.hh"
diff --git a/src/mem/cache/sector_blk.hh b/src/mem/cache/sector_blk.hh
index 66d83a2..3d09d2b 100644
--- a/src/mem/cache/sector_blk.hh
+++ b/src/mem/cache/sector_blk.hh
@@ -38,7 +38,7 @@
#include <vector>
-#include "mem/cache/blk.hh"
+#include "mem/cache/cache_blk.hh"
#include "mem/cache/replacement_policies/base.hh"
class SectorBlk;
diff --git a/src/mem/cache/tags/base.hh b/src/mem/cache/tags/base.hh
index 589de37..257b1bd 100644
--- a/src/mem/cache/tags/base.hh
+++ b/src/mem/cache/tags/base.hh
@@ -57,7 +57,7 @@
#include "base/logging.hh"
#include "base/statistics.hh"
#include "base/types.hh"
-#include "mem/cache/blk.hh"
+#include "mem/cache/cache_blk.hh"
#include "params/BaseTags.hh"
#include "sim/clocked_object.hh"
diff --git a/src/mem/cache/tags/base_set_assoc.hh
b/src/mem/cache/tags/base_set_assoc.hh
index 11c0c8d..f73a5d9 100644
--- a/src/mem/cache/tags/base_set_assoc.hh
+++ b/src/mem/cache/tags/base_set_assoc.hh
@@ -55,7 +55,7 @@
#include "base/logging.hh"
#include "base/types.hh"
#include "mem/cache/base.hh"
-#include "mem/cache/blk.hh"
+#include "mem/cache/cache_blk.hh"
#include "mem/cache/replacement_policies/base.hh"
#include "mem/cache/tags/base.hh"
#include "mem/cache/tags/indexing_policies/base.hh"
diff --git a/src/mem/cache/tags/fa_lru.hh b/src/mem/cache/tags/fa_lru.hh
index c2f9834..1504399 100644
--- a/src/mem/cache/tags/fa_lru.hh
+++ b/src/mem/cache/tags/fa_lru.hh
@@ -60,7 +60,7 @@
#include "base/logging.hh"
#include "base/statistics.hh"
#include "base/types.hh"
-#include "mem/cache/blk.hh"
+#include "mem/cache/cache_blk.hh"
#include "mem/cache/tags/base.hh"
#include "params/FALRU.hh"
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/13416
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: I8af45df3e4b8dd934fd9929ec914fb230cb2cb09
Gerrit-Change-Number: 13416
Gerrit-PatchSet: 2
Gerrit-Owner: Daniel Carvalho <[email protected]>
Gerrit-Reviewer: Daniel Carvalho <[email protected]>
Gerrit-Reviewer: Nikos Nikoleris <[email protected]>
Gerrit-MessageType: merged
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
