From 9c2aac17b990f9e6a94c3ad48eb9e2f2bc32cc17 Mon Sep 17 00:00:00 2001 From: Gabriel Busnot Date: Mon, 7 Jun 2021 14:00:14 +0200 Subject: [PATCH] mem-ruby: Rename WriteMask::cmpMask to containsMask MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Tiago Mück Maintainer: Jason Lowe-Power Tested-by: kokoro --- src/mem/ruby/common/WriteMask.hh | 2 +- src/mem/ruby/protocol/GPU_VIPER-TCP.sm | 2 +- src/mem/ruby/protocol/RubySlicc_Exports.sm | 2 +- src/mem/ruby/protocol/chi/CHI-cache-funcs.sm | 2 +- src/mem/ruby/protocol/chi/CHI-msg.sm | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/mem/ruby/common/WriteMask.hh b/src/mem/ruby/common/WriteMask.hh index 895584a5d2..1cb3f46501 100644 --- a/src/mem/ruby/common/WriteMask.hh +++ b/src/mem/ruby/common/WriteMask.hh @@ -126,7 +126,7 @@ class WriteMask } bool - cmpMask(const WriteMask &readMask) const + containsMask(const WriteMask &readMask) const { bool tmp = true; assert(mSize == readMask.mSize); diff --git a/src/mem/ruby/protocol/GPU_VIPER-TCP.sm b/src/mem/ruby/protocol/GPU_VIPER-TCP.sm index 5e987c8e82..a231da4b36 100644 --- a/src/mem/ruby/protocol/GPU_VIPER-TCP.sm +++ b/src/mem/ruby/protocol/GPU_VIPER-TCP.sm @@ -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 { diff --git a/src/mem/ruby/protocol/RubySlicc_Exports.sm b/src/mem/ruby/protocol/RubySlicc_Exports.sm index 7706f572da..cea6c048cc 100644 --- a/src/mem/ruby/protocol/RubySlicc_Exports.sm +++ b/src/mem/ruby/protocol/RubySlicc_Exports.sm @@ -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); diff --git a/src/mem/ruby/protocol/chi/CHI-cache-funcs.sm b/src/mem/ruby/protocol/chi/CHI-cache-funcs.sm index 40f33ce2f5..adf4e1c617 100644 --- a/src/mem/ruby/protocol/chi/CHI-cache-funcs.sm +++ b/src/mem/ruby/protocol/chi/CHI-cache-funcs.sm @@ -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); diff --git a/src/mem/ruby/protocol/chi/CHI-msg.sm b/src/mem/ruby/protocol/chi/CHI-msg.sm index 22fc508711..19cf3438ef 100644 --- a/src/mem/ruby/protocol/chi/CHI-msg.sm +++ b/src/mem/ruby/protocol/chi/CHI-msg.sm @@ -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;