stats: Cumulative stats update

This patch updates the stats to reflect the: 1) addition of the
internal queue in SimpleMemory, 2) moving of the memory class outside
FSConfig, 3) fixing up of the 2D vector printing format, 4) specifying
burst size and interface width for the DRAM instead of relying on
cache-line size, 5) performing merging in the DRAM controller write
buffer, and 6) fixing how idle cycles are counted in the atomic and
timing CPU models.

The main reason for bundling them up is to minimise the changeset
size.

2 files changed, 25 insertions, 24 deletions

diff --git a/tests/quick/se/70.tgen/ref/arm/linux/tgen-simple-dram/stats.txt b/tests/quick/se/70.tgen/ref/arm/linux/tgen-simple-dram/stats.txt
index ff9167bb3..4e4b75a44 100644
--- a/tests/quick/se/70.tgen/ref/arm/linux/tgen-simple-dram/stats.txt
+++ b/tests/quick/se/70.tgen/ref/arm/linux/tgen-simple-dram/stats.txt
@@ -4,9 +4,9 @@ sim_seconds                                  0.100000                       # Nu
 sim_ticks                                100000000000                       # Number of ticks simulated
 final_tick                               100000000000                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                 1000000000000                       # Frequency of simulated ticks
-host_tick_rate                            29067628326                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 231288                       # Number of bytes of host memory used
-host_seconds                                     3.44                       # Real time elapsed on the host
+host_tick_rate                            12102739985                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 228608                       # Number of bytes of host memory used
+host_seconds                                     8.26                       # Real time elapsed on the host
 system.physmem.bytes_read::cpu              213331136                       # Number of bytes read from this memory
 system.physmem.bytes_read::total            213331136                       # Number of bytes read from this memory
 system.physmem.num_reads::cpu                 3333299                       # Number of read requests responded to by this memory
@@ -15,14 +15,15 @@ system.physmem.bw_read::cpu                2133311360                       # To
 system.physmem.bw_read::total              2133311360                       # Total read bandwidth from this memory (bytes/s)
 system.physmem.bw_total::cpu               2133311360                       # Total bandwidth to/from this memory (bytes/s)
 system.physmem.bw_total::total             2133311360                       # Total bandwidth to/from this memory (bytes/s)
-system.physmem.readReqs                       3333300                       # Total number of read requests seen
-system.physmem.writeReqs                            0                       # Total number of write requests seen
-system.physmem.cpureqs                        3333300                       # Reqs generatd by CPU via cache - shady
+system.physmem.readReqs                       3333300                       # Total number of read requests accepted by DRAM controller
+system.physmem.writeReqs                            0                       # Total number of write requests accepted by DRAM controller
+system.physmem.readBursts                     3333300                       # Total number of DRAM read bursts. Each DRAM read request translates to either one or multiple DRAM read bursts
+system.physmem.writeBursts                          0                       # Total number of DRAM write bursts. Each DRAM write request translates to either one or multiple DRAM write bursts
 system.physmem.bytesRead                    213331136                       # Total number of bytes read from memory
 system.physmem.bytesWritten                         0                       # Total number of bytes written to memory
 system.physmem.bytesConsumedRd              213331136                       # bytesRead derated as per pkt->getSize()
 system.physmem.bytesConsumedWr                      0                       # bytesWritten derated as per pkt->getSize()
-system.physmem.servicedByWrQ                        0                       # Number of read reqs serviced by write Q
+system.physmem.servicedByWrQ                        0                       # Number of DRAM read bursts serviced by write Q
 system.physmem.neitherReadNorWrite                  0                       # Reqs where no action is needed
 system.physmem.perBankRdReqs::0                217600                       # Track reads on a per bank basis
 system.physmem.perBankRdReqs::1                217600                       # Track reads on a per bank basis
@@ -169,18 +170,15 @@ system.physmem.avgGap                        30000.29                       # Av
 system.membus.throughput                   2133311360                       # Throughput (bytes/s)
 system.membus.trans_dist::ReadReq             3333300                       # Transaction distribution
 system.membus.trans_dist::ReadResp            3333299                       # Transaction distribution
-system.membus.pkt_count_system.monitor-master      6666599                       # Packet count per connected master and slave (bytes)
-system.membus.pkt_count                       6666599                       # Packet count per connected master and slave (bytes)
-system.membus.tot_pkt_size_system.monitor-master    213331136                       # Cumulative packet size per connected master and slave (bytes)
-system.membus.tot_pkt_size                  213331136                       # Cumulative packet size per connected master and slave (bytes)
+system.membus.pkt_count_system.monitor-master::system.physmem.port      6666599                       # Packet count per connected master and slave (bytes)
+system.membus.pkt_count::total                6666599                       # Packet count per connected master and slave (bytes)
+system.membus.tot_pkt_size_system.monitor-master::system.physmem.port    213331136                       # Cumulative packet size per connected master and slave (bytes)
+system.membus.tot_pkt_size::total           213331136                       # Cumulative packet size per connected master and slave (bytes)
 system.membus.data_through_bus              213331136                       # Total data (bytes)
 system.membus.reqLayer0.occupancy          6333270000                       # Layer occupancy (ticks)
 system.membus.reqLayer0.utilization               6.3                       # Layer utilization (%)
 system.membus.respLayer0.occupancy        17184426300                       # Layer occupancy (ticks)
 system.membus.respLayer0.utilization             17.2                       # Layer utilization (%)
-system.cpu.numPackets                         3333300                       # Number of packets generated
-system.cpu.numRetries                               0                       # Number of retries
-system.cpu.retryTicks                               0                       # Time spent waiting due to back-pressure (ticks)
 system.monitor.readBurstLengthHist::samples      3333300                       # Histogram of burst lengths of transmitted packets
 system.monitor.readBurstLengthHist::mean           64                       # Histogram of burst lengths of transmitted packets
 system.monitor.readBurstLengthHist::gmean    64.000000                       # Histogram of burst lengths of transmitted packets
@@ -519,5 +517,8 @@ system.monitor.writeTransHist::17                   0      0.00%    100.00% # Hi
 system.monitor.writeTransHist::18                   0      0.00%    100.00% # Histogram of read transactions per sample period
 system.monitor.writeTransHist::19                   0      0.00%    100.00% # Histogram of read transactions per sample period
 system.monitor.writeTransHist::total              100                       # Histogram of read transactions per sample period
+system.cpu.numPackets                         3333300                       # Number of packets generated
+system.cpu.numRetries                               0                       # Number of retries
+system.cpu.retryTicks                               0                       # Time spent waiting due to back-pressure (ticks)
 
 ---------- End Simulation Statistics   ----------
diff --git a/tests/quick/se/70.tgen/ref/arm/linux/tgen-simple-mem/stats.txt b/tests/quick/se/70.tgen/ref/arm/linux/tgen-simple-mem/stats.txt
index 4db87dea6..14b3c1d80 100644
--- a/tests/quick/se/70.tgen/ref/arm/linux/tgen-simple-mem/stats.txt
+++ b/tests/quick/se/70.tgen/ref/arm/linux/tgen-simple-mem/stats.txt
@@ -4,9 +4,9 @@ sim_seconds                                  0.100000                       # Nu
 sim_ticks                                100000000000                       # Number of ticks simulated
 final_tick                               100000000000                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                 1000000000000                       # Frequency of simulated ticks
-host_tick_rate                            14083896029                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 231304                       # Number of bytes of host memory used
-host_seconds                                     7.10                       # Real time elapsed on the host
+host_tick_rate                             8032030639                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 228596                       # Number of bytes of host memory used
+host_seconds                                    12.45                       # Real time elapsed on the host
 system.physmem.bytes_read::cpu                     64                       # Number of bytes read from this memory
 system.physmem.bytes_read::total                   64                       # Number of bytes read from this memory
 system.physmem.bytes_written::cpu           213329152                       # Number of bytes written to this memory
@@ -26,18 +26,15 @@ system.membus.trans_dist::ReadReq                   1                       # Tr
 system.membus.trans_dist::ReadResp                  1                       # Transaction distribution
 system.membus.trans_dist::WriteReq            3333268                       # Transaction distribution
 system.membus.trans_dist::WriteResp           3333267                       # Transaction distribution
-system.membus.pkt_count_system.monitor-master      6666537                       # Packet count per connected master and slave (bytes)
-system.membus.pkt_count                       6666537                       # Packet count per connected master and slave (bytes)
-system.membus.tot_pkt_size_system.monitor-master    213329216                       # Cumulative packet size per connected master and slave (bytes)
-system.membus.tot_pkt_size                  213329216                       # Cumulative packet size per connected master and slave (bytes)
+system.membus.pkt_count_system.monitor-master::system.physmem.port      6666537                       # Packet count per connected master and slave (bytes)
+system.membus.pkt_count::total                6666537                       # Packet count per connected master and slave (bytes)
+system.membus.tot_pkt_size_system.monitor-master::system.physmem.port    213329216                       # Cumulative packet size per connected master and slave (bytes)
+system.membus.tot_pkt_size::total           213329216                       # Cumulative packet size per connected master and slave (bytes)
 system.membus.data_through_bus              213329216                       # Total data (bytes)
 system.membus.reqLayer0.occupancy         16666342328                       # Layer occupancy (ticks)
 system.membus.reqLayer0.utilization              16.7                       # Layer utilization (%)
 system.membus.respLayer0.occupancy         3333272000                       # Layer occupancy (ticks)
 system.membus.respLayer0.utilization              3.3                       # Layer utilization (%)
-system.cpu.numPackets                         3333269                       # Number of packets generated
-system.cpu.numRetries                               1                       # Number of retries
-system.cpu.retryTicks                            1672                       # Time spent waiting due to back-pressure (ticks)
 system.monitor.readBurstLengthHist::samples            1                       # Histogram of burst lengths of transmitted packets
 system.monitor.readBurstLengthHist::mean           64                       # Histogram of burst lengths of transmitted packets
 system.monitor.readBurstLengthHist::gmean    64.000000                       # Histogram of burst lengths of transmitted packets
@@ -376,5 +373,8 @@ system.monitor.writeTransHist::34816-36863            0      0.00%    100.00% #
 system.monitor.writeTransHist::36864-38911            0      0.00%    100.00% # Histogram of read transactions per sample period
 system.monitor.writeTransHist::38912-40959            0      0.00%    100.00% # Histogram of read transactions per sample period
 system.monitor.writeTransHist::total              100                       # Histogram of read transactions per sample period
+system.cpu.numPackets                         3333269                       # Number of packets generated
+system.cpu.numRetries                               1                       # Number of retries
+system.cpu.retryTicks                            1672                       # Time spent waiting due to back-pressure (ticks)
 
 ---------- End Simulation Statistics   ----------