changeset 0679c3554ba3 in /z/repo/gem5
details: http://repo.gem5.org/gem5?cmd=changeset;node=0679c3554ba3
description:
config: correct example ruby scripts
A couple of recent changesets added/deleted/edited some variables
that are needed for running the example ruby scripts. This changeset
edits these scripts to bring them to a working state.
diffstat:
configs/common/Options.py | 2 +-
configs/example/ruby_direct_test.py | 5 +++--
configs/example/ruby_mem_test.py | 12 +++++++++---
configs/example/ruby_network_test.py | 6 +++---
configs/example/ruby_random_test.py | 5 +++--
5 files changed, 19 insertions(+), 11 deletions(-)
diffs (112 lines):
diff -r 67c8fbe5d629 -r 0679c3554ba3 configs/common/Options.py
--- a/configs/common/Options.py Wed Oct 09 04:41:19 2013 -0400
+++ b/configs/common/Options.py Wed Oct 09 17:28:14 2013 -0500
@@ -115,7 +115,7 @@
parser.add_option("--ruby", action="store_true")
# Run duration options
- parser.add_option("-m", "--abs-max-tick", type="int", default=None,
+ parser.add_option("-m", "--abs-max-tick", type="int", default=m5.MaxTick,
metavar="TICKS", help="Run to absolute simulated tick " \
"specified including ticks from a restored checkpoint")
parser.add_option("--rel-max-tick", type="int", default=None,
diff -r 67c8fbe5d629 -r 0679c3554ba3 configs/example/ruby_direct_test.py
--- a/configs/example/ruby_direct_test.py Wed Oct 09 04:41:19 2013 -0400
+++ b/configs/example/ruby_direct_test.py Wed Oct 09 17:28:14 2013 -0500
@@ -92,7 +92,8 @@
# actually used by the rubytester, but is included to support the
# M5 memory size == Ruby memory size checks
#
-system = System(physmem = SimpleMemory())
+system = System(physmem = SimpleMemory(),
+ mem_ranges = [AddrRange(options.mem_size)])
# Create a top-level voltage domain and clock domain
@@ -136,6 +137,6 @@
m5.instantiate()
# simulate until program terminates
-exit_event = m5.simulate(options.maxtick)
+exit_event = m5.simulate(options.abs_max_tick)
print 'Exiting @ tick', m5.curTick(), 'because', exit_event.getCause()
diff -r 67c8fbe5d629 -r 0679c3554ba3 configs/example/ruby_mem_test.py
--- a/configs/example/ruby_mem_test.py Wed Oct 09 04:41:19 2013 -0400
+++ b/configs/example/ruby_mem_test.py Wed Oct 09 17:28:14 2013 -0500
@@ -108,7 +108,8 @@
funcmem = SimpleMemory(in_addr_map = False),
funcbus = NoncoherentBus(),
physmem = SimpleMemory(),
- clk_domain = SrcClockDomain(clock = options.sys_clock))
+ clk_domain = SrcClockDomain(clock = options.sys_clock),
+ mem_ranges = [AddrRange(options.mem_size)])
if options.num_dmas > 0:
dmas = [ MemTest(atomic = False,
@@ -129,8 +130,13 @@
dma_ports.append(dma.test)
Ruby.create_system(options, system, dma_ports = dma_ports)
+# Create a top-level voltage domain and clock domain
+system.voltage_domain = VoltageDomain(voltage = options.sys_voltage)
+system.clk_domain = SrcClockDomain(clock = options.sys_clock,
+ voltage_domain = system.voltage_domain)
# Create a seperate clock domain for Ruby
-system.ruby.clk_domain = SrcClockDomain(clock = options.ruby_clock)
+system.ruby.clk_domain = SrcClockDomain(clock = options.ruby_clock,
+ voltage_domain = system.voltage_domain)
#
# The tester is most effective when randomization is turned on and
@@ -183,6 +189,6 @@
m5.instantiate()
# simulate until program terminates
-exit_event = m5.simulate(options.maxtick)
+exit_event = m5.simulate(options.abs_max_tick)
print 'Exiting @ tick', m5.curTick(), 'because', exit_event.getCause()
diff -r 67c8fbe5d629 -r 0679c3554ba3 configs/example/ruby_network_test.py
--- a/configs/example/ruby_network_test.py Wed Oct 09 04:41:19 2013 -0400
+++ b/configs/example/ruby_network_test.py Wed Oct 09 17:28:14 2013 -0500
@@ -103,8 +103,8 @@
for i in xrange(options.num_cpus) ]
# create the desired simulated system
-system = System(cpu = cpus,
- physmem = SimpleMemory())
+system = System(cpu = cpus, physmem = SimpleMemory(),
+ mem_ranges = [AddrRange(options.mem_size)])
# Create a top-level voltage domain and clock domain
@@ -143,6 +143,6 @@
m5.instantiate()
# simulate until program terminates
-exit_event = m5.simulate(options.maxtick)
+exit_event = m5.simulate(options.abs_max_tick)
print 'Exiting @ tick', m5.curTick(), 'because', exit_event.getCause()
diff -r 67c8fbe5d629 -r 0679c3554ba3 configs/example/ruby_random_test.py
--- a/configs/example/ruby_random_test.py Wed Oct 09 04:41:19 2013 -0400
+++ b/configs/example/ruby_random_test.py Wed Oct 09 17:28:14 2013 -0500
@@ -97,7 +97,8 @@
# actually used by the rubytester, but is included to support the
# M5 memory size == Ruby memory size checks
#
-system = System(tester = tester, physmem = SimpleMemory())
+system = System(tester = tester, physmem = SimpleMemory(),
+ mem_ranges = [AddrRange(options.mem_size)])
# Create a top-level voltage domain and clock domain
system.voltage_domain = VoltageDomain(voltage = options.sys_voltage)
@@ -156,6 +157,6 @@
m5.instantiate()
# simulate until program terminates
-exit_event = m5.simulate(options.maxtick)
+exit_event = m5.simulate(options.abs_max_tick)
print 'Exiting @ tick', m5.curTick(), 'because', exit_event.getCause()
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
