X86: Update stats for the CPUID change.

9 files changed, 42 insertions, 59 deletions

diff --git a/tests/long/se/70.twolf/ref/x86/linux/o3-timing/config.ini b/tests/long/se/70.twolf/ref/x86/linux/o3-timing/config.ini
index ae31ca40a..1b6b8f01a 100644
--- a/tests/long/se/70.twolf/ref/x86/linux/o3-timing/config.ini
+++ b/tests/long/se/70.twolf/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=/scratch/nilay/GEM5/dist/m5/cpu2000/binaries/x86/linux/twolf
+executable=/dist/m5/cpu2000/binaries/x86/linux/twolf
 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/long/se/70.twolf/ref/x86/linux/o3-timing/simout b/tests/long/se/70.twolf/ref/x86/linux/o3-timing/simout
index dc48832a4..59b747474 100755
--- a/tests/long/se/70.twolf/ref/x86/linux/o3-timing/simout
+++ b/tests/long/se/70.twolf/ref/x86/linux/o3-timing/simout
@@ -1,14 +1,10 @@
-Redirecting stdout to build/X86/tests/opt/long/se/70.twolf/x86/linux/o3-timing/simout
-Redirecting stderr to build/X86/tests/opt/long/se/70.twolf/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: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/long/se/70.twolf/x86/linux/o3-timing -re tests/run.py build/X86/tests/opt/long/se/70.twolf/x86/linux/o3-timing
-Couldn't unlink  build/X86/tests/opt/long/se/70.twolf/x86/linux/o3-timing/smred.sav
-Couldn't unlink  build/X86/tests/opt/long/se/70.twolf/x86/linux/o3-timing/smred.sv2
 Global frequency set at 1000000000000 ticks per second
 info: Entering event queue @ 0.  Starting simulation...
 
diff --git a/tests/long/se/70.twolf/ref/x86/linux/o3-timing/stats.txt b/tests/long/se/70.twolf/ref/x86/linux/o3-timing/stats.txt
index 247b6d16f..1d5121a0a 100644
--- a/tests/long/se/70.twolf/ref/x86/linux/o3-timing/stats.txt
+++ b/tests/long/se/70.twolf/ref/x86/linux/o3-timing/stats.txt
@@ -4,11 +4,11 @@ sim_seconds                                  0.087752                       # Nu
 sim_ticks                                 87751730000                       # Number of ticks simulated
 final_tick                                87751730000                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                 1000000000000                       # Frequency of simulated ticks
-host_inst_rate                                  34298                       # Simulator instruction rate (inst/s)
-host_op_rate                                    57486                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                               22788458                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 285268                       # Number of bytes of host memory used
-host_seconds                                  3850.71                       # Real time elapsed on the host
+host_inst_rate                                  56809                       # Simulator instruction rate (inst/s)
+host_op_rate                                    95217                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                               37745520                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 259224                       # Number of bytes of host memory used
+host_seconds                                  2324.83                       # Real time elapsed on the host
 sim_insts                                   132071227                       # Number of instructions simulated
 sim_ops                                     221363017                       # Number of ops (including micro ops) simulated
 system.physmem.bytes_read                      345024                       # Number of bytes read from this memory
@@ -80,8 +80,8 @@ system.cpu.rename.IQFullEvents               20636040                       # Nu
 system.cpu.rename.LSQFullEvents              22537767                       # Number of times rename has blocked due to LSQ full
 system.cpu.rename.FullRegisterEvents             2198                       # Number of times there has been no free registers
 system.cpu.rename.RenamedOperands           506554560                       # Number of destination operands rename has renamed
-system.cpu.rename.RenameLookups            1130537576                       # Number of register rename lookups that rename has made
-system.cpu.rename.int_rename_lookups       1120266829                       # Number of integer rename lookups
+system.cpu.rename.RenameLookups            1130537584                       # Number of register rename lookups that rename has made
+system.cpu.rename.int_rename_lookups       1120266837                       # Number of integer rename lookups
 system.cpu.rename.fp_rename_lookups          10270747                       # Number of floating rename lookups
 system.cpu.rename.CommittedMaps             320143989                       # Number of HB maps that are committed
 system.cpu.rename.UndoneMaps                186410571                       # Number of HB maps that are undone due to squashing
@@ -103,10 +103,10 @@ system.cpu.iq.issued_per_cycle::samples     175426420                       # Nu
 system.cpu.iq.issued_per_cycle::mean         1.544061                       # Number of insts issued each cycle
 system.cpu.iq.issued_per_cycle::stdev        1.467197                       # Number of insts issued each cycle
 system.cpu.iq.issued_per_cycle::underflows            0      0.00%      0.00% # Number of insts issued each cycle
-system.cpu.iq.issued_per_cycle::0            49131918     28.01%     28.01% # Number of insts issued each cycle
-system.cpu.iq.issued_per_cycle::1            52597598     29.98%     57.99% # Number of insts issued each cycle
-system.cpu.iq.issued_per_cycle::2            34344441     19.58%     77.57% # Number of insts issued each cycle
-system.cpu.iq.issued_per_cycle::3            18981959     10.82%     88.39% # Number of insts issued each cycle
+system.cpu.iq.issued_per_cycle::0            49131919     28.01%     28.01% # Number of insts issued each cycle
+system.cpu.iq.issued_per_cycle::1            52597597     29.98%     57.99% # Number of insts issued each cycle
+system.cpu.iq.issued_per_cycle::2            34344440     19.58%     77.57% # Number of insts issued each cycle
+system.cpu.iq.issued_per_cycle::3            18981960     10.82%     88.39% # Number of insts issued each cycle
 system.cpu.iq.issued_per_cycle::4            12711399      7.25%     95.63% # Number of insts issued each cycle
 system.cpu.iq.issued_per_cycle::5             4926918      2.81%     98.44% # Number of insts issued each cycle
 system.cpu.iq.issued_per_cycle::6             2079867      1.19%     99.63% # Number of insts issued each cycle
@@ -233,7 +233,7 @@ system.cpu.iew.exec_rate                     1.525690                       # In
 system.cpu.iew.wb_sent                      266689649                       # cumulative count of insts sent to commit
 system.cpu.iew.wb_count                     265814614                       # cumulative count of insts written-back
 system.cpu.iew.wb_producers                 214459238                       # num instructions producing a value
-system.cpu.iew.wb_consumers                 504388651                       # num instructions consuming a value
+system.cpu.iew.wb_consumers                 504388652                       # num instructions consuming a value
 system.cpu.iew.wb_penalized                         0                       # number of instrctions required to write to 'other' IQ
 system.cpu.iew.wb_rate                       1.514583                       # insts written-back per cycle
 system.cpu.iew.wb_fanout                     0.425186                       # average fanout of values written-back
@@ -283,7 +283,7 @@ system.cpu.cpi                               1.328855                       # CP
 system.cpu.cpi_total                         1.328855                       # CPI: Total CPI of All Threads
 system.cpu.ipc                               0.752528                       # IPC: Instructions Per Cycle
 system.cpu.ipc_total                         0.752528                       # IPC: Total IPC of All Threads
-system.cpu.int_regfile_reads                657510090                       # number of integer regfile reads
+system.cpu.int_regfile_reads                657510098                       # number of integer regfile reads
 system.cpu.int_regfile_writes               365370199                       # number of integer regfile writes
 system.cpu.fp_regfile_reads                   3509073                       # number of floating regfile reads
 system.cpu.fp_regfile_writes                  2221147                       # number of floating regfile writes
diff --git a/tests/long/se/70.twolf/ref/x86/linux/simple-atomic/config.ini b/tests/long/se/70.twolf/ref/x86/linux/simple-atomic/config.ini
index 774020e98..5b797a438 100644
--- a/tests/long/se/70.twolf/ref/x86/linux/simple-atomic/config.ini
+++ b/tests/long/se/70.twolf/ref/x86/linux/simple-atomic/config.ini
@@ -103,7 +103,7 @@ egid=100
 env=
 errout=cerr
 euid=100
-executable=/scratch/nilay/GEM5/dist/m5/cpu2000/binaries/x86/linux/twolf
+executable=/dist/m5/cpu2000/binaries/x86/linux/twolf
 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/long/se/70.twolf/ref/x86/linux/simple-atomic/simout b/tests/long/se/70.twolf/ref/x86/linux/simple-atomic/simout
index 776b4fadc..c6c7c62e1 100755
--- a/tests/long/se/70.twolf/ref/x86/linux/simple-atomic/simout
+++ b/tests/long/se/70.twolf/ref/x86/linux/simple-atomic/simout
@@ -1,14 +1,10 @@
-Redirecting stdout to build/X86/tests/opt/long/se/70.twolf/x86/linux/simple-atomic/simout
-Redirecting stderr to build/X86/tests/opt/long/se/70.twolf/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:08:43
-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/70.twolf/x86/linux/simple-atomic -re tests/run.py build/X86/tests/opt/long/se/70.twolf/x86/linux/simple-atomic
-Couldn't unlink  build/X86/tests/opt/long/se/70.twolf/x86/linux/simple-atomic/smred.sav
-Couldn't unlink  build/X86/tests/opt/long/se/70.twolf/x86/linux/simple-atomic/smred.sv2
 Global frequency set at 1000000000000 ticks per second
 info: Entering event queue @ 0.  Starting simulation...
 
diff --git a/tests/long/se/70.twolf/ref/x86/linux/simple-atomic/stats.txt b/tests/long/se/70.twolf/ref/x86/linux/simple-atomic/stats.txt
index be9f62e84..98c43bfba 100644
--- a/tests/long/se/70.twolf/ref/x86/linux/simple-atomic/stats.txt
+++ b/tests/long/se/70.twolf/ref/x86/linux/simple-atomic/stats.txt
@@ -4,11 +4,11 @@ sim_seconds                                  0.131393                       # Nu
 sim_ticks                                131393100000                       # Number of ticks simulated
 final_tick                               131393100000                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                 1000000000000                       # Frequency of simulated ticks
-host_inst_rate                                 449336                       # Simulator instruction rate (inst/s)
-host_op_rate                                   753127                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                              447028889                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 272700                       # Number of bytes of host memory used
-host_seconds                                   293.93                       # Real time elapsed on the host
+host_inst_rate                                 560372                       # Simulator instruction rate (inst/s)
+host_op_rate                                   939232                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                              557494351                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 246748                       # Number of bytes of host memory used
+host_seconds                                   235.69                       # Real time elapsed on the host
 sim_insts                                   132071228                       # Number of instructions simulated
 sim_ops                                     221363018                       # Number of ops (including micro ops) simulated
 system.physmem.bytes_read                  1698379042                       # Number of bytes read from this memory
@@ -33,7 +33,7 @@ system.cpu.num_func_calls                           0                       # nu
 system.cpu.num_conditional_control_insts      8268471                       # number of instructions that are conditional controls
 system.cpu.num_int_insts                    220339607                       # number of integer instructions
 system.cpu.num_fp_insts                       2162459                       # number of float instructions
-system.cpu.num_int_register_reads           705008819                       # number of times the integer registers were read
+system.cpu.num_int_register_reads           705008823                       # number of times the integer registers were read
 system.cpu.num_int_register_writes          318312586                       # number of times the integer registers were written
 system.cpu.num_fp_register_reads              3037165                       # number of times the floating registers were read
 system.cpu.num_fp_register_writes             1831403                       # number of times the floating registers were written
diff --git a/tests/long/se/70.twolf/ref/x86/linux/simple-timing/config.ini b/tests/long/se/70.twolf/ref/x86/linux/simple-timing/config.ini
index 8ab20ef21..3d56f1a99 100644
--- a/tests/long/se/70.twolf/ref/x86/linux/simple-timing/config.ini
+++ b/tests/long/se/70.twolf/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=/scratch/nilay/GEM5/dist/m5/cpu2000/binaries/x86/linux/twolf
+executable=/dist/m5/cpu2000/binaries/x86/linux/twolf
 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/long/se/70.twolf/ref/x86/linux/simple-timing/simout b/tests/long/se/70.twolf/ref/x86/linux/simple-timing/simout
index 483a9fc09..a97127599 100755
--- a/tests/long/se/70.twolf/ref/x86/linux/simple-timing/simout
+++ b/tests/long/se/70.twolf/ref/x86/linux/simple-timing/simout
@@ -1,14 +1,10 @@
-Redirecting stdout to build/X86/tests/opt/long/se/70.twolf/x86/linux/simple-timing/simout
-Redirecting stderr to build/X86/tests/opt/long/se/70.twolf/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/70.twolf/x86/linux/simple-timing -re tests/run.py build/X86/tests/opt/long/se/70.twolf/x86/linux/simple-timing
-Couldn't unlink  build/X86/tests/opt/long/se/70.twolf/x86/linux/simple-timing/smred.sav
-Couldn't unlink  build/X86/tests/opt/long/se/70.twolf/x86/linux/simple-timing/smred.sv2
 Global frequency set at 1000000000000 ticks per second
 info: Entering event queue @ 0.  Starting simulation...
 
diff --git a/tests/long/se/70.twolf/ref/x86/linux/simple-timing/stats.txt b/tests/long/se/70.twolf/ref/x86/linux/simple-timing/stats.txt
index 029c5536e..1165c8c9e 100644
--- a/tests/long/se/70.twolf/ref/x86/linux/simple-timing/stats.txt
+++ b/tests/long/se/70.twolf/ref/x86/linux/simple-timing/stats.txt
@@ -4,11 +4,11 @@ sim_seconds                                  0.250961                       # Nu
 sim_ticks                                250960631000                       # Number of ticks simulated
 final_tick                               250960631000                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                 1000000000000                       # Frequency of simulated ticks
-host_inst_rate                                 291052                       # Simulator instruction rate (inst/s)
-host_op_rate                                   487829                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                              553054781                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 281636                       # Number of bytes of host memory used
-host_seconds                                   453.77                       # Real time elapsed on the host
+host_inst_rate                                 361817                       # Simulator instruction rate (inst/s)
+host_op_rate                                   606437                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                              687521912                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 255672                       # Number of bytes of host memory used
+host_seconds                                   365.02                       # Real time elapsed on the host
 sim_insts                                   132071228                       # Number of instructions simulated
 sim_ops                                     221363018                       # Number of ops (including micro ops) simulated
 system.physmem.bytes_read                      303040                       # Number of bytes read from this memory
@@ -32,7 +32,7 @@ system.cpu.num_func_calls                           0                       # nu
 system.cpu.num_conditional_control_insts      8268471                       # number of instructions that are conditional controls
 system.cpu.num_int_insts                    220339607                       # number of integer instructions
 system.cpu.num_fp_insts                       2162459                       # number of float instructions
-system.cpu.num_int_register_reads           705008819                       # number of times the integer registers were read
+system.cpu.num_int_register_reads           705008823                       # number of times the integer registers were read
 system.cpu.num_int_register_writes          318312586                       # number of times the integer registers were written
 system.cpu.num_fp_register_reads              3037165                       # number of times the floating registers were read
 system.cpu.num_fp_register_writes             1831403                       # number of times the floating registers were written