mem-ruby: Use check_on_cache_probe to protect locked lines from eviction
authorPouya Fotouhi <Pouya.Fotouhi@amd.com>
Thu, 8 Aug 2019 00:43:27 +0000 (19:43 -0500)
committerPouya Fotouhi <pfotouhi@ucdavis.edu>
Mon, 12 Aug 2019 18:21:28 +0000 (18:21 +0000)
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 <jason@lowepower.com>
Maintainer: Jason Lowe-Power <jason@lowepower.com>
Tested-by: kokoro <noreply+kokoro@google.com>
src/mem/protocol/MESI_Three_Level-L0cache.sm

index a87a3d9fdffc771f7ffb1e67d153c36f79ee205e..84bb0d868c7dd116b0af948b2535a9243be6257a 100644 (file)
@@ -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]);
             }
           }
         }