test: update stats

Update stats for recent changes.  Mostly minor changes
in register access stats due to addition of new cc
register type and slightly different (and more accurate)
classification of int vs. fp register accesses.

3 files changed, 32 insertions, 32 deletions

diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-dual/config.ini b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-dual/config.ini
index 83b4b4ad3..7ff8826e3 100644
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-dual/config.ini
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-dual/config.ini
@@ -25,7 +25,7 @@ load_addr_mask=268435455
 machine_type=RealView_PBX
 mem_mode=timing
 mem_ranges=0:134217727
-memories=system.realview.nvmem system.physmem
+memories=system.physmem system.realview.nvmem
 multi_proc=true
 num_work_ids=16
 panic_on_oops=true
@@ -127,6 +127,7 @@ max_loads_all_threads=0
 max_loads_any_thread=0
 needsTSO=false
 numIQEntries=64
+numPhysCCRegs=0
 numPhysFloatRegs=256
 numPhysIntRegs=256
 numROBEntries=192
@@ -602,6 +603,7 @@ max_loads_all_threads=0
 max_loads_any_thread=0
 needsTSO=false
 numIQEntries=64
+numPhysCCRegs=0
 numPhysFloatRegs=256
 numPhysIntRegs=256
 numROBEntries=192
diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-dual/simout b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-dual/simout
index 56628ec16..5def9d861 100755
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-dual/simout
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-dual/simout
@@ -1,10 +1,8 @@
-Redirecting stdout to build/ARM/tests/opt/long/fs/10.linux-boot/arm/linux/realview-o3-dual/simout
-Redirecting stderr to build/ARM/tests/opt/long/fs/10.linux-boot/arm/linux/realview-o3-dual/simerr
 gem5 Simulator System.  http://gem5.org
 gem5 is copyrighted software; use the --copyright option for details.
 
-gem5 compiled Sep 22 2013 07:58:15
-gem5 started Sep 22 2013 07:58:48
+gem5 compiled Oct 16 2013 01:36:42
+gem5 started Oct 16 2013 02:18:35
 gem5 executing on zizzer
 command line: build/ARM/gem5.opt -d build/ARM/tests/opt/long/fs/10.linux-boot/arm/linux/realview-o3-dual -re tests/run.py build/ARM/tests/opt/long/fs/10.linux-boot/arm/linux/realview-o3-dual
 Global frequency set at 1000000000000 ticks per second
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 1d3b3b539..99b249a14 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
@@ -4,31 +4,13 @@ sim_seconds                                  1.104038                       # Nu
 sim_ticks                                1104038330000                       # Number of ticks simulated
 final_tick                               1104038330000                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                 1000000000000                       # Frequency of simulated ticks
-host_inst_rate                                  67767                       # Simulator instruction rate (inst/s)
-host_op_rate                                    87238                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                             1214516577                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 404472                       # Number of bytes of host memory used
-host_seconds                                   909.04                       # Real time elapsed on the host
+host_inst_rate                                  65967                       # Simulator instruction rate (inst/s)
+host_op_rate                                    84921                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                             1182267512                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 404512                       # Number of bytes of host memory used
+host_seconds                                   933.83                       # Real time elapsed on the host
 sim_insts                                    61602211                       # Number of instructions simulated
 sim_ops                                      79302243                       # Number of ops (including micro ops) simulated
-system.realview.nvmem.bytes_read::cpu0.inst           64                       # Number of bytes read from this memory
-system.realview.nvmem.bytes_read::cpu1.inst          384                       # Number of bytes read from this memory
-system.realview.nvmem.bytes_read::total           448                       # Number of bytes read from this memory
-system.realview.nvmem.bytes_inst_read::cpu0.inst           64                       # Number of instructions bytes read from this memory
-system.realview.nvmem.bytes_inst_read::cpu1.inst          384                       # Number of instructions bytes read from this memory
-system.realview.nvmem.bytes_inst_read::total          448                       # Number of instructions bytes read from this memory
-system.realview.nvmem.num_reads::cpu0.inst            1                       # Number of read requests responded to by this memory
-system.realview.nvmem.num_reads::cpu1.inst            6                       # Number of read requests responded to by this memory
-system.realview.nvmem.num_reads::total              7                       # Number of read requests responded to by this memory
-system.realview.nvmem.bw_read::cpu0.inst           58                       # Total read bandwidth from this memory (bytes/s)
-system.realview.nvmem.bw_read::cpu1.inst          348                       # Total read bandwidth from this memory (bytes/s)
-system.realview.nvmem.bw_read::total              406                       # Total read bandwidth from this memory (bytes/s)
-system.realview.nvmem.bw_inst_read::cpu0.inst           58                       # Instruction read bandwidth from this memory (bytes/s)
-system.realview.nvmem.bw_inst_read::cpu1.inst          348                       # Instruction read bandwidth from this memory (bytes/s)
-system.realview.nvmem.bw_inst_read::total          406                       # Instruction read bandwidth from this memory (bytes/s)
-system.realview.nvmem.bw_total::cpu0.inst           58                       # Total bandwidth to/from this memory (bytes/s)
-system.realview.nvmem.bw_total::cpu1.inst          348                       # Total bandwidth to/from this memory (bytes/s)
-system.realview.nvmem.bw_total::total             406                       # Total bandwidth to/from this memory (bytes/s)
 system.physmem.bytes_read::realview.clcd     48758784                       # Number of bytes read from this memory
 system.physmem.bytes_read::cpu0.dtb.walker          768                       # Number of bytes read from this memory
 system.physmem.bytes_read::cpu0.itb.walker          192                       # Number of bytes read from this memory
@@ -485,6 +467,24 @@ system.physmem.writeRowHits                     98940                       # Nu
 system.physmem.readRowHitRate                   99.71                       # Row buffer hit rate for reads
 system.physmem.writeRowHitRate                  12.01                       # Row buffer hit rate for writes
 system.physmem.avgGap                       155904.23                       # Average gap between requests
+system.realview.nvmem.bytes_read::cpu0.inst           64                       # Number of bytes read from this memory
+system.realview.nvmem.bytes_read::cpu1.inst          384                       # Number of bytes read from this memory
+system.realview.nvmem.bytes_read::total           448                       # Number of bytes read from this memory
+system.realview.nvmem.bytes_inst_read::cpu0.inst           64                       # Number of instructions bytes read from this memory
+system.realview.nvmem.bytes_inst_read::cpu1.inst          384                       # Number of instructions bytes read from this memory
+system.realview.nvmem.bytes_inst_read::total          448                       # Number of instructions bytes read from this memory
+system.realview.nvmem.num_reads::cpu0.inst            1                       # Number of read requests responded to by this memory
+system.realview.nvmem.num_reads::cpu1.inst            6                       # Number of read requests responded to by this memory
+system.realview.nvmem.num_reads::total              7                       # Number of read requests responded to by this memory
+system.realview.nvmem.bw_read::cpu0.inst           58                       # Total read bandwidth from this memory (bytes/s)
+system.realview.nvmem.bw_read::cpu1.inst          348                       # Total read bandwidth from this memory (bytes/s)
+system.realview.nvmem.bw_read::total              406                       # Total read bandwidth from this memory (bytes/s)
+system.realview.nvmem.bw_inst_read::cpu0.inst           58                       # Instruction read bandwidth from this memory (bytes/s)
+system.realview.nvmem.bw_inst_read::cpu1.inst          348                       # Instruction read bandwidth from this memory (bytes/s)
+system.realview.nvmem.bw_inst_read::total          406                       # Instruction read bandwidth from this memory (bytes/s)
+system.realview.nvmem.bw_total::cpu0.inst           58                       # Total bandwidth to/from this memory (bytes/s)
+system.realview.nvmem.bw_total::cpu1.inst          348                       # Total bandwidth to/from this memory (bytes/s)
+system.realview.nvmem.bw_total::total             406                       # Total bandwidth to/from this memory (bytes/s)
 system.membus.throughput                     62410733                       # Throughput (bytes/s)
 system.membus.trans_dist::ReadReq             7306749                       # Transaction distribution
 system.membus.trans_dist::ReadResp            7306749                       # Transaction distribution
@@ -1252,8 +1252,8 @@ system.cpu0.rename.LSQFullEvents              1152507                       # Nu
 system.cpu0.rename.FullRegisterEvents              84                       # Number of times there has been no free registers
 system.cpu0.rename.RenamedOperands           39264921                       # Number of destination operands rename has renamed
 system.cpu0.rename.RenameLookups            175790758                       # Number of register rename lookups that rename has made
-system.cpu0.rename.int_rename_lookups       175756522                       # Number of integer rename lookups
-system.cpu0.rename.fp_rename_lookups            34236                       # Number of floating rename lookups
+system.cpu0.rename.int_rename_lookups       161860177                       # Number of integer rename lookups
+system.cpu0.rename.fp_rename_lookups             4025                       # Number of floating rename lookups
 system.cpu0.rename.CommittedMaps             30938700                       # Number of HB maps that are committed
 system.cpu0.rename.UndoneMaps                 8326220                       # Number of HB maps that are undone due to squashing
 system.cpu0.rename.serializingInsts            411215                       # count of serializing insts renamed
@@ -1823,8 +1823,8 @@ system.cpu1.rename.LSQFullEvents              3042854                       # Nu
 system.cpu1.rename.FullRegisterEvents            1130                       # Number of times there has been no free registers
 system.cpu1.rename.RenamedOperands           69218982                       # Number of destination operands rename has renamed
 system.cpu1.rename.RenameLookups            302521919                       # Number of register rename lookups that rename has made
-system.cpu1.rename.int_rename_lookups       302462653                       # Number of integer rename lookups
-system.cpu1.rename.fp_rename_lookups            59266                       # Number of floating rename lookups
+system.cpu1.rename.int_rename_lookups       280703259                       # Number of integer rename lookups
+system.cpu1.rename.fp_rename_lookups             6508                       # Number of floating rename lookups
 system.cpu1.rename.CommittedMaps             49058929                       # Number of HB maps that are committed
 system.cpu1.rename.UndoneMaps                20160053                       # Number of HB maps that are undone due to squashing
 system.cpu1.rename.serializingInsts            444772                       # count of serializing insts renamed