From: Timothy Hayes <timothy.hayes@arm.com>
Date: Fri, 27 Sep 2019 13:51:43 +0000 (+0100)
Subject: ruby: 2x protocols has typo/syntax error that fails building
X-Git-Tag: v19.0.0.0~513
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a060ac86307311587d05d280ee1f4cbdb84fe98a;p=gem5.git

ruby: 2x protocols has typo/syntax error that fails building

MOESI_hammer and MOESI_CMP_token contain incorrect lines.

Change-Id: I1f9ac429d0f4dcb0241f21c8c9b831bee7aa37a4
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/21259
Reviewed-by: Jason Lowe-Power <jason@lowepower.com>
Maintainer: Jason Lowe-Power <jason@lowepower.com>
Tested-by: kokoro <noreply+kokoro@google.com>
---

diff --git a/src/mem/ruby/protocol/MOESI_CMP_token-L1cache.sm b/src/mem/ruby/protocol/MOESI_CMP_token-L1cache.sm
index 960afda33..17c518a10 100644
--- a/src/mem/ruby/protocol/MOESI_CMP_token-L1cache.sm
+++ b/src/mem/ruby/protocol/MOESI_CMP_token-L1cache.sm
@@ -695,7 +695,6 @@ machine(MachineType:L1Cache, "Token protocol")
                       in_msg.LineAddress, L1Icache_entry, tbe);
             } else {
               // No room in the L1, so we need to make room
-              trigger(Event:L1_Replacement,
               Addr victim := L1Icache.cacheProbe(in_msg.LineAddress);
               trigger(Event:L1_Replacement,
                       victim, getL1ICacheEntry(victim), L1_TBEs[victim]);
diff --git a/src/mem/ruby/protocol/MOESI_hammer-dir.sm b/src/mem/ruby/protocol/MOESI_hammer-dir.sm
index d85ff1929..3b0016868 100644
--- a/src/mem/ruby/protocol/MOESI_hammer-dir.sm
+++ b/src/mem/ruby/protocol/MOESI_hammer-dir.sm
@@ -426,7 +426,6 @@ machine(MachineType:Directory, "AMD Hammer-like protocol")
                 trigger(cache_request_to_event(in_msg.Type), in_msg.addr,
                         pf_entry, tbe);
               } else {
-                trigger(Event:Pf_Replacement,
                 Addr victim := probeFilter.cacheProbe(in_msg.addr);
                 trigger(Event:Pf_Replacement,
                         victim, getProbeFilterEntry(victim), TBEs[victim]);