Daniel Carvalho has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/18737
Change subject: mem-ruby: Parameterize block size in Bloom Filters
......................................................................
mem-ruby: Parameterize block size in Bloom Filters
Substitute all occurrences of Ruby's block size by a
Python configurable block size.
Change-Id: If4913e842921447deda943b0482fb0c78a44c275
Signed-off-by: Daniel R. Carvalho <[email protected]>
---
M src/mem/ruby/filters/AbstractBloomFilter.hh
M src/mem/ruby/filters/BlockBloomFilter.cc
M src/mem/ruby/filters/BloomFilters.py
M src/mem/ruby/filters/BulkBloomFilter.cc
M src/mem/ruby/filters/H3BloomFilter.cc
M src/mem/ruby/filters/LSB_CountingBloomFilter.cc
M src/mem/ruby/filters/MultiBitSelBloomFilter.cc
M src/mem/ruby/filters/MultiGrainBloomFilter.cc
M src/mem/ruby/filters/NonCountingBloomFilter.cc
9 files changed, 39 insertions(+), 44 deletions(-)
diff --git a/src/mem/ruby/filters/AbstractBloomFilter.hh
b/src/mem/ruby/filters/AbstractBloomFilter.hh
index 969edb0..79f9858 100644
--- a/src/mem/ruby/filters/AbstractBloomFilter.hh
+++ b/src/mem/ruby/filters/AbstractBloomFilter.hh
@@ -53,6 +53,9 @@
class AbstractBloomFilter : public SimObject
{
protected:
+ /** Offset in an address due to the cache line bits. */
+ const unsigned blkBits;
+
/** The filter itself. */
std::vector<int> filter;
@@ -67,8 +70,8 @@
* Create and clear the filter.
*/
AbstractBloomFilter(const AbstractBloomFilterParams* p)
- : SimObject(p), filter(p->size), sizeBits(floorLog2(p->size)),
- setThreshold(p->threshold)
+ : SimObject(p), blkBits(p->block_bits), filter(p->size),
+ sizeBits(floorLog2(p->size)), setThreshold(p->threshold)
{
clear();
}
diff --git a/src/mem/ruby/filters/BlockBloomFilter.cc
b/src/mem/ruby/filters/BlockBloomFilter.cc
index 0f75aeb..827d146 100644
--- a/src/mem/ruby/filters/BlockBloomFilter.cc
+++ b/src/mem/ruby/filters/BlockBloomFilter.cc
@@ -28,7 +28,7 @@
#include "mem/ruby/filters/BlockBloomFilter.hh"
-#include "mem/ruby/system/RubySystem.hh"
+#include "mem/ruby/common/Address.hh"
#include "params/BlockBloomFilter.hh"
BlockBloomFilter::BlockBloomFilter(const BlockBloomFilterParams* p)
@@ -64,13 +64,10 @@
// Pull out some bit field ==> B1
// Pull out additional bits, not the same as B1 ==> B2
// XOR B1 and B2 to get hash index
- Addr block_bits = bitSelect(addr, RubySystem::getBlockSizeBits(),
- 2 * RubySystem::getBlockSizeBits() - 1);
+ Addr block_bits = bitSelect(addr, blkBits, 2 * blkBits - 1);
int offset = 5;
- Addr other_bits = bitSelect(addr,
- 2 * RubySystem::getBlockSizeBits() + offset,
- 2 * RubySystem::getBlockSizeBits() + offset +
- sizeBits - 1);
+ Addr other_bits = bitSelect(addr, 2 * blkBits + offset,
+ 2 * blkBits + offset + sizeBits - 1);
int index = block_bits ^ other_bits;
assert(index < filter.size());
return index;
diff --git a/src/mem/ruby/filters/BloomFilters.py
b/src/mem/ruby/filters/BloomFilters.py
index 49ebaa3..e413e2f 100644
--- a/src/mem/ruby/filters/BloomFilters.py
+++ b/src/mem/ruby/filters/BloomFilters.py
@@ -37,6 +37,9 @@
size = Param.Int(4096, "Number of entries in the filter")
+ # By default assume 64-byte cache lines
+ block_bits = Param.Unsigned(6, "Number of bits in a cache line offset")
+
# Most of the filters are booleans, and thus saturate on 1
threshold = Param.Int(1, "Value at which an entry is considered as
set")
diff --git a/src/mem/ruby/filters/BulkBloomFilter.cc
b/src/mem/ruby/filters/BulkBloomFilter.cc
index 4721dbf..08bc1b5 100644
--- a/src/mem/ruby/filters/BulkBloomFilter.cc
+++ b/src/mem/ruby/filters/BulkBloomFilter.cc
@@ -28,7 +28,7 @@
#include "mem/ruby/filters/BulkBloomFilter.hh"
-#include "mem/ruby/system/RubySystem.hh"
+#include "mem/ruby/common/Address.hh"
#include "params/BulkBloomFilter.hh"
BulkBloomFilter::BulkBloomFilter(const BulkBloomFilterParams* p)
@@ -45,12 +45,11 @@
{
// c0 contains the cache index bits
int set_bits = sectorBits;
- int block_bits = RubySystem::getBlockSizeBits();
- int c0 = bitSelect(addr, block_bits, block_bits + set_bits - 1);
+ int c0 = bitSelect(addr, blkBits, blkBits + set_bits - 1);
// c1 contains the lower sectorBits permuted bits
//Address permuted_bits = permute(addr);
//int c1 = permuted_bits.bitSelect(0, set_bits-1);
- int c1 = bitSelect(addr, block_bits+set_bits, (block_bits+2*set_bits)
- 1);
+ int c1 = bitSelect(addr, blkBits+set_bits, (blkBits+2*set_bits) - 1);
//assert(c0 < (filter_size/2));
//assert(c0 + (filter_size/2) < filter_size);
//assert(c1 < (filter_size/2));
@@ -66,12 +65,11 @@
// c0 contains the cache index bits
const int filter_size = filter.size();
int set_bits = sectorBits;
- int block_bits = RubySystem::getBlockSizeBits();
- int c0 = bitSelect(addr, block_bits, block_bits + set_bits - 1);
+ int c0 = bitSelect(addr, blkBits, blkBits + set_bits - 1);
// c1 contains the lower 10 permuted bits
//Address permuted_bits = permute(addr);
//int c1 = permuted_bits.bitSelect(0, set_bits-1);
- int c1 = bitSelect(addr, block_bits+set_bits, (block_bits+2*set_bits)
- 1);
+ int c1 = bitSelect(addr, blkBits+set_bits, (blkBits+2*set_bits) - 1);
//assert(c0 < (filter_size/2));
//assert(c0 + (filter_size/2) < filter_size);
//assert(c1 < (filter_size/2));
@@ -129,18 +127,17 @@
BulkBloomFilter::hash(Addr addr) const
{
// permutes the original address bits according to Table 5
- int block_offset = RubySystem::getBlockSizeBits();
- Addr part1 = bitSelect(addr, block_offset, block_offset + 6),
- part2 = bitSelect(addr, block_offset + 9, block_offset + 9),
- part3 = bitSelect(addr, block_offset + 11, block_offset + 11),
- part4 = bitSelect(addr, block_offset + 17, block_offset + 17),
- part5 = bitSelect(addr, block_offset + 7, block_offset + 8),
- part6 = bitSelect(addr, block_offset + 10, block_offset + 10),
- part7 = bitSelect(addr, block_offset + 12, block_offset + 12),
- part8 = bitSelect(addr, block_offset + 13, block_offset + 13),
- part9 = bitSelect(addr, block_offset + 15, block_offset + 16),
- part10 = bitSelect(addr, block_offset + 18, block_offset + 20),
- part11 = bitSelect(addr, block_offset + 14, block_offset + 14);
+ Addr part1 = bitSelect(addr, blkBits, blkBits + 6),
+ part2 = bitSelect(addr, blkBits + 9, blkBits + 9),
+ part3 = bitSelect(addr, blkBits + 11, blkBits + 11),
+ part4 = bitSelect(addr, blkBits + 17, blkBits + 17),
+ part5 = bitSelect(addr, blkBits + 7, blkBits + 8),
+ part6 = bitSelect(addr, blkBits + 10, blkBits + 10),
+ part7 = bitSelect(addr, blkBits + 12, blkBits + 12),
+ part8 = bitSelect(addr, blkBits + 13, blkBits + 13),
+ part9 = bitSelect(addr, blkBits + 15, blkBits + 16),
+ part10 = bitSelect(addr, blkBits + 18, blkBits + 20),
+ part11 = bitSelect(addr, blkBits + 14, blkBits + 14);
Addr result =
(part1 << 14) | (part2 << 13) | (part3 << 12) | (part4 << 11) |
@@ -150,7 +147,7 @@
// assume 32 bit addresses (both virtual and physical)
// select the remaining high-order 11 bits
Addr remaining_bits =
- bitSelect(addr, block_offset + 21, 31) << 21;
+ bitSelect(addr, blkBits + 21, 31) << 21;
result = result | remaining_bits;
return result;
diff --git a/src/mem/ruby/filters/H3BloomFilter.cc
b/src/mem/ruby/filters/H3BloomFilter.cc
index 2b64172..d71b7d0 100644
--- a/src/mem/ruby/filters/H3BloomFilter.cc
+++ b/src/mem/ruby/filters/H3BloomFilter.cc
@@ -396,7 +396,7 @@
int
H3BloomFilter::hash(Addr addr, int hash_number) const
{
- uint64_t x = makeLineAddress(addr);
+ uint64_t x = maskLowOrderBits(addr, blkBits);
int y = hashH3(x, hash_number);
if (isParallel) {
diff --git a/src/mem/ruby/filters/LSB_CountingBloomFilter.cc
b/src/mem/ruby/filters/LSB_CountingBloomFilter.cc
index 0aab650..758410a 100644
--- a/src/mem/ruby/filters/LSB_CountingBloomFilter.cc
+++ b/src/mem/ruby/filters/LSB_CountingBloomFilter.cc
@@ -28,7 +28,7 @@
#include "mem/ruby/filters/LSB_CountingBloomFilter.hh"
-#include "mem/ruby/system/RubySystem.hh"
+#include "mem/ruby/common/Address.hh"
#include "params/LSB_CountingBloomFilter.hh"
LSB_CountingBloomFilter::LSB_CountingBloomFilter(
@@ -66,9 +66,7 @@
int
LSB_CountingBloomFilter::hash(Addr addr) const
{
- return bitSelect(addr, RubySystem::getBlockSizeBits(),
- RubySystem::getBlockSizeBits() +
- sizeBits - 1);
+ return bitSelect(addr, blkBits, blkBits + sizeBits - 1);
}
LSB_CountingBloomFilter*
diff --git a/src/mem/ruby/filters/MultiBitSelBloomFilter.cc
b/src/mem/ruby/filters/MultiBitSelBloomFilter.cc
index 88fb8d3..6642ba2 100644
--- a/src/mem/ruby/filters/MultiBitSelBloomFilter.cc
+++ b/src/mem/ruby/filters/MultiBitSelBloomFilter.cc
@@ -76,7 +76,7 @@
int
MultiBitSelBloomFilter::hash(Addr addr, int hash_number) const
{
- uint64_t x = (makeLineAddress(addr) >> skipBits);
+ uint64_t x = (maskLowOrderBits(addr, blkBits) >> skipBits);
int y = hashBitsel(x, hash_number, numHashes, 30, sizeBits);
//36-bit addresses, 6-bit cache lines
diff --git a/src/mem/ruby/filters/MultiGrainBloomFilter.cc
b/src/mem/ruby/filters/MultiGrainBloomFilter.cc
index d120457..000e996 100644
--- a/src/mem/ruby/filters/MultiGrainBloomFilter.cc
+++ b/src/mem/ruby/filters/MultiGrainBloomFilter.cc
@@ -28,7 +28,7 @@
#include "mem/ruby/filters/MultiGrainBloomFilter.hh"
-#include "mem/ruby/system/RubySystem.hh"
+#include "mem/ruby/common/Address.hh"
#include "params/MultiGrainBloomFilter.hh"
MultiGrainBloomFilter::MultiGrainBloomFilter(
@@ -87,15 +87,13 @@
MultiGrainBloomFilter::hash(Addr addr) const
{
// grap a chunk of bits after byte offset
- return bitSelect(addr, RubySystem::getBlockSizeBits(),
- RubySystem::getBlockSizeBits() +
- sizeBits - 1);
+ return bitSelect(addr, blkBits, blkBits + sizeBits - 1);
}
int
MultiGrainBloomFilter::pageHash(Addr addr) const
{
- int bits = RubySystem::getBlockSizeBits() + sizeBits - 1;
+ int bits = blkBits + sizeBits - 1;
// grap a chunk of bits after first chunk
return bitSelect(addr, bits, bits + pageFilterSizeBits - 1);
diff --git a/src/mem/ruby/filters/NonCountingBloomFilter.cc
b/src/mem/ruby/filters/NonCountingBloomFilter.cc
index 1a6c91a..5cb38bb 100644
--- a/src/mem/ruby/filters/NonCountingBloomFilter.cc
+++ b/src/mem/ruby/filters/NonCountingBloomFilter.cc
@@ -28,7 +28,7 @@
#include "mem/ruby/filters/NonCountingBloomFilter.hh"
-#include "mem/ruby/system/RubySystem.hh"
+#include "mem/ruby/common/Address.hh"
#include "params/NonCountingBloomFilter.hh"
NonCountingBloomFilter::NonCountingBloomFilter(
@@ -72,9 +72,8 @@
int
NonCountingBloomFilter::hash(Addr addr) const
{
- return bitSelect(addr, RubySystem::getBlockSizeBits() + skipBits,
- RubySystem::getBlockSizeBits() + skipBits +
- sizeBits - 1);
+ return bitSelect(addr, blkBits + skipBits,
+ blkBits + skipBits + sizeBits - 1);
}
NonCountingBloomFilter*
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/18737
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: master
Gerrit-Change-Id: If4913e842921447deda943b0482fb0c78a44c275
Gerrit-Change-Number: 18737
Gerrit-PatchSet: 1
Gerrit-Owner: Daniel Carvalho <[email protected]>
Gerrit-MessageType: newchange
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
