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

mem-ruby: Rename WriteMask::cmpMask to containsMask

Browse Source 
Avoids confusion as the function tests for inclusions and not for equality.

Change-Id: I4cd10e08af46f69feed26afc2d6c7f809bc5192b
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/46560
Reviewed-by: Jason Lowe-Power <power.jg@gmail.com>
Reviewed-by: Tiago Mück <tiago.muck@arm.com>
Maintainer: Jason Lowe-Power <power.jg@gmail.com>
Tested-by: kokoro <noreply+kokoro@google.com>
This commit is contained in:
Gabriel Busnot
2021-06-07 14:00:14 +02:00
committed by Gabriel Busnot
parent 5a5fb03c77
commit 9c2aac17b9
5 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/mem/ruby/common/WriteMask.hh
View File

@@ -126,7 +126,7 @@ class WriteMask
}
bool
cmpMask(const WriteMask &readMask) const
containsMask(const WriteMask &readMask) const
{
bool tmp = true;
assert(mSize == readMask.mSize);

2
src/mem/ruby/protocol/GPU_VIPER-TCP.sm
View File

@@ -362,7 +362,7 @@ machine(MachineType:TCP, "GPU TCP (L1 Data Cache)")
action(norl_issueRdBlkOrloadDone, "norl", desc="local load done") {
peek(mandatoryQueue_in, RubyRequest){
if (cache_entry.writeMask.cmpMask(in_msg.writeMask)) {
if (cache_entry.writeMask.containsMask(in_msg.writeMask)) {
if (use_seq_not_coal) {
sequencer.readCallback(address, cache_entry.DataBlk, false, MachineType:L1Cache);
} else {

2
src/mem/ruby/protocol/RubySlicc_Exports.sm
View File

@@ -54,7 +54,7 @@ external_type(RequestPtr, primitive="yes", default="nullptr");
structure(WriteMask, external="yes", desc="...") {
void clear();
bool cmpMask(WriteMask);
bool containsMask(WriteMask);
bool isEmpty();
bool isFull();
bool isOverlap(WriteMask);

2
src/mem/ruby/protocol/chi/CHI-cache-funcs.sm
View File

@@ -215,7 +215,7 @@ void functionalRead(Addr addr, Packet *pkt, WriteMask &mask) {
WriteMask test_mask := mask;
test_mask.orMask(read_mask);
if ((mask.cmpMask(test_mask) == false) || dirty) {
if ((mask.containsMask(test_mask) == false) || dirty) {
if (from_tbe) {
if(testAndReadMask(addr, tbe.dataBlk, read_mask, pkt)) {
DPRINTF(RubySlicc, "functionalRead tbe %x %s dirty=%d %s %s\n", addr, tbe.dataBlk, tbe.dataDirty, read_mask, mask);

2
src/mem/ruby/protocol/chi/CHI-msg.sm
View File

@@ -217,7 +217,7 @@ structure(CHIDataMsg, desc="", interface="Message") {
assert(bitMask.isEmpty() == false);
WriteMask test_mask := mask;
test_mask.orMask(bitMask);
if ((mask.cmpMask(test_mask) == false) || is_dirty) {
if ((mask.containsMask(test_mask) == false) || is_dirty) {
if (testAndReadMask(addr, dataBlk, bitMask, pkt)) {
mask.orMask(bitMask);
return true;