# HG changeset patch
# User Brad Beckmann <[email protected]>
# Date 1268941833 25200
# Node ID d1c77144ae9a7c6a9bb2bf5b69d88592a5a35392
# Parent e1e42f946575365817ef5cc4ea60ef65be185af2
ruby: Reordered MOESI_CMP_token buffers for the correct ordering
diff --git a/src/mem/protocol/MOESI_CMP_token-L1cache.sm
b/src/mem/protocol/MOESI_CMP_token-L1cache.sm
--- a/src/mem/protocol/MOESI_CMP_token-L1cache.sm
+++ b/src/mem/protocol/MOESI_CMP_token-L1cache.sm
@@ -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 --git a/src/mem/protocol/MOESI_CMP_token-L2cache.sm
b/src/mem/protocol/MOESI_CMP_token-L2cache.sm
--- a/src/mem/protocol/MOESI_CMP_token-L2cache.sm
+++ b/src/mem/protocol/MOESI_CMP_token-L2cache.sm
@@ -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 --git a/src/mem/protocol/MOESI_CMP_token-dir.sm
b/src/mem/protocol/MOESI_CMP_token-dir.sm
--- a/src/mem/protocol/MOESI_CMP_token-dir.sm
+++ b/src/mem/protocol/MOESI_CMP_token-dir.sm
@@ -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 --git a/src/mem/protocol/MOESI_CMP_token-dma.sm
b/src/mem/protocol/MOESI_CMP_token-dma.sm
--- a/src/mem/protocol/MOESI_CMP_token-dma.sm
+++ b/src/mem/protocol/MOESI_CMP_token-dma.sm
@@ -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";
_______________________________________________
m5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/m5-dev
