summaryrefslogtreecommitdiff
path: root/tests/long/20.parser
diff options
context:
space:
mode:
Diffstat (limited to 'tests/long/20.parser')
-rw-r--r--tests/long/20.parser/ref/arm/linux/o3-timing/config.ini15
-rwxr-xr-xtests/long/20.parser/ref/arm/linux/o3-timing/simout8
-rw-r--r--tests/long/20.parser/ref/arm/linux/o3-timing/stats.txt30
-rw-r--r--tests/long/20.parser/ref/arm/linux/simple-atomic/config.ini17
-rwxr-xr-xtests/long/20.parser/ref/arm/linux/simple-atomic/simout10
-rw-r--r--tests/long/20.parser/ref/arm/linux/simple-atomic/stats.txt26
-rw-r--r--tests/long/20.parser/ref/arm/linux/simple-timing/config.ini17
-rwxr-xr-xtests/long/20.parser/ref/arm/linux/simple-timing/simerr2
-rwxr-xr-xtests/long/20.parser/ref/arm/linux/simple-timing/simout10
-rw-r--r--tests/long/20.parser/ref/arm/linux/simple-timing/stats.txt26
-rw-r--r--tests/long/20.parser/ref/x86/linux/o3-timing/config.ini9
-rwxr-xr-xtests/long/20.parser/ref/x86/linux/o3-timing/simout8
-rw-r--r--tests/long/20.parser/ref/x86/linux/o3-timing/stats.txt29
-rw-r--r--tests/long/20.parser/ref/x86/linux/simple-atomic/config.ini9
-rwxr-xr-xtests/long/20.parser/ref/x86/linux/simple-atomic/simout8
-rw-r--r--tests/long/20.parser/ref/x86/linux/simple-atomic/stats.txt26
-rw-r--r--tests/long/20.parser/ref/x86/linux/simple-timing/config.ini9
-rwxr-xr-xtests/long/20.parser/ref/x86/linux/simple-timing/simout8
-rw-r--r--tests/long/20.parser/ref/x86/linux/simple-timing/stats.txt26
19 files changed, 225 insertions, 68 deletions
diff --git a/tests/long/20.parser/ref/arm/linux/o3-timing/config.ini b/tests/long/20.parser/ref/arm/linux/o3-timing/config.ini
index 5f7dcc6cf..92faf41fb 100644
--- a/tests/long/20.parser/ref/arm/linux/o3-timing/config.ini
+++ b/tests/long/20.parser/ref/arm/linux/o3-timing/config.ini
@@ -1,13 +1,22 @@
[root]
type=Root
children=system
-dummy=0
+time_sync_enable=false
+time_sync_period=100000000000
+time_sync_spin_threshold=100000000
[system]
type=System
children=cpu membus physmem
mem_mode=atomic
physmem=system.physmem
+work_begin_ckpt_count=0
+work_begin_cpu_id_exit=-1
+work_begin_exit_count=0
+work_cpus_ckpt_count=0
+work_end_ckpt_count=0
+work_end_exit_count=0
+work_item_id=-1
[system.cpu]
type=DerivO3CPU
@@ -484,9 +493,9 @@ egid=100
env=
errout=cerr
euid=100
-executable=/chips/pd/randd/dist/cpu2000/binaries/arm/linux/parser
+executable=/dist/m5/cpu2000/binaries/arm/linux/parser
gid=100
-input=/chips/pd/randd/dist/cpu2000/data/parser/mdred/input/parser.in
+input=/dist/m5/cpu2000/data/parser/mdred/input/parser.in
max_stack_size=67108864
output=cout
pid=100
diff --git a/tests/long/20.parser/ref/arm/linux/o3-timing/simout b/tests/long/20.parser/ref/arm/linux/o3-timing/simout
index 7fcfd6a75..b1ee33712 100755
--- a/tests/long/20.parser/ref/arm/linux/o3-timing/simout
+++ b/tests/long/20.parser/ref/arm/linux/o3-timing/simout
@@ -5,10 +5,10 @@ The Regents of The University of Michigan
All Rights Reserved
-M5 compiled Jan 11 2011 18:16:01
-M5 revision b39a8457b332 7816 default ext/o3_regressions.patch qtip tip
-M5 started Jan 12 2011 03:20:30
-M5 executing on u200439-lin.austin.arm.com
+M5 compiled Feb 7 2011 01:56:16
+M5 revision 4b4b02c5553c 7929 default qtip reupdatestats.patch tip
+M5 started Feb 7 2011 01:56:25
+M5 executing on burrito
command line: build/ARM_SE/m5.fast -d build/ARM_SE/tests/fast/long/20.parser/arm/linux/o3-timing -re tests/run.py build/ARM_SE/tests/fast/long/20.parser/arm/linux/o3-timing
Global frequency set at 1000000000000 ticks per second
info: Entering event queue @ 0. Starting simulation...
diff --git a/tests/long/20.parser/ref/arm/linux/o3-timing/stats.txt b/tests/long/20.parser/ref/arm/linux/o3-timing/stats.txt
index b9adedb70..5862f2750 100644
--- a/tests/long/20.parser/ref/arm/linux/o3-timing/stats.txt
+++ b/tests/long/20.parser/ref/arm/linux/o3-timing/stats.txt
@@ -1,9 +1,9 @@
---------- Begin Simulation Statistics ----------
-host_inst_rate 95936 # Simulator instruction rate (inst/s)
-host_mem_usage 255716 # Number of bytes of host memory used
-host_seconds 5851.87 # Real time elapsed on the host
-host_tick_rate 62464794 # Simulator tick rate (ticks/s)
+host_inst_rate 89247 # Simulator instruction rate (inst/s)
+host_mem_usage 242220 # Number of bytes of host memory used
+host_seconds 6290.45 # Real time elapsed on the host
+host_tick_rate 58109668 # Simulator tick rate (ticks/s)
sim_freq 1000000000000 # Frequency of simulated ticks
sim_insts 561403855 # Number of instructions simulated
sim_seconds 0.365536 # Number of seconds simulated
@@ -37,6 +37,9 @@ system.cpu.commit.COM:committed_per_cycle::min_value 0
system.cpu.commit.COM:committed_per_cycle::max_value 8 # Number of insts commited each cycle
system.cpu.commit.COM:committed_per_cycle::total 660408748 # Number of insts commited each cycle
system.cpu.commit.COM:count 561403855 # Number of instructions committed
+system.cpu.commit.COM:fp_insts 16 # Number of committed floating point instructions.
+system.cpu.commit.COM:function_calls 0 # Number of function calls committed.
+system.cpu.commit.COM:int_insts 464140463 # Number of committed integer instructions.
system.cpu.commit.COM:loads 128127024 # Number of loads committed
system.cpu.commit.COM:membars 0 # Number of memory barriers committed
system.cpu.commit.COM:refs 184987501 # Number of memory references committed
@@ -171,6 +174,7 @@ system.cpu.fetch.rateDist::overflows 0 0.00% 100.00% # Nu
system.cpu.fetch.rateDist::min_value 0 # Number of instructions fetched each cycle (Total)
system.cpu.fetch.rateDist::max_value 8 # Number of instructions fetched each cycle (Total)
system.cpu.fetch.rateDist::total 726668486 # Number of instructions fetched each cycle (Total)
+system.cpu.fp_regfile_reads 16 # number of floating regfile reads
system.cpu.icache.ReadReq_accesses 122785155 # number of ReadReq accesses(hits+misses)
system.cpu.icache.ReadReq_avg_miss_latency 13335.070892 # average ReadReq miss latency
system.cpu.icache.ReadReq_avg_mshr_miss_latency 9658.160050 # average ReadReq mshr miss latency
@@ -270,6 +274,8 @@ system.cpu.iew.lsq.thread.0.squashedStores 83223254 #
system.cpu.iew.memOrderViolationEvents 352056 # Number of memory order violations
system.cpu.iew.predictedNotTakenIncorrect 15636111 # Number of branches that were predicted not taken incorrectly
system.cpu.iew.predictedTakenIncorrect 14467473 # Number of branches that were predicted taken incorrectly
+system.cpu.int_regfile_reads 1624866525 # number of integer regfile reads
+system.cpu.int_regfile_writes 504061562 # number of integer regfile writes
system.cpu.ipc 0.767919 # IPC: Instructions Per Cycle
system.cpu.ipc_total 0.767919 # IPC: Total IPC of All Threads
system.cpu.iq.ISSUE:FU_type_0::No_OpClass 0 0.00% 0.00% # Type of FU issued
@@ -361,6 +367,14 @@ system.cpu.iq.ISSUE:issued_per_cycle::min_value 0
system.cpu.iq.ISSUE:issued_per_cycle::max_value 8 # Number of insts issued each cycle
system.cpu.iq.ISSUE:issued_per_cycle::total 726668486 # Number of insts issued each cycle
system.cpu.iq.ISSUE:rate 1.039903 # Inst issue rate
+system.cpu.iq.fp_alu_accesses 140 # Number of floating point alu accesses
+system.cpu.iq.fp_inst_queue_reads 276 # Number of floating instruction queue reads
+system.cpu.iq.fp_inst_queue_wakeup_accesses 16 # Number of floating instruction queue wakeup accesses
+system.cpu.iq.fp_inst_queue_writes 652 # Number of floating instruction queue writes
+system.cpu.iq.int_alu_accesses 771704903 # Number of integer alu accesses
+system.cpu.iq.int_inst_queue_reads 2266614625 # Number of integer instruction queue reads
+system.cpu.iq.int_inst_queue_wakeup_accesses 674936607 # Number of integer instruction queue wakeup accesses
+system.cpu.iq.int_inst_queue_writes 1350317509 # Number of integer instruction queue writes
system.cpu.iq.iqInstsAdded 960829595 # Number of instructions added to the IQ (excludes non-spec)
system.cpu.iq.iqInstsIssued 760243815 # Number of instructions issued
system.cpu.iq.iqNonSpecInstsAdded 162257 # Number of non-speculative instructions added to the IQ
@@ -465,7 +479,11 @@ system.cpu.memDep0.conflictingLoads 60170710 # Nu
system.cpu.memDep0.conflictingStores 74734099 # Number of conflicting stores.
system.cpu.memDep0.insertedLoads 200154824 # Number of loads inserted to the mem dependence unit.
system.cpu.memDep0.insertedStores 140083731 # Number of stores inserted to the mem dependence unit.
+system.cpu.misc_regfile_reads 1169165868 # number of misc regfile reads
+system.cpu.misc_regfile_writes 344748 # number of misc regfile writes
system.cpu.numCycles 731071595 # number of cpu cycles simulated
+system.cpu.numWorkItemsCompleted 0 # number of work items this cpu completed
+system.cpu.numWorkItemsStarted 0 # number of work items this cpu started
system.cpu.rename.RENAME:BlockCycles 7125233 # Number of cycles rename is blocking
system.cpu.rename.RENAME:CommittedMaps 435368498 # Number of HB maps that are committed
system.cpu.rename.RENAME:IQFullEvents 5221350 # Number of times rename has blocked due to IQ full
@@ -479,10 +497,14 @@ system.cpu.rename.RENAME:RunCycles 326862324 # Nu
system.cpu.rename.RENAME:SquashCycles 66259738 # Number of cycles rename is squashing
system.cpu.rename.RENAME:UnblockCycles 15428382 # Number of cycles rename is unblocking
system.cpu.rename.RENAME:UndoneMaps 278321764 # Number of HB maps that are undone due to squashing
+system.cpu.rename.RENAME:fp_rename_lookups 2110 # Number of floating rename lookups
+system.cpu.rename.RENAME:int_rename_lookups 2644674034 # Number of integer rename lookups
system.cpu.rename.RENAME:serializeStallCycles 1706138 # count of cycles rename stalled for serializing inst
system.cpu.rename.RENAME:serializingInsts 233255 # count of serializing insts renamed
system.cpu.rename.RENAME:skidInsts 48704887 # count of insts added to the skid buffer
system.cpu.rename.RENAME:tempSerializingInsts 185624 # count of temporary serializing insts renamed
+system.cpu.rob.rob_reads 1617861624 # The number of ROB reads
+system.cpu.rob.rob_writes 1988299741 # The number of ROB writes
system.cpu.timesIdled 93433 # Number of times that the entire CPU went into an idle state and unscheduled itself
system.cpu.workload.PROG:num_syscalls 548 # Number of system calls
diff --git a/tests/long/20.parser/ref/arm/linux/simple-atomic/config.ini b/tests/long/20.parser/ref/arm/linux/simple-atomic/config.ini
index 8f051c01c..8b55eca4f 100644
--- a/tests/long/20.parser/ref/arm/linux/simple-atomic/config.ini
+++ b/tests/long/20.parser/ref/arm/linux/simple-atomic/config.ini
@@ -1,13 +1,22 @@
[root]
type=Root
children=system
-dummy=0
+time_sync_enable=false
+time_sync_period=100000000000
+time_sync_spin_threshold=100000000
[system]
type=System
children=cpu membus physmem
mem_mode=atomic
physmem=system.physmem
+work_begin_ckpt_count=0
+work_begin_cpu_id_exit=-1
+work_begin_exit_count=0
+work_cpus_ckpt_count=0
+work_end_ckpt_count=0
+work_end_exit_count=0
+work_item_id=-1
[system.cpu]
type=AtomicSimpleCPU
@@ -52,14 +61,14 @@ type=ExeTracer
[system.cpu.workload]
type=LiveProcess
cmd=parser 2.1.dict -batch
-cwd=build/ARM_SE/tests/opt/long/20.parser/arm/linux/simple-atomic
+cwd=build/ARM_SE/tests/fast/long/20.parser/arm/linux/simple-atomic
egid=100
env=
errout=cerr
euid=100
-executable=/chips/pd/randd/dist/cpu2000/binaries/arm/linux/parser
+executable=/dist/m5/cpu2000/binaries/arm/linux/parser
gid=100
-input=/chips/pd/randd/dist/cpu2000/data/parser/mdred/input/parser.in
+input=/dist/m5/cpu2000/data/parser/mdred/input/parser.in
max_stack_size=67108864
output=cout
pid=100
diff --git a/tests/long/20.parser/ref/arm/linux/simple-atomic/simout b/tests/long/20.parser/ref/arm/linux/simple-atomic/simout
index e187e6939..c27562976 100755
--- a/tests/long/20.parser/ref/arm/linux/simple-atomic/simout
+++ b/tests/long/20.parser/ref/arm/linux/simple-atomic/simout
@@ -5,11 +5,11 @@ The Regents of The University of Michigan
All Rights Reserved
-M5 compiled Oct 11 2010 18:37:23
-M5 revision c4e3d74d9a68 7726 default ext/mp_boot.patch qtip tip
-M5 started Oct 11 2010 18:37:50
-M5 executing on aus-bc3-b4
-command line: build/ARM_SE/m5.opt -d build/ARM_SE/tests/opt/long/20.parser/arm/linux/simple-atomic -re tests/run.py build/ARM_SE/tests/opt/long/20.parser/arm/linux/simple-atomic
+M5 compiled Feb 7 2011 01:56:16
+M5 revision 4b4b02c5553c 7929 default qtip reupdatestats.patch tip
+M5 started Feb 7 2011 01:56:25
+M5 executing on burrito
+command line: build/ARM_SE/m5.fast -d build/ARM_SE/tests/fast/long/20.parser/arm/linux/simple-atomic -re tests/run.py build/ARM_SE/tests/fast/long/20.parser/arm/linux/simple-atomic
Global frequency set at 1000000000000 ticks per second
info: Entering event queue @ 0. Starting simulation...
diff --git a/tests/long/20.parser/ref/arm/linux/simple-atomic/stats.txt b/tests/long/20.parser/ref/arm/linux/simple-atomic/stats.txt
index 3d8390b34..0871fb1fa 100644
--- a/tests/long/20.parser/ref/arm/linux/simple-atomic/stats.txt
+++ b/tests/long/20.parser/ref/arm/linux/simple-atomic/stats.txt
@@ -1,9 +1,9 @@
---------- Begin Simulation Statistics ----------
-host_inst_rate 2845430 # Simulator instruction rate (inst/s)
-host_mem_usage 257528 # Number of bytes of host memory used
-host_seconds 197.30 # Real time elapsed on the host
-host_tick_rate 1448130657 # Simulator tick rate (ticks/s)
+host_inst_rate 1052675 # Simulator instruction rate (inst/s)
+host_mem_usage 232888 # Number of bytes of host memory used
+host_seconds 533.31 # Real time elapsed on the host
+host_tick_rate 535740490 # Simulator tick rate (ticks/s)
sim_freq 1000000000000 # Frequency of simulated ticks
sim_insts 561403855 # Number of instructions simulated
sim_seconds 0.285717 # Number of seconds simulated
@@ -53,8 +53,24 @@ system.cpu.itb.write_hits 0 # DT
system.cpu.itb.write_misses 0 # DTB write misses
system.cpu.not_idle_fraction 1 # Percentage of non-idle cycles
system.cpu.numCycles 571433624 # number of cpu cycles simulated
+system.cpu.numWorkItemsCompleted 0 # number of work items this cpu completed
+system.cpu.numWorkItemsStarted 0 # number of work items this cpu started
+system.cpu.num_busy_cycles 571433624 # Number of busy cycles
+system.cpu.num_conditional_control_insts 0 # number of instructions that are conditional controls
+system.cpu.num_fp_alu_accesses 16 # Number of float alu accesses
+system.cpu.num_fp_insts 16 # number of float instructions
+system.cpu.num_fp_register_reads 16 # number of times the floating registers were read
+system.cpu.num_fp_register_writes 0 # number of times the floating registers were written
+system.cpu.num_func_calls 0 # number of times a function call or return occured
+system.cpu.num_idle_cycles 0 # Number of idle cycles
system.cpu.num_insts 561403855 # Number of instructions executed
-system.cpu.num_refs 184987503 # Number of memory references
+system.cpu.num_int_alu_accesses 464140465 # Number of integer alu accesses
+system.cpu.num_int_insts 464140465 # number of integer instructions
+system.cpu.num_int_register_reads 1370673061 # number of times the integer registers were read
+system.cpu.num_int_register_writes 415936275 # number of times the integer registers were written
+system.cpu.num_load_insts 128127024 # Number of load instructions
+system.cpu.num_mem_refs 184987503 # number of memory refs
+system.cpu.num_store_insts 56860479 # Number of store instructions
system.cpu.workload.PROG:num_syscalls 548 # Number of system calls
---------- End Simulation Statistics ----------
diff --git a/tests/long/20.parser/ref/arm/linux/simple-timing/config.ini b/tests/long/20.parser/ref/arm/linux/simple-timing/config.ini
index 2acf6aa8b..9596a7281 100644
--- a/tests/long/20.parser/ref/arm/linux/simple-timing/config.ini
+++ b/tests/long/20.parser/ref/arm/linux/simple-timing/config.ini
@@ -1,13 +1,22 @@
[root]
type=Root
children=system
-dummy=0
+time_sync_enable=false
+time_sync_period=100000000000
+time_sync_spin_threshold=100000000
[system]
type=System
children=cpu membus physmem
mem_mode=atomic
physmem=system.physmem
+work_begin_ckpt_count=0
+work_begin_cpu_id_exit=-1
+work_begin_exit_count=0
+work_cpus_ckpt_count=0
+work_end_ckpt_count=0
+work_end_exit_count=0
+work_item_id=-1
[system.cpu]
type=TimingSimpleCPU
@@ -152,14 +161,14 @@ type=ExeTracer
[system.cpu.workload]
type=LiveProcess
cmd=parser 2.1.dict -batch
-cwd=build/ARM_SE/tests/opt/long/20.parser/arm/linux/simple-timing
+cwd=build/ARM_SE/tests/fast/long/20.parser/arm/linux/simple-timing
egid=100
env=
errout=cerr
euid=100
-executable=/chips/pd/randd/dist/cpu2000/binaries/arm/linux/parser
+executable=/dist/m5/cpu2000/binaries/arm/linux/parser
gid=100
-input=/chips/pd/randd/dist/cpu2000/data/parser/mdred/input/parser.in
+input=/dist/m5/cpu2000/data/parser/mdred/input/parser.in
max_stack_size=67108864
output=cout
pid=100
diff --git a/tests/long/20.parser/ref/arm/linux/simple-timing/simerr b/tests/long/20.parser/ref/arm/linux/simple-timing/simerr
index eabe42249..cdafa164c 100755
--- a/tests/long/20.parser/ref/arm/linux/simple-timing/simerr
+++ b/tests/long/20.parser/ref/arm/linux/simple-timing/simerr
@@ -1,3 +1,5 @@
warn: Sockets disabled, not accepting gdb connections
For more information see: http://www.m5sim.org/warn/d946bea6
+warn: Complete acc isn't called on normal stores in O3.
+For more information see: http://www.m5sim.org/warn/138d8573
hack: be nice to actually delete the event here
diff --git a/tests/long/20.parser/ref/arm/linux/simple-timing/simout b/tests/long/20.parser/ref/arm/linux/simple-timing/simout
index 76b9031da..db8a10df5 100755
--- a/tests/long/20.parser/ref/arm/linux/simple-timing/simout
+++ b/tests/long/20.parser/ref/arm/linux/simple-timing/simout
@@ -5,11 +5,11 @@ The Regents of The University of Michigan
All Rights Reserved
-M5 compiled Oct 11 2010 18:37:23
-M5 revision c4e3d74d9a68 7726 default ext/mp_boot.patch qtip tip
-M5 started Oct 11 2010 19:30:07
-M5 executing on aus-bc3-b4
-command line: build/ARM_SE/m5.opt -d build/ARM_SE/tests/opt/long/20.parser/arm/linux/simple-timing -re tests/run.py build/ARM_SE/tests/opt/long/20.parser/arm/linux/simple-timing
+M5 compiled Feb 7 2011 01:56:16
+M5 revision 4b4b02c5553c 7929 default qtip reupdatestats.patch tip
+M5 started Feb 7 2011 02:00:20
+M5 executing on burrito
+command line: build/ARM_SE/m5.fast -d build/ARM_SE/tests/fast/long/20.parser/arm/linux/simple-timing -re tests/run.py build/ARM_SE/tests/fast/long/20.parser/arm/linux/simple-timing
Global frequency set at 1000000000000 ticks per second
info: Entering event queue @ 0. Starting simulation...
diff --git a/tests/long/20.parser/ref/arm/linux/simple-timing/stats.txt b/tests/long/20.parser/ref/arm/linux/simple-timing/stats.txt
index d49ea7a07..5187afa41 100644
--- a/tests/long/20.parser/ref/arm/linux/simple-timing/stats.txt
+++ b/tests/long/20.parser/ref/arm/linux/simple-timing/stats.txt
@@ -1,9 +1,9 @@
---------- Begin Simulation Statistics ----------
-host_inst_rate 698342 # Simulator instruction rate (inst/s)
-host_mem_usage 265248 # Number of bytes of host memory used
-host_seconds 801.14 # Real time elapsed on the host
-host_tick_rate 898558125 # Simulator tick rate (ticks/s)
+host_inst_rate 427899 # Simulator instruction rate (inst/s)
+host_mem_usage 240600 # Number of bytes of host memory used
+host_seconds 1307.48 # Real time elapsed on the host
+host_tick_rate 550579326 # Simulator tick rate (ticks/s)
sim_freq 1000000000000 # Frequency of simulated ticks
sim_insts 559470527 # Number of instructions simulated
sim_seconds 0.719872 # Number of seconds simulated
@@ -242,8 +242,24 @@ system.cpu.l2cache.warmup_cycle 510281834000 # Cy
system.cpu.l2cache.writebacks 172310 # number of writebacks
system.cpu.not_idle_fraction 1 # Percentage of non-idle cycles
system.cpu.numCycles 1439744848 # number of cpu cycles simulated
+system.cpu.numWorkItemsCompleted 0 # number of work items this cpu completed
+system.cpu.numWorkItemsStarted 0 # number of work items this cpu started
+system.cpu.num_busy_cycles 1439744848 # Number of busy cycles
+system.cpu.num_conditional_control_insts 0 # number of instructions that are conditional controls
+system.cpu.num_fp_alu_accesses 16 # Number of float alu accesses
+system.cpu.num_fp_insts 16 # number of float instructions
+system.cpu.num_fp_register_reads 16 # number of times the floating registers were read
+system.cpu.num_fp_register_writes 0 # number of times the floating registers were written
+system.cpu.num_func_calls 0 # number of times a function call or return occured
+system.cpu.num_idle_cycles 0 # Number of idle cycles
system.cpu.num_insts 559470527 # Number of instructions executed
-system.cpu.num_refs 184987503 # Number of memory references
+system.cpu.num_int_alu_accesses 464140465 # Number of integer alu accesses
+system.cpu.num_int_insts 464140465 # number of integer instructions
+system.cpu.num_int_register_reads 1497198689 # number of times the integer registers were read
+system.cpu.num_int_register_writes 415939738 # number of times the integer registers were written
+system.cpu.num_load_insts 128127024 # Number of load instructions
+system.cpu.num_mem_refs 184987503 # number of memory refs
+system.cpu.num_store_insts 56860479 # Number of store instructions
system.cpu.workload.PROG:num_syscalls 548 # Number of system calls
---------- End Simulation Statistics ----------
diff --git a/tests/long/20.parser/ref/x86/linux/o3-timing/config.ini b/tests/long/20.parser/ref/x86/linux/o3-timing/config.ini
index aa5254a3b..8363ae747 100644
--- a/tests/long/20.parser/ref/x86/linux/o3-timing/config.ini
+++ b/tests/long/20.parser/ref/x86/linux/o3-timing/config.ini
@@ -10,6 +10,13 @@ type=System
children=cpu membus physmem
mem_mode=atomic
physmem=system.physmem
+work_begin_ckpt_count=0
+work_begin_cpu_id_exit=-1
+work_begin_exit_count=0
+work_cpus_ckpt_count=0
+work_end_ckpt_count=0
+work_end_exit_count=0
+work_item_id=-1
[system.cpu]
type=DerivO3CPU
@@ -481,7 +488,7 @@ type=ExeTracer
[system.cpu.workload]
type=LiveProcess
cmd=parser 2.1.dict -batch
-cwd=build/X86_SE/tests/opt/long/20.parser/x86/linux/o3-timing
+cwd=build/X86_SE/tests/fast/long/20.parser/x86/linux/o3-timing
egid=100
env=
errout=cerr
diff --git a/tests/long/20.parser/ref/x86/linux/o3-timing/simout b/tests/long/20.parser/ref/x86/linux/o3-timing/simout
index 6e2ddc167..4d3b5f29b 100755
--- a/tests/long/20.parser/ref/x86/linux/o3-timing/simout
+++ b/tests/long/20.parser/ref/x86/linux/o3-timing/simout
@@ -5,11 +5,11 @@ The Regents of The University of Michigan
All Rights Reserved
-M5 compiled Jan 31 2011 16:34:44
-M5 revision 1b98eea40540 7883 default qtip tip x86o3regressions.patch
-M5 started Jan 31 2011 16:34:46
+M5 compiled Feb 7 2011 02:32:07
+M5 revision 4b4b02c5553c 7929 default qtip reupdatestats.patch tip
+M5 started Feb 7 2011 02:32:13
M5 executing on burrito
-command line: build/X86_SE/m5.opt -d build/X86_SE/tests/opt/long/20.parser/x86/linux/o3-timing -re tests/run.py build/X86_SE/tests/opt/long/20.parser/x86/linux/o3-timing
+command line: build/X86_SE/m5.fast -d build/X86_SE/tests/fast/long/20.parser/x86/linux/o3-timing -re tests/run.py build/X86_SE/tests/fast/long/20.parser/x86/linux/o3-timing
Global frequency set at 1000000000000 ticks per second
info: Entering event queue @ 0. Starting simulation...
diff --git a/tests/long/20.parser/ref/x86/linux/o3-timing/stats.txt b/tests/long/20.parser/ref/x86/linux/o3-timing/stats.txt
index c8db50488..c39e8dfae 100644
--- a/tests/long/20.parser/ref/x86/linux/o3-timing/stats.txt
+++ b/tests/long/20.parser/ref/x86/linux/o3-timing/stats.txt
@@ -1,9 +1,9 @@
---------- Begin Simulation Statistics ----------
-host_inst_rate 123365 # Simulator instruction rate (inst/s)
-host_mem_usage 239740 # Number of bytes of host memory used
-host_seconds 12393.99 # Real time elapsed on the host
-host_tick_rate 65919204 # Simulator tick rate (ticks/s)
+host_inst_rate 160923 # Simulator instruction rate (inst/s)
+host_mem_usage 240360 # Number of bytes of host memory used
+host_seconds 9501.35 # Real time elapsed on the host
+host_tick_rate 85987979 # Simulator tick rate (ticks/s)
sim_freq 1000000000000 # Frequency of simulated ticks
sim_insts 1528988756 # Number of instructions simulated
sim_seconds 0.817002 # Number of seconds simulated
@@ -37,6 +37,9 @@ system.cpu.commit.COM:committed_per_cycle::min_value 0
system.cpu.commit.COM:committed_per_cycle::max_value 8 # Number of insts commited each cycle
system.cpu.commit.COM:committed_per_cycle::total 1552269342 # Number of insts commited each cycle
system.cpu.commit.COM:count 1528988756 # Number of instructions committed
+system.cpu.commit.COM:fp_insts 0 # Number of committed floating point instructions.
+system.cpu.commit.COM:function_calls 0 # Number of function calls committed.
+system.cpu.commit.COM:int_insts 1528317614 # Number of committed integer instructions.
system.cpu.commit.COM:loads 384102160 # Number of loads committed
system.cpu.commit.COM:membars 0 # Number of memory barriers committed
system.cpu.commit.COM:refs 533262345 # Number of memory references committed
@@ -150,6 +153,7 @@ system.cpu.fetch.rateDist::overflows 0 0.00% 100.00% # Nu
system.cpu.fetch.rateDist::min_value 0 # Number of instructions fetched each cycle (Total)
system.cpu.fetch.rateDist::max_value 8 # Number of instructions fetched each cycle (Total)
system.cpu.fetch.rateDist::total 1623905370 # Number of instructions fetched each cycle (Total)
+system.cpu.fp_regfile_reads 10 # number of floating regfile reads
system.cpu.icache.ReadReq_accesses 165973622 # number of ReadReq accesses(hits+misses)
system.cpu.icache.ReadReq_avg_miss_latency 22741.617211 # average ReadReq miss latency
system.cpu.icache.ReadReq_avg_mshr_miss_latency 19372.661290 # average ReadReq mshr miss latency
@@ -249,6 +253,8 @@ system.cpu.iew.lsq.thread.0.squashedStores 44929168 #
system.cpu.iew.memOrderViolationEvents 11954619 # Number of memory order violations
system.cpu.iew.predictedNotTakenIncorrect 280770 # Number of branches that were predicted not taken incorrectly
system.cpu.iew.predictedTakenIncorrect 18292736 # Number of branches that were predicted taken incorrectly
+system.cpu.int_regfile_reads 3876226209 # number of integer regfile reads
+system.cpu.int_regfile_writes 1582892637 # number of integer regfile writes
system.cpu.ipc 0.935731 # IPC: Instructions Per Cycle
system.cpu.ipc_total 0.935731 # IPC: Total IPC of All Threads
system.cpu.iq.ISSUE:FU_type_0::No_OpClass 1927969 0.11% 0.11% # Type of FU issued
@@ -340,6 +346,14 @@ system.cpu.iq.ISSUE:issued_per_cycle::min_value 0
system.cpu.iq.ISSUE:issued_per_cycle::max_value 8 # Number of insts issued each cycle
system.cpu.iq.ISSUE:issued_per_cycle::total 1623905370 # Number of insts issued each cycle
system.cpu.iq.ISSUE:rate 1.060682 # Inst issue rate
+system.cpu.iq.fp_alu_accesses 24 # Number of floating point alu accesses
+system.cpu.iq.fp_inst_queue_reads 48 # Number of floating instruction queue reads
+system.cpu.iq.fp_inst_queue_wakeup_accesses 10 # Number of floating instruction queue wakeup accesses
+system.cpu.iq.fp_inst_queue_writes 68 # Number of floating instruction queue writes
+system.cpu.iq.int_alu_accesses 1732259326 # Number of integer alu accesses
+system.cpu.iq.int_inst_queue_reads 5091250901 # Number of integer instruction queue reads
+system.cpu.iq.int_inst_queue_wakeup_accesses 1694146357 # Number of integer instruction queue wakeup accesses
+system.cpu.iq.int_inst_queue_writes 2453039449 # Number of integer instruction queue writes
system.cpu.iq.iqInstsAdded 1988096819 # Number of instructions added to the IQ (excludes non-spec)
system.cpu.iq.iqInstsIssued 1733158148 # Number of instructions issued
system.cpu.iq.iqNonSpecInstsAdded 579 # Number of non-speculative instructions added to the IQ
@@ -430,7 +444,10 @@ system.cpu.memDep0.conflictingLoads 151128770 # Nu
system.cpu.memDep0.conflictingStores 47539398 # Number of conflicting stores.
system.cpu.memDep0.insertedLoads 508224738 # Number of loads inserted to the mem dependence unit.
system.cpu.memDep0.insertedStores 194089353 # Number of stores inserted to the mem dependence unit.
+system.cpu.misc_regfile_reads 947795380 # number of misc regfile reads
system.cpu.numCycles 1634004079 # number of cpu cycles simulated
+system.cpu.numWorkItemsCompleted 0 # number of work items this cpu completed
+system.cpu.numWorkItemsStarted 0 # number of work items this cpu started
system.cpu.rename.RENAME:BlockCycles 11181498 # Number of cycles rename is blocking
system.cpu.rename.RENAME:CommittedMaps 1427299027 # Number of HB maps that are committed
system.cpu.rename.RENAME:IQFullEvents 8162354 # Number of times rename has blocked due to IQ full
@@ -444,10 +461,14 @@ system.cpu.rename.RENAME:RunCycles 1095363349 # Nu
system.cpu.rename.RENAME:SquashCycles 71636028 # Number of cycles rename is squashing
system.cpu.rename.RENAME:UnblockCycles 14962968 # Number of cycles rename is unblocking
system.cpu.rename.RENAME:UndoneMaps 538631225 # Number of HB maps that are undone due to squashing
+system.cpu.rename.RENAME:fp_rename_lookups 168 # Number of floating rename lookups
+system.cpu.rename.RENAME:int_rename_lookups 6064799758 # Number of integer rename lookups
system.cpu.rename.RENAME:serializeStallCycles 6110 # count of cycles rename stalled for serializing inst
system.cpu.rename.RENAME:serializingInsts 566 # count of serializing insts renamed
system.cpu.rename.RENAME:skidInsts 21122292 # count of insts added to the skid buffer
system.cpu.rename.RENAME:tempSerializingInsts 563 # count of temporary serializing insts renamed
+system.cpu.rob.rob_reads 3532180532 # The number of ROB reads
+system.cpu.rob.rob_writes 4048956705 # The number of ROB writes
system.cpu.timesIdled 351337 # Number of times that the entire CPU went into an idle state and unscheduled itself
system.cpu.workload.PROG:num_syscalls 551 # Number of system calls
diff --git a/tests/long/20.parser/ref/x86/linux/simple-atomic/config.ini b/tests/long/20.parser/ref/x86/linux/simple-atomic/config.ini
index 2edd32f29..fdc891c59 100644
--- a/tests/long/20.parser/ref/x86/linux/simple-atomic/config.ini
+++ b/tests/long/20.parser/ref/x86/linux/simple-atomic/config.ini
@@ -10,6 +10,13 @@ type=System
children=cpu membus physmem
mem_mode=atomic
physmem=system.physmem
+work_begin_ckpt_count=0
+work_begin_cpu_id_exit=-1
+work_begin_exit_count=0
+work_cpus_ckpt_count=0
+work_end_ckpt_count=0
+work_end_exit_count=0
+work_item_id=-1
[system.cpu]
type=AtomicSimpleCPU
@@ -54,7 +61,7 @@ type=ExeTracer
[system.cpu.workload]
type=LiveProcess
cmd=parser 2.1.dict -batch
-cwd=build/X86_SE/tests/opt/long/20.parser/x86/linux/simple-atomic
+cwd=build/X86_SE/tests/fast/long/20.parser/x86/linux/simple-atomic
egid=100
env=
errout=cerr
diff --git a/tests/long/20.parser/ref/x86/linux/simple-atomic/simout b/tests/long/20.parser/ref/x86/linux/simple-atomic/simout
index 1a82abfd9..70ab31a10 100755
--- a/tests/long/20.parser/ref/x86/linux/simple-atomic/simout
+++ b/tests/long/20.parser/ref/x86/linux/simple-atomic/simout
@@ -5,11 +5,11 @@ The Regents of The University of Michigan
All Rights Reserved
-M5 compiled Jan 31 2011 14:03:49
-M5 revision aa283c8952a9 7880 default qtip stupdstats.patch tip
-M5 started Jan 31 2011 14:03:51
+M5 compiled Feb 7 2011 02:32:07
+M5 revision 4b4b02c5553c 7929 default qtip reupdatestats.patch tip
+M5 started Feb 7 2011 02:32:12
M5 executing on burrito
-command line: build/X86_SE/m5.opt -d build/X86_SE/tests/opt/long/20.parser/x86/linux/simple-atomic -re tests/run.py build/X86_SE/tests/opt/long/20.parser/x86/linux/simple-atomic
+command line: build/X86_SE/m5.fast -d build/X86_SE/tests/fast/long/20.parser/x86/linux/simple-atomic -re tests/run.py build/X86_SE/tests/fast/long/20.parser/x86/linux/simple-atomic
Global frequency set at 1000000000000 ticks per second
info: Entering event queue @ 0. Starting simulation...
diff --git a/tests/long/20.parser/ref/x86/linux/simple-atomic/stats.txt b/tests/long/20.parser/ref/x86/linux/simple-atomic/stats.txt
index 016faf2ec..836ed1519 100644
--- a/tests/long/20.parser/ref/x86/linux/simple-atomic/stats.txt
+++ b/tests/long/20.parser/ref/x86/linux/simple-atomic/stats.txt
@@ -1,9 +1,9 @@
---------- Begin Simulation Statistics ----------
-host_inst_rate 1495739 # Simulator instruction rate (inst/s)
-host_mem_usage 223620 # Number of bytes of host memory used
-host_seconds 1022.23 # Real time elapsed on the host
-host_tick_rate 865978759 # Simulator tick rate (ticks/s)
+host_inst_rate 904614 # Simulator instruction rate (inst/s)
+host_mem_usage 227300 # Number of bytes of host memory used
+host_seconds 1690.21 # Real time elapsed on the host
+host_tick_rate 523739013 # Simulator tick rate (ticks/s)
sim_freq 1000000000000 # Frequency of simulated ticks
sim_insts 1528988757 # Number of instructions simulated
sim_seconds 0.885229 # Number of seconds simulated
@@ -11,8 +11,24 @@ sim_ticks 885229360000 # Nu
system.cpu.idle_fraction 0 # Percentage of idle cycles
system.cpu.not_idle_fraction 1 # Percentage of non-idle cycles
system.cpu.numCycles 1770458721 # number of cpu cycles simulated
+system.cpu.numWorkItemsCompleted 0 # number of work items this cpu completed
+system.cpu.numWorkItemsStarted 0 # number of work items this cpu started
+system.cpu.num_busy_cycles 1770458721 # Number of busy cycles
+system.cpu.num_conditional_control_insts 92658800 # number of instructions that are conditional controls
+system.cpu.num_fp_alu_accesses 0 # Number of float alu accesses
+system.cpu.num_fp_insts 0 # number of float instructions
+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
+system.cpu.num_func_calls 0 # number of times a function call or return occured
+system.cpu.num_idle_cycles 0 # Number of idle cycles
system.cpu.num_insts 1528988757 # Number of instructions executed
-system.cpu.num_refs 533262345 # Number of memory references
+system.cpu.num_int_alu_accesses 1528317615 # Number of integer alu accesses
+system.cpu.num_int_insts 1528317615 # number of integer instructions
+system.cpu.num_int_register_reads 4418676175 # number of times the integer registers were read
+system.cpu.num_int_register_writes 1427299027 # number of times the integer registers were written
+system.cpu.num_load_insts 384102160 # Number of load instructions
+system.cpu.num_mem_refs 533262345 # number of memory refs
+system.cpu.num_store_insts 149160185 # Number of store instructions
system.cpu.workload.PROG:num_syscalls 551 # Number of system calls
---------- End Simulation Statistics ----------
diff --git a/tests/long/20.parser/ref/x86/linux/simple-timing/config.ini b/tests/long/20.parser/ref/x86/linux/simple-timing/config.ini
index fc75460ef..4c1fe374d 100644
--- a/tests/long/20.parser/ref/x86/linux/simple-timing/config.ini
+++ b/tests/long/20.parser/ref/x86/linux/simple-timing/config.ini
@@ -10,6 +10,13 @@ type=System
children=cpu membus physmem
mem_mode=atomic
physmem=system.physmem
+work_begin_ckpt_count=0
+work_begin_cpu_id_exit=-1
+work_begin_exit_count=0
+work_cpus_ckpt_count=0
+work_end_ckpt_count=0
+work_end_exit_count=0
+work_item_id=-1
[system.cpu]
type=TimingSimpleCPU
@@ -154,7 +161,7 @@ type=ExeTracer
[system.cpu.workload]
type=LiveProcess
cmd=parser 2.1.dict -batch
-cwd=build/X86_SE/tests/opt/long/20.parser/x86/linux/simple-timing
+cwd=build/X86_SE/tests/fast/long/20.parser/x86/linux/simple-timing
egid=100
env=
errout=cerr
diff --git a/tests/long/20.parser/ref/x86/linux/simple-timing/simout b/tests/long/20.parser/ref/x86/linux/simple-timing/simout
index 2f7e6c58c..9e491e500 100755
--- a/tests/long/20.parser/ref/x86/linux/simple-timing/simout
+++ b/tests/long/20.parser/ref/x86/linux/simple-timing/simout
@@ -5,11 +5,11 @@ The Regents of The University of Michigan
All Rights Reserved
-M5 compiled Jan 31 2011 14:03:49
-M5 revision aa283c8952a9 7880 default qtip stupdstats.patch tip
-M5 started Jan 31 2011 14:03:51
+M5 compiled Feb 7 2011 02:32:07
+M5 revision 4b4b02c5553c 7929 default qtip reupdatestats.patch tip
+M5 started Feb 7 2011 02:36:47
M5 executing on burrito
-command line: build/X86_SE/m5.opt -d build/X86_SE/tests/opt/long/20.parser/x86/linux/simple-timing -re tests/run.py build/X86_SE/tests/opt/long/20.parser/x86/linux/simple-timing
+command line: build/X86_SE/m5.fast -d build/X86_SE/tests/fast/long/20.parser/x86/linux/simple-timing -re tests/run.py build/X86_SE/tests/fast/long/20.parser/x86/linux/simple-timing
Global frequency set at 1000000000000 ticks per second
info: Entering event queue @ 0. Starting simulation...
diff --git a/tests/long/20.parser/ref/x86/linux/simple-timing/stats.txt b/tests/long/20.parser/ref/x86/linux/simple-timing/stats.txt
index 630224d3a..2cd323573 100644
--- a/tests/long/20.parser/ref/x86/linux/simple-timing/stats.txt
+++ b/tests/long/20.parser/ref/x86/linux/simple-timing/stats.txt
@@ -1,9 +1,9 @@
---------- Begin Simulation Statistics ----------
-host_inst_rate 1108188 # Simulator instruction rate (inst/s)
-host_mem_usage 231336 # Number of bytes of host memory used
-host_seconds 1379.72 # Real time elapsed on the host
-host_tick_rate 1202222105 # Simulator tick rate (ticks/s)
+host_inst_rate 738382 # Simulator instruction rate (inst/s)
+host_mem_usage 235020 # Number of bytes of host memory used
+host_seconds 2070.73 # Real time elapsed on the host
+host_tick_rate 801036637 # Simulator tick rate (ticks/s)
sim_freq 1000000000000 # Frequency of simulated ticks
sim_insts 1528988757 # Number of instructions simulated
sim_seconds 1.658730 # Number of seconds simulated
@@ -200,8 +200,24 @@ system.cpu.l2cache.warmup_cycle 896565143000 # Cy
system.cpu.l2cache.writebacks 411709 # number of writebacks
system.cpu.not_idle_fraction 1 # Percentage of non-idle cycles
system.cpu.numCycles 3317459208 # number of cpu cycles simulated
+system.cpu.numWorkItemsCompleted 0 # number of work items this cpu completed
+system.cpu.numWorkItemsStarted 0 # number of work items this cpu started
+system.cpu.num_busy_cycles 3317459208 # Number of busy cycles
+system.cpu.num_conditional_control_insts 92658800 # number of instructions that are conditional controls
+system.cpu.num_fp_alu_accesses 0 # Number of float alu accesses
+system.cpu.num_fp_insts 0 # number of float instructions
+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
+system.cpu.num_func_calls 0 # number of times a function call or return occured
+system.cpu.num_idle_cycles 0 # Number of idle cycles
system.cpu.num_insts 1528988757 # Number of instructions executed
-system.cpu.num_refs 533262345 # Number of memory references
+system.cpu.num_int_alu_accesses 1528317615 # Number of integer alu accesses
+system.cpu.num_int_insts 1528317615 # number of integer instructions
+system.cpu.num_int_register_reads 4418676175 # number of times the integer registers were read
+system.cpu.num_int_register_writes 1427299027 # number of times the integer registers were written
+system.cpu.num_load_insts 384102160 # Number of load instructions
+system.cpu.num_mem_refs 533262345 # number of memory refs
+system.cpu.num_store_insts 149160185 # Number of store instructions
system.cpu.workload.PROG:num_syscalls 551 # Number of system calls
---------- End Simulation Statistics ----------