stats: changes due to o3 cpu and ruby message buffer patches

9 files changed, 18 insertions, 29 deletions

diff --git a/tests/long/fs/10.linux-boot/ref/alpha/linux/tsunami-o3-dual/stats.txt b/tests/long/fs/10.linux-boot/ref/alpha/linux/tsunami-o3-dual/stats.txt
index 9c4d04cdf..5cabf17a2 100644
--- a/tests/long/fs/10.linux-boot/ref/alpha/linux/tsunami-o3-dual/stats.txt
+++ b/tests/long/fs/10.linux-boot/ref/alpha/linux/tsunami-o3-dual/stats.txt
@@ -1084,7 +1084,6 @@ system.cpu0.idleCycles                       39960467                       # To
 system.cpu0.quiesceCycles                  3695221845                       # Total number of cycles that CPU has spent quiesced or waiting for an interrupt
 system.cpu0.committedInsts                   48300626                       # Number of Instructions Simulated
 system.cpu0.committedOps                     48300626                       # Number of Ops (including micro ops) Simulated
-system.cpu0.committedInsts_total             48300626                       # Number of Instructions Simulated
 system.cpu0.cpi                              2.403165                       # CPI: Cycles Per Instruction
 system.cpu0.cpi_total                        2.403165                       # CPI: Total CPI of All Threads
 system.cpu0.ipc                              0.416118                       # IPC: Instructions Per Cycle
@@ -1819,7 +1818,6 @@ system.cpu1.idleCycles                         861019                       # To
 system.cpu1.quiesceCycles                  3795679739                       # Total number of cycles that CPU has spent quiesced or waiting for an interrupt
 system.cpu1.committedInsts                    8410372                       # Number of Instructions Simulated
 system.cpu1.committedOps                      8410372                       # Number of Ops (including micro ops) Simulated
-system.cpu1.committedInsts_total              8410372                       # Number of Instructions Simulated
 system.cpu1.cpi                              1.779309                       # CPI: Cycles Per Instruction
 system.cpu1.cpi_total                        1.779309                       # CPI: Total CPI of All Threads
 system.cpu1.ipc                              0.562016                       # IPC: Instructions Per Cycle
diff --git a/tests/long/fs/10.linux-boot/ref/alpha/linux/tsunami-o3/stats.txt b/tests/long/fs/10.linux-boot/ref/alpha/linux/tsunami-o3/stats.txt
index 272c07d73..eda12d3cf 100644
--- a/tests/long/fs/10.linux-boot/ref/alpha/linux/tsunami-o3/stats.txt
+++ b/tests/long/fs/10.linux-boot/ref/alpha/linux/tsunami-o3/stats.txt
@@ -765,7 +765,6 @@ system.cpu.idleCycles                        40774499                       # To
 system.cpu.quiesceCycles                   3598399845                       # Total number of cycles that CPU has spent quiesced or waiting for an interrupt
 system.cpu.committedInsts                    52979638                       # Number of Instructions Simulated
 system.cpu.committedOps                      52979638                       # Number of Ops (including micro ops) Simulated
-system.cpu.committedInsts_total              52979638                       # Number of Instructions Simulated
 system.cpu.cpi                               2.302193                       # CPI: Cycles Per Instruction
 system.cpu.cpi_total                         2.302193                       # CPI: Total CPI of All Threads
 system.cpu.ipc                               0.434368                       # IPC: Instructions Per Cycle
diff --git a/tests/long/fs/10.linux-boot/ref/alpha/linux/tsunami-switcheroo-full/stats.txt b/tests/long/fs/10.linux-boot/ref/alpha/linux/tsunami-switcheroo-full/stats.txt
index 14b9e6b0f..d0b0c157e 100644
--- a/tests/long/fs/10.linux-boot/ref/alpha/linux/tsunami-switcheroo-full/stats.txt
+++ b/tests/long/fs/10.linux-boot/ref/alpha/linux/tsunami-switcheroo-full/stats.txt
@@ -1854,7 +1854,6 @@ system.cpu2.idleCycles                        3893863                       # To
 system.cpu2.quiesceCycles                  1748379581                       # Total number of cycles that CPU has spent quiesced or waiting for an interrupt
 system.cpu2.committedInsts                   31517609                       # Number of Instructions Simulated
 system.cpu2.committedOps                     31517609                       # Number of Ops (including micro ops) Simulated
-system.cpu2.committedInsts_total             31517609                       # Number of Instructions Simulated
 system.cpu2.cpi                              0.994228                       # CPI: Cycles Per Instruction
 system.cpu2.cpi_total                        0.994228                       # CPI: Total CPI of All Threads
 system.cpu2.ipc                              1.005806                       # IPC: Instructions Per Cycle
diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-checker/stats.txt b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-checker/stats.txt
index 2c9e78fdf..7fa449dce 100644
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-checker/stats.txt
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-checker/stats.txt
@@ -918,7 +918,6 @@ system.cpu.idleCycles                       322801694                       # To
 system.cpu.quiesceCycles                   4575172520                       # Total number of cycles that CPU has spent quiesced or waiting for an interrupt
 system.cpu.committedInsts                    60309034                       # Number of Instructions Simulated
 system.cpu.committedOps                      77600502                       # Number of Ops (including micro ops) Simulated
-system.cpu.committedInsts_total              60309034                       # Number of Instructions Simulated
 system.cpu.cpi                               7.911400                       # CPI: Cycles Per Instruction
 system.cpu.cpi_total                         7.911400                       # CPI: Total CPI of All Threads
 system.cpu.ipc                               0.126400                       # IPC: Instructions Per Cycle
diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-dual/stats.txt b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-dual/stats.txt
index 97a804211..3626d40ac 100644
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-dual/stats.txt
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-dual/stats.txt
@@ -1338,7 +1338,6 @@ system.cpu0.idleCycles                       27854788                       # To
 system.cpu0.quiesceCycles                  5140997105                       # Total number of cycles that CPU has spent quiesced or waiting for an interrupt
 system.cpu0.committedInsts                   23990835                       # Number of Instructions Simulated
 system.cpu0.committedOps                     31708821                       # Number of Ops (including micro ops) Simulated
-system.cpu0.committedInsts_total             23990835                       # Number of Instructions Simulated
 system.cpu0.cpi                              2.928128                       # CPI: Cycles Per Instruction
 system.cpu0.cpi_total                        2.928128                       # CPI: Total CPI of All Threads
 system.cpu0.ipc                              0.341515                       # IPC: Instructions Per Cycle
@@ -2005,7 +2004,6 @@ system.cpu1.idleCycles                      296058429                       # To
 system.cpu1.quiesceCycles                  4796946974                       # Total number of cycles that CPU has spent quiesced or waiting for an interrupt
 system.cpu1.committedInsts                   38803971                       # Number of Instructions Simulated
 system.cpu1.committedOps                     49144375                       # Number of Ops (including micro ops) Simulated
-system.cpu1.committedInsts_total             38803971                       # Number of Instructions Simulated
 system.cpu1.cpi                             10.661121                       # CPI: Cycles Per Instruction
 system.cpu1.cpi_total                       10.661121                       # CPI: Total CPI of All Threads
 system.cpu1.ipc                              0.093799                       # IPC: Instructions Per Cycle
diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3/stats.txt b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3/stats.txt
index d345e80f2..4ddd9308a 100644
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3/stats.txt
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3/stats.txt
@@ -831,7 +831,6 @@ system.cpu.idleCycles                       322801694                       # To
 system.cpu.quiesceCycles                   4575172520                       # Total number of cycles that CPU has spent quiesced or waiting for an interrupt
 system.cpu.committedInsts                    60309034                       # Number of Instructions Simulated
 system.cpu.committedOps                      77600502                       # Number of Ops (including micro ops) Simulated
-system.cpu.committedInsts_total              60309034                       # Number of Instructions Simulated
 system.cpu.cpi                               7.911400                       # CPI: Cycles Per Instruction
 system.cpu.cpi_total                         7.911400                       # CPI: Total CPI of All Threads
 system.cpu.ipc                               0.126400                       # IPC: Instructions Per Cycle
diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-full/stats.txt b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-full/stats.txt
index 8f1b31c18..60f6414c0 100644
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-full/stats.txt
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-full/stats.txt
@@ -2007,7 +2007,6 @@ system.cpu2.idleCycles                       50897008                       # To
 system.cpu2.quiesceCycles                  3546076715                       # Total number of cycles that CPU has spent quiesced or waiting for an interrupt
 system.cpu2.committedInsts                   20499567                       # Number of Instructions Simulated
 system.cpu2.committedOps                     25336997                       # Number of Ops (including micro ops) Simulated
-system.cpu2.committedInsts_total             20499567                       # Number of Instructions Simulated
 system.cpu2.cpi                              4.308205                       # CPI: Cycles Per Instruction
 system.cpu2.cpi_total                        4.308205                       # CPI: Total CPI of All Threads
 system.cpu2.ipc                              0.232115                       # IPC: Instructions Per Cycle
diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-o3/stats.txt b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-o3/stats.txt
index 2ae3638d8..bff238873 100644
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-o3/stats.txt
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-o3/stats.txt
@@ -1307,7 +1307,6 @@ system.cpu0.idleCycles                      162972938                       # To
 system.cpu0.quiesceCycles                  2247980405                       # Total number of cycles that CPU has spent quiesced or waiting for an interrupt
 system.cpu0.committedInsts                   30002566                       # Number of Instructions Simulated
 system.cpu0.committedOps                     39142879                       # Number of Ops (including micro ops) Simulated
-system.cpu0.committedInsts_total             30002566                       # Number of Instructions Simulated
 system.cpu0.cpi                              8.074798                       # CPI: Cycles Per Instruction
 system.cpu0.cpi_total                        8.074798                       # CPI: Total CPI of All Threads
 system.cpu0.ipc                              0.123842                       # IPC: Instructions Per Cycle
@@ -2078,7 +2077,6 @@ system.cpu1.idleCycles                      160084473                       # To
 system.cpu1.quiesceCycles                  2317121408                       # Total number of cycles that CPU has spent quiesced or waiting for an interrupt
 system.cpu1.committedInsts                   30313431                       # Number of Instructions Simulated
 system.cpu1.committedOps                     38467115                       # Number of Ops (including micro ops) Simulated
-system.cpu1.committedInsts_total             30313431                       # Number of Instructions Simulated
 system.cpu1.cpi                              7.813189                       # CPI: Cycles Per Instruction
 system.cpu1.cpi_total                        7.813189                       # CPI: Total CPI of All Threads
 system.cpu1.ipc                              0.127989                       # IPC: Instructions Per Cycle
diff --git a/tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_Two_Level/stats.txt b/tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_Two_Level/stats.txt
index 69bdeab1f..e979c11e3 100644
--- a/tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_Two_Level/stats.txt
+++ b/tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_Two_Level/stats.txt
@@ -259,12 +259,12 @@ system.physmem.memoryStateTime::PRE_PDN             0                       # Ti
 system.physmem.memoryStateTime::ACT                 0                       # Time in different power states
 system.physmem.memoryStateTime::ACT_PDN             0                       # Time in different power states
 system.ruby.clk_domain.clock                      500                       # Clock period in ticks
-system.ruby.delayHist::bucket_size                  2                       # delay histogram for all message
-system.ruby.delayHist::max_bucket                  19                       # delay histogram for all message
+system.ruby.delayHist::bucket_size                  4                       # delay histogram for all message
+system.ruby.delayHist::max_bucket                  39                       # delay histogram for all message
 system.ruby.delayHist::samples               10864248                       # delay histogram for all message
-system.ruby.delayHist::mean                  0.221600                       # delay histogram for all message
-system.ruby.delayHist::stdev                 0.915697                       # delay histogram for all message
-system.ruby.delayHist                    |    10262737     94.46%     94.46% |        1567      0.01%     94.48% |      599477      5.52%    100.00% |         172      0.00%    100.00% |         242      0.00%    100.00% |           9      0.00%    100.00% |          44      0.00%    100.00% |           0      0.00%    100.00% |           0      0.00%    100.00% |           0      0.00%    100.00% # delay histogram for all message
+system.ruby.delayHist::mean                  0.443134                       # delay histogram for all message
+system.ruby.delayHist::stdev                 1.831153                       # delay histogram for all message
+system.ruby.delayHist                    |    10262857     94.46%     94.46% |        1509      0.01%     94.48% |      599467      5.52%    100.00% |         131      0.00%    100.00% |         231      0.00%    100.00% |           9      0.00%    100.00% |          44      0.00%    100.00% |           0      0.00%    100.00% |           0      0.00%    100.00% |           0      0.00%    100.00% # delay histogram for all message
 system.ruby.delayHist::total                 10864248                       # delay histogram for all message
 system.ruby.outstanding_req_hist::bucket_size            1                      
 system.ruby.outstanding_req_hist::max_bucket            9                      
@@ -854,25 +854,25 @@ system.ruby.network.routers5.throttle4.msg_count.Response_Data::1          811
 system.ruby.network.routers5.throttle4.msg_count.Writeback_Control::1        46736                      
 system.ruby.network.routers5.throttle4.msg_bytes.Response_Data::1        58392                      
 system.ruby.network.routers5.throttle4.msg_bytes.Writeback_Control::1       373888                      
-system.ruby.delayVCHist.vnet_0::bucket_size            2                       # delay histogram for vnet_0
-system.ruby.delayVCHist.vnet_0::max_bucket           19                       # delay histogram for vnet_0
+system.ruby.delayVCHist.vnet_0::bucket_size            4                       # delay histogram for vnet_0
+system.ruby.delayVCHist.vnet_0::max_bucket           39                       # delay histogram for vnet_0
 system.ruby.delayVCHist.vnet_0::samples       6099117                       # delay histogram for vnet_0
-system.ruby.delayVCHist.vnet_0::mean         0.377316                       # delay histogram for vnet_0
-system.ruby.delayVCHist.vnet_0::stdev        1.170385                       # delay histogram for vnet_0
-system.ruby.delayVCHist.vnet_0           |     5524398     90.58%     90.58% |         438      0.01%     90.58% |      573820      9.41%     99.99% |         170      0.00%    100.00% |         238      0.00%    100.00% |           9      0.00%    100.00% |          44      0.00%    100.00% |           0      0.00%    100.00% |           0      0.00%    100.00% |           0      0.00%    100.00% # delay histogram for vnet_0
+system.ruby.delayVCHist.vnet_0::mean         0.754514                       # delay histogram for vnet_0
+system.ruby.delayVCHist.vnet_0::stdev        2.340449                       # delay histogram for vnet_0
+system.ruby.delayVCHist.vnet_0           |     5524518     90.58%     90.58% |         380      0.01%     90.59% |      573810      9.41%     99.99% |         129      0.00%    100.00% |         227      0.00%    100.00% |           9      0.00%    100.00% |          44      0.00%    100.00% |           0      0.00%    100.00% |           0      0.00%    100.00% |           0      0.00%    100.00% # delay histogram for vnet_0
 system.ruby.delayVCHist.vnet_0::total         6099117                       # delay histogram for vnet_0
-system.ruby.delayVCHist.vnet_1::bucket_size            1                       # delay histogram for vnet_1
-system.ruby.delayVCHist.vnet_1::max_bucket            9                       # delay histogram for vnet_1
+system.ruby.delayVCHist.vnet_1::bucket_size            2                       # delay histogram for vnet_1
+system.ruby.delayVCHist.vnet_1::max_bucket           19                       # delay histogram for vnet_1
 system.ruby.delayVCHist.vnet_1::samples       4683733                       # delay histogram for vnet_1
-system.ruby.delayVCHist.vnet_1::mean         0.022443                       # delay histogram for vnet_1
-system.ruby.delayVCHist.vnet_1::stdev        0.297350                       # delay histogram for vnet_1
+system.ruby.delayVCHist.vnet_1::mean         0.044886                       # delay histogram for vnet_1
+system.ruby.delayVCHist.vnet_1::stdev        0.594700                       # delay histogram for vnet_1
 system.ruby.delayVCHist.vnet_1           |     4656826     99.43%     99.43% |         417      0.01%     99.43% |         407      0.01%     99.44% |         552      0.01%     99.45% |       25430      0.54%    100.00% |          99      0.00%    100.00% |           0      0.00%    100.00% |           1      0.00%    100.00% |           1      0.00%    100.00% |           0      0.00%    100.00% # delay histogram for vnet_1
 system.ruby.delayVCHist.vnet_1::total         4683733                       # delay histogram for vnet_1
-system.ruby.delayVCHist.vnet_2::bucket_size            1                       # delay histogram for vnet_2
-system.ruby.delayVCHist.vnet_2::max_bucket            9                       # delay histogram for vnet_2
+system.ruby.delayVCHist.vnet_2::bucket_size            2                       # delay histogram for vnet_2
+system.ruby.delayVCHist.vnet_2::max_bucket           19                       # delay histogram for vnet_2
 system.ruby.delayVCHist.vnet_2::samples         81398                       # delay histogram for vnet_2
-system.ruby.delayVCHist.vnet_2::mean         0.013600                       # delay histogram for vnet_2
-system.ruby.delayVCHist.vnet_2::stdev        0.216236                       # delay histogram for vnet_2
+system.ruby.delayVCHist.vnet_2::mean         0.027200                       # delay histogram for vnet_2
+system.ruby.delayVCHist.vnet_2::stdev        0.432471                       # delay histogram for vnet_2
 system.ruby.delayVCHist.vnet_2           |       80998     99.51%     99.51% |          98      0.12%     99.63% |          74      0.09%     99.72% |          96      0.12%     99.84% |          98      0.12%     99.96% |          30      0.04%    100.00% |           1      0.00%    100.00% |           0      0.00%    100.00% |           2      0.00%    100.00% |           1      0.00%    100.00% # delay histogram for vnet_2
 system.ruby.delayVCHist.vnet_2::total           81398                       # delay histogram for vnet_2
 system.ruby.LD.latency_hist::bucket_size           16