stats: updates due to o3 smt fix

+ changes to one ruby regression config.ini file.

2 files changed, 49 insertions, 46 deletions

diff --git a/tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_Two_Level/config.ini b/tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_Two_Level/config.ini
index dfa5f06ff..b0a3a316f 100644
--- a/tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_Two_Level/config.ini
+++ b/tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_Two_Level/config.ini
@@ -10,7 +10,7 @@ time_sync_spin_threshold=100000000
 
 [system]
 type=LinuxX86System
-children=acpi_description_table_pointer clk_domain cpu0 cpu1 cpu_clk_domain e820_table intel_mp_pointer intel_mp_table intrctrl pc physmem piobus ruby smbios_table sys_port_proxy voltage_domain
+children=acpi_description_table_pointer clk_domain cpu0 cpu1 cpu_clk_domain e820_table intel_mp_pointer intel_mp_table intrctrl iobus pc physmem ruby smbios_table sys_port_proxy voltage_domain
 acpi_description_table_pointer=system.acpi_description_table_pointer
 boot_osflags=earlyprintk=ttyS0 console=ttyS0 lpj=7999923 root=/dev/hda1
 cache_line_size=64
@@ -675,6 +675,17 @@ type=IntrControl
 eventq_index=0
 sys=system
 
+[system.iobus]
+type=NoncoherentBus
+clk_domain=system.clk_domain
+eventq_index=0
+header_cycles=1
+use_default_range=true
+width=8
+default=system.pc.pciconfig.pio
+master=system.pc.south_bridge.cmos.pio system.pc.south_bridge.dma1.pio system.pc.south_bridge.ide.pio system.pc.south_bridge.ide.config system.pc.south_bridge.keyboard.pio system.pc.south_bridge.pic1.pio system.pc.south_bridge.pic2.pio system.pc.south_bridge.pit.pio system.pc.south_bridge.speaker.pio system.pc.south_bridge.io_apic.pio system.pc.i_dont_exist.pio system.pc.behind_pci.pio system.pc.com_1.pio system.pc.fake_com_2.pio system.pc.fake_com_3.pio system.pc.fake_com_4.pio system.pc.fake_floppy.pio system.ruby.l1_cntrl0.sequencer.pio_slave_port system.ruby.l1_cntrl1.sequencer.pio_slave_port system.physmem.port
+slave=system.pc.south_bridge.io_apic.int_master system.ruby.l1_cntrl0.sequencer.pio_master_port system.ruby.l1_cntrl0.sequencer.mem_master_port system.ruby.l1_cntrl1.sequencer.pio_master_port system.ruby.l1_cntrl1.sequencer.mem_master_port
+
 [system.pc]
 type=Pc
 children=behind_pci com_1 fake_com_2 fake_com_3 fake_com_4 fake_floppy i_dont_exist pciconfig south_bridge
@@ -698,7 +709,7 @@ ret_data8=255
 system=system
 update_data=false
 warn_access=
-pio=system.piobus.master[11]
+pio=system.iobus.master[11]
 
 [system.pc.com_1]
 type=Uart8250
@@ -710,7 +721,7 @@ pio_latency=100000
 platform=system.pc
 system=system
 terminal=system.pc.com_1.terminal
-pio=system.piobus.master[12]
+pio=system.iobus.master[12]
 
 [system.pc.com_1.terminal]
 type=Terminal
@@ -736,7 +747,7 @@ ret_data8=255
 system=system
 update_data=false
 warn_access=
-pio=system.piobus.master[13]
+pio=system.iobus.master[13]
 
 [system.pc.fake_com_3]
 type=IsaFake
@@ -754,7 +765,7 @@ ret_data8=255
 system=system
 update_data=false
 warn_access=
-pio=system.piobus.master[14]
+pio=system.iobus.master[14]
 
 [system.pc.fake_com_4]
 type=IsaFake
@@ -772,7 +783,7 @@ ret_data8=255
 system=system
 update_data=false
 warn_access=
-pio=system.piobus.master[15]
+pio=system.iobus.master[15]
 
 [system.pc.fake_floppy]
 type=IsaFake
@@ -790,7 +801,7 @@ ret_data8=255
 system=system
 update_data=false
 warn_access=
-pio=system.piobus.master[16]
+pio=system.iobus.master[16]
 
 [system.pc.i_dont_exist]
 type=IsaFake
@@ -808,7 +819,7 @@ ret_data8=255
 system=system
 update_data=false
 warn_access=
-pio=system.piobus.master[10]
+pio=system.iobus.master[10]
 
 [system.pc.pciconfig]
 type=PciConfigAll
@@ -820,7 +831,7 @@ pio_latency=30000
 platform=system.pc
 size=16777216
 system=system
-pio=system.piobus.default
+pio=system.iobus.default
 
 [system.pc.south_bridge]
 type=SouthBridge
@@ -846,7 +857,7 @@ pio_addr=9223372036854775920
 pio_latency=100000
 system=system
 time=Sun Jan  1 00:00:00 2012
-pio=system.piobus.master[0]
+pio=system.iobus.master[0]
 
 [system.pc.south_bridge.cmos.int_pin]
 type=X86IntSourcePin
@@ -859,7 +870,7 @@ eventq_index=0
 pio_addr=9223372036854775808
 pio_latency=100000
 system=system
-pio=system.piobus.master[1]
+pio=system.iobus.master[1]
 
 [system.pc.south_bridge.ide]
 type=IdeController
@@ -947,9 +958,9 @@ pci_func=0
 pio_latency=30000
 platform=system.pc
 system=system
-config=system.piobus.master[3]
+config=system.iobus.master[3]
 dma=system.ruby.dma_cntrl0.dma_sequencer.slave[0]
-pio=system.piobus.master[2]
+pio=system.iobus.master[2]
 
 [system.pc.south_bridge.ide.disks0]
 type=IdeDisk
@@ -1098,8 +1109,8 @@ int_latency=1000
 pio_addr=4273995776
 pio_latency=100000
 system=system
-int_master=system.piobus.slave[0]
-pio=system.piobus.master[9]
+int_master=system.iobus.slave[0]
+pio=system.iobus.master[9]
 
 [system.pc.south_bridge.keyboard]
 type=I8042
@@ -1113,7 +1124,7 @@ mouse_int_pin=system.pc.south_bridge.keyboard.mouse_int_pin
 pio_addr=0
 pio_latency=100000
 system=system
-pio=system.piobus.master[4]
+pio=system.iobus.master[4]
 
 [system.pc.south_bridge.keyboard.keyboard_int_pin]
 type=X86IntSourcePin
@@ -1134,7 +1145,7 @@ pio_addr=9223372036854775840
 pio_latency=100000
 slave=system.pc.south_bridge.pic2
 system=system
-pio=system.piobus.master[5]
+pio=system.iobus.master[5]
 
 [system.pc.south_bridge.pic1.output]
 type=X86IntSourcePin
@@ -1151,7 +1162,7 @@ pio_addr=9223372036854775968
 pio_latency=100000
 slave=Null
 system=system
-pio=system.piobus.master[6]
+pio=system.iobus.master[6]
 
 [system.pc.south_bridge.pic2.output]
 type=X86IntSourcePin
@@ -1166,7 +1177,7 @@ int_pin=system.pc.south_bridge.pit.int_pin
 pio_addr=9223372036854775872
 pio_latency=100000
 system=system
-pio=system.piobus.master[7]
+pio=system.iobus.master[7]
 
 [system.pc.south_bridge.pit.int_pin]
 type=X86IntSourcePin
@@ -1180,12 +1191,12 @@ i8254=system.pc.south_bridge.pit
 pio_addr=9223372036854775905
 pio_latency=100000
 system=system
-pio=system.piobus.master[8]
+pio=system.iobus.master[8]
 
 [system.physmem]
-type=SimpleDRAM
+type=DRAMCtrl
 activation_limit=4
-addr_mapping=RaBaChCo
+addr_mapping=RoRaBaChCo
 banks_per_rank=8
 burst_length=8
 channels=1
@@ -1196,9 +1207,11 @@ device_rowbuffer_size=1024
 devices_per_rank=8
 eventq_index=0
 in_addr_map=true
+max_accesses_per_row=16
 mem_sched_policy=frfcfs
+min_writes_per_switch=16
 null=false
-page_policy=open
+page_policy=open_adaptive
 range=0:134217727
 ranks_per_channel=2
 read_buffer_size=32
@@ -1214,21 +1227,10 @@ tRP=13750
 tRRD=6250
 tWTR=7500
 tXAW=40000
-write_buffer_size=32
-write_high_thresh_perc=70
-write_low_thresh_perc=0
-port=system.piobus.master[19]
-
-[system.piobus]
-type=NoncoherentBus
-clk_domain=system.clk_domain
-eventq_index=0
-header_cycles=1
-use_default_range=true
-width=8
-default=system.pc.pciconfig.pio
-master=system.pc.south_bridge.cmos.pio system.pc.south_bridge.dma1.pio system.pc.south_bridge.ide.pio system.pc.south_bridge.ide.config system.pc.south_bridge.keyboard.pio system.pc.south_bridge.pic1.pio system.pc.south_bridge.pic2.pio system.pc.south_bridge.pit.pio system.pc.south_bridge.speaker.pio system.pc.south_bridge.io_apic.pio system.pc.i_dont_exist.pio system.pc.behind_pci.pio system.pc.com_1.pio system.pc.fake_com_2.pio system.pc.fake_com_3.pio system.pc.fake_com_4.pio system.pc.fake_floppy.pio system.ruby.l1_cntrl0.sequencer.pio_slave_port system.ruby.l1_cntrl1.sequencer.pio_slave_port system.physmem.port
-slave=system.pc.south_bridge.io_apic.int_master system.ruby.l1_cntrl0.sequencer.pio_master_port system.ruby.l1_cntrl0.sequencer.mem_master_port system.ruby.l1_cntrl1.sequencer.pio_master_port system.ruby.l1_cntrl1.sequencer.mem_master_port
+write_buffer_size=64
+write_high_thresh_perc=85
+write_low_thresh_perc=50
+port=system.iobus.master[19]
 
 [system.ruby]
 type=RubySystem
@@ -1411,9 +1413,9 @@ using_network_tester=false
 using_ruby_tester=false
 version=0
 master=system.cpu0.interrupts.pio system.cpu0.interrupts.int_slave
-mem_master_port=system.piobus.slave[2]
-pio_master_port=system.piobus.slave[1]
-pio_slave_port=system.piobus.master[17]
+mem_master_port=system.iobus.slave[2]
+pio_master_port=system.iobus.slave[1]
+pio_slave_port=system.iobus.master[17]
 slave=system.cpu0.icache_port system.cpu0.dcache_port system.cpu0.itb.walker.port system.cpu0.dtb.walker.port system.cpu0.interrupts.int_master
 
 [system.ruby.l1_cntrl1]
@@ -1498,9 +1500,9 @@ using_network_tester=false
 using_ruby_tester=false
 version=1
 master=system.cpu1.interrupts.pio system.cpu1.interrupts.int_slave
-mem_master_port=system.piobus.slave[4]
-pio_master_port=system.piobus.slave[3]
-pio_slave_port=system.piobus.master[18]
+mem_master_port=system.iobus.slave[4]
+pio_master_port=system.iobus.slave[3]
+pio_slave_port=system.iobus.master[18]
 slave=system.cpu1.icache_port system.cpu1.dcache_port system.cpu1.itb.walker.port system.cpu1.dtb.walker.port system.cpu1.interrupts.int_master
 
 [system.ruby.l2_cntrl0]
@@ -1553,6 +1555,7 @@ endpoint_bandwidth=1000
 eventq_index=0
 ext_links=system.ruby.network.ext_links0 system.ruby.network.ext_links1 system.ruby.network.ext_links2 system.ruby.network.ext_links3 system.ruby.network.ext_links4
 int_links=system.ruby.network.int_links0 system.ruby.network.int_links1 system.ruby.network.int_links2 system.ruby.network.int_links3 system.ruby.network.int_links4
+netifs=
 number_of_virtual_networks=10
 routers=system.ruby.network.routers0 system.ruby.network.routers1 system.ruby.network.routers2 system.ruby.network.routers3 system.ruby.network.routers4 system.ruby.network.routers5
 ruby_system=system.ruby
diff --git a/tests/long/fs/10.linux-boot/ref/x86/linux/pc-switcheroo-full/stats.txt b/tests/long/fs/10.linux-boot/ref/x86/linux/pc-switcheroo-full/stats.txt
index b144561d0..a3c063e75 100644
--- a/tests/long/fs/10.linux-boot/ref/x86/linux/pc-switcheroo-full/stats.txt
+++ b/tests/long/fs/10.linux-boot/ref/x86/linux/pc-switcheroo-full/stats.txt
@@ -1595,8 +1595,8 @@ system.cpu2.iew.iewIQFullEvents                633068                       # Nu
 system.cpu2.iew.iewLSQFullEvents                 3849                       # Number of times the LSQ has become full, causing a stall
 system.cpu2.iew.memOrderViolationEvents          4440                       # Number of memory order violations
 system.cpu2.iew.predictedTakenIncorrect        176570                       # Number of branches that were predicted taken incorrectly
-system.cpu2.iew.predictedNotTakenIncorrect       182317                       # Number of branches that were predicted not taken incorrectly
-system.cpu2.iew.branchMispredicts              358887                       # Number of branch mispredicts detected at execute
+system.cpu2.iew.predictedNotTakenIncorrect       182318                       # Number of branches that were predicted not taken incorrectly
+system.cpu2.iew.branchMispredicts              358888                       # Number of branch mispredicts detected at execute
 system.cpu2.iew.iewExecutedInsts            273973436                       # Number of executed instructions
 system.cpu2.iew.iewExecLoadInsts              6342946                       # Number of load instructions executed
 system.cpu2.iew.iewExecSquashedInsts           503814                       # Number of squashed instructions skipped in execute