summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configs/common/Options.py8
-rw-r--r--configs/common/Simulation.py10
2 files changed, 8 insertions, 10 deletions
diff --git a/configs/common/Options.py b/configs/common/Options.py
index dea7ab7df..e69f3a527 100644
--- a/configs/common/Options.py
+++ b/configs/common/Options.py
@@ -53,8 +53,8 @@ parser.add_option("-m", "--maxtick", type="int", default=m5.MaxTick,
metavar="T",
help="Stop after T ticks")
parser.add_option("--maxtime", type="float")
-parser.add_option("--maxinsts", type="int")
-parser.add_option("--prog_intvl", type="int")
+parser.add_option("-I", "--maxinsts", action="store", type="int", default=None,
+ help="Total number of instructions to simulate (default: run forever)")
parser.add_option("--work-item-id", action="store", type="int",
help="the specific work id for exit & checkpointing")
parser.add_option("--work-begin-cpu-id-exit", action="store", type="int",
@@ -94,14 +94,12 @@ parser.add_option("-s", "--standard-switch", action="store_true",
parser.add_option("-w", "--warmup", action="store", type="int",
help="if -s, then this is the warmup period. else, this is ignored",
default=5000000000)
-parser.add_option("--profile", help="CPU profile interval")
+parser.add_option("-p", "--prog-interval", type="int", help="CPU Progress Interval")
# Fastforwarding and simpoint related materials
parser.add_option("-W", "--warmup-insts", action="store", type="int",
default=None,
help="Warmup period in total instructions (requires --standard-switch)")
-parser.add_option("-I", "--max-inst", action="store", type="int", default=None,
- help="Total number of instructions to simulate (default: run forever)")
parser.add_option("--bench", action="store", type="string", default=None,
help="base names for --take-checkpoint and --checkpoint-restore")
parser.add_option("-F", "--fast-forward", action="store", type="string",
diff --git a/configs/common/Simulation.py b/configs/common/Simulation.py
index 9168e1370..1cc2f47b7 100644
--- a/configs/common/Simulation.py
+++ b/configs/common/Simulation.py
@@ -98,7 +98,7 @@ def run(options, root, testsys, cpu_class):
if options.prog_intvl:
for i in xrange(np):
- testsys.cpu[i].progress_interval = options.prog_intvl
+ testsys.cpu[i].progress_interval = options.prog_interval
if options.maxinsts:
for i in xrange(np):
@@ -116,8 +116,8 @@ def run(options, root, testsys, cpu_class):
switch_cpus[i].workload = testsys.cpu[i].workload
switch_cpus[i].clock = testsys.cpu[0].clock
# simulation period
- if options.max_inst:
- switch_cpus[i].max_insts_any_thread = options.max_inst
+ if options.maxinsts:
+ switch_cpus[i].max_insts_any_thread = options.maxinsts
testsys.switch_cpus = switch_cpus
switch_cpu_list = [(testsys.cpu[i], switch_cpus[i]) for i in xrange(np)]
@@ -163,8 +163,8 @@ def run(options, root, testsys, cpu_class):
switch_cpus[i].max_insts_any_thread = options.warmup_insts
# simulation period
- if options.max_inst:
- switch_cpus_1[i].max_insts_any_thread = options.max_inst
+ if options.maxinsts:
+ switch_cpus_1[i].max_insts_any_thread = options.maxinsts
testsys.switch_cpus = switch_cpus
testsys.switch_cpus_1 = switch_cpus_1