summaryrefslogtreecommitdiff
path: root/src/mem/cache/replacement_policies
diff options
context:
space:
mode:
authorNikos Nikoleris <nikos.nikoleris@arm.com>2018-05-03 12:14:41 +0100
committerNikos Nikoleris <nikos.nikoleris@arm.com>2018-05-31 17:45:23 +0000
commit56865ad1154c7c3fde2ae6b7329d0c888390f781 (patch)
tree61e8693763072515bc6364b1ea0020ff84603ffa /src/mem/cache/replacement_policies
parent51056cec69a72931a319e7be9370ea63f18e1aa3 (diff)
downloadgem5-56865ad1154c7c3fde2ae6b7329d0c888390f781.tar.xz
mem-cache: Fix include directives in the cache related classes
Change-Id: I111b0f662897c43974aadb08da1ed85c7542585c Reviewed-on: https://gem5-review.googlesource.com/10433 Reviewed-by: Daniel Carvalho <odanrc@yahoo.com.br> Reviewed-by: Jason Lowe-Power <jason@lowepower.com> Maintainer: Nikos Nikoleris <nikos.nikoleris@arm.com>
Diffstat (limited to 'src/mem/cache/replacement_policies')
-rw-r--r--src/mem/cache/replacement_policies/bip_rp.cc1
-rw-r--r--src/mem/cache/replacement_policies/bip_rp.hh3
-rw-r--r--src/mem/cache/replacement_policies/brrip_rp.cc2
-rw-r--r--src/mem/cache/replacement_policies/brrip_rp.hh3
-rw-r--r--src/mem/cache/replacement_policies/fifo_rp.cc3
-rw-r--r--src/mem/cache/replacement_policies/fifo_rp.hh4
-rw-r--r--src/mem/cache/replacement_policies/lfu_rp.cc3
-rw-r--r--src/mem/cache/replacement_policies/lfu_rp.hh3
-rw-r--r--src/mem/cache/replacement_policies/lru_rp.cc3
-rw-r--r--src/mem/cache/replacement_policies/lru_rp.hh3
-rw-r--r--src/mem/cache/replacement_policies/mru_rp.cc3
-rw-r--r--src/mem/cache/replacement_policies/mru_rp.hh4
-rw-r--r--src/mem/cache/replacement_policies/random_rp.cc5
-rw-r--r--src/mem/cache/replacement_policies/random_rp.hh3
-rw-r--r--src/mem/cache/replacement_policies/second_chance_rp.cc4
-rw-r--r--src/mem/cache/replacement_policies/second_chance_rp.hh4
16 files changed, 42 insertions, 9 deletions
diff --git a/src/mem/cache/replacement_policies/bip_rp.cc b/src/mem/cache/replacement_policies/bip_rp.cc
index 4a3a516f4..93143cacd 100644
--- a/src/mem/cache/replacement_policies/bip_rp.cc
+++ b/src/mem/cache/replacement_policies/bip_rp.cc
@@ -33,6 +33,7 @@
#include <memory>
#include "base/random.hh"
+#include "params/BIPRP.hh"
BIPRP::BIPRP(const Params *p)
: LRURP(p), btp(p->btp)
diff --git a/src/mem/cache/replacement_policies/bip_rp.hh b/src/mem/cache/replacement_policies/bip_rp.hh
index ac4db02e0..aa8df05f2 100644
--- a/src/mem/cache/replacement_policies/bip_rp.hh
+++ b/src/mem/cache/replacement_policies/bip_rp.hh
@@ -45,7 +45,8 @@
#define __MEM_CACHE_REPLACEMENT_POLICIES_BIP_RP_HH__
#include "mem/cache/replacement_policies/lru_rp.hh"
-#include "params/BIPRP.hh"
+
+struct BIPRPParams;
class BIPRP : public LRURP
{
diff --git a/src/mem/cache/replacement_policies/brrip_rp.cc b/src/mem/cache/replacement_policies/brrip_rp.cc
index 846b4fb9c..dc41d8b6b 100644
--- a/src/mem/cache/replacement_policies/brrip_rp.cc
+++ b/src/mem/cache/replacement_policies/brrip_rp.cc
@@ -30,10 +30,12 @@
#include "mem/cache/replacement_policies/brrip_rp.hh"
+#include <cassert>
#include <memory>
#include "base/logging.hh" // For fatal_if
#include "base/random.hh"
+#include "params/BRRIPRP.hh"
BRRIPRP::BRRIPRP(const Params *p)
: BaseReplacementPolicy(p),
diff --git a/src/mem/cache/replacement_policies/brrip_rp.hh b/src/mem/cache/replacement_policies/brrip_rp.hh
index e442d85ce..9374742c1 100644
--- a/src/mem/cache/replacement_policies/brrip_rp.hh
+++ b/src/mem/cache/replacement_policies/brrip_rp.hh
@@ -55,7 +55,8 @@
#define __MEM_CACHE_REPLACEMENT_POLICIES_BRRIP_RP_HH__
#include "mem/cache/replacement_policies/base.hh"
-#include "params/BRRIPRP.hh"
+
+struct BRRIPRPParams;
class BRRIPRP : public BaseReplacementPolicy
{
diff --git a/src/mem/cache/replacement_policies/fifo_rp.cc b/src/mem/cache/replacement_policies/fifo_rp.cc
index 731945a0a..7c5ce02fe 100644
--- a/src/mem/cache/replacement_policies/fifo_rp.cc
+++ b/src/mem/cache/replacement_policies/fifo_rp.cc
@@ -30,8 +30,11 @@
#include "mem/cache/replacement_policies/fifo_rp.hh"
+#include <cassert>
#include <memory>
+#include "params/FIFORP.hh"
+
FIFORP::FIFORP(const Params *p)
: BaseReplacementPolicy(p)
{
diff --git a/src/mem/cache/replacement_policies/fifo_rp.hh b/src/mem/cache/replacement_policies/fifo_rp.hh
index 34067d50f..77ff5d489 100644
--- a/src/mem/cache/replacement_policies/fifo_rp.hh
+++ b/src/mem/cache/replacement_policies/fifo_rp.hh
@@ -38,8 +38,10 @@
#ifndef __MEM_CACHE_REPLACEMENT_POLICIES_FIFO_RP_HH__
#define __MEM_CACHE_REPLACEMENT_POLICIES_FIFO_RP_HH__
+#include "base/types.hh"
#include "mem/cache/replacement_policies/base.hh"
-#include "params/FIFORP.hh"
+
+struct FIFORPParams;
class FIFORP : public BaseReplacementPolicy
{
diff --git a/src/mem/cache/replacement_policies/lfu_rp.cc b/src/mem/cache/replacement_policies/lfu_rp.cc
index ffa653e87..299c74d82 100644
--- a/src/mem/cache/replacement_policies/lfu_rp.cc
+++ b/src/mem/cache/replacement_policies/lfu_rp.cc
@@ -30,8 +30,11 @@
#include "mem/cache/replacement_policies/lfu_rp.hh"
+#include <cassert>
#include <memory>
+#include "params/LFURP.hh"
+
LFURP::LFURP(const Params *p)
: BaseReplacementPolicy(p)
{
diff --git a/src/mem/cache/replacement_policies/lfu_rp.hh b/src/mem/cache/replacement_policies/lfu_rp.hh
index 8709e35d4..0c184c4a5 100644
--- a/src/mem/cache/replacement_policies/lfu_rp.hh
+++ b/src/mem/cache/replacement_policies/lfu_rp.hh
@@ -40,7 +40,8 @@
#define __MEM_CACHE_REPLACEMENT_POLICIES_LFU_RP_HH__
#include "mem/cache/replacement_policies/base.hh"
-#include "params/LFURP.hh"
+
+struct LFURPParams;
class LFURP : public BaseReplacementPolicy
{
diff --git a/src/mem/cache/replacement_policies/lru_rp.cc b/src/mem/cache/replacement_policies/lru_rp.cc
index 99e35db19..9e7dcb525 100644
--- a/src/mem/cache/replacement_policies/lru_rp.cc
+++ b/src/mem/cache/replacement_policies/lru_rp.cc
@@ -30,8 +30,11 @@
#include "mem/cache/replacement_policies/lru_rp.hh"
+#include <cassert>
#include <memory>
+#include "params/LRURP.hh"
+
LRURP::LRURP(const Params *p)
: BaseReplacementPolicy(p)
{
diff --git a/src/mem/cache/replacement_policies/lru_rp.hh b/src/mem/cache/replacement_policies/lru_rp.hh
index e8e708f1c..1b8a396b6 100644
--- a/src/mem/cache/replacement_policies/lru_rp.hh
+++ b/src/mem/cache/replacement_policies/lru_rp.hh
@@ -39,7 +39,8 @@
#define __MEM_CACHE_REPLACEMENT_POLICIES_LRU_RP_HH__
#include "mem/cache/replacement_policies/base.hh"
-#include "params/LRURP.hh"
+
+struct LRURPParams;
class LRURP : public BaseReplacementPolicy
{
diff --git a/src/mem/cache/replacement_policies/mru_rp.cc b/src/mem/cache/replacement_policies/mru_rp.cc
index ff84fc368..b2e019f9a 100644
--- a/src/mem/cache/replacement_policies/mru_rp.cc
+++ b/src/mem/cache/replacement_policies/mru_rp.cc
@@ -30,8 +30,11 @@
#include "mem/cache/replacement_policies/mru_rp.hh"
+#include <cassert>
#include <memory>
+#include "params/MRURP.hh"
+
MRURP::MRURP(const Params *p)
: BaseReplacementPolicy(p)
{
diff --git a/src/mem/cache/replacement_policies/mru_rp.hh b/src/mem/cache/replacement_policies/mru_rp.hh
index 11cc272a4..a95da04a2 100644
--- a/src/mem/cache/replacement_policies/mru_rp.hh
+++ b/src/mem/cache/replacement_policies/mru_rp.hh
@@ -38,8 +38,10 @@
#ifndef __MEM_CACHE_REPLACEMENT_POLICIES_MRU_RP_HH__
#define __MEM_CACHE_REPLACEMENT_POLICIES_MRU_RP_HH__
+#include "base/types.hh"
#include "mem/cache/replacement_policies/base.hh"
-#include "params/MRURP.hh"
+
+struct MRURPParams;
class MRURP : public BaseReplacementPolicy
{
diff --git a/src/mem/cache/replacement_policies/random_rp.cc b/src/mem/cache/replacement_policies/random_rp.cc
index 6a0f353b7..c34d7ac33 100644
--- a/src/mem/cache/replacement_policies/random_rp.cc
+++ b/src/mem/cache/replacement_policies/random_rp.cc
@@ -30,8 +30,11 @@
#include "mem/cache/replacement_policies/random_rp.hh"
+#include <cassert>
+#include <memory>
+
#include "base/random.hh"
-#include "mem/cache/blk.hh"
+#include "params/RandomRP.hh"
RandomRP::RandomRP(const Params *p)
: BaseReplacementPolicy(p)
diff --git a/src/mem/cache/replacement_policies/random_rp.hh b/src/mem/cache/replacement_policies/random_rp.hh
index 5514961b6..bbceaab56 100644
--- a/src/mem/cache/replacement_policies/random_rp.hh
+++ b/src/mem/cache/replacement_policies/random_rp.hh
@@ -38,7 +38,8 @@
#define __MEM_CACHE_REPLACEMENT_POLICIES_RANDOM_RP_HH__
#include "mem/cache/replacement_policies/base.hh"
-#include "params/RandomRP.hh"
+
+struct RandomRPParams;
class RandomRP : public BaseReplacementPolicy
{
diff --git a/src/mem/cache/replacement_policies/second_chance_rp.cc b/src/mem/cache/replacement_policies/second_chance_rp.cc
index 2560a9846..64e667fe6 100644
--- a/src/mem/cache/replacement_policies/second_chance_rp.cc
+++ b/src/mem/cache/replacement_policies/second_chance_rp.cc
@@ -30,6 +30,10 @@
#include "mem/cache/replacement_policies/second_chance_rp.hh"
+#include <cassert>
+
+#include "params/SecondChanceRP.hh"
+
SecondChanceRP::SecondChanceRP(const Params *p)
: FIFORP(p)
{
diff --git a/src/mem/cache/replacement_policies/second_chance_rp.hh b/src/mem/cache/replacement_policies/second_chance_rp.hh
index 5522d5e7f..84970e4a8 100644
--- a/src/mem/cache/replacement_policies/second_chance_rp.hh
+++ b/src/mem/cache/replacement_policies/second_chance_rp.hh
@@ -40,8 +40,10 @@
#ifndef __MEM_CACHE_REPLACEMENT_POLICIES_SECOND_CHANCE_RP_HH__
#define __MEM_CACHE_REPLACEMENT_POLICIES_SECOND_CHANCE_RP_HH__
+#include "mem/cache/replacement_policies/base.hh"
#include "mem/cache/replacement_policies/fifo_rp.hh"
-#include "params/SecondChanceRP.hh"
+
+struct SecondChanceRPParams;
class SecondChanceRP : public FIFORP
{