mem-ruby: Remove Bloom Filter's print()

Print was unused. As a side effect 'using namespace std' is no
longer needed.

Change-Id: Ief10cba1a11dfdd4edb7464eb9291fc83d6668cd
Signed-off-by: Daniel R. Carvalho <odanrc@yahoo.com.br>
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/18731
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/ruby/filters/AbstractBloomFilter.hh b/src/mem/ruby/filters/AbstractBloomFilter.hh
index 6da4a9d535c230a5b9d041dd5912e3f3b5fc7f53..bdf7c63238311f52be844c42b644bd15586ede1c 100644 (file)
--- a/src/mem/ruby/filters/AbstractBloomFilter.hh
+++ b/src/mem/ruby/filters/AbstractBloomFilter.hh
@@ -29,8 +29,6 @@
 #ifndef __MEM_RUBY_FILTERS_ABSTRACTBLOOMFILTER_HH__
 #define __MEM_RUBY_FILTERS_ABSTRACTBLOOMFILTER_HH__
 
-#include <iostream>
-
 #include "mem/ruby/common/Address.hh"
 
 class AbstractBloomFilter
@@ -54,8 +52,6 @@ class AbstractBloomFilter
     virtual int getCount(Addr addr) = 0;
     virtual int getTotalCount() = 0;
 
-    virtual void print(std::ostream& out) const = 0;
-
     virtual int getIndex(Addr addr) = 0;
     virtual int readBit(const int index) = 0;
     virtual void writeBit(const int index, const int value) = 0;

diff --git a/src/mem/ruby/filters/BlockBloomFilter.cc b/src/mem/ruby/filters/BlockBloomFilter.cc
index 262ca8bab8632378d069b68d6c3fdea3065d2704..e990497d0ae491e6dcec3b0180e7948bf87c771f 100644 (file)
--- a/src/mem/ruby/filters/BlockBloomFilter.cc
+++ b/src/mem/ruby/filters/BlockBloomFilter.cc
@@ -29,11 +29,8 @@
 #include "mem/ruby/filters/BlockBloomFilter.hh"
 
 #include "base/intmath.hh"
-#include "base/str.hh"
 #include "mem/ruby/system/RubySystem.hh"
 
-using namespace std;
-
 BlockBloomFilter::BlockBloomFilter(int size)
 {
     m_filter_size = size;
@@ -108,11 +105,6 @@ BlockBloomFilter::getIndex(Addr addr)
     return get_index(addr);
 }
 
-void
-BlockBloomFilter::print(ostream& out) const
-{
-}
-
 int
 BlockBloomFilter::readBit(const int index)
 {

diff --git a/src/mem/ruby/filters/BlockBloomFilter.hh b/src/mem/ruby/filters/BlockBloomFilter.hh
index d015e1e0e501388920e3c1498e219888df626b24..088759c5ed7158dbbf30a2df4e9333f063e7f3aa 100644 (file)
--- a/src/mem/ruby/filters/BlockBloomFilter.hh
+++ b/src/mem/ruby/filters/BlockBloomFilter.hh
@@ -29,7 +29,6 @@
 #ifndef __MEM_RUBY_FILTERS_BLOCKBLOOMFILTER_HH__
 #define __MEM_RUBY_FILTERS_BLOCKBLOOMFILTER_HH__
 
-#include <iostream>
 #include <vector>
 
 #include "mem/ruby/common/Address.hh"
@@ -53,8 +52,6 @@ class BlockBloomFilter : public AbstractBloomFilter
     int readBit(const int index);
     void writeBit(const int index, const int value);
 
-    void print(std::ostream& out) const;
-
   private:
     int get_index(Addr addr);
 

diff --git a/src/mem/ruby/filters/BulkBloomFilter.cc b/src/mem/ruby/filters/BulkBloomFilter.cc
index a7e02781fab410deb07f21c3b61d017e6ffb8e87..d7fa1a388b208a77b80206f1dddf956baff2f826 100644 (file)
--- a/src/mem/ruby/filters/BulkBloomFilter.cc
+++ b/src/mem/ruby/filters/BulkBloomFilter.cc
@@ -31,11 +31,8 @@
 #include <cassert>
 
 #include "base/intmath.hh"
-#include "base/str.hh"
 #include "mem/ruby/system/RubySystem.hh"
 
-using namespace std;
-
 BulkBloomFilter::BulkBloomFilter(int size)
 {
     m_filter_size = size;
@@ -185,11 +182,6 @@ BulkBloomFilter::writeBit(const int index, const int value)
     // TODO
 }
 
-void
-BulkBloomFilter::print(ostream& out) const
-{
-}
-
 int
 BulkBloomFilter::get_index(Addr addr)
 {

diff --git a/src/mem/ruby/filters/BulkBloomFilter.hh b/src/mem/ruby/filters/BulkBloomFilter.hh
index 683bbe14c7922261c7c482e2822aaf4c049cd572..a3df105308d0f34acc32e316e977200f02ddf0d8 100644 (file)
--- a/src/mem/ruby/filters/BulkBloomFilter.hh
+++ b/src/mem/ruby/filters/BulkBloomFilter.hh
@@ -29,7 +29,6 @@
 #ifndef __MEM_RUBY_FILTERS_BULKBLOOMFILTER_HH__
 #define __MEM_RUBY_FILTERS_BULKBLOOMFILTER_HH__
 
-#include <iostream>
 #include <vector>
 
 #include "mem/ruby/common/Address.hh"
@@ -52,8 +51,6 @@ class BulkBloomFilter : public AbstractBloomFilter
     int readBit(const int index);
     void writeBit(const int index, const int value);
 
-    void print(std::ostream& out) const;
-
   private:
     int get_index(Addr addr);
     Addr permute(Addr addr);

diff --git a/src/mem/ruby/filters/H3BloomFilter.cc b/src/mem/ruby/filters/H3BloomFilter.cc
index 6fa182f9a60f7c4dc6527607335c531beb4fe6c9..90b3546d95069678bf35416f7eccfcd7dd959dcf 100644 (file)
--- a/src/mem/ruby/filters/H3BloomFilter.cc
+++ b/src/mem/ruby/filters/H3BloomFilter.cc
@@ -29,9 +29,6 @@
 #include "mem/ruby/filters/H3BloomFilter.hh"
 
 #include "base/intmath.hh"
-#include "base/logging.hh"
-
-using namespace std;
 
 static int H3[64][16] = {
     { 33268410,   395488709,  311024285,  456111753,
@@ -469,11 +466,6 @@ H3BloomFilter::getTotalCount()
     return count;
 }
 
-void
-H3BloomFilter::print(ostream& out) const
-{
-}
-
 int
 H3BloomFilter::get_index(Addr addr, int i)
 {

diff --git a/src/mem/ruby/filters/H3BloomFilter.hh b/src/mem/ruby/filters/H3BloomFilter.hh
index b9890e7b655d9e0be59a96ffef650d58148b6c8b..93dc7d373e31a356157e7ed8cb08bd91749ed367 100644 (file)
--- a/src/mem/ruby/filters/H3BloomFilter.hh
+++ b/src/mem/ruby/filters/H3BloomFilter.hh
@@ -29,7 +29,6 @@
 #ifndef __MEM_RUBY_FILTERS_H3BLOOMFILTER_HH__
 #define __MEM_RUBY_FILTERS_H3BLOOMFILTER_HH__
 
-#include <iostream>
 #include <vector>
 
 #include "mem/ruby/common/Address.hh"
@@ -48,7 +47,6 @@ class H3BloomFilter : public AbstractBloomFilter
     bool isSet(Addr addr);
     int getCount(Addr addr);
     int getTotalCount();
-    void print(std::ostream& out) const;
 
     int getIndex(Addr addr);
     int readBit(const int index);

diff --git a/src/mem/ruby/filters/LSB_CountingBloomFilter.cc b/src/mem/ruby/filters/LSB_CountingBloomFilter.cc
index 25e1dbfa8f31741dcad74fe4017c340475e6b71a..98c480b4eb7f50fac9ad379008ee96491dff8483 100644 (file)
--- a/src/mem/ruby/filters/LSB_CountingBloomFilter.cc
+++ b/src/mem/ruby/filters/LSB_CountingBloomFilter.cc
@@ -31,8 +31,6 @@
 #include "base/intmath.hh"
 #include "mem/ruby/system/RubySystem.hh"
 
-using namespace std;
-
 LSB_CountingBloomFilter::LSB_CountingBloomFilter(int head, int tail)
 {
     m_filter_size = head;
@@ -109,11 +107,6 @@ LSB_CountingBloomFilter::getIndex(Addr addr)
     return get_index(addr);
 }
 
-void
-LSB_CountingBloomFilter::print(ostream& out) const
-{
-}
-
 int
 LSB_CountingBloomFilter::readBit(const int index)
 {

diff --git a/src/mem/ruby/filters/LSB_CountingBloomFilter.hh b/src/mem/ruby/filters/LSB_CountingBloomFilter.hh
index 03602a381cb377a19a8258775fd4aba6b76af14c..11df169ddf22c1b40a1982d038cb7c0c5f5771f7 100644 (file)
--- a/src/mem/ruby/filters/LSB_CountingBloomFilter.hh
+++ b/src/mem/ruby/filters/LSB_CountingBloomFilter.hh
@@ -29,7 +29,6 @@
 #ifndef __MEM_RUBY_FILTERS_LSB_COUNTINGBLOOMFILTER_HH__
 #define __MEM_RUBY_FILTERS_LSB_COUNTINGBLOOMFILTER_HH__
 
-#include <iostream>
 #include <vector>
 
 #include "mem/ruby/common/Address.hh"
@@ -53,8 +52,6 @@ class LSB_CountingBloomFilter : public AbstractBloomFilter
     int readBit(const int index);
     void writeBit(const int index, const int value);
 
-    void print(std::ostream& out) const;
-
   private:
     int get_index(Addr addr);
 

diff --git a/src/mem/ruby/filters/MultiBitSelBloomFilter.cc b/src/mem/ruby/filters/MultiBitSelBloomFilter.cc
index 3dc392f8bc9f351e8a6ae10d9ad2c5ae9d024533..206e5b07a5105c1135d41e299ffd29cff010cf9e 100644 (file)
--- a/src/mem/ruby/filters/MultiBitSelBloomFilter.cc
+++ b/src/mem/ruby/filters/MultiBitSelBloomFilter.cc
@@ -31,9 +31,6 @@
 #include <vector>
 
 #include "base/intmath.hh"
-#include "base/logging.hh"
-
-using namespace std;
 
 MultiBitSelBloomFilter::MultiBitSelBloomFilter(std::size_t filter_size,
     int num_hashes, int skip_bits, bool is_parallel)
@@ -124,11 +121,6 @@ MultiBitSelBloomFilter::getTotalCount()
     return count;
 }
 
-void
-MultiBitSelBloomFilter::print(ostream& out) const
-{
-}
-
 int
 MultiBitSelBloomFilter::get_index(Addr addr, int i)
 {

diff --git a/src/mem/ruby/filters/MultiBitSelBloomFilter.hh b/src/mem/ruby/filters/MultiBitSelBloomFilter.hh
index 1f652b2a4dd5084159783c6f034d3b2c3a9cb027..94ec38d384a92b216e69335847a4f6e2ca982c60 100644 (file)
--- a/src/mem/ruby/filters/MultiBitSelBloomFilter.hh
+++ b/src/mem/ruby/filters/MultiBitSelBloomFilter.hh
@@ -29,7 +29,6 @@
 #ifndef __MEM_RUBY_FILTERS_MULTIBITSELBLOOMFILTER_HH__
 #define __MEM_RUBY_FILTERS_MULTIBITSELBLOOMFILTER_HH__
 
-#include <iostream>
 #include <vector>
 
 #include "mem/ruby/common/Address.hh"
@@ -50,7 +49,6 @@ class MultiBitSelBloomFilter : public AbstractBloomFilter
     bool isSet(Addr addr);
     int getCount(Addr addr);
     int getTotalCount();
-    void print(std::ostream& out) const;
 
     int getIndex(Addr addr);
     int readBit(const int index);

diff --git a/src/mem/ruby/filters/MultiGrainBloomFilter.cc b/src/mem/ruby/filters/MultiGrainBloomFilter.cc
index fef8fa8206a591d528fef8d378cc8cab41f5c1e8..a4de7a7af31a3c2802841729ab7785f38425e3e6 100644 (file)
--- a/src/mem/ruby/filters/MultiGrainBloomFilter.cc
+++ b/src/mem/ruby/filters/MultiGrainBloomFilter.cc
@@ -29,11 +29,8 @@
 #include "mem/ruby/filters/MultiGrainBloomFilter.hh"
 
 #include "base/intmath.hh"
-#include "base/str.hh"
 #include "mem/ruby/system/RubySystem.hh"
 
-using namespace std;
-
 MultiGrainBloomFilter::MultiGrainBloomFilter(int head, int tail)
 {
     // head contains size of 1st bloom filter, tail contains size of
@@ -134,11 +131,6 @@ MultiGrainBloomFilter::writeBit(const int index, const int value)
     // TODO
 }
 
-void
-MultiGrainBloomFilter::print(ostream& out) const
-{
-}
-
 int
 MultiGrainBloomFilter::get_block_index(Addr addr)
 {

diff --git a/src/mem/ruby/filters/MultiGrainBloomFilter.hh b/src/mem/ruby/filters/MultiGrainBloomFilter.hh
index c2329273f6e41de69ad2478d5e00acae6d4235d0..3be6ff640885a5ef956231265fb9fac7d6df17d2 100644 (file)
--- a/src/mem/ruby/filters/MultiGrainBloomFilter.hh
+++ b/src/mem/ruby/filters/MultiGrainBloomFilter.hh
@@ -29,7 +29,6 @@
 #ifndef __MEM_RUBY_FILTERS_MULTIGRAINBLOOMFILTER_HH__
 #define __MEM_RUBY_FILTERS_MULTIGRAINBLOOMFILTER_HH__
 
-#include <iostream>
 #include <vector>
 
 #include "mem/ruby/common/Address.hh"
@@ -52,8 +51,6 @@ class MultiGrainBloomFilter : public AbstractBloomFilter
     int readBit(const int index);
     void writeBit(const int index, const int value);
 
-    void print(std::ostream& out) const;
-
   private:
     int get_block_index(Addr addr);
     int get_page_index(Addr addr);

diff --git a/src/mem/ruby/filters/NonCountingBloomFilter.cc b/src/mem/ruby/filters/NonCountingBloomFilter.cc
index ca1cbab0153148c0c09c9f84faf2cb616a22c26b..f012a7249a60ea5df6accf8b0f270fd500f54edc 100644 (file)
--- a/src/mem/ruby/filters/NonCountingBloomFilter.cc
+++ b/src/mem/ruby/filters/NonCountingBloomFilter.cc
@@ -32,8 +32,6 @@
 #include "base/str.hh"
 #include "mem/ruby/system/RubySystem.hh"
 
-using namespace std;
-
 NonCountingBloomFilter::NonCountingBloomFilter(int head, int tail)
 {
     // head contains filter size, tail contains bit offset from block number
@@ -106,11 +104,6 @@ NonCountingBloomFilter::getTotalCount()
     return count;
 }
 
-void
-NonCountingBloomFilter::print(ostream& out) const
-{
-}
-
 int
 NonCountingBloomFilter::getIndex(Addr addr)
 {

diff --git a/src/mem/ruby/filters/NonCountingBloomFilter.hh b/src/mem/ruby/filters/NonCountingBloomFilter.hh
index 9d1ad0067bc32a50cebe8c7aafe7be134c7dc176..2f1885d8df3a6c603fc6af7f915e726b417e705c 100644 (file)
--- a/src/mem/ruby/filters/NonCountingBloomFilter.hh
+++ b/src/mem/ruby/filters/NonCountingBloomFilter.hh
@@ -29,7 +29,6 @@
 #ifndef __MEM_RUBY_FILTERS_NONCOUNTINGBLOOMFILTER_HH__
 #define __MEM_RUBY_FILTERS_NONCOUNTINGBLOOMFILTER_HH__
 
-#include <iostream>
 #include <vector>
 
 #include "mem/ruby/common/Address.hh"
@@ -54,8 +53,6 @@ class NonCountingBloomFilter : public AbstractBloomFilter
     int readBit(const int index);
     void writeBit(const int index, const int value);
 
-    void print(std::ostream& out) const;
-
     int
     operator[](const int index) const
     {