Fix #include lines for renamed cache files.

--HG--
extra : convert_revision : b5008115dc5b34958246608757e69a3fa43b85c5

diff --git a/src/cpu/memtest/memtest.cc b/src/cpu/memtest/memtest.cc
index 819b95e70d55a1fc3db24ac97b5963c3b2d53a50..42889163a41510d1af97eda251b4544f98d1229c 100644 (file)
--- a/src/cpu/memtest/memtest.cc
+++ b/src/cpu/memtest/memtest.cc
@@ -39,12 +39,9 @@
 #include "base/misc.hh"
 #include "base/statistics.hh"
 #include "cpu/memtest/memtest.hh"
-//#include "cpu/simple_thread.hh"
-//#include "mem/cache/base_cache.hh"
 #include "mem/mem_object.hh"
 #include "mem/port.hh"
 #include "mem/packet.hh"
-//#include "mem/physical.hh"
 #include "mem/request.hh"
 #include "sim/sim_events.hh"
 #include "sim/stats.hh"

diff --git a/src/cpu/ozone/simple_cpu_builder.cc b/src/cpu/ozone/simple_cpu_builder.cc
index 9cd56fdb40f329a8c3f05dc816f81237ec79043c..fa83e2531b3241794f01a1f42cc5540f1617700d 100644 (file)
--- a/src/cpu/ozone/simple_cpu_builder.cc
+++ b/src/cpu/ozone/simple_cpu_builder.cc
@@ -35,7 +35,7 @@
 #include "cpu/ozone/cpu_impl.hh"
 #include "cpu/ozone/simple_impl.hh"
 #include "cpu/ozone/simple_params.hh"
-#include "mem/cache/base_cache.hh"
+#include "mem/cache/base.hh"
 #include "sim/SimpleOzoneCPU.hh"
 #include "sim/process.hh"
 #include "sim/sim_object.hh"

diff --git a/src/mem/cache/base.cc b/src/mem/cache/base.cc
index 9fa9e2d29ac9eae429ecb551e528b92dd35918e4..ac0d54bf69ffef9cdf4728a19585823ea2826bbc 100644 (file)
--- a/src/mem/cache/base.cc
+++ b/src/mem/cache/base.cc
@@ -35,8 +35,8 @@
 
 #include "cpu/base.hh"
 #include "cpu/smt.hh"
-#include "mem/cache/base_cache.hh"
-#include "mem/cache/miss/mshr.hh"
+#include "mem/cache/base.hh"
+#include "mem/cache/mshr.hh"
 
 using namespace std;
 

diff --git a/src/mem/cache/base.hh b/src/mem/cache/base.hh
index 604474524350448e6c40c88ddf9902f4fbd23a69..d9702102404eaabc8970baad46b01fe756312345 100644 (file)
--- a/src/mem/cache/base.hh
+++ b/src/mem/cache/base.hh
@@ -47,7 +47,7 @@
 #include "base/misc.hh"
 #include "base/statistics.hh"
 #include "base/trace.hh"
-#include "mem/cache/miss/mshr_queue.hh"
+#include "mem/cache/mshr_queue.hh"
 #include "mem/mem_object.hh"
 #include "mem/packet.hh"
 #include "mem/tport.hh"

diff --git a/src/mem/cache/blk.cc b/src/mem/cache/blk.cc
index d4a2eaee8c08002064bf52a2330585fc87dc5621..4952ed758c7e3b68bd049aa9718b729d50a39f10 100644 (file)
--- a/src/mem/cache/blk.cc
+++ b/src/mem/cache/blk.cc
@@ -27,7 +27,7 @@
  */
 
 #include "base/cprintf.hh"
-#include "mem/cache/cache_blk.hh"
+#include "mem/cache/blk.hh"
 
 void
 CacheBlkPrintWrapper::print(std::ostream &os, int verbosity,

diff --git a/src/mem/cache/builder.cc b/src/mem/cache/builder.cc
index d67a9c9a4854c5494dbcbb879b70d38d20ad8f41..db900c64cb3f7b96d5c965832b807472343afdd5 100644 (file)
--- a/src/mem/cache/builder.cc
+++ b/src/mem/cache/builder.cc
@@ -39,7 +39,7 @@
 #include "enums/Prefetch.hh"
 #include "mem/config/cache.hh"
 #include "mem/config/prefetch.hh"
-#include "mem/cache/base_cache.hh"
+#include "mem/cache/base.hh"
 #include "mem/cache/cache.hh"
 #include "mem/bus.hh"
 #include "params/BaseCache.hh"
@@ -67,13 +67,13 @@
 
 //Prefetcher Headers
 #if defined(USE_GHB)
-#include "mem/cache/prefetch/ghb_prefetcher.hh"
+#include "mem/cache/prefetch/ghb.hh"
 #endif
 #if defined(USE_TAGGED)
-#include "mem/cache/prefetch/tagged_prefetcher.hh"
+#include "mem/cache/prefetch/tagged.hh"
 #endif
 #if defined(USE_STRIDED)
-#include "mem/cache/prefetch/stride_prefetcher.hh"
+#include "mem/cache/prefetch/stride.hh"
 #endif
 
 

diff --git a/src/mem/cache/cache.hh b/src/mem/cache/cache.hh
index 170ba0cd1638e4fca06b9019a12469fa56f76ce8..073ce5ecb11e0b5665d018166c966155d20817ca 100644 (file)
--- a/src/mem/cache/cache.hh
+++ b/src/mem/cache/cache.hh
@@ -41,9 +41,9 @@
 
 #include "base/misc.hh" // fatal, panic, and warn
 
-#include "mem/cache/base_cache.hh"
-#include "mem/cache/cache_blk.hh"
-#include "mem/cache/miss/mshr.hh"
+#include "mem/cache/base.hh"
+#include "mem/cache/blk.hh"
+#include "mem/cache/mshr.hh"
 
 #include "sim/eventq.hh"
 

diff --git a/src/mem/cache/cache_impl.hh b/src/mem/cache/cache_impl.hh
index 7a06f9fc7c49fa045250bf3f0b435b332aa40128..6e4b50ed9244a524f4bef09bae8d85f9cc21564d 100644 (file)
--- a/src/mem/cache/cache_impl.hh
+++ b/src/mem/cache/cache_impl.hh
@@ -42,9 +42,9 @@
 #include "base/range_ops.hh"
 
 #include "mem/cache/cache.hh"
-#include "mem/cache/cache_blk.hh"
-#include "mem/cache/miss/mshr.hh"
-#include "mem/cache/prefetch/base_prefetcher.hh"
+#include "mem/cache/blk.hh"
+#include "mem/cache/mshr.hh"
+#include "mem/cache/prefetch/base.hh"
 
 #include "sim/sim_exit.hh" // for SimExitEvent
 

diff --git a/src/mem/cache/mshr.cc b/src/mem/cache/mshr.cc
index d711ca53779d2b4e961101dbc63053dc5c4a5978..6537f63439f5bc1cbd86577534e44591463f5fea 100644 (file)
--- a/src/mem/cache/mshr.cc
+++ b/src/mem/cache/mshr.cc
@@ -39,7 +39,7 @@
 #include <vector>
 #include <algorithm>
 
-#include "mem/cache/miss/mshr.hh"
+#include "mem/cache/mshr.hh"
 #include "sim/core.hh" // for curTick
 #include "sim/host.hh"
 #include "base/misc.hh"

diff --git a/src/mem/cache/mshr_queue.cc b/src/mem/cache/mshr_queue.cc
index 71da7e4c16aa68368e2488ece4571390af901e04..45331c33d9327d04816a49e9bbd3fbec033a0804 100644 (file)
--- a/src/mem/cache/mshr_queue.cc
+++ b/src/mem/cache/mshr_queue.cc
@@ -32,7 +32,7 @@
  * Definition of MSHRQueue class functions.
  */
 
-#include "mem/cache/miss/mshr_queue.hh"
+#include "mem/cache/mshr_queue.hh"
 
 using namespace std;
 

diff --git a/src/mem/cache/mshr_queue.hh b/src/mem/cache/mshr_queue.hh
index e0474508784e027f4506de4333dab5a542dc6fd5..f481ca471108259d20090a70409a8b69790c242f 100644 (file)
--- a/src/mem/cache/mshr_queue.hh
+++ b/src/mem/cache/mshr_queue.hh
@@ -38,7 +38,7 @@
 #include <vector>
 
 #include "mem/packet.hh"
-#include "mem/cache/miss/mshr.hh"
+#include "mem/cache/mshr.hh"
 
 /**
  * A Class for maintaining a list of pending and allocated memory requests.

diff --git a/src/mem/cache/prefetch/base.cc b/src/mem/cache/prefetch/base.cc
index 1af900849d26396cbecd30e4f6797014b9aace5e..fcc02ff285e444905a56d3474c9aa8aa82798899 100644 (file)
--- a/src/mem/cache/prefetch/base.cc
+++ b/src/mem/cache/prefetch/base.cc
@@ -34,8 +34,8 @@
  */
 
 #include "base/trace.hh"
-#include "mem/cache/base_cache.hh"
-#include "mem/cache/prefetch/base_prefetcher.hh"
+#include "mem/cache/base.hh"
+#include "mem/cache/prefetch/base.hh"
 #include "mem/request.hh"
 #include <list>
 

diff --git a/src/mem/cache/prefetch/ghb.cc b/src/mem/cache/prefetch/ghb.cc
index d7d819a2d3eb97cafe73a09744bbc4a35df05b4d..f5b88e1a687105bf98900e3761de72a91f337ef3 100644 (file)
--- a/src/mem/cache/prefetch/ghb.cc
+++ b/src/mem/cache/prefetch/ghb.cc
@@ -34,7 +34,7 @@
  * GHB Prefetcher implementation.
  */
 
-#include "mem/cache/prefetch/ghb_prefetcher.hh"
+#include "mem/cache/prefetch/ghb.hh"
 #include "arch/isa_traits.hh"
 
 void

diff --git a/src/mem/cache/prefetch/ghb.hh b/src/mem/cache/prefetch/ghb.hh
index c44e9c45692f14b2cb4a0f213316b4ce92b25790..4fb69201691adb1a32e06dd9302b7660412d43f7 100644 (file)
--- a/src/mem/cache/prefetch/ghb.hh
+++ b/src/mem/cache/prefetch/ghb.hh
@@ -36,7 +36,7 @@
 #ifndef __MEM_CACHE_PREFETCH_GHB_PREFETCHER_HH__
 #define __MEM_CACHE_PREFETCH_GHB_PREFETCHER_HH__
 
-#include "mem/cache/prefetch/base_prefetcher.hh"
+#include "mem/cache/prefetch/base.hh"
 
 class GHBPrefetcher : public BasePrefetcher
 {

diff --git a/src/mem/cache/prefetch/stride.cc b/src/mem/cache/prefetch/stride.cc
index 8d957182a0d99b6de1d7385229c6b9d1eaaa9988..b116b66c71b727192b6706f457d6d6a4973f3743 100644 (file)
--- a/src/mem/cache/prefetch/stride.cc
+++ b/src/mem/cache/prefetch/stride.cc
@@ -34,7 +34,7 @@
  * Stride Prefetcher template instantiations.
  */
 
-#include "mem/cache/prefetch/stride_prefetcher.hh"
+#include "mem/cache/prefetch/stride.hh"
 
 void
 StridePrefetcher::calculatePrefetch(PacketPtr &pkt, std::list<Addr> &addresses,

diff --git a/src/mem/cache/prefetch/stride.hh b/src/mem/cache/prefetch/stride.hh
index 4d5ac2f0dfa16e16d858374aae26a2dc79e61079..f6bdbc424fc4784700733dcc6041a229f01e8cfc 100644 (file)
--- a/src/mem/cache/prefetch/stride.hh
+++ b/src/mem/cache/prefetch/stride.hh
@@ -36,7 +36,7 @@
 #ifndef __MEM_CACHE_PREFETCH_STRIDE_PREFETCHER_HH__
 #define __MEM_CACHE_PREFETCH_STRIDE_PREFETCHER_HH__
 
-#include "mem/cache/prefetch/base_prefetcher.hh"
+#include "mem/cache/prefetch/base.hh"
 
 class StridePrefetcher : public BasePrefetcher
 {

diff --git a/src/mem/cache/prefetch/tagged.cc b/src/mem/cache/prefetch/tagged.cc
index b25cb50548a756273ab8d460531c9e57554b5282..6afe1c6c214784b132c57db607118a31edab980f 100644 (file)
--- a/src/mem/cache/prefetch/tagged.cc
+++ b/src/mem/cache/prefetch/tagged.cc
@@ -34,7 +34,7 @@
  */
 
 #include "arch/isa_traits.hh"
-#include "mem/cache/prefetch/tagged_prefetcher.hh"
+#include "mem/cache/prefetch/tagged.hh"
 
 TaggedPrefetcher::TaggedPrefetcher(const BaseCacheParams *p)
     : BasePrefetcher(p),

diff --git a/src/mem/cache/prefetch/tagged.hh b/src/mem/cache/prefetch/tagged.hh
index f3094445ff5255449b9cdfb5730f336ef9308f3f..78e20083d008b7887299c84ef97bac7829059ceb 100644 (file)
--- a/src/mem/cache/prefetch/tagged.hh
+++ b/src/mem/cache/prefetch/tagged.hh
@@ -36,7 +36,7 @@
 #ifndef __MEM_CACHE_PREFETCH_TAGGED_PREFETCHER_HH__
 #define __MEM_CACHE_PREFETCH_TAGGED_PREFETCHER_HH__
 
-#include "mem/cache/prefetch/base_prefetcher.hh"
+#include "mem/cache/prefetch/base.hh"
 
 class TaggedPrefetcher : public BasePrefetcher
 {

diff --git a/src/mem/cache/tags/base.cc b/src/mem/cache/tags/base.cc
index 1537373004367e7e18eeed316f7f0ef3bc59f39b..e18026a21d957399e63eb3798176857dee85079e 100644 (file)
--- a/src/mem/cache/tags/base.cc
+++ b/src/mem/cache/tags/base.cc
@@ -34,9 +34,9 @@
  * Definitions of BaseTags.
  */
 
-#include "mem/cache/tags/base_tags.hh"
+#include "mem/cache/tags/base.hh"
 
-#include "mem/cache/base_cache.hh"
+#include "mem/cache/base.hh"
 #include "cpu/smt.hh" //maxThreadsPerCPU
 #include "sim/sim_exit.hh"
 

diff --git a/src/mem/cache/tags/fa_lru.hh b/src/mem/cache/tags/fa_lru.hh
index 8cbc798130f22a35508b00626ad4146b041f0ad8..cabcf18b47c61b1a09543bf8dfa632bb297dac42 100644 (file)
--- a/src/mem/cache/tags/fa_lru.hh
+++ b/src/mem/cache/tags/fa_lru.hh
@@ -38,10 +38,10 @@
 
 #include <list>
 
-#include "mem/cache/cache_blk.hh"
+#include "mem/cache/blk.hh"
 #include "mem/packet.hh"
 #include "base/hashmap.hh"
-#include "mem/cache/tags/base_tags.hh"
+#include "mem/cache/tags/base.hh"
 
 /**
  * A fully associative cache block.

diff --git a/src/mem/cache/tags/iic.cc b/src/mem/cache/tags/iic.cc
index 20babe6bb305d60134fcf3f9dda37988a60c733a..2825599f6d04e71a7e4048d9516e5538dbcc9a30 100644 (file)
--- a/src/mem/cache/tags/iic.cc
+++ b/src/mem/cache/tags/iic.cc
@@ -39,7 +39,7 @@
 
 #include <math.h>
 
-#include "mem/cache/base_cache.hh"
+#include "mem/cache/base.hh"
 #include "mem/cache/tags/iic.hh"
 #include "base/intmath.hh"
 #include "sim/core.hh" // for curTick

diff --git a/src/mem/cache/tags/iic.hh b/src/mem/cache/tags/iic.hh
index 082b3d15eaae7241d9ab16c25bfd4011c443b834..c9d080683f0235a93bb8a37abe23ca475bd097f4 100644 (file)
--- a/src/mem/cache/tags/iic.hh
+++ b/src/mem/cache/tags/iic.hh
@@ -39,11 +39,11 @@
 #include <list>
 #include <vector>
 
-#include "mem/cache/cache_blk.hh"
-#include "mem/cache/tags/repl/repl.hh"
+#include "mem/cache/blk.hh"
+#include "mem/cache/tags/iic_repl/repl.hh"
 #include "mem/packet.hh"
 #include "base/statistics.hh"
-#include "mem/cache/tags/base_tags.hh"
+#include "mem/cache/tags/base.hh"
 
 class BaseCache; // Forward declaration
 

diff --git a/src/mem/cache/tags/iic_repl/gen.cc b/src/mem/cache/tags/iic_repl/gen.cc
index bc4e6b86aafbf8400d1ea8821176619096a7e194..487b227da1ada80ab914c4802c0bc8563c09b9a0 100644 (file)
--- a/src/mem/cache/tags/iic_repl/gen.cc
+++ b/src/mem/cache/tags/iic_repl/gen.cc
@@ -38,7 +38,7 @@
 
 #include "base/misc.hh"
 #include "mem/cache/tags/iic.hh"
-#include "mem/cache/tags/repl/gen.hh"
+#include "mem/cache/tags/iic_repl/gen.hh"
 #include "params/GenRepl.hh"
 #include "sim/host.hh"
 

diff --git a/src/mem/cache/tags/iic_repl/gen.hh b/src/mem/cache/tags/iic_repl/gen.hh
index 09a8d5995ea4cc133f60907a0058bf7e67e06e49..22436b384a51453b97c834136c8d4622d5749b16 100644 (file)
--- a/src/mem/cache/tags/iic_repl/gen.hh
+++ b/src/mem/cache/tags/iic_repl/gen.hh
@@ -39,7 +39,7 @@
 #include <list>
 
 #include "base/statistics.hh"
-#include "mem/cache/tags/repl/repl.hh"
+#include "mem/cache/tags/iic_repl/repl.hh"
 #include "params/GenRepl.hh"
 
 /**

diff --git a/src/mem/cache/tags/lru.cc b/src/mem/cache/tags/lru.cc
index 0a8587c2061647388d846c93e4150385683a78b2..7f352e9c41e5601bbdeefffd4c5f56bd0a9c3610 100644 (file)
--- a/src/mem/cache/tags/lru.cc
+++ b/src/mem/cache/tags/lru.cc
@@ -35,7 +35,7 @@
 
 #include <string>
 
-#include "mem/cache/base_cache.hh"
+#include "mem/cache/base.hh"
 #include "base/intmath.hh"
 #include "mem/cache/tags/lru.hh"
 #include "sim/core.hh"

diff --git a/src/mem/cache/tags/lru.hh b/src/mem/cache/tags/lru.hh
index 26038d709029ab2bdedf127840a323998211b259..ea5606cde23e2b77d8ea6e2e6407d6b265865764 100644 (file)
--- a/src/mem/cache/tags/lru.hh
+++ b/src/mem/cache/tags/lru.hh
@@ -39,10 +39,10 @@
 #include <cstring>
 #include <list>
 
-#include "mem/cache/cache_blk.hh" // base class
+#include "mem/cache/blk.hh" // base class
 #include "mem/packet.hh" // for inlined functions
 #include <assert.h>
-#include "mem/cache/tags/base_tags.hh"
+#include "mem/cache/tags/base.hh"
 
 class BaseCache;
 

diff --git a/src/mem/cache/tags/split.cc b/src/mem/cache/tags/split.cc
index ae284766d39781b76ec71d44b0fa9fcc6a216fe6..0df85cc92c4bed11f8665cc1df03bc51b92cc96a 100644 (file)
--- a/src/mem/cache/tags/split.cc
+++ b/src/mem/cache/tags/split.cc
@@ -41,7 +41,7 @@
 #include "base/intmath.hh"
 #include "base/output.hh"
 #include "base/trace.hh"
-#include "mem/cache/base_cache.hh"
+#include "mem/cache/base.hh"
 #include "mem/cache/tags/split.hh"
 #include "mem/cache/tags/split_lifo.hh"
 #include "mem/cache/tags/split_lru.hh"

diff --git a/src/mem/cache/tags/split.hh b/src/mem/cache/tags/split.hh
index ab48ce769ebb4fade4fae7d9ae99ef8ad5350d5c..e8954f7919455d14aadf1ce6ff3ea54b322912d7 100644 (file)
--- a/src/mem/cache/tags/split.hh
+++ b/src/mem/cache/tags/split.hh
@@ -39,11 +39,11 @@
 #include <cstring>
 #include <list>
 
-#include "mem/cache/cache_blk.hh" // base class
+#include "mem/cache/blk.hh" // base class
 #include "mem/cache/tags/split_blk.hh"
 #include "mem/packet.hh" // for inlined functions
 #include <assert.h>
-#include "mem/cache/tags/base_tags.hh"
+#include "mem/cache/tags/base.hh"
 #include "base/hashmap.hh"
 
 class BaseCache;

diff --git a/src/mem/cache/tags/split_blk.hh b/src/mem/cache/tags/split_blk.hh
index f38516180aefbc9d361e7396d3ac7473fae4a42e..d2efe08dfdc2e404add6aa563d6dd74891de961f 100644 (file)
--- a/src/mem/cache/tags/split_blk.hh
+++ b/src/mem/cache/tags/split_blk.hh
@@ -36,7 +36,7 @@
 #ifndef __SPLIT_BLK_HH__
 #define __SPLIT_BLK_HH__
 
-#include "mem/cache/cache_blk.hh" // base class
+#include "mem/cache/blk.hh" // base class
 
 /**
  * Split cache block.

diff --git a/src/mem/cache/tags/split_lifo.cc b/src/mem/cache/tags/split_lifo.cc
index 4ee2473a44be60af0a3c991ddd0a014cac164701..3bdc7cae93cf423e3fc8e2ab4fcc4631f16890ce 100644 (file)
--- a/src/mem/cache/tags/split_lifo.cc
+++ b/src/mem/cache/tags/split_lifo.cc
@@ -35,7 +35,7 @@
 
 #include <string>
 
-#include "mem/cache/base_cache.hh"
+#include "mem/cache/base.hh"
 #include "base/intmath.hh"
 #include "mem/cache/tags/split_lifo.hh"
 #include "sim/core.hh"

diff --git a/src/mem/cache/tags/split_lifo.hh b/src/mem/cache/tags/split_lifo.hh
index 13ccf7ef407dc34aa7084665e164070d221b661c..0fd5f5c3ce7c2ca3f64b6b1303770b0c95aa4879 100644 (file)
--- a/src/mem/cache/tags/split_lifo.hh
+++ b/src/mem/cache/tags/split_lifo.hh
@@ -39,12 +39,12 @@
 #include <cstring>
 #include <list>
 
-#include "mem/cache/cache_blk.hh" // base class
+#include "mem/cache/blk.hh" // base class
 #include "mem/cache/tags/split_blk.hh"
 #include "mem/packet.hh" // for inlined functions
 #include "base/hashmap.hh"
 #include <assert.h>
-#include "mem/cache/tags/base_tags.hh"
+#include "mem/cache/tags/base.hh"
 
 class BaseCache;
 

diff --git a/src/mem/cache/tags/split_lru.cc b/src/mem/cache/tags/split_lru.cc
index 4d271a92ad9b5db54d54cc36052057cdee0974ad..bcccdcb30d9f973d74957cac83e066b7ea45601f 100644 (file)
--- a/src/mem/cache/tags/split_lru.cc
+++ b/src/mem/cache/tags/split_lru.cc
@@ -35,7 +35,7 @@
 
 #include <string>
 
-#include "mem/cache/base_cache.hh"
+#include "mem/cache/base.hh"
 #include "base/intmath.hh"
 #include "mem/cache/tags/split_lru.hh"
 #include "sim/core.hh"

diff --git a/src/mem/cache/tags/split_lru.hh b/src/mem/cache/tags/split_lru.hh
index a708ef740ad8759d456a4bb4af650c2d4b7e2f1b..d41b6efa710a73521a84a96c429ff522e8aeed74 100644 (file)
--- a/src/mem/cache/tags/split_lru.hh
+++ b/src/mem/cache/tags/split_lru.hh
@@ -39,11 +39,11 @@
 #include <cstring>
 #include <list>
 
-#include "mem/cache/cache_blk.hh" // base class
+#include "mem/cache/blk.hh" // base class
 #include "mem/cache/tags/split_blk.hh"
 #include "mem/packet.hh" // for inlined functions
 #include <assert.h>
-#include "mem/cache/tags/base_tags.hh"
+#include "mem/cache/tags/base.hh"
 
 class BaseCache;