stats: update stats for insts/ops and master id changes

3 files changed, 47 insertions, 10 deletions

diff --git a/tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/config.ini b/tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/config.ini
index 3ef5774b9..95be41a11 100644
--- a/tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/config.ini
+++ b/tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/config.ini
@@ -1,6 +1,7 @@
 [root]
 type=Root
 children=system
+full_system=false
 time_sync_enable=false
 time_sync_period=100000000
 time_sync_spin_threshold=100000
@@ -8,10 +9,16 @@ time_sync_spin_threshold=100000
 [system]
 type=System
 children=cpu dir_cntrl0 l1_cntrl0 physmem ruby sys_port_proxy
+boot_osflags=a
+init_param=0
+kernel=
+load_addr_mask=1099511627775
 mem_mode=timing
 memories=system.physmem
 num_work_ids=16
 physmem=system.physmem
+readfile=
+symbolfile=
 work_begin_ckpt_count=0
 work_begin_cpu_id_exit=-1
 work_begin_exit_count=0
@@ -23,16 +30,18 @@ system_port=system.sys_port_proxy.port[0]
 
 [system.cpu]
 type=TimingSimpleCPU
-children=dtb itb tracer workload
+children=dtb interrupts itb tracer workload
 checker=Null
 clock=1
 cpu_id=0
 defer_registration=false
 do_checkpoint_insts=true
+do_quiesce=true
 do_statistics_insts=true
 dtb=system.cpu.dtb
 function_trace=false
 function_trace_start=0
+interrupts=system.cpu.interrupts
 itb=system.cpu.itb
 max_insts_all_threads=0
 max_insts_any_thread=0
@@ -40,6 +49,7 @@ max_loads_all_threads=0
 max_loads_any_thread=0
 numThreads=1
 phase=0
+profile=0
 progress_interval=0
 system=system
 tracer=system.cpu.tracer
@@ -49,11 +59,34 @@ icache_port=system.l1_cntrl0.sequencer.port[0]
 
 [system.cpu.dtb]
 type=X86TLB
+children=walker
 size=64
+walker=system.cpu.dtb.walker
+
+[system.cpu.dtb.walker]
+type=X86PagetableWalker
+system=system
+port=system.l1_cntrl0.sequencer.port[3]
+
+[system.cpu.interrupts]
+type=X86LocalApic
+int_latency=1
+pio_addr=2305843009213693952
+pio_latency=1
+system=system
+int_port=system.l1_cntrl0.sequencer.port[5]
+pio=system.l1_cntrl0.sequencer.port[4]
 
 [system.cpu.itb]
 type=X86TLB
+children=walker
 size=64
+walker=system.cpu.itb.walker
+
+[system.cpu.itb.walker]
+type=X86PagetableWalker
+system=system
+port=system.l1_cntrl0.sequencer.port[2]
 
 [system.cpu.tracer]
 type=ExeTracer
@@ -131,6 +164,7 @@ issue_latency=2
 number_of_TBEs=256
 recycle_latency=10
 ruby_system=system.ruby
+send_evictions=false
 sequencer=system.l1_cntrl0.sequencer
 transitions_per_cycle=32
 version=0
@@ -157,7 +191,7 @@ using_network_tester=false
 using_ruby_tester=false
 version=0
 physMemPort=system.physmem.port[0]
-port=system.cpu.icache_port system.cpu.dcache_port
+port=system.cpu.icache_port system.cpu.dcache_port system.cpu.itb.walker.port system.cpu.dtb.walker.port system.cpu.interrupts.pio system.cpu.interrupts.int_port
 
 [system.physmem]
 type=PhysicalMemory
diff --git a/tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/simout b/tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/simout
index 9c1cf6357..f8a22f9ca 100755
--- a/tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/simout
+++ b/tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/simout
@@ -1,10 +1,10 @@
 gem5 Simulator System.  http://gem5.org
 gem5 is copyrighted software; use the --copyright option for details.
 
-gem5 compiled Jan 23 2012 04:08:34
-gem5 started Jan 23 2012 04:24:43
+gem5 compiled Feb 11 2012 13:08:53
+gem5 started Feb 11 2012 14:04:37
 gem5 executing on zizzer
-command line: build/X86_SE/gem5.opt -d build/X86_SE/tests/opt/quick/00.hello/x86/linux/simple-timing-ruby -re tests/run.py build/X86_SE/tests/opt/quick/00.hello/x86/linux/simple-timing-ruby
+command line: build/X86/gem5.fast -d build/X86/tests/fast/quick/se/00.hello/x86/linux/simple-timing-ruby -re tests/run.py build/X86/tests/fast/quick/se/00.hello/x86/linux/simple-timing-ruby
 Global frequency set at 1000000000 ticks per second
 info: Entering event queue @ 0.  Starting simulation...
 Hello world!
diff --git a/tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/stats.txt b/tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/stats.txt
index 49089d227..31a5db86e 100644
--- a/tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/stats.txt
+++ b/tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/stats.txt
@@ -4,11 +4,13 @@ sim_seconds                                  0.000276                       # Nu
 sim_ticks                                      276484                       # Number of ticks simulated
 final_tick                                     276484                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                   1000000000                       # Frequency of simulated ticks
-host_inst_rate                                  88128                       # Simulator instruction rate (inst/s)
-host_tick_rate                                2483404                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 223444                       # Number of bytes of host memory used
+host_inst_rate                                  47191                       # Simulator instruction rate (inst/s)
+host_op_rate                                    85448                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                                2407911                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 228676                       # Number of bytes of host memory used
 host_seconds                                     0.11                       # Real time elapsed on the host
-sim_insts                                        9810                       # Number of instructions simulated
+sim_insts                                        5417                       # Number of instructions simulated
+sim_ops                                          9810                       # Number of ops (including micro ops) simulated
 system.physmem.bytes_read                       62348                       # Number of bytes read from this memory
 system.physmem.bytes_inst_read                  55280                       # Number of instructions bytes read from this memory
 system.physmem.bytes_written                     7110                       # Number of bytes written to this memory
@@ -23,7 +25,8 @@ system.cpu.workload.num_syscalls                   11                       # Nu
 system.cpu.numCycles                           276484                       # number of cpu cycles simulated
 system.cpu.numWorkItemsStarted                      0                       # number of work items this cpu started
 system.cpu.numWorkItemsCompleted                    0                       # number of work items this cpu completed
-system.cpu.num_insts                             9810                       # Number of instructions executed
+system.cpu.committedInsts                        5417                       # Number of instructions committed
+system.cpu.committedOps                          9810                       # Number of ops (including micro ops) committed
 system.cpu.num_int_alu_accesses                  9715                       # Number of integer alu accesses
 system.cpu.num_fp_alu_accesses                      0                       # Number of float alu accesses
 system.cpu.num_func_calls                           0                       # number of times a function call or return occured