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, 24 insertions, 4 deletions

diff --git a/tests/quick/10.linux-boot/ref/arm/linux/realview-simple-atomic/stats.txt b/tests/quick/10.linux-boot/ref/arm/linux/realview-simple-atomic/stats.txt
index c4ace942b..e3050fa31 100644
--- a/tests/quick/10.linux-boot/ref/arm/linux/realview-simple-atomic/stats.txt
+++ b/tests/quick/10.linux-boot/ref/arm/linux/realview-simple-atomic/stats.txt
@@ -2,12 +2,32 @@
 ---------- Begin Simulation Statistics ----------
 sim_seconds                                  2.332317                       # Number of seconds simulated
 sim_ticks                                2332316587000                       # Number of ticks simulated
+final_tick                               2332316587000                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                 1000000000000                       # Frequency of simulated ticks
-host_inst_rate                                1407778                       # Simulator instruction rate (inst/s)
-host_tick_rate                            42901571145                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 417476                       # Number of bytes of host memory used
-host_seconds                                    54.36                       # Real time elapsed on the host
+host_inst_rate                                2072038                       # Simulator instruction rate (inst/s)
+host_tick_rate                            63144661085                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 379208                       # Number of bytes of host memory used
+host_seconds                                    36.94                       # Real time elapsed on the host
 sim_insts                                    76532931                       # Number of instructions simulated
+system.nvmem.bytes_read                            20                       # Number of bytes read from this memory
+system.nvmem.bytes_inst_read                       20                       # Number of instructions bytes read from this memory
+system.nvmem.bytes_written                          0                       # Number of bytes written to this memory
+system.nvmem.num_reads                              5                       # Number of read requests responded to by this memory
+system.nvmem.num_writes                             0                       # Number of write requests responded to by this memory
+system.nvmem.num_other                              0                       # Number of other requests responded to by this memory
+system.nvmem.bw_read                                9                       # Total read bandwidth from this memory (bytes/s)
+system.nvmem.bw_inst_read                           9                       # Instruction read bandwidth from this memory (bytes/s)
+system.nvmem.bw_total                               9                       # Total bandwidth to/from this memory (bytes/s)
+system.physmem.bytes_read                   122663536                       # Number of bytes read from this memory
+system.physmem.bytes_inst_read                 941280                       # Number of instructions bytes read from this memory
+system.physmem.bytes_written                  9577800                       # Number of bytes written to this memory
+system.physmem.num_reads                     14137126                       # Number of read requests responded to by this memory
+system.physmem.num_writes                      856485                       # 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                       52593004                       # Total read bandwidth from this memory (bytes/s)
+system.physmem.bw_inst_read                    403582                       # Instruction read bandwidth from this memory (bytes/s)
+system.physmem.bw_write                       4106561                       # Write bandwidth from this memory (bytes/s)
+system.physmem.bw_total                      56699565                       # Total bandwidth to/from this memory (bytes/s)
 system.l2c.replacements                        116822                       # number of replacements
 system.l2c.tagsinuse                     24240.388378                       # Cycle average of tags in use
 system.l2c.total_refs                         1520830                       # Total number of references to valid blocks.