tests: updates for stat name change

6 files changed, 60 insertions, 58 deletions

diff --git a/tests/long/10.linux-boot/ref/alpha/linux/tsunami-o3-dual/simout b/tests/long/10.linux-boot/ref/alpha/linux/tsunami-o3-dual/simout
index 9ebdcf06b..6aab5269d 100755
--- a/tests/long/10.linux-boot/ref/alpha/linux/tsunami-o3-dual/simout
+++ b/tests/long/10.linux-boot/ref/alpha/linux/tsunami-o3-dual/simout
@@ -5,12 +5,13 @@ The Regents of The University of Michigan
 All Rights Reserved
 
 
-M5 compiled Apr 19 2011 12:17:36
-M5 started Apr 19 2011 12:17:43
+M5 compiled Apr 21 2011 12:02:59
+M5 started Apr 21 2011 13:21:52
 M5 executing on maize
 command line: build/ALPHA_FS/m5.fast -d build/ALPHA_FS/tests/fast/long/10.linux-boot/alpha/linux/tsunami-o3-dual -re tests/run.py build/ALPHA_FS/tests/fast/long/10.linux-boot/alpha/linux/tsunami-o3-dual
 Global frequency set at 1000000000000 ticks per second
 info: kernel located at: /dist/m5/system/binaries/vmlinux
+      0: system.tsunami.io.rtc: Real-time clock set to Thu Jan  1 00:00:00 2009
 info: Entering event queue @ 0.  Starting simulation...
 info: Launching CPU 1 @ 109002500
 Exiting @ tick 1901725056500 because m5_exit instruction encountered
diff --git a/tests/long/10.linux-boot/ref/alpha/linux/tsunami-o3-dual/stats.txt b/tests/long/10.linux-boot/ref/alpha/linux/tsunami-o3-dual/stats.txt
index 31187c584..a973eefe5 100644
--- a/tests/long/10.linux-boot/ref/alpha/linux/tsunami-o3-dual/stats.txt
+++ b/tests/long/10.linux-boot/ref/alpha/linux/tsunami-o3-dual/stats.txt
@@ -1,9 +1,9 @@
 
 ---------- Begin Simulation Statistics ----------
-host_inst_rate                                 245660                       # Simulator instruction rate (inst/s)
-host_mem_usage                                 294304                       # Number of bytes of host memory used
-host_seconds                                   232.36                       # Real time elapsed on the host
-host_tick_rate                             8184534150                       # Simulator tick rate (ticks/s)
+host_inst_rate                                 146685                       # Simulator instruction rate (inst/s)
+host_mem_usage                                 297796                       # Number of bytes of host memory used
+host_seconds                                   389.14                       # Real time elapsed on the host
+host_tick_rate                             4887032789                       # Simulator tick rate (ticks/s)
 sim_freq                                 1000000000000                       # Frequency of simulated ticks
 sim_insts                                    57080594                       # Number of instructions simulated
 sim_seconds                                  1.901725                       # Number of seconds simulated
@@ -362,16 +362,16 @@ system.cpu0.iew.iewIdleCycles                       0                       # Nu
 system.cpu0.iew.iewLSQFullEvents                 5675                       # Number of times the LSQ has become full, causing a stall
 system.cpu0.iew.iewSquashCycles               1085015                       # Number of cycles IEW is squashing
 system.cpu0.iew.iewUnblockCycles               526785                       # Number of cycles IEW is unblocking
-system.cpu0.iew.lsq.thread.0.blockedLoads            0                       # Number of blocked loads due to partial load-store forwarding
-system.cpu0.iew.lsq.thread.0.cacheBlocked       157871                       # Number of times an access to memory failed due to the cache being blocked
-system.cpu0.iew.lsq.thread.0.forwLoads         427137                       # Number of loads that had data forwarded from stores
-system.cpu0.iew.lsq.thread.0.ignoredResponses         7542                       # Number of memory responses ignored because the instruction is squashed
-system.cpu0.iew.lsq.thread.0.invAddrLoads            0                       # Number of loads ignored due to an invalid address
-system.cpu0.iew.lsq.thread.0.invAddrSwpfs            0                       # Number of software prefetches ignored due to an invalid address
-system.cpu0.iew.lsq.thread.0.memOrderViolation        14768                       # Number of memory ordering violations
-system.cpu0.iew.lsq.thread.0.rescheduledLoads        12869                       # Number of loads that were rescheduled
-system.cpu0.iew.lsq.thread.0.squashedLoads      1004382                       # Number of loads squashed
-system.cpu0.iew.lsq.thread.0.squashedStores       318301                       # Number of stores squashed
+system.cpu0.iew.lsq.thread0.blockedLoads            0                       # Number of blocked loads due to partial load-store forwarding
+system.cpu0.iew.lsq.thread0.cacheBlocked       157871                       # Number of times an access to memory failed due to the cache being blocked
+system.cpu0.iew.lsq.thread0.forwLoads          427137                       # Number of loads that had data forwarded from stores
+system.cpu0.iew.lsq.thread0.ignoredResponses         7542                       # Number of memory responses ignored because the instruction is squashed
+system.cpu0.iew.lsq.thread0.invAddrLoads            0                       # Number of loads ignored due to an invalid address
+system.cpu0.iew.lsq.thread0.invAddrSwpfs            0                       # Number of software prefetches ignored due to an invalid address
+system.cpu0.iew.lsq.thread0.memOrderViolation        14768                       # Number of memory ordering violations
+system.cpu0.iew.lsq.thread0.rescheduledLoads        12869                       # Number of loads that were rescheduled
+system.cpu0.iew.lsq.thread0.squashedLoads      1004382                       # Number of loads squashed
+system.cpu0.iew.lsq.thread0.squashedStores       318301                       # Number of stores squashed
 system.cpu0.iew.memOrderViolationEvents         14768                       # Number of memory order violations
 system.cpu0.iew.predictedNotTakenIncorrect       331464                       # Number of branches that were predicted not taken incorrectly
 system.cpu0.iew.predictedTakenIncorrect        323527                       # Number of branches that were predicted taken incorrectly
@@ -978,16 +978,16 @@ system.cpu1.iew.iewIdleCycles                       0                       # Nu
 system.cpu1.iew.iewLSQFullEvents                 5665                       # Number of times the LSQ has become full, causing a stall
 system.cpu1.iew.iewSquashCycles                401676                       # Number of cycles IEW is squashing
 system.cpu1.iew.iewUnblockCycles                76714                       # Number of cycles IEW is unblocking
-system.cpu1.iew.lsq.thread.0.blockedLoads            0                       # Number of blocked loads due to partial load-store forwarding
-system.cpu1.iew.lsq.thread.0.cacheBlocked        25188                       # Number of times an access to memory failed due to the cache being blocked
-system.cpu1.iew.lsq.thread.0.forwLoads          88996                       # Number of loads that had data forwarded from stores
-system.cpu1.iew.lsq.thread.0.ignoredResponses         4435                       # Number of memory responses ignored because the instruction is squashed
-system.cpu1.iew.lsq.thread.0.invAddrLoads            0                       # Number of loads ignored due to an invalid address
-system.cpu1.iew.lsq.thread.0.invAddrSwpfs            0                       # Number of software prefetches ignored due to an invalid address
-system.cpu1.iew.lsq.thread.0.memOrderViolation         4299                       # Number of memory ordering violations
-system.cpu1.iew.lsq.thread.0.rescheduledLoads         5923                       # Number of loads that were rescheduled
-system.cpu1.iew.lsq.thread.0.squashedLoads       416191                       # Number of loads squashed
-system.cpu1.iew.lsq.thread.0.squashedStores       148395                       # Number of stores squashed
+system.cpu1.iew.lsq.thread0.blockedLoads            0                       # Number of blocked loads due to partial load-store forwarding
+system.cpu1.iew.lsq.thread0.cacheBlocked        25188                       # Number of times an access to memory failed due to the cache being blocked
+system.cpu1.iew.lsq.thread0.forwLoads           88996                       # Number of loads that had data forwarded from stores
+system.cpu1.iew.lsq.thread0.ignoredResponses         4435                       # Number of memory responses ignored because the instruction is squashed
+system.cpu1.iew.lsq.thread0.invAddrLoads            0                       # Number of loads ignored due to an invalid address
+system.cpu1.iew.lsq.thread0.invAddrSwpfs            0                       # Number of software prefetches ignored due to an invalid address
+system.cpu1.iew.lsq.thread0.memOrderViolation         4299                       # Number of memory ordering violations
+system.cpu1.iew.lsq.thread0.rescheduledLoads         5923                       # Number of loads that were rescheduled
+system.cpu1.iew.lsq.thread0.squashedLoads       416191                       # Number of loads squashed
+system.cpu1.iew.lsq.thread0.squashedStores       148395                       # Number of stores squashed
 system.cpu1.iew.memOrderViolationEvents          4299                       # Number of memory order violations
 system.cpu1.iew.predictedNotTakenIncorrect       105547                       # Number of branches that were predicted not taken incorrectly
 system.cpu1.iew.predictedTakenIncorrect        123821                       # Number of branches that were predicted taken incorrectly
diff --git a/tests/long/10.linux-boot/ref/alpha/linux/tsunami-o3/simout b/tests/long/10.linux-boot/ref/alpha/linux/tsunami-o3/simout
index 4d6dea231..6e8d29977 100755
--- a/tests/long/10.linux-boot/ref/alpha/linux/tsunami-o3/simout
+++ b/tests/long/10.linux-boot/ref/alpha/linux/tsunami-o3/simout
@@ -5,11 +5,12 @@ The Regents of The University of Michigan
 All Rights Reserved
 
 
-M5 compiled Apr 19 2011 12:17:36
-M5 started Apr 19 2011 12:17:43
+M5 compiled Apr 21 2011 12:02:59
+M5 started Apr 21 2011 13:21:52
 M5 executing on maize
 command line: build/ALPHA_FS/m5.fast -d build/ALPHA_FS/tests/fast/long/10.linux-boot/alpha/linux/tsunami-o3 -re tests/run.py build/ALPHA_FS/tests/fast/long/10.linux-boot/alpha/linux/tsunami-o3
 Global frequency set at 1000000000000 ticks per second
 info: kernel located at: /dist/m5/system/binaries/vmlinux
+      0: system.tsunami.io.rtc: Real-time clock set to Thu Jan  1 00:00:00 2009
 info: Entering event queue @ 0.  Starting simulation...
 Exiting @ tick 1863702170500 because m5_exit instruction encountered
diff --git a/tests/long/10.linux-boot/ref/alpha/linux/tsunami-o3/stats.txt b/tests/long/10.linux-boot/ref/alpha/linux/tsunami-o3/stats.txt
index 3f1d069d1..3d92c2fae 100644
--- a/tests/long/10.linux-boot/ref/alpha/linux/tsunami-o3/stats.txt
+++ b/tests/long/10.linux-boot/ref/alpha/linux/tsunami-o3/stats.txt
@@ -1,9 +1,9 @@
 
 ---------- Begin Simulation Statistics ----------
-host_inst_rate                                 247292                       # Simulator instruction rate (inst/s)
-host_mem_usage                                 292024                       # Number of bytes of host memory used
-host_seconds                                   214.68                       # Real time elapsed on the host
-host_tick_rate                             8681128138                       # Simulator tick rate (ticks/s)
+host_inst_rate                                 146689                       # Simulator instruction rate (inst/s)
+host_mem_usage                                 295516                       # Number of bytes of host memory used
+host_seconds                                   361.92                       # Real time elapsed on the host
+host_tick_rate                             5149474067                       # Simulator tick rate (ticks/s)
 sim_freq                                 1000000000000                       # Frequency of simulated ticks
 sim_insts                                    53089625                       # Number of instructions simulated
 sim_seconds                                  1.863702                       # Number of seconds simulated
@@ -360,16 +360,16 @@ system.cpu.iew.iewIdleCycles                        0                       # Nu
 system.cpu.iew.iewLSQFullEvents                 12252                       # Number of times the LSQ has become full, causing a stall
 system.cpu.iew.iewSquashCycles                1435065                       # Number of cycles IEW is squashing
 system.cpu.iew.iewUnblockCycles                608300                       # Number of cycles IEW is unblocking
-system.cpu.iew.lsq.thread.0.blockedLoads            0                       # Number of blocked loads due to partial load-store forwarding
-system.cpu.iew.lsq.thread.0.cacheBlocked       167273                       # Number of times an access to memory failed due to the cache being blocked
-system.cpu.iew.lsq.thread.0.forwLoads          486953                       # Number of loads that had data forwarded from stores
-system.cpu.iew.lsq.thread.0.ignoredResponses         6665                       # Number of memory responses ignored because the instruction is squashed
-system.cpu.iew.lsq.thread.0.invAddrLoads            0                       # Number of loads ignored due to an invalid address
-system.cpu.iew.lsq.thread.0.invAddrSwpfs            0                       # Number of software prefetches ignored due to an invalid address
-system.cpu.iew.lsq.thread.0.memOrderViolation        18985                       # Number of memory ordering violations
-system.cpu.iew.lsq.thread.0.rescheduledLoads        17936                       # Number of loads that were rescheduled
-system.cpu.iew.lsq.thread.0.squashedLoads      1381305                       # Number of loads squashed
-system.cpu.iew.lsq.thread.0.squashedStores       456751                       # Number of stores squashed
+system.cpu.iew.lsq.thread0.blockedLoads             0                       # Number of blocked loads due to partial load-store forwarding
+system.cpu.iew.lsq.thread0.cacheBlocked        167273                       # Number of times an access to memory failed due to the cache being blocked
+system.cpu.iew.lsq.thread0.forwLoads           486953                       # Number of loads that had data forwarded from stores
+system.cpu.iew.lsq.thread0.ignoredResponses         6665                       # Number of memory responses ignored because the instruction is squashed
+system.cpu.iew.lsq.thread0.invAddrLoads             0                       # Number of loads ignored due to an invalid address
+system.cpu.iew.lsq.thread0.invAddrSwpfs             0                       # Number of software prefetches ignored due to an invalid address
+system.cpu.iew.lsq.thread0.memOrderViolation        18985                       # Number of memory ordering violations
+system.cpu.iew.lsq.thread0.rescheduledLoads        17936                       # Number of loads that were rescheduled
+system.cpu.iew.lsq.thread0.squashedLoads      1381305                       # Number of loads squashed
+system.cpu.iew.lsq.thread0.squashedStores       456751                       # Number of stores squashed
 system.cpu.iew.memOrderViolationEvents          18985                       # Number of memory order violations
 system.cpu.iew.predictedNotTakenIncorrect       404859                       # Number of branches that were predicted not taken incorrectly
 system.cpu.iew.predictedTakenIncorrect         429533                       # Number of branches that were predicted taken incorrectly
diff --git a/tests/long/10.linux-boot/ref/arm/linux/realview-o3/simout b/tests/long/10.linux-boot/ref/arm/linux/realview-o3/simout
index 7cdd9066f..64f7ad077 100755
--- a/tests/long/10.linux-boot/ref/arm/linux/realview-o3/simout
+++ b/tests/long/10.linux-boot/ref/arm/linux/realview-o3/simout
@@ -5,8 +5,8 @@ The Regents of The University of Michigan
 All Rights Reserved
 
 
-M5 compiled Apr 19 2011 13:41:05
-M5 started Apr 19 2011 13:41:08
+M5 compiled Apr 21 2011 12:05:49
+M5 started Apr 21 2011 15:19:16
 M5 executing on maize
 command line: build/ARM_FS/m5.fast -d build/ARM_FS/tests/fast/long/10.linux-boot/arm/linux/realview-o3 -re tests/run.py build/ARM_FS/tests/fast/long/10.linux-boot/arm/linux/realview-o3
 Global frequency set at 1000000000000 ticks per second
diff --git a/tests/long/10.linux-boot/ref/arm/linux/realview-o3/stats.txt b/tests/long/10.linux-boot/ref/arm/linux/realview-o3/stats.txt
index 4fdec7dfb..f3579a27d 100644
--- a/tests/long/10.linux-boot/ref/arm/linux/realview-o3/stats.txt
+++ b/tests/long/10.linux-boot/ref/arm/linux/realview-o3/stats.txt
@@ -1,9 +1,9 @@
 
 ---------- Begin Simulation Statistics ----------
-host_inst_rate                                 182620                       # Simulator instruction rate (inst/s)
-host_mem_usage                                 341656                       # Number of bytes of host memory used
-host_seconds                                   284.63                       # Real time elapsed on the host
-host_tick_rate                              290422658                       # Simulator tick rate (ticks/s)
+host_inst_rate                                 112653                       # Simulator instruction rate (inst/s)
+host_mem_usage                                 348660                       # Number of bytes of host memory used
+host_seconds                                   461.40                       # Real time elapsed on the host
+host_tick_rate                              179154205                       # Simulator tick rate (ticks/s)
 sim_freq                                 1000000000000                       # Frequency of simulated ticks
 sim_insts                                    51978682                       # Number of instructions simulated
 sim_seconds                                  0.082662                       # Number of seconds simulated
@@ -356,16 +356,16 @@ system.cpu.iew.iewIdleCycles                        0                       # Nu
 system.cpu.iew.iewLSQFullEvents                 45641                       # Number of times the LSQ has become full, causing a stall
 system.cpu.iew.iewSquashCycles                2568567                       # Number of cycles IEW is squashing
 system.cpu.iew.iewUnblockCycles                263948                       # Number of cycles IEW is unblocking
-system.cpu.iew.lsq.thread.0.blockedLoads            0                       # Number of blocked loads due to partial load-store forwarding
-system.cpu.iew.lsq.thread.0.cacheBlocked         8235                       # Number of times an access to memory failed due to the cache being blocked
-system.cpu.iew.lsq.thread.0.forwLoads          331109                       # Number of loads that had data forwarded from stores
-system.cpu.iew.lsq.thread.0.ignoredResponses         7560                       # Number of memory responses ignored because the instruction is squashed
-system.cpu.iew.lsq.thread.0.invAddrLoads            0                       # Number of loads ignored due to an invalid address
-system.cpu.iew.lsq.thread.0.invAddrSwpfs            0                       # Number of software prefetches ignored due to an invalid address
-system.cpu.iew.lsq.thread.0.memOrderViolation       280540                       # Number of memory ordering violations
-system.cpu.iew.lsq.thread.0.rescheduledLoads     17000484                       # Number of loads that were rescheduled
-system.cpu.iew.lsq.thread.0.squashedLoads      3641022                       # Number of loads squashed
-system.cpu.iew.lsq.thread.0.squashedStores      1649637                       # Number of stores squashed
+system.cpu.iew.lsq.thread0.blockedLoads             0                       # Number of blocked loads due to partial load-store forwarding
+system.cpu.iew.lsq.thread0.cacheBlocked          8235                       # Number of times an access to memory failed due to the cache being blocked
+system.cpu.iew.lsq.thread0.forwLoads           331109                       # Number of loads that had data forwarded from stores
+system.cpu.iew.lsq.thread0.ignoredResponses         7560                       # Number of memory responses ignored because the instruction is squashed
+system.cpu.iew.lsq.thread0.invAddrLoads             0                       # Number of loads ignored due to an invalid address
+system.cpu.iew.lsq.thread0.invAddrSwpfs             0                       # Number of software prefetches ignored due to an invalid address
+system.cpu.iew.lsq.thread0.memOrderViolation       280540                       # Number of memory ordering violations
+system.cpu.iew.lsq.thread0.rescheduledLoads     17000484                       # Number of loads that were rescheduled
+system.cpu.iew.lsq.thread0.squashedLoads      3641022                       # Number of loads squashed
+system.cpu.iew.lsq.thread0.squashedStores      1649637                       # Number of stores squashed
 system.cpu.iew.memOrderViolationEvents         280540                       # Number of memory order violations
 system.cpu.iew.predictedNotTakenIncorrect       186102                       # Number of branches that were predicted not taken incorrectly
 system.cpu.iew.predictedTakenIncorrect         525140                       # Number of branches that were predicted taken incorrectly