From: Brad Beckmann <Brad.Beckmann@amd.com>
Date: Sat, 30 Jan 2010 04:29:23 +0000 (-0800)
Subject: ruby: Added atomic support to MOESI_hammer
X-Git-Tag: stable_2012_02_02~1546
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=66279fac3f099af78e63b5b181ddbd00a8b8244c;p=gem5.git

ruby: Added atomic support to MOESI_hammer
---

diff --git a/src/mem/protocol/MOESI_hammer-cache.sm b/src/mem/protocol/MOESI_hammer-cache.sm
index 0efca93ae..66bb85cf9 100644
--- a/src/mem/protocol/MOESI_hammer-cache.sm
+++ b/src/mem/protocol/MOESI_hammer-cache.sm
@@ -245,7 +245,7 @@ machine(L1Cache, "AMD Hammer-like protocol")
   // Forward Network
   in_port(forwardToCache_in, RequestMsg, forwardToCache) {
     if (forwardToCache_in.isReady()) {
-      peek(forwardToCache_in, RequestMsg) {
+      peek(forwardToCache_in, RequestMsg, block_on="Address") {
         if (in_msg.Type == CoherenceRequestType:GETX) {
           trigger(Event:Other_GETX, in_msg.Address);
         } else if (in_msg.Type == CoherenceRequestType:GETS) {
@@ -264,7 +264,7 @@ machine(L1Cache, "AMD Hammer-like protocol")
   // Response Network
   in_port(responseToCache_in, ResponseMsg, responseToCache) {
     if (responseToCache_in.isReady()) {
-      peek(responseToCache_in, ResponseMsg) {
+      peek(responseToCache_in, ResponseMsg, block_on="Address") {
         if (in_msg.Type == CoherenceResponseType:ACK) {
           trigger(Event:Ack, in_msg.Address);
         } else if (in_msg.Type == CoherenceResponseType:ACK_SHARED) {
@@ -287,7 +287,7 @@ machine(L1Cache, "AMD Hammer-like protocol")
   // Mandatory Queue
   in_port(mandatoryQueue_in, CacheMsg, mandatoryQueue, desc="...") {
     if (mandatoryQueue_in.isReady()) {
-      peek(mandatoryQueue_in, CacheMsg) {
+      peek(mandatoryQueue_in, CacheMsg, block_on="LineAddress") {
 
         // Check for data access to blocks in I-cache and ifetchs to blocks in D-cache