# HG changeset patch
# User Brad Beckmann <[email protected]>
# Date 1268941833 25200
# Node ID d4458d0d8d4499b96995ff63d29c76dcd094bde4
# Parent d1c77144ae9a7c6a9bb2bf5b69d88592a5a35392
ruby: Reordered vnet priorities to agree with PerfectSwitch
diff --git a/src/mem/protocol/MOESI_hammer-cache.sm
b/src/mem/protocol/MOESI_hammer-cache.sm
--- a/src/mem/protocol/MOESI_hammer-cache.sm
+++ b/src/mem/protocol/MOESI_hammer-cache.sm
@@ -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 --git a/src/mem/protocol/MOESI_hammer-dir.sm
b/src/mem/protocol/MOESI_hammer-dir.sm
--- a/src/mem/protocol/MOESI_hammer-dir.sm
+++ b/src/mem/protocol/MOESI_hammer-dir.sm
@@ -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 --git a/src/mem/protocol/MOESI_hammer-dma.sm
b/src/mem/protocol/MOESI_hammer-dma.sm
--- a/src/mem/protocol/MOESI_hammer-dma.sm
+++ b/src/mem/protocol/MOESI_hammer-dma.sm
@@ -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
