all: Update stats for memory per master and total fix.

3 files changed, 31 insertions, 20 deletions

diff --git a/tests/long/se/50.vortex/ref/arm/linux/simple-atomic/config.ini b/tests/long/se/50.vortex/ref/arm/linux/simple-atomic/config.ini
index 40b740299..311edc8c7 100644
--- a/tests/long/se/50.vortex/ref/arm/linux/simple-atomic/config.ini
+++ b/tests/long/se/50.vortex/ref/arm/linux/simple-atomic/config.ini
@@ -112,9 +112,8 @@ system=system
 uid=100
 
 [system.membus]
-type=Bus
+type=CoherentBus
 block_size=64
-bus_id=0
 clock=1000
 header_cycles=1
 use_default_range=false
diff --git a/tests/long/se/50.vortex/ref/arm/linux/simple-atomic/simout b/tests/long/se/50.vortex/ref/arm/linux/simple-atomic/simout
index 6e02c2f67..f1623eafd 100755
--- a/tests/long/se/50.vortex/ref/arm/linux/simple-atomic/simout
+++ b/tests/long/se/50.vortex/ref/arm/linux/simple-atomic/simout
@@ -1,9 +1,9 @@
 gem5 Simulator System.  http://gem5.org
 gem5 is copyrighted software; use the --copyright option for details.
 
-gem5 compiled May  8 2012 15:17:37
-gem5 started May  8 2012 16:44:19
-gem5 executing on piton
+gem5 compiled Jun  4 2012 12:14:06
+gem5 started Jun  4 2012 18:34:04
+gem5 executing on zizzer
 command line: build/ARM/gem5.opt -d build/ARM/tests/opt/long/se/50.vortex/arm/linux/simple-atomic -re tests/run.py build/ARM/tests/opt/long/se/50.vortex/arm/linux/simple-atomic
 Global frequency set at 1000000000000 ticks per second
 info: Entering event queue @ 0.  Starting simulation...
diff --git a/tests/long/se/50.vortex/ref/arm/linux/simple-atomic/stats.txt b/tests/long/se/50.vortex/ref/arm/linux/simple-atomic/stats.txt
index 015123589..b5b6453b4 100644
--- a/tests/long/se/50.vortex/ref/arm/linux/simple-atomic/stats.txt
+++ b/tests/long/se/50.vortex/ref/arm/linux/simple-atomic/stats.txt
@@ -4,23 +4,35 @@ sim_seconds                                  0.053932                       # Nu
 sim_ticks                                 53932162000                       # Number of ticks simulated
 final_tick                                53932162000                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                 1000000000000                       # Frequency of simulated ticks
-host_inst_rate                                 956394                       # Simulator instruction rate (inst/s)
-host_op_rate                                  1357212                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                              727373394                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 228240                       # Number of bytes of host memory used
-host_seconds                                    74.15                       # Real time elapsed on the host
+host_inst_rate                                1760373                       # Simulator instruction rate (inst/s)
+host_op_rate                                  2498132                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                             1338828629                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 228700                       # Number of bytes of host memory used
+host_seconds                                    40.28                       # Real time elapsed on the host
 sim_insts                                    70913189                       # Number of instructions simulated
 sim_ops                                     100632437                       # Number of ops (including micro ops) simulated
-system.physmem.bytes_read                   419153654                       # Number of bytes read from this memory
-system.physmem.bytes_inst_read              312580308                       # Number of instructions bytes read from this memory
-system.physmem.bytes_written                 78660211                       # Number of bytes written to this memory
-system.physmem.num_reads                    105301330                       # Number of read requests responded to by this memory
-system.physmem.num_writes                    19865820                       # Number of write requests responded to by this memory
-system.physmem.num_other                            0                       # Number of other requests responded to by this memory
-system.physmem.bw_read                     7771868185                       # Total read bandwidth from this memory (bytes/s)
-system.physmem.bw_inst_read                5795805256                       # Instruction read bandwidth from this memory (bytes/s)
-system.physmem.bw_write                    1458502832                       # Write bandwidth from this memory (bytes/s)
-system.physmem.bw_total                    9230371017                       # Total bandwidth to/from this memory (bytes/s)
+system.physmem.bytes_read::cpu.inst         312580308                       # Number of bytes read from this memory
+system.physmem.bytes_read::cpu.data         106573346                       # Number of bytes read from this memory
+system.physmem.bytes_read::total            419153654                       # Number of bytes read from this memory
+system.physmem.bytes_inst_read::cpu.inst    312580308                       # Number of instructions bytes read from this memory
+system.physmem.bytes_inst_read::total       312580308                       # Number of instructions bytes read from this memory
+system.physmem.bytes_written::cpu.data       78660211                       # Number of bytes written to this memory
+system.physmem.bytes_written::total          78660211                       # Number of bytes written to this memory
+system.physmem.num_reads::cpu.inst           78145077                       # Number of read requests responded to by this memory
+system.physmem.num_reads::cpu.data           27156253                       # Number of read requests responded to by this memory
+system.physmem.num_reads::total             105301330                       # Number of read requests responded to by this memory
+system.physmem.num_writes::cpu.data          19865820                       # Number of write requests responded to by this memory
+system.physmem.num_writes::total             19865820                       # Number of write requests responded to by this memory
+system.physmem.bw_read::cpu.inst           5795805256                       # Total read bandwidth from this memory (bytes/s)
+system.physmem.bw_read::cpu.data           1976062929                       # Total read bandwidth from this memory (bytes/s)
+system.physmem.bw_read::total              7771868185                       # Total read bandwidth from this memory (bytes/s)
+system.physmem.bw_inst_read::cpu.inst      5795805256                       # Instruction read bandwidth from this memory (bytes/s)
+system.physmem.bw_inst_read::total         5795805256                       # Instruction read bandwidth from this memory (bytes/s)
+system.physmem.bw_write::cpu.data          1458502832                       # Write bandwidth from this memory (bytes/s)
+system.physmem.bw_write::total             1458502832                       # Write bandwidth from this memory (bytes/s)
+system.physmem.bw_total::cpu.inst          5795805256                       # Total bandwidth to/from this memory (bytes/s)
+system.physmem.bw_total::cpu.data          3434565761                       # Total bandwidth to/from this memory (bytes/s)
+system.physmem.bw_total::total             9230371017                       # Total bandwidth to/from this memory (bytes/s)
 system.cpu.dtb.inst_hits                            0                       # ITB inst hits
 system.cpu.dtb.inst_misses                          0                       # ITB inst misses
 system.cpu.dtb.read_hits                            0                       # DTB read hits