mem-ruby: Finish implementing BloomFilter merge
Not all Bloom Filters had their union functionality implemented.
This change adds them.
Change-Id: I86af18d3c5eabd0da8280b57a88789b3af803c04
Signed-off-by: Daniel R. Carvalho <odanrc@yahoo.com.br>
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/18872
Tested-by: kokoro <noreply+kokoro@google.com>
Reviewed-by: Nikos Nikoleris <nikos.nikoleris@arm.com>
Maintainer: Nikos Nikoleris <nikos.nikoleris@arm.com>
diff --git a/src/mem/ruby/filters/AbstractBloomFilter.hh b/src/mem/ruby/filters/AbstractBloomFilter.hh
index 6a62d0a..a982696 100644
--- a/src/mem/ruby/filters/AbstractBloomFilter.hh
+++ b/src/mem/ruby/filters/AbstractBloomFilter.hh
@@ -76,8 +76,20 @@
}
}
- /** Merges the contents of both filters into this'. */
- virtual void merge(const AbstractBloomFilter* other) {}
+ /**
+ * Merges the contents of both filters into this' (Bloom Filter union).
+ * Both must have the same number of entries.
+ *
+ * @param other The other bloom filter to merge with.
+ */
+ virtual void
+ merge(const AbstractBloomFilter* other)
+ {
+ assert(filter.size() == other->filter.size());
+ for (int i = 0; i < filter.size(); ++i){
+ filter[i] |= other->filter[i];
+ }
+ }
/**
* Perform the filter specific function to set the corresponding
diff --git a/src/mem/ruby/filters/H3BloomFilter.cc b/src/mem/ruby/filters/H3BloomFilter.cc
index 4e4f95d..37af607 100644
--- a/src/mem/ruby/filters/H3BloomFilter.cc
+++ b/src/mem/ruby/filters/H3BloomFilter.cc
@@ -368,16 +368,6 @@
}
void
-H3BloomFilter::merge(const AbstractBloomFilter *other)
-{
- auto* cast_other = static_cast<const H3BloomFilter*>(other);
- assert(filter.size() == cast_other->filter.size());
- for (int i = 0; i < filter.size(); ++i){
- filter[i] |= cast_other->filter[i];
- }
-}
-
-void
H3BloomFilter::set(Addr addr)
{
for (int i = 0; i < numHashes; i++) {
diff --git a/src/mem/ruby/filters/H3BloomFilter.hh b/src/mem/ruby/filters/H3BloomFilter.hh
index 62a8ec1..6a36692 100644
--- a/src/mem/ruby/filters/H3BloomFilter.hh
+++ b/src/mem/ruby/filters/H3BloomFilter.hh
@@ -43,7 +43,6 @@
H3BloomFilter(const H3BloomFilterParams* p);
~H3BloomFilter();
- void merge(const AbstractBloomFilter* other) override;
void set(Addr addr) override;
int getCount(Addr addr) const override;
diff --git a/src/mem/ruby/filters/LSB_CountingBloomFilter.cc b/src/mem/ruby/filters/LSB_CountingBloomFilter.cc
index b999a2c..d45850d 100644
--- a/src/mem/ruby/filters/LSB_CountingBloomFilter.cc
+++ b/src/mem/ruby/filters/LSB_CountingBloomFilter.cc
@@ -42,6 +42,20 @@
}
void
+LSB_CountingBloomFilter::merge(const AbstractBloomFilter* other)
+{
+ auto* cast_other = static_cast<const LSB_CountingBloomFilter*>(other);
+ assert(filter.size() == cast_other->filter.size());
+ for (int i = 0; i < filter.size(); ++i){
+ if (filter[i] < maxValue - cast_other->filter[i]) {
+ filter[i] += cast_other->filter[i];
+ } else {
+ filter[i] = maxValue;
+ }
+ }
+}
+
+void
LSB_CountingBloomFilter::set(Addr addr)
{
const int i = hash(addr);
diff --git a/src/mem/ruby/filters/LSB_CountingBloomFilter.hh b/src/mem/ruby/filters/LSB_CountingBloomFilter.hh
index 4bc0441..410f22d 100644
--- a/src/mem/ruby/filters/LSB_CountingBloomFilter.hh
+++ b/src/mem/ruby/filters/LSB_CountingBloomFilter.hh
@@ -39,6 +39,7 @@
LSB_CountingBloomFilter(const LSB_CountingBloomFilterParams* p);
~LSB_CountingBloomFilter();
+ void merge(const AbstractBloomFilter* other) override;
void set(Addr addr) override;
void unset(Addr addr) override;
diff --git a/src/mem/ruby/filters/MultiBitSelBloomFilter.cc b/src/mem/ruby/filters/MultiBitSelBloomFilter.cc
index 007de8e..65428e0 100644
--- a/src/mem/ruby/filters/MultiBitSelBloomFilter.cc
+++ b/src/mem/ruby/filters/MultiBitSelBloomFilter.cc
@@ -47,16 +47,6 @@
}
void
-MultiBitSelBloomFilter::merge(const AbstractBloomFilter *other)
-{
- auto cast_other = static_cast<const MultiBitSelBloomFilter*>(other);
- assert(filter.size() == cast_other->filter.size());
- for (int i = 0; i < filter.size(); ++i){
- filter[i] |= cast_other->filter[i];
- }
-}
-
-void
MultiBitSelBloomFilter::set(Addr addr)
{
for (int i = 0; i < numHashes; i++) {
diff --git a/src/mem/ruby/filters/MultiBitSelBloomFilter.hh b/src/mem/ruby/filters/MultiBitSelBloomFilter.hh
index 501483d..42ba94c 100644
--- a/src/mem/ruby/filters/MultiBitSelBloomFilter.hh
+++ b/src/mem/ruby/filters/MultiBitSelBloomFilter.hh
@@ -39,7 +39,6 @@
MultiBitSelBloomFilter(const MultiBitSelBloomFilterParams* p);
~MultiBitSelBloomFilter();
- void merge(const AbstractBloomFilter* other) override;
void set(Addr addr) override;
int getCount(Addr addr) const override;
