diff -r 80e05832f025 -r 7217292ffa59 src/mem/protocol/MOESI_hammer-dir.sm --- a/src/mem/protocol/MOESI_hammer-dir.sm Thu Jan 06 15:34:28 2011 -0800 +++ b/src/mem/protocol/MOESI_hammer-dir.sm Thu Jan 06 15:35:01 2011 -0800 @@ -538,7 +538,13 @@ // directory DMA requests must wait for acks from all LLC caches, so // only decrement by 1. // - TBEs[address].NumPendingMsgs := TBEs[address].NumPendingMsgs - 1; + if ((in_msg.Type == CoherenceResponseType:DATA_SHARED) || + (in_msg.Type == CoherenceResponseType:DATA) || + (in_msg.Type == CoherenceResponseType:DATA_EXCLUSIVE)) { + TBEs[address].NumPendingMsgs := TBEs[address].NumPendingMsgs - 1; + } else { + TBEs[address].NumPendingMsgs := TBEs[address].NumPendingMsgs - in_msg.Acks; + } DPRINTF(RubySlicc, "%d\n", TBEs[address].NumPendingMsgs); } } @@ -547,11 +553,6 @@ peek(unblockNetwork_in, ResponseMsg) { assert(in_msg.Type == CoherenceResponseType:UNBLOCKS); DPRINTF(RubySlicc, "%d\n", TBEs[address].NumPendingMsgs); - // - // Note that cache data responses will have an ack count of 2. However, - // directory DMA requests must wait for acks from all LLC caches, so - // only decrement by 1. - // TBEs[address].NumPendingMsgs := TBEs[address].NumPendingMsgs - 1; DPRINTF(RubySlicc, "%d\n", TBEs[address].NumPendingMsgs); }