From 581bae9ecbafd5e94c5405ca925a55cc6e5d7488 Mon Sep 17 00:00:00 2001 From: Joel Hestness Date: Fri, 14 Aug 2015 00:19:44 -0500 Subject: ruby: Expose MessageBuffers as SimObjects Expose MessageBuffers from SLICC controllers as SimObjects that can be manipulated in Python. This patch has numerous benefits: 1) First and foremost, it exposes MessageBuffers as SimObjects that can be manipulated in Python code. This allows parameters to be set and checked in Python code to avoid obfuscating parameters within protocol files. Further, now as SimObjects, MessageBuffer parameters are printed to config output files as a way to track parameters across simulations (e.g. buffer sizes) 2) Cleans up special-case code for responseFromMemory buffers, and aligns their instantiation and use with mandatoryQueue buffers. These two special buffers are the only MessageBuffers that are exposed to components outside of SLICC controllers, and they're both slave ends of these buffers. They should be exposed outside of SLICC in the same way, and this patch does it. 3) Distinguishes buffer-specific parameters from buffer-to-network parameters. Specifically, buffer size, randomization, ordering, recycle latency, and ports are all specific to a MessageBuffer, while the virtual network ID and type are intrinsics of how the buffer is connected to network ports. The former are specified in the Python object, while the latter are specified in the controller *.sm files. Unlike buffer-specific parameters, which may need to change depending on the simulated system structure, buffer-to-network parameters can be specified statically for most or all different simulated systems. --- configs/ruby/Ruby.py | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'configs') diff --git a/configs/ruby/Ruby.py b/configs/ruby/Ruby.py index c9ef71593..44dbb925f 100644 --- a/configs/ruby/Ruby.py +++ b/configs/ruby/Ruby.py @@ -209,6 +209,11 @@ def create_system(options, full_system, system, piobus = None, dma_ports = []): topology.makeTopology(options, network, IntLinkClass, ExtLinkClass, RouterClass) + if options.garnet_network is None: + assert(NetworkClass == SimpleNetwork) + assert(RouterClass == Switch) + network.setup_buffers() + if InterfaceClass != None: netifs = [InterfaceClass(id=i) for (i,n) in enumerate(network.ext_links)] network.netifs = netifs -- cgit v1.2.3