summaryrefslogtreecommitdiff
path: root/configs/test
diff options
context:
space:
mode:
authorSteve Reinhardt <stever@eecs.umich.edu>2006-08-16 14:42:44 -0400
committerSteve Reinhardt <stever@eecs.umich.edu>2006-08-16 14:42:44 -0400
commitbd4ccd6e39d74f43e1cac8c3856347291bf4f990 (patch)
tree7eb3d466541203b802ddb839e6ed452e78abbcbc /configs/test
parent3298c0b222c34c8d54948351d1f979ab7fcc4b0a (diff)
downloadgem5-bd4ccd6e39d74f43e1cac8c3856347291bf4f990.tar.xz
Finish test clean-up & reorg.
configs/common/FSConfig.py: Add default Machine() param configs/example/fs.py: configs/example/se.py: make it work again src/python/m5/objects/BaseCPU.py: Make mem PhysicalMemory so that a Parent.any proxy works well src/sim/process.cc: Increase default stack size so we don't get an 'increasing stack' message on 'hello world' tests/SConscript: Add full list of current configs. tests/configs/simple-atomic.py: tests/configs/simple-timing.py: don't need SEConfig anymore tests/quick/00.hello/test.py: tests/quick/20.eio-short/test.py: fix tests/run.py: move configs to separate dir --HG-- rename : configs/test/fs.py => configs/example/fs.py rename : configs/test/test.py => configs/example/se.py rename : tests/simple-atomic.py => tests/configs/simple-atomic.py rename : tests/simple-timing.py => tests/configs/simple-timing.py rename : tests/linux-mpboot/ref/alpha/atomic/config.ini => tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic-dual/config.ini rename : tests/linux-mpboot/ref/alpha/atomic/config.out => tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic-dual/config.out rename : tests/linux-mpboot/ref/alpha/atomic/console.system.sim_console => tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic-dual/console.system.sim_console rename : tests/linux-mpboot/ref/alpha/atomic/m5stats.txt => tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic-dual/m5stats.txt rename : tests/linux-mpboot/ref/alpha/atomic/stderr => tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic-dual/stderr rename : tests/linux-mpboot/ref/alpha/atomic/stdout => tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic-dual/stdout rename : tests/linux-boot/ref/alpha/atomic/config.ini => tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic/config.ini rename : tests/linux-boot/ref/alpha/atomic/config.out => tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic/config.out rename : tests/linux-boot/ref/alpha/atomic/console.system.sim_console => tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic/console.system.sim_console rename : tests/linux-boot/ref/alpha/atomic/m5stats.txt => tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic/m5stats.txt rename : tests/linux-boot/ref/alpha/atomic/stderr => tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic/stderr rename : tests/linux-boot/ref/alpha/atomic/stdout => tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic/stdout rename : tests/linux-mpboot/ref/alpha/timing/config.ini => tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing-dual/config.ini rename : tests/linux-mpboot/ref/alpha/timing/config.out => tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing-dual/config.out rename : tests/linux-mpboot/ref/alpha/timing/console.system.sim_console => tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing-dual/console.system.sim_console rename : tests/linux-mpboot/ref/alpha/timing/m5stats.txt => tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing-dual/m5stats.txt rename : tests/linux-mpboot/ref/alpha/timing/stderr => tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing-dual/stderr rename : tests/linux-mpboot/ref/alpha/timing/stdout => tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing-dual/stdout rename : tests/test-progs/hello/bin/mips/linux/hello_mips => tests/test-progs/hello/bin/mips/linux/hello rename : tests/test-progs/hello/bin/sparc/bin => tests/test-progs/hello/bin/sparc/linux/hello extra : convert_revision : d68ee6d7eefa7ba57370f3fb3c3589f86a6ea6b4
Diffstat (limited to 'configs/test')
-rw-r--r--configs/test/fs.py93
-rw-r--r--configs/test/test.py83
2 files changed, 0 insertions, 176 deletions
diff --git a/configs/test/fs.py b/configs/test/fs.py
deleted file mode 100644
index 4a3876b36..000000000
--- a/configs/test/fs.py
+++ /dev/null
@@ -1,93 +0,0 @@
-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()
diff --git a/configs/test/test.py b/configs/test/test.py
deleted file mode 100644
index 9d780547b..000000000
--- a/configs/test/test.py
+++ /dev/null
@@ -1,83 +0,0 @@
-# Simple test script
-#
-# Alpha: "m5 test.py"
-# MIPS: "m5 test.py -c hello_mips"
-
-import m5
-import os, optparse, sys
-m5.AddToPath('../common')
-from SEConfig import *
-from FullO3Config import *
-from m5.objects import *
-
-parser = optparse.OptionParser()
-
-parser.add_option("-c", "--cmd", default="hello",
- help="The binary to run in syscall emulation mode.")
-parser.add_option("-o", "--options", default="",
- help="The options to pass to the binary, use \" \" around the entire\
- string.")
-parser.add_option("-i", "--input", default="",
- help="A file of input to give to the binary.")
-parser.add_option("-d", "--detailed", action="store_true")
-parser.add_option("-t", "--timing", action="store_true")
-parser.add_option("-m", "--maxtick", type="int")
-
-(options, args) = parser.parse_args()
-
-if args:
- print "Error: script doesn't take any positional arguments"
- sys.exit(1)
-
-this_dir = os.path.dirname(__file__)
-
-process = LiveProcess()
-process.executable = os.path.join(this_dir, options.cmd)
-process.cmd = options.cmd + " " + options.options
-if options.input != "":
- process.input = options.input
-
-if options.detailed:
- #check for SMT workload
- workloads = options.cmd.split(';')
- if len(workloads) > 1:
- process = []
- smt_idx = 0
- inputs = []
-
- if options.input != "":
- inputs = options.input.split(';')
-
- for wrkld in workloads:
- smt_process = LiveProcess()
- smt_process.executable = os.path.join(this_dir, wrkld)
- smt_process.cmd = wrkld + " " + options.options
- if inputs and inputs[smt_idx]:
- smt_process.input = inputs[smt_idx]
- process += [smt_process, ]
- smt_idx += 1
-
-
-if options.timing:
- cpu = TimingSimpleCPU()
-elif options.detailed:
- cpu = DetailedO3CPU()
-else:
- cpu = AtomicSimpleCPU()
-
-root = MySESystem(cpu, process)
-
-if options.timing or options.detailed:
- root.system.mem_mode = 'timing'
-
-# instantiate configuration
-m5.instantiate(root)
-
-# simulate until program terminates
-if options.maxtick:
- exit_event = m5.simulate(options.maxtick)
-else:
- exit_event = m5.simulate()
-
-print 'Exiting @ tick', m5.curTick(), 'because', exit_event.getCause()
-