Matthew Poremba has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/44806 )
Change subject: configs: Handle various DMA devices in GPU_VIPER
......................................................................
configs: Handle various DMA devices in GPU_VIPER
Viper is checking for the dma's type before making the port assignment.
In FullSystem mode the IDE device is a PortRef and does not have an
attribute 'type.' This handles the various types a bit better and
ensures that IDE device, the protocol tester, and upcoming DMA devices
related to FullSystem can be added.
Change-Id: I6879b25c6aabbbc22b0ee8dc9cbfec6399f70daa
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/44806
Reviewed-by: Matthew Poremba <[email protected]>
Maintainer: Matthew Poremba <[email protected]>
Tested-by: kokoro <[email protected]>
---
M configs/ruby/GPU_VIPER.py
1 file changed, 6 insertions(+), 1 deletion(-)
Approvals:
Matthew Poremba: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
diff --git a/configs/ruby/GPU_VIPER.py b/configs/ruby/GPU_VIPER.py
index 01ec602..1ac7c07 100644
--- a/configs/ruby/GPU_VIPER.py
+++ b/configs/ruby/GPU_VIPER.py
@@ -776,11 +776,16 @@
dma_cntrl = DMA_Controller(version=i, dma_sequencer=dma_seq,
ruby_system=ruby_system)
exec('system.dma_cntrl%d = dma_cntrl' % i)
- if dma_device.type == 'MemTest':
+
+ # 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)
+ elif dma_device.type == 'MemTest':
exec('system.dma_cntrl%d.dma_sequencer.slave =
dma_devices.test'
% i)
else:
exec('system.dma_cntrl%d.dma_sequencer.slave =
dma_device.dma' % i)
+
dma_cntrl.requestToDir = MessageBuffer(buffer_size=0)
dma_cntrl.requestToDir.master = ruby_system.network.slave
dma_cntrl.responseFromDir = MessageBuffer(buffer_size=0)
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/44806
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: I6879b25c6aabbbc22b0ee8dc9cbfec6399f70daa
Gerrit-Change-Number: 44806
Gerrit-PatchSet: 3
Gerrit-Owner: Matthew Poremba <[email protected]>
Gerrit-Reviewer: Alex Dutu <[email protected]>
Gerrit-Reviewer: Jason Lowe-Power <[email protected]>
Gerrit-Reviewer: Jason Lowe-Power <[email protected]>
Gerrit-Reviewer: Matt Sinclair <[email protected]>
Gerrit-Reviewer: Matthew Poremba <[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
