Merge with the main repo.

--HG--
rename : src/mem/vport.hh => src/mem/fs_translating_port_proxy.hh
rename : src/mem/translating_port.cc => src/mem/se_translating_port_proxy.cc
rename : src/mem/translating_port.hh => src/mem/se_translating_port_proxy.hh

1 files changed, 15 insertions, 4 deletions

diff --git a/tests/long/60.bzip2/ref/arm/linux/o3-timing/stats.txt b/tests/long/60.bzip2/ref/arm/linux/o3-timing/stats.txt
index 42652cb1d..bd2b3efef 100644
--- a/tests/long/60.bzip2/ref/arm/linux/o3-timing/stats.txt
+++ b/tests/long/60.bzip2/ref/arm/linux/o3-timing/stats.txt
@@ -2,12 +2,23 @@
 ---------- Begin Simulation Statistics ----------
 sim_seconds                                  0.483463                       # Number of seconds simulated
 sim_ticks                                483463019500                       # Number of ticks simulated
+final_tick                               483463019500                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                 1000000000000                       # Frequency of simulated ticks
-host_inst_rate                                 167165                       # Simulator instruction rate (inst/s)
-host_tick_rate                               46903472                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 214756                       # Number of bytes of host memory used
-host_seconds                                 10307.62                       # Real time elapsed on the host
+host_inst_rate                                 152421                       # Simulator instruction rate (inst/s)
+host_tick_rate                               42766664                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 220608                       # Number of bytes of host memory used
+host_seconds                                 11304.67                       # Real time elapsed on the host
 sim_insts                                  1723073849                       # Number of instructions simulated
+system.physmem.bytes_read                   188174592                       # Number of bytes read from this memory
+system.physmem.bytes_inst_read                  45888                       # Number of instructions bytes read from this memory
+system.physmem.bytes_written                 77926272                       # Number of bytes written to this memory
+system.physmem.num_reads                      2940228                       # Number of read requests responded to by this memory
+system.physmem.num_writes                     1217598                       # 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                      389222307                       # Total read bandwidth from this memory (bytes/s)
+system.physmem.bw_inst_read                     94915                       # Instruction read bandwidth from this memory (bytes/s)
+system.physmem.bw_write                     161183522                       # Write bandwidth from this memory (bytes/s)
+system.physmem.bw_total                     550405829                       # 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