changeset 56dfde6abe48 in /z/repo/m5
details: http://repo.m5sim.org/m5?cmd=changeset;node=56dfde6abe48
description:
ruby: Reordered protocol buffers
Reordered vnet priorities to agree with PerfectSwitch for protocols
MI_example,
MOESI_CMP_token, and MOESI_hammer
diffstat:
10 files changed, 50 insertions(+), 50 deletions(-)
src/mem/protocol/MI_example-cache.sm | 8 ++++----
src/mem/protocol/MI_example-dir.sm | 12 ++++++------
src/mem/protocol/MI_example-dma.sm | 4 ++--
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 | 16 ++++++++--------
src/mem/protocol/MOESI_hammer-dma.sm | 4 ++--
diffs (231 lines):
diff -r 46b02e79bf2c -r 56dfde6abe48 src/mem/protocol/MI_example-cache.sm
--- a/src/mem/protocol/MI_example-cache.sm Sun Mar 21 21:22:21 2010 -0700
+++ b/src/mem/protocol/MI_example-cache.sm Sun Mar 21 21:22:21 2010 -0700
@@ -7,11 +7,11 @@
{
// NETWORK BUFFERS
- MessageBuffer requestFromCache, network="To", virtual_network="0",
ordered="true";
- MessageBuffer responseFromCache, network="To", virtual_network="1",
ordered="true";
+ MessageBuffer requestFromCache, network="To", virtual_network="2",
ordered="true";
+ MessageBuffer responseFromCache, network="To", virtual_network="4",
ordered="true";
- MessageBuffer forwardToCache, network="From", virtual_network="2",
ordered="true";
- MessageBuffer responseToCache, network="From", virtual_network="1",
ordered="true";
+ MessageBuffer forwardToCache, network="From", virtual_network="3",
ordered="true";
+ MessageBuffer responseToCache, network="From", virtual_network="4",
ordered="true";
// STATES
enumeration(State, desc="Cache states") {
diff -r 46b02e79bf2c -r 56dfde6abe48 src/mem/protocol/MI_example-dir.sm
--- a/src/mem/protocol/MI_example-dir.sm Sun Mar 21 21:22:21 2010 -0700
+++ b/src/mem/protocol/MI_example-dir.sm Sun Mar 21 21:22:21 2010 -0700
@@ -5,12 +5,12 @@
int directory_latency = 12
{
- MessageBuffer forwardFromDir, network="To", virtual_network="2",
ordered="false";
- MessageBuffer responseFromDir, network="To", virtual_network="1",
ordered="false";
- MessageBuffer dmaRequestFromDir, network="To", virtual_network="4",
ordered="true";
+ MessageBuffer forwardFromDir, network="To", virtual_network="3",
ordered="false";
+ MessageBuffer responseFromDir, network="To", virtual_network="4",
ordered="false";
+ MessageBuffer dmaResponseFromDir, network="To", virtual_network="1",
ordered="true";
- MessageBuffer requestToDir, network="From", virtual_network="0",
ordered="true";
- MessageBuffer dmaRequestToDir, network="From", virtual_network="5",
ordered="true";
+ MessageBuffer requestToDir, network="From", virtual_network="2",
ordered="true";
+ MessageBuffer dmaRequestToDir, network="From", virtual_network="0",
ordered="true";
// STATES
enumeration(State, desc="Directory states", default="Directory_State_I") {
@@ -117,7 +117,7 @@
out_port(forwardNetwork_out, RequestMsg, forwardFromDir);
out_port(responseNetwork_out, ResponseMsg, responseFromDir);
out_port(requestQueue_out, ResponseMsg, requestToDir); // For recycling
requests
- out_port(dmaResponseNetwork_out, DMAResponseMsg, dmaRequestFromDir);
+ out_port(dmaResponseNetwork_out, DMAResponseMsg, dmaResponseFromDir);
//added by SS
out_port(memQueue_out, MemoryMsg, memBuffer);
diff -r 46b02e79bf2c -r 56dfde6abe48 src/mem/protocol/MI_example-dma.sm
--- a/src/mem/protocol/MI_example-dma.sm Sun Mar 21 21:22:21 2010 -0700
+++ b/src/mem/protocol/MI_example-dma.sm Sun Mar 21 21:22:21 2010 -0700
@@ -4,8 +4,8 @@
int request_latency = 6
{
- MessageBuffer responseFromDir, network="From", virtual_network="4",
ordered="true", no_vector="true";
- MessageBuffer reqToDirectory, network="To", virtual_network="5",
ordered="false", no_vector="true";
+ MessageBuffer responseFromDir, network="From", virtual_network="1",
ordered="true", no_vector="true";
+ MessageBuffer reqToDirectory, network="To", virtual_network="0",
ordered="false", no_vector="true";
enumeration(State, desc="DMA states", default="DMA_State_READY") {
READY, desc="Ready to accept a new request";
diff -r 46b02e79bf2c -r 56dfde6abe48 src/mem/protocol/MOESI_CMP_token-L1cache.sm
--- a/src/mem/protocol/MOESI_CMP_token-L1cache.sm Sun Mar 21 21:22:21
2010 -0700
+++ b/src/mem/protocol/MOESI_CMP_token-L1cache.sm Sun Mar 21 21:22:21
2010 -0700
@@ -48,18 +48,18 @@
// From this node's L1 cache TO the network
// a local L1 -> this L2 bank
- MessageBuffer responseFromL1Cache, network="To", virtual_network="1",
ordered="false";
- MessageBuffer persistentFromL1Cache, network="To", virtual_network="2",
ordered="true";
+ MessageBuffer responseFromL1Cache, network="To", virtual_network="4",
ordered="false";
+ MessageBuffer persistentFromL1Cache, network="To", virtual_network="3",
ordered="true";
// a local L1 -> this L2 bank, currently ordered with directory forwarded
requests
- MessageBuffer requestFromL1Cache, network="To", virtual_network="4",
ordered="false";
+ MessageBuffer requestFromL1Cache, network="To", virtual_network="1",
ordered="false";
// To this node's L1 cache FROM the network
// a L2 bank -> this L1
- MessageBuffer responseToL1Cache, network="From", virtual_network="1",
ordered="false";
- MessageBuffer persistentToL1Cache, network="From", virtual_network="2",
ordered="true";
+ MessageBuffer responseToL1Cache, network="From", virtual_network="4",
ordered="false";
+ MessageBuffer persistentToL1Cache, network="From", virtual_network="3",
ordered="true";
// a L2 bank -> this L1
- MessageBuffer requestToL1Cache, network="From", virtual_network="4",
ordered="false";
+ MessageBuffer requestToL1Cache, network="From", virtual_network="1",
ordered="false";
// STATES
enumeration(State, desc="Cache states", default="L1Cache_State_I") {
diff -r 46b02e79bf2c -r 56dfde6abe48 src/mem/protocol/MOESI_CMP_token-L2cache.sm
--- a/src/mem/protocol/MOESI_CMP_token-L2cache.sm Sun Mar 21 21:22:21
2010 -0700
+++ b/src/mem/protocol/MOESI_CMP_token-L2cache.sm Sun Mar 21 21:22:21
2010 -0700
@@ -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="1",
ordered="false";
+ MessageBuffer responseFromL2Cache, network="To", virtual_network="4",
ordered="false";
// this L2 bank -> mod-directory
- MessageBuffer GlobalRequestFromL2Cache, network="To", virtual_network="3",
ordered="false";
+ MessageBuffer GlobalRequestFromL2Cache, network="To", virtual_network="2",
ordered="false";
// this L2 bank -> a local L1
- MessageBuffer L1RequestFromL2Cache, network="To", virtual_network="4",
ordered="false";
+ MessageBuffer L1RequestFromL2Cache, network="To", virtual_network="1",
ordered="false";
// FROM the network to this local bank of L2 cache
// a local L1 || mod-directory -> this L2 bank
- MessageBuffer responseToL2Cache, network="From", virtual_network="1",
ordered="false";
- MessageBuffer persistentToL2Cache, network="From", virtual_network="2",
ordered="true";
+ MessageBuffer responseToL2Cache, network="From", virtual_network="4",
ordered="false";
+ MessageBuffer persistentToL2Cache, network="From", virtual_network="3",
ordered="true";
// mod-directory -> this L2 bank
- MessageBuffer GlobalRequestToL2Cache, network="From", virtual_network="3",
ordered="false";
+ MessageBuffer GlobalRequestToL2Cache, network="From", virtual_network="2",
ordered="false";
// a local L1 -> this L2 bank
- MessageBuffer L1RequestToL2Cache, network="From", virtual_network="4",
ordered="false";
+ MessageBuffer L1RequestToL2Cache, network="From", virtual_network="1",
ordered="false";
// STATES
enumeration(State, desc="L2 Cache states", default="L2Cache_State_I") {
diff -r 46b02e79bf2c -r 56dfde6abe48 src/mem/protocol/MOESI_CMP_token-dir.sm
--- a/src/mem/protocol/MOESI_CMP_token-dir.sm Sun Mar 21 21:22:21 2010 -0700
+++ b/src/mem/protocol/MOESI_CMP_token-dir.sm Sun Mar 21 21:22:21 2010 -0700
@@ -41,15 +41,15 @@
int fixed_timeout_latency = 300
{
- MessageBuffer dmaResponseFromDir, network="To", virtual_network="0",
ordered="true";
- MessageBuffer responseFromDir, network="To", virtual_network="1",
ordered="false";
- MessageBuffer persistentFromDir, network="To", virtual_network="2",
ordered="true";
- MessageBuffer requestFromDir, network="To", virtual_network="4",
ordered="false";
+ 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 responseToDir, network="From", virtual_network="1",
ordered="false";
- MessageBuffer persistentToDir, network="From", virtual_network="2",
ordered="true";
- MessageBuffer requestToDir, network="From", virtual_network="3",
ordered="false";
- MessageBuffer dmaRequestToDir, network="From", virtual_network="5",
ordered="true";
+ 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";
// STATES
enumeration(State, desc="Directory states", default="Directory_State_O") {
diff -r 46b02e79bf2c -r 56dfde6abe48 src/mem/protocol/MOESI_CMP_token-dma.sm
--- a/src/mem/protocol/MOESI_CMP_token-dma.sm Sun Mar 21 21:22:21 2010 -0700
+++ b/src/mem/protocol/MOESI_CMP_token-dma.sm Sun Mar 21 21:22:21 2010 -0700
@@ -32,8 +32,8 @@
int request_latency = 6
{
- MessageBuffer responseFromDir, network="From", virtual_network="0",
ordered="true", no_vector="true";
- MessageBuffer reqToDirectory, network="To", virtual_network="5",
ordered="false", no_vector="true";
+ MessageBuffer responseFromDir, network="From", virtual_network="5",
ordered="true", no_vector="true";
+ MessageBuffer reqToDirectory, network="To", virtual_network="0",
ordered="false", no_vector="true";
enumeration(State, desc="DMA states", default="DMA_State_READY") {
READY, desc="Ready to accept a new request";
diff -r 46b02e79bf2c -r 56dfde6abe48 src/mem/protocol/MOESI_hammer-cache.sm
--- a/src/mem/protocol/MOESI_hammer-cache.sm Sun Mar 21 21:22:21 2010 -0700
+++ b/src/mem/protocol/MOESI_hammer-cache.sm Sun Mar 21 21:22:21 2010 -0700
@@ -43,12 +43,12 @@
{
// NETWORK BUFFERS
- MessageBuffer requestFromCache, network="To", virtual_network="3",
ordered="false";
- MessageBuffer responseFromCache, network="To", virtual_network="1",
ordered="false";
- MessageBuffer unblockFromCache, network="To", virtual_network="0",
ordered="false";
+ 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 forwardToCache, network="From", virtual_network="2",
ordered="false";
- MessageBuffer responseToCache, network="From", virtual_network="1",
ordered="false";
+ MessageBuffer forwardToCache, network="From", virtual_network="3",
ordered="false";
+ MessageBuffer responseToCache, network="From", virtual_network="4",
ordered="false";
// STATES
diff -r 46b02e79bf2c -r 56dfde6abe48 src/mem/protocol/MOESI_hammer-dir.sm
--- a/src/mem/protocol/MOESI_hammer-dir.sm Sun Mar 21 21:22:21 2010 -0700
+++ b/src/mem/protocol/MOESI_hammer-dir.sm Sun Mar 21 21:22:21 2010 -0700
@@ -39,19 +39,19 @@
int memory_controller_latency = 12
{
- MessageBuffer forwardFromDir, network="To", virtual_network="2",
ordered="false";
- MessageBuffer responseFromDir, network="To", virtual_network="1",
ordered="false";
+ MessageBuffer forwardFromDir, network="To", virtual_network="3",
ordered="false";
+ MessageBuffer responseFromDir, network="To", virtual_network="4",
ordered="false";
//
// For a finite buffered network, note that the DMA response network only
- // works at this relatively higher numbered (lower priority) virtual network
+ // works at this relatively lower numbered (lower priority) virtual network
// because the trigger queue decouples cache responses from DMA responses.
//
- MessageBuffer dmaResponseFromDir, network="To", virtual_network="4",
ordered="true";
+ MessageBuffer dmaResponseFromDir, network="To", virtual_network="1",
ordered="true";
- MessageBuffer unblockToDir, network="From", virtual_network="0",
ordered="false";
- MessageBuffer responseToDir, network="From", virtual_network="1",
ordered="false";
- MessageBuffer requestToDir, network="From", virtual_network="3",
ordered="false";
- MessageBuffer dmaRequestToDir, network="From", virtual_network="5",
ordered="true";
+ MessageBuffer unblockToDir, network="From", virtual_network="5",
ordered="false";
+ MessageBuffer responseToDir, network="From", virtual_network="4",
ordered="false";
+ MessageBuffer requestToDir, network="From", virtual_network="2",
ordered="false";
+ MessageBuffer dmaRequestToDir, network="From", virtual_network="0",
ordered="true";
// STATES
enumeration(State, desc="Directory states", default="Directory_State_E") {
diff -r 46b02e79bf2c -r 56dfde6abe48 src/mem/protocol/MOESI_hammer-dma.sm
--- a/src/mem/protocol/MOESI_hammer-dma.sm Sun Mar 21 21:22:21 2010 -0700
+++ b/src/mem/protocol/MOESI_hammer-dma.sm Sun Mar 21 21:22:21 2010 -0700
@@ -32,8 +32,8 @@
int request_latency = 6
{
- MessageBuffer responseFromDir, network="From", virtual_network="4",
ordered="true", no_vector="true";
- MessageBuffer reqToDirectory, network="To", virtual_network="5",
ordered="false", no_vector="true";
+ MessageBuffer responseFromDir, network="From", virtual_network="1",
ordered="true", no_vector="true";
+ MessageBuffer reqToDirectory, network="To", virtual_network="0",
ordered="false", no_vector="true";
enumeration(State, desc="DMA states", default="DMA_State_READY") {
READY, desc="Ready to accept a new request";
_______________________________________________
m5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/m5-dev
