derek/gem5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mem-ruby: Bloom filters - Remove in/decrement

Browse Source 
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>
This commit is contained in:
Daniel R. Carvalho
2019-05-06 08:58:07 +02:00
committed by Daniel Carvalho
parent 4c38c7c02a
commit bb450fe0aa
16 changed files with 6 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/mem/protocol/RubySlicc_Types.sm
View File

@@ -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);

2
src/mem/ruby/filters/AbstractBloomFilter.hh
View File

@@ -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;

12
src/mem/ruby/filters/BlockBloomFilter.cc
View File

@@ -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)
{

2
src/mem/ruby/filters/BlockBloomFilter.hh
View File

@@ -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);

12
src/mem/ruby/filters/BulkBloomFilter.cc
View File

@@ -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)
{

2
src/mem/ruby/filters/BulkBloomFilter.hh
View File

@@ -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);

12
src/mem/ruby/filters/H3BloomFilter.cc
View File

@@ -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)
{

2
src/mem/ruby/filters/H3BloomFilter.hh
View File

@@ -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);

25
src/mem/ruby/filters/LSB_CountingBloomFilter.cc
View File

@@ -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

2
src/mem/ruby/filters/LSB_CountingBloomFilter.hh
View File

@@ -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);

13
src/mem/ruby/filters/MultiBitSelBloomFilter.cc
View File

@@ -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)
{

2
src/mem/ruby/filters/MultiBitSelBloomFilter.hh
View File

@@ -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);

13
src/mem/ruby/filters/MultiGrainBloomFilter.cc
View File

@@ -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)
{

2
src/mem/ruby/filters/MultiGrainBloomFilter.hh
View File

@@ -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);

12
src/mem/ruby/filters/NonCountingBloomFilter.cc
View File

@@ -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)
{

2
src/mem/ruby/filters/NonCountingBloomFilter.hh
View File

@@ -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);