stats: update stats for previous changes.

3 files changed, 26 insertions, 28 deletions

diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-full/config.ini b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-full/config.ini
index fbde95c56..5ab2174c6 100644
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-full/config.ini
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-full/config.ini
@@ -10,7 +10,7 @@ time_sync_spin_threshold=100000000
 type=LinuxArmSystem
 children=bridge cf0 cpu0 cpu1 cpu2 intrctrl iobus iocache l2c membus physmem realview terminal toL2Bus vncserver
 atags_addr=256
-boot_loader=/arm/scratch/sysexplr/dist/binaries/boot.arm
+boot_loader=/gem5/dist/binaries/boot.arm
 boot_osflags=earlyprintk console=ttyAMA0 lpj=19988480 norandmaps rw loglevel=8 mem=128MB root=/dev/sda1
 clock=1000
 dtb_filename=
@@ -19,16 +19,14 @@ enable_context_switch_stats_dump=false
 flags_addr=268435504
 gic_cpu_addr=520093952
 init_param=0
-kernel=/arm/scratch/sysexplr/dist/binaries/vmlinux.arm.smp.fb.2.6.38.8
+kernel=/gem5/dist/binaries/vmlinux.arm.smp.fb.2.6.38.8
 load_addr_mask=268435455
 machine_type=RealView_PBX
 mem_mode=atomic
 mem_ranges=0:134217727
-memories=system.physmem system.realview.nvmem
+memories=system.realview.nvmem system.physmem
 multi_proc=true
 num_work_ids=16
-panic_on_oops=true
-panic_on_panic=true
 readfile=tests/halt.sh
 symbolfile=
 work_begin_ckpt_count=0
@@ -67,7 +65,7 @@ table_size=65536
 
 [system.cf0.image.child]
 type=RawDiskImage
-image_file=/arm/scratch/sysexplr/dist/disks/linux-arm-ael.img
+image_file=/gem5/dist/disks/linux-arm-ael.img
 read_only=true
 
 [system.cpu0]
diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-full/simout b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-full/simout
index f0052292c..209411c61 100755
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-full/simout
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-full/simout
@@ -1,12 +1,12 @@
 gem5 Simulator System.  http://gem5.org
 gem5 is copyrighted software; use the --copyright option for details.
 
-gem5 compiled Dec 11 2012 16:28:23
-gem5 started Dec 11 2012 16:28:35
-gem5 executing on e103721-lin
+gem5 compiled Jan  4 2013 21:17:24
+gem5 started Jan  5 2013 02:09:50
+gem5 executing on u200540
 command line: build/ARM/gem5.opt -d build/ARM/tests/opt/long/fs/10.linux-boot/arm/linux/realview-switcheroo-full -re tests/run.py build/ARM/tests/opt/long/fs/10.linux-boot/arm/linux/realview-switcheroo-full
 Global frequency set at 1000000000000 ticks per second
-info: kernel located at: /arm/scratch/sysexplr/dist/binaries/vmlinux.arm.smp.fb.2.6.38.8
+info: kernel located at: /gem5/dist/binaries/vmlinux.arm.smp.fb.2.6.38.8
 info: Using bootloader at address 0x80000000
 info: Entering event queue @ 0.  Starting simulation...
 Switching CPUs...
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 ba425396c..41aab5e9e 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
@@ -4,13 +4,25 @@ sim_seconds                                  2.401421                       # Nu
 sim_ticks                                2401421439000                       # Number of ticks simulated
 final_tick                               2401421439000                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                 1000000000000                       # Frequency of simulated ticks
-host_inst_rate                                 170882                       # Simulator instruction rate (inst/s)
-host_op_rate                                   219406                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                             6786575645                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 393972                       # Number of bytes of host memory used
-host_seconds                                   353.85                       # Real time elapsed on the host
+host_inst_rate                                  75201                       # Simulator instruction rate (inst/s)
+host_op_rate                                    96555                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                             2986582566                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 393856                       # Number of bytes of host memory used
+host_seconds                                   804.07                       # Real time elapsed on the host
 sim_insts                                    60466509                       # Number of instructions simulated
 sim_ops                                      77636591                       # Number of ops (including micro ops) simulated
+system.realview.nvmem.bytes_read::cpu0.inst           20                       # Number of bytes read from this memory
+system.realview.nvmem.bytes_read::total            20                       # Number of bytes read from this memory
+system.realview.nvmem.bytes_inst_read::cpu0.inst           20                       # Number of instructions bytes read from this memory
+system.realview.nvmem.bytes_inst_read::total           20                       # Number of instructions bytes read from this memory
+system.realview.nvmem.num_reads::cpu0.inst            5                       # Number of read requests responded to by this memory
+system.realview.nvmem.num_reads::total              5                       # Number of read requests responded to by this memory
+system.realview.nvmem.bw_read::cpu0.inst            8                       # Total read bandwidth from this memory (bytes/s)
+system.realview.nvmem.bw_read::total                8                       # Total read bandwidth from this memory (bytes/s)
+system.realview.nvmem.bw_inst_read::cpu0.inst            8                       # Instruction read bandwidth from this memory (bytes/s)
+system.realview.nvmem.bw_inst_read::total            8                       # Instruction read bandwidth from this memory (bytes/s)
+system.realview.nvmem.bw_total::cpu0.inst            8                       # Total bandwidth to/from this memory (bytes/s)
+system.realview.nvmem.bw_total::total               8                       # Total bandwidth to/from this memory (bytes/s)
 system.physmem.bytes_read::realview.clcd    114819072                       # Number of bytes read from this memory
 system.physmem.bytes_read::cpu0.dtb.walker           64                       # Number of bytes read from this memory
 system.physmem.bytes_read::cpu0.itb.walker          128                       # Number of bytes read from this memory
@@ -245,18 +257,6 @@ system.physmem.writeRowHits                    499132                       # Nu
 system.physmem.readRowHitRate                   99.77                       # Row buffer hit rate for reads
 system.physmem.writeRowHitRate                  98.24                       # Row buffer hit rate for writes
 system.physmem.avgGap                       182850.04                       # Average gap between requests
-system.realview.nvmem.bytes_read::cpu0.inst           20                       # Number of bytes read from this memory
-system.realview.nvmem.bytes_read::total            20                       # Number of bytes read from this memory
-system.realview.nvmem.bytes_inst_read::cpu0.inst           20                       # Number of instructions bytes read from this memory
-system.realview.nvmem.bytes_inst_read::total           20                       # Number of instructions bytes read from this memory
-system.realview.nvmem.num_reads::cpu0.inst            5                       # Number of read requests responded to by this memory
-system.realview.nvmem.num_reads::total              5                       # Number of read requests responded to by this memory
-system.realview.nvmem.bw_read::cpu0.inst            8                       # Total read bandwidth from this memory (bytes/s)
-system.realview.nvmem.bw_read::total                8                       # Total read bandwidth from this memory (bytes/s)
-system.realview.nvmem.bw_inst_read::cpu0.inst            8                       # Instruction read bandwidth from this memory (bytes/s)
-system.realview.nvmem.bw_inst_read::total            8                       # Instruction read bandwidth from this memory (bytes/s)
-system.realview.nvmem.bw_total::cpu0.inst            8                       # Total bandwidth to/from this memory (bytes/s)
-system.realview.nvmem.bw_total::total               8                       # Total bandwidth to/from this memory (bytes/s)
 system.l2c.replacements                         63371                       # number of replacements
 system.l2c.tagsinuse                     50440.930838                       # Cycle average of tags in use
 system.l2c.total_refs                         1764263                       # Total number of references to valid blocks.
@@ -1541,7 +1541,7 @@ system.cpu2.int_regfile_reads               159046643                       # nu
 system.cpu2.int_regfile_writes               30194860                       # number of integer regfile writes
 system.cpu2.fp_regfile_reads                    22317                       # number of floating regfile reads
 system.cpu2.fp_regfile_writes                   20822                       # number of floating regfile writes
-system.cpu2.misc_regfile_reads               41979427                       # number of misc regfile reads
+system.cpu2.misc_regfile_reads                9419199                       # number of misc regfile reads
 system.cpu2.misc_regfile_writes                278833                       # number of misc regfile writes
 system.iocache.replacements                         0                       # number of replacements
 system.iocache.tagsinuse                            0                       # Cycle average of tags in use