Merge zizzer.eecs.umich.edu:/bk/newmem
into zeep.eecs.umich.edu:/home/gblack/m5/newmem --HG-- extra : convert_revision : f7d41fc21c7eeca6edde0b01f2e8844e3e19c51a
This commit is contained in:
commit
6a31898a88
3 changed files with 7 additions and 0 deletions
|
@ -464,6 +464,7 @@ BEGIN_DECLARE_SIM_OBJECT_PARAMS(AtomicSimpleCPU)
|
||||||
Param<Counter> max_insts_all_threads;
|
Param<Counter> max_insts_all_threads;
|
||||||
Param<Counter> max_loads_any_thread;
|
Param<Counter> max_loads_any_thread;
|
||||||
Param<Counter> max_loads_all_threads;
|
Param<Counter> max_loads_all_threads;
|
||||||
|
Param<Tick> progress_interval;
|
||||||
SimObjectParam<MemObject *> mem;
|
SimObjectParam<MemObject *> mem;
|
||||||
SimObjectParam<System *> system;
|
SimObjectParam<System *> system;
|
||||||
|
|
||||||
|
@ -496,6 +497,7 @@ BEGIN_INIT_SIM_OBJECT_PARAMS(AtomicSimpleCPU)
|
||||||
"terminate when any thread reaches this load count"),
|
"terminate when any thread reaches this load count"),
|
||||||
INIT_PARAM(max_loads_all_threads,
|
INIT_PARAM(max_loads_all_threads,
|
||||||
"terminate when all threads have reached this load count"),
|
"terminate when all threads have reached this load count"),
|
||||||
|
INIT_PARAM(progress_interval, "Progress interval"),
|
||||||
INIT_PARAM(mem, "memory"),
|
INIT_PARAM(mem, "memory"),
|
||||||
INIT_PARAM(system, "system object"),
|
INIT_PARAM(system, "system object"),
|
||||||
|
|
||||||
|
@ -527,6 +529,7 @@ CREATE_SIM_OBJECT(AtomicSimpleCPU)
|
||||||
params->max_insts_all_threads = max_insts_all_threads;
|
params->max_insts_all_threads = max_insts_all_threads;
|
||||||
params->max_loads_any_thread = max_loads_any_thread;
|
params->max_loads_any_thread = max_loads_any_thread;
|
||||||
params->max_loads_all_threads = max_loads_all_threads;
|
params->max_loads_all_threads = max_loads_all_threads;
|
||||||
|
params->progress_interval = progress_interval;
|
||||||
params->deferRegistration = defer_registration;
|
params->deferRegistration = defer_registration;
|
||||||
params->clock = clock;
|
params->clock = clock;
|
||||||
params->functionTrace = function_trace;
|
params->functionTrace = function_trace;
|
||||||
|
|
|
@ -589,6 +589,7 @@ BEGIN_DECLARE_SIM_OBJECT_PARAMS(TimingSimpleCPU)
|
||||||
Param<Counter> max_insts_all_threads;
|
Param<Counter> max_insts_all_threads;
|
||||||
Param<Counter> max_loads_any_thread;
|
Param<Counter> max_loads_any_thread;
|
||||||
Param<Counter> max_loads_all_threads;
|
Param<Counter> max_loads_all_threads;
|
||||||
|
Param<Tick> progress_interval;
|
||||||
SimObjectParam<MemObject *> mem;
|
SimObjectParam<MemObject *> mem;
|
||||||
SimObjectParam<System *> system;
|
SimObjectParam<System *> system;
|
||||||
|
|
||||||
|
@ -621,6 +622,7 @@ BEGIN_INIT_SIM_OBJECT_PARAMS(TimingSimpleCPU)
|
||||||
"terminate when any thread reaches this load count"),
|
"terminate when any thread reaches this load count"),
|
||||||
INIT_PARAM(max_loads_all_threads,
|
INIT_PARAM(max_loads_all_threads,
|
||||||
"terminate when all threads have reached this load count"),
|
"terminate when all threads have reached this load count"),
|
||||||
|
INIT_PARAM(progress_interval, "Progress interval"),
|
||||||
INIT_PARAM(mem, "memory"),
|
INIT_PARAM(mem, "memory"),
|
||||||
INIT_PARAM(system, "system object"),
|
INIT_PARAM(system, "system object"),
|
||||||
|
|
||||||
|
@ -652,6 +654,7 @@ CREATE_SIM_OBJECT(TimingSimpleCPU)
|
||||||
params->max_insts_all_threads = max_insts_all_threads;
|
params->max_insts_all_threads = max_insts_all_threads;
|
||||||
params->max_loads_any_thread = max_loads_any_thread;
|
params->max_loads_any_thread = max_loads_any_thread;
|
||||||
params->max_loads_all_threads = max_loads_all_threads;
|
params->max_loads_all_threads = max_loads_all_threads;
|
||||||
|
params->progress_interval = progress_interval;
|
||||||
params->deferRegistration = defer_registration;
|
params->deferRegistration = defer_registration;
|
||||||
params->clock = clock;
|
params->clock = clock;
|
||||||
params->functionTrace = function_trace;
|
params->functionTrace = function_trace;
|
||||||
|
|
|
@ -278,6 +278,7 @@ def main():
|
||||||
# set tracing options
|
# set tracing options
|
||||||
objects.Trace.flags = options.trace_flags
|
objects.Trace.flags = options.trace_flags
|
||||||
objects.Trace.start = options.trace_start
|
objects.Trace.start = options.trace_start
|
||||||
|
objects.Trace.cycle = options.trace_cycle
|
||||||
objects.Trace.file = options.trace_file
|
objects.Trace.file = options.trace_file
|
||||||
objects.Trace.bufsize = options.trace_circlebuf
|
objects.Trace.bufsize = options.trace_circlebuf
|
||||||
objects.Trace.dump_on_exit = options.trace_dumponexit
|
objects.Trace.dump_on_exit = options.trace_dumponexit
|
||||||
|
|
Loading…
Reference in a new issue