changeset cb1e137ac35e in /z/repo/m5
details: http://repo.m5sim.org/m5?cmd=changeset;node=cb1e137ac35e
description:
ARM: Fix stats for ARM_SE checkpoint restore fix.
Register reads/writes done in startup() count against the stats while
they
don't count if done in initState().
diffstat:
tests/long/00.gzip/ref/arm/linux/o3-timing/config.ini | 4 ++--
tests/long/00.gzip/ref/arm/linux/o3-timing/stats.txt | 14 +++++++-------
tests/long/10.mcf/ref/arm/linux/o3-timing/config.ini | 6 +++---
tests/long/10.mcf/ref/arm/linux/o3-timing/stats.txt | 14 +++++++-------
tests/long/20.parser/ref/arm/linux/o3-timing/config.ini | 6 +++---
tests/long/20.parser/ref/arm/linux/o3-timing/stats.txt | 14 +++++++-------
tests/long/30.eon/ref/arm/linux/o3-timing/config.ini | 4 ++--
tests/long/30.eon/ref/arm/linux/o3-timing/stats.txt | 14 +++++++-------
tests/long/40.perlbmk/ref/arm/linux/o3-timing/config.ini | 4 ++--
tests/long/40.perlbmk/ref/arm/linux/o3-timing/stats.txt | 14 +++++++-------
tests/long/50.vortex/ref/arm/linux/o3-timing/config.ini | 4 ++--
tests/long/50.vortex/ref/arm/linux/o3-timing/stats.txt | 14 +++++++-------
tests/long/60.bzip2/ref/arm/linux/o3-timing/config.ini | 4 ++--
tests/long/60.bzip2/ref/arm/linux/o3-timing/stats.txt | 14 +++++++-------
tests/long/70.twolf/ref/arm/linux/o3-timing/config.ini | 4 ++--
tests/long/70.twolf/ref/arm/linux/o3-timing/stats.txt | 14 +++++++-------
tests/quick/00.hello/ref/arm/linux/o3-timing/config.ini | 2 +-
tests/quick/00.hello/ref/arm/linux/o3-timing/stats.txt | 14 +++++++-------
18 files changed, 82 insertions(+), 82 deletions(-)
diffs (truncated from 495 to 300 lines):
diff -r 70e61aa65759 -r cb1e137ac35e
tests/long/00.gzip/ref/arm/linux/o3-timing/config.ini
--- a/tests/long/00.gzip/ref/arm/linux/o3-timing/config.ini Sun Apr 10
21:02:28 2011 -0400
+++ b/tests/long/00.gzip/ref/arm/linux/o3-timing/config.ini Tue Apr 12
16:09:20 2011 -0400
@@ -493,12 +493,12 @@
[system.cpu.workload]
type=LiveProcess
cmd=gzip input.log 1
-cwd=build/ARM_SE/tests/opt/long/00.gzip/arm/linux/o3-timing
+cwd=build/ARM_SE/tests/fast/long/00.gzip/arm/linux/o3-timing
egid=100
env=
errout=cerr
euid=100
-executable=/chips/pd/randd/dist/cpu2000/binaries/arm/linux/gzip
+executable=/arm/scratch/alisai01/dist/cpu2000/binaries/arm/linux/gzip
gid=100
input=cin
max_stack_size=67108864
diff -r 70e61aa65759 -r cb1e137ac35e
tests/long/00.gzip/ref/arm/linux/o3-timing/stats.txt
--- a/tests/long/00.gzip/ref/arm/linux/o3-timing/stats.txt Sun Apr 10
21:02:28 2011 -0400
+++ b/tests/long/00.gzip/ref/arm/linux/o3-timing/stats.txt Tue Apr 12
16:09:20 2011 -0400
@@ -1,9 +1,9 @@
---------- Begin Simulation Statistics ----------
-host_inst_rate 79580 #
Simulator instruction rate (inst/s)
-host_mem_usage 255900 #
Number of bytes of host memory used
-host_seconds 7569.27 #
Real time elapsed on the host
-host_tick_rate 25961971 #
Simulator tick rate (ticks/s)
+host_inst_rate 238408 #
Simulator instruction rate (inst/s)
+host_mem_usage 258640 #
Number of bytes of host memory used
+host_seconds 2526.59 #
Real time elapsed on the host
+host_tick_rate 77778012 #
Simulator tick rate (ticks/s)
sim_freq 1000000000000 #
Frequency of simulated ticks
sim_insts 602359865 #
Number of instructions simulated
sim_seconds 0.196513 #
Number of seconds simulated
@@ -287,7 +287,7 @@
system.cpu.iew.predictedNotTakenIncorrect 628522 #
Number of branches that were predicted not taken incorrectly
system.cpu.iew.predictedTakenIncorrect 3676919 #
Number of branches that were predicted taken incorrectly
system.cpu.int_regfile_reads 1724767298 #
number of integer regfile reads
-system.cpu.int_regfile_writes 495432855 #
number of integer regfile writes
+system.cpu.int_regfile_writes 495432851 #
number of integer regfile writes
system.cpu.ipc 1.532620 #
IPC: Instructions Per Cycle
system.cpu.ipc_total 1.532620 #
IPC: Total IPC of All Threads
system.cpu.iq.ISSUE:FU_type_0::No_OpClass 0 0.00% 0.00% #
Type of FU issued
@@ -497,8 +497,8 @@
system.cpu.memDep0.conflictingStores 23086559 #
Number of conflicting stores.
system.cpu.memDep0.insertedLoads 176106355 #
Number of loads inserted to the mem dependence unit.
system.cpu.memDep0.insertedStores 82187861 #
Number of stores inserted to the mem dependence unit.
-system.cpu.misc_regfile_reads 922126404 #
number of misc regfile reads
-system.cpu.misc_regfile_writes 2684 #
number of misc regfile writes
+system.cpu.misc_regfile_reads 922126402 #
number of misc regfile reads
+system.cpu.misc_regfile_writes 2682 #
number of misc regfile writes
system.cpu.numCycles 393026282 #
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
diff -r 70e61aa65759 -r cb1e137ac35e
tests/long/10.mcf/ref/arm/linux/o3-timing/config.ini
--- a/tests/long/10.mcf/ref/arm/linux/o3-timing/config.ini Sun Apr 10
21:02:28 2011 -0400
+++ b/tests/long/10.mcf/ref/arm/linux/o3-timing/config.ini Tue Apr 12
16:09:20 2011 -0400
@@ -493,14 +493,14 @@
[system.cpu.workload]
type=LiveProcess
cmd=mcf mcf.in
-cwd=build/ARM_SE/tests/opt/long/10.mcf/arm/linux/o3-timing
+cwd=build/ARM_SE/tests/fast/long/10.mcf/arm/linux/o3-timing
egid=100
env=
errout=cerr
euid=100
-executable=/chips/pd/randd/dist/cpu2000/binaries/arm/linux/mcf
+executable=/arm/scratch/alisai01/dist/cpu2000/binaries/arm/linux/mcf
gid=100
-input=/chips/pd/randd/dist/cpu2000/data/mcf/smred/input/mcf.in
+input=/arm/scratch/alisai01/dist/cpu2000/data/mcf/smred/input/mcf.in
max_stack_size=67108864
output=cout
pid=100
diff -r 70e61aa65759 -r cb1e137ac35e
tests/long/10.mcf/ref/arm/linux/o3-timing/stats.txt
--- a/tests/long/10.mcf/ref/arm/linux/o3-timing/stats.txt Sun Apr 10
21:02:28 2011 -0400
+++ b/tests/long/10.mcf/ref/arm/linux/o3-timing/stats.txt Tue Apr 12
16:09:20 2011 -0400
@@ -1,9 +1,9 @@
---------- Begin Simulation Statistics ----------
-host_inst_rate 64138 #
Simulator instruction rate (inst/s)
-host_mem_usage 388624 #
Number of bytes of host memory used
-host_seconds 1422.72 #
Real time elapsed on the host
-host_tick_rate 31485248 #
Simulator tick rate (ticks/s)
+host_inst_rate 190258 #
Simulator instruction rate (inst/s)
+host_mem_usage 391364 #
Number of bytes of host memory used
+host_seconds 479.61 #
Real time elapsed on the host
+host_tick_rate 93397782 #
Simulator tick rate (ticks/s)
sim_freq 1000000000000 #
Frequency of simulated ticks
sim_insts 91249905 #
Number of instructions simulated
sim_seconds 0.044795 #
Number of seconds simulated
@@ -288,7 +288,7 @@
system.cpu.iew.predictedNotTakenIncorrect 282853 #
Number of branches that were predicted not taken incorrectly
system.cpu.iew.predictedTakenIncorrect 1526930 #
Number of branches that were predicted taken incorrectly
system.cpu.int_regfile_reads 259728905 #
number of integer regfile reads
-system.cpu.int_regfile_writes 80595216 #
number of integer regfile writes
+system.cpu.int_regfile_writes 80595212 #
number of integer regfile writes
system.cpu.ipc 1.018534 #
IPC: Instructions Per Cycle
system.cpu.ipc_total 1.018534 #
IPC: Total IPC of All Threads
system.cpu.iq.ISSUE:FU_type_0::No_OpClass 0 0.00% 0.00% #
Type of FU issued
@@ -497,8 +497,8 @@
system.cpu.memDep0.conflictingStores 377389 #
Number of conflicting stores.
system.cpu.memDep0.insertedLoads 31496278 #
Number of loads inserted to the mem dependence unit.
system.cpu.memDep0.insertedStores 6614347 #
Number of stores inserted to the mem dependence unit.
-system.cpu.misc_regfile_reads 197340646 #
number of misc regfile reads
-system.cpu.misc_regfile_writes 11604 #
number of misc regfile writes
+system.cpu.misc_regfile_reads 197340644 #
number of misc regfile reads
+system.cpu.misc_regfile_writes 11602 #
number of misc regfile writes
system.cpu.numCycles 89589473 #
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
diff -r 70e61aa65759 -r cb1e137ac35e
tests/long/20.parser/ref/arm/linux/o3-timing/config.ini
--- a/tests/long/20.parser/ref/arm/linux/o3-timing/config.ini Sun Apr 10
21:02:28 2011 -0400
+++ b/tests/long/20.parser/ref/arm/linux/o3-timing/config.ini Tue Apr 12
16:09:20 2011 -0400
@@ -493,14 +493,14 @@
[system.cpu.workload]
type=LiveProcess
cmd=parser 2.1.dict -batch
-cwd=build/ARM_SE/tests/opt/long/20.parser/arm/linux/o3-timing
+cwd=build/ARM_SE/tests/fast/long/20.parser/arm/linux/o3-timing
egid=100
env=
errout=cerr
euid=100
-executable=/chips/pd/randd/dist/cpu2000/binaries/arm/linux/parser
+executable=/arm/scratch/alisai01/dist/cpu2000/binaries/arm/linux/parser
gid=100
-input=/chips/pd/randd/dist/cpu2000/data/parser/mdred/input/parser.in
+input=/arm/scratch/alisai01/dist/cpu2000/data/parser/mdred/input/parser.in
max_stack_size=67108864
output=cout
pid=100
diff -r 70e61aa65759 -r cb1e137ac35e
tests/long/20.parser/ref/arm/linux/o3-timing/stats.txt
--- a/tests/long/20.parser/ref/arm/linux/o3-timing/stats.txt Sun Apr 10
21:02:28 2011 -0400
+++ b/tests/long/20.parser/ref/arm/linux/o3-timing/stats.txt Tue Apr 12
16:09:20 2011 -0400
@@ -1,9 +1,9 @@
---------- Begin Simulation Statistics ----------
-host_inst_rate 59520 #
Simulator instruction rate (inst/s)
-host_mem_usage 261972 #
Number of bytes of host memory used
-host_seconds 9632.84 #
Real time elapsed on the host
-host_tick_rate 34541337 #
Simulator tick rate (ticks/s)
+host_inst_rate 134709 #
Simulator instruction rate (inst/s)
+host_mem_usage 264692 #
Number of bytes of host memory used
+host_seconds 4256.17 #
Real time elapsed on the host
+host_tick_rate 78176241 #
Simulator tick rate (ticks/s)
sim_freq 1000000000000 #
Frequency of simulated ticks
sim_insts 573342397 #
Number of instructions simulated
sim_seconds 0.332731 #
Number of seconds simulated
@@ -287,7 +287,7 @@
system.cpu.iew.predictedNotTakenIncorrect 6965983 #
Number of branches that were predicted not taken incorrectly
system.cpu.iew.predictedTakenIncorrect 18134157 #
Number of branches that were predicted taken incorrectly
system.cpu.int_regfile_reads 1609052037 #
number of integer regfile reads
-system.cpu.int_regfile_writes 524399008 #
number of integer regfile writes
+system.cpu.int_regfile_writes 524399004 #
number of integer regfile writes
system.cpu.ipc 0.861570 #
IPC: Instructions Per Cycle
system.cpu.ipc_total 0.861570 #
IPC: Total IPC of All Threads
system.cpu.iq.ISSUE:FU_type_0::No_OpClass 0 0.00% 0.00% #
Type of FU issued
@@ -499,8 +499,8 @@
system.cpu.memDep0.conflictingStores 61680450 #
Number of conflicting stores.
system.cpu.memDep0.insertedLoads 196892006 #
Number of loads inserted to the mem dependence unit.
system.cpu.memDep0.insertedStores 114373867 #
Number of stores inserted to the mem dependence unit.
-system.cpu.misc_regfile_reads 1238278236 #
number of misc regfile reads
-system.cpu.misc_regfile_writes 4464328 #
number of misc regfile writes
+system.cpu.misc_regfile_reads 1238278234 #
number of misc regfile reads
+system.cpu.misc_regfile_writes 4464326 #
number of misc regfile writes
system.cpu.numCycles 665462439 #
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
diff -r 70e61aa65759 -r cb1e137ac35e
tests/long/30.eon/ref/arm/linux/o3-timing/config.ini
--- a/tests/long/30.eon/ref/arm/linux/o3-timing/config.ini Sun Apr 10
21:02:28 2011 -0400
+++ b/tests/long/30.eon/ref/arm/linux/o3-timing/config.ini Tue Apr 12
16:09:20 2011 -0400
@@ -493,12 +493,12 @@
[system.cpu.workload]
type=LiveProcess
cmd=eon chair.control.cook chair.camera chair.surfaces chair.cook.ppm ppm
pixels_out.cook
-cwd=build/ARM_SE/tests/opt/long/30.eon/arm/linux/o3-timing
+cwd=build/ARM_SE/tests/fast/long/30.eon/arm/linux/o3-timing
egid=100
env=
errout=cerr
euid=100
-executable=/chips/pd/randd/dist/cpu2000/binaries/arm/linux/eon
+executable=/arm/scratch/alisai01/dist/cpu2000/binaries/arm/linux/eon
gid=100
input=cin
max_stack_size=67108864
diff -r 70e61aa65759 -r cb1e137ac35e
tests/long/30.eon/ref/arm/linux/o3-timing/stats.txt
--- a/tests/long/30.eon/ref/arm/linux/o3-timing/stats.txt Sun Apr 10
21:02:28 2011 -0400
+++ b/tests/long/30.eon/ref/arm/linux/o3-timing/stats.txt Tue Apr 12
16:09:20 2011 -0400
@@ -1,9 +1,9 @@
---------- Begin Simulation Statistics ----------
-host_inst_rate 74668 #
Simulator instruction rate (inst/s)
-host_mem_usage 264768 #
Number of bytes of host memory used
-host_seconds 4674.91 #
Real time elapsed on the host
-host_tick_rate 32457846 #
Simulator tick rate (ticks/s)
+host_inst_rate 203026 #
Simulator instruction rate (inst/s)
+host_mem_usage 267492 #
Number of bytes of host memory used
+host_seconds 1719.32 #
Real time elapsed on the host
+host_tick_rate 88254289 #
Simulator tick rate (ticks/s)
sim_freq 1000000000000 #
Frequency of simulated ticks
sim_insts 349065985 #
Number of instructions simulated
sim_seconds 0.151737 #
Number of seconds simulated
@@ -288,7 +288,7 @@
system.cpu.iew.predictedNotTakenIncorrect 360118 #
Number of branches that were predicted not taken incorrectly
system.cpu.iew.predictedTakenIncorrect 3215056 #
Number of branches that were predicted taken incorrectly
system.cpu.int_regfile_reads 845155916 #
number of integer regfile reads
-system.cpu.int_regfile_writes 184404890 #
number of integer regfile writes
+system.cpu.int_regfile_writes 184404886 #
number of integer regfile writes
system.cpu.ipc 1.150231 #
IPC: Instructions Per Cycle
system.cpu.ipc_total 1.150231 #
IPC: Total IPC of All Threads
system.cpu.iq.ISSUE:FU_type_0::No_OpClass 0 0.00% 0.00% #
Type of FU issued
@@ -497,8 +497,8 @@
system.cpu.memDep0.conflictingStores 25086687 #
Number of conflicting stores.
system.cpu.memDep0.insertedLoads 104118233 #
Number of loads inserted to the mem dependence unit.
system.cpu.memDep0.insertedStores 89143121 #
Number of stores inserted to the mem dependence unit.
-system.cpu.misc_regfile_reads 963294655 #
number of misc regfile reads
-system.cpu.misc_regfile_writes 34422261 #
number of misc regfile writes
+system.cpu.misc_regfile_reads 963294653 #
number of misc regfile reads
+system.cpu.misc_regfile_writes 34422259 #
number of misc regfile writes
system.cpu.numCycles 303474759 #
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
diff -r 70e61aa65759 -r cb1e137ac35e
tests/long/40.perlbmk/ref/arm/linux/o3-timing/config.ini
--- a/tests/long/40.perlbmk/ref/arm/linux/o3-timing/config.ini Sun Apr 10
21:02:28 2011 -0400
+++ b/tests/long/40.perlbmk/ref/arm/linux/o3-timing/config.ini Tue Apr 12
16:09:20 2011 -0400
@@ -493,12 +493,12 @@
[system.cpu.workload]
type=LiveProcess
cmd=perlbmk -I. -I lib lgred.makerand.pl
-cwd=build/ARM_SE/tests/opt/long/40.perlbmk/arm/linux/o3-timing
+cwd=build/ARM_SE/tests/fast/long/40.perlbmk/arm/linux/o3-timing
egid=100
env=
errout=cerr
euid=100
-executable=/chips/pd/randd/dist/cpu2000/binaries/arm/linux/perlbmk
+executable=/arm/scratch/alisai01/dist/cpu2000/binaries/arm/linux/perlbmk
gid=100
input=cin
max_stack_size=67108864
diff -r 70e61aa65759 -r cb1e137ac35e
tests/long/40.perlbmk/ref/arm/linux/o3-timing/stats.txt
--- a/tests/long/40.perlbmk/ref/arm/linux/o3-timing/stats.txt Sun Apr 10
21:02:28 2011 -0400
+++ b/tests/long/40.perlbmk/ref/arm/linux/o3-timing/stats.txt Tue Apr 12
16:09:20 2011 -0400
@@ -1,9 +1,9 @@
---------- Begin Simulation Statistics ----------
-host_inst_rate 81390 #
Simulator instruction rate (inst/s)
-host_mem_usage 261920 #
Number of bytes of host memory used
-host_seconds 23164.20 #
Real time elapsed on the host
-host_tick_rate 37520082 #
Simulator tick rate (ticks/s)
+host_inst_rate 140843 #
Simulator instruction rate (inst/s)
+host_mem_usage 264636 #
Number of bytes of host memory used
+host_seconds 13386.13 #
Real time elapsed on the host
+host_tick_rate 64927108 #
Simulator tick rate (ticks/s)
sim_freq 1000000000000 #
Frequency of simulated ticks
sim_insts 1885343131 #
Number of instructions simulated
sim_seconds 0.869123 #
Number of seconds simulated
@@ -288,7 +288,7 @@
system.cpu.iew.predictedNotTakenIncorrect 7823566 #
Number of branches that were predicted not taken incorrectly
system.cpu.iew.predictedTakenIncorrect 38670994 #
Number of branches that were predicted taken incorrectly
system.cpu.int_regfile_reads 5694776843 #
number of integer regfile reads
-system.cpu.int_regfile_writes 1751148890 #
number of integer regfile writes
+system.cpu.int_regfile_writes 1751148886 #
number of integer regfile writes
system.cpu.ipc 1.084624 #
IPC: Instructions Per Cycle
system.cpu.ipc_total 1.084624 #
IPC: Total IPC of All Threads
system.cpu.iq.ISSUE:FU_type_0::No_OpClass 0 0.00% 0.00% #
Type of FU issued
@@ -498,8 +498,8 @@
system.cpu.memDep0.conflictingStores 97070199 #
Number of conflicting stores.
system.cpu.memDep0.insertedLoads 946299703 #
Number of loads inserted to the mem dependence unit.
system.cpu.memDep0.insertedStores 478952600 #
Number of stores inserted to the mem dependence unit.
-system.cpu.misc_regfile_reads 3932819873 #
number of misc regfile reads
-system.cpu.misc_regfile_writes 13780016 #
number of misc regfile writes
+system.cpu.misc_regfile_reads 3932819871 #
number of misc regfile reads
+system.cpu.misc_regfile_writes 13780014 #
number of misc regfile writes
system.cpu.numCycles 1738245230 #
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
diff -r 70e61aa65759 -r cb1e137ac35e
tests/long/50.vortex/ref/arm/linux/o3-timing/config.ini
--- a/tests/long/50.vortex/ref/arm/linux/o3-timing/config.ini Sun Apr 10
21:02:28 2011 -0400
+++ b/tests/long/50.vortex/ref/arm/linux/o3-timing/config.ini Tue Apr 12
16:09:20 2011 -0400
@@ -493,12 +493,12 @@
[system.cpu.workload]
type=LiveProcess
cmd=vortex lendian.raw
-cwd=build/ARM_SE/tests/opt/long/50.vortex/arm/linux/o3-timing
+cwd=build/ARM_SE/tests/fast/long/50.vortex/arm/linux/o3-timing
egid=100
env=
errout=cerr
euid=100
-executable=/chips/pd/randd/dist/cpu2000/binaries/arm/linux/vortex
+executable=/arm/scratch/alisai01/dist/cpu2000/binaries/arm/linux/vortex
gid=100
input=cin
max_stack_size=67108864
diff -r 70e61aa65759 -r cb1e137ac35e
tests/long/50.vortex/ref/arm/linux/o3-timing/stats.txt
_______________________________________________
m5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/m5-dev
