changeset 79cf09f5a234 in /z/repo/m5
details: http://repo.m5sim.org/m5?cmd=changeset;node=79cf09f5a234
description:
        slicc: added vnet_type field to identify response vnets from others

        Identifying response vnets versus other vnets will allow garnet to
        determine which vnets will carry data packets, and which will carry
        ctrl packets, and use appropriate buffer sizes (since data packets are 
larger
        than ctrl packets). This in turn allows the orion power model to 
accurately
        estimate buffer power.

diffstat:

 src/mem/protocol/MESI_CMP_directory-L1cache.sm                 |  10 +++---
 src/mem/protocol/MESI_CMP_directory-L2cache.sm                 |  14 ++++----
 src/mem/protocol/MESI_CMP_directory-dir.sm                     |   8 ++--
 src/mem/protocol/MESI_CMP_directory-dma.sm                     |   4 +-
 src/mem/protocol/MOESI_CMP_directory-L1cache.sm                |  10 +++---
 src/mem/protocol/MOESI_CMP_directory-L2cache.sm                |  14 ++++----
 src/mem/protocol/MOESI_CMP_directory-dir.sm                    |  12 +++---
 src/mem/protocol/MOESI_CMP_directory-dma.sm                    |  12 +++---
 src/mem/protocol/MOESI_CMP_token-L1cache.sm                    |  12 +++---
 src/mem/protocol/MOESI_CMP_token-L2cache.sm                    |  14 ++++----
 src/mem/protocol/MOESI_CMP_token-dir.sm                        |  16 +++++-----
 src/mem/protocol/MOESI_CMP_token-dma.sm                        |   4 +-
 src/mem/protocol/MOESI_hammer-cache.sm                         |  10 +++---
 src/mem/protocol/MOESI_hammer-dir.sm                           |  14 ++++----
 src/mem/protocol/MOESI_hammer-dma.sm                           |   4 +-
 src/mem/protocol/Network_test-cache.sm                         |   6 +-
 src/mem/protocol/Network_test-dir.sm                           |   6 +-
 src/mem/ruby/network/Network.hh                                |   4 +-
 src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.cc  |  10 +++++-
 src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.hh  |   6 ++-
 src/mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.cc |   6 ++-
 src/mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.hh |   6 ++-
 src/mem/ruby/network/simple/SimpleNetwork.cc                   |   6 ++-
 src/mem/ruby/network/simple/SimpleNetwork.hh                   |   4 +-
 src/mem/slicc/symbols/StateMachine.py                          |   3 +-
 25 files changed, 115 insertions(+), 100 deletions(-)

diffs (truncated from 531 to 300 lines):

diff -r 76f7c2858c5c -r 79cf09f5a234 
src/mem/protocol/MESI_CMP_directory-L1cache.sm
--- a/src/mem/protocol/MESI_CMP_directory-L1cache.sm    Wed May 18 03:04:14 
2011 -0400
+++ b/src/mem/protocol/MESI_CMP_directory-L1cache.sm    Wed May 18 03:06:07 
2011 -0400
@@ -39,17 +39,17 @@
   // NODE L1 CACHE
   // From this node's L1 cache TO the network
   // a local L1 -> this L2 bank, currently ordered with directory forwarded 
requests
-  MessageBuffer requestFromL1Cache, network="To", virtual_network="0", 
ordered="false";
+  MessageBuffer requestFromL1Cache, network="To", virtual_network="0", 
ordered="false", vnet_type="request";
   // a local L1 -> this L2 bank
-  MessageBuffer responseFromL1Cache, network="To", virtual_network="1", 
ordered="false";
-  MessageBuffer unblockFromL1Cache, network="To", virtual_network="2", 
ordered="false";
+  MessageBuffer responseFromL1Cache, network="To", virtual_network="1", 
ordered="false", vnet_type="response";
+  MessageBuffer unblockFromL1Cache, network="To", virtual_network="2", 
ordered="false", vnet_type="unblock";
 
 
   // To this node's L1 cache FROM the network
   // a L2 bank -> this L1
-  MessageBuffer requestToL1Cache, network="From", virtual_network="0", 
ordered="false";
+  MessageBuffer requestToL1Cache, network="From", virtual_network="0", 
ordered="false", vnet_type="request";
   // a L2 bank -> this L1
-  MessageBuffer responseToL1Cache, network="From", virtual_network="1", 
ordered="false";
+  MessageBuffer responseToL1Cache, network="From", virtual_network="1", 
ordered="false", vnet_type="response";
 
   // STATES
   state_declaration(State, desc="Cache states", default="L1Cache_State_I") {
diff -r 76f7c2858c5c -r 79cf09f5a234 
src/mem/protocol/MESI_CMP_directory-L2cache.sm
--- a/src/mem/protocol/MESI_CMP_directory-L2cache.sm    Wed May 18 03:04:14 
2011 -0400
+++ b/src/mem/protocol/MESI_CMP_directory-L2cache.sm    Wed May 18 03:06:07 
2011 -0400
@@ -40,15 +40,15 @@
 {
   // L2 BANK QUEUES
   // From local bank of L2 cache TO the network
-  MessageBuffer DirRequestFromL2Cache, network="To", virtual_network="0", 
ordered="false";  // this L2 bank -> Memory
-  MessageBuffer L1RequestFromL2Cache, network="To", virtual_network="0", 
ordered="false";  // this L2 bank -> a local L1
-  MessageBuffer responseFromL2Cache, network="To", virtual_network="1", 
ordered="false";  // this L2 bank -> a local L1 || Memory
+  MessageBuffer DirRequestFromL2Cache, network="To", virtual_network="0", 
ordered="false", vnet_type="request";  // this L2 bank -> Memory
+  MessageBuffer L1RequestFromL2Cache, network="To", virtual_network="0", 
ordered="false", vnet_type="request";  // this L2 bank -> a local L1
+  MessageBuffer responseFromL2Cache, network="To", virtual_network="1", 
ordered="false", vnet_type="response";  // this L2 bank -> a local L1 || Memory
 
   // FROM the network to this local bank of L2 cache
-  MessageBuffer unblockToL2Cache, network="From", virtual_network="2", 
ordered="false";  // a local L1 || Memory -> this L2 bank
-  MessageBuffer L1RequestToL2Cache, network="From", virtual_network="0", 
ordered="false";  // a local L1 -> this L2 bank
-  MessageBuffer responseToL2Cache, network="From", virtual_network="1", 
ordered="false";  // a local L1 || Memory -> this L2 bank
-//  MessageBuffer unblockToL2Cache, network="From", virtual_network="4", 
ordered="false";  // a local L1 || Memory -> this L2 bank
+  MessageBuffer unblockToL2Cache, network="From", virtual_network="2", 
ordered="false", vnet_type="unblock";  // a local L1 || Memory -> this L2 bank
+  MessageBuffer L1RequestToL2Cache, network="From", virtual_network="0", 
ordered="false", vnet_type="request";  // a local L1 -> this L2 bank
+  MessageBuffer responseToL2Cache, network="From", virtual_network="1", 
ordered="false", vnet_type="response";  // a local L1 || Memory -> this L2 bank
+//  MessageBuffer unblockToL2Cache, network="From", virtual_network="4", 
ordered="false", vnet_type="unblock";  // a local L1 || Memory -> this L2 bank
 
   // STATES
   state_declaration(State, desc="L2 Cache states", default="L2Cache_State_NP") 
{
diff -r 76f7c2858c5c -r 79cf09f5a234 src/mem/protocol/MESI_CMP_directory-dir.sm
--- a/src/mem/protocol/MESI_CMP_directory-dir.sm        Wed May 18 03:04:14 
2011 -0400
+++ b/src/mem/protocol/MESI_CMP_directory-dir.sm        Wed May 18 03:06:07 
2011 -0400
@@ -42,11 +42,11 @@
    int directory_latency = 6
 {
 
-  MessageBuffer requestToDir, network="From", virtual_network="0", 
ordered="false";
-  MessageBuffer responseToDir, network="From", virtual_network="1", 
ordered="false";
+  MessageBuffer requestToDir, network="From", virtual_network="0", 
ordered="false", vnet_type="request";
+  MessageBuffer responseToDir, network="From", virtual_network="1", 
ordered="false", vnet_type="response";
 
-  MessageBuffer requestFromDir, network="To", virtual_network="0", 
ordered="false";
-  MessageBuffer responseFromDir, network="To", virtual_network="1", 
ordered="false";
+  MessageBuffer requestFromDir, network="To", virtual_network="0", 
ordered="false", vnet_type="request";
+  MessageBuffer responseFromDir, network="To", virtual_network="1", 
ordered="false", vnet_type="response";
 
   // STATES
   state_declaration(State, desc="Directory states", 
default="Directory_State_I") {
diff -r 76f7c2858c5c -r 79cf09f5a234 src/mem/protocol/MESI_CMP_directory-dma.sm
--- a/src/mem/protocol/MESI_CMP_directory-dma.sm        Wed May 18 03:04:14 
2011 -0400
+++ b/src/mem/protocol/MESI_CMP_directory-dma.sm        Wed May 18 03:06:07 
2011 -0400
@@ -4,8 +4,8 @@
   int request_latency = 6
 {
 
-  MessageBuffer responseFromDir, network="From", virtual_network="1", 
ordered="true", no_vector="true";
-  MessageBuffer reqToDirectory, network="To", virtual_network="0", 
ordered="false", no_vector="true";
+  MessageBuffer responseFromDir, network="From", virtual_network="1", 
ordered="true", vnet_type="response", no_vector="true";
+  MessageBuffer reqToDirectory, network="To", virtual_network="0", 
ordered="false", vnet_type="request", no_vector="true";
 
   state_declaration(State, desc="DMA states", default="DMA_State_READY") {
     READY, AccessPermission:Invalid, desc="Ready to accept a new request";
diff -r 76f7c2858c5c -r 79cf09f5a234 
src/mem/protocol/MOESI_CMP_directory-L1cache.sm
--- a/src/mem/protocol/MOESI_CMP_directory-L1cache.sm   Wed May 18 03:04:14 
2011 -0400
+++ b/src/mem/protocol/MOESI_CMP_directory-L1cache.sm   Wed May 18 03:06:07 
2011 -0400
@@ -43,17 +43,17 @@
   // NODE L1 CACHE
   // From this node's L1 cache TO the network
   // a local L1 -> this L2 bank, currently ordered with directory forwarded 
requests
-  MessageBuffer requestFromL1Cache, network="To", virtual_network="0", 
ordered="false";
+  MessageBuffer requestFromL1Cache, network="To", virtual_network="0", 
ordered="false", vnet_type="request";
   // a local L1 -> this L2 bank
-  MessageBuffer responseFromL1Cache, network="To", virtual_network="2", 
ordered="false";
-//  MessageBuffer writebackFromL1Cache, network="To", virtual_network="3", 
ordered="false";
+  MessageBuffer responseFromL1Cache, network="To", virtual_network="2", 
ordered="false", vnet_type="response";
+//  MessageBuffer writebackFromL1Cache, network="To", virtual_network="3", 
ordered="false", vnet_type="writeback";
 
 
   // To this node's L1 cache FROM the network
   // a L2 bank -> this L1
-  MessageBuffer requestToL1Cache, network="From", virtual_network="0", 
ordered="false";
+  MessageBuffer requestToL1Cache, network="From", virtual_network="0", 
ordered="false", vnet_type="request";
   // a L2 bank -> this L1
-  MessageBuffer responseToL1Cache, network="From", virtual_network="2", 
ordered="false";
+  MessageBuffer responseToL1Cache, network="From", virtual_network="2", 
ordered="false", vnet_type="response";
 
 
 
diff -r 76f7c2858c5c -r 79cf09f5a234 
src/mem/protocol/MOESI_CMP_directory-L2cache.sm
--- a/src/mem/protocol/MOESI_CMP_directory-L2cache.sm   Wed May 18 03:04:14 
2011 -0400
+++ b/src/mem/protocol/MOESI_CMP_directory-L2cache.sm   Wed May 18 03:06:07 
2011 -0400
@@ -40,15 +40,15 @@
 
   // L2 BANK QUEUES
   // From local bank of L2 cache TO the network
-  MessageBuffer L1RequestFromL2Cache, network="To", virtual_network="0", 
ordered="false";  // this L2 bank -> a local L1
-  MessageBuffer GlobalRequestFromL2Cache, network="To", virtual_network="1", 
ordered="false";  // this L2 bank -> mod-directory
-  MessageBuffer responseFromL2Cache, network="To", virtual_network="2", 
ordered="false";  // this L2 bank -> a local L1 || mod-directory
+  MessageBuffer L1RequestFromL2Cache, network="To", virtual_network="0", 
ordered="false", vnet_type="request";  // this L2 bank -> a local L1
+  MessageBuffer GlobalRequestFromL2Cache, network="To", virtual_network="1", 
ordered="false", vnet_type="request";  // this L2 bank -> mod-directory
+  MessageBuffer responseFromL2Cache, network="To", virtual_network="2", 
ordered="false", vnet_type="response";  // this L2 bank -> a local L1 || 
mod-directory
 
   // FROM the network to this local bank of L2 cache
-  MessageBuffer L1RequestToL2Cache, network="From", virtual_network="0", 
ordered="false";  // a local L1 -> this L2 bank, Lets try this???
-  MessageBuffer GlobalRequestToL2Cache, network="From", virtual_network="1", 
ordered="false";  // mod-directory -> this L2 bank
-  MessageBuffer responseToL2Cache, network="From", virtual_network="2", 
ordered="false";  // a local L1 || mod-directory -> this L2 bank
-//  MessageBuffer L1WritebackToL2Cache, network="From", virtual_network="3", 
ordered="false";
+  MessageBuffer L1RequestToL2Cache, network="From", virtual_network="0", 
ordered="false", vnet_type="request";  // a local L1 -> this L2 bank, Lets try 
this???
+  MessageBuffer GlobalRequestToL2Cache, network="From", virtual_network="1", 
ordered="false", vnet_type="request";  // mod-directory -> this L2 bank
+  MessageBuffer responseToL2Cache, network="From", virtual_network="2", 
ordered="false", vnet_type="response";  // a local L1 || mod-directory -> this 
L2 bank
+//  MessageBuffer L1WritebackToL2Cache, network="From", virtual_network="3", 
ordered="false", vnet_type="writeback";
 
   // STATES
   state_declaration(State, desc="L2 Cache states", default="L2Cache_State_I") {
diff -r 76f7c2858c5c -r 79cf09f5a234 src/mem/protocol/MOESI_CMP_directory-dir.sm
--- a/src/mem/protocol/MOESI_CMP_directory-dir.sm       Wed May 18 03:04:14 
2011 -0400
+++ b/src/mem/protocol/MOESI_CMP_directory-dir.sm       Wed May 18 03:06:07 
2011 -0400
@@ -38,13 +38,13 @@
 {
 
   // ** IN QUEUES **
-  MessageBuffer foo1, network="From", virtual_network="0", ordered="false";  
// a mod-L2 bank -> this Dir
-  MessageBuffer requestToDir, network="From", virtual_network="1", 
ordered="false";  // a mod-L2 bank -> this Dir
-  MessageBuffer responseToDir, network="From", virtual_network="2", 
ordered="false";  // a mod-L2 bank -> this Dir
+  MessageBuffer foo1, network="From", virtual_network="0", ordered="false", 
vnet_type="foo";  // a mod-L2 bank -> this Dir
+  MessageBuffer requestToDir, network="From", virtual_network="1", 
ordered="false", vnet_type="request";  // a mod-L2 bank -> this Dir
+  MessageBuffer responseToDir, network="From", virtual_network="2", 
ordered="false", vnet_type="response";  // a mod-L2 bank -> this Dir
   
-  MessageBuffer goo1, network="To", virtual_network="0", ordered="false";
-  MessageBuffer forwardFromDir, network="To", virtual_network="1", 
ordered="false";
-  MessageBuffer responseFromDir, network="To", virtual_network="2", 
ordered="false";  // Dir -> mod-L2 bank
+  MessageBuffer goo1, network="To", virtual_network="0", ordered="false", 
vnet_type="goo";
+  MessageBuffer forwardFromDir, network="To", virtual_network="1", 
ordered="false", vnet_type="forward";
+  MessageBuffer responseFromDir, network="To", virtual_network="2", 
ordered="false", vnet_type="response";  // Dir -> mod-L2 bank
 
 
   // STATES
diff -r 76f7c2858c5c -r 79cf09f5a234 src/mem/protocol/MOESI_CMP_directory-dma.sm
--- a/src/mem/protocol/MOESI_CMP_directory-dma.sm       Wed May 18 03:04:14 
2011 -0400
+++ b/src/mem/protocol/MOESI_CMP_directory-dma.sm       Wed May 18 03:06:07 
2011 -0400
@@ -5,13 +5,13 @@
   int response_latency = 14
 {
   
-  MessageBuffer goo1, network="From", virtual_network="0", ordered="false";
-  MessageBuffer goo2, network="From", virtual_network="1", ordered="false";
-  MessageBuffer responseFromDir, network="From", virtual_network="2", 
ordered="false";
+  MessageBuffer goo1, network="From", virtual_network="0", ordered="false", 
vnet_type="goo";
+  MessageBuffer goo2, network="From", virtual_network="1", ordered="false", 
vnet_type="goo";
+  MessageBuffer responseFromDir, network="From", virtual_network="2", 
ordered="false", vnet_type="response";
 
-  MessageBuffer foo1, network="To", virtual_network="0", ordered="false";
-  MessageBuffer reqToDir, network="To", virtual_network="1", ordered="false";
-  MessageBuffer respToDir, network="To", virtual_network="2", ordered="false";
+  MessageBuffer foo1, network="To", virtual_network="0", ordered="false", 
vnet_type="foo";
+  MessageBuffer reqToDir, network="To", virtual_network="1", ordered="false", 
vnet_type="request";
+  MessageBuffer respToDir, network="To", virtual_network="2", ordered="false", 
vnet_type="dmaresponse";
   
   state_declaration(State, desc="DMA states", default="DMA_State_READY") {
     READY, AccessPermission:Invalid, desc="Ready to accept a new request";
diff -r 76f7c2858c5c -r 79cf09f5a234 src/mem/protocol/MOESI_CMP_token-L1cache.sm
--- a/src/mem/protocol/MOESI_CMP_token-L1cache.sm       Wed May 18 03:04:14 
2011 -0400
+++ b/src/mem/protocol/MOESI_CMP_token-L1cache.sm       Wed May 18 03:06:07 
2011 -0400
@@ -49,18 +49,18 @@
   // From this node's L1 cache TO the network
 
   // a local L1 -> this L2 bank
-  MessageBuffer responseFromL1Cache, network="To", virtual_network="4", 
ordered="false";
-  MessageBuffer persistentFromL1Cache, network="To", virtual_network="3", 
ordered="true";
+  MessageBuffer responseFromL1Cache, network="To", virtual_network="4", 
ordered="false", vnet_type="response";
+  MessageBuffer persistentFromL1Cache, network="To", virtual_network="3", 
ordered="true", vnet_type="persistent";
   // a local L1 -> this L2 bank, currently ordered with directory forwarded 
requests
-  MessageBuffer requestFromL1Cache, network="To", virtual_network="1", 
ordered="false";
+  MessageBuffer requestFromL1Cache, network="To", virtual_network="1", 
ordered="false", vnet_type="request";
 
 
   // To this node's L1 cache FROM the network
   // a L2 bank -> this L1
-  MessageBuffer responseToL1Cache, network="From", virtual_network="4", 
ordered="false";
-  MessageBuffer persistentToL1Cache, network="From", virtual_network="3", 
ordered="true";
+  MessageBuffer responseToL1Cache, network="From", virtual_network="4", 
ordered="false", vnet_type="response";
+  MessageBuffer persistentToL1Cache, network="From", virtual_network="3", 
ordered="true", vnet_type="persistent";
   // a L2 bank -> this L1
-  MessageBuffer requestToL1Cache, network="From", virtual_network="1", 
ordered="false";
+  MessageBuffer requestToL1Cache, network="From", virtual_network="1", 
ordered="false", vnet_type="request";
 
   // STATES
   state_declaration(State, desc="Cache states", default="L1Cache_State_I") {
diff -r 76f7c2858c5c -r 79cf09f5a234 src/mem/protocol/MOESI_CMP_token-L2cache.sm
--- a/src/mem/protocol/MOESI_CMP_token-L2cache.sm       Wed May 18 03:04:14 
2011 -0400
+++ b/src/mem/protocol/MOESI_CMP_token-L2cache.sm       Wed May 18 03:06:07 
2011 -0400
@@ -44,22 +44,22 @@
   // From local bank of L2 cache TO the network
 
   // this L2 bank -> a local L1 || mod-directory
-  MessageBuffer responseFromL2Cache, network="To", virtual_network="4", 
ordered="false";  
+  MessageBuffer responseFromL2Cache, network="To", virtual_network="4", 
ordered="false", vnet_type="response";
   // this L2 bank -> mod-directory
-  MessageBuffer GlobalRequestFromL2Cache, network="To", virtual_network="2", 
ordered="false";  
+  MessageBuffer GlobalRequestFromL2Cache, network="To", virtual_network="2", 
ordered="false", vnet_type="request";
   // this L2 bank -> a local L1
-  MessageBuffer L1RequestFromL2Cache, network="To", virtual_network="1", 
ordered="false";  
+  MessageBuffer L1RequestFromL2Cache, network="To", virtual_network="1", 
ordered="false", vnet_type="request";
 
 
   // FROM the network to this local bank of L2 cache
 
   // a local L1 || mod-directory -> this L2 bank
-  MessageBuffer responseToL2Cache, network="From", virtual_network="4", 
ordered="false";  
-  MessageBuffer persistentToL2Cache, network="From", virtual_network="3", 
ordered="true";
+  MessageBuffer responseToL2Cache, network="From", virtual_network="4", 
ordered="false", vnet_type="response";
+  MessageBuffer persistentToL2Cache, network="From", virtual_network="3", 
ordered="true", vnet_type="persistent";
   // mod-directory -> this L2 bank
-  MessageBuffer GlobalRequestToL2Cache, network="From", virtual_network="2", 
ordered="false";  
+  MessageBuffer GlobalRequestToL2Cache, network="From", virtual_network="2", 
ordered="false", vnet_type="request";
   // a local L1 -> this L2 bank
-  MessageBuffer L1RequestToL2Cache, network="From", virtual_network="1", 
ordered="false";  
+  MessageBuffer L1RequestToL2Cache, network="From", virtual_network="1", 
ordered="false", vnet_type="request";
 
   // STATES
   state_declaration(State, desc="L2 Cache states", default="L2Cache_State_I") {
diff -r 76f7c2858c5c -r 79cf09f5a234 src/mem/protocol/MOESI_CMP_token-dir.sm
--- a/src/mem/protocol/MOESI_CMP_token-dir.sm   Wed May 18 03:04:14 2011 -0400
+++ b/src/mem/protocol/MOESI_CMP_token-dir.sm   Wed May 18 03:06:07 2011 -0400
@@ -41,15 +41,15 @@
    int fixed_timeout_latency = 100
 {
 
-  MessageBuffer dmaResponseFromDir, network="To", virtual_network="5", 
ordered="true";
-  MessageBuffer responseFromDir, network="To", virtual_network="4", 
ordered="false";
-  MessageBuffer persistentFromDir, network="To", virtual_network="3", 
ordered="true";
-  MessageBuffer requestFromDir, network="To", virtual_network="1", 
ordered="false";
+  MessageBuffer dmaResponseFromDir, network="To", virtual_network="5", 
ordered="true", vnet_type="response";
+  MessageBuffer responseFromDir, network="To", virtual_network="4", 
ordered="false", vnet_type="response";
+  MessageBuffer persistentFromDir, network="To", virtual_network="3", 
ordered="true", vnet_type="persistent";
+  MessageBuffer requestFromDir, network="To", virtual_network="1", 
ordered="false", vnet_type="request";
 
-  MessageBuffer responseToDir, network="From", virtual_network="4", 
ordered="false";
-  MessageBuffer persistentToDir, network="From", virtual_network="3", 
ordered="true";
-  MessageBuffer requestToDir, network="From", virtual_network="2", 
ordered="false";
-  MessageBuffer dmaRequestToDir, network="From", virtual_network="0", 
ordered="true";
+  MessageBuffer responseToDir, network="From", virtual_network="4", 
ordered="false", vnet_type="response";
+  MessageBuffer persistentToDir, network="From", virtual_network="3", 
ordered="true", vnet_type="persistent";
+  MessageBuffer requestToDir, network="From", virtual_network="2", 
ordered="false", vnet_type="request";
+  MessageBuffer dmaRequestToDir, network="From", virtual_network="0", 
ordered="true", vnet_type="request";
 
   // STATES
   state_declaration(State, desc="Directory states", 
default="Directory_State_O") {
diff -r 76f7c2858c5c -r 79cf09f5a234 src/mem/protocol/MOESI_CMP_token-dma.sm
--- a/src/mem/protocol/MOESI_CMP_token-dma.sm   Wed May 18 03:04:14 2011 -0400
+++ b/src/mem/protocol/MOESI_CMP_token-dma.sm   Wed May 18 03:06:07 2011 -0400
@@ -32,8 +32,8 @@
   int request_latency = 6
 {
 
-  MessageBuffer responseFromDir, network="From", virtual_network="5", 
ordered="true", no_vector="true";
-  MessageBuffer reqToDirectory, network="To", virtual_network="0", 
ordered="false", no_vector="true";
+  MessageBuffer responseFromDir, network="From", virtual_network="5", 
ordered="true", vnet_type="response", no_vector="true";
+  MessageBuffer reqToDirectory, network="To", virtual_network="0", 
ordered="false", vnet_type="request", no_vector="true";
 
   state_declaration(State, desc="DMA states", default="DMA_State_READY") {
     READY, AccessPermission:Invalid, desc="Ready to accept a new request";
diff -r 76f7c2858c5c -r 79cf09f5a234 src/mem/protocol/MOESI_hammer-cache.sm
--- a/src/mem/protocol/MOESI_hammer-cache.sm    Wed May 18 03:04:14 2011 -0400
+++ b/src/mem/protocol/MOESI_hammer-cache.sm    Wed May 18 03:06:07 2011 -0400
@@ -45,12 +45,12 @@
 {
 
   // NETWORK BUFFERS
-  MessageBuffer requestFromCache, network="To", virtual_network="2", 
ordered="false";
-  MessageBuffer responseFromCache, network="To", virtual_network="4", 
ordered="false";
-  MessageBuffer unblockFromCache, network="To", virtual_network="5", 
ordered="false";
+  MessageBuffer requestFromCache, network="To", virtual_network="2", 
ordered="false", vnet_type="request";
+  MessageBuffer responseFromCache, network="To", virtual_network="4", 
ordered="false", vnet_type="response";
+  MessageBuffer unblockFromCache, network="To", virtual_network="5", 
ordered="false", vnet_type="unblock";
 
-  MessageBuffer forwardToCache, network="From", virtual_network="3", 
ordered="false";
_______________________________________________
gem5-dev mailing list
gem5-dev@m5sim.org
http://m5sim.org/mailman/listinfo/gem5-dev

Reply via email to