diff -r d1ce92fd3245 -r 25250afa8887 configs/common/Options.py
--- a/configs/common/Options.py	Wed May 18 11:06:23 2011 -0700
+++ b/configs/common/Options.py	Fri May 20 02:34:45 2011 -0400
@@ -53,8 +53,8 @@
                   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("-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_intvl", 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 -r d1ce92fd3245 -r 25250afa8887 configs/common/Simulation.py
--- a/configs/common/Simulation.py	Wed May 18 11:06:23 2011 -0700
+++ b/configs/common/Simulation.py	Fri May 20 02:34:45 2011 -0400
@@ -116,8 +116,8 @@
                 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 @@
                 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