Migrate most of main() and and all option parsing to python
configs/test/fs.py:
configs/test/test.py:
update for the new way that m5 deals with options
src/python/SConscript:
Compile AUTHORS, LICENSE, README, and RELEASE_NOTES into the
python stuff.
src/python/m5/__init__.py:
redo the way options work.
Move them all to main.py
src/sim/main.cc:
Migrate more functionality for main() into python.
Namely option parsing
src/python/m5/attrdict.py:
A dictionary object that overrides attribute access to
do item access.
src/python/m5/main.py:
The new location for M5's option parsing, and the main()
routine to set up the simulation.
--HG--
extra : convert_revision : c86b87a9f508bde1994088e23fd470c7753ee4c1
This commit is contained in:
Nathan Binkert
parent
ad4374e0cd
commit
55ea050d48
|
|
@ -1,14 +1,14 @@
|
|||
import optparse, os, sys
|
||||
|
||||
import m5
|
||||
from m5.objects import *
|
||||
import os,optparse,sys
|
||||
from SysPaths import *
|
||||
|
||||
parser = optparse.OptionParser(option_list=m5.standardOptions)
|
||||
parser = optparse.OptionParser()
|
||||
|
||||
parser.add_option("-t", "--timing", action="store_true")
|
||||
|
||||
(options, args) = parser.parse_args()
|
||||
m5.setStandardOptions(options)
|
||||
|
||||
if args:
|
||||
print "Error: script doesn't take any positional arguments"
|
||||
|
|
|
|||
|
|
@ -4,15 +4,16 @@
|
|||
# MIPS: "m5 test.py -a Mips -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 = optparse.OptionParser()
|
||||
|
||||
parser.add_option("-c", "--cmd", default="hello",
|
||||
help="The binary to run in syscall emulation mode.")
|
||||
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.")
|
||||
|
|
@ -26,7 +27,6 @@ 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"
|
||||
|
|
|
|||
|
|
@ -75,16 +75,27 @@ def addPkg(pkgdir):
|
|||
# build_env flags.
|
||||
def MakeDefinesPyFile(target, source, env):
|
||||
f = file(str(target[0]), 'w')
|
||||
print >>f, "m5_build_env = ",
|
||||
print >>f, source[0]
|
||||
print >>f, "m5_build_env = ", source[0]
|
||||
f.close()
|
||||
|
||||
optionDict = dict([(opt, env[opt]) for opt in env.ExportOptions])
|
||||
env.Command('m5/defines.py', Value(optionDict), MakeDefinesPyFile)
|
||||
|
||||
def MakeInfoPyFile(target, source, env):
|
||||
f = file(str(target[0]), 'w')
|
||||
for src in source:
|
||||
data = ''.join(file(src.srcnode().abspath, 'r').xreadlines())
|
||||
print >>f, "%s = %s" % (src, repr(data))
|
||||
f.close()
|
||||
|
||||
env.Command('m5/info.py',
|
||||
[ '#/AUTHORS', '#/LICENSE', '#/README', '#/RELEASE_NOTES' ],
|
||||
MakeInfoPyFile)
|
||||
|
||||
# Now specify the packages & files for the zip archive.
|
||||
addPkg('m5')
|
||||
pyzip_files.append('m5/defines.py')
|
||||
pyzip_files.append('m5/info.py')
|
||||
pyzip_files.append(join(env['ROOT'], 'util/pbs/jobfile.py'))
|
||||
|
||||
env.Command(['swig/cc_main_wrap.cc', 'm5/cc_main.py'],
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@
|
|||
# Authors: Nathan Binkert
|
||||
# Steve Reinhardt
|
||||
|
||||
import sys, os, time, atexit, optparse
|
||||
import atexit, os, sys
|
||||
|
||||
# import the SWIG-wrapped main C++ functions
|
||||
import cc_main
|
||||
|
|
@ -57,111 +57,6 @@ def AddToPath(path):
|
|||
# so place the new dir right after that.
|
||||
sys.path.insert(1, path)
|
||||
|
||||
|
||||
# The m5 module's pointer to the parsed options object
|
||||
options = None
|
||||
|
||||
|
||||
# User should call this function after calling parse_args() to pass
|
||||
# parsed standard option values back into the m5 module for
|
||||
# processing.
|
||||
def setStandardOptions(_options):
|
||||
# Set module global var
|
||||
global options
|
||||
options = _options
|
||||
# tell C++ about output directory
|
||||
cc_main.setOutputDir(options.outdir)
|
||||
|
||||
# Callback to set trace flags. Not necessarily the best way to do
|
||||
# things in the long run (particularly if we change how these global
|
||||
# options are handled).
|
||||
def setTraceFlags(option, opt_str, value, parser):
|
||||
objects.Trace.flags = value
|
||||
|
||||
def setTraceStart(option, opt_str, value, parser):
|
||||
objects.Trace.start = value
|
||||
|
||||
def setTraceFile(option, opt_str, value, parser):
|
||||
objects.Trace.file = value
|
||||
|
||||
def noPCSymbol(option, opt_str, value, parser):
|
||||
objects.ExecutionTrace.pc_symbol = False
|
||||
|
||||
def noPrintCycle(option, opt_str, value, parser):
|
||||
objects.ExecutionTrace.print_cycle = False
|
||||
|
||||
def noPrintOpclass(option, opt_str, value, parser):
|
||||
objects.ExecutionTrace.print_opclass = False
|
||||
|
||||
def noPrintThread(option, opt_str, value, parser):
|
||||
objects.ExecutionTrace.print_thread = False
|
||||
|
||||
def noPrintEA(option, opt_str, value, parser):
|
||||
objects.ExecutionTrace.print_effaddr = False
|
||||
|
||||
def noPrintData(option, opt_str, value, parser):
|
||||
objects.ExecutionTrace.print_data = False
|
||||
|
||||
def printFetchseq(option, opt_str, value, parser):
|
||||
objects.ExecutionTrace.print_fetchseq = True
|
||||
|
||||
def printCpseq(option, opt_str, value, parser):
|
||||
objects.ExecutionTrace.print_cpseq = True
|
||||
|
||||
def dumpOnExit(option, opt_str, value, parser):
|
||||
objects.Trace.dump_on_exit = True
|
||||
|
||||
def debugBreak(option, opt_str, value, parser):
|
||||
objects.Debug.break_cycles = value
|
||||
|
||||
def statsTextFile(option, opt_str, value, parser):
|
||||
objects.Statistics.text_file = value
|
||||
|
||||
# Standard optparse options. Need to be explicitly included by the
|
||||
# user script when it calls optparse.OptionParser().
|
||||
standardOptions = [
|
||||
optparse.make_option("--outdir", type="string", default="."),
|
||||
optparse.make_option("--traceflags", type="string", action="callback",
|
||||
callback=setTraceFlags),
|
||||
optparse.make_option("--tracestart", type="int", action="callback",
|
||||
callback=setTraceStart),
|
||||
optparse.make_option("--tracefile", type="string", action="callback",
|
||||
callback=setTraceFile),
|
||||
optparse.make_option("--nopcsymbol",
|
||||
action="callback", callback=noPCSymbol,
|
||||
help="Disable PC symbols in trace output"),
|
||||
optparse.make_option("--noprintcycle",
|
||||
action="callback", callback=noPrintCycle,
|
||||
help="Don't print cycle numbers in trace output"),
|
||||
optparse.make_option("--noprintopclass",
|
||||
action="callback", callback=noPrintOpclass,
|
||||
help="Don't print op class type in trace output"),
|
||||
optparse.make_option("--noprintthread",
|
||||
action="callback", callback=noPrintThread,
|
||||
help="Don't print thread number in trace output"),
|
||||
optparse.make_option("--noprinteffaddr",
|
||||
action="callback", callback=noPrintEA,
|
||||
help="Don't print effective address in trace output"),
|
||||
optparse.make_option("--noprintdata",
|
||||
action="callback", callback=noPrintData,
|
||||
help="Don't print result data in trace output"),
|
||||
optparse.make_option("--printfetchseq",
|
||||
action="callback", callback=printFetchseq,
|
||||
help="Print fetch sequence numbers in trace output"),
|
||||
optparse.make_option("--printcpseq",
|
||||
action="callback", callback=printCpseq,
|
||||
help="Print correct path sequence numbers in trace output"),
|
||||
optparse.make_option("--dumponexit",
|
||||
action="callback", callback=dumpOnExit,
|
||||
help="Dump trace buffer on exit"),
|
||||
optparse.make_option("--debugbreak", type="int", metavar="CYCLE",
|
||||
action="callback", callback=debugBreak,
|
||||
help="Cycle to create a breakpoint"),
|
||||
optparse.make_option("--statsfile", type="string", action="callback",
|
||||
callback=statsTextFile, metavar="FILE",
|
||||
help="Sets the output file for the statistics")
|
||||
]
|
||||
|
||||
# make a SmartDict out of the build options for our local use
|
||||
import smartdict
|
||||
build_env = smartdict.SmartDict()
|
||||
|
|
@ -171,12 +66,13 @@ build_env.update(defines.m5_build_env)
|
|||
env = smartdict.SmartDict()
|
||||
env.update(os.environ)
|
||||
|
||||
|
||||
# Function to provide to C++ so it can look up instances based on paths
|
||||
def resolveSimObject(name):
|
||||
obj = config.instanceDict[name]
|
||||
return obj.getCCObject()
|
||||
|
||||
from main import options, arguments, main
|
||||
|
||||
# The final hook to generate .ini files. Called from the user script
|
||||
# once the config is built.
|
||||
def instantiate(root):
|
||||
|
|
|
|||
61
src/python/m5/attrdict.py
Normal file
61
src/python/m5/attrdict.py
Normal file
|
|
@ -0,0 +1,61 @@
|
|||
# Copyright (c) 2006 The Regents of The University of Michigan
|
||||
# All rights reserved.
|
||||
#
|
||||
# Redistribution and use in source and binary forms, with or without
|
||||
# modification, are permitted provided that the following conditions are
|
||||
# met: redistributions of source code must retain the above copyright
|
||||
# notice, this list of conditions and the following disclaimer;
|
||||
# redistributions in binary form must reproduce the above copyright
|
||||
# notice, this list of conditions and the following disclaimer in the
|
||||
# documentation and/or other materials provided with the distribution;
|
||||
# neither the name of the copyright holders nor the names of its
|
||||
# contributors may be used to endorse or promote products derived from
|
||||
# this software without specific prior written permission.
|
||||
#
|
||||
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
||||
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
||||
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
||||
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
||||
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
||||
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
#
|
||||
# Authors: Nathan Binkert
|
||||
|
||||
__all__ = [ 'attrdict' ]
|
||||
|
||||
class attrdict(dict):
|
||||
def __getattr__(self, attr):
|
||||
if attr in self:
|
||||
return self.__getitem__(attr)
|
||||
return super(attrdict, self).__getattribute__(attr)
|
||||
|
||||
def __setattr__(self, attr, value):
|
||||
if attr in dir(self):
|
||||
return super(attrdict, self).__setattr__(attr, value)
|
||||
return self.__setitem__(attr, value)
|
||||
|
||||
def __delattr__(self, attr):
|
||||
if attr in self:
|
||||
return self.__delitem__(attr)
|
||||
return super(attrdict, self).__delattr__(attr, value)
|
||||
|
||||
if __name__ == '__main__':
|
||||
x = attrdict()
|
||||
x.y = 1
|
||||
x['z'] = 2
|
||||
print x['y'], x.y
|
||||
print x['z'], x.z
|
||||
print dir(x)
|
||||
print x
|
||||
|
||||
print
|
||||
|
||||
del x['y']
|
||||
del x.z
|
||||
print dir(x)
|
||||
print(x)
|
||||
306
src/python/m5/main.py
Normal file
306
src/python/m5/main.py
Normal file
|
|
@ -0,0 +1,306 @@
|
|||
# Copyright (c) 2005 The Regents of The University of Michigan
|
||||
# All rights reserved.
|
||||
#
|
||||
# Redistribution and use in source and binary forms, with or without
|
||||
# modification, are permitted provided that the following conditions are
|
||||
# met: redistributions of source code must retain the above copyright
|
||||
# notice, this list of conditions and the following disclaimer;
|
||||
# redistributions in binary form must reproduce the above copyright
|
||||
# notice, this list of conditions and the following disclaimer in the
|
||||
# documentation and/or other materials provided with the distribution;
|
||||
# neither the name of the copyright holders nor the names of its
|
||||
# contributors may be used to endorse or promote products derived from
|
||||
# this software without specific prior written permission.
|
||||
#
|
||||
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
||||
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
||||
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
||||
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
||||
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
||||
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
#
|
||||
# Authors: Nathan Binkert
|
||||
|
||||
import code, optparse, os, socket, sys
|
||||
from datetime import datetime
|
||||
from attrdict import attrdict
|
||||
|
||||
try:
|
||||
import info
|
||||
except ImportError:
|
||||
info = None
|
||||
|
||||
__all__ = [ 'options', 'arguments', 'main' ]
|
||||
|
||||
usage="%prog [m5 options] script.py [script options]"
|
||||
version="%prog 2.0"
|
||||
brief_copyright='''
|
||||
Copyright (c) 2001-2006
|
||||
The Regents of The University of Michigan
|
||||
All Rights Reserved
|
||||
'''
|
||||
|
||||
# there's only one option parsing done, so make it global and add some
|
||||
# helper functions to make it work well.
|
||||
parser = optparse.OptionParser(usage=usage, version=version,
|
||||
description=brief_copyright,
|
||||
formatter=optparse.TitledHelpFormatter())
|
||||
|
||||
# current option group
|
||||
group = None
|
||||
|
||||
def set_group(*args, **kwargs):
|
||||
'''set the current option group'''
|
||||
global group
|
||||
if not args and not kwargs:
|
||||
group = None
|
||||
else:
|
||||
group = parser.add_option_group(*args, **kwargs)
|
||||
|
||||
class splitter(object):
|
||||
def __init__(self, split):
|
||||
self.split = split
|
||||
def __call__(self, option, opt_str, value, parser):
|
||||
getattr(parser.values, option.dest).extend(value.split(self.split))
|
||||
|
||||
def add_option(*args, **kwargs):
|
||||
'''add an option to the current option group, or global none set'''
|
||||
|
||||
# if action=split, but allows the option arguments
|
||||
# themselves to be lists separated by the split variable'''
|
||||
|
||||
if kwargs.get('action', None) == 'append' and 'split' in kwargs:
|
||||
split = kwargs.pop('split')
|
||||
kwargs['default'] = []
|
||||
kwargs['type'] = 'string'
|
||||
kwargs['action'] = 'callback'
|
||||
kwargs['callback'] = splitter(split)
|
||||
|
||||
if group:
|
||||
return group.add_option(*args, **kwargs)
|
||||
|
||||
return parser.add_option(*args, **kwargs)
|
||||
|
||||
def bool_option(name, default, help):
|
||||
'''add a boolean option called --name and --no-name.
|
||||
Display help depending on which is the default'''
|
||||
|
||||
tname = '--%s' % name
|
||||
fname = '--no-%s' % name
|
||||
dest = name.replace('-', '_')
|
||||
if default:
|
||||
thelp = optparse.SUPPRESS_HELP
|
||||
fhelp = help
|
||||
else:
|
||||
thelp = help
|
||||
fhelp = optparse.SUPPRESS_HELP
|
||||
|
||||
add_option(tname, action="store_true", default=default, help=thelp)
|
||||
add_option(fname, action="store_false", dest=dest, help=fhelp)
|
||||
|
||||
# Help options
|
||||
add_option('-A', "--authors", action="store_true", default=False,
|
||||
help="Show author information")
|
||||
add_option('-C', "--copyright", action="store_true", default=False,
|
||||
help="Show full copyright information")
|
||||
add_option('-R', "--readme", action="store_true", default=False,
|
||||
help="Show the readme")
|
||||
add_option('-N', "--release-notes", action="store_true", default=False,
|
||||
help="Show the release notes")
|
||||
|
||||
# Options for configuring the base simulator
|
||||
add_option('-d', "--outdir", metavar="DIR", default=".",
|
||||
help="Set the output directory to DIR [Default: %default]")
|
||||
add_option('-i', "--interactive", action="store_true", default=False,
|
||||
help="Invoke the interactive interpreter after running the script")
|
||||
add_option('-p', "--path", metavar="PATH[:PATH]", action='append', split=':',
|
||||
help="Prepend PATH to the system path when invoking the script")
|
||||
add_option('-q', "--quiet", action="count", default=0,
|
||||
help="Reduce verbosity")
|
||||
add_option('-v', "--verbose", action="count", default=0,
|
||||
help="Increase verbosity")
|
||||
|
||||
# Statistics options
|
||||
set_group("Statistics Options")
|
||||
add_option("--stats-file", metavar="FILE", default="m5stats.txt",
|
||||
help="Sets the output file for statistics [Default: %default]")
|
||||
|
||||
# Debugging options
|
||||
set_group("Debugging Options")
|
||||
add_option("--debug-break", metavar="TIME[,TIME]", action='append', split=',',
|
||||
help="Cycle to create a breakpoint")
|
||||
|
||||
# Tracing options
|
||||
set_group("Trace Options")
|
||||
add_option("--trace-flags", metavar="FLAG[,FLAG]", action='append', split=',',
|
||||
help="Sets the flags for tracing")
|
||||
add_option("--trace-start", metavar="TIME", default='0s',
|
||||
help="Start tracing at TIME (must have units)")
|
||||
add_option("--trace-file", metavar="FILE", default="cout",
|
||||
help="Sets the output file for tracing [Default: %default]")
|
||||
add_option("--trace-circlebuf", metavar="SIZE", type="int", default=0,
|
||||
help="If SIZE is non-zero, turn on the circular buffer with SIZE lines")
|
||||
add_option("--no-trace-circlebuf", action="store_const", const=0,
|
||||
dest='trace_circlebuf', help=optparse.SUPPRESS_HELP)
|
||||
bool_option("trace-dumponexit", default=False,
|
||||
help="Dump trace buffer on exit")
|
||||
add_option("--trace-ignore", metavar="EXPR", action='append', split=':',
|
||||
help="Ignore EXPR sim objects")
|
||||
|
||||
# Execution Trace options
|
||||
set_group("Execution Trace Options")
|
||||
bool_option("speculative", default=True,
|
||||
help="Don't capture speculative instructions")
|
||||
bool_option("print-cycle", default=True,
|
||||
help="Don't print cycle numbers in trace output")
|
||||
bool_option("print-symbol", default=True,
|
||||
help="Disable PC symbols in trace output")
|
||||
bool_option("print-opclass", default=True,
|
||||
help="Don't print op class type in trace output")
|
||||
bool_option("print-thread", default=True,
|
||||
help="Don't print thread number in trace output")
|
||||
bool_option("print-effaddr", default=True,
|
||||
help="Don't print effective address in trace output")
|
||||
bool_option("print-data", default=True,
|
||||
help="Don't print result data in trace output")
|
||||
bool_option("print-iregs", default=False,
|
||||
help="Print fetch sequence numbers in trace output")
|
||||
bool_option("print-fetch-seq", default=False,
|
||||
help="Print fetch sequence numbers in trace output")
|
||||
bool_option("print-cpseq", default=False,
|
||||
help="Print correct path sequence numbers in trace output")
|
||||
|
||||
options = attrdict()
|
||||
arguments = []
|
||||
|
||||
def usage(exitcode=None):
|
||||
print parser.help
|
||||
if exitcode is not None:
|
||||
sys.exit(exitcode)
|
||||
|
||||
def parse_args():
|
||||
_opts,args = parser.parse_args()
|
||||
opts = attrdict(_opts.__dict__)
|
||||
|
||||
# setting verbose and quiet at the same time doesn't make sense
|
||||
if opts.verbose > 0 and opts.quiet > 0:
|
||||
usage(2)
|
||||
|
||||
# store the verbosity in a single variable. 0 is default,
|
||||
# negative numbers represent quiet and positive values indicate verbose
|
||||
opts.verbose -= opts.quiet
|
||||
|
||||
del opts.quiet
|
||||
|
||||
options.update(opts)
|
||||
arguments.extend(args)
|
||||
return opts,args
|
||||
|
||||
def main():
|
||||
import cc_main
|
||||
|
||||
parse_args()
|
||||
|
||||
done = False
|
||||
if options.copyright:
|
||||
done = True
|
||||
print info.LICENSE
|
||||
print
|
||||
|
||||
if options.authors:
|
||||
done = True
|
||||
print 'Author information:'
|
||||
print
|
||||
print info.AUTHORS
|
||||
print
|
||||
|
||||
if options.readme:
|
||||
done = True
|
||||
print 'Readme:'
|
||||
print
|
||||
print info.README
|
||||
print
|
||||
|
||||
if options.release_notes:
|
||||
done = True
|
||||
print 'Release Notes:'
|
||||
print
|
||||
print info.RELEASE_NOTES
|
||||
print
|
||||
|
||||
if done:
|
||||
sys.exit(0)
|
||||
|
||||
if options.verbose >= 0:
|
||||
print "M5 Simulator System"
|
||||
print brief_copyright
|
||||
print
|
||||
print "M5 compiled %s" % cc_main.cvar.compileDate;
|
||||
print "M5 started %s" % datetime.now().ctime()
|
||||
print "M5 executing on %s" % socket.gethostname()
|
||||
|
||||
# check to make sure we can find the listed script
|
||||
if not arguments or not os.path.isfile(arguments[0]):
|
||||
usage(2)
|
||||
|
||||
# tell C++ about output directory
|
||||
cc_main.setOutputDir(options.outdir)
|
||||
|
||||
# update the system path with elements from the -p option
|
||||
sys.path[0:0] = options.path
|
||||
|
||||
import objects
|
||||
|
||||
# set stats options
|
||||
objects.Statistics.text_file = options.stats_file
|
||||
|
||||
# set debugging options
|
||||
objects.Debug.break_cycles = options.debug_break
|
||||
|
||||
# set tracing options
|
||||
objects.Trace.flags = options.trace_flags
|
||||
objects.Trace.start = options.trace_start
|
||||
objects.Trace.file = options.trace_file
|
||||
objects.Trace.bufsize = options.trace_circlebuf
|
||||
objects.Trace.dump_on_exit = options.trace_dumponexit
|
||||
objects.Trace.ignore = options.trace_ignore
|
||||
|
||||
# set execution trace options
|
||||
objects.ExecutionTrace.speculative = options.speculative
|
||||
objects.ExecutionTrace.print_cycle = options.print_cycle
|
||||
objects.ExecutionTrace.pc_symbol = options.print_symbol
|
||||
objects.ExecutionTrace.print_opclass = options.print_opclass
|
||||
objects.ExecutionTrace.print_thread = options.print_thread
|
||||
objects.ExecutionTrace.print_effaddr = options.print_effaddr
|
||||
objects.ExecutionTrace.print_data = options.print_data
|
||||
objects.ExecutionTrace.print_iregs = options.print_iregs
|
||||
objects.ExecutionTrace.print_fetchseq = options.print_fetch_seq
|
||||
objects.ExecutionTrace.print_cpseq = options.print_cpseq
|
||||
|
||||
scope = { '__file__' : sys.argv[0] }
|
||||
sys.argv = arguments
|
||||
sys.path = [ os.path.dirname(sys.argv[0]) ] + sys.path
|
||||
exec("import readline", scope)
|
||||
execfile(sys.argv[0], scope)
|
||||
|
||||
# once the script is done
|
||||
if options.interactive:
|
||||
interact = code.InteractiveConsole(scope)
|
||||
interact.interact("M5 Interactive Console")
|
||||
|
||||
if __name__ == '__main__':
|
||||
from pprint import pprint
|
||||
|
||||
parse_args()
|
||||
|
||||
print 'opts:'
|
||||
pprint(options, indent=4)
|
||||
print
|
||||
|
||||
print 'args:'
|
||||
pprint(arguments, indent=4)
|
||||
160
src/sim/main.cc
160
src/sim/main.cc
|
|
@ -115,70 +115,11 @@ abortHandler(int sigtype)
|
|||
#endif
|
||||
}
|
||||
|
||||
/// Simulator executable name
|
||||
char *myProgName = "";
|
||||
|
||||
/// Show brief help message.
|
||||
void
|
||||
showBriefHelp(ostream &out)
|
||||
{
|
||||
char *prog = basename(myProgName);
|
||||
|
||||
ccprintf(out, "Usage:\n");
|
||||
ccprintf(out,
|
||||
"%s [-p <path>] [-i ] [-h] <config file>\n"
|
||||
"\n"
|
||||
" -p, --path <path> prepends <path> to PYTHONPATH instead of using\n"
|
||||
" built-in zip archive. Useful when developing/debugging\n"
|
||||
" changes to built-in Python libraries, as the new Python\n"
|
||||
" can be tested without building a new m5 binary.\n\n"
|
||||
" -i, --interactive forces entry into interactive mode after the supplied\n"
|
||||
" script is executed (just like the -i option to the\n"
|
||||
" Python interpreter).\n\n"
|
||||
" -h Prints this help\n\n"
|
||||
" <configfile> config file name which ends in .py. (Normally you can\n"
|
||||
" run <configfile> --help to get help on that config files\n"
|
||||
" parameters.\n\n",
|
||||
prog);
|
||||
|
||||
}
|
||||
|
||||
const char *briefCopyright =
|
||||
"Copyright (c) 2001-2006\n"
|
||||
"The Regents of The University of Michigan\n"
|
||||
"All Rights Reserved\n";
|
||||
|
||||
/// Print welcome message.
|
||||
void
|
||||
sayHello(ostream &out)
|
||||
{
|
||||
extern const char *compileDate; // from date.cc
|
||||
|
||||
ccprintf(out, "M5 Simulator System\n");
|
||||
// display copyright
|
||||
ccprintf(out, "%s\n", briefCopyright);
|
||||
ccprintf(out, "M5 compiled %d\n", compileDate);
|
||||
ccprintf(out, "M5 started %s\n", Time::start);
|
||||
|
||||
char *host = getenv("HOSTNAME");
|
||||
if (!host)
|
||||
host = getenv("HOST");
|
||||
|
||||
if (host)
|
||||
ccprintf(out, "M5 executing on %s\n", host);
|
||||
}
|
||||
|
||||
|
||||
extern "C" { void init_cc_main(); }
|
||||
|
||||
int
|
||||
main(int argc, char **argv)
|
||||
{
|
||||
// Saze off program name
|
||||
myProgName = argv[0];
|
||||
|
||||
sayHello(cerr);
|
||||
|
||||
signal(SIGFPE, SIG_IGN); // may occur on misspeculated paths
|
||||
signal(SIGTRAP, SIG_IGN);
|
||||
signal(SIGUSR1, dumpStatsHandler); // dump intermediate stats
|
||||
|
|
@ -189,72 +130,18 @@ main(int argc, char **argv)
|
|||
Py_SetProgramName(argv[0]);
|
||||
|
||||
// default path to m5 python code is the currently executing
|
||||
// file... Python ZipImporter will find embedded zip archive
|
||||
char *pythonpath = argv[0];
|
||||
|
||||
bool interactive = false;
|
||||
bool show_help = false;
|
||||
bool getopt_done = false;
|
||||
int opt_index = 0;
|
||||
|
||||
static struct option long_options[] = {
|
||||
{"python", 1, 0, 'p'},
|
||||
{"interactive", 0, 0, 'i'},
|
||||
{"help", 0, 0, 'h'},
|
||||
{0,0,0,0}
|
||||
};
|
||||
|
||||
do {
|
||||
switch (getopt_long(argc, argv, "+p:ih", long_options, &opt_index)) {
|
||||
// -p <path> prepends <path> to PYTHONPATH instead of
|
||||
// using built-in zip archive. Useful when
|
||||
// developing/debugging changes to built-in Python
|
||||
// libraries, as the new Python can be tested without
|
||||
// building a new m5 binary.
|
||||
case 'p':
|
||||
pythonpath = optarg;
|
||||
break;
|
||||
|
||||
// -i forces entry into interactive mode after the
|
||||
// supplied script is executed (just like the -i option to
|
||||
// the Python interpreter).
|
||||
case 'i':
|
||||
interactive = true;
|
||||
break;
|
||||
|
||||
case 'h':
|
||||
show_help = true;
|
||||
break;
|
||||
case -1:
|
||||
getopt_done = true;
|
||||
break;
|
||||
|
||||
default:
|
||||
fatal("Unrecognized option %c\n", optopt);
|
||||
}
|
||||
} while (!getopt_done);
|
||||
|
||||
if (show_help) {
|
||||
showBriefHelp(cerr);
|
||||
exit(1);
|
||||
}
|
||||
|
||||
// Fix up argc & argv to hide arguments we just processed.
|
||||
// getopt() sets optind to the index of the first non-processed
|
||||
// argv element.
|
||||
argc -= optind;
|
||||
argv += optind;
|
||||
|
||||
// Set up PYTHONPATH to make sure the m5 module is found
|
||||
string newpath(pythonpath);
|
||||
// file... Python ZipImporter will find embedded zip archive.
|
||||
// The M5_ARCHIVE environment variable can be used to override this.
|
||||
char *m5_archive = getenv("M5_ARCHIVE");
|
||||
string pythonpath = m5_archive ? m5_archive : argv[0];
|
||||
|
||||
char *oldpath = getenv("PYTHONPATH");
|
||||
if (oldpath != NULL) {
|
||||
newpath += ":";
|
||||
newpath += oldpath;
|
||||
pythonpath += ":";
|
||||
pythonpath += oldpath;
|
||||
}
|
||||
|
||||
if (setenv("PYTHONPATH", newpath.c_str(), true) == -1)
|
||||
if (setenv("PYTHONPATH", pythonpath.c_str(), true) == -1)
|
||||
fatal("setenv: %s\n", strerror(errno));
|
||||
|
||||
// initialize embedded Python interpreter
|
||||
|
|
@ -264,37 +151,8 @@ main(int argc, char **argv)
|
|||
// initialize SWIG 'cc_main' module
|
||||
init_cc_main();
|
||||
|
||||
if (argc > 0) {
|
||||
// extra arg(s): first is script file, remaining ones are args
|
||||
// to script file
|
||||
char *filename = argv[0];
|
||||
FILE *fp = fopen(filename, "r");
|
||||
if (!fp) {
|
||||
fatal("cannot open file '%s'\n", filename);
|
||||
}
|
||||
|
||||
PyRun_AnyFile(fp, filename);
|
||||
} else {
|
||||
// no script file argument... force interactive prompt
|
||||
interactive = true;
|
||||
}
|
||||
|
||||
if (interactive) {
|
||||
// The following code to import readline was copied from Python
|
||||
// 2.4.3's Modules/main.c.
|
||||
// Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006
|
||||
// Python Software Foundation; All Rights Reserved
|
||||
// We should only enable this if we're actually using an
|
||||
// interactive prompt.
|
||||
PyObject *v;
|
||||
v = PyImport_ImportModule("readline");
|
||||
if (v == NULL)
|
||||
PyErr_Clear();
|
||||
else
|
||||
Py_DECREF(v);
|
||||
|
||||
PyRun_InteractiveLoop(stdin, "stdin");
|
||||
}
|
||||
PyRun_SimpleString("import m5");
|
||||
PyRun_SimpleString("m5.main()");
|
||||
|
||||
// clean up Python intepreter.
|
||||
Py_Finalize();
|
||||
|
|
|
|||
Loading…
Reference in a new issue