From 4a644767c58754339965cecc5d85853255652a30 Mon Sep 17 00:00:00 2001
From: Nathan Binkert <nate@binkert.org>
Date: Wed, 9 May 2012 11:52:14 -0700
Subject: stats: update stats for no_value -> nan Lots of accumulated older
 changes too.

---
 .../sparc/solaris/t1000-simple-atomic/config.ini   | 90 +++++++++++++---------
 1 file changed, 52 insertions(+), 38 deletions(-)

(limited to 'tests/long/fs/80.solaris-boot/ref/sparc/solaris/t1000-simple-atomic/config.ini')

diff --git a/tests/long/fs/80.solaris-boot/ref/sparc/solaris/t1000-simple-atomic/config.ini b/tests/long/fs/80.solaris-boot/ref/sparc/solaris/t1000-simple-atomic/config.ini
index 490c0c72f..acae3dcdb 100644
--- a/tests/long/fs/80.solaris-boot/ref/sparc/solaris/t1000-simple-atomic/config.ini
+++ b/tests/long/fs/80.solaris-boot/ref/sparc/solaris/t1000-simple-atomic/config.ini
@@ -19,7 +19,7 @@ init_param=0
 kernel=
 load_addr_mask=1099511627775
 mem_mode=atomic
-memories=system.rom system.hypervisor_desc system.physmem2 system.nvram system.physmem system.partition_desc
+memories=system.hypervisor_desc system.nvram system.partition_desc system.physmem2 system.rom system.physmem
 num_work_ids=16
 nvram=system.nvram
 nvram_addr=133429198848
@@ -29,7 +29,6 @@ openboot_bin=/dist/m5/system/binaries/openboot_new.bin
 partition_desc=system.partition_desc
 partition_desc_addr=133445976064
 partition_desc_bin=/dist/m5/system/binaries/1up-md.bin
-physmem=system.physmem
 readfile=tests/halt.sh
 reset_addr=1099243192320
 reset_bin=/dist/m5/system/binaries/reset_new.bin
@@ -42,7 +41,7 @@ work_cpus_ckpt_count=0
 work_end_ckpt_count=0
 work_end_exit_count=0
 work_item_id=-1
-system_port=system.membus.port[9]
+system_port=system.membus.slave[0]
 
 [system.bridge]
 type=Bridge
@@ -52,8 +51,8 @@ ranges=133412421632:133412421639 134217728000:554050781183 644245094400:65283502
 req_size=16
 resp_size=16
 write_ack=false
-master=system.iobus.port[14]
-slave=system.membus.port[2]
+master=system.iobus.slave[0]
+slave=system.membus.master[2]
 
 [system.cpu]
 type=AtomicSimpleCPU
@@ -66,6 +65,7 @@ do_checkpoint_insts=true
 do_quiesce=true
 do_statistics_insts=true
 dtb=system.cpu.dtb
+fastmem=false
 function_trace=false
 function_trace_start=0
 interrupts=system.cpu.interrupts
@@ -84,8 +84,8 @@ system=system
 tracer=system.cpu.tracer
 width=1
 workload=
-dcache_port=system.membus.port[11]
-icache_port=system.membus.port[10]
+dcache_port=system.membus.slave[2]
+icache_port=system.membus.slave[1]
 
 [system.cpu.dtb]
 type=SparcTLB
@@ -108,7 +108,7 @@ image=system.disk0.image
 pio_addr=134217728000
 pio_latency=2
 system=system
-pio=system.iobus.port[15]
+pio=system.iobus.master[14]
 
 [system.disk0.image]
 type=CowDiskImage
@@ -124,14 +124,16 @@ image_file=/dist/m5/system/disks/disk.s10hw2
 read_only=true
 
 [system.hypervisor_desc]
-type=PhysicalMemory
+type=SimpleMemory
+conf_table_reported=false
 file=
+in_addr_map=true
 latency=60
 latency_var=0
 null=false
 range=133446500352:133446508543
 zero=false
-port=system.membus.port[7]
+port=system.membus.master[7]
 
 [system.intrctrl]
 type=IntrControl
@@ -145,7 +147,8 @@ clock=2
 header_cycles=1
 use_default_range=false
 width=64
-port=system.t1000.fake_clk.pio system.t1000.fake_membnks.pio system.t1000.fake_l2_1.pio system.t1000.fake_l2_2.pio system.t1000.fake_l2_3.pio system.t1000.fake_l2_4.pio system.t1000.fake_l2esr_1.pio system.t1000.fake_l2esr_2.pio system.t1000.fake_l2esr_3.pio system.t1000.fake_l2esr_4.pio system.t1000.fake_ssi.pio system.t1000.fake_jbi.pio system.t1000.puart0.pio system.t1000.hvuart.pio system.bridge.master system.disk0.pio
+master=system.t1000.fake_clk.pio system.t1000.fake_membnks.pio system.t1000.fake_l2_1.pio system.t1000.fake_l2_2.pio system.t1000.fake_l2_3.pio system.t1000.fake_l2_4.pio system.t1000.fake_l2esr_1.pio system.t1000.fake_l2esr_2.pio system.t1000.fake_l2esr_3.pio system.t1000.fake_l2esr_4.pio system.t1000.fake_ssi.pio system.t1000.fake_jbi.pio system.t1000.puart0.pio system.t1000.hvuart.pio system.disk0.pio
+slave=system.bridge.master
 
 [system.membus]
 type=Bus
@@ -157,7 +160,8 @@ header_cycles=1
 use_default_range=false
 width=64
 default=system.membus.badaddr_responder.pio
-port=system.t1000.iob.pio system.t1000.htod.pio system.bridge.slave system.physmem.port[0] system.physmem2.port[0] system.rom.port[0] system.nvram.port[0] system.hypervisor_desc.port[0] system.partition_desc.port[0] system.system_port system.cpu.icache_port system.cpu.dcache_port
+master=system.t1000.iob.pio system.t1000.htod.pio system.bridge.slave system.physmem.port[0] system.physmem2.port[0] system.rom.port[0] system.nvram.port[0] system.hypervisor_desc.port[0] system.partition_desc.port[0]
+slave=system.system_port system.cpu.icache_port system.cpu.dcache_port
 
 [system.membus.badaddr_responder]
 type=IsaFake
@@ -176,54 +180,64 @@ warn_access=
 pio=system.membus.default
 
 [system.nvram]
-type=PhysicalMemory
+type=SimpleMemory
+conf_table_reported=false
 file=
+in_addr_map=true
 latency=60
 latency_var=0
 null=false
 range=133429198848:133429207039
 zero=false
-port=system.membus.port[6]
+port=system.membus.master[6]
 
 [system.partition_desc]
-type=PhysicalMemory
+type=SimpleMemory
+conf_table_reported=false
 file=
+in_addr_map=true
 latency=60
 latency_var=0
 null=false
 range=133445976064:133445984255
 zero=false
-port=system.membus.port[8]
+port=system.membus.master[8]
 
 [system.physmem]
-type=PhysicalMemory
+type=SimpleMemory
+conf_table_reported=false
 file=
+in_addr_map=true
 latency=60
 latency_var=0
 null=false
 range=1048576:68157439
 zero=true
-port=system.membus.port[3]
+port=system.membus.master[3]
 
 [system.physmem2]
-type=PhysicalMemory
+type=SimpleMemory
+conf_table_reported=false
 file=
+in_addr_map=true
 latency=60
 latency_var=0
 null=false
 range=2147483648:2415919103
 zero=true
-port=system.membus.port[4]
+port=system.membus.master[4]
 
 [system.rom]
-type=PhysicalMemory
+type=SimpleMemory
+conf_table_reported=false
 file=
+in_addr_map=true
 latency=60
 latency_var=0
 null=false
 range=1099243192320:1099251580927
 zero=false
-port=system.membus.port[5]
+port=system.membus.master[5]
 
 [system.t1000]
 type=T1000
@@ -245,7 +259,7 @@ ret_data8=255
 system=system
 update_data=false
 warn_access=
-pio=system.iobus.port[0]
+pio=system.iobus.master[0]
 
 [system.t1000.fake_jbi]
 type=IsaFake
@@ -261,7 +275,7 @@ ret_data8=255
 system=system
 update_data=false
 warn_access=
-pio=system.iobus.port[11]
+pio=system.iobus.master[11]
 
 [system.t1000.fake_l2_1]
 type=IsaFake
@@ -277,7 +291,7 @@ ret_data8=255
 system=system
 update_data=true
 warn_access=
-pio=system.iobus.port[2]
+pio=system.iobus.master[2]
 
 [system.t1000.fake_l2_2]
 type=IsaFake
@@ -293,7 +307,7 @@ ret_data8=255
 system=system
 update_data=true
 warn_access=
-pio=system.iobus.port[3]
+pio=system.iobus.master[3]
 
 [system.t1000.fake_l2_3]
 type=IsaFake
@@ -309,7 +323,7 @@ ret_data8=255
 system=system
 update_data=true
 warn_access=
-pio=system.iobus.port[4]
+pio=system.iobus.master[4]
 
 [system.t1000.fake_l2_4]
 type=IsaFake
@@ -325,7 +339,7 @@ ret_data8=255
 system=system
 update_data=true
 warn_access=
-pio=system.iobus.port[5]
+pio=system.iobus.master[5]
 
 [system.t1000.fake_l2esr_1]
 type=IsaFake
@@ -341,7 +355,7 @@ ret_data8=255
 system=system
 update_data=true
 warn_access=
-pio=system.iobus.port[6]
+pio=system.iobus.master[6]
 
 [system.t1000.fake_l2esr_2]
 type=IsaFake
@@ -357,7 +371,7 @@ ret_data8=255
 system=system
 update_data=true
 warn_access=
-pio=system.iobus.port[7]
+pio=system.iobus.master[7]
 
 [system.t1000.fake_l2esr_3]
 type=IsaFake
@@ -373,7 +387,7 @@ ret_data8=255
 system=system
 update_data=true
 warn_access=
-pio=system.iobus.port[8]
+pio=system.iobus.master[8]
 
 [system.t1000.fake_l2esr_4]
 type=IsaFake
@@ -389,7 +403,7 @@ ret_data8=255
 system=system
 update_data=true
 warn_access=
-pio=system.iobus.port[9]
+pio=system.iobus.master[9]
 
 [system.t1000.fake_membnks]
 type=IsaFake
@@ -405,7 +419,7 @@ ret_data8=255
 system=system
 update_data=false
 warn_access=
-pio=system.iobus.port[1]
+pio=system.iobus.master[1]
 
 [system.t1000.fake_ssi]
 type=IsaFake
@@ -421,7 +435,7 @@ ret_data8=255
 system=system
 update_data=false
 warn_access=
-pio=system.iobus.port[10]
+pio=system.iobus.master[10]
 
 [system.t1000.hterm]
 type=Terminal
@@ -436,7 +450,7 @@ pio_addr=1099255906296
 pio_latency=2
 system=system
 time=Thu Jan  1 00:00:00 2009
-pio=system.membus.port[1]
+pio=system.membus.master[1]
 
 [system.t1000.hvuart]
 type=Uart8250
@@ -445,14 +459,14 @@ pio_latency=2
 platform=system.t1000
 system=system
 terminal=system.t1000.hterm
-pio=system.iobus.port[13]
+pio=system.iobus.master[13]
 
 [system.t1000.iob]
 type=Iob
 pio_latency=2
 platform=system.t1000
 system=system
-pio=system.membus.port[0]
+pio=system.membus.master[0]
 
 [system.t1000.pterm]
 type=Terminal
@@ -468,5 +482,5 @@ pio_latency=2
 platform=system.t1000
 system=system
 terminal=system.t1000.pterm
-pio=system.iobus.port[12]
+pio=system.iobus.master[12]
 
-- 
cgit v1.2.3