Merge ktlim@zizzer:/bk/newmem

into  zamp.eecs.umich.edu:/z/ktlim2/clean/o3-merge/newmem

src/cpu/memtest/memtest.cc:
src/cpu/memtest/memtest.hh:
src/cpu/simple/timing.hh:
tests/configs/o3-timing-mp.py:
    Hand merge.

--HG--
extra : convert_revision : a58cc439eb5e8f900d175ed8b5a85b6c8723e558

1 files changed, 11 insertions, 0 deletions

diff --git a/tests/quick/00.hello/ref/mips/linux/simple-atomic/config.ini b/tests/quick/00.hello/ref/mips/linux/simple-atomic/config.ini
index 2c82b8c1a..59cadaa12 100644
--- a/tests/quick/00.hello/ref/mips/linux/simple-atomic/config.ini
+++ b/tests/quick/00.hello/ref/mips/linux/simple-atomic/config.ini
@@ -56,6 +56,7 @@ physmem=system.physmem
 type=AtomicSimpleCPU
 children=workload
 clock=1
+cpu_id=0
 defer_registration=false
 function_trace=false
 function_trace_start=0
@@ -64,6 +65,7 @@ max_insts_any_thread=0
 max_loads_all_threads=0
 max_loads_any_thread=0
 mem=system.physmem
+progress_interval=0
 simulate_stalls=false
 system=system
 width=1
@@ -74,15 +76,23 @@ icache_port=system.membus.port[1]
 [system.cpu.workload]
 type=LiveProcess
 cmd=hello
+egid=100
 env=
+euid=100
 executable=tests/test-progs/hello/bin/mips/linux/hello
+gid=100
 input=cin
 output=cout
+pid=100
+ppid=99
 system=system
+uid=100
 
 [system.membus]
 type=Bus
 bus_id=0
+clock=1000
+width=64
 port=system.physmem.port system.cpu.icache_port system.cpu.dcache_port
 
 [system.physmem]
@@ -94,6 +104,7 @@ port=system.membus.port[0]
 
 [trace]
 bufsize=0
+cycle=0
 dump_on_exit=false
 file=cout
 flags=