changeset fd510b6e124d in /z/repo/gem5
details: http://repo.gem5.org/gem5?cmd=changeset;node=fd510b6e124d
description:
Ruby: Connect system port in Ruby network test
This patch moves the connection of the system port to create_system in
Ruby.py. Thereby it allows the failing Ruby test (and other Ruby
systems) to run again.
diffstat:
configs/example/se.py | 1 -
configs/ruby/Ruby.py | 5 ++++-
tests/configs/memtest-ruby.py | 4 ----
tests/configs/o3-timing-mp-ruby.py | 2 ++
tests/configs/o3-timing-ruby.py | 3 +++
tests/configs/rubytest-ruby.py | 3 ---
tests/configs/simple-atomic-mp-ruby.py | 2 ++
tests/configs/simple-timing-mp-ruby.py | 3 ---
tests/configs/simple-timing-ruby.py | 3 ---
9 files changed, 11 insertions(+), 15 deletions(-)
diffs (119 lines):
diff -r bb0aaf3ffa18 -r fd510b6e124d configs/example/se.py
--- a/configs/example/se.py Mon Jan 30 05:38:24 2012 -0500
+++ b/configs/example/se.py Mon Jan 30 09:37:06 2012 -0500
@@ -184,7 +184,6 @@
options.use_map = True
Ruby.create_system(options, system)
assert(options.num_cpus == len(system.ruby._cpu_ruby_ports))
- system.system_port = system.ruby._sys_port_proxy.port
else:
system.system_port = system.membus.port
system.physmem.port = system.membus.port
diff -r bb0aaf3ffa18 -r fd510b6e124d configs/ruby/Ruby.py
--- a/configs/ruby/Ruby.py Mon Jan 30 05:38:24 2012 -0500
+++ b/configs/ruby/Ruby.py Mon Jan 30 09:37:06 2012 -0500
@@ -105,6 +105,10 @@
# full-fledged controller
system.sys_port_proxy = sys_port_proxy
+ # Connect the system port for loading of binaries etc
+ system.system_port = system.sys_port_proxy.port
+
+
#
# Set the network classes based on the command line options
#
@@ -182,5 +186,4 @@
ruby.profiler = ruby_profiler
ruby.mem_size = total_mem_size
ruby._cpu_ruby_ports = cpu_sequencers
- ruby._sys_port_proxy = sys_port_proxy
ruby.random_seed = options.random_seed
diff -r bb0aaf3ffa18 -r fd510b6e124d tests/configs/memtest-ruby.py
--- a/tests/configs/memtest-ruby.py Mon Jan 30 05:38:24 2012 -0500
+++ b/tests/configs/memtest-ruby.py Mon Jan 30 09:37:06 2012 -0500
@@ -109,10 +109,6 @@
#
ruby_port.access_phys_mem = False
-
-# Connect the system port for loading of binaries etc
-system.system_port = system.ruby._sys_port_proxy.port
-
# -----------------------
# run simulation
# -----------------------
diff -r bb0aaf3ffa18 -r fd510b6e124d tests/configs/o3-timing-mp-ruby.py
--- a/tests/configs/o3-timing-mp-ruby.py Mon Jan 30 05:38:24 2012 -0500
+++ b/tests/configs/o3-timing-mp-ruby.py Mon Jan 30 09:37:06 2012 -0500
@@ -46,6 +46,8 @@
# connect memory to membus
system.physmem.port = system.membus.port
+# Connect the system port for loading of binaries etc
+system.system_port = system.membus.port
# -----------------------
# run simulation
diff -r bb0aaf3ffa18 -r fd510b6e124d tests/configs/o3-timing-ruby.py
--- a/tests/configs/o3-timing-ruby.py Mon Jan 30 05:38:24 2012 -0500
+++ b/tests/configs/o3-timing-ruby.py Mon Jan 30 09:37:06 2012 -0500
@@ -43,4 +43,7 @@
system.physmem.port = system.membus.port
cpu.connectAllPorts(system.membus)
+# Connect the system port for loading of binaries etc
+system.system_port = system.membus.port
+
root = Root(system = system)
diff -r bb0aaf3ffa18 -r fd510b6e124d tests/configs/rubytest-ruby.py
--- a/tests/configs/rubytest-ruby.py Mon Jan 30 05:38:24 2012 -0500
+++ b/tests/configs/rubytest-ruby.py Mon Jan 30 09:37:06 2012 -0500
@@ -105,9 +105,6 @@
#
ruby_port.access_phys_mem = False
-# Connect the system port for loading of binaries etc
-system.system_port = system.ruby._sys_port_proxy.port
-
# -----------------------
# run simulation
# -----------------------
diff -r bb0aaf3ffa18 -r fd510b6e124d tests/configs/simple-atomic-mp-ruby.py
--- a/tests/configs/simple-atomic-mp-ruby.py Mon Jan 30 05:38:24 2012 -0500
+++ b/tests/configs/simple-atomic-mp-ruby.py Mon Jan 30 09:37:06 2012 -0500
@@ -47,6 +47,8 @@
# connect memory to membus
system.physmem.port = system.membus.port
+# Connect the system port for loading of binaries etc
+system.system_port = system.membus.port
# -----------------------
# run simulation
diff -r bb0aaf3ffa18 -r fd510b6e124d tests/configs/simple-timing-mp-ruby.py
--- a/tests/configs/simple-timing-mp-ruby.py Mon Jan 30 05:38:24 2012 -0500
+++ b/tests/configs/simple-timing-mp-ruby.py Mon Jan 30 09:37:06 2012 -0500
@@ -88,9 +88,6 @@
cpu.icache_port = system.ruby._cpu_ruby_ports[i].port
cpu.dcache_port = system.ruby._cpu_ruby_ports[i].port
-# Connect the system port for loading of binaries etc
-system.system_port = system.ruby._sys_port_proxy.port
-
# -----------------------
# run simulation
# -----------------------
diff -r bb0aaf3ffa18 -r fd510b6e124d tests/configs/simple-timing-ruby.py
--- a/tests/configs/simple-timing-ruby.py Mon Jan 30 05:38:24 2012 -0500
+++ b/tests/configs/simple-timing-ruby.py Mon Jan 30 09:37:06 2012 -0500
@@ -85,9 +85,6 @@
cpu.icache_port = system.ruby._cpu_ruby_ports[0].port
cpu.dcache_port = system.ruby._cpu_ruby_ports[0].port
-# Connect the system port for loading of binaries etc
-system.system_port = system.ruby._sys_port_proxy.port
-
# -----------------------
# run simulation
# -----------------------
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
