From 8b4f2ca9023ef32b8d2b076502cbe90b35b70b4e Mon Sep 17 00:00:00 2001
From: Pouya Fotouhi <Pouya.Fotouhi@amd.com>
Date: Wed, 7 Aug 2019 20:05:49 -0500
Subject: mem-ruby: Use check_on_cache_probe on MOESI CMP
This change uses check_on_cache_probe statement to check if the cacheline
subject to eviction is locked in MOESI CMP.
Change-Id: I3a8879e10ebd94ef68194836475e656761fed62c
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/19908
Tested-by: kokoro <noreply+kokoro@google.com>
Reviewed-by: Jason Lowe-Power <jason@lowepower.com>
Maintainer: Jason Lowe-Power <jason@lowepower.com>
---
src/mem/protocol/MOESI_CMP_directory-L1cache.sm | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
(limited to 'src')
diff --git a/src/mem/protocol/MOESI_CMP_directory-L1cache.sm b/src/mem/protocol/MOESI_CMP_directory-L1cache.sm
index 1f573162b..b8d8ab4a0 100644
--- a/src/mem/protocol/MOESI_CMP_directory-L1cache.sm
+++ b/src/mem/protocol/MOESI_CMP_directory-L1cache.sm
@@ -412,10 +412,13 @@ machine(MachineType:L1Cache, "L1 cache protocol")
TBEs[in_msg.LineAddress]);
} else {
// No room in the L1, so we need to make room in the L1
+ // Check if the line we want to evict is not locked
+ Addr addr := L1Icache.cacheProbe(in_msg.LineAddress);
+ check_on_cache_probe(mandatoryQueue_in, addr);
trigger(Event:L1_Replacement,
- L1Icache.cacheProbe(in_msg.LineAddress),
- getL1ICacheEntry(L1Icache.cacheProbe(in_msg.LineAddress)),
- TBEs[L1Icache.cacheProbe(in_msg.LineAddress)]);
+ addr,
+ getL1ICacheEntry(addr),
+ TBEs[addr]);
}
}
} else {
@@ -443,10 +446,13 @@ machine(MachineType:L1Cache, "L1 cache protocol")
TBEs[in_msg.LineAddress]);
} else {
// No room in the L1, so we need to make room in the L1
+ // Check if the line we want to evict is not locked
+ Addr addr := L1Dcache.cacheProbe(in_msg.LineAddress);
+ check_on_cache_probe(mandatoryQueue_in, addr);
trigger(Event:L1_Replacement,
- L1Dcache.cacheProbe(in_msg.LineAddress),
- getL1DCacheEntry(L1Dcache.cacheProbe(in_msg.LineAddress)),
- TBEs[L1Dcache.cacheProbe(in_msg.LineAddress)]);
+ addr,
+ getL1DCacheEntry(addr),
+ TBEs[addr]);
}
}
}
--
cgit v1.2.3