Daniel Carvalho has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/45405 )
Change subject: mem: Rename ReplacementPolicy namespace as
replacement_policy
......................................................................
mem: Rename ReplacementPolicy namespace as replacement_policy
As part of recent decisions regarding namespace
naming conventions, all namespaces will be changed
to snake case.
::ReplacementPolicy became ::replacement_policy.
Change-Id: Id46cd9d89e9424fd3c5484e2f9c69ef2b73f135b
Signed-off-by: Daniel R. Carvalho <oda...@yahoo.com.br>
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/45405
Tested-by: kokoro <noreply+kok...@google.com>
Maintainer: Bobby R. Bruce <bbr...@ucdavis.edu>
Reviewed-by: Hoa Nguyen <hoangu...@ucdavis.edu>
---
M src/mem/cache/prefetch/associative_set.hh
M src/mem/cache/prefetch/associative_set_impl.hh
M src/mem/cache/prefetch/stride.hh
M src/mem/cache/replacement_policies/ReplacementPolicies.py
M src/mem/cache/replacement_policies/base.hh
M src/mem/cache/replacement_policies/bip_rp.cc
M src/mem/cache/replacement_policies/bip_rp.hh
M src/mem/cache/replacement_policies/brrip_rp.cc
M src/mem/cache/replacement_policies/brrip_rp.hh
M src/mem/cache/replacement_policies/fifo_rp.cc
M src/mem/cache/replacement_policies/fifo_rp.hh
M src/mem/cache/replacement_policies/lfu_rp.cc
M src/mem/cache/replacement_policies/lfu_rp.hh
M src/mem/cache/replacement_policies/lru_rp.cc
M src/mem/cache/replacement_policies/lru_rp.hh
M src/mem/cache/replacement_policies/mru_rp.cc
M src/mem/cache/replacement_policies/mru_rp.hh
M src/mem/cache/replacement_policies/random_rp.cc
M src/mem/cache/replacement_policies/random_rp.hh
M src/mem/cache/replacement_policies/replaceable_entry.hh
M src/mem/cache/replacement_policies/second_chance_rp.cc
M src/mem/cache/replacement_policies/second_chance_rp.hh
M src/mem/cache/replacement_policies/tree_plru_rp.cc
M src/mem/cache/replacement_policies/tree_plru_rp.hh
M src/mem/cache/replacement_policies/weighted_lru_rp.cc
M src/mem/cache/replacement_policies/weighted_lru_rp.hh
M src/mem/cache/tags/base_set_assoc.hh
M src/mem/cache/tags/sector_tags.hh
M src/mem/ruby/structures/CacheMemory.cc
M src/mem/ruby/structures/CacheMemory.hh
30 files changed, 120 insertions(+), 71 deletions(-)
Approvals:
Hoa Nguyen: Looks good to me, approved
Bobby R. Bruce: Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/mem/cache/prefetch/associative_set.hh
b/src/mem/cache/prefetch/associative_set.hh
index 61fd1f6..d349dc0 100644
--- a/src/mem/cache/prefetch/associative_set.hh
+++ b/src/mem/cache/prefetch/associative_set.hh
@@ -55,7 +55,7 @@
/** Pointer to the indexing policy */
BaseIndexingPolicy* const indexingPolicy;
/** Pointer to the replacement policy */
- ReplacementPolicy::Base* const replacementPolicy;
+ replacement_policy::Base* const replacementPolicy;
/** Vector containing the entries of the container */
std::vector<Entry> entries;
@@ -70,7 +70,7 @@
* @param init_val initial value of the elements of the set
*/
AssociativeSet(int assoc, int num_entries, BaseIndexingPolicy
*idx_policy,
- ReplacementPolicy::Base *rpl_policy, Entry const &init_val =
Entry());
+ replacement_policy::Base *rpl_policy, Entry const &init_val =
Entry());
/**
* Find an entry within the set
diff --git a/src/mem/cache/prefetch/associative_set_impl.hh
b/src/mem/cache/prefetch/associative_set_impl.hh
index 4b16dbb..6118009 100644
--- a/src/mem/cache/prefetch/associative_set_impl.hh
+++ b/src/mem/cache/prefetch/associative_set_impl.hh
@@ -34,7 +34,7 @@
template<class Entry>
AssociativeSet<Entry>::AssociativeSet(int assoc, int num_entries,
- BaseIndexingPolicy *idx_policy, ReplacementPolicy::Base
*rpl_policy,
+ BaseIndexingPolicy *idx_policy, replacement_policy::Base
*rpl_policy,
Entry const &init_value)
: associativity(assoc), numEntries(num_entries),
indexingPolicy(idx_policy),
replacementPolicy(rpl_policy), entries(numEntries, init_value)
diff --git a/src/mem/cache/prefetch/stride.hh
b/src/mem/cache/prefetch/stride.hh
index 36fc194..077a035 100644
--- a/src/mem/cache/prefetch/stride.hh
+++ b/src/mem/cache/prefetch/stride.hh
@@ -61,7 +61,9 @@
#include "params/StridePrefetcherHashedSetAssociative.hh"
class BaseIndexingPolicy;
-namespace ReplacementPolicy {
+GEM5_DEPRECATED_NAMESPACE(ReplacementPolicy, replacement_policy);
+namespace replacement_policy
+{
class Base;
}
struct StridePrefetcherParams;
@@ -109,14 +111,13 @@
const int numEntries;
BaseIndexingPolicy* const indexingPolicy;
- ReplacementPolicy::Base* const replacementPolicy;
+ replacement_policy::Base* const replacementPolicy;
PCTableInfo(int assoc, int num_entries,
BaseIndexingPolicy* indexing_policy,
- ReplacementPolicy::Base* replacement_policy)
+ replacement_policy::Base* repl_policy)
: assoc(assoc), numEntries(num_entries),
- indexingPolicy(indexing_policy),
- replacementPolicy(replacement_policy)
+ indexingPolicy(indexing_policy), replacementPolicy(repl_policy)
{
}
} pcTableInfo;
diff --git a/src/mem/cache/replacement_policies/ReplacementPolicies.py
b/src/mem/cache/replacement_policies/ReplacementPolicies.py
index 06a4909..8b308b4 100644
--- a/src/mem/cache/replacement_policies/ReplacementPolicies.py
+++ b/src/mem/cache/replacement_policies/ReplacementPolicies.py
@@ -31,32 +31,32 @@
class BaseReplacementPolicy(SimObject):
type = 'BaseReplacementPolicy'
abstract = True
- cxx_class = 'ReplacementPolicy::Base'
+ cxx_class = 'replacement_policy::Base'
cxx_header = "mem/cache/replacement_policies/base.hh"
class FIFORP(BaseReplacementPolicy):
type = 'FIFORP'
- cxx_class = 'ReplacementPolicy::FIFO'
+ cxx_class = 'replacement_policy::FIFO'
cxx_header = "mem/cache/replacement_policies/fifo_rp.hh"
class SecondChanceRP(FIFORP):
type = 'SecondChanceRP'
- cxx_class = 'ReplacementPolicy::SecondChance'
+ cxx_class = 'replacement_policy::SecondChance'
cxx_header = "mem/cache/replacement_policies/second_chance_rp.hh"
class LFURP(BaseReplacementPolicy):
type = 'LFURP'
- cxx_class = 'ReplacementPolicy::LFU'
+ cxx_class = 'replacement_policy::LFU'
cxx_header = "mem/cache/replacement_policies/lfu_rp.hh"
class LRURP(BaseReplacementPolicy):
type = 'LRURP'
- cxx_class = 'ReplacementPolicy::LRU'
+ cxx_class = 'replacement_policy::LRU'
cxx_header = "mem/cache/replacement_policies/lru_rp.hh"
class BIPRP(LRURP):
type = 'BIPRP'
- cxx_class = 'ReplacementPolicy::BIP'
+ cxx_class = 'replacement_policy::BIP'
cxx_header = "mem/cache/replacement_policies/bip_rp.hh"
btp = Param.Percent(3, "Percentage of blocks to be inserted as MRU")
@@ -65,17 +65,17 @@
class MRURP(BaseReplacementPolicy):
type = 'MRURP'
- cxx_class = 'ReplacementPolicy::MRU'
+ cxx_class = 'replacement_policy::MRU'
cxx_header = "mem/cache/replacement_policies/mru_rp.hh"
class RandomRP(BaseReplacementPolicy):
type = 'RandomRP'
- cxx_class = 'ReplacementPolicy::Random'
+ cxx_class = 'replacement_policy::Random'
cxx_header = "mem/cache/replacement_policies/random_rp.hh"
class BRRIPRP(BaseReplacementPolicy):
type = 'BRRIPRP'
- cxx_class = 'ReplacementPolicy::BRRIP'
+ cxx_class = 'replacement_policy::BRRIP'
cxx_header = "mem/cache/replacement_policies/brrip_rp.hh"
num_bits = Param.Int(2, "Number of bits per RRPV")
hit_priority = Param.Bool(False,
@@ -92,11 +92,11 @@
class TreePLRURP(BaseReplacementPolicy):
type = 'TreePLRURP'
- cxx_class = 'ReplacementPolicy::TreePLRU'
+ cxx_class = 'replacement_policy::TreePLRU'
cxx_header = "mem/cache/replacement_policies/tree_plru_rp.hh"
num_leaves = Param.Int(Parent.assoc, "Number of leaves in each tree")
class WeightedLRURP(BaseReplacementPolicy):
type = "WeightedLRURP"
- cxx_class = "ReplacementPolicy::WeightedLRU"
+ cxx_class = "replacement_policy::WeightedLRU"
cxx_header = "mem/cache/replacement_policies/weighted_lru_rp.hh"
diff --git a/src/mem/cache/replacement_policies/base.hh
b/src/mem/cache/replacement_policies/base.hh
index 147885d..1d6b221 100644
--- a/src/mem/cache/replacement_policies/base.hh
+++ b/src/mem/cache/replacement_policies/base.hh
@@ -31,6 +31,7 @@
#include <memory>
+#include "base/compiler.hh"
#include "mem/cache/replacement_policies/replaceable_entry.hh"
#include "params/BaseReplacementPolicy.hh"
#include "sim/sim_object.hh"
@@ -40,7 +41,9 @@
*/
typedef std::vector<ReplaceableEntry*> ReplacementCandidates;
-namespace ReplacementPolicy {
+GEM5_DEPRECATED_NAMESPACE(ReplacementPolicy, replacement_policy);
+namespace replacement_policy
+{
/**
* A common base class of cache replacement policy objects.
@@ -93,6 +96,6 @@
virtual std::shared_ptr<ReplacementData> instantiateEntry() = 0;
};
-} // namespace ReplacementPolicy
+} // namespace replacement_policy
#endif // __MEM_CACHE_REPLACEMENT_POLICIES_BASE_HH__
diff --git a/src/mem/cache/replacement_policies/bip_rp.cc
b/src/mem/cache/replacement_policies/bip_rp.cc
index d45105d..b2e6299 100644
--- a/src/mem/cache/replacement_policies/bip_rp.cc
+++ b/src/mem/cache/replacement_policies/bip_rp.cc
@@ -34,7 +34,9 @@
#include "params/BIPRP.hh"
#include "sim/core.hh"
-namespace ReplacementPolicy {
+GEM5_DEPRECATED_NAMESPACE(ReplacementPolicy, replacement_policy);
+namespace replacement_policy
+{
BIP::BIP(const Params &p)
: LRU(p), btp(p.btp)
@@ -56,4 +58,4 @@
}
}
-} // namespace ReplacementPolicy
+} // namespace replacement_policy
diff --git a/src/mem/cache/replacement_policies/bip_rp.hh
b/src/mem/cache/replacement_policies/bip_rp.hh
index 0d9f97a..e3648ce 100644
--- a/src/mem/cache/replacement_policies/bip_rp.hh
+++ b/src/mem/cache/replacement_policies/bip_rp.hh
@@ -46,7 +46,9 @@
struct BIPRPParams;
-namespace ReplacementPolicy {
+GEM5_DEPRECATED_NAMESPACE(ReplacementPolicy, replacement_policy);
+namespace replacement_policy
+{
class BIP : public LRU
{
@@ -73,6 +75,6 @@
override;
};
-} // namespace ReplacementPolicy
+} // namespace replacement_policy
#endif // __MEM_CACHE_REPLACEMENT_POLICIES_BIP_RP_HH__
diff --git a/src/mem/cache/replacement_policies/brrip_rp.cc
b/src/mem/cache/replacement_policies/brrip_rp.cc
index 76300e0..2e62510 100644
--- a/src/mem/cache/replacement_policies/brrip_rp.cc
+++ b/src/mem/cache/replacement_policies/brrip_rp.cc
@@ -35,7 +35,9 @@
#include "base/random.hh"
#include "params/BRRIPRP.hh"
-namespace ReplacementPolicy {
+GEM5_DEPRECATED_NAMESPACE(ReplacementPolicy, replacement_policy);
+namespace replacement_policy
+{
BRRIP::BRRIP(const Params &p)
: Base(p), numRRPVBits(p.num_bits), hitPriority(p.hit_priority),
@@ -144,4 +146,4 @@
return std::shared_ptr<ReplacementData>(new
BRRIPReplData(numRRPVBits));
}
-} // namespace ReplacementPolicy
+} // namespace replacement_policy
diff --git a/src/mem/cache/replacement_policies/brrip_rp.hh
b/src/mem/cache/replacement_policies/brrip_rp.hh
index 4ed8ca5..e3371bf 100644
--- a/src/mem/cache/replacement_policies/brrip_rp.hh
+++ b/src/mem/cache/replacement_policies/brrip_rp.hh
@@ -57,7 +57,9 @@
struct BRRIPRPParams;
-namespace ReplacementPolicy {
+GEM5_DEPRECATED_NAMESPACE(ReplacementPolicy, replacement_policy);
+namespace replacement_policy
+{
class BRRIP : public Base
{
@@ -155,6 +157,6 @@
std::shared_ptr<ReplacementData> instantiateEntry() override;
};
-} // namespace ReplacementPolicy
+} // namespace replacement_policy
#endif // __MEM_CACHE_REPLACEMENT_POLICIES_BRRIP_RP_HH__
diff --git a/src/mem/cache/replacement_policies/fifo_rp.cc
b/src/mem/cache/replacement_policies/fifo_rp.cc
index 496d86a..0bb42d0 100644
--- a/src/mem/cache/replacement_policies/fifo_rp.cc
+++ b/src/mem/cache/replacement_policies/fifo_rp.cc
@@ -34,7 +34,9 @@
#include "params/FIFORP.hh"
#include "sim/core.hh"
-namespace ReplacementPolicy {
+GEM5_DEPRECATED_NAMESPACE(ReplacementPolicy, replacement_policy);
+namespace replacement_policy
+{
FIFO::FIFO(const Params &p)
: Base(p)
@@ -91,4 +93,4 @@
return std::shared_ptr<ReplacementData>(new FIFOReplData());
}
-} // namespace ReplacementPolicy
+} // namespace replacement_policy
diff --git a/src/mem/cache/replacement_policies/fifo_rp.hh
b/src/mem/cache/replacement_policies/fifo_rp.hh
index ae9f317..a8c7d41 100644
--- a/src/mem/cache/replacement_policies/fifo_rp.hh
+++ b/src/mem/cache/replacement_policies/fifo_rp.hh
@@ -41,7 +41,9 @@
struct FIFORPParams;
-namespace ReplacementPolicy {
+GEM5_DEPRECATED_NAMESPACE(ReplacementPolicy, replacement_policy);
+namespace replacement_policy
+{
class FIFO : public Base
{
@@ -107,6 +109,6 @@
std::shared_ptr<ReplacementData> instantiateEntry() override;
};
-} // namespace ReplacementPolicy
+} // namespace replacement_policy
#endif // __MEM_CACHE_REPLACEMENT_POLICIES_FIFO_RP_HH__
diff --git a/src/mem/cache/replacement_policies/lfu_rp.cc
b/src/mem/cache/replacement_policies/lfu_rp.cc
index a3cd961..b5be8c7 100644
--- a/src/mem/cache/replacement_policies/lfu_rp.cc
+++ b/src/mem/cache/replacement_policies/lfu_rp.cc
@@ -33,7 +33,9 @@
#include "params/LFURP.hh"
-namespace ReplacementPolicy {
+GEM5_DEPRECATED_NAMESPACE(ReplacementPolicy, replacement_policy);
+namespace replacement_policy
+{
LFU::LFU(const Params &p)
: Base(p)
@@ -89,4 +91,4 @@
return std::shared_ptr<ReplacementData>(new LFUReplData());
}
-} // namespace ReplacementPolicy
+} // namespace replacement_policy
diff --git a/src/mem/cache/replacement_policies/lfu_rp.hh
b/src/mem/cache/replacement_policies/lfu_rp.hh
index 4f233a4..92d5964 100644
--- a/src/mem/cache/replacement_policies/lfu_rp.hh
+++ b/src/mem/cache/replacement_policies/lfu_rp.hh
@@ -41,7 +41,9 @@
struct LFURPParams;
-namespace ReplacementPolicy {
+GEM5_DEPRECATED_NAMESPACE(ReplacementPolicy, replacement_policy);
+namespace replacement_policy
+{
class LFU : public Base
{
@@ -107,6 +109,6 @@
std::shared_ptr<ReplacementData> instantiateEntry() override;
};
-} // namespace ReplacementPolicy
+} // namespace replacement_policy
#endif // __MEM_CACHE_REPLACEMENT_POLICIES_LFU_RP_HH__
diff --git a/src/mem/cache/replacement_policies/lru_rp.cc
b/src/mem/cache/replacement_policies/lru_rp.cc
index fd89703..473505c 100644
--- a/src/mem/cache/replacement_policies/lru_rp.cc
+++ b/src/mem/cache/replacement_policies/lru_rp.cc
@@ -34,7 +34,9 @@
#include "params/LRURP.hh"
#include "sim/core.hh"
-namespace ReplacementPolicy {
+GEM5_DEPRECATED_NAMESPACE(ReplacementPolicy, replacement_policy);
+namespace replacement_policy
+{
LRU::LRU(const Params &p)
: Base(p)
@@ -93,4 +95,4 @@
return std::shared_ptr<ReplacementData>(new LRUReplData());
}
-} // namespace ReplacementPolicy
+} // namespace replacement_policy
diff --git a/src/mem/cache/replacement_policies/lru_rp.hh
b/src/mem/cache/replacement_policies/lru_rp.hh
index 033816f..d536045 100644
--- a/src/mem/cache/replacement_policies/lru_rp.hh
+++ b/src/mem/cache/replacement_policies/lru_rp.hh
@@ -39,7 +39,9 @@
struct LRURPParams;
-namespace ReplacementPolicy {
+GEM5_DEPRECATED_NAMESPACE(ReplacementPolicy, replacement_policy);
+namespace replacement_policy
+{
class LRU : public Base
{
@@ -105,6 +107,6 @@
std::shared_ptr<ReplacementData> instantiateEntry() override;
};
-} // namespace ReplacementPolicy
+} // namespace replacement_policy
#endif // __MEM_CACHE_REPLACEMENT_POLICIES_LRU_RP_HH__
diff --git a/src/mem/cache/replacement_policies/mru_rp.cc
b/src/mem/cache/replacement_policies/mru_rp.cc
index cc2016b..d2016fb 100644
--- a/src/mem/cache/replacement_policies/mru_rp.cc
+++ b/src/mem/cache/replacement_policies/mru_rp.cc
@@ -34,7 +34,9 @@
#include "params/MRURP.hh"
#include "sim/core.hh"
-namespace ReplacementPolicy {
+GEM5_DEPRECATED_NAMESPACE(ReplacementPolicy, replacement_policy);
+namespace replacement_policy
+{
MRU::MRU(const Params &p)
: Base(p)
@@ -98,4 +100,4 @@
return std::shared_ptr<ReplacementData>(new MRUReplData());
}
-} // namespace ReplacementPolicy
+} // namespace replacement_policy
diff --git a/src/mem/cache/replacement_policies/mru_rp.hh
b/src/mem/cache/replacement_policies/mru_rp.hh
index d5ef19b..a92ac89 100644
--- a/src/mem/cache/replacement_policies/mru_rp.hh
+++ b/src/mem/cache/replacement_policies/mru_rp.hh
@@ -41,7 +41,9 @@
struct MRURPParams;
-namespace ReplacementPolicy {
+GEM5_DEPRECATED_NAMESPACE(ReplacementPolicy, replacement_policy);
+namespace replacement_policy
+{
class MRU : public Base
{
@@ -107,6 +109,6 @@
std::shared_ptr<ReplacementData> instantiateEntry() override;
};
-} // namespace ReplacementPolicy
+} // namespace replacement_policy
#endif // __MEM_CACHE_REPLACEMENT_POLICIES_MRU_RP_HH__
diff --git a/src/mem/cache/replacement_policies/random_rp.cc
b/src/mem/cache/replacement_policies/random_rp.cc
index 8f81c1c..f0eac2c 100644
--- a/src/mem/cache/replacement_policies/random_rp.cc
+++ b/src/mem/cache/replacement_policies/random_rp.cc
@@ -34,7 +34,9 @@
#include "base/random.hh"
#include "params/RandomRP.hh"
-namespace ReplacementPolicy {
+GEM5_DEPRECATED_NAMESPACE(ReplacementPolicy, replacement_policy);
+namespace replacement_policy
+{
Random::Random(const Params &p)
: Base(p)
@@ -92,4 +94,4 @@
return std::shared_ptr<ReplacementData>(new RandomReplData());
}
-} // namespace ReplacementPolicy
+} // namespace replacement_policy
diff --git a/src/mem/cache/replacement_policies/random_rp.hh
b/src/mem/cache/replacement_policies/random_rp.hh
index a8896e3..46e1014 100644
--- a/src/mem/cache/replacement_policies/random_rp.hh
+++ b/src/mem/cache/replacement_policies/random_rp.hh
@@ -39,7 +39,9 @@
struct RandomRPParams;
-namespace ReplacementPolicy {
+GEM5_DEPRECATED_NAMESPACE(ReplacementPolicy, replacement_policy);
+namespace replacement_policy
+{
class Random : public Base
{
@@ -108,6 +110,6 @@
std::shared_ptr<ReplacementData> instantiateEntry() override;
};
-} // namespace ReplacementPolicy
+} // namespace replacement_policy
#endif // __MEM_CACHE_REPLACEMENT_POLICIES_RANDOM_RP_HH__
diff --git a/src/mem/cache/replacement_policies/replaceable_entry.hh
b/src/mem/cache/replacement_policies/replaceable_entry.hh
index 85de6d1..27655af 100644
--- a/src/mem/cache/replacement_policies/replaceable_entry.hh
+++ b/src/mem/cache/replacement_policies/replaceable_entry.hh
@@ -32,9 +32,12 @@
#include <cstdint>
#include <memory>
+#include "base/compiler.hh"
#include "base/cprintf.hh"
-namespace ReplacementPolicy {
+GEM5_DEPRECATED_NAMESPACE(ReplacementPolicy, replacement_policy);
+namespace replacement_policy
+{
/**
* The replacement data needed by replacement policies. Each replacement
policy
@@ -42,7 +45,7 @@
*/
struct ReplacementData {};
-} // namespace ReplacementPolicy
+} // namespace replacement_policy
/**
* A replaceable entry is a basic entry in a 2d table-like structure that
needs
@@ -75,7 +78,7 @@
* Replacement data associated to this entry.
* It must be instantiated by the replacement policy before being used.
*/
- std::shared_ptr<ReplacementPolicy::ReplacementData> replacementData;
+ std::shared_ptr<replacement_policy::ReplacementData> replacementData;
/**
* Set both the set and way. Should be called only once.
diff --git a/src/mem/cache/replacement_policies/second_chance_rp.cc
b/src/mem/cache/replacement_policies/second_chance_rp.cc
index 0f8c392..c07a600 100644
--- a/src/mem/cache/replacement_policies/second_chance_rp.cc
+++ b/src/mem/cache/replacement_policies/second_chance_rp.cc
@@ -32,7 +32,9 @@
#include "params/SecondChanceRP.hh"
-namespace ReplacementPolicy {
+GEM5_DEPRECATED_NAMESPACE(ReplacementPolicy, replacement_policy);
+namespace replacement_policy
+{
SecondChance::SecondChance(const Params &p)
: FIFO(p)
@@ -133,4 +135,4 @@
return std::shared_ptr<ReplacementData>(new SecondChanceReplData());
}
-} // namespace ReplacementPolicy
+} // namespace replacement_policy
diff --git a/src/mem/cache/replacement_policies/second_chance_rp.hh
b/src/mem/cache/replacement_policies/second_chance_rp.hh
index 29a3ed5..ba8085e 100644
--- a/src/mem/cache/replacement_policies/second_chance_rp.hh
+++ b/src/mem/cache/replacement_policies/second_chance_rp.hh
@@ -43,7 +43,9 @@
struct SecondChanceRPParams;
-namespace ReplacementPolicy {
+GEM5_DEPRECATED_NAMESPACE(ReplacementPolicy, replacement_policy);
+namespace replacement_policy
+{
class SecondChance : public FIFO
{
@@ -123,6 +125,6 @@
std::shared_ptr<ReplacementData> instantiateEntry() override;
};
-} // namespace ReplacementPolicy
+} // namespace replacement_policy
#endif // __MEM_CACHE_REPLACEMENT_POLICIES_SECOND_CHANCE_RP_HH__
diff --git a/src/mem/cache/replacement_policies/tree_plru_rp.cc
b/src/mem/cache/replacement_policies/tree_plru_rp.cc
index 9f50261..834d443 100644
--- a/src/mem/cache/replacement_policies/tree_plru_rp.cc
+++ b/src/mem/cache/replacement_policies/tree_plru_rp.cc
@@ -40,7 +40,9 @@
#include "base/logging.hh"
#include "params/TreePLRURP.hh"
-namespace ReplacementPolicy {
+GEM5_DEPRECATED_NAMESPACE(ReplacementPolicy, replacement_policy);
+namespace replacement_policy
+{
/**
* Get the index of the parent of the given indexed subtree.
@@ -211,4 +213,4 @@
return std::shared_ptr<ReplacementData>(treePLRUReplData);
}
-} // namespace ReplacementPolicy
+} // namespace replacement_policy
diff --git a/src/mem/cache/replacement_policies/tree_plru_rp.hh
b/src/mem/cache/replacement_policies/tree_plru_rp.hh
index 3724392..e1004a2 100644
--- a/src/mem/cache/replacement_policies/tree_plru_rp.hh
+++ b/src/mem/cache/replacement_policies/tree_plru_rp.hh
@@ -77,7 +77,9 @@
struct TreePLRURPParams;
-namespace ReplacementPolicy {
+GEM5_DEPRECATED_NAMESPACE(ReplacementPolicy, replacement_policy);
+namespace replacement_policy
+{
class TreePLRU : public Base
{
@@ -205,6 +207,6 @@
std::shared_ptr<ReplacementData> instantiateEntry() override;
};
-} // namespace ReplacementPolicy
+} // namespace replacement_policy
#endif // __MEM_CACHE_REPLACEMENT_POLICIES_TREE_PLRU_RP_HH__
diff --git a/src/mem/cache/replacement_policies/weighted_lru_rp.cc
b/src/mem/cache/replacement_policies/weighted_lru_rp.cc
index 0e2043d..cf9120c 100644
--- a/src/mem/cache/replacement_policies/weighted_lru_rp.cc
+++ b/src/mem/cache/replacement_policies/weighted_lru_rp.cc
@@ -38,7 +38,9 @@
#include "params/WeightedLRURP.hh"
#include "sim/core.hh"
-namespace ReplacementPolicy {
+GEM5_DEPRECATED_NAMESPACE(ReplacementPolicy, replacement_policy);
+namespace replacement_policy
+{
WeightedLRU::WeightedLRU(const Params &p)
: Base(p)
@@ -121,4 +123,4 @@
replacement_data)->last_touch_tick = Tick(0);
}
-} // namespace ReplacementPolicy
+} // namespace replacement_policy
diff --git a/src/mem/cache/replacement_policies/weighted_lru_rp.hh
b/src/mem/cache/replacement_policies/weighted_lru_rp.hh
index 71156d3..285ce3b 100644
--- a/src/mem/cache/replacement_policies/weighted_lru_rp.hh
+++ b/src/mem/cache/replacement_policies/weighted_lru_rp.hh
@@ -41,7 +41,9 @@
struct WeightedLRURPParams;
-namespace ReplacementPolicy {
+GEM5_DEPRECATED_NAMESPACE(ReplacementPolicy, replacement_policy);
+namespace replacement_policy
+{
class WeightedLRU : public Base
{
@@ -111,6 +113,6 @@
candidates) const override;
};
-} // namespace ReplacementPolicy
+} // namespace replacement_policy
#endif // __MEM_CACHE_REPLACEMENT_POLICIES_WEIGHTED_LRU_RP_HH__
diff --git a/src/mem/cache/tags/base_set_assoc.hh
b/src/mem/cache/tags/base_set_assoc.hh
index b13b007..30592f1 100644
--- a/src/mem/cache/tags/base_set_assoc.hh
+++ b/src/mem/cache/tags/base_set_assoc.hh
@@ -82,7 +82,7 @@
const bool sequentialAccess;
/** Replacement policy */
- ReplacementPolicy::Base *replacementPolicy;
+ replacement_policy::Base *replacementPolicy;
public:
/** Convenience typedef. */
diff --git a/src/mem/cache/tags/sector_tags.hh
b/src/mem/cache/tags/sector_tags.hh
index 5c228ee..ba142c7 100644
--- a/src/mem/cache/tags/sector_tags.hh
+++ b/src/mem/cache/tags/sector_tags.hh
@@ -44,7 +44,9 @@
#include "mem/packet.hh"
#include "params/SectorTags.hh"
-namespace ReplacementPolicy {
+GEM5_DEPRECATED_NAMESPACE(ReplacementPolicy, replacement_policy);
+namespace replacement_policy
+{
class Base;
}
class ReplaceableEntry;
@@ -73,7 +75,7 @@
const bool sequentialAccess;
/** Replacement policy */
- ReplacementPolicy::Base *replacementPolicy;
+ replacement_policy::Base *replacementPolicy;
/** Number of data blocks per sector. */
const unsigned numBlocksPerSector;
diff --git a/src/mem/ruby/structures/CacheMemory.cc
b/src/mem/ruby/structures/CacheMemory.cc
index bf8e1d4..ffcf1c2 100644
--- a/src/mem/ruby/structures/CacheMemory.cc
+++ b/src/mem/ruby/structures/CacheMemory.cc
@@ -76,7 +76,7 @@
m_is_instruction_only_cache = p.is_icache;
m_resource_stalls = p.resourceStalls;
m_block_size = p.block_size; // may be 0 at this point. Updated in
init()
- m_use_occupancy = dynamic_cast<ReplacementPolicy::WeightedLRU*>(
+ m_use_occupancy = dynamic_cast<replacement_policy::WeightedLRU*>(
m_replacementPolicy_ptr) ? true :
false;
}
@@ -381,7 +381,7 @@
// replacement policy. Depending on different replacement policies,
// use different touch() function.
if (m_use_occupancy) {
- static_cast<ReplacementPolicy::WeightedLRU*>(
+ static_cast<replacement_policy::WeightedLRU*>(
m_replacementPolicy_ptr)->touch(
entry->replacementData, occupancy);
} else {
diff --git a/src/mem/ruby/structures/CacheMemory.hh
b/src/mem/ruby/structures/CacheMemory.hh
index 7b378f4..30eeedb 100644
--- a/src/mem/ruby/structures/CacheMemory.hh
+++ b/src/mem/ruby/structures/CacheMemory.hh
@@ -64,7 +64,7 @@
{
public:
typedef RubyCacheParams Params;
- typedef std::shared_ptr<ReplacementPolicy::ReplacementData> ReplData;
+ typedef std::shared_ptr<replacement_policy::ReplacementData> ReplData;
CacheMemory(const Params &p);
~CacheMemory();
@@ -176,7 +176,7 @@
std::vector<std::vector<AbstractCacheEntry*> > m_cache;
/** We use the replacement policies from the Classic memory system. */
- ReplacementPolicy::Base *m_replacementPolicy_ptr;
+ replacement_policy::Base *m_replacementPolicy_ptr;
BankedArray dataArray;
BankedArray tagArray;
5 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the
submitted one.
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/45405
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: Id46cd9d89e9424fd3c5484e2f9c69ef2b73f135b
Gerrit-Change-Number: 45405
Gerrit-PatchSet: 9
Gerrit-Owner: Daniel Carvalho <oda...@yahoo.com.br>
Gerrit-Reviewer: Bobby R. Bruce <bbr...@ucdavis.edu>
Gerrit-Reviewer: Daniel Carvalho <oda...@yahoo.com.br>
Gerrit-Reviewer: Hoa Nguyen <hoangu...@ucdavis.edu>
Gerrit-Reviewer: Nikos Nikoleris <nikos.nikole...@arm.com>
Gerrit-Reviewer: kokoro <noreply+kok...@google.com>
Gerrit-MessageType: merged
_______________________________________________
gem5-dev mailing list -- gem5-dev@gem5.org
To unsubscribe send an email to gem5-dev-le...@gem5.org
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s
