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

3 files changed, 25 insertions, 64 deletions

diff --git a/tests/quick/fs/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/config.ini b/tests/quick/fs/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/config.ini
index 4bff39dc1..7a0c1d8ae 100644
--- a/tests/quick/fs/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/config.ini
+++ b/tests/quick/fs/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/config.ini
@@ -64,6 +64,7 @@ simulate_inst_stalls=false
 system=drivesys
 tracer=drivesys.cpu.tracer
 width=1
+workload=
 dcache_port=drivesys.membus.port[4]
 icache_port=drivesys.membus.port[3]
 
@@ -165,7 +166,6 @@ fake_mem=false
 pio_addr=0
 pio_latency=1000
 pio_size=8
-platform=drivesys.tsunami
 ret_bad_addr=true
 ret_data16=65535
 ret_data32=4294967295
@@ -225,7 +225,6 @@ pio=drivesys.iobus.port[25]
 type=TsunamiCChip
 pio_addr=8803072344064
 pio_latency=1000
-platform=drivesys.tsunami
 system=drivesys
 tsunami=drivesys.tsunami
 pio=drivesys.iobus.port[1]
@@ -308,7 +307,6 @@ fake_mem=false
 pio_addr=8796093677568
 pio_latency=1000
 pio_size=393216
-platform=drivesys.tsunami
 ret_bad_addr=false
 ret_data16=65535
 ret_data32=4294967295
@@ -325,7 +323,6 @@ fake_mem=false
 pio_addr=8804615848432
 pio_latency=1000
 pio_size=8
-platform=drivesys.tsunami
 ret_bad_addr=false
 ret_data16=65535
 ret_data32=4294967295
@@ -342,7 +339,6 @@ fake_mem=false
 pio_addr=8804615848304
 pio_latency=1000
 pio_size=8
-platform=drivesys.tsunami
 ret_bad_addr=false
 ret_data16=65535
 ret_data32=4294967295
@@ -359,7 +355,6 @@ fake_mem=false
 pio_addr=8804615848569
 pio_latency=1000
 pio_size=8
-platform=drivesys.tsunami
 ret_bad_addr=false
 ret_data16=65535
 ret_data32=4294967295
@@ -376,7 +371,6 @@ fake_mem=false
 pio_addr=8804615848451
 pio_latency=1000
 pio_size=8
-platform=drivesys.tsunami
 ret_bad_addr=false
 ret_data16=65535
 ret_data32=4294967295
@@ -393,7 +387,6 @@ fake_mem=false
 pio_addr=8804615848515
 pio_latency=1000
 pio_size=8
-platform=drivesys.tsunami
 ret_bad_addr=false
 ret_data16=65535
 ret_data32=4294967295
@@ -410,7 +403,6 @@ fake_mem=false
 pio_addr=8804615848579
 pio_latency=1000
 pio_size=8
-platform=drivesys.tsunami
 ret_bad_addr=false
 ret_data16=65535
 ret_data32=4294967295
@@ -427,7 +419,6 @@ fake_mem=false
 pio_addr=8804615848643
 pio_latency=1000
 pio_size=8
-platform=drivesys.tsunami
 ret_bad_addr=false
 ret_data16=65535
 ret_data32=4294967295
@@ -444,7 +435,6 @@ fake_mem=false
 pio_addr=8804615848707
 pio_latency=1000
 pio_size=8
-platform=drivesys.tsunami
 ret_bad_addr=false
 ret_data16=65535
 ret_data32=4294967295
@@ -461,7 +451,6 @@ fake_mem=false
 pio_addr=8804615848771
 pio_latency=1000
 pio_size=8
-platform=drivesys.tsunami
 ret_bad_addr=false
 ret_data16=65535
 ret_data32=4294967295
@@ -478,7 +467,6 @@ fake_mem=false
 pio_addr=8804615848835
 pio_latency=1000
 pio_size=8
-platform=drivesys.tsunami
 ret_bad_addr=false
 ret_data16=65535
 ret_data32=4294967295
@@ -495,7 +483,6 @@ fake_mem=false
 pio_addr=8804615848899
 pio_latency=1000
 pio_size=8
-platform=drivesys.tsunami
 ret_bad_addr=false
 ret_data16=65535
 ret_data32=4294967295
@@ -512,7 +499,6 @@ fake_mem=false
 pio_addr=8804615850617
 pio_latency=1000
 pio_size=8
-platform=drivesys.tsunami
 ret_bad_addr=false
 ret_data16=65535
 ret_data32=4294967295
@@ -529,7 +515,6 @@ fake_mem=false
 pio_addr=8804615848891
 pio_latency=1000
 pio_size=8
-platform=drivesys.tsunami
 ret_bad_addr=false
 ret_data16=65535
 ret_data32=4294967295
@@ -546,7 +531,6 @@ fake_mem=false
 pio_addr=8804615848816
 pio_latency=1000
 pio_size=8
-platform=drivesys.tsunami
 ret_bad_addr=false
 ret_data16=65535
 ret_data32=4294967295
@@ -563,7 +547,6 @@ fake_mem=false
 pio_addr=8804615848696
 pio_latency=1000
 pio_size=8
-platform=drivesys.tsunami
 ret_bad_addr=false
 ret_data16=65535
 ret_data32=4294967295
@@ -580,7 +563,6 @@ fake_mem=false
 pio_addr=8804615848936
 pio_latency=1000
 pio_size=8
-platform=drivesys.tsunami
 ret_bad_addr=false
 ret_data16=65535
 ret_data32=4294967295
@@ -597,7 +579,6 @@ fake_mem=false
 pio_addr=8804615848680
 pio_latency=1000
 pio_size=8
-platform=drivesys.tsunami
 ret_bad_addr=false
 ret_data16=65535
 ret_data32=4294967295
@@ -614,7 +595,6 @@ fake_mem=false
 pio_addr=8804615848944
 pio_latency=1000
 pio_size=8
-platform=drivesys.tsunami
 ret_bad_addr=false
 ret_data16=65535
 ret_data32=4294967295
@@ -630,7 +610,6 @@ type=BadDevice
 devicename=FrameBuffer
 pio_addr=8804615848912
 pio_latency=1000
-platform=drivesys.tsunami
 system=drivesys
 pio=drivesys.iobus.port[22]
 
@@ -695,7 +674,6 @@ type=TsunamiIO
 frequency=976562500
 pio_addr=8804615847936
 pio_latency=1000
-platform=drivesys.tsunami
 system=drivesys
 time=Thu Jan  1 00:00:00 2009
 tsunami=drivesys.tsunami
@@ -706,7 +684,6 @@ pio=drivesys.iobus.port[23]
 type=TsunamiPChip
 pio_addr=8802535473152
 pio_latency=1000
-platform=drivesys.tsunami
 system=drivesys
 tsunami=drivesys.tsunami
 pio=drivesys.iobus.port[2]
@@ -746,6 +723,7 @@ int1=drivesys.tsunami.ethernet.interface
 [root]
 type=Root
 children=drivesys etherdump etherlink testsys
+full_system=true
 time_sync_enable=false
 time_sync_period=100000000000
 time_sync_spin_threshold=100000000
@@ -816,6 +794,7 @@ simulate_inst_stalls=false
 system=testsys
 tracer=testsys.cpu.tracer
 width=1
+workload=
 dcache_port=testsys.membus.port[4]
 icache_port=testsys.membus.port[3]
 
@@ -917,7 +896,6 @@ fake_mem=false
 pio_addr=0
 pio_latency=1000
 pio_size=8
-platform=testsys.tsunami
 ret_bad_addr=true
 ret_data16=65535
 ret_data32=4294967295
@@ -977,7 +955,6 @@ pio=testsys.iobus.port[25]
 type=TsunamiCChip
 pio_addr=8803072344064
 pio_latency=1000
-platform=testsys.tsunami
 system=testsys
 tsunami=testsys.tsunami
 pio=testsys.iobus.port[1]
@@ -1060,7 +1037,6 @@ fake_mem=false
 pio_addr=8796093677568
 pio_latency=1000
 pio_size=393216
-platform=testsys.tsunami
 ret_bad_addr=false
 ret_data16=65535
 ret_data32=4294967295
@@ -1077,7 +1053,6 @@ fake_mem=false
 pio_addr=8804615848432
 pio_latency=1000
 pio_size=8
-platform=testsys.tsunami
 ret_bad_addr=false
 ret_data16=65535
 ret_data32=4294967295
@@ -1094,7 +1069,6 @@ fake_mem=false
 pio_addr=8804615848304
 pio_latency=1000
 pio_size=8
-platform=testsys.tsunami
 ret_bad_addr=false
 ret_data16=65535
 ret_data32=4294967295
@@ -1111,7 +1085,6 @@ fake_mem=false
 pio_addr=8804615848569
 pio_latency=1000
 pio_size=8
-platform=testsys.tsunami
 ret_bad_addr=false
 ret_data16=65535
 ret_data32=4294967295
@@ -1128,7 +1101,6 @@ fake_mem=false
 pio_addr=8804615848451
 pio_latency=1000
 pio_size=8
-platform=testsys.tsunami
 ret_bad_addr=false
 ret_data16=65535
 ret_data32=4294967295
@@ -1145,7 +1117,6 @@ fake_mem=false
 pio_addr=8804615848515
 pio_latency=1000
 pio_size=8
-platform=testsys.tsunami
 ret_bad_addr=false
 ret_data16=65535
 ret_data32=4294967295
@@ -1162,7 +1133,6 @@ fake_mem=false
 pio_addr=8804615848579
 pio_latency=1000
 pio_size=8
-platform=testsys.tsunami
 ret_bad_addr=false
 ret_data16=65535
 ret_data32=4294967295
@@ -1179,7 +1149,6 @@ fake_mem=false
 pio_addr=8804615848643
 pio_latency=1000
 pio_size=8
-platform=testsys.tsunami
 ret_bad_addr=false
 ret_data16=65535
 ret_data32=4294967295
@@ -1196,7 +1165,6 @@ fake_mem=false
 pio_addr=8804615848707
 pio_latency=1000
 pio_size=8
-platform=testsys.tsunami
 ret_bad_addr=false
 ret_data16=65535
 ret_data32=4294967295
@@ -1213,7 +1181,6 @@ fake_mem=false
 pio_addr=8804615848771
 pio_latency=1000
 pio_size=8
-platform=testsys.tsunami
 ret_bad_addr=false
 ret_data16=65535
 ret_data32=4294967295
@@ -1230,7 +1197,6 @@ fake_mem=false
 pio_addr=8804615848835
 pio_latency=1000
 pio_size=8
-platform=testsys.tsunami
 ret_bad_addr=false
 ret_data16=65535
 ret_data32=4294967295
@@ -1247,7 +1213,6 @@ fake_mem=false
 pio_addr=8804615848899
 pio_latency=1000
 pio_size=8
-platform=testsys.tsunami
 ret_bad_addr=false
 ret_data16=65535
 ret_data32=4294967295
@@ -1264,7 +1229,6 @@ fake_mem=false
 pio_addr=8804615850617
 pio_latency=1000
 pio_size=8
-platform=testsys.tsunami
 ret_bad_addr=false
 ret_data16=65535
 ret_data32=4294967295
@@ -1281,7 +1245,6 @@ fake_mem=false
 pio_addr=8804615848891
 pio_latency=1000
 pio_size=8
-platform=testsys.tsunami
 ret_bad_addr=false
 ret_data16=65535
 ret_data32=4294967295
@@ -1298,7 +1261,6 @@ fake_mem=false
 pio_addr=8804615848816
 pio_latency=1000
 pio_size=8
-platform=testsys.tsunami
 ret_bad_addr=false
 ret_data16=65535
 ret_data32=4294967295
@@ -1315,7 +1277,6 @@ fake_mem=false
 pio_addr=8804615848696
 pio_latency=1000
 pio_size=8
-platform=testsys.tsunami
 ret_bad_addr=false
 ret_data16=65535
 ret_data32=4294967295
@@ -1332,7 +1293,6 @@ fake_mem=false
 pio_addr=8804615848936
 pio_latency=1000
 pio_size=8
-platform=testsys.tsunami
 ret_bad_addr=false
 ret_data16=65535
 ret_data32=4294967295
@@ -1349,7 +1309,6 @@ fake_mem=false
 pio_addr=8804615848680
 pio_latency=1000
 pio_size=8
-platform=testsys.tsunami
 ret_bad_addr=false
 ret_data16=65535
 ret_data32=4294967295
@@ -1366,7 +1325,6 @@ fake_mem=false
 pio_addr=8804615848944
 pio_latency=1000
 pio_size=8
-platform=testsys.tsunami
 ret_bad_addr=false
 ret_data16=65535
 ret_data32=4294967295
@@ -1382,7 +1340,6 @@ type=BadDevice
 devicename=FrameBuffer
 pio_addr=8804615848912
 pio_latency=1000
-platform=testsys.tsunami
 system=testsys
 pio=testsys.iobus.port[22]
 
@@ -1447,7 +1404,6 @@ type=TsunamiIO
 frequency=976562500
 pio_addr=8804615847936
 pio_latency=1000
-platform=testsys.tsunami
 system=testsys
 time=Thu Jan  1 00:00:00 2009
 tsunami=testsys.tsunami
@@ -1458,7 +1414,6 @@ pio=testsys.iobus.port[23]
 type=TsunamiPChip
 pio_addr=8802535473152
 pio_latency=1000
-platform=testsys.tsunami
 system=testsys
 tsunami=testsys.tsunami
 pio=testsys.iobus.port[2]
diff --git a/tests/quick/fs/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/simout b/tests/quick/fs/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/simout
index d1174531e..ca565fefc 100755
--- a/tests/quick/fs/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/simout
+++ b/tests/quick/fs/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/simout
@@ -1,13 +1,11 @@
 gem5 Simulator System.  http://gem5.org
 gem5 is copyrighted software; use the --copyright option for details.
 
-gem5 compiled Jan 23 2012 03:53:29
-gem5 started Jan 23 2012 04:23:10
+gem5 compiled Feb 11 2012 13:05:17
+gem5 started Feb 11 2012 13:10:02
 gem5 executing on zizzer
-command line: build/ALPHA_FS/gem5.opt -d build/ALPHA_FS/tests/opt/quick/80.netperf-stream/alpha/linux/twosys-tsunami-simple-atomic -re tests/run.py build/ALPHA_FS/tests/opt/quick/80.netperf-stream/alpha/linux/twosys-tsunami-simple-atomic
+command line: build/ALPHA/gem5.fast -d build/ALPHA/tests/fast/quick/fs/80.netperf-stream/alpha/linux/twosys-tsunami-simple-atomic -re tests/run.py build/ALPHA/tests/fast/quick/fs/80.netperf-stream/alpha/linux/twosys-tsunami-simple-atomic
 Global frequency set at 1000000000000 ticks per second
-      0: testsys.tsunami.io.rtc: Real-time clock set to Thu Jan  1 00:00:00 2009
-      0: drivesys.tsunami.io.rtc: Real-time clock set to Thu Jan  1 00:00:00 2009
 info: kernel located at: /dist/m5/system/binaries/vmlinux
 info: kernel located at: /dist/m5/system/binaries/vmlinux
 info: Entering event queue @ 0.  Starting simulation...
diff --git a/tests/quick/fs/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/stats.txt b/tests/quick/fs/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/stats.txt
index c3a385a95..4f6f5ddfe 100644
--- a/tests/quick/fs/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/stats.txt
+++ b/tests/quick/fs/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/stats.txt
@@ -4,11 +4,13 @@ sim_seconds                                  0.200001                       # Nu
 sim_ticks                                200000789468                       # Number of ticks simulated
 final_tick                               4300236018046                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                 1000000000000                       # Frequency of simulated ticks
-host_inst_rate                              201516796                       # Simulator instruction rate (inst/s)
-host_tick_rate                           147427543497                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 479620                       # Number of bytes of host memory used
-host_seconds                                     1.36                       # Real time elapsed on the host
+host_inst_rate                              238054601                       # Simulator instruction rate (inst/s)
+host_op_rate                                238047910                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                           174152914765                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 476544                       # Number of bytes of host memory used
+host_seconds                                     1.15                       # Real time elapsed on the host
 sim_insts                                   273374833                       # Number of instructions simulated
+sim_ops                                     273374833                       # Number of ops (including micro ops) simulated
 testsys.physmem.bytes_read                   19104208                       # Number of bytes read from this memory
 testsys.physmem.bytes_inst_read              14257548                       # Number of instructions bytes read from this memory
 testsys.physmem.bytes_written                 3887982                       # Number of bytes written to this memory
@@ -66,7 +68,8 @@ testsys.cpu.itb.data_accesses                       0                       # DT
 testsys.cpu.numCycles                    199569460393                       # number of cpu cycles simulated
 testsys.cpu.numWorkItemsStarted                     0                       # number of work items this cpu started
 testsys.cpu.numWorkItemsCompleted                   0                       # number of work items this cpu completed
-testsys.cpu.num_insts                         3560411                       # Number of instructions executed
+testsys.cpu.committedInsts                    3560411                       # Number of instructions committed
+testsys.cpu.committedOps                      3560411                       # Number of ops (including micro ops) committed
 testsys.cpu.num_int_alu_accesses              3348322                       # Number of integer alu accesses
 testsys.cpu.num_fp_alu_accesses                 17380                       # Number of float alu accesses
 testsys.cpu.num_func_calls                     107994                       # number of times a function call or return occured
@@ -258,7 +261,8 @@ drivesys.cpu.itb.data_accesses                      0                       # DT
 drivesys.cpu.numCycles                   199571362884                       # number of cpu cycles simulated
 drivesys.cpu.numWorkItemsStarted                    0                       # number of work items this cpu started
 drivesys.cpu.numWorkItemsCompleted                  0                       # number of work items this cpu completed
-drivesys.cpu.num_insts                        1958129                       # Number of instructions executed
+drivesys.cpu.committedInsts                   1958129                       # Number of instructions committed
+drivesys.cpu.committedOps                     1958129                       # Number of ops (including micro ops) committed
 drivesys.cpu.num_int_alu_accesses             1889973                       # Number of integer alu accesses
 drivesys.cpu.num_fp_alu_accesses                 1278                       # Number of float alu accesses
 drivesys.cpu.num_func_calls                    121650                       # number of times a function call or return occured
@@ -391,11 +395,13 @@ sim_seconds                                  0.000001                       # Nu
 sim_ticks                                      785978                       # Number of ticks simulated
 final_tick                               4300236804024                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                 1000000000000                       # Frequency of simulated ticks
-host_inst_rate                           864513825905                       # Simulator instruction rate (inst/s)
-host_tick_rate                             2363296319                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 479620                       # Number of bytes of host memory used
+host_inst_rate                           826237832724                       # Simulator instruction rate (inst/s)
+host_op_rate                             785322914063                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                             2155916043                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 476544                       # Number of bytes of host memory used
 host_seconds                                     0.00                       # Real time elapsed on the host
 sim_insts                                   273374833                       # Number of instructions simulated
+sim_ops                                     273374833                       # Number of ops (including micro ops) simulated
 testsys.physmem.bytes_read                          0                       # Number of bytes read from this memory
 testsys.physmem.bytes_inst_read                     0                       # Number of instructions bytes read from this memory
 testsys.physmem.bytes_written                       0                       # Number of bytes written to this memory
@@ -449,7 +455,8 @@ testsys.cpu.itb.data_accesses                       0                       # DT
 testsys.cpu.numCycles                               0                       # number of cpu cycles simulated
 testsys.cpu.numWorkItemsStarted                     0                       # number of work items this cpu started
 testsys.cpu.numWorkItemsCompleted                   0                       # number of work items this cpu completed
-testsys.cpu.num_insts                               0                       # Number of instructions executed
+testsys.cpu.committedInsts                          0                       # Number of instructions committed
+testsys.cpu.committedOps                            0                       # Number of ops (including micro ops) committed
 testsys.cpu.num_int_alu_accesses                    0                       # Number of integer alu accesses
 testsys.cpu.num_fp_alu_accesses                     0                       # Number of float alu accesses
 testsys.cpu.num_func_calls                          0                       # number of times a function call or return occured
@@ -568,7 +575,8 @@ drivesys.cpu.itb.data_accesses                      0                       # DT
 drivesys.cpu.numCycles                              0                       # number of cpu cycles simulated
 drivesys.cpu.numWorkItemsStarted                    0                       # number of work items this cpu started
 drivesys.cpu.numWorkItemsCompleted                  0                       # number of work items this cpu completed
-drivesys.cpu.num_insts                              0                       # Number of instructions executed
+drivesys.cpu.committedInsts                         0                       # Number of instructions committed
+drivesys.cpu.committedOps                           0                       # Number of ops (including micro ops) committed
 drivesys.cpu.num_int_alu_accesses                   0                       # Number of integer alu accesses
 drivesys.cpu.num_fp_alu_accesses                    0                       # Number of float alu accesses
 drivesys.cpu.num_func_calls                         0                       # number of times a function call or return occured