diff options
| author | Kevin Lim <ktlim@umich.edu> | 2006-10-02 18:12:21 -0400 |
|---|---|---|
| committer | Kevin Lim <ktlim@umich.edu> | 2006-10-02 18:12:21 -0400 |
| commit | cada0473195eacc84dbcb8edcac412cb5cbd689a (patch) | |
| tree | a7075372acc1fbf3d1ad53e9f4034a661c8d1651 | |
| parent | f2acc3a4a303e4cc054eef62621499ebcbf8599b (diff) | |
| parent | c78b6634a2f5997c142d51305cbdd75e056c5f03 (diff) | |
| download | gem5-cada0473195eacc84dbcb8edcac412cb5cbd689a.tar.xz | |
Merge ktlim@zizzer:/bk/newmem
into zamp.eecs.umich.edu:/z/ktlim2/clean/newmem
--HG--
extra : convert_revision : 1010a4ee8e1abec0e8290637feee523ca9ef9a9b
| -rw-r--r-- | src/cpu/simple/atomic.cc | 3 | ||||
| -rw-r--r-- | src/cpu/simple/timing.cc | 3 |
2 files changed, 6 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; |