summaryrefslogtreecommitdiff
path: root/tests/quick/fs/10.linux-boot/ref
diff options
context:
space:
mode:
authorGabe Black <gblack@eecs.umich.edu>2012-06-04 10:43:11 -0700
committerGabe Black <gblack@eecs.umich.edu>2012-06-04 10:43:11 -0700
commit6437f3f4ee5275f59a4472d95e0abac1a8b82e22 (patch)
treed713965271b0329bca3d4496e491e1d456946dc2 /tests/quick/fs/10.linux-boot/ref
parent35fa5074aa256880f70591eb656dceeb1a7feae0 (diff)
downloadgem5-6437f3f4ee5275f59a4472d95e0abac1a8b82e22.tar.xz
X86: Update stats for the CPUID change.
Diffstat (limited to 'tests/quick/fs/10.linux-boot/ref')
-rw-r--r--tests/quick/fs/10.linux-boot/ref/x86/linux/pc-simple-atomic/config.ini15
-rwxr-xr-xtests/quick/fs/10.linux-boot/ref/x86/linux/pc-simple-atomic/simout10
-rw-r--r--tests/quick/fs/10.linux-boot/ref/x86/linux/pc-simple-atomic/stats.txt12
-rw-r--r--tests/quick/fs/10.linux-boot/ref/x86/linux/pc-simple-timing/config.ini15
-rwxr-xr-xtests/quick/fs/10.linux-boot/ref/x86/linux/pc-simple-timing/simout10
-rw-r--r--tests/quick/fs/10.linux-boot/ref/x86/linux/pc-simple-timing/stats.txt12
6 files changed, 32 insertions, 42 deletions
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