mem-ruby: Bloom filters - Remove in/decrement
Increment and decrement were functions created to supply the
different naming convention used by the counting bloom filter.
They were removed, and the set and unset functions were used
in their place instead, as in the other filters.
Change-Id: I45732bdfa3083add0a975f374a0f3560003e9d09
Signed-off-by: Daniel R. Carvalho <odanrc@yahoo.com.br>
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/18729
Maintainer: Nikos Nikoleris <nikos.nikoleris@arm.com>
Tested-by: kokoro <noreply+kokoro@google.com>
Reviewed-by: Nikos Nikoleris <nikos.nikoleris@arm.com>
diff --git a/src/mem/protocol/RubySlicc_Types.sm b/src/mem/protocol/RubySlicc_Types.sm
index 27a045d..28fb6ef 100644
--- a/src/mem/protocol/RubySlicc_Types.sm
+++ b/src/mem/protocol/RubySlicc_Types.sm
@@ -235,8 +235,6 @@
structure (AbstractBloomFilter, external = "yes") {
void clear(int);
- void increment(Addr, int);
- void decrement(Addr, int);
void set(Addr, int);
void unset(Addr, int);
diff --git a/src/mem/ruby/filters/AbstractBloomFilter.hh b/src/mem/ruby/filters/AbstractBloomFilter.hh
index 097e0e2..51c5e92 100644
--- a/src/mem/ruby/filters/AbstractBloomFilter.hh
+++ b/src/mem/ruby/filters/AbstractBloomFilter.hh
@@ -38,8 +38,6 @@
public:
virtual ~AbstractBloomFilter() {};
virtual void clear() = 0;
- virtual void increment(Addr addr) = 0;
- virtual void decrement(Addr addr) = 0;
virtual void merge(AbstractBloomFilter * other_filter) = 0;
virtual void set(Addr addr) = 0;
virtual void unset(Addr addr) = 0;
diff --git a/src/mem/ruby/filters/BlockBloomFilter.cc b/src/mem/ruby/filters/BlockBloomFilter.cc
index 9587fa9..262ca8b 100644
--- a/src/mem/ruby/filters/BlockBloomFilter.cc
+++ b/src/mem/ruby/filters/BlockBloomFilter.cc
@@ -57,18 +57,6 @@
}
void
-BlockBloomFilter::increment(Addr addr)
-{
- // Not used
-}
-
-void
-BlockBloomFilter::decrement(Addr addr)
-{
- // Not used
-}
-
-void
BlockBloomFilter::merge(AbstractBloomFilter * other_filter)
{
// TODO
diff --git a/src/mem/ruby/filters/BlockBloomFilter.hh b/src/mem/ruby/filters/BlockBloomFilter.hh
index 8e6a94f..bd24aa6 100644
--- a/src/mem/ruby/filters/BlockBloomFilter.hh
+++ b/src/mem/ruby/filters/BlockBloomFilter.hh
@@ -42,8 +42,6 @@
~BlockBloomFilter();
void clear();
- void increment(Addr addr);
- void decrement(Addr addr);
void merge(AbstractBloomFilter * other_filter);
void set(Addr addr);
void unset(Addr addr);
diff --git a/src/mem/ruby/filters/BulkBloomFilter.cc b/src/mem/ruby/filters/BulkBloomFilter.cc
index 3bd2b4d..4a80d53 100644
--- a/src/mem/ruby/filters/BulkBloomFilter.cc
+++ b/src/mem/ruby/filters/BulkBloomFilter.cc
@@ -66,18 +66,6 @@
}
void
-BulkBloomFilter::increment(Addr addr)
-{
- // Not used
-}
-
-void
-BulkBloomFilter::decrement(Addr addr)
-{
- // Not used
-}
-
-void
BulkBloomFilter::merge(AbstractBloomFilter * other_filter)
{
// TODO
diff --git a/src/mem/ruby/filters/BulkBloomFilter.hh b/src/mem/ruby/filters/BulkBloomFilter.hh
index 059f8b1..2316221 100644
--- a/src/mem/ruby/filters/BulkBloomFilter.hh
+++ b/src/mem/ruby/filters/BulkBloomFilter.hh
@@ -42,8 +42,6 @@
~BulkBloomFilter();
void clear();
- void increment(Addr addr);
- void decrement(Addr addr);
void merge(AbstractBloomFilter * other_filter);
void set(Addr addr);
void unset(Addr addr);
diff --git a/src/mem/ruby/filters/H3BloomFilter.cc b/src/mem/ruby/filters/H3BloomFilter.cc
index 71d4c88..91aa168 100644
--- a/src/mem/ruby/filters/H3BloomFilter.cc
+++ b/src/mem/ruby/filters/H3BloomFilter.cc
@@ -405,18 +405,6 @@
}
void
-H3BloomFilter::increment(Addr addr)
-{
- // Not used
-}
-
-void
-H3BloomFilter::decrement(Addr addr)
-{
- // Not used
-}
-
-void
H3BloomFilter::merge(AbstractBloomFilter *other_filter)
{
// assumes both filters are the same size!
diff --git a/src/mem/ruby/filters/H3BloomFilter.hh b/src/mem/ruby/filters/H3BloomFilter.hh
index 443487f..efbdec3 100644
--- a/src/mem/ruby/filters/H3BloomFilter.hh
+++ b/src/mem/ruby/filters/H3BloomFilter.hh
@@ -42,8 +42,6 @@
~H3BloomFilter();
void clear();
- void increment(Addr addr);
- void decrement(Addr addr);
void merge(AbstractBloomFilter * other_filter);
void set(Addr addr);
void unset(Addr addr);
diff --git a/src/mem/ruby/filters/LSB_CountingBloomFilter.cc b/src/mem/ruby/filters/LSB_CountingBloomFilter.cc
index e8050b1..25e1dbf 100644
--- a/src/mem/ruby/filters/LSB_CountingBloomFilter.cc
+++ b/src/mem/ruby/filters/LSB_CountingBloomFilter.cc
@@ -58,23 +58,6 @@
}
void
-LSB_CountingBloomFilter::increment(Addr addr)
-{
- int i = get_index(addr);
- if (m_filter[i] < m_count)
- m_filter[i] += 1;
-}
-
-
-void
-LSB_CountingBloomFilter::decrement(Addr addr)
-{
- int i = get_index(addr);
- if (m_filter[i] > 0)
- m_filter[i] -= 1;
-}
-
-void
LSB_CountingBloomFilter::merge(AbstractBloomFilter * other_filter)
{
// TODO
@@ -83,13 +66,17 @@
void
LSB_CountingBloomFilter::set(Addr addr)
{
- // TODO
+ int i = get_index(addr);
+ if (m_filter[i] < m_count)
+ m_filter[i] += 1;
}
void
LSB_CountingBloomFilter::unset(Addr addr)
{
- // TODO
+ int i = get_index(addr);
+ if (m_filter[i] > 0)
+ m_filter[i] -= 1;
}
bool
diff --git a/src/mem/ruby/filters/LSB_CountingBloomFilter.hh b/src/mem/ruby/filters/LSB_CountingBloomFilter.hh
index 05749be..48e8380 100644
--- a/src/mem/ruby/filters/LSB_CountingBloomFilter.hh
+++ b/src/mem/ruby/filters/LSB_CountingBloomFilter.hh
@@ -42,8 +42,6 @@
~LSB_CountingBloomFilter();
void clear();
- void increment(Addr addr);
- void decrement(Addr addr);
void merge(AbstractBloomFilter * other_filter);
void set(Addr addr);
void unset(Addr addr);
diff --git a/src/mem/ruby/filters/MultiBitSelBloomFilter.cc b/src/mem/ruby/filters/MultiBitSelBloomFilter.cc
index cee28db..f46442e 100644
--- a/src/mem/ruby/filters/MultiBitSelBloomFilter.cc
+++ b/src/mem/ruby/filters/MultiBitSelBloomFilter.cc
@@ -60,19 +60,6 @@
}
void
-MultiBitSelBloomFilter::increment(Addr addr)
-{
- // Not used
-}
-
-
-void
-MultiBitSelBloomFilter::decrement(Addr addr)
-{
- // Not used
-}
-
-void
MultiBitSelBloomFilter::merge(AbstractBloomFilter *other_filter)
{
// assumes both filters are the same size!
diff --git a/src/mem/ruby/filters/MultiBitSelBloomFilter.hh b/src/mem/ruby/filters/MultiBitSelBloomFilter.hh
index 23d970a..315e272 100644
--- a/src/mem/ruby/filters/MultiBitSelBloomFilter.hh
+++ b/src/mem/ruby/filters/MultiBitSelBloomFilter.hh
@@ -44,8 +44,6 @@
~MultiBitSelBloomFilter();
void clear();
- void increment(Addr addr);
- void decrement(Addr addr);
void merge(AbstractBloomFilter * other_filter);
void set(Addr addr);
void unset(Addr addr);
diff --git a/src/mem/ruby/filters/MultiGrainBloomFilter.cc b/src/mem/ruby/filters/MultiGrainBloomFilter.cc
index c1d558c..5f541b5 100644
--- a/src/mem/ruby/filters/MultiGrainBloomFilter.cc
+++ b/src/mem/ruby/filters/MultiGrainBloomFilter.cc
@@ -65,19 +65,6 @@
}
void
-MultiGrainBloomFilter::increment(Addr addr)
-{
- // Not used
-}
-
-
-void
-MultiGrainBloomFilter::decrement(Addr addr)
-{
- // Not used
-}
-
-void
MultiGrainBloomFilter::merge(AbstractBloomFilter *other_filter)
{
// TODO
diff --git a/src/mem/ruby/filters/MultiGrainBloomFilter.hh b/src/mem/ruby/filters/MultiGrainBloomFilter.hh
index e4c8395..8bfd39b 100644
--- a/src/mem/ruby/filters/MultiGrainBloomFilter.hh
+++ b/src/mem/ruby/filters/MultiGrainBloomFilter.hh
@@ -42,8 +42,6 @@
~MultiGrainBloomFilter();
void clear();
- void increment(Addr addr);
- void decrement(Addr addr);
void merge(AbstractBloomFilter * other_filter);
void set(Addr addr);
void unset(Addr addr);
diff --git a/src/mem/ruby/filters/NonCountingBloomFilter.cc b/src/mem/ruby/filters/NonCountingBloomFilter.cc
index 15b1697..ca1cbab 100644
--- a/src/mem/ruby/filters/NonCountingBloomFilter.cc
+++ b/src/mem/ruby/filters/NonCountingBloomFilter.cc
@@ -58,18 +58,6 @@
}
void
-NonCountingBloomFilter::increment(Addr addr)
-{
- // Not used
-}
-
-void
-NonCountingBloomFilter::decrement(Addr addr)
-{
- // Not used
-}
-
-void
NonCountingBloomFilter::merge(AbstractBloomFilter *other_filter)
{
// assumes both filters are the same size!
diff --git a/src/mem/ruby/filters/NonCountingBloomFilter.hh b/src/mem/ruby/filters/NonCountingBloomFilter.hh
index b0599e7..bdd05db 100644
--- a/src/mem/ruby/filters/NonCountingBloomFilter.hh
+++ b/src/mem/ruby/filters/NonCountingBloomFilter.hh
@@ -42,8 +42,6 @@
~NonCountingBloomFilter();
void clear();
- void increment(Addr addr);
- void decrement(Addr addr);
void merge(AbstractBloomFilter * other_filter);
void set(Addr addr);
void unset(Addr addr);
