ruby: remove unused code in protocols

diff --git a/src/mem/protocol/MESI_CMP_directory-msg.sm b/src/mem/protocol/MESI_CMP_directory-msg.sm
index 2292ac1d132f84c238aeec6fa8a4f59f828178d7..67619f075fe34f079570a03deff228b851262cfb 100644 (file)
--- a/src/mem/protocol/MESI_CMP_directory-msg.sm
+++ b/src/mem/protocol/MESI_CMP_directory-msg.sm
@@ -83,5 +83,3 @@ structure(ResponseMsg, desc="...", interface="NetworkMessage") {
   int AckCount, default="0",  desc="number of acks in this message";
   MessageSizeType MessageSize,  desc="size category of the message";
 }
-
-

diff --git a/src/mem/protocol/MI_example-msg.sm b/src/mem/protocol/MI_example-msg.sm
index 24e53990c301e7b67d261c871a59aa897eae3f39..2fb1c48ba6f8b693f4c1f6c917e88c96744520d2 100644 (file)
--- a/src/mem/protocol/MI_example-msg.sm
+++ b/src/mem/protocol/MI_example-msg.sm
@@ -51,17 +51,6 @@ enumeration(CoherenceResponseType, desc="...") {
   WRITEBACK,         desc="Generic writeback (contains data)";
 }
 
-// TriggerType
-enumeration(TriggerType, desc="...") {
-  ALL_ACKS,            desc="See corresponding event";
-}
-
-// TriggerMsg
-structure(TriggerMsg, desc="...", interface="Message") {
-  Address Address,             desc="Physical address for this request";
-  TriggerType Type,            desc="Type of trigger";
-}
-
 // RequestMsg (and also forwarded requests)
 structure(RequestMsg, desc="...", interface="NetworkMessage") {
   Address Address,             desc="Physical address for this request";

diff --git a/src/mem/protocol/MOESI_CMP_directory-dir.sm b/src/mem/protocol/MOESI_CMP_directory-dir.sm
index 202bd11f66beb8d0b8c2e18c82c6791db0f27f96..02e3d36353018b44f8afa82828621320bea10af9 100644 (file)
--- a/src/mem/protocol/MOESI_CMP_directory-dir.sm
+++ b/src/mem/protocol/MOESI_CMP_directory-dir.sm
@@ -38,11 +38,9 @@ machine(Directory, "Directory protocol")
 {
 
   // ** IN QUEUES **
-  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", 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
 
@@ -223,17 +221,10 @@ machine(Directory, "Directory protocol")
   out_port(forwardNetwork_out, RequestMsg, forwardFromDir);
   out_port(responseNetwork_out, ResponseMsg, responseFromDir);
 //  out_port(requestQueue_out, ResponseMsg, requestFromDir); // For recycling requests
-  out_port(goo1_out, ResponseMsg, goo1);
   out_port(memQueue_out, MemoryMsg, memBuffer);
 
   // ** IN_PORTS **
 
-  in_port(foo1_in, ResponseMsg, foo1) {
-
-  }
-
-  // in_port(unblockNetwork_in, ResponseMsg, unblockToDir) {
-  //  if (unblockNetwork_in.isReady()) {
   in_port(unblockNetwork_in, ResponseMsg, responseToDir) {
     if (unblockNetwork_in.isReady()) {
       peek(unblockNetwork_in, ResponseMsg) {

diff --git a/src/mem/protocol/MOESI_CMP_directory-dma.sm b/src/mem/protocol/MOESI_CMP_directory-dma.sm
index e3aefbe514c43eec923590ccf75d3cfcf0eb7c2a..36b89056c179c69d81f5f76b4f794c3d4711bc71 100644 (file)
--- a/src/mem/protocol/MOESI_CMP_directory-dma.sm
+++ b/src/mem/protocol/MOESI_CMP_directory-dma.sm
@@ -4,12 +4,8 @@ machine(DMA, "DMA Controller")
   int request_latency = 14,
   int response_latency = 14
 {
-  
-  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", 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";
   
@@ -74,25 +70,8 @@ machine(DMA, "DMA Controller")
 
   out_port(reqToDirectory_out, RequestMsg, reqToDir, desc="...");
   out_port(respToDirectory_out, ResponseMsg, respToDir, desc="...");
-  out_port(foo1_out, ResponseMsg, foo1, desc="...");
   out_port(triggerQueue_out, TriggerMsg, triggerQueue, desc="...");
 
-  in_port(goo1_in, RequestMsg, goo1) {
-    if (goo1_in.isReady()) {
-      peek(goo1_in, RequestMsg) {
-        assert(false);
-      }
-    }
-  }
-  
-  in_port(goo2_in, RequestMsg, goo2) {
-    if (goo2_in.isReady()) {
-      peek(goo2_in, RequestMsg) {
-        assert(false);
-      }
-    }
-  }
-
   in_port(dmaRequestQueue_in, SequencerMsg, mandatoryQueue, desc="...") {
     if (dmaRequestQueue_in.isReady()) {
       peek(dmaRequestQueue_in, SequencerMsg) {

diff --git a/src/mem/protocol/MOESI_CMP_directory-msg.sm b/src/mem/protocol/MOESI_CMP_directory-msg.sm
index 07cc51c9a7d314a3b672dc59f844dc176d537501..7b203537f9f36b5edc49f36e010dac3766ca344e 100644 (file)
--- a/src/mem/protocol/MOESI_CMP_directory-msg.sm
+++ b/src/mem/protocol/MOESI_CMP_directory-msg.sm
@@ -100,5 +100,3 @@ structure(ResponseMsg, desc="...", interface="NetworkMessage") {
   int Acks,                    desc="How many acks to expect";
   MessageSizeType MessageSize, desc="size category of the message";
 }
-
-

diff --git a/src/mem/protocol/MOESI_CMP_token-msg.sm b/src/mem/protocol/MOESI_CMP_token-msg.sm
index 6f1504d54bc845e38d72e9b7d17fd103b40345a7..b1c3f458068224f2750f585929958de9cda2a8b1 100644 (file)
--- a/src/mem/protocol/MOESI_CMP_token-msg.sm
+++ b/src/mem/protocol/MOESI_CMP_token-msg.sm
@@ -57,20 +57,6 @@ enumeration(CoherenceResponseType, desc="...") {
   INV,         desc="L1 informing L2 of loss of all tokens";
 }
 
-// TriggerType
-enumeration(TriggerType, desc="...") {
-  REQUEST_TIMEOUT,         desc="See corresponding event";
-  USE_TIMEOUT,             desc="See corresponding event";
-  DATA,                    desc="data for dma read response";
-  DATA_ALL_TOKENS,         desc="data and all tokens for dma write response";
-}
-
-// TriggerMsg
-structure(TriggerMsg, desc="...", interface="Message") {
-  Address Address,             desc="Physical address for this request";
-  TriggerType Type,            desc="Type of trigger";
-}
-
 // PersistentMsg
 structure(PersistentMsg, desc="...", interface="NetworkMessage") {
   Address Address,             desc="Physical address for this request";

diff --git a/src/mem/protocol/Network_test-msg.sm b/src/mem/protocol/Network_test-msg.sm
index 7de35f176094551de8ca520bca81387abc33c204..6492024d81206dcaa44aecb65aa900b20958a388 100644 (file)
--- a/src/mem/protocol/Network_test-msg.sm
+++ b/src/mem/protocol/Network_test-msg.sm
@@ -41,37 +41,3 @@ structure(RequestMsg, desc="...", interface="NetworkMessage") {
   DataBlock DataBlk,           desc="data for the cache line";
   MessageSizeType MessageSize, desc="size category of the message";
 }
-
-
-enumeration(DMARequestType, desc="...", default="DMARequestType_NULL") {
-  READ,          desc="Memory Read";
-  WRITE,         desc="Memory Write";
-  NULL,          desc="Invalid";
-}
-
-enumeration(DMAResponseType, desc="...", default="DMAResponseType_NULL") {
-  DATA,          desc="DATA read";
-  ACK,           desc="ACK write";
-  NULL,          desc="Invalid";
-}
-
-structure(DMARequestMsg, desc="...", interface="NetworkMessage") {
-  DMARequestType Type,       desc="Request type (read/write)";
-  Address PhysicalAddress,   desc="Physical address for this request";
-  Address LineAddress,       desc="Line address for this request";
-  NetDest Destination,       desc="Destination";
-  DataBlock DataBlk,         desc="DataBlk attached to this request";
-  int Len,                   desc="The length of the request";
-  MessageSizeType MessageSize, desc="size category of the message";
-}
-
-structure(DMAResponseMsg, desc="...", interface="NetworkMessage") {
-  DMAResponseType Type,      desc="Response type (DATA/ACK)";
-  Address PhysicalAddress,   desc="Physical address for this request";
-  Address LineAddress,       desc="Line address for this request";
-  NetDest Destination,       desc="Destination";
-  DataBlock DataBlk,         desc="DataBlk attached to this request";
-  MessageSizeType MessageSize, desc="size category of the message";
-}
-
-