diff options
Diffstat (limited to 'configs/ruby/MOESI_CMP_directory.py')
| -rw-r--r-- | configs/ruby/MOESI_CMP_directory.py | 70 |
1 files changed, 49 insertions, 21 deletions
diff --git a/configs/ruby/MOESI_CMP_directory.py b/configs/ruby/MOESI_CMP_directory.py index f02c45987..7a430990b 100644 --- a/configs/ruby/MOESI_CMP_directory.py +++ b/configs/ruby/MOESI_CMP_directory.py @@ -103,10 +103,16 @@ 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.requestFromL1Cache = ruby_system.network.slave - l1_cntrl.responseFromL1Cache = ruby_system.network.slave - l1_cntrl.requestToL1Cache = ruby_system.network.master - l1_cntrl.responseToL1Cache = ruby_system.network.master + l1_cntrl.mandatoryQueue = MessageBuffer() + l1_cntrl.requestFromL1Cache = MessageBuffer() + l1_cntrl.requestFromL1Cache.master = ruby_system.network.slave + l1_cntrl.responseFromL1Cache = MessageBuffer() + l1_cntrl.responseFromL1Cache.master = ruby_system.network.slave + l1_cntrl.requestToL1Cache = MessageBuffer() + l1_cntrl.requestToL1Cache.slave = ruby_system.network.master + l1_cntrl.responseToL1Cache = MessageBuffer() + l1_cntrl.responseToL1Cache.slave = ruby_system.network.master + l1_cntrl.triggerQueue = MessageBuffer(ordered = True) l2_index_start = block_size_bits + l2_bits @@ -128,13 +134,20 @@ def create_system(options, full_system, system, dma_ports, ruby_system): l2_cntrl_nodes.append(l2_cntrl) # Connect the L2 controllers and the network - l2_cntrl.GlobalRequestFromL2Cache = ruby_system.network.slave - l2_cntrl.L1RequestFromL2Cache = ruby_system.network.slave - l2_cntrl.responseFromL2Cache = ruby_system.network.slave - - l2_cntrl.GlobalRequestToL2Cache = ruby_system.network.master - l2_cntrl.L1RequestToL2Cache = ruby_system.network.master - l2_cntrl.responseToL2Cache = ruby_system.network.master + l2_cntrl.GlobalRequestFromL2Cache = MessageBuffer() + l2_cntrl.GlobalRequestFromL2Cache.master = ruby_system.network.slave + l2_cntrl.L1RequestFromL2Cache = MessageBuffer() + l2_cntrl.L1RequestFromL2Cache.master = ruby_system.network.slave + l2_cntrl.responseFromL2Cache = MessageBuffer() + l2_cntrl.responseFromL2Cache.master = ruby_system.network.slave + + l2_cntrl.GlobalRequestToL2Cache = MessageBuffer() + l2_cntrl.GlobalRequestToL2Cache.slave = ruby_system.network.master + l2_cntrl.L1RequestToL2Cache = MessageBuffer() + l2_cntrl.L1RequestToL2Cache.slave = ruby_system.network.master + l2_cntrl.responseToL2Cache = MessageBuffer() + l2_cntrl.responseToL2Cache.slave = ruby_system.network.master + l2_cntrl.triggerQueue = MessageBuffer(ordered = True) phys_mem_size = sum(map(lambda r: r.size(), system.mem_ranges)) @@ -163,10 +176,15 @@ 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.responseToDir = ruby_system.network.master - dir_cntrl.responseFromDir = ruby_system.network.slave - dir_cntrl.forwardFromDir = ruby_system.network.slave + dir_cntrl.requestToDir = MessageBuffer() + dir_cntrl.requestToDir.slave = ruby_system.network.master + dir_cntrl.responseToDir = MessageBuffer() + dir_cntrl.responseToDir.slave = ruby_system.network.master + dir_cntrl.responseFromDir = MessageBuffer() + dir_cntrl.responseFromDir.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): @@ -186,9 +204,14 @@ def create_system(options, full_system, system, dma_ports, ruby_system): dma_cntrl_nodes.append(dma_cntrl) # Connect the dma controller to the network - dma_cntrl.responseFromDir = ruby_system.network.master - dma_cntrl.reqToDir = ruby_system.network.slave - dma_cntrl.respToDir = ruby_system.network.slave + dma_cntrl.mandatoryQueue = MessageBuffer() + dma_cntrl.responseFromDir = MessageBuffer() + dma_cntrl.responseFromDir.slave = ruby_system.network.master + dma_cntrl.reqToDir = MessageBuffer() + dma_cntrl.reqToDir.master = ruby_system.network.slave + dma_cntrl.respToDir = MessageBuffer() + dma_cntrl.respToDir.master = ruby_system.network.slave + dma_cntrl.triggerQueue = MessageBuffer(ordered = True) all_cntrls = l1_cntrl_nodes + \ @@ -206,9 +229,14 @@ 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.reqToDir = ruby_system.network.slave - io_controller.respToDir = ruby_system.network.slave + io_controller.mandatoryQueue = MessageBuffer() + io_controller.responseFromDir = MessageBuffer() + io_controller.responseFromDir.slave = ruby_system.network.master + io_controller.reqToDir = MessageBuffer() + io_controller.reqToDir.master = ruby_system.network.slave + io_controller.respToDir = MessageBuffer() + io_controller.respToDir.master = ruby_system.network.slave + io_controller.triggerQueue = MessageBuffer(ordered = True) all_cntrls = all_cntrls + [io_controller] |