From b5b9d2ad3ead8d0bf06e4546ca7fdd41445b6d2b Mon Sep 17 00:00:00 2001 From: Jayneel Gandhi Date: Mon, 16 Apr 2012 17:51:26 -0500 Subject: Config: Add command line options for disk image and memory size Added the options to Options.py for FS mode with backward compatibility. It is good to provide an option to specify the disk image and the memory size from command line since a lot of disk images are created to support different benchmark suites as well as per user needs. Change in program also leads to change in memory requirements. These options provide the interface to provide both disk image and memory size from the command line and gives more flexibility. --- configs/common/Options.py | 8 ++++++++ configs/example/fs.py | 4 ++-- configs/example/ruby_fs.py | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) (limited to 'configs') diff --git a/configs/common/Options.py b/configs/common/Options.py index d22b3ab3c..9413283f1 100644 --- a/configs/common/Options.py +++ b/configs/common/Options.py @@ -171,3 +171,11 @@ def addFSOptions(parser): parser.add_option("--etherdump", action="store", type="string", dest="etherdump", help="Specify the filename to dump a pcap capture of the" \ "ethernet traffic") + + # Disk Image Options + parser.add_option("--disk-image", action="store", type="string", default=None, + help="Path to the disk image to use.") + + # Memory Size Options + parser.add_option("--mem-size", action="store", type="string", default=None, + help="Path to the disk image to use.") diff --git a/configs/example/fs.py b/configs/example/fs.py index 38571fec3..33dc63af4 100644 --- a/configs/example/fs.py +++ b/configs/example/fs.py @@ -86,9 +86,9 @@ if options.benchmark: sys.exit(1) else: if options.dual: - bm = [SysConfig(), SysConfig()] + bm = [SysConfig(disk=options.disk_image, mem=options.mem_size), SysConfig(disk=options.disk_image, mem=options.mem_size)] else: - bm = [SysConfig()] + bm = [SysConfig(disk=options.disk_image, mem=options.mem_size)] np = options.num_cpus diff --git a/configs/example/ruby_fs.py b/configs/example/ruby_fs.py index 8f02b8cfd..35e485c7a 100644 --- a/configs/example/ruby_fs.py +++ b/configs/example/ruby_fs.py @@ -71,7 +71,7 @@ if options.benchmark: print "Valid benchmarks are: %s" % DefinedBenchmarks sys.exit(1) else: - bm = [SysConfig()] + bm = [SysConfig(disk=options.disk_image, mem=options.mem_size)] # Check for timing mode because ruby does not support atomic accesses if not (options.cpu_type == "detailed" or options.cpu_type == "timing"): -- cgit v1.2.3