Daniel Carvalho has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/45401 )
Change subject: base: Rename BloomFilter namespace as bloom_filter
......................................................................
base: Rename BloomFilter namespace as bloom_filter
As part of recent decisions regarding namespace
naming conventions, all namespaces will be changed
to snake case.
::BloomFilter became ::bloom_filter.
Change-Id: I721ad0f55c77d6c3a2dc2b53fe567b3202783b8b
Signed-off-by: Daniel R. Carvalho <[email protected]>
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/45401
Tested-by: kokoro <[email protected]>
Reviewed-by: Bobby R. Bruce <[email protected]>
Reviewed-by: Hoa Nguyen <[email protected]>
Maintainer: Bobby R. Bruce <[email protected]>
---
M src/base/filters/BloomFilters.py
M src/base/filters/base.hh
M src/base/filters/block_bloom_filter.cc
M src/base/filters/block_bloom_filter.hh
M src/base/filters/bulk_bloom_filter.cc
M src/base/filters/bulk_bloom_filter.hh
M src/base/filters/h3_bloom_filter.cc
M src/base/filters/h3_bloom_filter.hh
M src/base/filters/multi_bit_sel_bloom_filter.cc
M src/base/filters/multi_bit_sel_bloom_filter.hh
M src/base/filters/multi_bloom_filter.cc
M src/base/filters/multi_bloom_filter.hh
M src/base/filters/perfect_bloom_filter.cc
M src/base/filters/perfect_bloom_filter.hh
14 files changed, 60 insertions(+), 33 deletions(-)
Approvals:
Hoa Nguyen: Looks good to me, approved
Bobby R. Bruce: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/base/filters/BloomFilters.py
b/src/base/filters/BloomFilters.py
index 5ac3a42..4808b19 100644
--- a/src/base/filters/BloomFilters.py
+++ b/src/base/filters/BloomFilters.py
@@ -32,7 +32,7 @@
type = 'BloomFilterBase'
abstract = True
cxx_header = "base/filters/base.hh"
- cxx_class = 'BloomFilter::Base'
+ cxx_class = 'bloom_filter::Base'
size = Param.Int(4096, "Number of entries in the filter")
@@ -45,7 +45,7 @@
class BloomFilterBlock(BloomFilterBase):
type = 'BloomFilterBlock'
- cxx_class = 'BloomFilter::Block'
+ cxx_class = 'bloom_filter::Block'
cxx_header = "base/filters/block_bloom_filter.hh"
masks_lsbs = VectorParam.Unsigned([Self.offset_bits,
@@ -55,7 +55,7 @@
class BloomFilterMultiBitSel(BloomFilterBase):
type = 'BloomFilterMultiBitSel'
- cxx_class = 'BloomFilter::MultiBitSel'
+ cxx_class = 'bloom_filter::MultiBitSel'
cxx_header = "base/filters/multi_bit_sel_bloom_filter.hh"
num_hashes = Param.Int(4, "Number of hashes")
@@ -65,17 +65,17 @@
class BloomFilterBulk(BloomFilterMultiBitSel):
type = 'BloomFilterBulk'
- cxx_class = 'BloomFilter::Bulk'
+ cxx_class = 'bloom_filter::Bulk'
cxx_header = "base/filters/bulk_bloom_filter.hh"
class BloomFilterH3(BloomFilterMultiBitSel):
type = 'BloomFilterH3'
- cxx_class = 'BloomFilter::H3'
+ cxx_class = 'bloom_filter::H3'
cxx_header = "base/filters/h3_bloom_filter.hh"
class BloomFilterMulti(BloomFilterBase):
type = 'BloomFilterMulti'
- cxx_class = 'BloomFilter::Multi'
+ cxx_class = 'bloom_filter::Multi'
cxx_header = "base/filters/multi_bloom_filter.hh"
# The base filter should not be used, since this filter is the
combination
@@ -93,7 +93,7 @@
class BloomFilterPerfect(BloomFilterBase):
type = 'BloomFilterPerfect'
- cxx_class = 'BloomFilter::Perfect'
+ cxx_class = 'bloom_filter::Perfect'
cxx_header = "base/filters/perfect_bloom_filter.hh"
# The base filter is not needed. Use a dummy value.
diff --git a/src/base/filters/base.hh b/src/base/filters/base.hh
index 583e035..7ab9663 100644
--- a/src/base/filters/base.hh
+++ b/src/base/filters/base.hh
@@ -32,13 +32,16 @@
#include <vector>
+#include "base/compiler.hh"
#include "base/intmath.hh"
#include "base/sat_counter.hh"
#include "base/types.hh"
#include "params/BloomFilterBase.hh"
#include "sim/sim_object.hh"
-namespace BloomFilter {
+GEM5_DEPRECATED_NAMESPACE(BloomFilter, bloom_filter);
+namespace bloom_filter
+{
class Base : public SimObject
{
@@ -146,6 +149,6 @@
}
};
-} // namespace BloomFilter
+} // namespace bloom_filter
#endif // __BASE_FILTERS_BASE_HH__
diff --git a/src/base/filters/block_bloom_filter.cc
b/src/base/filters/block_bloom_filter.cc
index 100f198..13447b1 100644
--- a/src/base/filters/block_bloom_filter.cc
+++ b/src/base/filters/block_bloom_filter.cc
@@ -33,7 +33,9 @@
#include "base/logging.hh"
#include "params/BloomFilterBlock.hh"
-namespace BloomFilter {
+GEM5_DEPRECATED_NAMESPACE(BloomFilter, bloom_filter);
+namespace bloom_filter
+{
Block::Block(const BloomFilterBlockParams &p)
: Base(p), masksLSBs(p.masks_lsbs),
@@ -89,4 +91,4 @@
return hashed_addr;
}
-} // namespace BloomFilter
+} // namespace bloom_filter
diff --git a/src/base/filters/block_bloom_filter.hh
b/src/base/filters/block_bloom_filter.hh
index 7292914..ba1a88c 100644
--- a/src/base/filters/block_bloom_filter.hh
+++ b/src/base/filters/block_bloom_filter.hh
@@ -36,7 +36,9 @@
struct BloomFilterBlockParams;
-namespace BloomFilter {
+GEM5_DEPRECATED_NAMESPACE(BloomFilter, bloom_filter);
+namespace bloom_filter
+{
/**
* Simple deletable (with false negatives) bloom filter that extracts
@@ -68,6 +70,6 @@
std::vector<unsigned> masksSizes;
};
-} // namespace BloomFilter
+} // namespace bloom_filter
#endif // __BASE_FILTERS_BLOCK_BLOOM_FILTER_HH__
diff --git a/src/base/filters/bulk_bloom_filter.cc
b/src/base/filters/bulk_bloom_filter.cc
index 9487699..fb47b9d 100644
--- a/src/base/filters/bulk_bloom_filter.cc
+++ b/src/base/filters/bulk_bloom_filter.cc
@@ -35,7 +35,9 @@
#include "base/logging.hh"
#include "params/BloomFilterBulk.hh"
-namespace BloomFilter {
+GEM5_DEPRECATED_NAMESPACE(BloomFilter, bloom_filter);
+namespace bloom_filter
+{
Bulk::Bulk(const BloomFilterBulkParams &p)
: MultiBitSel(p), sectorBits(floorLog2(parFilterSize))
@@ -95,4 +97,4 @@
return result;
}
-} // namespace BloomFilter
+} // namespace bloom_filter
diff --git a/src/base/filters/bulk_bloom_filter.hh
b/src/base/filters/bulk_bloom_filter.hh
index 8cc054d..c87d6ae 100644
--- a/src/base/filters/bulk_bloom_filter.hh
+++ b/src/base/filters/bulk_bloom_filter.hh
@@ -34,7 +34,9 @@
struct BloomFilterBulkParams;
-namespace BloomFilter {
+GEM5_DEPRECATED_NAMESPACE(BloomFilter, bloom_filter);
+namespace bloom_filter
+{
/**
* Implementation of the bloom filter, as described in "Bulk
Disambiguation of
@@ -63,6 +65,6 @@
const int sectorBits;
};
-} // namespace BloomFilter
+} // namespace bloom_filter
#endif // __BASE_FILTERS_BULK_BLOOM_FILTER_HH__
diff --git a/src/base/filters/h3_bloom_filter.cc
b/src/base/filters/h3_bloom_filter.cc
index dabd068..65a4583 100644
--- a/src/base/filters/h3_bloom_filter.cc
+++ b/src/base/filters/h3_bloom_filter.cc
@@ -35,7 +35,9 @@
#include "base/logging.hh"
#include "params/BloomFilterH3.hh"
-namespace BloomFilter {
+GEM5_DEPRECATED_NAMESPACE(BloomFilter, bloom_filter);
+namespace bloom_filter
+{
static int H3Matrix[64][16] = {
{ 33268410, 395488709, 311024285, 456111753,
@@ -389,4 +391,4 @@
}
}
-} // namespace BloomFilter
+} // namespace bloom_filter
diff --git a/src/base/filters/h3_bloom_filter.hh
b/src/base/filters/h3_bloom_filter.hh
index 78b52eb..65f9553 100644
--- a/src/base/filters/h3_bloom_filter.hh
+++ b/src/base/filters/h3_bloom_filter.hh
@@ -34,7 +34,9 @@
struct BloomFilterH3Params;
-namespace BloomFilter {
+GEM5_DEPRECATED_NAMESPACE(BloomFilter, bloom_filter);
+namespace bloom_filter
+{
/**
* Implementation of the bloom filter as described in "Implementing
Signatures
@@ -50,6 +52,6 @@
int hash(Addr addr, int hash_number) const override;
};
-} // namespace BloomFilter
+} // namespace bloom_filter
#endif // __BASE_FILTERS_H3_BLOOM_FILTER_HH__
diff --git a/src/base/filters/multi_bit_sel_bloom_filter.cc
b/src/base/filters/multi_bit_sel_bloom_filter.cc
index 34208e8..282a105 100644
--- a/src/base/filters/multi_bit_sel_bloom_filter.cc
+++ b/src/base/filters/multi_bit_sel_bloom_filter.cc
@@ -35,7 +35,9 @@
#include "base/logging.hh"
#include "params/BloomFilterMultiBitSel.hh"
-namespace BloomFilter {
+GEM5_DEPRECATED_NAMESPACE(BloomFilter, bloom_filter);
+namespace bloom_filter
+{
MultiBitSel::MultiBitSel(const BloomFilterMultiBitSelParams &p)
: Base(p), numHashes(p.num_hashes),
@@ -93,5 +95,5 @@
}
}
-} // namespace BloomFilter
+} // namespace bloom_filter
diff --git a/src/base/filters/multi_bit_sel_bloom_filter.hh
b/src/base/filters/multi_bit_sel_bloom_filter.hh
index 0ba65de..46b02eb 100644
--- a/src/base/filters/multi_bit_sel_bloom_filter.hh
+++ b/src/base/filters/multi_bit_sel_bloom_filter.hh
@@ -34,7 +34,9 @@
struct BloomFilterMultiBitSelParams;
-namespace BloomFilter {
+GEM5_DEPRECATED_NAMESPACE(BloomFilter, bloom_filter);
+namespace bloom_filter
+{
/**
* The MultiBitSel Bloom Filter associates an address to multiple entries
@@ -75,6 +77,6 @@
const int skipBits;
};
-} // namespace BloomFilter
+} // namespace bloom_filter
#endif // __BASE_FILTERS_MULTI_BIT_SEL_BLOOM_FILTER_HH__
diff --git a/src/base/filters/multi_bloom_filter.cc
b/src/base/filters/multi_bloom_filter.cc
index 728b7d5..36dfd21 100644
--- a/src/base/filters/multi_bloom_filter.cc
+++ b/src/base/filters/multi_bloom_filter.cc
@@ -32,7 +32,9 @@
#include "base/logging.hh"
#include "params/BloomFilterMulti.hh"
-namespace BloomFilter {
+GEM5_DEPRECATED_NAMESPACE(BloomFilter, bloom_filter);
+namespace bloom_filter
+{
Multi::Multi(const BloomFilterMultiParams &p)
: Base(p), filters(p.filters)
@@ -109,4 +111,4 @@
return count;
}
-} // namespace BloomFilter
+} // namespace bloom_filter
diff --git a/src/base/filters/multi_bloom_filter.hh
b/src/base/filters/multi_bloom_filter.hh
index 5f0255e..b346573 100644
--- a/src/base/filters/multi_bloom_filter.hh
+++ b/src/base/filters/multi_bloom_filter.hh
@@ -36,7 +36,9 @@
struct BloomFilterMultiParams;
-namespace BloomFilter {
+GEM5_DEPRECATED_NAMESPACE(BloomFilter, bloom_filter);
+namespace bloom_filter
+{
/**
* This BloomFilter has multiple sub-filters, each with its own hashing
@@ -63,6 +65,6 @@
std::vector<Base*> filters;
};
-} // namespace BloomFilter
+} // namespace bloom_filter
#endif // __BASE_FILTERS_MULTI_BLOOM_FILTER_HH__
diff --git a/src/base/filters/perfect_bloom_filter.cc
b/src/base/filters/perfect_bloom_filter.cc
index 6cac44e..91119be 100644
--- a/src/base/filters/perfect_bloom_filter.cc
+++ b/src/base/filters/perfect_bloom_filter.cc
@@ -30,7 +30,9 @@
#include "params/BloomFilterPerfect.hh"
-namespace BloomFilter {
+GEM5_DEPRECATED_NAMESPACE(BloomFilter, bloom_filter);
+namespace bloom_filter
+{
Perfect::Perfect(const BloomFilterPerfectParams &p)
: Base(p)
@@ -78,4 +80,4 @@
return entries.size();
}
-} // namespace BloomFilter
+} // namespace bloom_filter
diff --git a/src/base/filters/perfect_bloom_filter.hh
b/src/base/filters/perfect_bloom_filter.hh
index b37cefe..79d7120 100644
--- a/src/base/filters/perfect_bloom_filter.hh
+++ b/src/base/filters/perfect_bloom_filter.hh
@@ -35,7 +35,9 @@
struct BloomFilterPerfectParams;
-namespace BloomFilter {
+GEM5_DEPRECATED_NAMESPACE(BloomFilter, bloom_filter);
+namespace bloom_filter
+{
/**
* A perfect bloom filter with no false positives nor false negatives.
@@ -59,6 +61,6 @@
std::unordered_set<Addr> entries;
};
-} // namespace BloomFilter
+} // namespace bloom_filter
#endif // __BASE_FILTERS_PERFECT_BLOOM_FILTER_HH__
6 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/+/45401
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: I721ad0f55c77d6c3a2dc2b53fe567b3202783b8b
Gerrit-Change-Number: 45401
Gerrit-PatchSet: 8
Gerrit-Owner: Daniel Carvalho <[email protected]>
Gerrit-Reviewer: Bobby R. Bruce <[email protected]>
Gerrit-Reviewer: Daniel Carvalho <[email protected]>
Gerrit-Reviewer: Gabe Black <[email protected]>
Gerrit-Reviewer: Hoa Nguyen <[email protected]>
Gerrit-Reviewer: kokoro <[email protected]>
Gerrit-MessageType: merged
_______________________________________________
gem5-dev mailing list -- [email protected]
To unsubscribe send an email to [email protected]
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s
