From 507a0cecc5fb7e7575079e945188800552f30288 Mon Sep 17 00:00:00 2001 From: Pouya Fotouhi Date: Wed, 7 Aug 2019 19:43:27 -0500 Subject: [PATCH] mem-ruby: Use check_on_cache_probe to protect locked lines from eviction This change uses check_on_cache_probe statement to check if the cacheline subject to eviction is locked in MESI Three Level. Change-Id: Ib0de54aa067c7603db1f7321cc4825b123b641ac Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/19868 Reviewed-by: Jason Lowe-Power Maintainer: Jason Lowe-Power Tested-by: kokoro --- src/mem/protocol/MESI_Three_Level-L0cache.sm | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/src/mem/protocol/MESI_Three_Level-L0cache.sm b/src/mem/protocol/MESI_Three_Level-L0cache.sm index a87a3d9fd..84bb0d868 100644 --- a/src/mem/protocol/MESI_Three_Level-L0cache.sm +++ b/src/mem/protocol/MESI_Three_Level-L0cache.sm @@ -324,9 +324,12 @@ machine(MachineType:L0Cache, "MESI Directory L0 Cache") Icache_entry, TBEs[in_msg.LineAddress]); } else { // No room in the L0, so we need to make room in the L0 - trigger(Event:L0_Replacement, Icache.cacheProbe(in_msg.LineAddress), - getICacheEntry(Icache.cacheProbe(in_msg.LineAddress)), - TBEs[Icache.cacheProbe(in_msg.LineAddress)]); + // Check if the line we want to evict is not locked + Addr addr := Icache.cacheProbe(in_msg.LineAddress); + check_on_cache_probe(mandatoryQueue_in, addr); + trigger(Event:L0_Replacement, addr, + getICacheEntry(addr), + TBEs[addr]); } } } else { @@ -354,9 +357,12 @@ machine(MachineType:L0Cache, "MESI Directory L0 Cache") Dcache_entry, TBEs[in_msg.LineAddress]); } else { // No room in the L1, so we need to make room in the L0 - trigger(Event:L0_Replacement, Dcache.cacheProbe(in_msg.LineAddress), - getDCacheEntry(Dcache.cacheProbe(in_msg.LineAddress)), - TBEs[Dcache.cacheProbe(in_msg.LineAddress)]); + // Check if the line we want to evict is not locked + Addr addr := Dcache.cacheProbe(in_msg.LineAddress); + check_on_cache_probe(mandatoryQueue_in, addr); + trigger(Event:L0_Replacement, addr, + getDCacheEntry(addr), + TBEs[addr]); } } } -- 2.30.2