2552e68eb6
Moving work back to zizzer...
configs/common/FSConfig.py:
configs/test/fs.py:
Move CPU connections out of makeLinuxAlphaSystem()
src/python/m5/objects/BaseCPU.py:
Create default TLBs in full system.
Move utility cache functions here.
src/python/m5/objects/O3CPU.py:
Add _mem_ports
tests/run.py:
Add binpath()
Change maxtick default to 'forever'
tests/simple-atomic.py:
Use connectmemPorts()
tests/simple-timing.py:
Fix up.
--HG--
rename : tests/quick/eio1/ref/alpha/eio/detailed/config.ini => tests/quick/20.eio-short/ref/alpha/eio/detailed/config.ini
rename : tests/quick/eio1/ref/alpha/eio/detailed/config.out => tests/quick/20.eio-short/ref/alpha/eio/detailed/config.out
rename : tests/quick/eio1/ref/alpha/eio/detailed/m5stats.txt => tests/quick/20.eio-short/ref/alpha/eio/detailed/m5stats.txt
rename : tests/quick/eio1/ref/alpha/eio/detailed/stderr => tests/quick/20.eio-short/ref/alpha/eio/detailed/stderr
rename : tests/quick/eio1/ref/alpha/eio/detailed/stdout => tests/quick/20.eio-short/ref/alpha/eio/detailed/stdout
rename : tests/quick/eio1/ref/alpha/eio/simple-atomic/config.ini => tests/quick/20.eio-short/ref/alpha/eio/simple-atomic/config.ini
rename : tests/quick/eio1/ref/alpha/eio/simple-atomic/config.out => tests/quick/20.eio-short/ref/alpha/eio/simple-atomic/config.out
rename : tests/quick/eio1/ref/alpha/eio/simple-atomic/m5stats.txt => tests/quick/20.eio-short/ref/alpha/eio/simple-atomic/m5stats.txt
rename : tests/quick/eio1/ref/alpha/eio/simple-atomic/stderr => tests/quick/20.eio-short/ref/alpha/eio/simple-atomic/stderr
rename : tests/quick/eio1/ref/alpha/eio/simple-atomic/stdout => tests/quick/20.eio-short/ref/alpha/eio/simple-atomic/stdout
rename : tests/quick/eio1/ref/alpha/eio/simple-timing/config.ini => tests/quick/20.eio-short/ref/alpha/eio/simple-timing/config.ini
rename : tests/quick/eio1/ref/alpha/eio/simple-timing/config.out => tests/quick/20.eio-short/ref/alpha/eio/simple-timing/config.out
rename : tests/quick/eio1/ref/alpha/eio/simple-timing/m5stats.txt => tests/quick/20.eio-short/ref/alpha/eio/simple-timing/m5stats.txt
rename : tests/quick/eio1/ref/alpha/eio/simple-timing/stderr => tests/quick/20.eio-short/ref/alpha/eio/simple-timing/stderr
rename : tests/quick/eio1/ref/alpha/eio/simple-timing/stdout => tests/quick/20.eio-short/ref/alpha/eio/simple-timing/stdout
rename : tests/quick/eio1/test.py => tests/quick/20.eio-short/test.py
rename : configs/test/hello => tests/test-progs/hello/bin/alpha/linux/hello
rename : configs/test/hello_mips => tests/test-progs/hello/bin/mips/linux/hello_mips
rename : configs/test/sparc_tests/hello_sparc => tests/test-progs/hello/bin/sparc/bin
extra : convert_revision : 1f891392ecc11ffcc3b3182fa673c401c0efc8a5
94 lines
2.8 KiB
Python
94 lines
2.8 KiB
Python
import optparse, os, sys
|
|
|
|
import m5
|
|
from m5.objects import *
|
|
m5.AddToPath('../common')
|
|
from FSConfig import *
|
|
from SysPaths import *
|
|
from Benchmarks import *
|
|
|
|
parser = optparse.OptionParser()
|
|
|
|
parser.add_option("-d", "--detailed", action="store_true")
|
|
parser.add_option("-t", "--timing", action="store_true")
|
|
parser.add_option("-m", "--maxtick", type="int")
|
|
parser.add_option("--maxtime", type="float")
|
|
parser.add_option("--dual", action="store_true",
|
|
help="Simulate two systems attached with an ethernet link")
|
|
parser.add_option("-b", "--benchmark", action="store", type="string",
|
|
dest="benchmark",
|
|
help="Specify the benchmark to run. Available benchmarks: %s"\
|
|
% DefinedBenchmarks)
|
|
|
|
(options, args) = parser.parse_args()
|
|
|
|
if args:
|
|
print "Error: script doesn't take any positional arguments"
|
|
sys.exit(1)
|
|
|
|
if options.detailed:
|
|
cpu = DetailedO3CPU()
|
|
cpu2 = DetailedO3CPU()
|
|
mem_mode = 'timing'
|
|
elif options.timing:
|
|
cpu = TimingSimpleCPU()
|
|
cpu2 = TimingSimpleCPU()
|
|
mem_mode = 'timing'
|
|
else:
|
|
cpu = AtomicSimpleCPU()
|
|
cpu2 = AtomicSimpleCPU()
|
|
mem_mode = 'atomic'
|
|
|
|
|
|
if options.benchmark:
|
|
if options.benchmark not in Benchmarks:
|
|
print "Error benchmark %s has not been defined." % options.benchmark
|
|
print "Valid benchmarks are: %s" % DefinedBenchmarks
|
|
sys.exit(1)
|
|
|
|
bm = Benchmarks[options.benchmark]
|
|
|
|
if len(bm) == 2:
|
|
s1 = makeLinuxAlphaSystem(mem_mode, bm[0])
|
|
s2 = makeLinuxAlphaSystem(mem_mode, bm[1])
|
|
cpu.connectMemPorts(s1.membus)
|
|
cpu2.connectMemPorts(s2.membus)
|
|
root = makeDualRoot(s1, s2)
|
|
elif len(bm) == 1:
|
|
root = Root(clock = '1THz',
|
|
system = makeLinuxAlphaSystem(mem_mode, bm[0]))
|
|
cpu.connectMemPorts(root.system.membus)
|
|
else:
|
|
print "Error I don't know how to create more than 2 systems."
|
|
sys.exit(1)
|
|
|
|
else:
|
|
if options.dual:
|
|
root = makeDualRoot(
|
|
makeLinuxAlphaSystem(cpu, mem_mode, Machine()),
|
|
makeLinuxAlphaSystem(cpu2, mem_mode, Machine()))
|
|
else:
|
|
root = Root(clock = '1THz',
|
|
system = makeLinuxAlphaSystem(cpu, mem_mode, Machine()))
|
|
|
|
m5.instantiate(root)
|
|
|
|
#exit_event = m5.simulate(2600000000000)
|
|
#if exit_event.getCause() != "user interrupt received":
|
|
# m5.checkpoint(root, 'cpt')
|
|
# exit_event = m5.simulate(300000000000)
|
|
# if exit_event.getCause() != "user interrupt received":
|
|
# m5.checkpoint(root, 'cptA')
|
|
|
|
|
|
if options.maxtick:
|
|
exit_event = m5.simulate(options.maxtick)
|
|
elif options.maxtime:
|
|
simtime = int(options.maxtime * root.clock.value)
|
|
print "simulating for: ", simtime
|
|
exit_event = m5.simulate(simtime)
|
|
else:
|
|
exit_event = m5.simulate()
|
|
|
|
print 'Exiting @ cycle', m5.curTick(), 'because', exit_event.getCause()
|