From fa1fbcf020ee9aacdd4a7a09e81a633e09bad97a Mon Sep 17 00:00:00 2001
From: Nilay Vaish <nilay@cs.wisc.edu>
Date: Mon, 1 Sep 2014 16:55:52 -0500
Subject: stats: updates due to recent ruby and x86 changes Also updates many
 out of date config files.

---
 .../config.ini                                     | 64 ++++++++++++++++++----
 1 file changed, 54 insertions(+), 10 deletions(-)

(limited to 'tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_Two_Level/config.ini')

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 b0a3a316f..f38bb864d 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 iobus pc physmem ruby smbios_table sys_port_proxy voltage_domain
+children=acpi_description_table_pointer clk_domain cpu0 cpu1 cpu_clk_domain dvfs_handler 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
@@ -21,13 +21,14 @@ init_param=0
 intel_mp_pointer=system.intel_mp_pointer
 intel_mp_table=system.intel_mp_table
 kernel=/scratch/nilay/GEM5/system/binaries/x86_64-vmlinux-2.6.22.9.smp
+kernel_addr_check=true
 load_addr_mask=18446744073709551615
 load_offset=0
 mem_mode=timing
 mem_ranges=0:134217727
 memories=system.physmem
 num_work_ids=16
-readfile=tests/halt.sh
+readfile=/scratch/nilay/GEM5/gem5/tests/halt.sh
 smbios_table=system.smbios_table
 symbolfile=
 work_begin_ckpt_count=0
@@ -61,7 +62,9 @@ oem_table_id=
 [system.clk_domain]
 type=SrcClockDomain
 clock=1000
+domain_id=-1
 eventq_index=0
+init_perf_level=0
 voltage_domain=system.voltage_domain
 
 [system.cpu0]
@@ -89,6 +92,7 @@ numThreads=1
 profile=0
 progress_interval=0
 simpoint_start_insts=
+socket_id=0
 switched_out=false
 system=system
 tracer=system.cpu0.tracer
@@ -177,6 +181,7 @@ numThreads=1
 profile=0
 progress_interval=0
 simpoint_start_insts=
+socket_id=0
 switched_out=false
 system=system
 tracer=system.cpu1.tracer
@@ -243,9 +248,19 @@ eventq_index=0
 [system.cpu_clk_domain]
 type=SrcClockDomain
 clock=500
+domain_id=-1
 eventq_index=0
+init_perf_level=0
 voltage_domain=system.voltage_domain
 
+[system.dvfs_handler]
+type=DVFSHandler
+domains=
+enable=false
+eventq_index=0
+sys_clk_domain=system.clk_domain
+transition_latency=100000000
+
 [system.e820_table]
 type=X86E820Table
 children=entries0 entries1 entries2 entries3
@@ -680,7 +695,7 @@ type=NoncoherentBus
 clk_domain=system.clk_domain
 eventq_index=0
 header_cycles=1
-use_default_range=true
+use_default_range=false
 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
@@ -1218,15 +1233,19 @@ read_buffer_size=32
 static_backend_latency=10000
 static_frontend_latency=10000
 tBURST=5000
+tCK=1250
 tCL=13750
 tRAS=35000
 tRCD=13750
 tREFI=7800000
-tRFC=300000
+tRFC=260000
 tRP=13750
-tRRD=6250
+tRRD=6000
+tRTP=7500
+tRTW=2500
+tWR=15000
 tWTR=7500
-tXAW=40000
+tXAW=30000
 write_buffer_size=64
 write_high_thresh_perc=85
 write_low_thresh_perc=50
@@ -1249,7 +1268,9 @@ randomization=false
 [system.ruby.clk_domain]
 type=SrcClockDomain
 clock=500
+domain_id=-1
 eventq_index=0
+init_perf_level=0
 voltage_domain=system.voltage_domain
 
 [system.ruby.dir_cntrl0]
@@ -1269,6 +1290,9 @@ ruby_system=system.ruby
 to_mem_ctrl_latency=1
 transitions_per_cycle=4
 version=0
+requestToDir=system.ruby.network.master[7]
+responseFromDir=system.ruby.network.slave[9]
+responseToDir=system.ruby.network.master[8]
 
 [system.ruby.dir_cntrl0.directory]
 type=RubyDirectoryMemory
@@ -1317,6 +1341,8 @@ request_latency=6
 ruby_system=system.ruby
 transitions_per_cycle=4
 version=0
+requestToDir=system.ruby.network.slave[10]
+responseFromDir=system.ruby.network.master[9]
 
 [system.ruby.dma_cntrl0.dma_sequencer]
 type=DMASequencer
@@ -1337,7 +1363,7 @@ children=L1Dcache L1Icache prefetcher sequencer
 L1Dcache=system.ruby.l1_cntrl0.L1Dcache
 L1Icache=system.ruby.l1_cntrl0.L1Icache
 buffer_size=0
-clk_domain=system.ruby.clk_domain
+clk_domain=system.cpu_clk_domain
 cluster_id=0
 enable_prefetch=false
 eventq_index=0
@@ -1354,6 +1380,11 @@ sequencer=system.ruby.l1_cntrl0.sequencer
 to_l2_latency=1
 transitions_per_cycle=4
 version=0
+requestFromL1Cache=system.ruby.network.slave[0]
+requestToL1Cache=system.ruby.network.master[0]
+responseFromL1Cache=system.ruby.network.slave[1]
+responseToL1Cache=system.ruby.network.master[1]
+unblockFromL1Cache=system.ruby.network.slave[2]
 
 [system.ruby.l1_cntrl0.L1Dcache]
 type=RubyCache
@@ -1399,7 +1430,7 @@ unit_filter=8
 [system.ruby.l1_cntrl0.sequencer]
 type=RubySequencer
 access_phys_mem=true
-clk_domain=system.ruby.clk_domain
+clk_domain=system.cpu_clk_domain
 dcache=system.ruby.l1_cntrl0.L1Dcache
 deadlock_threshold=500000
 eventq_index=0
@@ -1424,7 +1455,7 @@ children=L1Dcache L1Icache prefetcher sequencer
 L1Dcache=system.ruby.l1_cntrl1.L1Dcache
 L1Icache=system.ruby.l1_cntrl1.L1Icache
 buffer_size=0
-clk_domain=system.ruby.clk_domain
+clk_domain=system.cpu_clk_domain
 cluster_id=0
 enable_prefetch=false
 eventq_index=0
@@ -1441,6 +1472,11 @@ sequencer=system.ruby.l1_cntrl1.sequencer
 to_l2_latency=1
 transitions_per_cycle=4
 version=1
+requestFromL1Cache=system.ruby.network.slave[3]
+requestToL1Cache=system.ruby.network.master[2]
+responseFromL1Cache=system.ruby.network.slave[4]
+responseToL1Cache=system.ruby.network.master[3]
+unblockFromL1Cache=system.ruby.network.slave[5]
 
 [system.ruby.l1_cntrl1.L1Dcache]
 type=RubyCache
@@ -1486,7 +1522,7 @@ unit_filter=8
 [system.ruby.l1_cntrl1.sequencer]
 type=RubySequencer
 access_phys_mem=true
-clk_domain=system.ruby.clk_domain
+clk_domain=system.cpu_clk_domain
 dcache=system.ruby.l1_cntrl1.L1Dcache
 deadlock_threshold=500000
 eventq_index=0
@@ -1522,6 +1558,12 @@ ruby_system=system.ruby
 to_l1_latency=1
 transitions_per_cycle=4
 version=0
+DirRequestFromL2Cache=system.ruby.network.slave[6]
+L1RequestFromL2Cache=system.ruby.network.slave[7]
+L1RequestToL2Cache=system.ruby.network.master[5]
+responseFromL2Cache=system.ruby.network.slave[8]
+responseToL2Cache=system.ruby.network.master[6]
+unblockToL2Cache=system.ruby.network.master[4]
 
 [system.ruby.l2_cntrl0.L2cache]
 type=RubyCache
@@ -1560,6 +1602,8 @@ 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
 topology=Crossbar
+master=system.ruby.l1_cntrl0.requestToL1Cache system.ruby.l1_cntrl0.responseToL1Cache system.ruby.l1_cntrl1.requestToL1Cache system.ruby.l1_cntrl1.responseToL1Cache system.ruby.l2_cntrl0.unblockToL2Cache system.ruby.l2_cntrl0.L1RequestToL2Cache system.ruby.l2_cntrl0.responseToL2Cache system.ruby.dir_cntrl0.requestToDir system.ruby.dir_cntrl0.responseToDir system.ruby.dma_cntrl0.responseFromDir
+slave=system.ruby.l1_cntrl0.requestFromL1Cache system.ruby.l1_cntrl0.responseFromL1Cache system.ruby.l1_cntrl0.unblockFromL1Cache system.ruby.l1_cntrl1.requestFromL1Cache system.ruby.l1_cntrl1.responseFromL1Cache system.ruby.l1_cntrl1.unblockFromL1Cache system.ruby.l2_cntrl0.DirRequestFromL2Cache system.ruby.l2_cntrl0.L1RequestFromL2Cache system.ruby.l2_cntrl0.responseFromL2Cache system.ruby.dir_cntrl0.responseFromDir system.ruby.dma_cntrl0.requestToDir
 
 [system.ruby.network.ext_links0]
 type=SimpleExtLink
-- 
cgit v1.2.3