diff options
author | Steve Reinhardt <stever@eecs.umich.edu> | 2006-06-10 00:22:42 -0400 |
---|---|---|
committer | Steve Reinhardt <stever@eecs.umich.edu> | 2006-06-10 00:22:42 -0400 |
commit | cd6550473957258130a549ef74e2f18102b8c881 (patch) | |
tree | 4330f082c66906c78f94a25143bbc1370a736a41 /configs/test/fs.py | |
parent | f693b451a59949ef1a025fe8b391031d2234f1e1 (diff) | |
download | gem5-cd6550473957258130a549ef74e2f18102b8c881.tar.xz |
Update scripts for testing ALPHA_FS and MIPS_SE.
Minor fixes to ALPHA_FS and SPARC_SE.
SPARC_SE still does not compile... looks like there
are unresolved issues with ExecContext -> ThreadContext
rename/reorg.
configs/test/fs.py:
Port to new script interface/model.
configs/test/test.py:
Add support for running MIPS test(s) too via
command-line option.
src/arch/alpha/ev5.cc:
Fix include file.
src/arch/sparc/regfile.hh:
Make Bit64 a ULL constant to avoid compiler error.
--HG--
extra : convert_revision : c46c179758271c4f00171faaa579915846bf4624
Diffstat (limited to 'configs/test/fs.py')
-rw-r--r-- | configs/test/fs.py | 24 |
1 files changed, 22 insertions, 2 deletions
diff --git a/configs/test/fs.py b/configs/test/fs.py index fdbf86abe..05b38991c 100644 --- a/configs/test/fs.py +++ b/configs/test/fs.py @@ -1,7 +1,18 @@ -from m5 import * +import m5 +from m5.objects import * import os from SysPaths import * +parser = optparse.OptionParser(option_list=m5.standardOptions) + +parser.add_option("-t", "--timing", action="store_true") + +(options, args) = parser.parse_args() + +if args: + print "Error: script doesn't take any positional arguments" + sys.exit(1) + # Base for tests is directory containing this file. test_base = os.path.dirname(__file__) @@ -181,7 +192,11 @@ class LinuxAlphaSystem(LinuxAlphaSystem): read_only=True) simple_disk = SimpleDisk(disk=Parent.raw_image) intrctrl = IntrControl() - cpu = AtomicSimpleCPU(mem=Parent.magicbus2) + if options.timing: + cpu = TimingSimpleCPU() + else: + cpu = AtomicSimpleCPU() + cpu.mem = Parent.magicbus2 sim_console = SimConsole(listener=ConsoleListener(port=3456)) kernel = binary('vmlinux') pal = binary('ts_osfpal') @@ -213,3 +228,8 @@ def DualRoot(ClientSystem, ServerSystem): root = DualRoot(ClientSystem = LinuxAlphaSystem(readfile=script('netperf-stream-nt-client.rcS')), ServerSystem = LinuxAlphaSystem(readfile=script('netperf-server.rcS'))) +m5.instantiate(root) + +exit_event = m5.simulate() + +print 'Exiting @', m5.curTick(), 'because', exit_event.getCause() |