summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNilay Vaish <nilay@cs.wisc.edu>2013-06-28 21:42:26 -0500
committerNilay Vaish <nilay@cs.wisc.edu>2013-06-28 21:42:26 -0500
commit516b7849e8efb369ede9c711309667d48897c9c2 (patch)
treec5acb0b62c4aba1d1f470cece66e115ac70347f2
parentb3980cdb9a511227d5b2eb2d4ba75fde34cb209b (diff)
downloadgem5-516b7849e8efb369ede9c711309667d48897c9c2.tar.xz
configs: rearrange the available options in Options.py
It also changes the instantiation of physmem in se.py so as to make use of the memory size supplied by the mem_size option.
-rw-r--r--configs/common/Options.py51
-rw-r--r--configs/example/se.py2
2 files changed, 30 insertions, 23 deletions
diff --git a/configs/common/Options.py b/configs/common/Options.py
index 6c97f547f..ce270fcd4 100644
--- a/configs/common/Options.py
+++ b/configs/common/Options.py
@@ -62,21 +62,8 @@ def addCommonOptions(parser):
parser.add_option("--cpu-type", type="choice", default="atomic",
choices=CpuConfig.cpu_names(),
help = "type of cpu to run with")
- parser.add_option("--list-mem-types",
- action="callback", callback=_listMemTypes,
- help="List available memory types")
- parser.add_option("--mem-type", type="choice", default="simple_mem",
- choices=MemConfig.mem_names(),
- help = "type of memory to use")
parser.add_option("--checker", action="store_true");
parser.add_option("-n", "--num-cpus", type="int", default=1)
- parser.add_option("--caches", action="store_true")
- parser.add_option("--l2cache", action="store_true")
- parser.add_option("--fastmem", action="store_true")
- parser.add_option("--simpoint-profile", action="store_true",
- help="Enable basic block profiling for SimPoints")
- parser.add_option("--simpoint-interval", type="int", default=10000000,
- help="SimPoint interval in num of instructions")
parser.add_option("--sys-clock", action="store", type="string",
default='1GHz',
help = """Top-level clock for blocks running at system
@@ -84,6 +71,27 @@ def addCommonOptions(parser):
parser.add_option("--cpu-clock", action="store", type="string",
default='2GHz',
help="Clock for blocks running at CPU speed")
+ parser.add_option("--smt", action="store_true", default=False,
+ help = """
+ Only used if multiple programs are specified. If true,
+ then the number of threads per cpu is same as the
+ number of programs.""")
+
+ # Memory Options
+ parser.add_option("--list-mem-types",
+ action="callback", callback=_listMemTypes,
+ help="List available memory types")
+ parser.add_option("--mem-type", type="choice", default="simple_mem",
+ choices=MemConfig.mem_names(),
+ help = "type of memory to use")
+ parser.add_option("--mem-size", action="store", type="string",
+ default="512MB",
+ help="Specify the physical memory size (single memory)")
+
+ # Cache Options
+ parser.add_option("--caches", action="store_true")
+ parser.add_option("--l2cache", action="store_true")
+ parser.add_option("--fastmem", action="store_true")
parser.add_option("--num-dirs", type="int", default=1)
parser.add_option("--num-l2caches", type="int", default=1)
parser.add_option("--num-l3caches", type="int", default=1)
@@ -96,12 +104,9 @@ def addCommonOptions(parser):
parser.add_option("--l2_assoc", type="int", default=8)
parser.add_option("--l3_assoc", type="int", default=16)
parser.add_option("--cacheline_size", type="int", default=64)
+
+ # Enable Ruby
parser.add_option("--ruby", action="store_true")
- parser.add_option("--smt", action="store_true", default=False,
- help = """
- Only used if multiple programs are specified. If true,
- then the number of threads per cpu is same as the
- number of programs.""")
# Run duration options
parser.add_option("-m", "--maxtick", type="int", default=m5.MaxTick,
@@ -122,6 +127,12 @@ def addCommonOptions(parser):
help="""Parameter available in simulation with m5
initparam""")
+ # Simpoint options
+ parser.add_option("--simpoint-profile", action="store_true",
+ help="Enable basic block profiling for SimPoints")
+ parser.add_option("--simpoint-interval", type="int", default=10000000,
+ help="SimPoint interval in num of instructions")
+
# Checkpointing options
###Note that performing checkpointing via python script files will override
###checkpoint instructions built into binaries.
@@ -224,7 +235,3 @@ def addFSOptions(parser):
# 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="Specify the physical memory size (single memory)")
diff --git a/configs/example/se.py b/configs/example/se.py
index a564901a3..63f6ddc80 100644
--- a/configs/example/se.py
+++ b/configs/example/se.py
@@ -157,7 +157,7 @@ if options.smt and options.num_cpus > 1:
np = options.num_cpus
system = System(cpu = [CPUClass(cpu_id=i) for i in xrange(np)],
- physmem = MemClass(range=AddrRange("512MB")),
+ physmem = MemClass(range=AddrRange(options.mem_size)),
mem_mode = test_mem_mode,
clk_domain = SrcClockDomain(clock = options.sys_clock))