configs: Replace master/slave terminology from ruby scripts

Signed-off-by: Giacomo Travaglini <[email protected]> Change-Id: Iabc82a19e8d6c7cf619874dc2926276c349eba7c Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/52865 Tested-by: kokoro <[email protected]> Reviewed-by: Jason Lowe-Power <[email protected]> Maintainer: Jason Lowe-Power <[email protected]>
darchr · Nov 22, 2021 · 65c32dc · 65c32dc
1 parent f1fc49e
commit 65c32dc
Show file tree

Hide file tree

Showing 11 changed files with 154 additions and 155 deletions.
diff --git a/configs/ruby/AMD_Base_Constructor.py b/configs/ruby/AMD_Base_Constructor.py
@@ -116,11 +116,11 @@ def construct(options, system, ruby_system):
         cp_cntrl.create(options, ruby_system, system)
 
         # Connect the CP controllers to the ruby network
-        cp_cntrl.requestFromCore = ruby_system.network.slave
-        cp_cntrl.responseFromCore = ruby_system.network.slave
-        cp_cntrl.unblockFromCore = ruby_system.network.slave
-        cp_cntrl.probeToCore = ruby_system.network.master
-        cp_cntrl.responseToCore = ruby_system.network.master
+        cp_cntrl.requestFromCore = ruby_system.network.in_port
+        cp_cntrl.responseFromCore = ruby_system.network.in_port
+        cp_cntrl.unblockFromCore = ruby_system.network.in_port
+        cp_cntrl.probeToCore = ruby_system.network.out_port
+        cp_cntrl.responseToCore = ruby_system.network.out_port
 
         exec("system.cp_cntrl%d = cp_cntrl" % i)
         #

diff --git a/configs/ruby/CHI_config.py b/configs/ruby/CHI_config.py
@@ -351,7 +351,6 @@ def __init__(self, iseq, dseq):
         self.__dict__['support_inst_reqs'] = True
         # Compatibility with certain scripts that wire up ports
         # without connectCpuPorts
-        self.__dict__['slave'] = dseq.in_ports
         self.__dict__['in_ports'] = dseq.in_ports
 
     def connectCpuPorts(self, cpu):

diff --git a/configs/ruby/MESI_Three_Level.py b/configs/ruby/MESI_Three_Level.py
@@ -173,16 +173,16 @@ def create_system(options, full_system, system, dma_ports, bootmem,
 
             # Connect the L1 controllers and the network
             l1_cntrl.requestToL2 = MessageBuffer()
-            l1_cntrl.requestToL2.master = ruby_system.network.slave
+            l1_cntrl.requestToL2.out_port = ruby_system.network.in_port
             l1_cntrl.responseToL2 = MessageBuffer()
-            l1_cntrl.responseToL2.master = ruby_system.network.slave
+            l1_cntrl.responseToL2.out_port = ruby_system.network.in_port
             l1_cntrl.unblockToL2 = MessageBuffer()
-            l1_cntrl.unblockToL2.master = ruby_system.network.slave
+            l1_cntrl.unblockToL2.out_port = ruby_system.network.in_port
 
             l1_cntrl.requestFromL2 = MessageBuffer()
-            l1_cntrl.requestFromL2.slave = ruby_system.network.master
+            l1_cntrl.requestFromL2.in_port = ruby_system.network.out_port
             l1_cntrl.responseFromL2 = MessageBuffer()
-            l1_cntrl.responseFromL2.slave = ruby_system.network.master
+            l1_cntrl.responseFromL2.in_port = ruby_system.network.out_port
 
 
         for j in range(num_l2caches_per_cluster):
@@ -203,18 +203,18 @@ def create_system(options, full_system, system, dma_ports, bootmem,
 
             # Connect the L2 controllers and the network
             l2_cntrl.DirRequestFromL2Cache = MessageBuffer()
-            l2_cntrl.DirRequestFromL2Cache.master = ruby_system.network.slave
+            l2_cntrl.DirRequestFromL2Cache.out_port = ruby_system.network.in_port
             l2_cntrl.L1RequestFromL2Cache = MessageBuffer()
-            l2_cntrl.L1RequestFromL2Cache.master = ruby_system.network.slave
+            l2_cntrl.L1RequestFromL2Cache.out_port = ruby_system.network.in_port
             l2_cntrl.responseFromL2Cache = MessageBuffer()
-            l2_cntrl.responseFromL2Cache.master = ruby_system.network.slave
+            l2_cntrl.responseFromL2Cache.out_port = ruby_system.network.in_port
 
             l2_cntrl.unblockToL2Cache = MessageBuffer()
-            l2_cntrl.unblockToL2Cache.slave = ruby_system.network.master
+            l2_cntrl.unblockToL2Cache.in_port = ruby_system.network.out_port
             l2_cntrl.L1RequestToL2Cache = MessageBuffer()
-            l2_cntrl.L1RequestToL2Cache.slave = ruby_system.network.master
+            l2_cntrl.L1RequestToL2Cache.in_port = ruby_system.network.out_port
             l2_cntrl.responseToL2Cache = MessageBuffer()
-            l2_cntrl.responseToL2Cache.slave = ruby_system.network.master
+            l2_cntrl.responseToL2Cache.in_port = ruby_system.network.out_port
 
     # Run each of the ruby memory controllers at a ratio of the frequency of
     # the ruby system
@@ -230,11 +230,11 @@ def create_system(options, full_system, system, dma_ports, bootmem,
     for dir_cntrl in dir_cntrl_nodes:
         # Connect the directory controllers and the network
         dir_cntrl.requestToDir = MessageBuffer()
-        dir_cntrl.requestToDir.slave = ruby_system.network.master
+        dir_cntrl.requestToDir.in_port = ruby_system.network.out_port
         dir_cntrl.responseToDir = MessageBuffer()
-        dir_cntrl.responseToDir.slave = ruby_system.network.master
+        dir_cntrl.responseToDir.in_port = ruby_system.network.out_port
         dir_cntrl.responseFromDir = MessageBuffer()
-        dir_cntrl.responseFromDir.master = ruby_system.network.slave
+        dir_cntrl.responseFromDir.out_port = ruby_system.network.in_port
         dir_cntrl.requestToMemory = MessageBuffer()
         dir_cntrl.responseFromMemory = MessageBuffer()
 
@@ -250,15 +250,15 @@ def create_system(options, full_system, system, dma_ports, bootmem,
                                    ruby_system = ruby_system)
 
         exec("ruby_system.dma_cntrl%d = dma_cntrl" % i)
-        exec("ruby_system.dma_cntrl%d.dma_sequencer.slave = dma_port" % i)
+        exec("ruby_system.dma_cntrl%d.dma_sequencer.in_ports = dma_port" % i)
         dma_cntrl_nodes.append(dma_cntrl)
 
         # Connect the dma controller to the network
         dma_cntrl.mandatoryQueue = MessageBuffer()
         dma_cntrl.responseFromDir = MessageBuffer(ordered = True)
-        dma_cntrl.responseFromDir.slave = ruby_system.network.master
+        dma_cntrl.responseFromDir.in_port = ruby_system.network.out_port
         dma_cntrl.requestToDir = MessageBuffer()
-        dma_cntrl.requestToDir.master = ruby_system.network.slave
+        dma_cntrl.requestToDir.out_port = ruby_system.network.in_port
 
     all_cntrls = l0_cntrl_nodes + \
                  l1_cntrl_nodes + \
@@ -278,9 +278,9 @@ def create_system(options, full_system, system, dma_ports, bootmem,
         # Connect the dma controller to the network
         io_controller.mandatoryQueue = MessageBuffer()
         io_controller.responseFromDir = MessageBuffer(ordered = True)
-        io_controller.responseFromDir.slave = ruby_system.network.master
+        io_controller.responseFromDir.in_port = ruby_system.network.out_port
         io_controller.requestToDir = MessageBuffer()
-        io_controller.requestToDir.master = ruby_system.network.slave
+        io_controller.requestToDir.out_port = ruby_system.network.in_port
 
         all_cntrls = all_cntrls + [io_controller]
     # Register configuration with filesystem

diff --git a/configs/ruby/MESI_Three_Level_HTM.py b/configs/ruby/MESI_Three_Level_HTM.py
@@ -172,16 +172,16 @@ def create_system(options, full_system, system, dma_ports, bootmem,
 
             # Connect the L1 controllers and the network
             l1_cntrl.requestToL2 = MessageBuffer()
-            l1_cntrl.requestToL2.master = ruby_system.network.slave
+            l1_cntrl.requestToL2.out_port = ruby_system.network.in_port
             l1_cntrl.responseToL2 = MessageBuffer()
-            l1_cntrl.responseToL2.master = ruby_system.network.slave
+            l1_cntrl.responseToL2.out_port = ruby_system.network.in_port
             l1_cntrl.unblockToL2 = MessageBuffer()
-            l1_cntrl.unblockToL2.master = ruby_system.network.slave
+            l1_cntrl.unblockToL2.out_port = ruby_system.network.in_port
 
             l1_cntrl.requestFromL2 = MessageBuffer()
-            l1_cntrl.requestFromL2.slave = ruby_system.network.master
+            l1_cntrl.requestFromL2.in_port = ruby_system.network.out_port
             l1_cntrl.responseFromL2 = MessageBuffer()
-            l1_cntrl.responseFromL2.slave = ruby_system.network.master
+            l1_cntrl.responseFromL2.in_port = ruby_system.network.out_port
 
 
         for j in range(num_l2caches_per_cluster):
@@ -202,18 +202,18 @@ def create_system(options, full_system, system, dma_ports, bootmem,
 
             # Connect the L2 controllers and the network
             l2_cntrl.DirRequestFromL2Cache = MessageBuffer()
-            l2_cntrl.DirRequestFromL2Cache.master = ruby_system.network.slave
+            l2_cntrl.DirRequestFromL2Cache.out_port = ruby_system.network.in_port
             l2_cntrl.L1RequestFromL2Cache = MessageBuffer()
-            l2_cntrl.L1RequestFromL2Cache.master = ruby_system.network.slave
+            l2_cntrl.L1RequestFromL2Cache.out_port = ruby_system.network.in_port
             l2_cntrl.responseFromL2Cache = MessageBuffer()
-            l2_cntrl.responseFromL2Cache.master = ruby_system.network.slave
+            l2_cntrl.responseFromL2Cache.out_port = ruby_system.network.in_port
 
             l2_cntrl.unblockToL2Cache = MessageBuffer()
-            l2_cntrl.unblockToL2Cache.slave = ruby_system.network.master
+            l2_cntrl.unblockToL2Cache.in_port = ruby_system.network.out_port
             l2_cntrl.L1RequestToL2Cache = MessageBuffer()
-            l2_cntrl.L1RequestToL2Cache.slave = ruby_system.network.master
+            l2_cntrl.L1RequestToL2Cache.in_port = ruby_system.network.out_port
             l2_cntrl.responseToL2Cache = MessageBuffer()
-            l2_cntrl.responseToL2Cache.slave = ruby_system.network.master
+            l2_cntrl.responseToL2Cache.in_port = ruby_system.network.out_port
 
     # Run each of the ruby memory controllers at a ratio of the frequency of
     # the ruby system
@@ -229,11 +229,11 @@ def create_system(options, full_system, system, dma_ports, bootmem,
     for dir_cntrl in dir_cntrl_nodes:
         # Connect the directory controllers and the network
         dir_cntrl.requestToDir = MessageBuffer()
-        dir_cntrl.requestToDir.slave = ruby_system.network.master
+        dir_cntrl.requestToDir.in_port = ruby_system.network.out_port
         dir_cntrl.responseToDir = MessageBuffer()
-        dir_cntrl.responseToDir.slave = ruby_system.network.master
+        dir_cntrl.responseToDir.in_port = ruby_system.network.out_port
         dir_cntrl.responseFromDir = MessageBuffer()
-        dir_cntrl.responseFromDir.master = ruby_system.network.slave
+        dir_cntrl.responseFromDir.out_port = ruby_system.network.in_port
         dir_cntrl.requestToMemory = MessageBuffer()
         dir_cntrl.responseFromMemory = MessageBuffer()
 
@@ -249,15 +249,15 @@ def create_system(options, full_system, system, dma_ports, bootmem,
                                    ruby_system = ruby_system)
 
         exec("ruby_system.dma_cntrl%d = dma_cntrl" % i)
-        exec("ruby_system.dma_cntrl%d.dma_sequencer.slave = dma_port" % i)
+        exec("ruby_system.dma_cntrl%d.dma_sequencer.in_ports = dma_port" % i)
         dma_cntrl_nodes.append(dma_cntrl)
 
         # Connect the dma controller to the network
         dma_cntrl.mandatoryQueue = MessageBuffer()
         dma_cntrl.responseFromDir = MessageBuffer(ordered = True)
-        dma_cntrl.responseFromDir.slave = ruby_system.network.master
+        dma_cntrl.responseFromDir.in_port = ruby_system.network.out_port
         dma_cntrl.requestToDir = MessageBuffer()
-        dma_cntrl.requestToDir.master = ruby_system.network.slave
+        dma_cntrl.requestToDir.out_port = ruby_system.network.in_port
 
     all_cntrls = l0_cntrl_nodes + \
                  l1_cntrl_nodes + \
@@ -277,9 +277,9 @@ def create_system(options, full_system, system, dma_ports, bootmem,
         # Connect the dma controller to the network
         io_controller.mandatoryQueue = MessageBuffer()
         io_controller.responseFromDir = MessageBuffer(ordered = True)
-        io_controller.responseFromDir.slave = ruby_system.network.master
+        io_controller.responseFromDir.in_port = ruby_system.network.out_port
         io_controller.requestToDir = MessageBuffer()
-        io_controller.requestToDir.master = ruby_system.network.slave
+        io_controller.requestToDir.out_port = ruby_system.network.in_port
 
         all_cntrls = all_cntrls + [io_controller]
     # Register configuration with filesystem

diff --git a/configs/ruby/MESI_Two_Level.py b/configs/ruby/MESI_Two_Level.py
@@ -107,18 +107,18 @@ def create_system(options, full_system, system, dma_ports, bootmem,
         # Connect the L1 controllers and the network
         l1_cntrl.mandatoryQueue = MessageBuffer()
         l1_cntrl.requestFromL1Cache = MessageBuffer()
-        l1_cntrl.requestFromL1Cache.master = ruby_system.network.slave
+        l1_cntrl.requestFromL1Cache.out_port = ruby_system.network.in_port
         l1_cntrl.responseFromL1Cache = MessageBuffer()
-        l1_cntrl.responseFromL1Cache.master = ruby_system.network.slave
+        l1_cntrl.responseFromL1Cache.out_port = ruby_system.network.in_port
         l1_cntrl.unblockFromL1Cache = MessageBuffer()
-        l1_cntrl.unblockFromL1Cache.master = ruby_system.network.slave
+        l1_cntrl.unblockFromL1Cache.out_port = ruby_system.network.in_port
 
         l1_cntrl.optionalQueue = MessageBuffer()
 
         l1_cntrl.requestToL1Cache = MessageBuffer()
-        l1_cntrl.requestToL1Cache.slave = ruby_system.network.master
+        l1_cntrl.requestToL1Cache.in_port = ruby_system.network.out_port
         l1_cntrl.responseToL1Cache = MessageBuffer()
-        l1_cntrl.responseToL1Cache.slave = ruby_system.network.master
+        l1_cntrl.responseToL1Cache.in_port = ruby_system.network.out_port
 
 
     l2_index_start = block_size_bits + l2_bits
@@ -141,18 +141,18 @@ def create_system(options, full_system, system, dma_ports, bootmem,
 
         # Connect the L2 controllers and the network
         l2_cntrl.DirRequestFromL2Cache = MessageBuffer()
-        l2_cntrl.DirRequestFromL2Cache.master = ruby_system.network.slave
+        l2_cntrl.DirRequestFromL2Cache.out_port = ruby_system.network.in_port
         l2_cntrl.L1RequestFromL2Cache = MessageBuffer()
-        l2_cntrl.L1RequestFromL2Cache.master = ruby_system.network.slave
+        l2_cntrl.L1RequestFromL2Cache.out_port = ruby_system.network.in_port
         l2_cntrl.responseFromL2Cache = MessageBuffer()
-        l2_cntrl.responseFromL2Cache.master = ruby_system.network.slave
+        l2_cntrl.responseFromL2Cache.out_port = ruby_system.network.in_port
 
         l2_cntrl.unblockToL2Cache = MessageBuffer()
-        l2_cntrl.unblockToL2Cache.slave = ruby_system.network.master
+        l2_cntrl.unblockToL2Cache.in_port = ruby_system.network.out_port
         l2_cntrl.L1RequestToL2Cache = MessageBuffer()
-        l2_cntrl.L1RequestToL2Cache.slave = ruby_system.network.master
+        l2_cntrl.L1RequestToL2Cache.in_port = ruby_system.network.out_port
         l2_cntrl.responseToL2Cache = MessageBuffer()
-        l2_cntrl.responseToL2Cache.slave = ruby_system.network.master
+        l2_cntrl.responseToL2Cache.in_port = ruby_system.network.out_port
 
 
     # Run each of the ruby memory controllers at a ratio of the frequency of
@@ -170,19 +170,19 @@ def create_system(options, full_system, system, dma_ports, bootmem,
     for dir_cntrl in dir_cntrl_nodes:
         # Connect the directory controllers and the network
         dir_cntrl.requestToDir = MessageBuffer()
-        dir_cntrl.requestToDir.slave = ruby_system.network.master
+        dir_cntrl.requestToDir.in_port = ruby_system.network.out_port
         dir_cntrl.responseToDir = MessageBuffer()
-        dir_cntrl.responseToDir.slave = ruby_system.network.master
+        dir_cntrl.responseToDir.in_port = ruby_system.network.out_port
         dir_cntrl.responseFromDir = MessageBuffer()
-        dir_cntrl.responseFromDir.master = ruby_system.network.slave
+        dir_cntrl.responseFromDir.out_port = ruby_system.network.in_port
         dir_cntrl.requestToMemory = MessageBuffer()
         dir_cntrl.responseFromMemory = MessageBuffer()
 
 
     for i, dma_port in enumerate(dma_ports):
         # Create the Ruby objects associated with the dma controller
         dma_seq = DMASequencer(version = i, ruby_system = ruby_system,
-                               slave = dma_port)
+                               in_ports = dma_port)
 
         dma_cntrl = DMA_Controller(version = i, dma_sequencer = dma_seq,
                                    transitions_per_cycle = options.ports,
@@ -194,9 +194,9 @@ def create_system(options, full_system, system, dma_ports, bootmem,
         # Connect the dma controller to the network
         dma_cntrl.mandatoryQueue = MessageBuffer()
         dma_cntrl.responseFromDir = MessageBuffer(ordered = True)
-        dma_cntrl.responseFromDir.slave = ruby_system.network.master
+        dma_cntrl.responseFromDir.in_port = ruby_system.network.out_port
         dma_cntrl.requestToDir = MessageBuffer()
-        dma_cntrl.requestToDir.master = ruby_system.network.slave
+        dma_cntrl.requestToDir.out_port = ruby_system.network.in_port
 
     all_cntrls = l1_cntrl_nodes + \
                  l2_cntrl_nodes + \
@@ -216,9 +216,9 @@ def create_system(options, full_system, system, dma_ports, bootmem,
         # Connect the dma controller to the network
         io_controller.mandatoryQueue = MessageBuffer()
         io_controller.responseFromDir = MessageBuffer(ordered = True)
-        io_controller.responseFromDir.slave = ruby_system.network.master
+        io_controller.responseFromDir.in_port = ruby_system.network.out_port
         io_controller.requestToDir = MessageBuffer()
-        io_controller.requestToDir.master = ruby_system.network.slave
+        io_controller.requestToDir.out_port = ruby_system.network.in_port
 
         all_cntrls = all_cntrls + [io_controller]