X86: Update stats for the CPUID change.

9 files changed, 40 insertions, 51 deletions

diff --git a/tests/long/se/10.mcf/ref/x86/linux/o3-timing/config.ini b/tests/long/se/10.mcf/ref/x86/linux/o3-timing/config.ini
index cb0a90f11..084c1a30a 100644
--- a/tests/long/se/10.mcf/ref/x86/linux/o3-timing/config.ini
+++ b/tests/long/se/10.mcf/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,9 +515,9 @@ egid=100
 env=
 errout=cerr
 euid=100
-executable=/scratch/nilay/GEM5/dist/m5/cpu2000/binaries/x86/linux/mcf
+executable=/dist/m5/cpu2000/binaries/x86/linux/mcf
 gid=100
-input=/scratch/nilay/GEM5/dist/m5/cpu2000/data/mcf/smred/input/mcf.in
+input=/dist/m5/cpu2000/data/mcf/smred/input/mcf.in
 max_stack_size=67108864
 output=cout
 pid=100
@@ -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/long/se/10.mcf/ref/x86/linux/o3-timing/simout b/tests/long/se/10.mcf/ref/x86/linux/o3-timing/simout
index d6b0619bd..7dd036543 100755
--- a/tests/long/se/10.mcf/ref/x86/linux/o3-timing/simout
+++ b/tests/long/se/10.mcf/ref/x86/linux/o3-timing/simout
@@ -1,11 +1,9 @@
-Redirecting stdout to build/X86/tests/opt/long/se/10.mcf/x86/linux/o3-timing/simout
-Redirecting stderr to build/X86/tests/opt/long/se/10.mcf/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:10:14
-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/long/se/10.mcf/x86/linux/o3-timing -re tests/run.py build/X86/tests/opt/long/se/10.mcf/x86/linux/o3-timing
 Global frequency set at 1000000000000 ticks per second
 info: Entering event queue @ 0.  Starting simulation...
diff --git a/tests/long/se/10.mcf/ref/x86/linux/o3-timing/stats.txt b/tests/long/se/10.mcf/ref/x86/linux/o3-timing/stats.txt
index a58d7758c..2d4c91c54 100644
--- a/tests/long/se/10.mcf/ref/x86/linux/o3-timing/stats.txt
+++ b/tests/long/se/10.mcf/ref/x86/linux/o3-timing/stats.txt
@@ -4,11 +4,11 @@ sim_seconds                                  0.067388                       # Nu
 sim_ticks                                 67388458000                       # Number of ticks simulated
 final_tick                                67388458000                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                 1000000000000                       # Frequency of simulated ticks
-host_inst_rate                                  49866                       # Simulator instruction rate (inst/s)
-host_op_rate                                    87805                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                               21269638                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 411868                       # Number of bytes of host memory used
-host_seconds                                  3168.29                       # Real time elapsed on the host
+host_inst_rate                                  74550                       # Simulator instruction rate (inst/s)
+host_op_rate                                   131270                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                               31798513                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 385908                       # Number of bytes of host memory used
+host_seconds                                  2119.23                       # Real time elapsed on the host
 sim_insts                                   157988582                       # Number of instructions simulated
 sim_ops                                     278192519                       # Number of ops (including micro ops) simulated
 system.physmem.bytes_read                     3907520                       # Number of bytes read from this memory
@@ -81,8 +81,8 @@ system.cpu.rename.IQFullEvents                   3712                       # Nu
 system.cpu.rename.LSQFullEvents              23187560                       # Number of times rename has blocked due to LSQ full
 system.cpu.rename.FullRegisterEvents            79157                       # Number of times there has been no free registers
 system.cpu.rename.RenamedOperands           414755881                       # Number of destination operands rename has renamed
-system.cpu.rename.RenameLookups            1009935088                       # Number of register rename lookups that rename has made
-system.cpu.rename.int_rename_lookups       1009932388                       # Number of integer rename lookups
+system.cpu.rename.RenameLookups            1009935094                       # Number of register rename lookups that rename has made
+system.cpu.rename.int_rename_lookups       1009932394                       # Number of integer rename lookups
 system.cpu.rename.fp_rename_lookups              2700                       # Number of floating rename lookups
 system.cpu.rename.CommittedMaps             341010940                       # Number of HB maps that are committed
 system.cpu.rename.UndoneMaps                 73744941                       # Number of HB maps that are undone due to squashing
@@ -284,7 +284,7 @@ system.cpu.cpi                               0.853080                       # CP
 system.cpu.cpi_total                         0.853080                       # CPI: Total CPI of All Threads
 system.cpu.ipc                               1.172223                       # IPC: Instructions Per Cycle
 system.cpu.ipc_total                         1.172223                       # IPC: Total IPC of All Threads
-system.cpu.int_regfile_reads                705322543                       # number of integer regfile reads
+system.cpu.int_regfile_reads                705322547                       # number of integer regfile reads
 system.cpu.int_regfile_writes               373244258                       # number of integer regfile writes
 system.cpu.fp_regfile_reads                       361                       # number of floating regfile reads
 system.cpu.fp_regfile_writes                      193                       # number of floating regfile writes
diff --git a/tests/long/se/10.mcf/ref/x86/linux/simple-atomic/config.ini b/tests/long/se/10.mcf/ref/x86/linux/simple-atomic/config.ini
index 3db1877d2..3fd88efc2 100644
--- a/tests/long/se/10.mcf/ref/x86/linux/simple-atomic/config.ini
+++ b/tests/long/se/10.mcf/ref/x86/linux/simple-atomic/config.ini
@@ -103,9 +103,9 @@ egid=100
 env=
 errout=cerr
 euid=100
-executable=/scratch/nilay/GEM5/dist/m5/cpu2000/binaries/x86/linux/mcf
+executable=/dist/m5/cpu2000/binaries/x86/linux/mcf
 gid=100
-input=/scratch/nilay/GEM5/dist/m5/cpu2000/data/mcf/smred/input/mcf.in
+input=/dist/m5/cpu2000/data/mcf/smred/input/mcf.in
 max_stack_size=67108864
 output=cout
 pid=100
@@ -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/long/se/10.mcf/ref/x86/linux/simple-atomic/simout b/tests/long/se/10.mcf/ref/x86/linux/simple-atomic/simout
index fce15c036..8772b21f0 100755
--- a/tests/long/se/10.mcf/ref/x86/linux/simple-atomic/simout
+++ b/tests/long/se/10.mcf/ref/x86/linux/simple-atomic/simout
@@ -1,11 +1,9 @@
-Redirecting stdout to build/X86/tests/opt/long/se/10.mcf/x86/linux/simple-atomic/simout
-Redirecting stderr to build/X86/tests/opt/long/se/10.mcf/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:00:58
-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/long/se/10.mcf/x86/linux/simple-atomic -re tests/run.py build/X86/tests/opt/long/se/10.mcf/x86/linux/simple-atomic
 Global frequency set at 1000000000000 ticks per second
 info: Entering event queue @ 0.  Starting simulation...
diff --git a/tests/long/se/10.mcf/ref/x86/linux/simple-atomic/stats.txt b/tests/long/se/10.mcf/ref/x86/linux/simple-atomic/stats.txt
index 6c9341510..09f40044d 100644
--- a/tests/long/se/10.mcf/ref/x86/linux/simple-atomic/stats.txt
+++ b/tests/long/se/10.mcf/ref/x86/linux/simple-atomic/stats.txt
@@ -4,11 +4,11 @@ sim_seconds                                  0.168950                       # Nu
 sim_ticks                                168950072000                       # Number of ticks simulated
 final_tick                               168950072000                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                 1000000000000                       # Frequency of simulated ticks
-host_inst_rate                                 714486                       # Simulator instruction rate (inst/s)
-host_op_rate                                  1258095                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                              764057931                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 400764                       # Number of bytes of host memory used
-host_seconds                                   221.12                       # Real time elapsed on the host
+host_inst_rate                                 563497                       # Simulator instruction rate (inst/s)
+host_op_rate                                   992227                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                              602592819                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 374808                       # Number of bytes of host memory used
+host_seconds                                   280.37                       # Real time elapsed on the host
 sim_insts                                   157988583                       # Number of instructions simulated
 sim_ops                                     278192520                       # Number of ops (including micro ops) simulated
 system.physmem.bytes_read                  2458815679                       # Number of bytes read from this memory
@@ -33,7 +33,7 @@ system.cpu.num_func_calls                           0                       # nu
 system.cpu.num_conditional_control_insts     18628012                       # number of instructions that are conditional controls
 system.cpu.num_int_insts                    278186228                       # number of integer instructions
 system.cpu.num_fp_insts                            40                       # number of float instructions
-system.cpu.num_int_register_reads           834011906                       # number of times the integer registers were read
+system.cpu.num_int_register_reads           834011910                       # number of times the integer registers were read
 system.cpu.num_int_register_writes          341010914                       # number of times the integer registers were written
 system.cpu.num_fp_register_reads                   40                       # number of times the floating registers were read
 system.cpu.num_fp_register_writes                  26                       # number of times the floating registers were written
diff --git a/tests/long/se/10.mcf/ref/x86/linux/simple-timing/config.ini b/tests/long/se/10.mcf/ref/x86/linux/simple-timing/config.ini
index 8da90e4f8..96f41a3e2 100644
--- a/tests/long/se/10.mcf/ref/x86/linux/simple-timing/config.ini
+++ b/tests/long/se/10.mcf/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,9 +184,9 @@ egid=100
 env=
 errout=cerr
 euid=100
-executable=/scratch/nilay/GEM5/dist/m5/cpu2000/binaries/x86/linux/mcf
+executable=/dist/m5/cpu2000/binaries/x86/linux/mcf
 gid=100
-input=/scratch/nilay/GEM5/dist/m5/cpu2000/data/mcf/smred/input/mcf.in
+input=/dist/m5/cpu2000/data/mcf/smred/input/mcf.in
 max_stack_size=67108864
 output=cout
 pid=100
@@ -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/long/se/10.mcf/ref/x86/linux/simple-timing/simout b/tests/long/se/10.mcf/ref/x86/linux/simple-timing/simout
index 704c6b28f..3e731c17d 100755
--- a/tests/long/se/10.mcf/ref/x86/linux/simple-timing/simout
+++ b/tests/long/se/10.mcf/ref/x86/linux/simple-timing/simout
@@ -1,11 +1,9 @@
-Redirecting stdout to build/X86/tests/opt/long/se/10.mcf/x86/linux/simple-timing/simout
-Redirecting stderr to build/X86/tests/opt/long/se/10.mcf/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:00:58
-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/long/se/10.mcf/x86/linux/simple-timing -re tests/run.py build/X86/tests/opt/long/se/10.mcf/x86/linux/simple-timing
 Global frequency set at 1000000000000 ticks per second
 info: Entering event queue @ 0.  Starting simulation...
diff --git a/tests/long/se/10.mcf/ref/x86/linux/simple-timing/stats.txt b/tests/long/se/10.mcf/ref/x86/linux/simple-timing/stats.txt
index 3b408b67c..093a41c03 100644
--- a/tests/long/se/10.mcf/ref/x86/linux/simple-timing/stats.txt
+++ b/tests/long/se/10.mcf/ref/x86/linux/simple-timing/stats.txt
@@ -4,11 +4,11 @@ sim_seconds                                  0.370011                       # Nu
 sim_ticks                                370010840000                       # Number of ticks simulated
 final_tick                               370010840000                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                 1000000000000                       # Frequency of simulated ticks
-host_inst_rate                                 298215                       # Simulator instruction rate (inst/s)
-host_op_rate                                   525109                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                              698422266                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 409692                       # Number of bytes of host memory used
-host_seconds                                   529.78                       # Real time elapsed on the host
+host_inst_rate                                 376379                       # Simulator instruction rate (inst/s)
+host_op_rate                                   662743                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                              881483751                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 383736                       # Number of bytes of host memory used
+host_seconds                                   419.76                       # Real time elapsed on the host
 sim_insts                                   157988583                       # Number of instructions simulated
 sim_ops                                     278192520                       # Number of ops (including micro ops) simulated
 system.physmem.bytes_read                     4900800                       # Number of bytes read from this memory
@@ -33,7 +33,7 @@ system.cpu.num_func_calls                           0                       # nu
 system.cpu.num_conditional_control_insts     18628012                       # number of instructions that are conditional controls
 system.cpu.num_int_insts                    278186228                       # number of integer instructions
 system.cpu.num_fp_insts                            40                       # number of float instructions
-system.cpu.num_int_register_reads           834011906                       # number of times the integer registers were read
+system.cpu.num_int_register_reads           834011910                       # number of times the integer registers were read
 system.cpu.num_int_register_writes          341010914                       # number of times the integer registers were written
 system.cpu.num_fp_register_reads                   40                       # number of times the floating registers were read
 system.cpu.num_fp_register_writes                  26                       # number of times the floating registers were written