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/20.parser/ref/x86/linux/simple-atomic/stats.txt b/tests/long/20.parser/ref/x86/linux/simple-atomic/stats.txt
index c9073b3b2..4e0a10e13 100644
--- a/tests/long/20.parser/ref/x86/linux/simple-atomic/stats.txt
+++ b/tests/long/20.parser/ref/x86/linux/simple-atomic/stats.txt
@@ -2,12 +2,23 @@
 ---------- Begin Simulation Statistics ----------
 sim_seconds                                  0.885229                       # Number of seconds simulated
 sim_ticks                                885229360000                       # Number of ticks simulated
+final_tick                               885229360000                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                 1000000000000                       # Frequency of simulated ticks
-host_inst_rate                                1063398                       # Simulator instruction rate (inst/s)
-host_tick_rate                              615669149                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 237896                       # Number of bytes of host memory used
-host_seconds                                  1437.83                       # Real time elapsed on the host
+host_inst_rate                                2258239                       # Simulator instruction rate (inst/s)
+host_tick_rate                             1307438877                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 208528                       # Number of bytes of host memory used
+host_seconds                                   677.07                       # Real time elapsed on the host
 sim_insts                                  1528988757                       # Number of instructions simulated
+system.physmem.bytes_read                 10832432532                       # Number of bytes read from this memory
+system.physmem.bytes_inst_read             8546776872                       # Number of instructions bytes read from this memory
+system.physmem.bytes_written                991849460                       # Number of bytes written to this memory
+system.physmem.num_reads                   1452449298                       # Number of read requests responded to by this memory
+system.physmem.num_writes                   149160201                       # 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                    12236865406                       # Total read bandwidth from this memory (bytes/s)
+system.physmem.bw_inst_read                9654872803                       # Instruction read bandwidth from this memory (bytes/s)
+system.physmem.bw_write                    1120443475                       # Write bandwidth from this memory (bytes/s)
+system.physmem.bw_total                   13357308881                       # Total bandwidth to/from this memory (bytes/s)
 system.cpu.workload.num_syscalls                  551                       # Number of system calls
 system.cpu.numCycles                       1770458721                       # number of cpu cycles simulated
 system.cpu.numWorkItemsStarted                      0                       # number of work items this cpu started