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

3 files changed, 32 insertions, 46 deletions

diff --git a/tests/long/fs/80.solaris-boot/ref/sparc/solaris/t1000-simple-atomic/config.ini b/tests/long/fs/80.solaris-boot/ref/sparc/solaris/t1000-simple-atomic/config.ini
index 409b736b6..490c0c72f 100644
--- a/tests/long/fs/80.solaris-boot/ref/sparc/solaris/t1000-simple-atomic/config.ini
+++ b/tests/long/fs/80.solaris-boot/ref/sparc/solaris/t1000-simple-atomic/config.ini
@@ -1,6 +1,7 @@
 [root]
 type=Root
 children=system
+full_system=true
 time_sync_enable=false
 time_sync_period=200000000
 time_sync_spin_threshold=200000
@@ -8,7 +9,6 @@ time_sync_spin_threshold=200000
 [system]
 type=SparcSystem
 children=bridge cpu disk0 hypervisor_desc intrctrl iobus membus nvram partition_desc physmem physmem2 rom t1000
-boot_cpu_frequency=1
 boot_osflags=a
 hypervisor_addr=1099243257856
 hypervisor_bin=/dist/m5/system/binaries/q_new.bin
@@ -19,7 +19,7 @@ init_param=0
 kernel=
 load_addr_mask=1099511627775
 mem_mode=atomic
-memories=system.physmem2 system.nvram system.partition_desc system.rom system.physmem system.hypervisor_desc
+memories=system.rom system.hypervisor_desc system.physmem2 system.nvram system.physmem system.partition_desc
 num_work_ids=16
 nvram=system.nvram
 nvram_addr=133429198848
@@ -83,6 +83,7 @@ simulate_inst_stalls=false
 system=system
 tracer=system.cpu.tracer
 width=1
+workload=
 dcache_port=system.membus.port[11]
 icache_port=system.membus.port[10]
 
@@ -106,7 +107,6 @@ children=image
 image=system.disk0.image
 pio_addr=134217728000
 pio_latency=2
-platform=system.t1000
 system=system
 pio=system.iobus.port[15]
 
@@ -165,7 +165,6 @@ fake_mem=false
 pio_addr=0
 pio_latency=2
 pio_size=8
-platform=system.t1000
 ret_bad_addr=true
 ret_data16=65535
 ret_data32=4294967295
@@ -238,7 +237,6 @@ fake_mem=false
 pio_addr=644245094400
 pio_latency=2
 pio_size=4294967296
-platform=system.t1000
 ret_bad_addr=false
 ret_data16=65535
 ret_data32=4294967295
@@ -255,7 +253,6 @@ fake_mem=false
 pio_addr=549755813888
 pio_latency=2
 pio_size=4294967296
-platform=system.t1000
 ret_bad_addr=false
 ret_data16=65535
 ret_data32=4294967295
@@ -272,7 +269,6 @@ fake_mem=false
 pio_addr=725849473024
 pio_latency=2
 pio_size=8
-platform=system.t1000
 ret_bad_addr=false
 ret_data16=65535
 ret_data32=4294967295
@@ -289,7 +285,6 @@ fake_mem=false
 pio_addr=725849473088
 pio_latency=2
 pio_size=8
-platform=system.t1000
 ret_bad_addr=false
 ret_data16=65535
 ret_data32=4294967295
@@ -306,7 +301,6 @@ fake_mem=false
 pio_addr=725849473152
 pio_latency=2
 pio_size=8
-platform=system.t1000
 ret_bad_addr=false
 ret_data16=65535
 ret_data32=4294967295
@@ -323,7 +317,6 @@ fake_mem=false
 pio_addr=725849473216
 pio_latency=2
 pio_size=8
-platform=system.t1000
 ret_bad_addr=false
 ret_data16=65535
 ret_data32=4294967295
@@ -340,7 +333,6 @@ fake_mem=false
 pio_addr=734439407616
 pio_latency=2
 pio_size=8
-platform=system.t1000
 ret_bad_addr=false
 ret_data16=65535
 ret_data32=4294967295
@@ -357,7 +349,6 @@ fake_mem=false
 pio_addr=734439407680
 pio_latency=2
 pio_size=8
-platform=system.t1000
 ret_bad_addr=false
 ret_data16=65535
 ret_data32=4294967295
@@ -374,7 +365,6 @@ fake_mem=false
 pio_addr=734439407744
 pio_latency=2
 pio_size=8
-platform=system.t1000
 ret_bad_addr=false
 ret_data16=65535
 ret_data32=4294967295
@@ -391,7 +381,6 @@ fake_mem=false
 pio_addr=734439407808
 pio_latency=2
 pio_size=8
-platform=system.t1000
 ret_bad_addr=false
 ret_data16=65535
 ret_data32=4294967295
@@ -408,7 +397,6 @@ fake_mem=false
 pio_addr=648540061696
 pio_latency=2
 pio_size=16384
-platform=system.t1000
 ret_bad_addr=false
 ret_data16=65535
 ret_data32=4294967295
@@ -425,7 +413,6 @@ fake_mem=false
 pio_addr=1095216660480
 pio_latency=2
 pio_size=268435456
-platform=system.t1000
 ret_bad_addr=false
 ret_data16=65535
 ret_data32=4294967295
@@ -447,7 +434,6 @@ port=3456
 type=DumbTOD
 pio_addr=1099255906296
 pio_latency=2
-platform=system.t1000
 system=system
 time=Thu Jan  1 00:00:00 2009
 pio=system.membus.port[1]
diff --git a/tests/long/fs/80.solaris-boot/ref/sparc/solaris/t1000-simple-atomic/simout b/tests/long/fs/80.solaris-boot/ref/sparc/solaris/t1000-simple-atomic/simout
index d81b5c20f..c2315f7a1 100755
--- a/tests/long/fs/80.solaris-boot/ref/sparc/solaris/t1000-simple-atomic/simout
+++ b/tests/long/fs/80.solaris-boot/ref/sparc/solaris/t1000-simple-atomic/simout
@@ -1,14 +1,11 @@
 gem5 Simulator System.  http://gem5.org
 gem5 is copyrighted software; use the --copyright option for details.
 
-gem5 compiled Jan 23 2012 04:05:05
-gem5 started Jan 23 2012 06:26:23
+gem5 compiled Feb 11 2012 13:08:33
+gem5 started Feb 11 2012 14:02:46
 gem5 executing on zizzer
-command line: build/SPARC_FS/gem5.opt -d build/SPARC_FS/tests/opt/long/80.solaris-boot/sparc/solaris/t1000-simple-atomic -re tests/run.py build/SPARC_FS/tests/opt/long/80.solaris-boot/sparc/solaris/t1000-simple-atomic
+command line: build/SPARC/gem5.fast -d build/SPARC/tests/fast/long/fs/80.solaris-boot/sparc/solaris/t1000-simple-atomic -re tests/run.py build/SPARC/tests/fast/long/fs/80.solaris-boot/sparc/solaris/t1000-simple-atomic
 Global frequency set at 2000000000 ticks per second
-      0: system.t1000.htod: Real-time clock set to Thu Jan  1 00:00:00 2009
-
-      0: system.t1000.htod: Real-time clock set to 1230768000
 info: No kernel set for full system simulation. Assuming you know what you're doing...
 info: Entering event queue @ 0.  Starting simulation...
 info: Ignoring write to SPARC ERROR regsiter
diff --git a/tests/long/fs/80.solaris-boot/ref/sparc/solaris/t1000-simple-atomic/stats.txt b/tests/long/fs/80.solaris-boot/ref/sparc/solaris/t1000-simple-atomic/stats.txt
index 21a50a501..26c5818ca 100644
--- a/tests/long/fs/80.solaris-boot/ref/sparc/solaris/t1000-simple-atomic/stats.txt
+++ b/tests/long/fs/80.solaris-boot/ref/sparc/solaris/t1000-simple-atomic/stats.txt
@@ -4,11 +4,13 @@ sim_seconds                                  1.116889                       # Nu
 sim_ticks                                  2233777512                       # Number of ticks simulated
 final_tick                                 2233777512                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                   2000000000                       # Frequency of simulated ticks
-host_inst_rate                                3505728                       # Simulator instruction rate (inst/s)
-host_tick_rate                                3512989                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 500940                       # Number of bytes of host memory used
-host_seconds                                   635.86                       # Real time elapsed on the host
-sim_insts                                  2229160714                       # Number of instructions simulated
+host_inst_rate                                4520258                       # Simulator instruction rate (inst/s)
+host_op_rate                                  4522035                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                                4531400                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 500812                       # Number of bytes of host memory used
+host_seconds                                   492.96                       # Real time elapsed on the host
+sim_insts                                  2228284650                       # Number of instructions simulated
+sim_ops                                    2229160714                       # Number of ops (including micro ops) simulated
 system.hypervisor_desc.bytes_read               16792                       # Number of bytes read from this memory
 system.hypervisor_desc.bytes_inst_read              0                       # Number of instructions bytes read from this memory
 system.hypervisor_desc.bytes_written                0                       # Number of bytes written to this memory
@@ -17,6 +19,15 @@ system.hypervisor_desc.num_writes                   0                       # Nu
 system.hypervisor_desc.num_other                    0                       # Number of other requests responded to by this memory
 system.hypervisor_desc.bw_read                  15035                       # Total read bandwidth from this memory (bytes/s)
 system.hypervisor_desc.bw_total                 15035                       # Total bandwidth to/from this memory (bytes/s)
+system.rom.bytes_read                         1128688                       # Number of bytes read from this memory
+system.rom.bytes_inst_read                     432296                       # Number of instructions bytes read from this memory
+system.rom.bytes_written                            0                       # Number of bytes written to this memory
+system.rom.num_reads                           195123                       # Number of read requests responded to by this memory
+system.rom.num_writes                               0                       # Number of write requests responded to by this memory
+system.rom.num_other                                0                       # Number of other requests responded to by this memory
+system.rom.bw_read                            1010564                       # Total read bandwidth from this memory (bytes/s)
+system.rom.bw_inst_read                        387054                       # Instruction read bandwidth from this memory (bytes/s)
+system.rom.bw_total                           1010564                       # Total bandwidth to/from this memory (bytes/s)
 system.physmem2.bytes_read                 9813991967                       # Number of bytes read from this memory
 system.physmem2.bytes_inst_read            8318106840                       # Number of instructions bytes read from this memory
 system.physmem2.bytes_written               897268422                       # Number of bytes written to this memory
@@ -36,23 +47,6 @@ system.nvram.num_other                              0                       # Nu
 system.nvram.bw_read                              254                       # Total read bandwidth from this memory (bytes/s)
 system.nvram.bw_write                              82                       # Write bandwidth from this memory (bytes/s)
 system.nvram.bw_total                             337                       # Total bandwidth to/from this memory (bytes/s)
-system.partition_desc.bytes_read                 4846                       # Number of bytes read from this memory
-system.partition_desc.bytes_inst_read               0                       # Number of instructions bytes read from this memory
-system.partition_desc.bytes_written                 0                       # Number of bytes written to this memory
-system.partition_desc.num_reads                   608                       # Number of read requests responded to by this memory
-system.partition_desc.num_writes                    0                       # Number of write requests responded to by this memory
-system.partition_desc.num_other                     0                       # Number of other requests responded to by this memory
-system.partition_desc.bw_read                    4339                       # Total read bandwidth from this memory (bytes/s)
-system.partition_desc.bw_total                   4339                       # Total bandwidth to/from this memory (bytes/s)
-system.rom.bytes_read                         1128688                       # Number of bytes read from this memory
-system.rom.bytes_inst_read                     432296                       # Number of instructions bytes read from this memory
-system.rom.bytes_written                            0                       # Number of bytes written to this memory
-system.rom.num_reads                           195123                       # Number of read requests responded to by this memory
-system.rom.num_writes                               0                       # Number of write requests responded to by this memory
-system.rom.num_other                                0                       # Number of other requests responded to by this memory
-system.rom.bw_read                            1010564                       # Total read bandwidth from this memory (bytes/s)
-system.rom.bw_inst_read                        387054                       # Instruction read bandwidth from this memory (bytes/s)
-system.rom.bw_total                           1010564                       # Total bandwidth to/from this memory (bytes/s)
 system.physmem.bytes_read                   709825348                       # Number of bytes read from this memory
 system.physmem.bytes_inst_read              612291324                       # Number of instructions bytes read from this memory
 system.physmem.bytes_written                 15400223                       # Number of bytes written to this memory
@@ -63,10 +57,19 @@ system.physmem.bw_read                      635538091                       # To
 system.physmem.bw_inst_read                 548211557                       # Instruction read bandwidth from this memory (bytes/s)
 system.physmem.bw_write                      13788502                       # Write bandwidth from this memory (bytes/s)
 system.physmem.bw_total                     649326593                       # Total bandwidth to/from this memory (bytes/s)
+system.partition_desc.bytes_read                 4846                       # Number of bytes read from this memory
+system.partition_desc.bytes_inst_read               0                       # Number of instructions bytes read from this memory
+system.partition_desc.bytes_written                 0                       # Number of bytes written to this memory
+system.partition_desc.num_reads                   608                       # Number of read requests responded to by this memory
+system.partition_desc.num_writes                    0                       # Number of write requests responded to by this memory
+system.partition_desc.num_other                     0                       # Number of other requests responded to by this memory
+system.partition_desc.bw_read                    4339                       # Total read bandwidth from this memory (bytes/s)
+system.partition_desc.bw_total                   4339                       # Total bandwidth to/from this memory (bytes/s)
 system.cpu.numCycles                       2233777513                       # 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                       2229160714                       # Number of instructions executed
+system.cpu.committedInsts                  2228284650                       # Number of instructions committed
+system.cpu.committedOps                    2229160714                       # Number of ops (including micro ops) committed
 system.cpu.num_int_alu_accesses            1839325658                       # Number of integer alu accesses
 system.cpu.num_fp_alu_accesses               14608322                       # Number of float alu accesses
 system.cpu.num_func_calls                    44037246                       # number of times a function call or return occured