summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGabe Black <gblack@eecs.umich.edu>2011-11-28 04:19:57 -0500
committerGabe Black <gblack@eecs.umich.edu>2011-11-28 04:19:57 -0500
commit0e621fd1367e431fd5af55693d45925fa6144146 (patch)
treef5544cbad40023b65a1178936e7c08066a6493cf
parente7d0c999a140949e165b75961c4a32a01c7562ce (diff)
downloadgem5-0e621fd1367e431fd5af55693d45925fa6144146.tar.xz
SPARC: Update the FS stats for the recent FP fix.
--HG-- extra : rebase_source : 643e3541507576e30d9cd4dec045e5b94532c342
-rw-r--r--tests/long/80.solaris-boot/ref/sparc/solaris/t1000-simple-atomic/config.ini14
-rwxr-xr-xtests/long/80.solaris-boot/ref/sparc/solaris/t1000-simple-atomic/simout8
-rw-r--r--tests/long/80.solaris-boot/ref/sparc/solaris/t1000-simple-atomic/stats.txt12
3 files changed, 23 insertions, 11 deletions
diff --git a/tests/long/80.solaris-boot/ref/sparc/solaris/t1000-simple-atomic/config.ini b/tests/long/80.solaris-boot/ref/sparc/solaris/t1000-simple-atomic/config.ini
index cc2f70a95..395184da9 100644
--- a/tests/long/80.solaris-boot/ref/sparc/solaris/t1000-simple-atomic/config.ini
+++ b/tests/long/80.solaris-boot/ref/sparc/solaris/t1000-simple-atomic/config.ini
@@ -19,6 +19,7 @@ init_param=0
kernel=
load_addr_mask=1099511627775
mem_mode=atomic
+memories=system.nvram system.physmem2 system.partition_desc system.physmem system.hypervisor_desc system.rom
nvram=system.nvram
nvram_addr=133429198848
nvram_bin=/dist/m5/system/binaries/nvram1
@@ -161,6 +162,7 @@ port=system.t1000.iob.pio system.t1000.htod.pio system.bridge.side_b system.phys
[system.membus.badaddr_responder]
type=IsaFake
+fake_mem=false
pio_addr=0
pio_latency=2
pio_size=8
@@ -233,6 +235,7 @@ system=system
[system.t1000.fake_clk]
type=IsaFake
+fake_mem=false
pio_addr=644245094400
pio_latency=2
pio_size=4294967296
@@ -249,6 +252,7 @@ pio=system.iobus.port[0]
[system.t1000.fake_jbi]
type=IsaFake
+fake_mem=false
pio_addr=549755813888
pio_latency=2
pio_size=4294967296
@@ -265,6 +269,7 @@ pio=system.iobus.port[11]
[system.t1000.fake_l2_1]
type=IsaFake
+fake_mem=false
pio_addr=725849473024
pio_latency=2
pio_size=8
@@ -281,6 +286,7 @@ pio=system.iobus.port[2]
[system.t1000.fake_l2_2]
type=IsaFake
+fake_mem=false
pio_addr=725849473088
pio_latency=2
pio_size=8
@@ -297,6 +303,7 @@ pio=system.iobus.port[3]
[system.t1000.fake_l2_3]
type=IsaFake
+fake_mem=false
pio_addr=725849473152
pio_latency=2
pio_size=8
@@ -313,6 +320,7 @@ pio=system.iobus.port[4]
[system.t1000.fake_l2_4]
type=IsaFake
+fake_mem=false
pio_addr=725849473216
pio_latency=2
pio_size=8
@@ -329,6 +337,7 @@ pio=system.iobus.port[5]
[system.t1000.fake_l2esr_1]
type=IsaFake
+fake_mem=false
pio_addr=734439407616
pio_latency=2
pio_size=8
@@ -345,6 +354,7 @@ pio=system.iobus.port[6]
[system.t1000.fake_l2esr_2]
type=IsaFake
+fake_mem=false
pio_addr=734439407680
pio_latency=2
pio_size=8
@@ -361,6 +371,7 @@ pio=system.iobus.port[7]
[system.t1000.fake_l2esr_3]
type=IsaFake
+fake_mem=false
pio_addr=734439407744
pio_latency=2
pio_size=8
@@ -377,6 +388,7 @@ pio=system.iobus.port[8]
[system.t1000.fake_l2esr_4]
type=IsaFake
+fake_mem=false
pio_addr=734439407808
pio_latency=2
pio_size=8
@@ -393,6 +405,7 @@ pio=system.iobus.port[9]
[system.t1000.fake_membnks]
type=IsaFake
+fake_mem=false
pio_addr=648540061696
pio_latency=2
pio_size=16384
@@ -409,6 +422,7 @@ pio=system.iobus.port[1]
[system.t1000.fake_ssi]
type=IsaFake
+fake_mem=false
pio_addr=1095216660480
pio_latency=2
pio_size=268435456
diff --git a/tests/long/80.solaris-boot/ref/sparc/solaris/t1000-simple-atomic/simout b/tests/long/80.solaris-boot/ref/sparc/solaris/t1000-simple-atomic/simout
index 39438a2c7..6ef01a659 100755
--- a/tests/long/80.solaris-boot/ref/sparc/solaris/t1000-simple-atomic/simout
+++ b/tests/long/80.solaris-boot/ref/sparc/solaris/t1000-simple-atomic/simout
@@ -1,11 +1,9 @@
-Redirecting stdout to build/SPARC_FS/tests/opt/long/80.solaris-boot/sparc/solaris/t1000-simple-atomic/simout
-Redirecting stderr to build/SPARC_FS/tests/opt/long/80.solaris-boot/sparc/solaris/t1000-simple-atomic/simerr
gem5 Simulator System. http://gem5.org
gem5 is copyrighted software; use the --copyright option for details.
-gem5 compiled Jun 12 2011 07:35:14
-gem5 started Jun 12 2011 07:35:20
-gem5 executing on zizzer
+gem5 compiled Nov 27 2011 04:34:45
+gem5 started Nov 27 2011 04:35:04
+gem5 executing on chips
command line: build/SPARC_FS/gem5.opt -d build/SPARC_FS/tests/opt/long/80.solaris-boot/sparc/solaris/t1000-simple-atomic -re tests/run.py build/SPARC_FS/tests/opt/long/80.solaris-boot/sparc/solaris/t1000-simple-atomic
Global frequency set at 2000000000 ticks per second
info: No kernel set for full system simulation. Assuming you know what you're doing...
diff --git a/tests/long/80.solaris-boot/ref/sparc/solaris/t1000-simple-atomic/stats.txt b/tests/long/80.solaris-boot/ref/sparc/solaris/t1000-simple-atomic/stats.txt
index 4b265dc78..a8935aa0a 100644
--- a/tests/long/80.solaris-boot/ref/sparc/solaris/t1000-simple-atomic/stats.txt
+++ b/tests/long/80.solaris-boot/ref/sparc/solaris/t1000-simple-atomic/stats.txt
@@ -3,10 +3,10 @@
sim_seconds 1.116889 # Number of seconds simulated
sim_ticks 2233777512 # Number of ticks simulated
sim_freq 2000000000 # Frequency of simulated ticks
-host_inst_rate 2349387 # Simulator instruction rate (inst/s)
-host_tick_rate 2354253 # Simulator tick rate (ticks/s)
-host_mem_usage 524024 # Number of bytes of host memory used
-host_seconds 948.83 # Real time elapsed on the host
+host_inst_rate 941153 # Simulator instruction rate (inst/s)
+host_tick_rate 943102 # Simulator tick rate (ticks/s)
+host_mem_usage 535596 # Number of bytes of host memory used
+host_seconds 2368.54 # Real time elapsed on the host
sim_insts 2229160714 # Number of instructions simulated
system.cpu.numCycles 2233777513 # number of cpu cycles simulated
system.cpu.numWorkItemsStarted 0 # number of work items this cpu started
@@ -18,8 +18,8 @@ system.cpu.num_func_calls 44037246 # nu
system.cpu.num_conditional_control_insts 316367761 # number of instructions that are conditional controls
system.cpu.num_int_insts 1839325658 # number of integer instructions
system.cpu.num_fp_insts 14608322 # number of float instructions
-system.cpu.num_int_register_reads 4304894311 # number of times the integer registers were read
-system.cpu.num_int_register_writes 2108336490 # number of times the integer registers were written
+system.cpu.num_int_register_reads 4305540407 # number of times the integer registers were read
+system.cpu.num_int_register_writes 2100562807 # number of times the integer registers were written
system.cpu.num_fp_register_reads 35401841 # number of times the floating registers were read
system.cpu.num_fp_register_writes 22917558 # number of times the floating registers were written
system.cpu.num_mem_refs 547951940 # number of memory refs