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

mem-ruby: fix state updates on WriteCleanFull

Browse Source 
- fix wrong variable check at UpdateDirState_FromReqDataResp
- even after a WriteClean, dataMaybeDirtyUpstream still applies if
  there is an exclusive owner upstream.

JIRA: https://gem5.atlassian.net/browse/GEM5-1195

Change-Id: If1fa3ee40e30226db3a66c34633316e751eb7c4d
Signed-off-by: Tiago Mück <tiago.muck@arm.com>
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/57391
Tested-by: kokoro <noreply+kokoro@google.com>
Reviewed-by: Jason Lowe-Power <power.jg@gmail.com>
Reviewed-by: Daecheol You <daecheol.you@samsung.com>
Maintainer: Jason Lowe-Power <power.jg@gmail.com>
This commit is contained in:
Tiago Mück
2022-03-02 15:58:08 -06:00
committed by Tiago Muck
parent 5faa7aaffd
commit 183e8e2b61
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/mem/ruby/protocol/chi/CHI-cache-actions.sm
View File

@@ -1748,7 +1748,7 @@ action(UpdateDirState_FromReqDataResp, desc="") {
} else if (in_msg.type == CHIDataType:CBWrData_UD_PD) {
assert(tbe.dir_ownerExists && tbe.dir_ownerIsExcl && (tbe.dir_owner == in_msg.responder));
assert(tbe.dir_sharers.isElement(in_msg.responder));
if (tbe.pendReqType != CHIRequestType:WriteCleanFull) {
if (tbe.reqType != CHIRequestType:WriteCleanFull) {
tbe.dir_ownerExists := false;
tbe.dir_ownerIsExcl := false;
tbe.dir_sharers.remove(in_msg.responder);
@@ -1766,7 +1766,7 @@ action(UpdateDirState_FromReqDataResp, desc="") {
assert(tbe.dir_sharers.isElement(in_msg.responder));
tbe.dir_ownerExists := false;
tbe.dir_ownerIsExcl := false;
if (tbe.pendReqType != CHIRequestType:WriteCleanFull) {
if (tbe.reqType != CHIRequestType:WriteCleanFull) {
tbe.dir_sharers.remove(in_msg.responder);
}
@@ -1913,7 +1913,13 @@ action(UpdateDataState_FromReqDataResp, desc="") {
assert(tbe.dataUnique);
tbe.dataDirty := true;
tbe.dataValid := true;
tbe.dataMaybeDirtyUpstream := false;
if (tbe.reqType == CHIRequestType:WriteCleanFull) {
// upstream data can still be UC if this is a WriteCleanFull
assert(tbe.dir_ownerExists && tbe.dir_ownerIsExcl);
tbe.dataMaybeDirtyUpstream := true;
} else {
tbe.dataMaybeDirtyUpstream := false;
}
} else if (in_msg.type == CHIDataType:CBWrData_SD_PD) {
tbe.dataDirty := true;