diff options
33 files changed, 49 insertions, 52 deletions
diff --git a/src/cpu/memtest/memtest.cc b/src/cpu/memtest/memtest.cc index 819b95e70..42889163a 100644 --- 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 9cd56fdb4..fa83e2531 100644 --- 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 9fa9e2d29..ac0d54bf6 100644 --- 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 604474524..d97021024 100644 --- 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 d4a2eaee8..4952ed758 100644 --- 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 d67a9c9a4..db900c64c 100644 --- 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 170ba0cd1..073ce5ecb 100644 --- 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 7a06f9fc7..6e4b50ed9 100644 --- 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 d711ca537..6537f6343 100644 --- 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 71da7e4c1..45331c33d 100644 --- 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 e04745087..f481ca471 100644 --- 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 1af900849..fcc02ff28 100644 --- 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 d7d819a2d..f5b88e1a6 100644 --- 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 c44e9c456..4fb692016 100644 --- 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 8d957182a..b116b66c7 100644 --- 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 4d5ac2f0d..f6bdbc424 100644 --- 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 b25cb5054..6afe1c6c2 100644 --- 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 f3094445f..78e20083d 100644 --- 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 153737300..e18026a21 100644 --- 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 8cbc79813..cabcf18b4 100644 --- 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 20babe6bb..2825599f6 100644 --- 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 082b3d15e..c9d080683 100644 --- 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 bc4e6b86a..487b227da 100644 --- 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 09a8d5995..22436b384 100644 --- 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 0a8587c20..7f352e9c4 100644 --- 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 26038d709..ea5606cde 100644 --- 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 ae284766d..0df85cc92 100644 --- 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 ab48ce769..e8954f791 100644 --- 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 f38516180..d2efe08df 100644 --- 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 4ee2473a4..3bdc7cae9 100644 --- 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 13ccf7ef4..0fd5f5c3c 100644 --- 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 4d271a92a..bcccdcb30 100644 --- 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 a708ef740..d41b6efa7 100644 --- 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; |