X86: Update stats for the CPUID change.

3 files changed, 41 insertions, 46 deletions

diff --git a/tests/long/fs/10.linux-boot/ref/x86/linux/pc-o3-timing/config.ini b/tests/long/fs/10.linux-boot/ref/x86/linux/pc-o3-timing/config.ini
index 1120c294b..1c6d485f3 100644
--- a/tests/long/fs/10.linux-boot/ref/x86/linux/pc-o3-timing/config.ini
+++ b/tests/long/fs/10.linux-boot/ref/x86/linux/pc-o3-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
@@ -930,9 +930,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
@@ -992,10 +991,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
@@ -1263,7 +1261,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]
@@ -1283,7 +1281,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]
@@ -1474,9 +1472,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/long/fs/10.linux-boot/ref/x86/linux/pc-o3-timing/simout b/tests/long/fs/10.linux-boot/ref/x86/linux/pc-o3-timing/simout
index 807344aef..7261617c5 100755
--- a/tests/long/fs/10.linux-boot/ref/x86/linux/pc-o3-timing/simout
+++ b/tests/long/fs/10.linux-boot/ref/x86/linux/pc-o3-timing/simout
@@ -1,15 +1,13 @@
-Redirecting stdout to build/X86/tests/opt/long/fs/10.linux-boot/x86/linux/pc-o3-timing/simout
-Redirecting stderr to build/X86/tests/opt/long/fs/10.linux-boot/x86/linux/pc-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: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/fs/10.linux-boot/x86/linux/pc-o3-timing -re tests/run.py build/X86/tests/opt/long/fs/10.linux-boot/x86/linux/pc-o3-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 5157514159500 because m5_exit instruction encountered
diff --git a/tests/long/fs/10.linux-boot/ref/x86/linux/pc-o3-timing/stats.txt b/tests/long/fs/10.linux-boot/ref/x86/linux/pc-o3-timing/stats.txt
index 6732f4df4..3dd4a07d4 100644
--- a/tests/long/fs/10.linux-boot/ref/x86/linux/pc-o3-timing/stats.txt
+++ b/tests/long/fs/10.linux-boot/ref/x86/linux/pc-o3-timing/stats.txt
@@ -4,11 +4,11 @@ sim_seconds                                  5.157514                       # Nu
 sim_ticks                                5157514159500                       # Number of ticks simulated
 final_tick                               5157514159500                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                 1000000000000                       # Frequency of simulated ticks
-host_inst_rate                                  88188                       # Simulator instruction rate (inst/s)
-host_op_rate                                   173786                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                             1066411603                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 415716                       # Number of bytes of host memory used
-host_seconds                                  4836.33                       # Real time elapsed on the host
+host_inst_rate                                 128842                       # Simulator instruction rate (inst/s)
+host_op_rate                                   253899                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                             1558019011                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 389972                       # Number of bytes of host memory used
+host_seconds                                  3310.30                       # Real time elapsed on the host
 sim_insts                                   426506235                       # Number of instructions simulated
 sim_ops                                     840483958                       # Number of ops (including micro ops) simulated
 system.physmem.bytes_read                    15959488                       # Number of bytes read from this memory
@@ -392,8 +392,8 @@ system.cpu.rename.IQFullEvents               34551329                       # Nu
 system.cpu.rename.LSQFullEvents               3873333                       # Number of times rename has blocked due to LSQ full
 system.cpu.rename.FullRegisterEvents         31844673                       # Number of times there has been no free registers
 system.cpu.rename.RenamedOperands          1393807250                       # Number of destination operands rename has renamed
-system.cpu.rename.RenameLookups            2487747342                       # Number of register rename lookups that rename has made
-system.cpu.rename.int_rename_lookups       2487746606                       # Number of integer rename lookups
+system.cpu.rename.RenameLookups            2487751490                       # Number of register rename lookups that rename has made
+system.cpu.rename.int_rename_lookups       2487750754                       # Number of integer rename lookups
 system.cpu.rename.fp_rename_lookups               736                       # Number of floating rename lookups
 system.cpu.rename.CommittedMaps            1347499622                       # Number of HB maps that are committed
 system.cpu.rename.UndoneMaps                 46307621                       # Number of HB maps that are undone due to squashing
@@ -406,22 +406,22 @@ system.cpu.memDep0.conflictingLoads           1295912                       # Nu
 system.cpu.memDep0.conflictingStores          1023550                       # Number of conflicting stores.
 system.cpu.iq.iqInstsAdded                  865497785                       # Number of instructions added to the IQ (excludes non-spec)
 system.cpu.iq.iqNonSpecInstsAdded             1720774                       # Number of non-speculative instructions added to the IQ
-system.cpu.iq.iqInstsIssued                 864256508                       # Number of instructions issued
+system.cpu.iq.iqInstsIssued                 864256485                       # Number of instructions issued
 system.cpu.iq.iqSquashedInstsIssued            112298                       # Number of squashed instructions issued
 system.cpu.iq.iqSquashedInstsExamined        25797308                       # Number of squashed instructions iterated over during squash; mainly for profiling
-system.cpu.iq.iqSquashedOperandsExamined     52868004                       # Number of squashed operands that are examined and possibly removed from graph
+system.cpu.iq.iqSquashedOperandsExamined     52868100                       # Number of squashed operands that are examined and possibly removed from graph
 system.cpu.iq.iqSquashedNonSpecRemoved         205226                       # Number of squashed non-spec instructions that were removed
 system.cpu.iq.issued_per_cycle::samples     302354351                       # Number of insts issued each cycle
 system.cpu.iq.issued_per_cycle::mean         2.858423                       # Number of insts issued each cycle
-system.cpu.iq.issued_per_cycle::stdev        2.389400                       # Number of insts issued each cycle
+system.cpu.iq.issued_per_cycle::stdev        2.389396                       # 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            95961743     31.74%     31.74% # Number of insts issued each cycle
-system.cpu.iq.issued_per_cycle::1            22211681      7.35%     39.08% # Number of insts issued each cycle
-system.cpu.iq.issued_per_cycle::2            18919578      6.26%     45.34% # Number of insts issued each cycle
-system.cpu.iq.issued_per_cycle::3             7861063      2.60%     47.94% # Number of insts issued each cycle
-system.cpu.iq.issued_per_cycle::4            80643893     26.67%     74.61% # Number of insts issued each cycle
-system.cpu.iq.issued_per_cycle::5             3287491      1.09%     75.70% # Number of insts issued each cycle
-system.cpu.iq.issued_per_cycle::6            72804898     24.08%     99.78% # Number of insts issued each cycle
+system.cpu.iq.issued_per_cycle::0            95961753     31.74%     31.74% # Number of insts issued each cycle
+system.cpu.iq.issued_per_cycle::1            22210791      7.35%     39.08% # Number of insts issued each cycle
+system.cpu.iq.issued_per_cycle::2            18920489      6.26%     45.34% # Number of insts issued each cycle
+system.cpu.iq.issued_per_cycle::3             7861035      2.60%     47.94% # Number of insts issued each cycle
+system.cpu.iq.issued_per_cycle::4            80643891     26.67%     74.61% # Number of insts issued each cycle
+system.cpu.iq.issued_per_cycle::5             3288348      1.09%     75.70% # Number of insts issued each cycle
+system.cpu.iq.issued_per_cycle::6            72804040     24.08%     99.78% # Number of insts issued each cycle
 system.cpu.iq.issued_per_cycle::7              531965      0.18%     99.96% # Number of insts issued each cycle
 system.cpu.iq.issued_per_cycle::8              132039      0.04%    100.00% # Number of insts issued each cycle
 system.cpu.iq.issued_per_cycle::overflows            0      0.00%    100.00% # Number of insts issued each cycle
@@ -463,7 +463,7 @@ system.cpu.iq.fu_full::MemWrite                164454      7.80%    100.00% # at
 system.cpu.iq.fu_full::IprAccess                    0      0.00%    100.00% # attempts to use FU when none available
 system.cpu.iq.fu_full::InstPrefetch                 0      0.00%    100.00% # attempts to use FU when none available
 system.cpu.iq.FU_type_0::No_OpClass            295147      0.03%      0.03% # Type of FU issued
-system.cpu.iq.FU_type_0::IntAlu             829365439     95.96%     96.00% # Type of FU issued
+system.cpu.iq.FU_type_0::IntAlu             829365416     95.96%     96.00% # Type of FU issued
 system.cpu.iq.FU_type_0::IntMult                    0      0.00%     96.00% # Type of FU issued
 system.cpu.iq.FU_type_0::IntDiv                     0      0.00%     96.00% # Type of FU issued
 system.cpu.iq.FU_type_0::FloatAdd                   0      0.00%     96.00% # Type of FU issued
@@ -496,17 +496,17 @@ system.cpu.iq.FU_type_0::MemRead             25156928      2.91%     98.91% # Ty
 system.cpu.iq.FU_type_0::MemWrite             9438994      1.09%    100.00% # Type of FU issued
 system.cpu.iq.FU_type_0::IprAccess                  0      0.00%    100.00% # Type of FU issued
 system.cpu.iq.FU_type_0::InstPrefetch               0      0.00%    100.00% # Type of FU issued
-system.cpu.iq.FU_type_0::total              864256508                       # Type of FU issued
+system.cpu.iq.FU_type_0::total              864256485                       # Type of FU issued
 system.cpu.iq.rate                           1.873386                       # Inst issue rate
 system.cpu.iq.fu_busy_cnt                     2109065                       # FU busy when requested
 system.cpu.iq.fu_busy_rate                   0.002440                       # FU busy rate (busy events/executed inst)
-system.cpu.iq.int_inst_queue_reads         2033227261                       # Number of integer instruction queue reads
+system.cpu.iq.int_inst_queue_reads         2033227215                       # Number of integer instruction queue reads
 system.cpu.iq.int_inst_queue_writes         893026339                       # Number of integer instruction queue writes
-system.cpu.iq.int_inst_queue_wakeup_accesses    853844351                       # Number of integer instruction queue wakeup accesses
+system.cpu.iq.int_inst_queue_wakeup_accesses    853844323                       # Number of integer instruction queue wakeup accesses
 system.cpu.iq.fp_inst_queue_reads                 314                       # Number of floating instruction queue reads
 system.cpu.iq.fp_inst_queue_writes                348                       # Number of floating instruction queue writes
 system.cpu.iq.fp_inst_queue_wakeup_accesses           80                       # Number of floating instruction queue wakeup accesses
-system.cpu.iq.int_alu_accesses              866070281                       # Number of integer alu accesses
+system.cpu.iq.int_alu_accesses              866070258                       # Number of integer alu accesses
 system.cpu.iq.fp_alu_accesses                     145                       # Number of floating point alu accesses
 system.cpu.iew.lsq.thread0.forwLoads          1582954                       # Number of loads that had data forwarded from stores
 system.cpu.iew.lsq.thread0.invAddrLoads             0                       # Number of loads ignored due to an invalid address
@@ -533,21 +533,21 @@ system.cpu.iew.memOrderViolationEvents          11829                       # Nu
 system.cpu.iew.predictedTakenIncorrect         701390                       # Number of branches that were predicted taken incorrectly
 system.cpu.iew.predictedNotTakenIncorrect       622436                       # Number of branches that were predicted not taken incorrectly
 system.cpu.iew.branchMispredicts              1323826                       # Number of branch mispredicts detected at execute
-system.cpu.iew.iewExecutedInsts             862339012                       # Number of executed instructions
+system.cpu.iew.iewExecutedInsts             862338984                       # Number of executed instructions
 system.cpu.iew.iewExecLoadInsts              24725426                       # Number of load instructions executed
-system.cpu.iew.iewExecSquashedInsts           1917495                       # Number of squashed instructions skipped in execute
+system.cpu.iew.iewExecSquashedInsts           1917500                       # Number of squashed instructions skipped in execute
 system.cpu.iew.exec_swp                             0                       # number of swp insts executed
 system.cpu.iew.exec_nop                             0                       # number of nop insts executed
 system.cpu.iew.exec_refs                     33920026                       # number of memory reference insts executed
 system.cpu.iew.exec_branches                 86488789                       # Number of branches executed
 system.cpu.iew.exec_stores                    9194600                       # Number of stores executed
 system.cpu.iew.exec_rate                     1.869230                       # Inst execution rate
-system.cpu.iew.wb_sent                      861878636                       # cumulative count of insts sent to commit
-system.cpu.iew.wb_count                     853844431                       # cumulative count of insts written-back
-system.cpu.iew.wb_producers                 669889199                       # num instructions producing a value
-system.cpu.iew.wb_consumers                1919045631                       # num instructions consuming a value
+system.cpu.iew.wb_sent                      861878608                       # cumulative count of insts sent to commit
+system.cpu.iew.wb_count                     853844403                       # cumulative count of insts written-back
+system.cpu.iew.wb_producers                 669889230                       # num instructions producing a value
+system.cpu.iew.wb_consumers                1919047361                       # 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.850817                       # insts written-back per cycle
+system.cpu.iew.wb_rate                       1.850816                       # insts written-back per cycle
 system.cpu.iew.wb_fanout                     0.349074                       # average fanout of values written-back
 system.cpu.iew.wb_penalized_rate                    0                       # fraction of instructions written-back that wrote to 'other' IQ
 system.cpu.commit.commitCommittedInsts      426506235                       # The number of committed instructions
@@ -596,8 +596,8 @@ system.cpu.cpi                               1.081658                       # CP
 system.cpu.cpi_total                         1.081658                       # CPI: Total CPI of All Threads
 system.cpu.ipc                               0.924507                       # IPC: Instructions Per Cycle
 system.cpu.ipc_total                         0.924507                       # IPC: Total IPC of All Threads
-system.cpu.int_regfile_reads               2163089762                       # number of integer regfile reads
-system.cpu.int_regfile_writes              1362601574                       # number of integer regfile writes
+system.cpu.int_regfile_reads               2163093750                       # number of integer regfile reads
+system.cpu.int_regfile_writes              1362601470                       # number of integer regfile writes
 system.cpu.fp_regfile_reads                        80                       # number of floating regfile reads
 system.cpu.misc_regfile_reads               281025584                       # number of misc regfile reads
 system.cpu.misc_regfile_writes                 403474                       # number of misc regfile writes