From 6437f3f4ee5275f59a4472d95e0abac1a8b82e22 Mon Sep 17 00:00:00 2001 From: Gabe Black Date: Mon, 4 Jun 2012 10:43:11 -0700 Subject: X86: Update stats for the CPUID change. --- .../ref/x86/linux/pc-simple-atomic/config.ini | 15 ++++++--------- .../ref/x86/linux/pc-simple-atomic/simout | 10 ++++------ .../ref/x86/linux/pc-simple-atomic/stats.txt | 12 ++++++------ .../ref/x86/linux/pc-simple-timing/config.ini | 15 ++++++--------- .../ref/x86/linux/pc-simple-timing/simout | 10 ++++------ .../ref/x86/linux/pc-simple-timing/stats.txt | 12 ++++++------ .../se/00.hello/ref/x86/linux/o3-timing/config.ini | 8 +++----- .../se/00.hello/ref/x86/linux/o3-timing/simout | 8 +++----- .../se/00.hello/ref/x86/linux/o3-timing/stats.txt | 16 ++++++++-------- .../ref/x86/linux/simple-atomic/config.ini | 5 ++--- .../se/00.hello/ref/x86/linux/simple-atomic/simout | 8 +++----- .../00.hello/ref/x86/linux/simple-atomic/stats.txt | 12 ++++++------ .../ref/x86/linux/simple-timing-ruby/config.ini | 2 +- .../ref/x86/linux/simple-timing-ruby/ruby.stats | 22 +++++++++++----------- .../ref/x86/linux/simple-timing-ruby/simout | 8 +++----- .../ref/x86/linux/simple-timing-ruby/stats.txt | 12 ++++++------ .../ref/x86/linux/simple-timing/config.ini | 8 +++----- .../se/00.hello/ref/x86/linux/simple-timing/simout | 8 +++----- .../00.hello/ref/x86/linux/simple-timing/stats.txt | 12 ++++++------ 19 files changed, 90 insertions(+), 113 deletions(-) (limited to 'tests/quick') diff --git a/tests/quick/fs/10.linux-boot/ref/x86/linux/pc-simple-atomic/config.ini b/tests/quick/fs/10.linux-boot/ref/x86/linux/pc-simple-atomic/config.ini index 784b98c30..8bff0c61a 100644 --- a/tests/quick/fs/10.linux-boot/ref/x86/linux/pc-simple-atomic/config.ini +++ b/tests/quick/fs/10.linux-boot/ref/x86/linux/pc-simple-atomic/config.ini @@ -15,7 +15,7 @@ e820_table=system.e820_table init_param=0 intel_mp_pointer=system.intel_mp_pointer intel_mp_table=system.intel_mp_table -kernel=/scratch/nilay/GEM5/system/binaries/x86_64-vmlinux-2.6.22.9 +kernel=/dist/m5/system/binaries/x86_64-vmlinux-2.6.22.9 load_addr_mask=18446744073709551615 mem_mode=atomic memories=system.physmem @@ -603,9 +603,8 @@ type=IntrControl sys=system [system.iobus] -type=Bus +type=NoncoherentBus block_size=64 -bus_id=0 clock=1000 header_cycles=1 use_default_range=true @@ -665,10 +664,9 @@ cpu_side=system.toL2Bus.master[0] mem_side=system.membus.slave[3] [system.membus] -type=Bus +type=CoherentBus children=badaddr_responder block_size=64 -bus_id=1 clock=1000 header_cycles=1 use_default_range=false @@ -936,7 +934,7 @@ table_size=65536 [system.pc.south_bridge.ide.disks0.image.child] type=RawDiskImage -image_file=/scratch/nilay/GEM5/system/disks/linux-x86.img +image_file=/dist/m5/system/disks/linux-x86.img read_only=true [system.pc.south_bridge.ide.disks1] @@ -956,7 +954,7 @@ table_size=65536 [system.pc.south_bridge.ide.disks1.image.child] type=RawDiskImage -image_file=/scratch/nilay/GEM5/system/disks/linux-bigswap2.img +image_file=/dist/m5/system/disks/linux-bigswap2.img read_only=true [system.pc.south_bridge.int_lines0] @@ -1147,9 +1145,8 @@ vendor= version= [system.toL2Bus] -type=Bus +type=CoherentBus block_size=64 -bus_id=0 clock=1000 header_cycles=1 use_default_range=false diff --git a/tests/quick/fs/10.linux-boot/ref/x86/linux/pc-simple-atomic/simout b/tests/quick/fs/10.linux-boot/ref/x86/linux/pc-simple-atomic/simout index 424a8fb50..a62c40c07 100755 --- a/tests/quick/fs/10.linux-boot/ref/x86/linux/pc-simple-atomic/simout +++ b/tests/quick/fs/10.linux-boot/ref/x86/linux/pc-simple-atomic/simout @@ -1,15 +1,13 @@ -Redirecting stdout to build/X86/tests/opt/quick/fs/10.linux-boot/x86/linux/pc-simple-atomic/simout -Redirecting stderr to build/X86/tests/opt/quick/fs/10.linux-boot/x86/linux/pc-simple-atomic/simerr gem5 Simulator System. http://gem5.org gem5 is copyrighted software; use the --copyright option for details. -gem5 compiled May 21 2012 19:00:49 -gem5 started May 21 2012 19:00:57 -gem5 executing on ribera.cs.wisc.edu +gem5 compiled Jun 3 2012 13:30:44 +gem5 started Jun 3 2012 13:30:59 +gem5 executing on burrito command line: build/X86/gem5.opt -d build/X86/tests/opt/quick/fs/10.linux-boot/x86/linux/pc-simple-atomic -re tests/run.py build/X86/tests/opt/quick/fs/10.linux-boot/x86/linux/pc-simple-atomic warning: add_child('terminal'): child 'terminal' already has parent Global frequency set at 1000000000000 ticks per second -info: kernel located at: /scratch/nilay/GEM5/system/binaries/x86_64-vmlinux-2.6.22.9 +info: kernel located at: /dist/m5/system/binaries/x86_64-vmlinux-2.6.22.9 0: rtc: Real-time clock set to Sun Jan 1 00:00:00 2012 info: Entering event queue @ 0. Starting simulation... Exiting @ tick 5112043255000 because m5_exit instruction encountered diff --git a/tests/quick/fs/10.linux-boot/ref/x86/linux/pc-simple-atomic/stats.txt b/tests/quick/fs/10.linux-boot/ref/x86/linux/pc-simple-atomic/stats.txt index 6f54e627b..344f40088 100644 --- a/tests/quick/fs/10.linux-boot/ref/x86/linux/pc-simple-atomic/stats.txt +++ b/tests/quick/fs/10.linux-boot/ref/x86/linux/pc-simple-atomic/stats.txt @@ -4,11 +4,11 @@ sim_seconds 5.112043 # Nu sim_ticks 5112043255000 # Number of ticks simulated final_tick 5112043255000 # Number of ticks from beginning of simulation (restored from checkpoints and never reset) sim_freq 1000000000000 # Frequency of simulated ticks -host_inst_rate 514394 # Simulator instruction rate (inst/s) -host_op_rate 1053258 # Simulator op (including micro ops) rate (op/s) -host_tick_rate 13160254594 # Simulator tick rate (ticks/s) -host_mem_usage 404120 # Number of bytes of host memory used -host_seconds 388.45 # Real time elapsed on the host +host_inst_rate 704165 # Simulator instruction rate (inst/s) +host_op_rate 1441828 # Simulator op (including micro ops) rate (op/s) +host_tick_rate 18015373871 # Simulator tick rate (ticks/s) +host_mem_usage 378116 # Number of bytes of host memory used +host_seconds 283.76 # Real time elapsed on the host sim_insts 199813913 # Number of instructions simulated sim_ops 409133277 # Number of ops (including micro ops) simulated system.physmem.bytes_read 15568704 # Number of bytes read from this memory @@ -187,7 +187,7 @@ system.cpu.num_func_calls 0 # nu system.cpu.num_conditional_control_insts 39954968 # number of instructions that are conditional controls system.cpu.num_int_insts 374297244 # number of integer instructions system.cpu.num_fp_insts 0 # number of float instructions -system.cpu.num_int_register_reads 1159024883 # number of times the integer registers were read +system.cpu.num_int_register_reads 1159028861 # number of times the integer registers were read system.cpu.num_int_register_writes 636431619 # number of times the integer registers were written system.cpu.num_fp_register_reads 0 # number of times the floating registers were read system.cpu.num_fp_register_writes 0 # number of times the floating registers were written diff --git a/tests/quick/fs/10.linux-boot/ref/x86/linux/pc-simple-timing/config.ini b/tests/quick/fs/10.linux-boot/ref/x86/linux/pc-simple-timing/config.ini index cb842a83c..8437cb6eb 100644 --- a/tests/quick/fs/10.linux-boot/ref/x86/linux/pc-simple-timing/config.ini +++ b/tests/quick/fs/10.linux-boot/ref/x86/linux/pc-simple-timing/config.ini @@ -15,7 +15,7 @@ e820_table=system.e820_table init_param=0 intel_mp_pointer=system.intel_mp_pointer intel_mp_table=system.intel_mp_table -kernel=/scratch/nilay/GEM5/system/binaries/x86_64-vmlinux-2.6.22.9 +kernel=/dist/m5/system/binaries/x86_64-vmlinux-2.6.22.9 load_addr_mask=18446744073709551615 mem_mode=timing memories=system.physmem @@ -599,9 +599,8 @@ type=IntrControl sys=system [system.iobus] -type=Bus +type=NoncoherentBus block_size=64 -bus_id=0 clock=1000 header_cycles=1 use_default_range=true @@ -661,10 +660,9 @@ cpu_side=system.toL2Bus.master[0] mem_side=system.membus.slave[3] [system.membus] -type=Bus +type=CoherentBus children=badaddr_responder block_size=64 -bus_id=1 clock=1000 header_cycles=1 use_default_range=false @@ -932,7 +930,7 @@ table_size=65536 [system.pc.south_bridge.ide.disks0.image.child] type=RawDiskImage -image_file=/scratch/nilay/GEM5/system/disks/linux-x86.img +image_file=/dist/m5/system/disks/linux-x86.img read_only=true [system.pc.south_bridge.ide.disks1] @@ -952,7 +950,7 @@ table_size=65536 [system.pc.south_bridge.ide.disks1.image.child] type=RawDiskImage -image_file=/scratch/nilay/GEM5/system/disks/linux-bigswap2.img +image_file=/dist/m5/system/disks/linux-bigswap2.img read_only=true [system.pc.south_bridge.int_lines0] @@ -1143,9 +1141,8 @@ vendor= version= [system.toL2Bus] -type=Bus +type=CoherentBus block_size=64 -bus_id=0 clock=1000 header_cycles=1 use_default_range=false diff --git a/tests/quick/fs/10.linux-boot/ref/x86/linux/pc-simple-timing/simout b/tests/quick/fs/10.linux-boot/ref/x86/linux/pc-simple-timing/simout index 04d54d050..70b899ba9 100755 --- a/tests/quick/fs/10.linux-boot/ref/x86/linux/pc-simple-timing/simout +++ b/tests/quick/fs/10.linux-boot/ref/x86/linux/pc-simple-timing/simout @@ -1,15 +1,13 @@ -Redirecting stdout to build/X86/tests/opt/quick/fs/10.linux-boot/x86/linux/pc-simple-timing/simout -Redirecting stderr to build/X86/tests/opt/quick/fs/10.linux-boot/x86/linux/pc-simple-timing/simerr gem5 Simulator System. http://gem5.org gem5 is copyrighted software; use the --copyright option for details. -gem5 compiled May 21 2012 19:00:49 -gem5 started May 21 2012 19:04:51 -gem5 executing on ribera.cs.wisc.edu +gem5 compiled Jun 3 2012 13:30:44 +gem5 started Jun 3 2012 13:30:59 +gem5 executing on burrito command line: build/X86/gem5.opt -d build/X86/tests/opt/quick/fs/10.linux-boot/x86/linux/pc-simple-timing -re tests/run.py build/X86/tests/opt/quick/fs/10.linux-boot/x86/linux/pc-simple-timing warning: add_child('terminal'): child 'terminal' already has parent Global frequency set at 1000000000000 ticks per second -info: kernel located at: /scratch/nilay/GEM5/system/binaries/x86_64-vmlinux-2.6.22.9 +info: kernel located at: /dist/m5/system/binaries/x86_64-vmlinux-2.6.22.9 0: rtc: Real-time clock set to Sun Jan 1 00:00:00 2012 info: Entering event queue @ 0. Starting simulation... Exiting @ tick 5195470393000 because m5_exit instruction encountered diff --git a/tests/quick/fs/10.linux-boot/ref/x86/linux/pc-simple-timing/stats.txt b/tests/quick/fs/10.linux-boot/ref/x86/linux/pc-simple-timing/stats.txt index 7f3f31ab7..92c083c66 100644 --- a/tests/quick/fs/10.linux-boot/ref/x86/linux/pc-simple-timing/stats.txt +++ b/tests/quick/fs/10.linux-boot/ref/x86/linux/pc-simple-timing/stats.txt @@ -4,11 +4,11 @@ sim_seconds 5.195470 # Nu sim_ticks 5195470393000 # Number of ticks simulated final_tick 5195470393000 # Number of ticks from beginning of simulation (restored from checkpoints and never reset) sim_freq 1000000000000 # Frequency of simulated ticks -host_inst_rate 457894 # Simulator instruction rate (inst/s) -host_op_rate 878898 # Simulator op (including micro ops) rate (op/s) -host_tick_rate 17221658168 # Simulator tick rate (ticks/s) -host_mem_usage 400980 # Number of bytes of host memory used -host_seconds 301.68 # Real time elapsed on the host +host_inst_rate 435377 # Simulator instruction rate (inst/s) +host_op_rate 835677 # Simulator op (including micro ops) rate (op/s) +host_tick_rate 16374771456 # Simulator tick rate (ticks/s) +host_mem_usage 374904 # Number of bytes of host memory used +host_seconds 317.29 # Real time elapsed on the host sim_insts 138138472 # Number of instructions simulated sim_ops 265147881 # Number of ops (including micro ops) simulated system.physmem.bytes_read 13764096 # Number of bytes read from this memory @@ -331,7 +331,7 @@ system.cpu.num_func_calls 0 # nu system.cpu.num_conditional_control_insts 24882695 # number of instructions that are conditional controls system.cpu.num_int_insts 249556386 # number of integer instructions system.cpu.num_fp_insts 0 # number of float instructions -system.cpu.num_int_register_reads 778081993 # number of times the integer registers were read +system.cpu.num_int_register_reads 778086007 # number of times the integer registers were read system.cpu.num_int_register_writes 422921187 # number of times the integer registers were written system.cpu.num_fp_register_reads 0 # number of times the floating registers were read system.cpu.num_fp_register_writes 0 # number of times the floating registers were written diff --git a/tests/quick/se/00.hello/ref/x86/linux/o3-timing/config.ini b/tests/quick/se/00.hello/ref/x86/linux/o3-timing/config.ini index c82cb42ab..f4e4acba8 100644 --- a/tests/quick/se/00.hello/ref/x86/linux/o3-timing/config.ini +++ b/tests/quick/se/00.hello/ref/x86/linux/o3-timing/config.ini @@ -495,9 +495,8 @@ cpu_side=system.cpu.toL2Bus.master[0] mem_side=system.membus.slave[1] [system.cpu.toL2Bus] -type=Bus +type=CoherentBus block_size=64 -bus_id=0 clock=1000 header_cycles=1 use_default_range=false @@ -516,7 +515,7 @@ egid=100 env= errout=cerr euid=100 -executable=tests/test-progs/hello/bin/x86/linux/hello +executable=/dist/m5/regression/test-progs/hello/bin/x86/linux/hello gid=100 input=cin max_stack_size=67108864 @@ -528,9 +527,8 @@ system=system uid=100 [system.membus] -type=Bus +type=CoherentBus block_size=64 -bus_id=0 clock=1000 header_cycles=1 use_default_range=false diff --git a/tests/quick/se/00.hello/ref/x86/linux/o3-timing/simout b/tests/quick/se/00.hello/ref/x86/linux/o3-timing/simout index b715ba6b6..ebb140a84 100755 --- a/tests/quick/se/00.hello/ref/x86/linux/o3-timing/simout +++ b/tests/quick/se/00.hello/ref/x86/linux/o3-timing/simout @@ -1,11 +1,9 @@ -Redirecting stdout to build/X86/tests/opt/quick/se/00.hello/x86/linux/o3-timing/simout -Redirecting stderr to build/X86/tests/opt/quick/se/00.hello/x86/linux/o3-timing/simerr gem5 Simulator System. http://gem5.org gem5 is copyrighted software; use the --copyright option for details. -gem5 compiled May 21 2012 19:00:49 -gem5 started May 21 2012 19:03:20 -gem5 executing on ribera.cs.wisc.edu +gem5 compiled Jun 3 2012 13:30:44 +gem5 started Jun 3 2012 13:30:58 +gem5 executing on burrito command line: build/X86/gem5.opt -d build/X86/tests/opt/quick/se/00.hello/x86/linux/o3-timing -re tests/run.py build/X86/tests/opt/quick/se/00.hello/x86/linux/o3-timing Global frequency set at 1000000000000 ticks per second info: Entering event queue @ 0. Starting simulation... diff --git a/tests/quick/se/00.hello/ref/x86/linux/o3-timing/stats.txt b/tests/quick/se/00.hello/ref/x86/linux/o3-timing/stats.txt index f253ef45b..5a009d0f1 100644 --- a/tests/quick/se/00.hello/ref/x86/linux/o3-timing/stats.txt +++ b/tests/quick/se/00.hello/ref/x86/linux/o3-timing/stats.txt @@ -4,11 +4,11 @@ sim_seconds 0.000012 # Nu sim_ticks 12198000 # Number of ticks simulated final_tick 12198000 # Number of ticks from beginning of simulation (restored from checkpoints and never reset) sim_freq 1000000000000 # Frequency of simulated ticks -host_inst_rate 10821 # Simulator instruction rate (inst/s) -host_op_rate 19598 # Simulator op (including micro ops) rate (op/s) -host_tick_rate 24369729 # Simulator tick rate (ticks/s) -host_mem_usage 271424 # Number of bytes of host memory used -host_seconds 0.50 # Real time elapsed on the host +host_inst_rate 27776 # Simulator instruction rate (inst/s) +host_op_rate 50299 # Simulator op (including micro ops) rate (op/s) +host_tick_rate 62542635 # Simulator tick rate (ticks/s) +host_mem_usage 245428 # Number of bytes of host memory used +host_seconds 0.20 # Real time elapsed on the host sim_insts 5416 # Number of instructions simulated sim_ops 9809 # Number of ops (including micro ops) simulated system.physmem.bytes_read 28864 # Number of bytes read from this memory @@ -80,8 +80,8 @@ system.cpu.rename.IQFullEvents 50 # Nu system.cpu.rename.LSQFullEvents 591 # Number of times rename has blocked due to LSQ full system.cpu.rename.FullRegisterEvents 1 # Number of times there has been no free registers system.cpu.rename.RenamedOperands 35223 # Number of destination operands rename has renamed -system.cpu.rename.RenameLookups 70482 # Number of register rename lookups that rename has made -system.cpu.rename.int_rename_lookups 70466 # Number of integer rename lookups +system.cpu.rename.RenameLookups 70488 # Number of register rename lookups that rename has made +system.cpu.rename.int_rename_lookups 70472 # Number of integer rename lookups system.cpu.rename.fp_rename_lookups 16 # Number of floating rename lookups system.cpu.rename.CommittedMaps 14707 # Number of HB maps that are committed system.cpu.rename.UndoneMaps 20516 # Number of HB maps that are undone due to squashing @@ -283,7 +283,7 @@ system.cpu.cpi 4.504616 # CP system.cpu.cpi_total 4.504616 # CPI: Total CPI of All Threads system.cpu.ipc 0.221995 # IPC: Instructions Per Cycle system.cpu.ipc_total 0.221995 # IPC: Total IPC of All Threads -system.cpu.int_regfile_reads 35454 # number of integer regfile reads +system.cpu.int_regfile_reads 35460 # number of integer regfile reads system.cpu.int_regfile_writes 22063 # number of integer regfile writes system.cpu.fp_regfile_reads 4 # number of floating regfile reads system.cpu.misc_regfile_reads 7402 # number of misc regfile reads diff --git a/tests/quick/se/00.hello/ref/x86/linux/simple-atomic/config.ini b/tests/quick/se/00.hello/ref/x86/linux/simple-atomic/config.ini index 8422307f0..3367142fe 100644 --- a/tests/quick/se/00.hello/ref/x86/linux/simple-atomic/config.ini +++ b/tests/quick/se/00.hello/ref/x86/linux/simple-atomic/config.ini @@ -103,7 +103,7 @@ egid=100 env= errout=cerr euid=100 -executable=tests/test-progs/hello/bin/x86/linux/hello +executable=/dist/m5/regression/test-progs/hello/bin/x86/linux/hello gid=100 input=cin max_stack_size=67108864 @@ -115,9 +115,8 @@ system=system uid=100 [system.membus] -type=Bus +type=CoherentBus block_size=64 -bus_id=0 clock=1000 header_cycles=1 use_default_range=false diff --git a/tests/quick/se/00.hello/ref/x86/linux/simple-atomic/simout b/tests/quick/se/00.hello/ref/x86/linux/simple-atomic/simout index 4c14d0aa7..0daaf6112 100755 --- a/tests/quick/se/00.hello/ref/x86/linux/simple-atomic/simout +++ b/tests/quick/se/00.hello/ref/x86/linux/simple-atomic/simout @@ -1,11 +1,9 @@ -Redirecting stdout to build/X86/tests/opt/quick/se/00.hello/x86/linux/simple-atomic/simout -Redirecting stderr to build/X86/tests/opt/quick/se/00.hello/x86/linux/simple-atomic/simerr gem5 Simulator System. http://gem5.org gem5 is copyrighted software; use the --copyright option for details. -gem5 compiled May 21 2012 19:00:49 -gem5 started May 21 2012 19:10:03 -gem5 executing on ribera.cs.wisc.edu +gem5 compiled Jun 3 2012 13:30:44 +gem5 started Jun 3 2012 13:30:59 +gem5 executing on burrito command line: build/X86/gem5.opt -d build/X86/tests/opt/quick/se/00.hello/x86/linux/simple-atomic -re tests/run.py build/X86/tests/opt/quick/se/00.hello/x86/linux/simple-atomic Global frequency set at 1000000000000 ticks per second info: Entering event queue @ 0. Starting simulation... diff --git a/tests/quick/se/00.hello/ref/x86/linux/simple-atomic/stats.txt b/tests/quick/se/00.hello/ref/x86/linux/simple-atomic/stats.txt index 9d71bb46a..2c5d9e840 100644 --- a/tests/quick/se/00.hello/ref/x86/linux/simple-atomic/stats.txt +++ b/tests/quick/se/00.hello/ref/x86/linux/simple-atomic/stats.txt @@ -4,11 +4,11 @@ sim_seconds 0.000006 # Nu sim_ticks 5651000 # Number of ticks simulated final_tick 5651000 # Number of ticks from beginning of simulation (restored from checkpoints and never reset) sim_freq 1000000000000 # Frequency of simulated ticks -host_inst_rate 288907 # Simulator instruction rate (inst/s) -host_op_rate 522587 # Simulator op (including micro ops) rate (op/s) -host_tick_rate 300697068 # Simulator tick rate (ticks/s) -host_mem_usage 260908 # Number of bytes of host memory used -host_seconds 0.02 # Real time elapsed on the host +host_inst_rate 8235 # Simulator instruction rate (inst/s) +host_op_rate 14913 # Simulator op (including micro ops) rate (op/s) +host_tick_rate 8590426 # Simulator tick rate (ticks/s) +host_mem_usage 234908 # Number of bytes of host memory used +host_seconds 0.66 # Real time elapsed on the host sim_insts 5417 # Number of instructions simulated sim_ops 9810 # Number of ops (including micro ops) simulated system.physmem.bytes_read 62348 # Number of bytes read from this memory @@ -33,7 +33,7 @@ system.cpu.num_func_calls 0 # nu system.cpu.num_conditional_control_insts 904 # number of instructions that are conditional controls system.cpu.num_int_insts 9715 # number of integer instructions system.cpu.num_fp_insts 0 # number of float instructions -system.cpu.num_int_register_reads 29928 # number of times the integer registers were read +system.cpu.num_int_register_reads 29934 # number of times the integer registers were read system.cpu.num_int_register_writes 14707 # number of times the integer registers were written system.cpu.num_fp_register_reads 0 # number of times the floating registers were read system.cpu.num_fp_register_writes 0 # number of times the floating registers were written diff --git a/tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/config.ini b/tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/config.ini index ab4fb38df..e879347ff 100644 --- a/tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/config.ini +++ b/tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/config.ini @@ -99,7 +99,7 @@ egid=100 env= errout=cerr euid=100 -executable=tests/test-progs/hello/bin/x86/linux/hello +executable=/dist/m5/regression/test-progs/hello/bin/x86/linux/hello gid=100 input=cin max_stack_size=67108864 diff --git a/tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/ruby.stats b/tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/ruby.stats index a99abad11..a0ea73428 100644 --- a/tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/ruby.stats +++ b/tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/ruby.stats @@ -34,7 +34,7 @@ periodic_stats_period: 1000000 ================ End RubySystem Configuration Print ================ -Real time: May/21/2012 19:13:48 +Real time: Jun/03/2012 13:31:00 Profiler Stats -------------- @@ -43,18 +43,18 @@ Elapsed_time_in_minutes: 0.0166667 Elapsed_time_in_hours: 0.000277778 Elapsed_time_in_days: 1.15741e-05 -Virtual_time_in_seconds: 0.46 -Virtual_time_in_minutes: 0.00766667 -Virtual_time_in_hours: 0.000127778 -Virtual_time_in_days: 5.32407e-06 +Virtual_time_in_seconds: 0.35 +Virtual_time_in_minutes: 0.00583333 +Virtual_time_in_hours: 9.72222e-05 +Virtual_time_in_days: 4.05093e-06 Ruby_current_time: 276484 Ruby_start_time: 0 Ruby_cycles: 276484 -mbytes_resident: 53.1328 -mbytes_total: 274.648 -resident_ratio: 0.193486 +mbytes_resident: 52.5547 +mbytes_total: 249.254 +resident_ratio: 0.210848 ruby_cycles_executed: [ 276485 ] @@ -125,11 +125,11 @@ Resource Usage page_size: 4096 user_time: 0 system_time: 0 -page_reclaims: 15001 -page_faults: 3 +page_reclaims: 11223 +page_faults: 0 swaps: 0 block_inputs: 0 -block_outputs: 0 +block_outputs: 96 Network Stats ------------- diff --git a/tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/simout b/tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/simout index ab4279ad8..bef47caec 100755 --- a/tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/simout +++ b/tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/simout @@ -1,11 +1,9 @@ -Redirecting stdout to build/X86/tests/opt/quick/se/00.hello/x86/linux/simple-timing-ruby/simout -Redirecting stderr to build/X86/tests/opt/quick/se/00.hello/x86/linux/simple-timing-ruby/simerr gem5 Simulator System. http://gem5.org gem5 is copyrighted software; use the --copyright option for details. -gem5 compiled May 21 2012 19:00:49 -gem5 started May 21 2012 19:13:47 -gem5 executing on ribera.cs.wisc.edu +gem5 compiled Jun 3 2012 13:30:44 +gem5 started Jun 3 2012 13:30:58 +gem5 executing on burrito command line: build/X86/gem5.opt -d build/X86/tests/opt/quick/se/00.hello/x86/linux/simple-timing-ruby -re tests/run.py build/X86/tests/opt/quick/se/00.hello/x86/linux/simple-timing-ruby Global frequency set at 1000000000 ticks per second info: Entering event queue @ 0. Starting simulation... diff --git a/tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/stats.txt b/tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/stats.txt index 0a683990f..436ded977 100644 --- a/tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/stats.txt +++ b/tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/stats.txt @@ -4,11 +4,11 @@ sim_seconds 0.000276 # Nu sim_ticks 276484 # Number of ticks simulated final_tick 276484 # Number of ticks from beginning of simulation (restored from checkpoints and never reset) sim_freq 1000000000 # Frequency of simulated ticks -host_inst_rate 40683 # Simulator instruction rate (inst/s) -host_op_rate 73662 # Simulator op (including micro ops) rate (op/s) -host_tick_rate 2075784 # Simulator tick rate (ticks/s) -host_mem_usage 281244 # Number of bytes of host memory used -host_seconds 0.13 # Real time elapsed on the host +host_inst_rate 34222 # Simulator instruction rate (inst/s) +host_op_rate 61969 # Simulator op (including micro ops) rate (op/s) +host_tick_rate 1746397 # Simulator tick rate (ticks/s) +host_mem_usage 255240 # Number of bytes of host memory used +host_seconds 0.16 # Real time elapsed on the host sim_insts 5417 # Number of instructions simulated sim_ops 9810 # Number of ops (including micro ops) simulated system.physmem.bytes_read 62348 # Number of bytes read from this memory @@ -33,7 +33,7 @@ system.cpu.num_func_calls 0 # nu system.cpu.num_conditional_control_insts 904 # number of instructions that are conditional controls system.cpu.num_int_insts 9715 # number of integer instructions system.cpu.num_fp_insts 0 # number of float instructions -system.cpu.num_int_register_reads 29928 # number of times the integer registers were read +system.cpu.num_int_register_reads 29934 # number of times the integer registers were read system.cpu.num_int_register_writes 14707 # number of times the integer registers were written system.cpu.num_fp_register_reads 0 # number of times the floating registers were read system.cpu.num_fp_register_writes 0 # number of times the floating registers were written diff --git a/tests/quick/se/00.hello/ref/x86/linux/simple-timing/config.ini b/tests/quick/se/00.hello/ref/x86/linux/simple-timing/config.ini index dddeed309..3ced8b832 100644 --- a/tests/quick/se/00.hello/ref/x86/linux/simple-timing/config.ini +++ b/tests/quick/se/00.hello/ref/x86/linux/simple-timing/config.ini @@ -164,9 +164,8 @@ cpu_side=system.cpu.toL2Bus.master[0] mem_side=system.membus.slave[1] [system.cpu.toL2Bus] -type=Bus +type=CoherentBus block_size=64 -bus_id=0 clock=1000 header_cycles=1 use_default_range=false @@ -185,7 +184,7 @@ egid=100 env= errout=cerr euid=100 -executable=tests/test-progs/hello/bin/x86/linux/hello +executable=/dist/m5/regression/test-progs/hello/bin/x86/linux/hello gid=100 input=cin max_stack_size=67108864 @@ -197,9 +196,8 @@ system=system uid=100 [system.membus] -type=Bus +type=CoherentBus block_size=64 -bus_id=0 clock=1000 header_cycles=1 use_default_range=false diff --git a/tests/quick/se/00.hello/ref/x86/linux/simple-timing/simout b/tests/quick/se/00.hello/ref/x86/linux/simple-timing/simout index bbf370aff..91d5c9297 100755 --- a/tests/quick/se/00.hello/ref/x86/linux/simple-timing/simout +++ b/tests/quick/se/00.hello/ref/x86/linux/simple-timing/simout @@ -1,11 +1,9 @@ -Redirecting stdout to build/X86/tests/opt/quick/se/00.hello/x86/linux/simple-timing/simout -Redirecting stderr to build/X86/tests/opt/quick/se/00.hello/x86/linux/simple-timing/simerr gem5 Simulator System. http://gem5.org gem5 is copyrighted software; use the --copyright option for details. -gem5 compiled May 21 2012 19:00:49 -gem5 started May 21 2012 19:09:59 -gem5 executing on ribera.cs.wisc.edu +gem5 compiled Jun 3 2012 13:30:44 +gem5 started Jun 3 2012 13:30:59 +gem5 executing on burrito command line: build/X86/gem5.opt -d build/X86/tests/opt/quick/se/00.hello/x86/linux/simple-timing -re tests/run.py build/X86/tests/opt/quick/se/00.hello/x86/linux/simple-timing Global frequency set at 1000000000000 ticks per second info: Entering event queue @ 0. Starting simulation... diff --git a/tests/quick/se/00.hello/ref/x86/linux/simple-timing/stats.txt b/tests/quick/se/00.hello/ref/x86/linux/simple-timing/stats.txt index 2734be727..2325f81a1 100644 --- a/tests/quick/se/00.hello/ref/x86/linux/simple-timing/stats.txt +++ b/tests/quick/se/00.hello/ref/x86/linux/simple-timing/stats.txt @@ -4,11 +4,11 @@ sim_seconds 0.000029 # Nu sim_ticks 28768000 # Number of ticks simulated final_tick 28768000 # Number of ticks from beginning of simulation (restored from checkpoints and never reset) sim_freq 1000000000000 # Frequency of simulated ticks -host_inst_rate 209143 # Simulator instruction rate (inst/s) -host_op_rate 378428 # Simulator op (including micro ops) rate (op/s) -host_tick_rate 1108849830 # Simulator tick rate (ticks/s) -host_mem_usage 269844 # Number of bytes of host memory used -host_seconds 0.03 # Real time elapsed on the host +host_inst_rate 39729 # Simulator instruction rate (inst/s) +host_op_rate 71940 # Simulator op (including micro ops) rate (op/s) +host_tick_rate 210944443 # Simulator tick rate (ticks/s) +host_mem_usage 244104 # Number of bytes of host memory used +host_seconds 0.14 # Real time elapsed on the host sim_insts 5417 # Number of instructions simulated sim_ops 9810 # Number of ops (including micro ops) simulated system.physmem.bytes_read 23104 # Number of bytes read from this memory @@ -32,7 +32,7 @@ system.cpu.num_func_calls 0 # nu system.cpu.num_conditional_control_insts 904 # number of instructions that are conditional controls system.cpu.num_int_insts 9715 # number of integer instructions system.cpu.num_fp_insts 0 # number of float instructions -system.cpu.num_int_register_reads 29928 # number of times the integer registers were read +system.cpu.num_int_register_reads 29934 # number of times the integer registers were read system.cpu.num_int_register_writes 14707 # number of times the integer registers were written system.cpu.num_fp_register_reads 0 # number of times the floating registers were read system.cpu.num_fp_register_writes 0 # number of times the floating registers were written -- cgit v1.2.3