Andreas Sandberg has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/39582 )
Change subject: configs: Weed out old port terminology in Arm examples
......................................................................
configs: Weed out old port terminology in Arm examples
Stop using the deprecated port names in Arm example scripts.
Change-Id: I11fea3e0df945ac64075b647766570604b70cad8
Signed-off-by: Andreas Sandberg <[email protected]>
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/39582
Reviewed-by: Gabe Black <[email protected]>
Reviewed-by: Jason Lowe-Power <[email protected]>
Maintainer: Jason Lowe-Power <[email protected]>
Tested-by: kokoro <[email protected]>
---
M configs/common/MemConfig.py
M configs/example/arm/devices.py
M configs/example/arm/fs_bigLITTLE.py
M configs/example/arm/starter_se.py
4 files changed, 20 insertions(+), 19 deletions(-)
Approvals:
Jason Lowe-Power: Looks good to me, approved; Looks good to me, approved
Gabe Black: Looks good to me, approved
kokoro: Regressions pass
diff --git a/configs/common/MemConfig.py b/configs/common/MemConfig.py
index 63301ab..94b1655 100644
--- a/configs/common/MemConfig.py
+++ b/configs/common/MemConfig.py
@@ -151,7 +151,7 @@
system.external_memory = m5.objects.ExternalSlave(
port_type="tlm_slave",
port_data=opt_tlm_memory,
- port=system.membus.master,
+ port=system.membus.mem_side_ports,
addr_ranges=system.mem_ranges)
system.workload.addr_check = False
return
@@ -269,12 +269,12 @@
for i in range(len(mem_ctrls)):
if opt_mem_type == "HMC_2500_1x32":
# Connect the controllers to the membus
- mem_ctrls[i].port = xbar[i/4].master
+ mem_ctrls[i].port = xbar[i/4].mem_side_ports
# Set memory device size. There is an independent controller
# for each vault. All vaults are same size.
mem_ctrls[i].dram.device_size = options.hmc_dev_vault_size
else:
# Connect the controllers to the membus
- mem_ctrls[i].port = xbar.master
+ mem_ctrls[i].port = xbar.mem_side_ports
subsystem.mem_ctrls = mem_ctrls
diff --git a/configs/example/arm/devices.py b/configs/example/arm/devices.py
index 52613c6..9ef4d70 100644
--- a/configs/example/arm/devices.py
+++ b/configs/example/arm/devices.py
@@ -151,7 +151,7 @@
self.l2 = self._l2_type()
for cpu in self.cpus:
cpu.connectAllPorts(self.toL2Bus)
- self.toL2Bus.master = self.l2.cpu_side
+ self.toL2Bus.mem_side_ports = self.l2.cpu_side
def addPMUs(self, ints, events=[]):
"""
@@ -181,7 +181,7 @@
def connectMemSide(self, bus):
try:
- self.l2.mem_side = bus.slave
+ self.l2.mem_side = bus.cpu_side_ports
except AttributeError:
for cpu in self.cpus:
cpu.connectAllPorts(bus)
@@ -223,8 +223,9 @@
])
gic_a2t = AmbaToTlmBridge64(amba=gic.amba_m)
- gic_t2g = TlmToGem5Bridge64(tlm=gic_a2t.tlm,
gem5=system.iobus.slave)
- gic_g2t = Gem5ToTlmBridge64(gem5=system.membus.master)
+ gic_t2g = TlmToGem5Bridge64(tlm=gic_a2t.tlm,
+ gem5=system.iobus.cpu_side_ports)
+ gic_g2t = Gem5ToTlmBridge64(gem5=system.membus.mem_side_ports)
gic_g2t.addr_ranges = gic.get_addr_ranges()
gic_t2a = AmbaFromTlmBridge64(tlm=gic_g2t.tlm)
gic.amba_s = gic_t2a.amba
@@ -255,7 +256,7 @@
self.cpus = [ cpu ]
a2t = AmbaToTlmBridge64(amba=cpu.amba)
- t2g = TlmToGem5Bridge64(tlm=a2t.tlm, gem5=system.membus.slave)
+ t2g = TlmToGem5Bridge64(tlm=a2t.tlm,
gem5=system.membus.cpu_side_ports)
system.gic_hub.a2t = a2t
system.gic_hub.t2g = t2g
@@ -330,21 +331,21 @@
self.realview.attachPciDevice(dev, self.iobus)
def connect(self):
- self.iobridge.master = self.iobus.slave
- self.iobridge.slave = self.membus.master
+ self.iobridge.mem_side_port = self.iobus.cpu_side_ports
+ self.iobridge.cpu_side_port = self.membus.mem_side_ports
if self._caches:
- self.iocache.mem_side = self.membus.slave
- self.iocache.cpu_side = self.iobus.master
+ self.iocache.mem_side = self.membus.cpu_side_ports
+ self.iocache.cpu_side = self.iobus.mem_side_ports
else:
- self.dmabridge.master = self.membus.slave
- self.dmabridge.slave = self.iobus.master
+ self.dmabridge.mem_side_port = self.membus.cpu_side_ports
+ self.dmabridge.cpu_side_port = self.iobus.mem_side_ports
if hasattr(self.realview.gic, 'cpu_addr'):
self.gic_cpu_addr = self.realview.gic.cpu_addr
self.realview.attachOnChipIO(self.membus, self.iobridge)
self.realview.attachIO(self.iobus)
- self.system_port = self.membus.slave
+ self.system_port = self.membus.cpu_side_ports
def numCpuClusters(self):
return len(self._clusters)
@@ -377,8 +378,8 @@
key=lambda c:
c.clk_domain.clock[0])
self.l3 = L3(clk_domain=max_clock_cluster.clk_domain)
self.toL3Bus = L2XBar(width=64)
- self.toL3Bus.master = self.l3.cpu_side
- self.l3.mem_side = self.membus.slave
+ self.toL3Bus.mem_side_ports = self.l3.cpu_side
+ self.l3.mem_side = self.membus.cpu_side_ports
cluster_mem_bus = self.toL3Bus
# connect each cluster to the memory hierarchy
diff --git a/configs/example/arm/fs_bigLITTLE.py
b/configs/example/arm/fs_bigLITTLE.py
index 85213ee..1df548d 100644
--- a/configs/example/arm/fs_bigLITTLE.py
+++ b/configs/example/arm/fs_bigLITTLE.py
@@ -119,7 +119,7 @@
object_file=SysPaths.binary(kernel)),
readfile=bootscript)
- sys.mem_ctrls = [ SimpleMemory(range=r, port=sys.membus.master)
+ sys.mem_ctrls = [ SimpleMemory(range=r, port=sys.membus.mem_side_ports)
for r in sys.mem_ranges ]
sys.connect()
diff --git a/configs/example/arm/starter_se.py
b/configs/example/arm/starter_se.py
index 23da8e7..15fcad7 100644
--- a/configs/example/arm/starter_se.py
+++ b/configs/example/arm/starter_se.py
@@ -97,7 +97,7 @@
# Wire up the system port that gem5 uses to load the kernel
# and to perform debug accesses.
- self.system_port = self.membus.slave
+ self.system_port = self.membus.cpu_side_ports
# Add CPUs to the system. A cluster of CPUs typically have
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/39582
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: I11fea3e0df945ac64075b647766570604b70cad8
Gerrit-Change-Number: 39582
Gerrit-PatchSet: 2
Gerrit-Owner: Andreas Sandberg <[email protected]>
Gerrit-Reviewer: Andreas Sandberg <[email protected]>
Gerrit-Reviewer: Gabe Black <[email protected]>
Gerrit-Reviewer: Giacomo Travaglini <[email protected]>
Gerrit-Reviewer: Jason Lowe-Power <[email protected]>
Gerrit-Reviewer: Jason Lowe-Power <[email protected]>
Gerrit-Reviewer: kokoro <[email protected]>
Gerrit-MessageType: merged
_______________________________________________
gem5-dev mailing list -- [email protected]
To unsubscribe send an email to [email protected]
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s