Gabriel Busnot has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/46560 )
Change subject: mem-ruby: Rename WriteMask::cmpMask to containsMask
..
mem-ruby: Rename WriteMask::cmpMask to containsMask
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
---
M src/mem/ruby/common/WriteMask.hh
M src/mem/ruby/protocol/GPU_VIPER-TCP.sm
M src/mem/ruby/protocol/RubySlicc_Exports.sm
M src/mem/ruby/protocol/chi/CHI-cache-funcs.sm
M src/mem/ruby/protocol/chi/CHI-msg.sm
5 files changed, 5 insertions(+), 5 deletions(-)
Approvals:
Jason Lowe-Power: Looks good to me, but someone else must approve; Looks
good to me, approved
Tiago Mück: Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/mem/ruby/common/WriteMask.hh
b/src/mem/ruby/common/WriteMask.hh
index 895584a..1cb3f46 100644
--- a/src/mem/ruby/common/WriteMask.hh
+++ b/src/mem/ruby/common/WriteMask.hh
@@ -126,7 +126,7 @@
}
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 5e987c8..a231da4 100644
--- a/src/mem/ruby/protocol/GPU_VIPER-TCP.sm
+++ b/src/mem/ruby/protocol/GPU_VIPER-TCP.sm
@@ -362,7 +362,7 @@
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 7706f57..cea6c04 100644
--- a/src/mem/ruby/protocol/RubySlicc_Exports.sm
+++ b/src/mem/ruby/protocol/RubySlicc_Exports.sm
@@ -54,7 +54,7 @@
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 40f33ce..adf4e1c 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 @@
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 22fc508..19cf343 100644
--- a/src/mem/ruby/protocol/chi/CHI-msg.sm
+++ b/src/mem/ruby/protocol/chi/CHI-msg.sm
@@ -217,7 +217,7 @@
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;
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/46560
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: I4cd10e08af46f69feed26afc2d6c7f809bc5192b
Gerrit-Change-Number: 46560
Gerrit-PatchSet: 2
Gerrit-Owner: Gabriel Busnot
Gerrit-Reviewer: Gabriel Busnot
Gerrit-Reviewer: Jason Lowe-Power
Gerrit-Reviewer: Jason Lowe-Power
Gerrit-Reviewer: Tiago Mück
Gerrit-Reviewer: kokoro
Gerrit-CC: Giacomo Travaglini
Gerrit-MessageType: merged
___
gem5-dev mailing list -- gem5-dev@gem5.org
To unsubscribe send an email to gem5-dev-le...@gem5.org
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s
