Daecheol You has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/58413 )
Change subject: mem-ruby: fix sharer update for stale WriteCleanFull
......................................................................
mem-ruby: fix sharer update for stale WriteCleanFull
Initiate_CopyBack_Stale removes the requestor from the sharer list.
However, if CBWrData_SC is the data response of stale WriteCleanFull,
the requestor should remain in the sharer list.
Thus, whether to send a Evict or not can be decided after the data
response arrives. For this, FinishCopyBack_Stale event was added as the
last event to handle Evict.
Change-Id: Ic3e3a1e4d74b24b9aa328b2ddfa817db44f24e4e
---
M src/mem/ruby/protocol/chi/CHI-cache-actions.sm
M src/mem/ruby/protocol/chi/CHI-cache-transitions.sm
M src/mem/ruby/protocol/chi/CHI-cache.sm
3 files changed, 33 insertions(+), 6 deletions(-)
diff --git a/src/mem/ruby/protocol/chi/CHI-cache-actions.sm
b/src/mem/ruby/protocol/chi/CHI-cache-actions.sm
index 93a97d4..a181aa0 100644
--- a/src/mem/ruby/protocol/chi/CHI-cache-actions.sm
+++ b/src/mem/ruby/protocol/chi/CHI-cache-actions.sm
@@ -835,17 +835,18 @@
tbe.actions.pushNB(Event:SendCompDBIDRespStale);
tbe.actions.pushNB(Event:WriteFEPipe);
+ tbe.actions.push(Event:FinishCopyBack_Stale);
+ assert((tbe.dir_ownerExists == false) || (tbe.dir_owner !=
tbe.requestor));
+}
+
+action(Finish_CopyBack_Stale, desc="") {
// if it was the last known sharer and we don't have the data do the same
// the Initiate_Evict
- if ((is_HN == false) && (tbe.dir_sharers.count() == 1) &&
+ if ((is_HN == false) && (tbe.dir_sharers.count() == 0) &&
tbe.dir_sharers.isElement(tbe.requestor) && (tbe.dataValid ==
false)) {
tbe.actions.push(Event:SendEvict);
}
-
- tbe.dir_sharers.remove(tbe.requestor);
- assert((tbe.dir_ownerExists == false) || (tbe.dir_owner !=
tbe.requestor));
-
}
action(Initiate_Evict, desc="") {
@@ -1681,7 +1682,10 @@
} else if (in_msg.type == CHIDataType:CBWrData_SC) {
assert((tbe.dir_ownerExists == false) || (tbe.dir_owner !=
in_msg.responder));
- tbe.dir_sharers.remove(in_msg.responder);
+ // Do not remove the responder in case of stale WriteCleanFull
+ if (tbe.reqType != CHIRequestType:WriteCleanFull) {
+ tbe.dir_sharers.remove(in_msg.responder);
+ }
} else if (in_msg.type == CHIDataType:CBWrData_SD_PD) {
assert(tbe.dir_ownerExists && (tbe.dir_ownerIsExcl == false) &&
(tbe.dir_owner == in_msg.responder));
diff --git a/src/mem/ruby/protocol/chi/CHI-cache-transitions.sm
b/src/mem/ruby/protocol/chi/CHI-cache-transitions.sm
index c4eb8ff..e8f4f91 100644
--- a/src/mem/ruby/protocol/chi/CHI-cache-transitions.sm
+++ b/src/mem/ruby/protocol/chi/CHI-cache-transitions.sm
@@ -1023,6 +1023,12 @@
ProcessNextState_ClearPending;
}
+transition(BUSY_BLKD, FinishCopyBack_Stale) {
+ Pop_TriggerQueue;
+ Finish_CopyBack_Stale;
+ ProcessNextState_ClearPending;
+}
+
transition(BUSY_BLKD, CheckUpgrade_FromStore) {
Pop_TriggerQueue;
Callback_Miss; // note: Callback happens only if tbe.dataValid
diff --git a/src/mem/ruby/protocol/chi/CHI-cache.sm
b/src/mem/ruby/protocol/chi/CHI-cache.sm
index 5a12575..fb5a31a 100644
--- a/src/mem/ruby/protocol/chi/CHI-cache.sm
+++ b/src/mem/ruby/protocol/chi/CHI-cache.sm
@@ -470,6 +470,7 @@
TX_Data, desc="Transmit pending data messages";
MaintainCoherence, desc="Queues a WriteBack or Evict before droping
the only valid copy of the block";
FinishCleanUnique, desc="Sends acks and perform any writeback after a
CleanUnique";
+ FinishCopyBack_Stale, desc="Check if a Evict needs to be sent";
ActionStalledOnHazard, desc="Stall a trigger action because until
finish handling snoop hazard";
// This is triggered once a transaction doesn't have
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/58413
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: Ic3e3a1e4d74b24b9aa328b2ddfa817db44f24e4e
Gerrit-Change-Number: 58413
Gerrit-PatchSet: 1
Gerrit-Owner: Daecheol You <daecheol....@samsung.com>
Gerrit-MessageType: newchange
_______________________________________________
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
