diff options
author | Kevin Lim <ktlim@umich.edu> | 2006-07-12 17:17:17 -0400 |
---|---|---|
committer | Kevin Lim <ktlim@umich.edu> | 2006-07-12 17:17:17 -0400 |
commit | a9ca36639f3e6d52284d947ab55c7c277918e686 (patch) | |
tree | 70dd82109b4619796d52ffd81d79f9d73012970c /configs/test/test.py | |
parent | 35ab2296d3eec6da29ba30a6230f67433f261eb3 (diff) | |
download | gem5-a9ca36639f3e6d52284d947ab55c7c277918e686.tar.xz |
Initial try of consolidating configuration files so they can be shared more easily, especially across regression tests and simple examples.
configs/test/fs.py:
Pull a lot of the default options out of the config file now that they are in the Python objects themselves. Also merge this file with the single_fs.py, allowing one file to be used for both. Previously they differed only by the system they instantiated.
configs/test/test.py:
Initial stab at consolidating configuration files so they aren't redundant between the regression tests and the simple examples.
--HG--
extra : convert_revision : e8ae3de5a6d8864831f21089d4fdb8ec690e4731
Diffstat (limited to 'configs/test/test.py')
-rw-r--r-- | configs/test/test.py | 54 |
1 files changed, 5 insertions, 49 deletions
diff --git a/configs/test/test.py b/configs/test/test.py index e7b0971ef..79b271c3f 100644 --- a/configs/test/test.py +++ b/configs/test/test.py @@ -1,38 +1,13 @@ # Simple test script # # Alpha: "m5 test.py" -# MIPS: "m5 test.py -a Mips -c hello_mips" +# MIPS: "m5 test.py -c hello_mips" -import os, optparse, sys import m5 -from m5.objects import * -from FullO3Config import * - -# parse command-line arguments -parser = optparse.OptionParser(option_list=m5.standardOptions) - -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("-t", "--timing", action="store_true", - help="Use simple timing CPU.") -parser.add_option("-d", "--detailed", action="store_true", - help="Use detailed CPU.") -parser.add_option("-m", "--maxtick", type="int", - help="Set the maximum number of ticks to run for") - -(options, args) = parser.parse_args() -m5.setStandardOptions(options) - -if args: - print "Error: script doesn't take any positional arguments" - sys.exit(1) +import os, optparse, sys +m5.AddToPath('../common') +from SEConfig import * -# build configuration this_dir = os.path.dirname(__file__) process = LiveProcess() @@ -41,16 +16,7 @@ process.cmd = options.cmd + " " + options.options if options.input != "": process.input = options.input -magicbus = Bus() -mem = PhysicalMemory() - -if options.timing and options.detailed: - print "Error: you may only specify one cpu model"; - sys.exit(1) - -if options.timing: - cpu = TimingSimpleCPU() -elif options.detailed: +if options.detailed: #check for SMT workload workloads = options.cmd.split(';') if len(workloads) > 1: @@ -70,17 +36,7 @@ elif options.detailed: process += [smt_process, ] smt_idx += 1 - cpu = DetailedO3CPU() -else: - cpu = AtomicSimpleCPU() cpu.workload = process -cpu.mem = magicbus -cpu.icache_port=magicbus.port -cpu.dcache_port=magicbus.port - -system = System(physmem = mem, cpu = cpu) -mem.port = magicbus.port -root = Root(system = system) # instantiate configuration m5.instantiate(root) |