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

3 files changed, 31 insertions, 20 deletions

diff --git a/tests/long/se/60.bzip2/ref/arm/linux/simple-atomic/config.ini b/tests/long/se/60.bzip2/ref/arm/linux/simple-atomic/config.ini
index e2f8298fd..b103ca45f 100644
--- a/tests/long/se/60.bzip2/ref/arm/linux/simple-atomic/config.ini
+++ b/tests/long/se/60.bzip2/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/60.bzip2/ref/arm/linux/simple-atomic/simout b/tests/long/se/60.bzip2/ref/arm/linux/simple-atomic/simout
index 89e0dc3cd..4559b3892 100755
--- a/tests/long/se/60.bzip2/ref/arm/linux/simple-atomic/simout
+++ b/tests/long/se/60.bzip2/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:48:29
-gem5 executing on piton
+gem5 compiled Jun  4 2012 12:14:06
+gem5 started Jun  4 2012 18:41:45
+gem5 executing on zizzer
 command line: build/ARM/gem5.opt -d build/ARM/tests/opt/long/se/60.bzip2/arm/linux/simple-atomic -re tests/run.py build/ARM/tests/opt/long/se/60.bzip2/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/60.bzip2/ref/arm/linux/simple-atomic/stats.txt b/tests/long/se/60.bzip2/ref/arm/linux/simple-atomic/stats.txt
index 991f53624..6c3e8b909 100644
--- a/tests/long/se/60.bzip2/ref/arm/linux/simple-atomic/stats.txt
+++ b/tests/long/se/60.bzip2/ref/arm/linux/simple-atomic/stats.txt
@@ -4,23 +4,35 @@ sim_seconds                                  0.861538                       # Nu
 sim_ticks                                861538205000                       # Number of ticks simulated
 final_tick                               861538205000                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                 1000000000000                       # Frequency of simulated ticks
-host_inst_rate                                1163959                       # Simulator instruction rate (inst/s)
-host_op_rate                                  1298482                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                              649242111                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 220952                       # Number of bytes of host memory used
-host_seconds                                  1326.99                       # Real time elapsed on the host
+host_inst_rate                                2187855                       # Simulator instruction rate (inst/s)
+host_op_rate                                  2440714                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                             1220358665                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 221416                       # Number of bytes of host memory used
+host_seconds                                   705.97                       # Real time elapsed on the host
 sim_insts                                  1544563049                       # Number of instructions simulated
 sim_ops                                    1723073862                       # Number of ops (including micro ops) simulated
-system.physmem.bytes_read                  7759650064                       # Number of bytes read from this memory
-system.physmem.bytes_inst_read             6178262392                       # Number of instructions bytes read from this memory
-system.physmem.bytes_written                624158392                       # Number of bytes written to this memory
-system.physmem.num_reads                   2026949786                       # Number of read requests responded to by this memory
-system.physmem.num_writes                   172586108                       # 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                     9006739363                       # Total read bandwidth from this memory (bytes/s)
-system.physmem.bw_inst_read                7171199555                       # Instruction read bandwidth from this memory (bytes/s)
-system.physmem.bw_write                     724469778                       # Write bandwidth from this memory (bytes/s)
-system.physmem.bw_total                    9731209141                       # Total bandwidth to/from this memory (bytes/s)
+system.physmem.bytes_read::cpu.inst        6178262392                       # Number of bytes read from this memory
+system.physmem.bytes_read::cpu.data        1581387672                       # Number of bytes read from this memory
+system.physmem.bytes_read::total           7759650064                       # Number of bytes read from this memory
+system.physmem.bytes_inst_read::cpu.inst   6178262392                       # Number of instructions bytes read from this memory
+system.physmem.bytes_inst_read::total      6178262392                       # Number of instructions bytes read from this memory
+system.physmem.bytes_written::cpu.data      624158392                       # Number of bytes written to this memory
+system.physmem.bytes_written::total         624158392                       # Number of bytes written to this memory
+system.physmem.num_reads::cpu.inst         1544565598                       # Number of read requests responded to by this memory
+system.physmem.num_reads::cpu.data          482384188                       # Number of read requests responded to by this memory
+system.physmem.num_reads::total            2026949786                       # Number of read requests responded to by this memory
+system.physmem.num_writes::cpu.data         172586108                       # Number of write requests responded to by this memory
+system.physmem.num_writes::total            172586108                       # Number of write requests responded to by this memory
+system.physmem.bw_read::cpu.inst           7171199555                       # Total read bandwidth from this memory (bytes/s)
+system.physmem.bw_read::cpu.data           1835539809                       # Total read bandwidth from this memory (bytes/s)
+system.physmem.bw_read::total              9006739363                       # Total read bandwidth from this memory (bytes/s)
+system.physmem.bw_inst_read::cpu.inst      7171199555                       # Instruction read bandwidth from this memory (bytes/s)
+system.physmem.bw_inst_read::total         7171199555                       # Instruction read bandwidth from this memory (bytes/s)
+system.physmem.bw_write::cpu.data           724469778                       # Write bandwidth from this memory (bytes/s)
+system.physmem.bw_write::total              724469778                       # Write bandwidth from this memory (bytes/s)
+system.physmem.bw_total::cpu.inst          7171199555                       # Total bandwidth to/from this memory (bytes/s)
+system.physmem.bw_total::cpu.data          2560009587                       # Total bandwidth to/from this memory (bytes/s)
+system.physmem.bw_total::total             9731209141                       # 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