changeset 721d3e248f75 in /z/repo/gem5
details: http://repo.gem5.org/gem5?cmd=changeset;node=721d3e248f75
description:
ruby: bloom filters: refactor code
diffstat:
src/mem/protocol/RubySlicc_Types.sm | 2 +-
src/mem/ruby/SConscript | 2 +-
src/mem/ruby/filters/BlockBloomFilter.cc | 13 +-
src/mem/ruby/filters/BlockBloomFilter.hh | 4 +-
src/mem/ruby/filters/BulkBloomFilter.cc | 12 +-
src/mem/ruby/filters/BulkBloomFilter.hh | 3 +-
src/mem/ruby/filters/GenericBloomFilter.cc | 153 ------------------------
src/mem/ruby/filters/GenericBloomFilter.hh | 80 ------------
src/mem/ruby/filters/H3BloomFilter.cc | 21 +--
src/mem/ruby/filters/H3BloomFilter.hh | 4 +-
src/mem/ruby/filters/LSB_CountingBloomFilter.cc | 14 +-
src/mem/ruby/filters/LSB_CountingBloomFilter.hh | 3 +-
src/mem/ruby/filters/MultiGrainBloomFilter.cc | 14 +-
src/mem/ruby/filters/MultiGrainBloomFilter.hh | 3 +-
src/mem/ruby/filters/NonCountingBloomFilter.cc | 13 +-
src/mem/ruby/filters/NonCountingBloomFilter.hh | 3 +-
src/mem/ruby/filters/SConscript | 1 -
17 files changed, 25 insertions(+), 320 deletions(-)
diffs (truncated from 584 to 300 lines):
diff -r 370488a55495 -r 721d3e248f75 src/mem/protocol/RubySlicc_Types.sm
--- a/src/mem/protocol/RubySlicc_Types.sm Wed Sep 23 11:23:10 2015 -0500
+++ b/src/mem/protocol/RubySlicc_Types.sm Wed Sep 23 11:23:10 2015 -0500
@@ -186,7 +186,7 @@
bool isSet(Addr);
}
-structure (GenericBloomFilter, external = "yes") {
+structure (AbstractBloomFilter, external = "yes") {
void clear(int);
void increment(Addr, int);
void decrement(Addr, int);
diff -r 370488a55495 -r 721d3e248f75 src/mem/ruby/SConscript
--- a/src/mem/ruby/SConscript Wed Sep 23 11:23:10 2015 -0500
+++ b/src/mem/ruby/SConscript Wed Sep 23 11:23:10 2015 -0500
@@ -119,7 +119,7 @@
MakeInclude('common/MachineID.hh')
MakeInclude('common/NetDest.hh')
MakeInclude('common/Set.hh')
-MakeInclude('filters/GenericBloomFilter.hh')
+MakeInclude('filters/AbstractBloomFilter.hh')
MakeInclude('network/MessageBuffer.hh')
MakeInclude('structures/Prefetcher.hh')
MakeInclude('structures/CacheMemory.hh')
diff -r 370488a55495 -r 721d3e248f75 src/mem/ruby/filters/BlockBloomFilter.cc
--- a/src/mem/ruby/filters/BlockBloomFilter.cc Wed Sep 23 11:23:10 2015 -0500
+++ b/src/mem/ruby/filters/BlockBloomFilter.cc Wed Sep 23 11:23:10 2015 -0500
@@ -33,18 +33,9 @@
using namespace std;
-BlockBloomFilter::BlockBloomFilter(string str)
+BlockBloomFilter::BlockBloomFilter(int size)
{
- string head, tail;
-
-#ifndef NDEBUG
- bool success =
-#endif
- split_first(str, head, tail, '_');
-
- assert(success);
-
- m_filter_size = atoi(head.c_str());
+ m_filter_size = size;
m_filter_size_bits = floorLog2(m_filter_size);
m_filter.resize(m_filter_size);
diff -r 370488a55495 -r 721d3e248f75 src/mem/ruby/filters/BlockBloomFilter.hh
--- a/src/mem/ruby/filters/BlockBloomFilter.hh Wed Sep 23 11:23:10 2015 -0500
+++ b/src/mem/ruby/filters/BlockBloomFilter.hh Wed Sep 23 11:23:10 2015 -0500
@@ -30,7 +30,6 @@
#define __MEM_RUBY_FILTERS_BLOCKBLOOMFILTER_HH__
#include <iostream>
-#include <string>
#include <vector>
#include "mem/ruby/common/Address.hh"
@@ -39,7 +38,7 @@
class BlockBloomFilter : public AbstractBloomFilter
{
public:
- BlockBloomFilter(std::string config);
+ BlockBloomFilter(int size);
~BlockBloomFilter();
void clear();
@@ -64,7 +63,6 @@
std::vector<int> m_filter;
int m_filter_size;
int m_filter_size_bits;
-
};
#endif // __MEM_RUBY_FILTERS_BLOCKBLOOMFILTER_HH__
diff -r 370488a55495 -r 721d3e248f75 src/mem/ruby/filters/BulkBloomFilter.cc
--- a/src/mem/ruby/filters/BulkBloomFilter.cc Wed Sep 23 11:23:10 2015 -0500
+++ b/src/mem/ruby/filters/BulkBloomFilter.cc Wed Sep 23 11:23:10 2015 -0500
@@ -35,17 +35,9 @@
using namespace std;
-BulkBloomFilter::BulkBloomFilter(string str)
+BulkBloomFilter::BulkBloomFilter(int size)
{
- string head, tail;
-
-#ifndef NDEBUG
- bool success =
-#endif
- split_first(str, head, tail, '_');
- assert(success);
-
- m_filter_size = atoi(head.c_str());
+ m_filter_size = size;
m_filter_size_bits = floorLog2(m_filter_size);
// split the filter bits in half, c0 and c1
m_sector_bits = m_filter_size_bits - 1;
diff -r 370488a55495 -r 721d3e248f75 src/mem/ruby/filters/BulkBloomFilter.hh
--- a/src/mem/ruby/filters/BulkBloomFilter.hh Wed Sep 23 11:23:10 2015 -0500
+++ b/src/mem/ruby/filters/BulkBloomFilter.hh Wed Sep 23 11:23:10 2015 -0500
@@ -30,7 +30,6 @@
#define __MEM_RUBY_FILTERS_BULKBLOOMFILTER_HH__
#include <iostream>
-#include <string>
#include <vector>
#include "mem/ruby/common/Address.hh"
@@ -39,7 +38,7 @@
class BulkBloomFilter : public AbstractBloomFilter
{
public:
- BulkBloomFilter(std::string config);
+ BulkBloomFilter(int size);
~BulkBloomFilter();
void clear();
diff -r 370488a55495 -r 721d3e248f75 src/mem/ruby/filters/GenericBloomFilter.cc
--- a/src/mem/ruby/filters/GenericBloomFilter.cc Wed Sep 23 11:23:10
2015 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,153 +0,0 @@
-/*
- * Copyright (c) 1999-2008 Mark D. Hill and David A. Wood
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met: redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer;
- * redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution;
- * neither the name of the copyright holders nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "base/str.hh"
-#include "mem/ruby/common/Address.hh"
-#include "mem/ruby/filters/BlockBloomFilter.hh"
-#include "mem/ruby/filters/BulkBloomFilter.hh"
-#include "mem/ruby/filters/GenericBloomFilter.hh"
-#include "mem/ruby/filters/H3BloomFilter.hh"
-#include "mem/ruby/filters/LSB_CountingBloomFilter.hh"
-#include "mem/ruby/filters/MultiBitSelBloomFilter.hh"
-#include "mem/ruby/filters/MultiGrainBloomFilter.hh"
-#include "mem/ruby/filters/NonCountingBloomFilter.hh"
-
-using namespace std;
-
-GenericBloomFilter::GenericBloomFilter(string config)
-{
- string head, tail;
-#ifndef NDEBUG
- bool success =
-#endif
- split_first(config, head, tail, '_');
- assert(success);
-
- if (head == "LSB_Counting" ) {
- m_filter = new LSB_CountingBloomFilter(tail);
- } else if(head == "NonCounting" ) {
- m_filter = new NonCountingBloomFilter(tail);
- } else if(head == "Bulk" ) {
- m_filter = new BulkBloomFilter(tail);
- } else if(head == "Block") {
- m_filter = new BlockBloomFilter(tail);
- } else if(head == "Multigrain"){
- m_filter = new MultiGrainBloomFilter(tail);
- } else if(head == "MultiBitSel"){
- m_filter = new MultiBitSelBloomFilter(tail);
- } else if(head == "H3"){
- m_filter = new H3BloomFilter(tail);
- } else {
- assert(0);
- }
-}
-
-GenericBloomFilter::~GenericBloomFilter()
-{
- delete m_filter;
-}
-
-void
-GenericBloomFilter::clear()
-{
- m_filter->clear();
-}
-
-void
-GenericBloomFilter::increment(Addr addr)
-{
- m_filter->increment(addr);
-}
-
-void
-GenericBloomFilter::decrement(Addr addr)
-{
- m_filter->decrement(addr);
-}
-
-void
-GenericBloomFilter::merge(GenericBloomFilter * other_filter)
-{
- m_filter->merge(other_filter->getFilter());
-}
-
-void
-GenericBloomFilter::set(Addr addr)
-{
- m_filter->set(addr);
-}
-
-void
-GenericBloomFilter::unset(Addr addr)
-{
- m_filter->unset(addr);
-}
-
-bool
-GenericBloomFilter::isSet(Addr addr)
-{
- return m_filter->isSet(addr);
-}
-
-int
-GenericBloomFilter::getCount(Addr addr)
-{
- return m_filter->getCount(addr);
-}
-
-int
-GenericBloomFilter::getTotalCount()
-{
- return m_filter->getTotalCount();
-}
-
-int
-GenericBloomFilter::getIndex(Addr addr)
-{
- return m_filter->getIndex(addr);
-}
-
-int
-GenericBloomFilter::readBit(const int index)
-{
- return m_filter->readBit(index);
-}
-
-void
-GenericBloomFilter::writeBit(const int index, const int value)
-{
- m_filter->writeBit(index, value);
-}
-
-void
-GenericBloomFilter::print(ostream& out) const
-{
- return m_filter->print(out);
-}
-
-
diff -r 370488a55495 -r 721d3e248f75 src/mem/ruby/filters/GenericBloomFilter.hh
--- a/src/mem/ruby/filters/GenericBloomFilter.hh Wed Sep 23 11:23:10
2015 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,80 +0,0 @@
-/*
- * Copyright (c) 1999-2008 Mark D. Hill and David A. Wood
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met: redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer;
- * redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution;
- * neither the name of the copyright holders nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
