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.

---
 .../linux/rubytest-ruby-MESI_Two_Level/config.ini  | 59 ++++++++++++++++------
 1 file changed, 44 insertions(+), 15 deletions(-)

(limited to 'tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_Two_Level/config.ini')

diff --git a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_Two_Level/config.ini b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_Two_Level/config.ini
index 9af8818a4..24d022938 100644
--- a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_Two_Level/config.ini
+++ b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_Two_Level/config.ini
@@ -10,13 +10,14 @@ time_sync_spin_threshold=100000
 
 [system]
 type=System
-children=clk_domain physmem ruby sys_port_proxy tester voltage_domain
+children=clk_domain cpu dvfs_handler physmem ruby sys_port_proxy voltage_domain
 boot_osflags=a
 cache_line_size=64
 clk_domain=system.clk_domain
 eventq_index=0
 init_param=0
 kernel=
+kernel_addr_check=true
 load_addr_mask=1099511627775
 load_offset=0
 mem_mode=timing
@@ -37,9 +38,32 @@ system_port=system.sys_port_proxy.slave[0]
 [system.clk_domain]
 type=SrcClockDomain
 clock=1
+domain_id=-1
 eventq_index=0
+init_perf_level=0
 voltage_domain=system.voltage_domain
 
+[system.cpu]
+type=RubyTester
+check_flush=false
+checks_to_complete=100
+clk_domain=system.clk_domain
+deadlock_threshold=50000
+eventq_index=0
+num_cpus=1
+system=system
+wakeup_frequency=10
+cpuDataPort=system.ruby.l1_cntrl0.sequencer.slave[0]
+cpuInstPort=system.ruby.l1_cntrl0.sequencer.slave[1]
+
+[system.dvfs_handler]
+type=DVFSHandler
+domains=
+enable=false
+eventq_index=0
+sys_clk_domain=system.clk_domain
+transition_latency=100000
+
 [system.physmem]
 type=SimpleMemory
 bandwidth=0.000000
@@ -69,7 +93,9 @@ randomization=true
 [system.ruby.clk_domain]
 type=SrcClockDomain
 clock=1
+domain_id=-1
 eventq_index=0
+init_perf_level=0
 voltage_domain=system.voltage_domain
 
 [system.ruby.dir_cntrl0]
@@ -89,6 +115,9 @@ ruby_system=system.ruby
 to_mem_ctrl_latency=1
 transitions_per_cycle=32
 version=0
+requestToDir=system.ruby.network.master[5]
+responseFromDir=system.ruby.network.slave[6]
+responseToDir=system.ruby.network.master[6]
 
 [system.ruby.dir_cntrl0.directory]
 type=RubyDirectoryMemory
@@ -145,6 +174,11 @@ sequencer=system.ruby.l1_cntrl0.sequencer
 to_l2_latency=1
 transitions_per_cycle=32
 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
@@ -203,7 +237,7 @@ system=system
 using_network_tester=false
 using_ruby_tester=true
 version=0
-slave=system.tester.cpuDataPort[0] system.tester.cpuInstPort[0]
+slave=system.cpu.cpuDataPort[0] system.cpu.cpuInstPort[0]
 
 [system.ruby.l2_cntrl0]
 type=L2Cache_Controller
@@ -222,6 +256,12 @@ ruby_system=system.ruby
 to_l1_latency=1
 transitions_per_cycle=32
 version=0
+DirRequestFromL2Cache=system.ruby.network.slave[3]
+L1RequestFromL2Cache=system.ruby.network.slave[4]
+L1RequestToL2Cache=system.ruby.network.master[3]
+responseFromL2Cache=system.ruby.network.slave[5]
+responseToL2Cache=system.ruby.network.master[4]
+unblockToL2Cache=system.ruby.network.master[2]
 
 [system.ruby.l2_cntrl0.L2cache]
 type=RubyCache
@@ -260,6 +300,8 @@ number_of_virtual_networks=10
 routers=system.ruby.network.routers0 system.ruby.network.routers1 system.ruby.network.routers2 system.ruby.network.routers3
 ruby_system=system.ruby
 topology=Crossbar
+master=system.ruby.l1_cntrl0.requestToL1Cache system.ruby.l1_cntrl0.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
+slave=system.ruby.l1_cntrl0.requestFromL1Cache system.ruby.l1_cntrl0.responseFromL1Cache system.ruby.l1_cntrl0.unblockFromL1Cache system.ruby.l2_cntrl0.DirRequestFromL2Cache system.ruby.l2_cntrl0.L1RequestFromL2Cache system.ruby.l2_cntrl0.responseFromL2Cache system.ruby.dir_cntrl0.responseFromDir
 
 [system.ruby.network.ext_links0]
 type=SimpleExtLink
@@ -362,19 +404,6 @@ using_ruby_tester=false
 version=0
 slave=system.system_port
 
-[system.tester]
-type=RubyTester
-check_flush=false
-checks_to_complete=100
-clk_domain=system.clk_domain
-deadlock_threshold=50000
-eventq_index=0
-num_cpus=1
-system=system
-wakeup_frequency=10
-cpuDataPort=system.ruby.l1_cntrl0.sequencer.slave[0]
-cpuInstPort=system.ruby.l1_cntrl0.sequencer.slave[1]
-
 [system.voltage_domain]
 type=VoltageDomain
 eventq_index=0
-- 
cgit v1.2.3