Matthew Poremba has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/44906 )
Change subject: configs: Remove deprecated port names in GPU_VIPER
......................................................................
configs: Remove deprecated port names in GPU_VIPER
Remove the port names that were deprecated in 21.0 and replace with the
new names in GPU_VIPER.py.
Change-Id: Ied770982ccd365638923c71a0ea8bcf9936d358e
---
M configs/ruby/GPU_VIPER.py
1 file changed, 41 insertions(+), 40 deletions(-)
diff --git a/configs/ruby/GPU_VIPER.py b/configs/ruby/GPU_VIPER.py
index 1ac7c07..e315543 100644
--- a/configs/ruby/GPU_VIPER.py
+++ b/configs/ruby/GPU_VIPER.py
@@ -462,19 +462,19 @@
# Connect the Directory controller to the ruby network
dir_cntrl.requestFromCores = MessageBuffer(ordered = True)
- dir_cntrl.requestFromCores.slave = ruby_system.network.master
+ dir_cntrl.requestFromCores.in_port = ruby_system.network.out_port
dir_cntrl.responseFromCores = MessageBuffer()
- dir_cntrl.responseFromCores.slave = ruby_system.network.master
+ dir_cntrl.responseFromCores.in_port = ruby_system.network.out_port
dir_cntrl.unblockFromCores = MessageBuffer()
- dir_cntrl.unblockFromCores.slave = ruby_system.network.master
+ dir_cntrl.unblockFromCores.in_port = ruby_system.network.out_port
dir_cntrl.probeToCore = MessageBuffer()
- dir_cntrl.probeToCore.master = ruby_system.network.slave
+ dir_cntrl.probeToCore.out_port = ruby_system.network.in_port
dir_cntrl.responseToCore = MessageBuffer()
- dir_cntrl.responseToCore.master = ruby_system.network.slave
+ dir_cntrl.responseToCore.out_port = ruby_system.network.in_port
dir_cntrl.triggerQueue = MessageBuffer(ordered = True)
dir_cntrl.L3triggerQueue = MessageBuffer(ordered = True)
@@ -482,10 +482,10 @@
dir_cntrl.responseFromMemory = MessageBuffer()
dir_cntrl.requestFromDMA = MessageBuffer(ordered=True)
- dir_cntrl.requestFromDMA.slave = ruby_system.network.master
+ dir_cntrl.requestFromDMA.in_port = ruby_system.network.out_port
dir_cntrl.responseToDMA = MessageBuffer()
- dir_cntrl.responseToDMA.master = ruby_system.network.slave
+ dir_cntrl.responseToDMA.out_port = ruby_system.network.in_port
dir_cntrl.requestToMemory = MessageBuffer()
dir_cntrl.responseFromMemory = MessageBuffer()
@@ -513,19 +513,19 @@
# Connect the CP controllers and the network
cp_cntrl.requestFromCore = MessageBuffer()
- cp_cntrl.requestFromCore.master = ruby_system.network.slave
+ cp_cntrl.requestFromCore.out_port = ruby_system.network.in_port
cp_cntrl.responseFromCore = MessageBuffer()
- cp_cntrl.responseFromCore.master = ruby_system.network.slave
+ cp_cntrl.responseFromCore.out_port = ruby_system.network.in_port
cp_cntrl.unblockFromCore = MessageBuffer()
- cp_cntrl.unblockFromCore.master = ruby_system.network.slave
+ cp_cntrl.unblockFromCore.out_port = ruby_system.network.in_port
cp_cntrl.probeToCore = MessageBuffer()
- cp_cntrl.probeToCore.slave = ruby_system.network.master
+ cp_cntrl.probeToCore.in_port = ruby_system.network.out_port
cp_cntrl.responseToCore = MessageBuffer()
- cp_cntrl.responseToCore.slave = ruby_system.network.master
+ cp_cntrl.responseToCore.in_port = ruby_system.network.out_port
cp_cntrl.mandatoryQueue = MessageBuffer()
cp_cntrl.triggerQueue = MessageBuffer(ordered = True)
@@ -610,19 +610,19 @@
# Connect the TCP controller to the ruby network
tcp_cntrl.requestFromTCP = MessageBuffer(ordered = True)
- tcp_cntrl.requestFromTCP.master = ruby_system.network.slave
+ tcp_cntrl.requestFromTCP.out_port = ruby_system.network.in_port
tcp_cntrl.responseFromTCP = MessageBuffer(ordered = True)
- tcp_cntrl.responseFromTCP.master = ruby_system.network.slave
+ tcp_cntrl.responseFromTCP.out_port = ruby_system.network.in_port
tcp_cntrl.unblockFromCore = MessageBuffer()
- tcp_cntrl.unblockFromCore.master = ruby_system.network.slave
+ tcp_cntrl.unblockFromCore.out_port = ruby_system.network.in_port
tcp_cntrl.probeToTCP = MessageBuffer(ordered = True)
- tcp_cntrl.probeToTCP.slave = ruby_system.network.master
+ tcp_cntrl.probeToTCP.in_port = ruby_system.network.out_port
tcp_cntrl.responseToTCP = MessageBuffer(ordered = True)
- tcp_cntrl.responseToTCP.slave = ruby_system.network.master
+ tcp_cntrl.responseToTCP.in_port = ruby_system.network.out_port
tcp_cntrl.mandatoryQueue = MessageBuffer()
@@ -641,13 +641,13 @@
# Connect the SQC controller to the ruby network
sqc_cntrl.requestFromSQC = MessageBuffer(ordered = True)
- sqc_cntrl.requestFromSQC.master = ruby_system.network.slave
+ sqc_cntrl.requestFromSQC.out_port = ruby_system.network.in_port
sqc_cntrl.probeToSQC = MessageBuffer(ordered = True)
- sqc_cntrl.probeToSQC.slave = ruby_system.network.master
+ sqc_cntrl.probeToSQC.in_port = ruby_system.network.out_port
sqc_cntrl.responseToSQC = MessageBuffer(ordered = True)
- sqc_cntrl.responseToSQC.slave = ruby_system.network.master
+ sqc_cntrl.responseToSQC.in_port = ruby_system.network.out_port
sqc_cntrl.mandatoryQueue = MessageBuffer()
@@ -663,13 +663,13 @@
cpu_sequencers.append(scalar_cntrl.sequencer)
scalar_cntrl.requestFromSQC = MessageBuffer(ordered = True)
- scalar_cntrl.requestFromSQC.master = ruby_system.network.slave
+ scalar_cntrl.requestFromSQC.out_port = ruby_system.network.in_port
scalar_cntrl.probeToSQC = MessageBuffer(ordered = True)
- scalar_cntrl.probeToSQC.slave = ruby_system.network.master
+ scalar_cntrl.probeToSQC.in_port = ruby_system.network.out_port
scalar_cntrl.responseToSQC = MessageBuffer(ordered = True)
- scalar_cntrl.responseToSQC.slave = ruby_system.network.master
+ scalar_cntrl.responseToSQC.in_port = ruby_system.network.out_port
scalar_cntrl.mandatoryQueue = \
MessageBuffer(buffer_size=options.scalar_buffer_size)
@@ -700,19 +700,19 @@
# Connect the CP (TCP) controllers to the ruby network
tcp_cntrl.requestFromTCP = MessageBuffer(ordered = True)
- tcp_cntrl.requestFromTCP.master = ruby_system.network.slave
+ tcp_cntrl.requestFromTCP.out_port = ruby_system.network.in_port
tcp_cntrl.responseFromTCP = MessageBuffer(ordered = True)
- tcp_cntrl.responseFromTCP.master = ruby_system.network.slave
+ tcp_cntrl.responseFromTCP.out_port = ruby_system.network.in_port
tcp_cntrl.unblockFromCore = MessageBuffer(ordered = True)
- tcp_cntrl.unblockFromCore.master = ruby_system.network.slave
+ tcp_cntrl.unblockFromCore.out_port = ruby_system.network.in_port
tcp_cntrl.probeToTCP = MessageBuffer(ordered = True)
- tcp_cntrl.probeToTCP.slave = ruby_system.network.master
+ tcp_cntrl.probeToTCP.in_port = ruby_system.network.out_port
tcp_cntrl.responseToTCP = MessageBuffer(ordered = True)
- tcp_cntrl.responseToTCP.slave = ruby_system.network.master
+ tcp_cntrl.responseToTCP.in_port = ruby_system.network.out_port
tcp_cntrl.mandatoryQueue = MessageBuffer()
@@ -743,25 +743,25 @@
# Connect the TCC controllers to the ruby network
tcc_cntrl.requestFromTCP = MessageBuffer(ordered = True)
- tcc_cntrl.requestFromTCP.slave = ruby_system.network.master
+ tcc_cntrl.requestFromTCP.in_port = ruby_system.network.out_port
tcc_cntrl.responseToCore = MessageBuffer(ordered = True)
- tcc_cntrl.responseToCore.master = ruby_system.network.slave
+ tcc_cntrl.responseToCore.out_port = ruby_system.network.in_port
tcc_cntrl.probeFromNB = MessageBuffer()
- tcc_cntrl.probeFromNB.slave = ruby_system.network.master
+ tcc_cntrl.probeFromNB.in_port = ruby_system.network.out_port
tcc_cntrl.responseFromNB = MessageBuffer()
- tcc_cntrl.responseFromNB.slave = ruby_system.network.master
+ tcc_cntrl.responseFromNB.in_port = ruby_system.network.out_port
tcc_cntrl.requestToNB = MessageBuffer(ordered = True)
- tcc_cntrl.requestToNB.master = ruby_system.network.slave
+ tcc_cntrl.requestToNB.out_port = ruby_system.network.in_port
tcc_cntrl.responseToNB = MessageBuffer()
- tcc_cntrl.responseToNB.master = ruby_system.network.slave
+ tcc_cntrl.responseToNB.out_port = ruby_system.network.in_port
tcc_cntrl.unblockToNB = MessageBuffer()
- tcc_cntrl.unblockToNB.master = ruby_system.network.slave
+ tcc_cntrl.unblockToNB.out_port = ruby_system.network.in_port
tcc_cntrl.triggerQueue = MessageBuffer(ordered = True)
@@ -779,17 +779,18 @@
# IDE doesn't have a .type but seems like everything else does.
if not hasattr(dma_device, 'type'):
- exec('system.dma_cntrl%d.dma_sequencer.slave = dma_device' % i)
+ exec('system.dma_cntrl%d.dma_sequencer.in_ports =
dma_device' % i)
elif dma_device.type == 'MemTest':
- exec('system.dma_cntrl%d.dma_sequencer.slave =
dma_devices.test'
+ exec('system.dma_cntrl%d.dma_sequencer.in_ports =
dma_devices.test'
% i)
else:
- exec('system.dma_cntrl%d.dma_sequencer.slave =
dma_device.dma' % i)
+ exec('system.dma_cntrl%d.dma_sequencer.in_ports =
dma_device.dma'
+ % i)
dma_cntrl.requestToDir = MessageBuffer(buffer_size=0)
- dma_cntrl.requestToDir.master = ruby_system.network.slave
+ dma_cntrl.requestToDir.out_port = ruby_system.network.in_port
dma_cntrl.responseFromDir = MessageBuffer(buffer_size=0)
- dma_cntrl.responseFromDir.slave = ruby_system.network.master
+ dma_cntrl.responseFromDir.in_port = ruby_system.network.out_port
dma_cntrl.mandatoryQueue = MessageBuffer(buffer_size = 0)
gpuCluster.add(dma_cntrl)
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/44906
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: Ied770982ccd365638923c71a0ea8bcf9936d358e
Gerrit-Change-Number: 44906
Gerrit-PatchSet: 1
Gerrit-Owner: Matthew Poremba <matthew.pore...@amd.com>
Gerrit-MessageType: newchange
_______________________________________________
gem5-dev mailing list -- gem5-dev@gem5.org
To unsubscribe send an email to gem5-dev-le...@gem5.org
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s
