sanchayanmaity/gem5
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

config: correct example ruby scripts

Browse source 
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.
This commit is contained in:
Nilay Vaish 2013-10-09 17:28:14 -05:00
parent a44bb59192
commit dbc3b2e86a
5 changed files with 19 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
configs/common/Options.py
View file

@ -115,7 +115,7 @@ def addCommonOptions(parser):
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,

5
configs/example/ruby_direct_test.py
View file

@ -92,7 +92,8 @@ else:
# 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.ticks.setGlobalFrequency('1ns')
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()

12
configs/example/ruby_mem_test.py
View file

@ -108,7 +108,8 @@ system = System(cpu = cpus,
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 @@ for (i, dma) in enumerate(dmas):
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.ticks.setGlobalFrequency('1ns')
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()

6
configs/example/ruby_network_test.py
View file

@ -103,8 +103,8 @@ cpus = [ NetworkTest(fixed_pkts=options.fixed_pkts,
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.ticks.setGlobalFrequency('1ns')
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()

5
configs/example/ruby_random_test.py
View file

@ -97,7 +97,8 @@ tester = RubyTester(check_flush = check_flush,
# 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.ticks.setGlobalFrequency('1ns')
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()