Seems like this series of patches that just shuffles priorities could (should?) be folded together.
Steve On Thu, Mar 18, 2010 at 3:46 PM, Brad Beckmann <[email protected]> wrote: > # HG changeset patch > # User Brad Beckmann <[email protected]> > # Date 1268941833 25200 > # Node ID 7b9079a51a5292285396cf2c43015d89f8c27cc0 > # Parent d4458d0d8d4499b96995ff63d29c76dcd094bde4 > ruby: reordered vnets for MI_example to match PerfectSwitch priority > > diff --git a/src/mem/protocol/MI_example-cache.sm > b/src/mem/protocol/MI_example-cache.sm > --- a/src/mem/protocol/MI_example-cache.sm > +++ b/src/mem/protocol/MI_example-cache.sm > @@ -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 --git a/src/mem/protocol/MI_example-dir.sm > b/src/mem/protocol/MI_example-dir.sm > --- a/src/mem/protocol/MI_example-dir.sm > +++ b/src/mem/protocol/MI_example-dir.sm > @@ -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 --git a/src/mem/protocol/MI_example-dma.sm > b/src/mem/protocol/MI_example-dma.sm > --- a/src/mem/protocol/MI_example-dma.sm > +++ b/src/mem/protocol/MI_example-dma.sm > @@ -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"; > > _______________________________________________ > m5-dev mailing list > [email protected] > http://m5sim.org/mailman/listinfo/m5-dev > _______________________________________________ m5-dev mailing list [email protected] http://m5sim.org/mailman/listinfo/m5-dev
