diff --git a/src/mem/protocol/RubySlicc_Types.sm b/src/mem/protocol/RubySlicc_Types.sm index 27a045d29a..28fb6ef00d 100644 --- 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 097e0e2048..51c5e92b2a 100644 --- 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 9587fa9277..262ca8bab8 100644 --- 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 8e6a94fa1f..bd24aa66a5 100644 --- 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 3bd2b4d329..4a80d538a8 100644 --- 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 059f8b17ac..231622125e 100644 --- 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 71d4c88ce7..91aa168572 100644 --- 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 443487facc..efbdec3417 100644 --- 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 e8050b16d3..25e1dbfa8f 100644 --- 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 05749be6c5..48e83805ac 100644 --- 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 cee28db04e..f46442eced 100644 --- 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 23d970a2e9..315e2725fa 100644 --- 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 c1d558c8cd..5f541b5a82 100644 --- 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 e4c83957de..8bfd39b463 100644 --- 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 15b1697941..ca1cbab015 100644 --- 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 b0599e74b9..bdd05db3aa 100644 --- 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);