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 27a045d29a952ed9698ca09349c53c1550dbbde5..28fb6ef00d22d3365c381c4376c3e3b4b767c981 100644 (file)
--- a/src/mem/protocol/RubySlicc_Types.sm
+++ b/src/mem/protocol/RubySlicc_Types.sm
@@ -235,8 +235,6 @@ structure (TimerTable, inport="yes", external = "yes") {
 
 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 097e0e2048479a53ea90fe9f2f6c58efa696c41e..51c5e92b2a064962508967671a8df0eec584dfc1 100644 (file)
--- a/src/mem/ruby/filters/AbstractBloomFilter.hh
+++ b/src/mem/ruby/filters/AbstractBloomFilter.hh
@@ -38,8 +38,6 @@ class AbstractBloomFilter
   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 9587fa9277811a094ca83241b24859cc390b3edb..262ca8bab8632378d069b68d6c3fdea3065d2704 100644 (file)
--- a/src/mem/ruby/filters/BlockBloomFilter.cc
+++ b/src/mem/ruby/filters/BlockBloomFilter.cc
@@ -56,18 +56,6 @@ BlockBloomFilter::clear()
     }
 }
 
-void
-BlockBloomFilter::increment(Addr addr)
-{
-    // Not used
-}
-
-void
-BlockBloomFilter::decrement(Addr addr)
-{
-    // Not used
-}
-
 void
 BlockBloomFilter::merge(AbstractBloomFilter * other_filter)
 {

diff --git a/src/mem/ruby/filters/BlockBloomFilter.hh b/src/mem/ruby/filters/BlockBloomFilter.hh
index 8e6a94fa1f46a12a5d5f014fa9f0d3a34b81c4a0..bd24aa66a54348d8bc83276716a75406d055d618 100644 (file)
--- a/src/mem/ruby/filters/BlockBloomFilter.hh
+++ b/src/mem/ruby/filters/BlockBloomFilter.hh
@@ -42,8 +42,6 @@ class BlockBloomFilter : public AbstractBloomFilter
     ~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 3bd2b4d3291c1133314a63042b6223a92c54d14a..4a80d538a8e3bf74cd21288fb489043cdd188092 100644 (file)
--- a/src/mem/ruby/filters/BulkBloomFilter.cc
+++ b/src/mem/ruby/filters/BulkBloomFilter.cc
@@ -65,18 +65,6 @@ BulkBloomFilter::clear()
     }
 }
 
-void
-BulkBloomFilter::increment(Addr addr)
-{
-    // Not used
-}
-
-void
-BulkBloomFilter::decrement(Addr addr)
-{
-    // Not used
-}
-
 void
 BulkBloomFilter::merge(AbstractBloomFilter * other_filter)
 {

diff --git a/src/mem/ruby/filters/BulkBloomFilter.hh b/src/mem/ruby/filters/BulkBloomFilter.hh
index 059f8b17acd750e27fd8fac8fabf93cb64f3f396..231622125e82780c912bd849e9750c850d5174f2 100644 (file)
--- a/src/mem/ruby/filters/BulkBloomFilter.hh
+++ b/src/mem/ruby/filters/BulkBloomFilter.hh
@@ -42,8 +42,6 @@ class BulkBloomFilter : public AbstractBloomFilter
     ~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 71d4c88ce7a09519acbfbbfec64a711a7a7f9a43..91aa1685726af76d3de5a0f25c6b142961510c14 100644 (file)
--- a/src/mem/ruby/filters/H3BloomFilter.cc
+++ b/src/mem/ruby/filters/H3BloomFilter.cc
@@ -404,18 +404,6 @@ H3BloomFilter::clear()
     }
 }
 
-void
-H3BloomFilter::increment(Addr addr)
-{
-    // Not used
-}
-
-void
-H3BloomFilter::decrement(Addr addr)
-{
-    // Not used
-}
-
 void
 H3BloomFilter::merge(AbstractBloomFilter *other_filter)
 {

diff --git a/src/mem/ruby/filters/H3BloomFilter.hh b/src/mem/ruby/filters/H3BloomFilter.hh
index 443487faccbe23a30e16378fe4c14fa908365ad5..efbdec3417585098aed3e856b26f907fdbf99299 100644 (file)
--- a/src/mem/ruby/filters/H3BloomFilter.hh
+++ b/src/mem/ruby/filters/H3BloomFilter.hh
@@ -42,8 +42,6 @@ class H3BloomFilter : public AbstractBloomFilter
     ~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 e8050b16d32f6f554caded9d916910dc15c8461a..25e1dbfa8f31741dcad74fe4017c340475e6b71a 100644 (file)
--- a/src/mem/ruby/filters/LSB_CountingBloomFilter.cc
+++ b/src/mem/ruby/filters/LSB_CountingBloomFilter.cc
@@ -57,23 +57,6 @@ LSB_CountingBloomFilter::clear()
     }
 }
 
-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)
 {
@@ -83,13 +66,17 @@ LSB_CountingBloomFilter::merge(AbstractBloomFilter * other_filter)
 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 05749be6c55621b26fbdf0231ffaa8373fa66122..48e83805ac1cb4ecc1f715acf7b44c53cdd92681 100644 (file)
--- a/src/mem/ruby/filters/LSB_CountingBloomFilter.hh
+++ b/src/mem/ruby/filters/LSB_CountingBloomFilter.hh
@@ -42,8 +42,6 @@ class LSB_CountingBloomFilter : public AbstractBloomFilter
     ~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 cee28db04eda63e4880590f86ad90a3f8382d16b..f46442ecedab4155d835066e1416328f3498d1cc 100644 (file)
--- a/src/mem/ruby/filters/MultiBitSelBloomFilter.cc
+++ b/src/mem/ruby/filters/MultiBitSelBloomFilter.cc
@@ -59,19 +59,6 @@ MultiBitSelBloomFilter::clear()
     }
 }
 
-void
-MultiBitSelBloomFilter::increment(Addr addr)
-{
-    // Not used
-}
-
-
-void
-MultiBitSelBloomFilter::decrement(Addr addr)
-{
-    // Not used
-}
-
 void
 MultiBitSelBloomFilter::merge(AbstractBloomFilter *other_filter)
 {

diff --git a/src/mem/ruby/filters/MultiBitSelBloomFilter.hh b/src/mem/ruby/filters/MultiBitSelBloomFilter.hh
index 23d970a2e9ccdd94b858fe350502fa3ae726c98c..315e2725fae0dd7929b0cda9c9146d1cd4a56bdc 100644 (file)
--- a/src/mem/ruby/filters/MultiBitSelBloomFilter.hh
+++ b/src/mem/ruby/filters/MultiBitSelBloomFilter.hh
@@ -44,8 +44,6 @@ class MultiBitSelBloomFilter : public AbstractBloomFilter
     ~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 c1d558c8cd7c3ed9cc7a64b826c17fd99cac5b59..5f541b5a82e2cf60d18d08e58a72509161648eae 100644 (file)
--- a/src/mem/ruby/filters/MultiGrainBloomFilter.cc
+++ b/src/mem/ruby/filters/MultiGrainBloomFilter.cc
@@ -64,19 +64,6 @@ MultiGrainBloomFilter::clear()
     }
 }
 
-void
-MultiGrainBloomFilter::increment(Addr addr)
-{
-    // Not used
-}
-
-
-void
-MultiGrainBloomFilter::decrement(Addr addr)
-{
-    // Not used
-}
-
 void
 MultiGrainBloomFilter::merge(AbstractBloomFilter *other_filter)
 {

diff --git a/src/mem/ruby/filters/MultiGrainBloomFilter.hh b/src/mem/ruby/filters/MultiGrainBloomFilter.hh
index e4c83957deaec02d8ef91194885e05f7ffddd119..8bfd39b46365d4b3d8581e951a8b1d5598cff5b9 100644 (file)
--- a/src/mem/ruby/filters/MultiGrainBloomFilter.hh
+++ b/src/mem/ruby/filters/MultiGrainBloomFilter.hh
@@ -42,8 +42,6 @@ class MultiGrainBloomFilter : public AbstractBloomFilter
     ~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 15b1697941286aa9454cb0a1b172224188f71aed..ca1cbab0153148c0c09c9f84faf2cb616a22c26b 100644 (file)
--- a/src/mem/ruby/filters/NonCountingBloomFilter.cc
+++ b/src/mem/ruby/filters/NonCountingBloomFilter.cc
@@ -57,18 +57,6 @@ NonCountingBloomFilter::clear()
     }
 }
 
-void
-NonCountingBloomFilter::increment(Addr addr)
-{
-    // Not used
-}
-
-void
-NonCountingBloomFilter::decrement(Addr addr)
-{
-    // Not used
-}
-
 void
 NonCountingBloomFilter::merge(AbstractBloomFilter *other_filter)
 {

diff --git a/src/mem/ruby/filters/NonCountingBloomFilter.hh b/src/mem/ruby/filters/NonCountingBloomFilter.hh
index b0599e74b9da5e24b427f09425002274abbe2546..bdd05db3aa906366363cfd81ffd095bb5e3351e8 100644 (file)
--- a/src/mem/ruby/filters/NonCountingBloomFilter.hh
+++ b/src/mem/ruby/filters/NonCountingBloomFilter.hh
@@ -42,8 +42,6 @@ class NonCountingBloomFilter : public AbstractBloomFilter
     ~NonCountingBloomFilter();
 
     void clear();
-    void increment(Addr addr);
-    void decrement(Addr addr);
     void merge(AbstractBloomFilter * other_filter);
     void set(Addr addr);
     void unset(Addr addr);