diff options
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/ruby/MESI_Three_Level.py | 66 | ||||
| -rw-r--r-- | configs/ruby/MESI_Two_Level.py | 60 | ||||
| -rw-r--r-- | configs/ruby/MI_example.py | 44 | ||||
| -rw-r--r-- | configs/ruby/MOESI_CMP_directory.py | 70 | ||||
| -rw-r--r-- | configs/ruby/MOESI_CMP_token.py | 85 | ||||
| -rw-r--r-- | configs/ruby/MOESI_hammer.py | 58 | ||||
| -rw-r--r-- | configs/ruby/Network_test.py | 13 |
7 files changed, 271 insertions, 125 deletions
diff --git a/configs/ruby/MESI_Three_Level.py b/configs/ruby/MESI_Three_Level.py index 74eb15887..262022911 100644 --- a/configs/ruby/MESI_Three_Level.py +++ b/configs/ruby/MESI_Three_Level.py @@ -127,16 +127,24 @@ def create_system(options, full_system, system, dma_ports, ruby_system): l1_cntrl_nodes.append(l1_cntrl) # Connect the L0 and L1 controllers - l0_cntrl.bufferToL1 = l1_cntrl.bufferFromL0 - l0_cntrl.bufferFromL1 = l1_cntrl.bufferToL0 + l0_cntrl.mandatoryQueue = MessageBuffer() + l0_cntrl.bufferToL1 = MessageBuffer(ordered = True) + l1_cntrl.bufferFromL0 = l0_cntrl.bufferToL1 + l0_cntrl.bufferFromL1 = MessageBuffer(ordered = True) + l1_cntrl.bufferToL0 = l0_cntrl.bufferFromL1 # Connect the L1 controllers and the network - l1_cntrl.requestToL2 = ruby_system.network.slave - l1_cntrl.responseToL2 = ruby_system.network.slave - l1_cntrl.unblockToL2 = ruby_system.network.slave + l1_cntrl.requestToL2 = MessageBuffer() + l1_cntrl.requestToL2.master = ruby_system.network.slave + l1_cntrl.responseToL2 = MessageBuffer() + l1_cntrl.responseToL2.master = ruby_system.network.slave + l1_cntrl.unblockToL2 = MessageBuffer() + l1_cntrl.unblockToL2.master = ruby_system.network.slave - l1_cntrl.requestFromL2 = ruby_system.network.master - l1_cntrl.responseFromL2 = ruby_system.network.master + l1_cntrl.requestFromL2 = MessageBuffer() + l1_cntrl.requestFromL2.slave = ruby_system.network.master + l1_cntrl.responseFromL2 = MessageBuffer() + l1_cntrl.responseFromL2.slave = ruby_system.network.master for j in xrange(num_l2caches_per_cluster): @@ -155,13 +163,19 @@ 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.DirRequestFromL2Cache = ruby_system.network.slave - l2_cntrl.L1RequestFromL2Cache = ruby_system.network.slave - l2_cntrl.responseFromL2Cache = ruby_system.network.slave - - l2_cntrl.unblockToL2Cache = ruby_system.network.master - l2_cntrl.L1RequestToL2Cache = ruby_system.network.master - l2_cntrl.responseToL2Cache = ruby_system.network.master + l2_cntrl.DirRequestFromL2Cache = MessageBuffer() + l2_cntrl.DirRequestFromL2Cache.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.unblockToL2Cache = MessageBuffer() + l2_cntrl.unblockToL2Cache.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 phys_mem_size = sum(map(lambda r: r.size(), system.mem_ranges)) assert(phys_mem_size % options.num_dirs == 0) @@ -191,9 +205,13 @@ 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.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.responseFromMemory = MessageBuffer() for i, dma_port in enumerate(dma_ports): # @@ -212,8 +230,11 @@ 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.requestToDir = ruby_system.network.slave + dma_cntrl.mandatoryQueue = MessageBuffer() + dma_cntrl.responseFromDir = MessageBuffer(ordered = True) + dma_cntrl.responseFromDir.slave = ruby_system.network.master + dma_cntrl.requestToDir = MessageBuffer() + dma_cntrl.requestToDir.master = ruby_system.network.slave all_cntrls = l0_cntrl_nodes + \ l1_cntrl_nodes + \ @@ -231,8 +252,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.responseFromDir = MessageBuffer(ordered = True) + io_controller.responseFromDir.slave = ruby_system.network.master + io_controller.requestToDir = MessageBuffer() + io_controller.requestToDir.master = ruby_system.network.slave all_cntrls = all_cntrls + [io_controller] diff --git a/configs/ruby/MESI_Two_Level.py b/configs/ruby/MESI_Two_Level.py index 9f286fa53..e075b3aa5 100644 --- a/configs/ruby/MESI_Two_Level.py +++ b/configs/ruby/MESI_Two_Level.py @@ -107,12 +107,20 @@ 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.unblockFromL1Cache = ruby_system.network.slave + 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.unblockFromL1Cache = MessageBuffer() + l1_cntrl.unblockFromL1Cache.master = ruby_system.network.slave - l1_cntrl.requestToL1Cache = ruby_system.network.master - l1_cntrl.responseToL1Cache = ruby_system.network.master + l1_cntrl.optionalQueue = MessageBuffer() + + l1_cntrl.requestToL1Cache = MessageBuffer() + l1_cntrl.requestToL1Cache.slave = ruby_system.network.master + l1_cntrl.responseToL1Cache = MessageBuffer() + l1_cntrl.responseToL1Cache.slave = ruby_system.network.master l2_index_start = block_size_bits + l2_bits @@ -134,13 +142,19 @@ 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.DirRequestFromL2Cache = ruby_system.network.slave - l2_cntrl.L1RequestFromL2Cache = ruby_system.network.slave - l2_cntrl.responseFromL2Cache = ruby_system.network.slave + l2_cntrl.DirRequestFromL2Cache = MessageBuffer() + l2_cntrl.DirRequestFromL2Cache.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.unblockToL2Cache = ruby_system.network.master - l2_cntrl.L1RequestToL2Cache = ruby_system.network.master - l2_cntrl.responseToL2Cache = ruby_system.network.master + l2_cntrl.unblockToL2Cache = MessageBuffer() + l2_cntrl.unblockToL2Cache.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 phys_mem_size = sum(map(lambda r: r.size(), system.mem_ranges)) @@ -169,9 +183,13 @@ 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.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.responseFromMemory = MessageBuffer() for i, dma_port in enumerate(dma_ports): @@ -189,8 +207,11 @@ 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.requestToDir = ruby_system.network.slave + dma_cntrl.mandatoryQueue = MessageBuffer() + dma_cntrl.responseFromDir = MessageBuffer(ordered = True) + dma_cntrl.responseFromDir.slave = ruby_system.network.master + dma_cntrl.requestToDir = MessageBuffer() + dma_cntrl.requestToDir.master = ruby_system.network.slave all_cntrls = l1_cntrl_nodes + \ l2_cntrl_nodes + \ @@ -207,8 +228,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.responseFromDir = MessageBuffer(ordered = True) + io_controller.responseFromDir.slave = ruby_system.network.master + io_controller.requestToDir = MessageBuffer() + io_controller.requestToDir.master = ruby_system.network.slave all_cntrls = all_cntrls + [io_controller] 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] 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] diff --git a/configs/ruby/MOESI_CMP_token.py b/configs/ruby/MOESI_CMP_token.py index 4b09fc937..cf8897333 100644 --- a/configs/ruby/MOESI_CMP_token.py +++ b/configs/ruby/MOESI_CMP_token.py @@ -123,13 +123,20 @@ 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.persistentFromL1Cache = ruby_system.network.slave - - l1_cntrl.requestToL1Cache = ruby_system.network.master - l1_cntrl.responseToL1Cache = ruby_system.network.master - l1_cntrl.persistentToL1Cache = ruby_system.network.master + 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.persistentFromL1Cache = MessageBuffer(ordered = True) + l1_cntrl.persistentFromL1Cache.master = ruby_system.network.slave + + l1_cntrl.mandatoryQueue = MessageBuffer() + 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.persistentToL1Cache = MessageBuffer(ordered = True) + l1_cntrl.persistentToL1Cache.slave = ruby_system.network.master l2_index_start = block_size_bits + l2_bits @@ -152,14 +159,21 @@ 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.persistentToL2Cache = 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.persistentToL2Cache = MessageBuffer(ordered = True) + l2_cntrl.persistentToL2Cache.slave = ruby_system.network.master phys_mem_size = sum(map(lambda r: r.size(), system.mem_ranges)) @@ -188,15 +202,24 @@ 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.persistentToDir = ruby_system.network.master - dir_cntrl.dmaRequestToDir = ruby_system.network.master - - dir_cntrl.requestFromDir = ruby_system.network.slave - dir_cntrl.responseFromDir = ruby_system.network.slave - dir_cntrl.persistentFromDir = ruby_system.network.slave - dir_cntrl.dmaResponseFromDir = 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.persistentToDir = MessageBuffer(ordered = True) + dir_cntrl.persistentToDir.slave = ruby_system.network.master + dir_cntrl.dmaRequestToDir = MessageBuffer(ordered = True) + dir_cntrl.dmaRequestToDir.slave = ruby_system.network.master + + dir_cntrl.requestFromDir = MessageBuffer() + dir_cntrl.requestFromDir.master = ruby_system.network.slave + dir_cntrl.responseFromDir = MessageBuffer() + dir_cntrl.responseFromDir.master = ruby_system.network.slave + dir_cntrl.persistentFromDir = MessageBuffer(ordered = True) + dir_cntrl.persistentFromDir.master = ruby_system.network.slave + dir_cntrl.dmaResponseFromDir = MessageBuffer(ordered = True) + dir_cntrl.dmaResponseFromDir.master = ruby_system.network.slave + dir_cntrl.responseFromMemory = MessageBuffer() for i, dma_port in enumerate(dma_ports): @@ -216,8 +239,11 @@ 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.reqToDirectory = ruby_system.network.slave + dma_cntrl.mandatoryQueue = MessageBuffer() + dma_cntrl.responseFromDir = MessageBuffer(ordered = True) + dma_cntrl.responseFromDir.slave = ruby_system.network.master + dma_cntrl.reqToDirectory = MessageBuffer() + dma_cntrl.reqToDirectory.master = ruby_system.network.slave all_cntrls = l1_cntrl_nodes + \ l2_cntrl_nodes + \ @@ -234,8 +260,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.reqToDirectory = ruby_system.network.slave + io_controller.mandatoryQueue = MessageBuffer() + io_controller.responseFromDir = MessageBuffer(ordered = True) + io_controller.responseFromDir.slave = ruby_system.network.master + io_controller.reqToDirectory = MessageBuffer() + io_controller.reqToDirectory.master = ruby_system.network.slave all_cntrls = all_cntrls + [io_controller] diff --git a/configs/ruby/MOESI_hammer.py b/configs/ruby/MOESI_hammer.py index afbb25dc3..606d73de0 100644 --- a/configs/ruby/MOESI_hammer.py +++ b/configs/ruby/MOESI_hammer.py @@ -118,13 +118,21 @@ def create_system(options, full_system, system, dma_ports, ruby_system): # Connect the L1 controller and the network # Connect the buffers from the controller to network - l1_cntrl.requestFromCache = ruby_system.network.slave - l1_cntrl.responseFromCache = ruby_system.network.slave - l1_cntrl.unblockFromCache = ruby_system.network.slave + l1_cntrl.requestFromCache = MessageBuffer() + l1_cntrl.requestFromCache.master = ruby_system.network.slave + l1_cntrl.responseFromCache = MessageBuffer() + l1_cntrl.responseFromCache.master = ruby_system.network.slave + l1_cntrl.unblockFromCache = MessageBuffer() + l1_cntrl.unblockFromCache.master = ruby_system.network.slave + + l1_cntrl.triggerQueue = MessageBuffer() # Connect the buffers from the network to the controller - l1_cntrl.forwardToCache = ruby_system.network.master - l1_cntrl.responseToCache = ruby_system.network.master + l1_cntrl.mandatoryQueue = MessageBuffer() + l1_cntrl.forwardToCache = MessageBuffer() + l1_cntrl.forwardToCache.slave = ruby_system.network.master + l1_cntrl.responseToCache = MessageBuffer() + l1_cntrl.responseToCache.slave = ruby_system.network.master phys_mem_size = sum(map(lambda r: r.size(), system.mem_ranges)) @@ -184,14 +192,24 @@ def create_system(options, full_system, system, dma_ports, ruby_system): dir_cntrl_nodes.append(dir_cntrl) # Connect the directory controller to the network - dir_cntrl.forwardFromDir = ruby_system.network.slave - dir_cntrl.responseFromDir = ruby_system.network.slave - dir_cntrl.dmaResponseFromDir = ruby_system.network.slave - - dir_cntrl.unblockToDir = ruby_system.network.master - dir_cntrl.responseToDir = ruby_system.network.master - dir_cntrl.requestToDir = ruby_system.network.master - dir_cntrl.dmaRequestToDir = ruby_system.network.master + dir_cntrl.forwardFromDir = MessageBuffer() + dir_cntrl.forwardFromDir.master = 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.triggerQueue = MessageBuffer(ordered = True) + + dir_cntrl.unblockToDir = MessageBuffer() + dir_cntrl.unblockToDir.slave = ruby_system.network.master + dir_cntrl.responseToDir = MessageBuffer() + dir_cntrl.responseToDir.slave = ruby_system.network.master + dir_cntrl.requestToDir = MessageBuffer() + dir_cntrl.requestToDir.slave = ruby_system.network.master + dir_cntrl.dmaRequestToDir = MessageBuffer(ordered = True) + dir_cntrl.dmaRequestToDir.slave = ruby_system.network.master + dir_cntrl.responseFromMemory = MessageBuffer() for i, dma_port in enumerate(dma_ports): @@ -214,8 +232,11 @@ def create_system(options, full_system, system, dma_ports, ruby_system): dma_cntrl.recycle_latency = options.recycle_latency # Connect the dma controller to the network - dma_cntrl.responseFromDir = ruby_system.network.master - dma_cntrl.requestToDir = ruby_system.network.slave + dma_cntrl.responseFromDir = MessageBuffer(ordered = True) + dma_cntrl.responseFromDir.slave = ruby_system.network.master + dma_cntrl.requestToDir = MessageBuffer() + dma_cntrl.requestToDir.master = ruby_system.network.slave + dma_cntrl.mandatoryQueue = MessageBuffer() all_cntrls = l1_cntrl_nodes + dir_cntrl_nodes + dma_cntrl_nodes @@ -229,8 +250,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.responseFromDir = MessageBuffer(ordered = True) + io_controller.responseFromDir.slave = ruby_system.network.master + io_controller.requestToDir = MessageBuffer() + io_controller.requestToDir.master = ruby_system.network.slave + io_controller.mandatoryQueue = MessageBuffer() all_cntrls = all_cntrls + [io_controller] diff --git a/configs/ruby/Network_test.py b/configs/ruby/Network_test.py index 5eeaba98b..7a968a253 100644 --- a/configs/ruby/Network_test.py +++ b/configs/ruby/Network_test.py @@ -95,9 +95,10 @@ 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.forwardFromCache = ruby_system.network.slave + l1_cntrl.mandatoryQueue = MessageBuffer() + l1_cntrl.requestFromCache = MessageBuffer() + l1_cntrl.responseFromCache = MessageBuffer() + l1_cntrl.forwardFromCache = MessageBuffer() phys_mem_size = sum(map(lambda r: r.size(), system.mem_ranges)) @@ -118,9 +119,9 @@ 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.forwardToDir = ruby_system.network.master - dir_cntrl.responseToDir = ruby_system.network.master + dir_cntrl.requestToDir = MessageBuffer() + dir_cntrl.forwardToDir = MessageBuffer() + dir_cntrl.responseToDir = MessageBuffer() all_cntrls = l1_cntrl_nodes + dir_cntrl_nodes |