summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGabe Black <gblack@eecs.umich.edu>2006-10-02 18:35:36 -0400
committerGabe Black <gblack@eecs.umich.edu>2006-10-02 18:35:36 -0400
commit6a31898a88a9ecced399ccf50636831c21d4a75e (patch)
tree16dfbde1b2a15ae82732e392a0504f1a56492547 /src
parente8ced44aead3b1a11ac7747b8d38ce5dba6c09d1 (diff)
parent51c8eab7b336a6c83e545b741cb975883fe56440 (diff)
downloadgem5-6a31898a88a9ecced399ccf50636831c21d4a75e.tar.xz
Merge zizzer.eecs.umich.edu:/bk/newmem
into zeep.eecs.umich.edu:/home/gblack/m5/newmem --HG-- extra : convert_revision : f7d41fc21c7eeca6edde0b01f2e8844e3e19c51a
Diffstat (limited to 'src')
-rw-r--r--src/cpu/simple/atomic.cc3
-rw-r--r--src/cpu/simple/timing.cc3
-rw-r--r--src/python/m5/main.py1
3 files changed, 7 insertions, 0 deletions
diff --git a/src/cpu/simple/atomic.cc b/src/cpu/simple/atomic.cc
index c396f5033..7ba1b7df1 100644
--- a/src/cpu/simple/atomic.cc
+++ b/src/cpu/simple/atomic.cc
@@ -464,6 +464,7 @@ BEGIN_DECLARE_SIM_OBJECT_PARAMS(AtomicSimpleCPU)
Param<Counter> max_insts_all_threads;
Param<Counter> max_loads_any_thread;
Param<Counter> max_loads_all_threads;
+ Param<Tick> progress_interval;
SimObjectParam<MemObject *> mem;
SimObjectParam<System *> system;
@@ -496,6 +497,7 @@ BEGIN_INIT_SIM_OBJECT_PARAMS(AtomicSimpleCPU)
"terminate when any thread reaches this load count"),
INIT_PARAM(max_loads_all_threads,
"terminate when all threads have reached this load count"),
+ INIT_PARAM(progress_interval, "Progress interval"),
INIT_PARAM(mem, "memory"),
INIT_PARAM(system, "system object"),
@@ -527,6 +529,7 @@ CREATE_SIM_OBJECT(AtomicSimpleCPU)
params->max_insts_all_threads = max_insts_all_threads;
params->max_loads_any_thread = max_loads_any_thread;
params->max_loads_all_threads = max_loads_all_threads;
+ params->progress_interval = progress_interval;
params->deferRegistration = defer_registration;
params->clock = clock;
params->functionTrace = function_trace;
diff --git a/src/cpu/simple/timing.cc b/src/cpu/simple/timing.cc
index 5c1654f7e..03ee27e04 100644
--- a/src/cpu/simple/timing.cc
+++ b/src/cpu/simple/timing.cc
@@ -589,6 +589,7 @@ BEGIN_DECLARE_SIM_OBJECT_PARAMS(TimingSimpleCPU)
Param<Counter> max_insts_all_threads;
Param<Counter> max_loads_any_thread;
Param<Counter> max_loads_all_threads;
+ Param<Tick> progress_interval;
SimObjectParam<MemObject *> mem;
SimObjectParam<System *> system;
@@ -621,6 +622,7 @@ BEGIN_INIT_SIM_OBJECT_PARAMS(TimingSimpleCPU)
"terminate when any thread reaches this load count"),
INIT_PARAM(max_loads_all_threads,
"terminate when all threads have reached this load count"),
+ INIT_PARAM(progress_interval, "Progress interval"),
INIT_PARAM(mem, "memory"),
INIT_PARAM(system, "system object"),
@@ -652,6 +654,7 @@ CREATE_SIM_OBJECT(TimingSimpleCPU)
params->max_insts_all_threads = max_insts_all_threads;
params->max_loads_any_thread = max_loads_any_thread;
params->max_loads_all_threads = max_loads_all_threads;
+ params->progress_interval = progress_interval;
params->deferRegistration = defer_registration;
params->clock = clock;
params->functionTrace = function_trace;
diff --git a/src/python/m5/main.py b/src/python/m5/main.py
index e93ef3a36..ccd6c5807 100644
--- a/src/python/m5/main.py
+++ b/src/python/m5/main.py
@@ -278,6 +278,7 @@ def main():
# set tracing options
objects.Trace.flags = options.trace_flags
objects.Trace.start = options.trace_start
+ objects.Trace.cycle = options.trace_cycle
objects.Trace.file = options.trace_file
objects.Trace.bufsize = options.trace_circlebuf
objects.Trace.dump_on_exit = options.trace_dumponexit