From 4a644767c58754339965cecc5d85853255652a30 Mon Sep 17 00:00:00 2001 From: Nathan Binkert Date: Wed, 9 May 2012 11:52:14 -0700 Subject: stats: update stats for no_value -> nan Lots of accumulated older changes too. --- .../ref/arm/linux/realview-o3-checker/config.ini | 16 ++++---- .../ref/arm/linux/realview-o3-checker/simout | 10 ++--- .../ref/arm/linux/realview-o3-checker/stats.txt | 40 ++++++++++---------- .../ref/arm/linux/realview-o3-dual/config.ini | 16 ++++---- .../ref/arm/linux/realview-o3-dual/simout | 10 ++--- .../ref/arm/linux/realview-o3-dual/stats.txt | 42 ++++++++++----------- .../ref/arm/linux/realview-o3-dual/status | 2 +- .../ref/arm/linux/realview-o3-dual/system.terminal | Bin 6036 -> 6036 bytes .../ref/arm/linux/realview-o3/config.ini | 16 ++++---- .../10.linux-boot/ref/arm/linux/realview-o3/simout | 10 ++--- .../ref/arm/linux/realview-o3/stats.txt | 40 ++++++++++---------- 11 files changed, 104 insertions(+), 98 deletions(-) (limited to 'tests/long/fs/10.linux-boot/ref/arm') diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-checker/config.ini b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-checker/config.ini index 655130261..b11582c4e 100644 --- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-checker/config.ini +++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-checker/config.ini @@ -10,20 +10,18 @@ time_sync_spin_threshold=100000000 type=LinuxArmSystem children=bridge cf0 cpu intrctrl iobus iocache l2c membus physmem realview terminal toL2Bus vncserver atags_addr=256 -boot_loader=/projects/pd/randd/dist/binaries/boot.arm -boot_loader_mem=system.realview.nvmem +boot_loader=/dist/m5/system/binaries/boot.arm boot_osflags=earlyprintk console=ttyAMA0 lpj=19988480 norandmaps rw loglevel=8 mem=128MB root=/dev/sda1 flags_addr=268435504 gic_cpu_addr=520093952 init_param=0 -kernel=/projects/pd/randd/dist/binaries/vmlinux.arm.smp.fb.2.6.38.8 +kernel=/dist/m5/system/binaries/vmlinux.arm.smp.fb.2.6.38.8 load_addr_mask=268435455 machine_type=RealView_PBX mem_mode=timing memories=system.physmem system.realview.nvmem midr_regval=890224640 num_work_ids=16 -physmem=system.physmem readfile=tests/halt.sh symbolfile= work_begin_ckpt_count=0 @@ -63,7 +61,7 @@ table_size=65536 [system.cf0.image.child] type=RawDiskImage -image_file=/projects/pd/randd/dist/disks/linux-arm-ael.img +image_file=/dist/m5/system/disks/linux-arm-ael.img read_only=true [system.cpu] @@ -662,8 +660,10 @@ warn_access=warn pio=system.membus.default [system.physmem] -type=PhysicalMemory +type=SimpleMemory +conf_table_reported=true file= +in_addr_map=true latency=30000 latency_var=0 null=false @@ -894,8 +894,10 @@ system=system pio=system.iobus.master[22] [system.realview.nvmem] -type=PhysicalMemory +type=SimpleMemory +conf_table_reported=false file= +in_addr_map=true latency=30000 latency_var=0 null=false diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-checker/simout b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-checker/simout index 37a41903b..8da57663e 100755 --- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-checker/simout +++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-checker/simout @@ -1,12 +1,12 @@ gem5 Simulator System. http://gem5.org gem5 is copyrighted software; use the --copyright option for details. -gem5 compiled Mar 17 2012 11:46:05 -gem5 started Mar 17 2012 18:15:21 -gem5 executing on u200540-lin -command line: build/ARM/gem5.fast -d build/ARM/tests/fast/long/fs/10.linux-boot/arm/linux/realview-o3-checker -re tests/run.py build/ARM/tests/fast/long/fs/10.linux-boot/arm/linux/realview-o3-checker +gem5 compiled May 8 2012 15:17:37 +gem5 started May 8 2012 17:08:48 +gem5 executing on piton +command line: build/ARM/gem5.opt -d build/ARM/tests/opt/long/fs/10.linux-boot/arm/linux/realview-o3-checker -re tests/run.py build/ARM/tests/opt/long/fs/10.linux-boot/arm/linux/realview-o3-checker Global frequency set at 1000000000000 ticks per second -info: kernel located at: /projects/pd/randd/dist/binaries/vmlinux.arm.smp.fb.2.6.38.8 +info: kernel located at: /dist/m5/system/binaries/vmlinux.arm.smp.fb.2.6.38.8 info: Using bootloader at address 0x80000000 info: Entering event queue @ 0. Starting simulation... Exiting @ tick 2501676293500 because m5_exit instruction encountered 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 ec9717e88..bf07a31ac 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 @@ -4,22 +4,13 @@ sim_seconds 2.501676 # Nu sim_ticks 2501676293500 # Number of ticks simulated final_tick 2501676293500 # Number of ticks from beginning of simulation (restored from checkpoints and never reset) sim_freq 1000000000000 # Frequency of simulated ticks -host_inst_rate 79857 # Simulator instruction rate (inst/s) -host_op_rate 103150 # Simulator op (including micro ops) rate (op/s) -host_tick_rate 3360326389 # Simulator tick rate (ticks/s) -host_mem_usage 381664 # Number of bytes of host memory used -host_seconds 744.47 # Real time elapsed on the host +host_inst_rate 32851 # Simulator instruction rate (inst/s) +host_op_rate 42433 # Simulator op (including micro ops) rate (op/s) +host_tick_rate 1382341341 # Simulator tick rate (ticks/s) +host_mem_usage 388632 # Number of bytes of host memory used +host_seconds 1809.74 # Real time elapsed on the host sim_insts 59451291 # Number of instructions simulated sim_ops 76792341 # Number of ops (including micro ops) simulated -system.realview.nvmem.bytes_read 64 # Number of bytes read from this memory -system.realview.nvmem.bytes_inst_read 64 # Number of instructions bytes read from this memory -system.realview.nvmem.bytes_written 0 # Number of bytes written to this memory -system.realview.nvmem.num_reads 1 # Number of read requests responded to by this memory -system.realview.nvmem.num_writes 0 # Number of write requests responded to by this memory -system.realview.nvmem.num_other 0 # Number of other requests responded to by this memory -system.realview.nvmem.bw_read 26 # Total read bandwidth from this memory (bytes/s) -system.realview.nvmem.bw_inst_read 26 # Instruction read bandwidth from this memory (bytes/s) -system.realview.nvmem.bw_total 26 # Total bandwidth to/from this memory (bytes/s) system.physmem.bytes_read 129652968 # Number of bytes read from this memory system.physmem.bytes_inst_read 1121024 # Number of instructions bytes read from this memory system.physmem.bytes_written 9585096 # Number of bytes written to this memory @@ -30,6 +21,15 @@ system.physmem.bw_read 51826437 # To system.physmem.bw_inst_read 448109 # Instruction read bandwidth from this memory (bytes/s) system.physmem.bw_write 3831469 # Write bandwidth from this memory (bytes/s) system.physmem.bw_total 55657906 # Total bandwidth to/from this memory (bytes/s) +system.realview.nvmem.bytes_read 64 # Number of bytes read from this memory +system.realview.nvmem.bytes_inst_read 64 # Number of instructions bytes read from this memory +system.realview.nvmem.bytes_written 0 # Number of bytes written to this memory +system.realview.nvmem.num_reads 1 # Number of read requests responded to by this memory +system.realview.nvmem.num_writes 0 # Number of write requests responded to by this memory +system.realview.nvmem.num_other 0 # Number of other requests responded to by this memory +system.realview.nvmem.bw_read 26 # Total read bandwidth from this memory (bytes/s) +system.realview.nvmem.bw_inst_read 26 # Instruction read bandwidth from this memory (bytes/s) +system.realview.nvmem.bw_total 26 # Total bandwidth to/from this memory (bytes/s) system.l2c.replacements 119784 # number of replacements system.l2c.tagsinuse 25999.615357 # Cycle average of tags in use system.l2c.total_refs 1826145 # Total number of references to valid blocks. @@ -169,8 +169,8 @@ system.l2c.blocked_cycles::no_mshrs 0 # nu system.l2c.blocked_cycles::no_targets 0 # number of cycles access was blocked system.l2c.blocked::no_mshrs 0 # number of cycles access was blocked system.l2c.blocked::no_targets 0 # number of cycles access was blocked -system.l2c.avg_blocked_cycles::no_mshrs no_value # average number of cycles each access was blocked -system.l2c.avg_blocked_cycles::no_targets no_value # average number of cycles each access was blocked +system.l2c.avg_blocked_cycles::no_mshrs nan # average number of cycles each access was blocked +system.l2c.avg_blocked_cycles::no_targets nan # average number of cycles each access was blocked system.l2c.fast_writes 0 # number of fast writes performed system.l2c.cache_copies 0 # number of cache copies performed system.l2c.writebacks::writebacks 102641 # number of writebacks @@ -683,7 +683,7 @@ system.cpu.icache.blocked_cycles::no_targets 0 system.cpu.icache.blocked::no_mshrs 416 # number of cycles access was blocked system.cpu.icache.blocked::no_targets 0 # number of cycles access was blocked system.cpu.icache.avg_blocked_cycles::no_mshrs 7692.266827 # average number of cycles each access was blocked -system.cpu.icache.avg_blocked_cycles::no_targets no_value # average number of cycles each access was blocked +system.cpu.icache.avg_blocked_cycles::no_targets nan # average number of cycles each access was blocked system.cpu.icache.fast_writes 0 # number of fast writes performed system.cpu.icache.cache_copies 0 # number of cache copies performed system.cpu.icache.writebacks::writebacks 59844 # number of writebacks @@ -858,14 +858,14 @@ system.iocache.replacements 0 # nu system.iocache.tagsinuse 0 # Cycle average of tags in use system.iocache.total_refs 0 # Total number of references to valid blocks. system.iocache.sampled_refs 0 # Sample count of references to valid blocks. -system.iocache.avg_refs no_value # Average number of references to valid blocks. +system.iocache.avg_refs nan # Average number of references to valid blocks. system.iocache.warmup_cycle 0 # Cycle when the warmup percentage was hit. system.iocache.blocked_cycles::no_mshrs 0 # number of cycles access was blocked system.iocache.blocked_cycles::no_targets 0 # number of cycles access was blocked system.iocache.blocked::no_mshrs 0 # number of cycles access was blocked system.iocache.blocked::no_targets 0 # number of cycles access was blocked -system.iocache.avg_blocked_cycles::no_mshrs no_value # average number of cycles each access was blocked -system.iocache.avg_blocked_cycles::no_targets no_value # average number of cycles each access was blocked +system.iocache.avg_blocked_cycles::no_mshrs nan # average number of cycles each access was blocked +system.iocache.avg_blocked_cycles::no_targets nan # average number of cycles each access was blocked system.iocache.fast_writes 0 # number of fast writes performed system.iocache.cache_copies 0 # number of cache copies performed system.iocache.ReadReq_mshr_uncacheable_latency::realview.clcd 1296055922339 # number of ReadReq MSHR uncacheable cycles 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 54fc0a20c..632f13a19 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 @@ -10,20 +10,18 @@ time_sync_spin_threshold=100000000 type=LinuxArmSystem children=bridge cf0 cpu0 cpu1 intrctrl iobus iocache l2c membus physmem realview terminal toL2Bus vncserver atags_addr=256 -boot_loader=/projects/pd/randd/dist/binaries/boot.arm -boot_loader_mem=system.realview.nvmem +boot_loader=/dist/m5/system/binaries/boot.arm boot_osflags=earlyprintk console=ttyAMA0 lpj=19988480 norandmaps rw loglevel=8 mem=128MB root=/dev/sda1 flags_addr=268435504 gic_cpu_addr=520093952 init_param=0 -kernel=/projects/pd/randd/dist/binaries/vmlinux.arm.smp.fb.2.6.38.8 +kernel=/dist/m5/system/binaries/vmlinux.arm.smp.fb.2.6.38.8 load_addr_mask=268435455 machine_type=RealView_PBX mem_mode=timing memories=system.physmem system.realview.nvmem midr_regval=890224640 num_work_ids=16 -physmem=system.physmem readfile=tests/halt.sh symbolfile= work_begin_ckpt_count=0 @@ -63,7 +61,7 @@ table_size=65536 [system.cf0.image.child] type=RawDiskImage -image_file=/projects/pd/randd/dist/disks/linux-arm-ael.img +image_file=/dist/m5/system/disks/linux-arm-ael.img read_only=true [system.cpu0] @@ -1045,8 +1043,10 @@ warn_access=warn pio=system.membus.default [system.physmem] -type=PhysicalMemory +type=SimpleMemory +conf_table_reported=true file= +in_addr_map=true latency=30000 latency_var=0 null=false @@ -1277,8 +1277,10 @@ system=system pio=system.iobus.master[22] [system.realview.nvmem] -type=PhysicalMemory +type=SimpleMemory +conf_table_reported=false file= +in_addr_map=true latency=30000 latency_var=0 null=false 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 b8d0cb88a..6b6706b72 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,12 +1,12 @@ gem5 Simulator System. http://gem5.org gem5 is copyrighted software; use the --copyright option for details. -gem5 compiled Mar 17 2012 11:46:05 -gem5 started Mar 17 2012 18:22:04 -gem5 executing on u200540-lin -command line: build/ARM/gem5.fast -d build/ARM/tests/fast/long/fs/10.linux-boot/arm/linux/realview-o3-dual -re tests/run.py build/ARM/tests/fast/long/fs/10.linux-boot/arm/linux/realview-o3-dual +gem5 compiled May 8 2012 15:17:37 +gem5 started May 8 2012 17:10:02 +gem5 executing on piton +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 -info: kernel located at: /projects/pd/randd/dist/binaries/vmlinux.arm.smp.fb.2.6.38.8 +info: kernel located at: /dist/m5/system/binaries/vmlinux.arm.smp.fb.2.6.38.8 info: Using bootloader at address 0x80000000 info: Entering event queue @ 0. Starting simulation... Exiting @ tick 2570828403500 because m5_exit instruction encountered 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 c5e5a6be8..afefe64cd 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,22 +4,13 @@ sim_seconds 2.570828 # Nu sim_ticks 2570828403500 # Number of ticks simulated final_tick 2570828403500 # Number of ticks from beginning of simulation (restored from checkpoints and never reset) sim_freq 1000000000000 # Frequency of simulated ticks -host_inst_rate 96885 # Simulator instruction rate (inst/s) -host_op_rate 125154 # Simulator op (including micro ops) rate (op/s) -host_tick_rate 4026902595 # Simulator tick rate (ticks/s) -host_mem_usage 385208 # Number of bytes of host memory used -host_seconds 638.41 # Real time elapsed on the host +host_inst_rate 36466 # Simulator instruction rate (inst/s) +host_op_rate 47106 # Simulator op (including micro ops) rate (op/s) +host_tick_rate 1515652841 # Simulator tick rate (ticks/s) +host_mem_usage 392156 # Number of bytes of host memory used +host_seconds 1696.19 # Real time elapsed on the host sim_insts 61852501 # Number of instructions simulated sim_ops 79899751 # Number of ops (including micro ops) simulated -system.realview.nvmem.bytes_read 384 # Number of bytes read from this memory -system.realview.nvmem.bytes_inst_read 384 # Number of instructions bytes read from this memory -system.realview.nvmem.bytes_written 0 # Number of bytes written to this memory -system.realview.nvmem.num_reads 6 # Number of read requests responded to by this memory -system.realview.nvmem.num_writes 0 # Number of write requests responded to by this memory -system.realview.nvmem.num_other 0 # Number of other requests responded to by this memory -system.realview.nvmem.bw_read 149 # Total read bandwidth from this memory (bytes/s) -system.realview.nvmem.bw_inst_read 149 # Instruction read bandwidth from this memory (bytes/s) -system.realview.nvmem.bw_total 149 # Total bandwidth to/from this memory (bytes/s) system.physmem.bytes_read 131418468 # Number of bytes read from this memory system.physmem.bytes_inst_read 1192320 # Number of instructions bytes read from this memory system.physmem.bytes_written 10172560 # Number of bytes written to this memory @@ -30,6 +21,15 @@ system.physmem.bw_read 51119113 # To system.physmem.bw_inst_read 463788 # Instruction read bandwidth from this memory (bytes/s) system.physmem.bw_write 3956919 # Write bandwidth from this memory (bytes/s) system.physmem.bw_total 55076032 # Total bandwidth to/from this memory (bytes/s) +system.realview.nvmem.bytes_read 384 # Number of bytes read from this memory +system.realview.nvmem.bytes_inst_read 384 # Number of instructions bytes read from this memory +system.realview.nvmem.bytes_written 0 # Number of bytes written to this memory +system.realview.nvmem.num_reads 6 # Number of read requests responded to by this memory +system.realview.nvmem.num_writes 0 # Number of write requests responded to by this memory +system.realview.nvmem.num_other 0 # Number of other requests responded to by this memory +system.realview.nvmem.bw_read 149 # Total read bandwidth from this memory (bytes/s) +system.realview.nvmem.bw_inst_read 149 # Instruction read bandwidth from this memory (bytes/s) +system.realview.nvmem.bw_total 149 # Total bandwidth to/from this memory (bytes/s) system.l2c.replacements 130877 # number of replacements system.l2c.tagsinuse 27573.095607 # Cycle average of tags in use system.l2c.total_refs 1846037 # Total number of references to valid blocks. @@ -267,8 +267,8 @@ system.l2c.blocked_cycles::no_mshrs 0 # nu system.l2c.blocked_cycles::no_targets 0 # number of cycles access was blocked system.l2c.blocked::no_mshrs 0 # number of cycles access was blocked system.l2c.blocked::no_targets 0 # number of cycles access was blocked -system.l2c.avg_blocked_cycles::no_mshrs no_value # average number of cycles each access was blocked -system.l2c.avg_blocked_cycles::no_targets no_value # average number of cycles each access was blocked +system.l2c.avg_blocked_cycles::no_mshrs nan # average number of cycles each access was blocked +system.l2c.avg_blocked_cycles::no_targets nan # average number of cycles each access was blocked system.l2c.fast_writes 0 # number of fast writes performed system.l2c.cache_copies 0 # number of cache copies performed system.l2c.writebacks::writebacks 111616 # number of writebacks @@ -812,7 +812,7 @@ system.cpu0.icache.blocked_cycles::no_targets 0 system.cpu0.icache.blocked::no_mshrs 206 # number of cycles access was blocked system.cpu0.icache.blocked::no_targets 0 # number of cycles access was blocked system.cpu0.icache.avg_blocked_cycles::no_mshrs 8213.548544 # average number of cycles each access was blocked -system.cpu0.icache.avg_blocked_cycles::no_targets no_value # average number of cycles each access was blocked +system.cpu0.icache.avg_blocked_cycles::no_targets nan # average number of cycles each access was blocked system.cpu0.icache.fast_writes 0 # number of fast writes performed system.cpu0.icache.cache_copies 0 # number of cache copies performed system.cpu0.icache.writebacks::writebacks 19233 # number of writebacks @@ -1345,7 +1345,7 @@ system.cpu1.icache.blocked_cycles::no_targets 0 system.cpu1.icache.blocked::no_mshrs 234 # number of cycles access was blocked system.cpu1.icache.blocked::no_targets 0 # number of cycles access was blocked system.cpu1.icache.avg_blocked_cycles::no_mshrs 6555.529915 # average number of cycles each access was blocked -system.cpu1.icache.avg_blocked_cycles::no_targets no_value # average number of cycles each access was blocked +system.cpu1.icache.avg_blocked_cycles::no_targets nan # average number of cycles each access was blocked system.cpu1.icache.fast_writes 0 # number of fast writes performed system.cpu1.icache.cache_copies 0 # number of cache copies performed system.cpu1.icache.writebacks::writebacks 32964 # number of writebacks @@ -1523,14 +1523,14 @@ system.iocache.replacements 0 # nu system.iocache.tagsinuse 0 # Cycle average of tags in use system.iocache.total_refs 0 # Total number of references to valid blocks. system.iocache.sampled_refs 0 # Sample count of references to valid blocks. -system.iocache.avg_refs no_value # Average number of references to valid blocks. +system.iocache.avg_refs nan # Average number of references to valid blocks. system.iocache.warmup_cycle 0 # Cycle when the warmup percentage was hit. system.iocache.blocked_cycles::no_mshrs 0 # number of cycles access was blocked system.iocache.blocked_cycles::no_targets 0 # number of cycles access was blocked system.iocache.blocked::no_mshrs 0 # number of cycles access was blocked system.iocache.blocked::no_targets 0 # number of cycles access was blocked -system.iocache.avg_blocked_cycles::no_mshrs no_value # average number of cycles each access was blocked -system.iocache.avg_blocked_cycles::no_targets no_value # average number of cycles each access was blocked +system.iocache.avg_blocked_cycles::no_mshrs nan # average number of cycles each access was blocked +system.iocache.avg_blocked_cycles::no_targets nan # average number of cycles each access was blocked system.iocache.fast_writes 0 # number of fast writes performed system.iocache.cache_copies 0 # number of cache copies performed system.iocache.ReadReq_mshr_uncacheable_latency::realview.clcd 1308112364906 # number of ReadReq MSHR uncacheable cycles diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-dual/status b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-dual/status index 696134c20..e41fe50a6 100644 --- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-dual/status +++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-dual/status @@ -1 +1 @@ -build/ARM/tests/fast/long/fs/10.linux-boot/arm/linux/realview-o3-dual FAILED! +build/ARM/tests/opt/long/fs/10.linux-boot/arm/linux/realview-o3-dual FAILED! diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-dual/system.terminal b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-dual/system.terminal index f397106c4..92fa179c5 100644 Binary files a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-dual/system.terminal and b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-dual/system.terminal differ diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3/config.ini b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3/config.ini index 7b28f6e69..e70ebd6c7 100644 --- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3/config.ini +++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3/config.ini @@ -10,20 +10,18 @@ time_sync_spin_threshold=100000000 type=LinuxArmSystem children=bridge cf0 cpu intrctrl iobus iocache l2c membus physmem realview terminal toL2Bus vncserver atags_addr=256 -boot_loader=/projects/pd/randd/dist/binaries/boot.arm -boot_loader_mem=system.realview.nvmem +boot_loader=/dist/m5/system/binaries/boot.arm boot_osflags=earlyprintk console=ttyAMA0 lpj=19988480 norandmaps rw loglevel=8 mem=128MB root=/dev/sda1 flags_addr=268435504 gic_cpu_addr=520093952 init_param=0 -kernel=/projects/pd/randd/dist/binaries/vmlinux.arm.smp.fb.2.6.38.8 +kernel=/dist/m5/system/binaries/vmlinux.arm.smp.fb.2.6.38.8 load_addr_mask=268435455 machine_type=RealView_PBX mem_mode=timing memories=system.physmem system.realview.nvmem midr_regval=890224640 num_work_ids=16 -physmem=system.physmem readfile=tests/halt.sh symbolfile= work_begin_ckpt_count=0 @@ -63,7 +61,7 @@ table_size=65536 [system.cf0.image.child] type=RawDiskImage -image_file=/projects/pd/randd/dist/disks/linux-arm-ael.img +image_file=/dist/m5/system/disks/linux-arm-ael.img read_only=true [system.cpu] @@ -603,8 +601,10 @@ warn_access=warn pio=system.membus.default [system.physmem] -type=PhysicalMemory +type=SimpleMemory +conf_table_reported=true file= +in_addr_map=true latency=30000 latency_var=0 null=false @@ -835,8 +835,10 @@ system=system pio=system.iobus.master[22] [system.realview.nvmem] -type=PhysicalMemory +type=SimpleMemory +conf_table_reported=false file= +in_addr_map=true latency=30000 latency_var=0 null=false diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3/simout b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3/simout index 16435a5eb..3751264d1 100755 --- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3/simout +++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3/simout @@ -1,12 +1,12 @@ gem5 Simulator System. http://gem5.org gem5 is copyrighted software; use the --copyright option for details. -gem5 compiled Mar 17 2012 11:46:05 -gem5 started Mar 17 2012 18:11:20 -gem5 executing on u200540-lin -command line: build/ARM/gem5.fast -d build/ARM/tests/fast/long/fs/10.linux-boot/arm/linux/realview-o3 -re tests/run.py build/ARM/tests/fast/long/fs/10.linux-boot/arm/linux/realview-o3 +gem5 compiled May 8 2012 15:17:37 +gem5 started May 8 2012 17:05:43 +gem5 executing on piton +command line: build/ARM/gem5.opt -d build/ARM/tests/opt/long/fs/10.linux-boot/arm/linux/realview-o3 -re tests/run.py build/ARM/tests/opt/long/fs/10.linux-boot/arm/linux/realview-o3 Global frequency set at 1000000000000 ticks per second -info: kernel located at: /projects/pd/randd/dist/binaries/vmlinux.arm.smp.fb.2.6.38.8 +info: kernel located at: /dist/m5/system/binaries/vmlinux.arm.smp.fb.2.6.38.8 info: Using bootloader at address 0x80000000 info: Entering event queue @ 0. Starting simulation... Exiting @ tick 2501676293500 because m5_exit instruction encountered 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 356c695d2..97fe75f03 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 @@ -4,22 +4,13 @@ sim_seconds 2.501676 # Nu sim_ticks 2501676293500 # Number of ticks simulated final_tick 2501676293500 # Number of ticks from beginning of simulation (restored from checkpoints and never reset) sim_freq 1000000000000 # Frequency of simulated ticks -host_inst_rate 93944 # Simulator instruction rate (inst/s) -host_op_rate 121345 # Simulator op (including micro ops) rate (op/s) -host_tick_rate 3953091411 # Simulator tick rate (ticks/s) -host_mem_usage 381372 # Number of bytes of host memory used -host_seconds 632.84 # Real time elapsed on the host +host_inst_rate 32202 # Simulator instruction rate (inst/s) +host_op_rate 41595 # Simulator op (including micro ops) rate (op/s) +host_tick_rate 1355039119 # Simulator tick rate (ticks/s) +host_mem_usage 388344 # Number of bytes of host memory used +host_seconds 1846.20 # Real time elapsed on the host sim_insts 59451291 # Number of instructions simulated sim_ops 76792341 # Number of ops (including micro ops) simulated -system.realview.nvmem.bytes_read 64 # Number of bytes read from this memory -system.realview.nvmem.bytes_inst_read 64 # Number of instructions bytes read from this memory -system.realview.nvmem.bytes_written 0 # Number of bytes written to this memory -system.realview.nvmem.num_reads 1 # Number of read requests responded to by this memory -system.realview.nvmem.num_writes 0 # Number of write requests responded to by this memory -system.realview.nvmem.num_other 0 # Number of other requests responded to by this memory -system.realview.nvmem.bw_read 26 # Total read bandwidth from this memory (bytes/s) -system.realview.nvmem.bw_inst_read 26 # Instruction read bandwidth from this memory (bytes/s) -system.realview.nvmem.bw_total 26 # Total bandwidth to/from this memory (bytes/s) system.physmem.bytes_read 129652968 # Number of bytes read from this memory system.physmem.bytes_inst_read 1121024 # Number of instructions bytes read from this memory system.physmem.bytes_written 9585096 # Number of bytes written to this memory @@ -30,6 +21,15 @@ system.physmem.bw_read 51826437 # To system.physmem.bw_inst_read 448109 # Instruction read bandwidth from this memory (bytes/s) system.physmem.bw_write 3831469 # Write bandwidth from this memory (bytes/s) system.physmem.bw_total 55657906 # Total bandwidth to/from this memory (bytes/s) +system.realview.nvmem.bytes_read 64 # Number of bytes read from this memory +system.realview.nvmem.bytes_inst_read 64 # Number of instructions bytes read from this memory +system.realview.nvmem.bytes_written 0 # Number of bytes written to this memory +system.realview.nvmem.num_reads 1 # Number of read requests responded to by this memory +system.realview.nvmem.num_writes 0 # Number of write requests responded to by this memory +system.realview.nvmem.num_other 0 # Number of other requests responded to by this memory +system.realview.nvmem.bw_read 26 # Total read bandwidth from this memory (bytes/s) +system.realview.nvmem.bw_inst_read 26 # Instruction read bandwidth from this memory (bytes/s) +system.realview.nvmem.bw_total 26 # Total bandwidth to/from this memory (bytes/s) system.l2c.replacements 119784 # number of replacements system.l2c.tagsinuse 25999.615357 # Cycle average of tags in use system.l2c.total_refs 1826145 # Total number of references to valid blocks. @@ -169,8 +169,8 @@ system.l2c.blocked_cycles::no_mshrs 0 # nu system.l2c.blocked_cycles::no_targets 0 # number of cycles access was blocked system.l2c.blocked::no_mshrs 0 # number of cycles access was blocked system.l2c.blocked::no_targets 0 # number of cycles access was blocked -system.l2c.avg_blocked_cycles::no_mshrs no_value # average number of cycles each access was blocked -system.l2c.avg_blocked_cycles::no_targets no_value # average number of cycles each access was blocked +system.l2c.avg_blocked_cycles::no_mshrs nan # average number of cycles each access was blocked +system.l2c.avg_blocked_cycles::no_targets nan # average number of cycles each access was blocked system.l2c.fast_writes 0 # number of fast writes performed system.l2c.cache_copies 0 # number of cache copies performed system.l2c.writebacks::writebacks 102641 # number of writebacks @@ -638,7 +638,7 @@ system.cpu.icache.blocked_cycles::no_targets 0 system.cpu.icache.blocked::no_mshrs 416 # number of cycles access was blocked system.cpu.icache.blocked::no_targets 0 # number of cycles access was blocked system.cpu.icache.avg_blocked_cycles::no_mshrs 7692.266827 # average number of cycles each access was blocked -system.cpu.icache.avg_blocked_cycles::no_targets no_value # average number of cycles each access was blocked +system.cpu.icache.avg_blocked_cycles::no_targets nan # average number of cycles each access was blocked system.cpu.icache.fast_writes 0 # number of fast writes performed system.cpu.icache.cache_copies 0 # number of cache copies performed system.cpu.icache.writebacks::writebacks 59844 # number of writebacks @@ -813,14 +813,14 @@ system.iocache.replacements 0 # nu system.iocache.tagsinuse 0 # Cycle average of tags in use system.iocache.total_refs 0 # Total number of references to valid blocks. system.iocache.sampled_refs 0 # Sample count of references to valid blocks. -system.iocache.avg_refs no_value # Average number of references to valid blocks. +system.iocache.avg_refs nan # Average number of references to valid blocks. system.iocache.warmup_cycle 0 # Cycle when the warmup percentage was hit. system.iocache.blocked_cycles::no_mshrs 0 # number of cycles access was blocked system.iocache.blocked_cycles::no_targets 0 # number of cycles access was blocked system.iocache.blocked::no_mshrs 0 # number of cycles access was blocked system.iocache.blocked::no_targets 0 # number of cycles access was blocked -system.iocache.avg_blocked_cycles::no_mshrs no_value # average number of cycles each access was blocked -system.iocache.avg_blocked_cycles::no_targets no_value # average number of cycles each access was blocked +system.iocache.avg_blocked_cycles::no_mshrs nan # average number of cycles each access was blocked +system.iocache.avg_blocked_cycles::no_targets nan # average number of cycles each access was blocked system.iocache.fast_writes 0 # number of fast writes performed system.iocache.cache_copies 0 # number of cache copies performed system.iocache.ReadReq_mshr_uncacheable_latency::realview.clcd 1296055922339 # number of ReadReq MSHR uncacheable cycles -- cgit v1.2.3