stats: Update stats to reflect cache changes

4 files changed, 35 insertions, 43 deletions

diff --git a/tests/long/se/20.parser/ref/arm/linux/minor-timing/stats.txt b/tests/long/se/20.parser/ref/arm/linux/minor-timing/stats.txt
index e29c8c27b..a54a6c0d4 100644
--- a/tests/long/se/20.parser/ref/arm/linux/minor-timing/stats.txt
+++ b/tests/long/se/20.parser/ref/arm/linux/minor-timing/stats.txt
@@ -4,11 +4,11 @@ sim_seconds                                  0.366340                       # Nu
 sim_ticks                                366339500500                       # Number of ticks simulated
 final_tick                               366339500500                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                 1000000000000                       # Frequency of simulated ticks
-host_inst_rate                                 174606                       # Simulator instruction rate (inst/s)
-host_op_rate                                   189122                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                              126268215                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 309684                       # Number of bytes of host memory used
-host_seconds                                  2901.28                       # Real time elapsed on the host
+host_inst_rate                                 237525                       # Simulator instruction rate (inst/s)
+host_op_rate                                   257271                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                              171768388                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 317860                       # Number of bytes of host memory used
+host_seconds                                  2132.75                       # Real time elapsed on the host
 sim_insts                                   506582156                       # Number of instructions simulated
 sim_ops                                     548695379                       # Number of ops (including micro ops) simulated
 system.voltage_domain.voltage                       1                       # Voltage in Volts
@@ -824,17 +824,15 @@ system.cpu.toL2Bus.pkt_size_system.cpu.dcache.mem_side::system.cpu.l2cache.cpu_s
 system.cpu.toL2Bus.pkt_size::total          142850048                       # Cumulative packet size per connected master and slave (bytes)
 system.cpu.toL2Bus.snoops                           0                       # Total snoops (count)
 system.cpu.toL2Bus.snoop_fanout::samples      2232032                       # Request fanout histogram
-system.cpu.toL2Bus.snoop_fanout::mean               3                       # Request fanout histogram
+system.cpu.toL2Bus.snoop_fanout::mean               1                       # Request fanout histogram
 system.cpu.toL2Bus.snoop_fanout::stdev              0                       # Request fanout histogram
 system.cpu.toL2Bus.snoop_fanout::underflows            0      0.00%      0.00% # Request fanout histogram
 system.cpu.toL2Bus.snoop_fanout::0                  0      0.00%      0.00% # Request fanout histogram
-system.cpu.toL2Bus.snoop_fanout::1                  0      0.00%      0.00% # Request fanout histogram
-system.cpu.toL2Bus.snoop_fanout::2                  0      0.00%      0.00% # Request fanout histogram
-system.cpu.toL2Bus.snoop_fanout::3            2232032    100.00%    100.00% # Request fanout histogram
-system.cpu.toL2Bus.snoop_fanout::4                  0      0.00%    100.00% # Request fanout histogram
+system.cpu.toL2Bus.snoop_fanout::1            2232032    100.00%    100.00% # Request fanout histogram
+system.cpu.toL2Bus.snoop_fanout::2                  0      0.00%    100.00% # Request fanout histogram
 system.cpu.toL2Bus.snoop_fanout::overflows            0      0.00%    100.00% # Request fanout histogram
-system.cpu.toL2Bus.snoop_fanout::min_value            3                       # Request fanout histogram
-system.cpu.toL2Bus.snoop_fanout::max_value            3                       # Request fanout histogram
+system.cpu.toL2Bus.snoop_fanout::min_value            1                       # Request fanout histogram
+system.cpu.toL2Bus.snoop_fanout::max_value            1                       # Request fanout histogram
 system.cpu.toL2Bus.snoop_fanout::total        2232032                       # Request fanout histogram
 system.cpu.toL2Bus.reqLayer0.occupancy     2184563000                       # Layer occupancy (ticks)
 system.cpu.toL2Bus.reqLayer0.utilization          0.6                       # Layer utilization (%)
diff --git a/tests/long/se/20.parser/ref/arm/linux/o3-timing/stats.txt b/tests/long/se/20.parser/ref/arm/linux/o3-timing/stats.txt
index f6e4f2ecd..12498d68b 100644
--- a/tests/long/se/20.parser/ref/arm/linux/o3-timing/stats.txt
+++ b/tests/long/se/20.parser/ref/arm/linux/o3-timing/stats.txt
@@ -4,11 +4,11 @@ sim_seconds                                  0.233457                       # Nu
 sim_ticks                                233457400500                       # Number of ticks simulated
 final_tick                               233457400500                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                 1000000000000                       # Frequency of simulated ticks
-host_inst_rate                                 105147                       # Simulator instruction rate (inst/s)
-host_op_rate                                   113911                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                               48585649                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 312624                       # Number of bytes of host memory used
-host_seconds                                  4805.07                       # Real time elapsed on the host
+host_inst_rate                                 140578                       # Simulator instruction rate (inst/s)
+host_op_rate                                   152296                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                               64957541                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 319412                       # Number of bytes of host memory used
+host_seconds                                  3594.00                       # Real time elapsed on the host
 sim_insts                                   505237724                       # Number of instructions simulated
 sim_ops                                     547350945                       # Number of ops (including micro ops) simulated
 system.voltage_domain.voltage                       1                       # Voltage in Volts
@@ -1159,17 +1159,15 @@ system.cpu.toL2Bus.pkt_size_system.cpu.dcache.mem_side::system.cpu.l2cache.cpu_s
 system.cpu.toL2Bus.pkt_size::total          335917632                       # Cumulative packet size per connected master and slave (bytes)
 system.cpu.toL2Bus.snoops                      317126                       # Total snoops (count)
 system.cpu.toL2Bus.snoop_fanout::samples      5565869                       # Request fanout histogram
-system.cpu.toL2Bus.snoop_fanout::mean        3.056971                       # Request fanout histogram
+system.cpu.toL2Bus.snoop_fanout::mean        1.056971                       # Request fanout histogram
 system.cpu.toL2Bus.snoop_fanout::stdev       0.231787                       # Request fanout histogram
 system.cpu.toL2Bus.snoop_fanout::underflows            0      0.00%      0.00% # Request fanout histogram
 system.cpu.toL2Bus.snoop_fanout::0                  0      0.00%      0.00% # Request fanout histogram
-system.cpu.toL2Bus.snoop_fanout::1                  0      0.00%      0.00% # Request fanout histogram
-system.cpu.toL2Bus.snoop_fanout::2                  0      0.00%      0.00% # Request fanout histogram
-system.cpu.toL2Bus.snoop_fanout::3            5248777     94.30%     94.30% # Request fanout histogram
-system.cpu.toL2Bus.snoop_fanout::4             317092      5.70%    100.00% # Request fanout histogram
+system.cpu.toL2Bus.snoop_fanout::1            5248777     94.30%     94.30% # Request fanout histogram
+system.cpu.toL2Bus.snoop_fanout::2             317092      5.70%    100.00% # Request fanout histogram
 system.cpu.toL2Bus.snoop_fanout::overflows            0      0.00%    100.00% # Request fanout histogram
-system.cpu.toL2Bus.snoop_fanout::min_value            3                       # Request fanout histogram
-system.cpu.toL2Bus.snoop_fanout::max_value            4                       # Request fanout histogram
+system.cpu.toL2Bus.snoop_fanout::min_value            1                       # Request fanout histogram
+system.cpu.toL2Bus.snoop_fanout::max_value            2                       # Request fanout histogram
 system.cpu.toL2Bus.snoop_fanout::total        5565869                       # Request fanout histogram
 system.cpu.toL2Bus.reqLayer0.occupancy     4977148500                       # Layer occupancy (ticks)
 system.cpu.toL2Bus.reqLayer0.utilization          2.1                       # Layer utilization (%)
diff --git a/tests/long/se/20.parser/ref/arm/linux/simple-atomic/stats.txt b/tests/long/se/20.parser/ref/arm/linux/simple-atomic/stats.txt
index 7518311dc..04541cf46 100644
--- a/tests/long/se/20.parser/ref/arm/linux/simple-atomic/stats.txt
+++ b/tests/long/se/20.parser/ref/arm/linux/simple-atomic/stats.txt
@@ -4,11 +4,11 @@ sim_seconds                                  0.279362                       # Nu
 sim_ticks                                279362298000                       # Number of ticks simulated
 final_tick                               279362298000                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                 1000000000000                       # Frequency of simulated ticks
-host_inst_rate                                1382525                       # Simulator instruction rate (inst/s)
-host_op_rate                                  1497457                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                              762414599                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 298924                       # Number of bytes of host memory used
-host_seconds                                   366.42                       # Real time elapsed on the host
+host_inst_rate                                1944100                       # Simulator instruction rate (inst/s)
+host_op_rate                                  2105717                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                             1072104103                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 306580                       # Number of bytes of host memory used
+host_seconds                                   260.57                       # Real time elapsed on the host
 sim_insts                                   506581608                       # Number of instructions simulated
 sim_ops                                     548694829                       # Number of ops (including micro ops) simulated
 system.voltage_domain.voltage                       1                       # Voltage in Volts
@@ -230,16 +230,14 @@ system.membus.pkt_size_system.cpu.dcache_port::system.physmem.port    638920325
 system.membus.pkt_size::total              2705365829                       # Cumulative packet size per connected master and slave (bytes)
 system.membus.snoops                                0                       # Total snoops (count)
 system.membus.snoop_fanout::samples         687930750                       # Request fanout histogram
-system.membus.snoop_fanout::mean             2.750964                       # Request fanout histogram
+system.membus.snoop_fanout::mean             0.750964                       # Request fanout histogram
 system.membus.snoop_fanout::stdev            0.432455                       # Request fanout histogram
 system.membus.snoop_fanout::underflows              0      0.00%      0.00% # Request fanout histogram
-system.membus.snoop_fanout::0                       0      0.00%      0.00% # Request fanout histogram
-system.membus.snoop_fanout::1                       0      0.00%      0.00% # Request fanout histogram
-system.membus.snoop_fanout::2               171319374     24.90%     24.90% # Request fanout histogram
-system.membus.snoop_fanout::3               516611376     75.10%    100.00% # Request fanout histogram
+system.membus.snoop_fanout::0               171319374     24.90%     24.90% # Request fanout histogram
+system.membus.snoop_fanout::1               516611376     75.10%    100.00% # Request fanout histogram
 system.membus.snoop_fanout::overflows               0      0.00%    100.00% # Request fanout histogram
-system.membus.snoop_fanout::min_value               2                       # Request fanout histogram
-system.membus.snoop_fanout::max_value               3                       # Request fanout histogram
+system.membus.snoop_fanout::min_value               0                       # Request fanout histogram
+system.membus.snoop_fanout::max_value               1                       # Request fanout histogram
 system.membus.snoop_fanout::total           687930750                       # Request fanout histogram
 
 ---------- End Simulation Statistics   ----------
diff --git a/tests/long/se/20.parser/ref/arm/linux/simple-timing/stats.txt b/tests/long/se/20.parser/ref/arm/linux/simple-timing/stats.txt
index 93937d49d..5ab6bd474 100644
--- a/tests/long/se/20.parser/ref/arm/linux/simple-timing/stats.txt
+++ b/tests/long/se/20.parser/ref/arm/linux/simple-timing/stats.txt
@@ -593,17 +593,15 @@ system.cpu.toL2Bus.pkt_size_system.cpu.dcache.mem_side::system.cpu.l2cache.cpu_s
 system.cpu.toL2Bus.pkt_size::total          141782016                       # Cumulative packet size per connected master and slave (bytes)
 system.cpu.toL2Bus.snoops                           0                       # Total snoops (count)
 system.cpu.toL2Bus.snoop_fanout::samples      2215344                       # Request fanout histogram
-system.cpu.toL2Bus.snoop_fanout::mean               3                       # Request fanout histogram
+system.cpu.toL2Bus.snoop_fanout::mean               1                       # Request fanout histogram
 system.cpu.toL2Bus.snoop_fanout::stdev              0                       # Request fanout histogram
 system.cpu.toL2Bus.snoop_fanout::underflows            0      0.00%      0.00% # Request fanout histogram
 system.cpu.toL2Bus.snoop_fanout::0                  0      0.00%      0.00% # Request fanout histogram
-system.cpu.toL2Bus.snoop_fanout::1                  0      0.00%      0.00% # Request fanout histogram
-system.cpu.toL2Bus.snoop_fanout::2                  0      0.00%      0.00% # Request fanout histogram
-system.cpu.toL2Bus.snoop_fanout::3            2215344    100.00%    100.00% # Request fanout histogram
-system.cpu.toL2Bus.snoop_fanout::4                  0      0.00%    100.00% # Request fanout histogram
+system.cpu.toL2Bus.snoop_fanout::1            2215344    100.00%    100.00% # Request fanout histogram
+system.cpu.toL2Bus.snoop_fanout::2                  0      0.00%    100.00% # Request fanout histogram
 system.cpu.toL2Bus.snoop_fanout::overflows            0      0.00%    100.00% # Request fanout histogram
-system.cpu.toL2Bus.snoop_fanout::min_value            3                       # Request fanout histogram
-system.cpu.toL2Bus.snoop_fanout::max_value            3                       # Request fanout histogram
+system.cpu.toL2Bus.snoop_fanout::min_value            1                       # Request fanout histogram
+system.cpu.toL2Bus.snoop_fanout::max_value            1                       # Request fanout histogram
 system.cpu.toL2Bus.snoop_fanout::total        2215344                       # Request fanout histogram
 system.cpu.toL2Bus.reqLayer0.occupancy     2172577000                       # Layer occupancy (ticks)
 system.cpu.toL2Bus.reqLayer0.utilization          0.3                       # Layer utilization (%)