From 905c0b347c785d07b606b6a9f3c6bbdf8ebe96a7 Mon Sep 17 00:00:00 2001 From: Joel Hestness Date: Fri, 14 Aug 2015 00:19:45 -0500 Subject: ruby: Protocol changes for SimObject MessageBuffers --- configs/ruby/MI_example.py | 44 ++++++++++++++++++++++++++++++-------------- 1 file changed, 30 insertions(+), 14 deletions(-) (limited to 'configs/ruby/MI_example.py') diff --git a/configs/ruby/MI_example.py b/configs/ruby/MI_example.py index 5afee674a..4e01de65b 100644 --- a/configs/ruby/MI_example.py +++ b/configs/ruby/MI_example.py @@ -98,11 +98,15 @@ def create_system(options, full_system, system, dma_ports, ruby_system): l1_cntrl_nodes.append(l1_cntrl) # Connect the L1 controllers and the network - l1_cntrl.requestFromCache = ruby_system.network.slave - l1_cntrl.responseFromCache = ruby_system.network.slave - l1_cntrl.forwardToCache = ruby_system.network.master - l1_cntrl.responseToCache = ruby_system.network.master - + l1_cntrl.mandatoryQueue = MessageBuffer() + l1_cntrl.requestFromCache = MessageBuffer(ordered = True) + l1_cntrl.requestFromCache.master = ruby_system.network.slave + l1_cntrl.responseFromCache = MessageBuffer(ordered = True) + l1_cntrl.responseFromCache.master = ruby_system.network.slave + l1_cntrl.forwardToCache = MessageBuffer(ordered = True) + l1_cntrl.forwardToCache.slave = ruby_system.network.master + l1_cntrl.responseToCache = MessageBuffer(ordered = True) + l1_cntrl.responseToCache.slave = ruby_system.network.master phys_mem_size = sum(map(lambda r: r.size(), system.mem_ranges)) assert(phys_mem_size % options.num_dirs == 0) @@ -128,12 +132,18 @@ def create_system(options, full_system, system, dma_ports, ruby_system): dir_cntrl_nodes.append(dir_cntrl) # Connect the directory controllers and the network - dir_cntrl.requestToDir = ruby_system.network.master - dir_cntrl.dmaRequestToDir = ruby_system.network.master + dir_cntrl.requestToDir = MessageBuffer(ordered = True) + dir_cntrl.requestToDir.slave = ruby_system.network.master + dir_cntrl.dmaRequestToDir = MessageBuffer(ordered = True) + dir_cntrl.dmaRequestToDir.slave = ruby_system.network.master - dir_cntrl.responseFromDir = ruby_system.network.slave - dir_cntrl.dmaResponseFromDir = ruby_system.network.slave - dir_cntrl.forwardFromDir = ruby_system.network.slave + dir_cntrl.responseFromDir = MessageBuffer() + dir_cntrl.responseFromDir.master = ruby_system.network.slave + dir_cntrl.dmaResponseFromDir = MessageBuffer(ordered = True) + dir_cntrl.dmaResponseFromDir.master = ruby_system.network.slave + dir_cntrl.forwardFromDir = MessageBuffer() + dir_cntrl.forwardFromDir.master = ruby_system.network.slave + dir_cntrl.responseFromMemory = MessageBuffer() for i, dma_port in enumerate(dma_ports): @@ -153,8 +163,11 @@ def create_system(options, full_system, system, dma_ports, ruby_system): dma_cntrl_nodes.append(dma_cntrl) # Connect the directory controllers and the network - dma_cntrl.requestToDir = ruby_system.network.slave - dma_cntrl.responseFromDir = ruby_system.network.master + dma_cntrl.mandatoryQueue = MessageBuffer() + dma_cntrl.requestToDir = MessageBuffer() + dma_cntrl.requestToDir.master = ruby_system.network.slave + dma_cntrl.responseFromDir = MessageBuffer(ordered = True) + dma_cntrl.responseFromDir.slave = ruby_system.network.master all_cntrls = l1_cntrl_nodes + dir_cntrl_nodes + dma_cntrl_nodes @@ -168,8 +181,11 @@ def create_system(options, full_system, system, dma_ports, ruby_system): ruby_system.io_controller = io_controller # Connect the dma controller to the network - io_controller.responseFromDir = ruby_system.network.master - io_controller.requestToDir = ruby_system.network.slave + io_controller.mandatoryQueue = MessageBuffer() + io_controller.requestToDir = MessageBuffer() + io_controller.requestToDir.master = ruby_system.network.slave + io_controller.responseFromDir = MessageBuffer(ordered = True) + io_controller.responseFromDir.slave = ruby_system.network.master all_cntrls = all_cntrls + [io_controller] -- cgit v1.2.3