Regression: Updates regression outputs for Ruby memtest

This patch updates the regression outputs for Ruby memtest. This was
required because of the changes carried out by the addition of functional
access support to Ruby.

1 files changed, 175 insertions, 149 deletions

diff --git a/tests/quick/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_directory/config.ini b/tests/quick/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_directory/config.ini
index ed65695b0..7275a3b0b 100644
--- a/tests/quick/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_directory/config.ini
+++ b/tests/quick/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_directory/config.ini
@@ -25,14 +25,15 @@ issue_dmas=false
 max_loads=100000
 memory_size=65536
 percent_dest_unaligned=50
-percent_functional=0
+percent_functional=50
 percent_reads=65
 percent_source_unaligned=50
 percent_uncacheable=0
 progress_interval=10000
+suppress_func_warnings=true
 trace_addr=0
 functional=system.funcmem.port[0]
-test=system.ruby.cpu_ruby_ports0.port[0]
+test=system.l1_cntrl0.sequencer.port[0]
 
 [system.cpu1]
 type=MemTest
@@ -41,14 +42,15 @@ issue_dmas=false
 max_loads=100000
 memory_size=65536
 percent_dest_unaligned=50
-percent_functional=0
+percent_functional=50
 percent_reads=65
 percent_source_unaligned=50
 percent_uncacheable=0
 progress_interval=10000
+suppress_func_warnings=true
 trace_addr=0
 functional=system.funcmem.port[1]
-test=system.ruby.cpu_ruby_ports1.port[0]
+test=system.l1_cntrl1.sequencer.port[0]
 
 [system.cpu2]
 type=MemTest
@@ -57,14 +59,15 @@ issue_dmas=false
 max_loads=100000
 memory_size=65536
 percent_dest_unaligned=50
-percent_functional=0
+percent_functional=50
 percent_reads=65
 percent_source_unaligned=50
 percent_uncacheable=0
 progress_interval=10000
+suppress_func_warnings=true
 trace_addr=0
 functional=system.funcmem.port[2]
-test=system.ruby.cpu_ruby_ports2.port[0]
+test=system.l1_cntrl2.sequencer.port[0]
 
 [system.cpu3]
 type=MemTest
@@ -73,14 +76,15 @@ issue_dmas=false
 max_loads=100000
 memory_size=65536
 percent_dest_unaligned=50
-percent_functional=0
+percent_functional=50
 percent_reads=65
 percent_source_unaligned=50
 percent_uncacheable=0
 progress_interval=10000
+suppress_func_warnings=true
 trace_addr=0
 functional=system.funcmem.port[3]
-test=system.ruby.cpu_ruby_ports3.port[0]
+test=system.l1_cntrl3.sequencer.port[0]
 
 [system.cpu4]
 type=MemTest
@@ -89,14 +93,15 @@ issue_dmas=false
 max_loads=100000
 memory_size=65536
 percent_dest_unaligned=50
-percent_functional=0
+percent_functional=50
 percent_reads=65
 percent_source_unaligned=50
 percent_uncacheable=0
 progress_interval=10000
+suppress_func_warnings=true
 trace_addr=0
 functional=system.funcmem.port[4]
-test=system.ruby.cpu_ruby_ports4.port[0]
+test=system.l1_cntrl4.sequencer.port[0]
 
 [system.cpu5]
 type=MemTest
@@ -105,14 +110,15 @@ issue_dmas=false
 max_loads=100000
 memory_size=65536
 percent_dest_unaligned=50
-percent_functional=0
+percent_functional=50
 percent_reads=65
 percent_source_unaligned=50
 percent_uncacheable=0
 progress_interval=10000
+suppress_func_warnings=true
 trace_addr=0
 functional=system.funcmem.port[5]
-test=system.ruby.cpu_ruby_ports5.port[0]
+test=system.l1_cntrl5.sequencer.port[0]
 
 [system.cpu6]
 type=MemTest
@@ -121,14 +127,15 @@ issue_dmas=false
 max_loads=100000
 memory_size=65536
 percent_dest_unaligned=50
-percent_functional=0
+percent_functional=50
 percent_reads=65
 percent_source_unaligned=50
 percent_uncacheable=0
 progress_interval=10000
+suppress_func_warnings=true
 trace_addr=0
 functional=system.funcmem.port[6]
-test=system.ruby.cpu_ruby_ports6.port[0]
+test=system.l1_cntrl6.sequencer.port[0]
 
 [system.cpu7]
 type=MemTest
@@ -137,14 +144,15 @@ issue_dmas=false
 max_loads=100000
 memory_size=65536
 percent_dest_unaligned=50
-percent_functional=0
+percent_functional=50
 percent_reads=65
 percent_source_unaligned=50
 percent_uncacheable=0
 progress_interval=10000
+suppress_func_warnings=true
 trace_addr=0
 functional=system.funcmem.port[7]
-test=system.ruby.cpu_ruby_ports7.port[0]
+test=system.l1_cntrl7.sequencer.port[0]
 
 [system.dir_cntrl0]
 type=Directory_Controller
@@ -156,6 +164,7 @@ directory_latency=6
 memBuffer=system.dir_cntrl0.memBuffer
 number_of_TBEs=256
 recycle_latency=10
+ruby_system=system.ruby
 transitions_per_cycle=32
 version=0
 
@@ -200,7 +209,7 @@ port=system.cpu0.functional system.cpu1.functional system.cpu2.functional system
 
 [system.l1_cntrl0]
 type=L1Cache_Controller
-children=L1DcacheMemory L1IcacheMemory
+children=L1DcacheMemory L1IcacheMemory sequencer
 L1DcacheMemory=system.l1_cntrl0.L1DcacheMemory
 L1IcacheMemory=system.l1_cntrl0.L1IcacheMemory
 buffer_size=0
@@ -209,7 +218,8 @@ l2_select_num_bits=0
 number_of_TBEs=256
 recycle_latency=10
 request_latency=2
-sequencer=system.ruby.cpu_ruby_ports0
+ruby_system=system.ruby
+sequencer=system.l1_cntrl0.sequencer
 transitions_per_cycle=32
 version=0
 
@@ -229,9 +239,24 @@ replacement_policy=PSEUDO_LRU
 size=256
 start_index_bit=6
 
+[system.l1_cntrl0.sequencer]
+type=RubySequencer
+access_phys_mem=false
+dcache=system.l1_cntrl0.L1DcacheMemory
+deadlock_threshold=1000000
+icache=system.l1_cntrl0.L1IcacheMemory
+max_outstanding_requests=16
+physmem=system.physmem
+ruby_system=system.ruby
+using_network_tester=false
+using_ruby_tester=false
+version=0
+physMemPort=system.physmem.port[0]
+port=system.cpu0.test
+
 [system.l1_cntrl1]
 type=L1Cache_Controller
-children=L1DcacheMemory L1IcacheMemory
+children=L1DcacheMemory L1IcacheMemory sequencer
 L1DcacheMemory=system.l1_cntrl1.L1DcacheMemory
 L1IcacheMemory=system.l1_cntrl1.L1IcacheMemory
 buffer_size=0
@@ -240,7 +265,8 @@ l2_select_num_bits=0
 number_of_TBEs=256
 recycle_latency=10
 request_latency=2
-sequencer=system.ruby.cpu_ruby_ports1
+ruby_system=system.ruby
+sequencer=system.l1_cntrl1.sequencer
 transitions_per_cycle=32
 version=1
 
@@ -260,9 +286,24 @@ replacement_policy=PSEUDO_LRU
 size=256
 start_index_bit=6
 
+[system.l1_cntrl1.sequencer]
+type=RubySequencer
+access_phys_mem=false
+dcache=system.l1_cntrl1.L1DcacheMemory
+deadlock_threshold=1000000
+icache=system.l1_cntrl1.L1IcacheMemory
+max_outstanding_requests=16
+physmem=system.physmem
+ruby_system=system.ruby
+using_network_tester=false
+using_ruby_tester=false
+version=1
+physMemPort=system.physmem.port[1]
+port=system.cpu1.test
+
 [system.l1_cntrl2]
 type=L1Cache_Controller
-children=L1DcacheMemory L1IcacheMemory
+children=L1DcacheMemory L1IcacheMemory sequencer
 L1DcacheMemory=system.l1_cntrl2.L1DcacheMemory
 L1IcacheMemory=system.l1_cntrl2.L1IcacheMemory
 buffer_size=0
@@ -271,7 +312,8 @@ l2_select_num_bits=0
 number_of_TBEs=256
 recycle_latency=10
 request_latency=2
-sequencer=system.ruby.cpu_ruby_ports2
+ruby_system=system.ruby
+sequencer=system.l1_cntrl2.sequencer
 transitions_per_cycle=32
 version=2
 
@@ -291,9 +333,24 @@ replacement_policy=PSEUDO_LRU
 size=256
 start_index_bit=6
 
+[system.l1_cntrl2.sequencer]
+type=RubySequencer
+access_phys_mem=false
+dcache=system.l1_cntrl2.L1DcacheMemory
+deadlock_threshold=1000000
+icache=system.l1_cntrl2.L1IcacheMemory
+max_outstanding_requests=16
+physmem=system.physmem
+ruby_system=system.ruby
+using_network_tester=false
+using_ruby_tester=false
+version=2
+physMemPort=system.physmem.port[2]
+port=system.cpu2.test
+
 [system.l1_cntrl3]
 type=L1Cache_Controller
-children=L1DcacheMemory L1IcacheMemory
+children=L1DcacheMemory L1IcacheMemory sequencer
 L1DcacheMemory=system.l1_cntrl3.L1DcacheMemory
 L1IcacheMemory=system.l1_cntrl3.L1IcacheMemory
 buffer_size=0
@@ -302,7 +359,8 @@ l2_select_num_bits=0
 number_of_TBEs=256
 recycle_latency=10
 request_latency=2
-sequencer=system.ruby.cpu_ruby_ports3
+ruby_system=system.ruby
+sequencer=system.l1_cntrl3.sequencer
 transitions_per_cycle=32
 version=3
 
@@ -322,9 +380,24 @@ replacement_policy=PSEUDO_LRU
 size=256
 start_index_bit=6
 
+[system.l1_cntrl3.sequencer]
+type=RubySequencer
+access_phys_mem=false
+dcache=system.l1_cntrl3.L1DcacheMemory
+deadlock_threshold=1000000
+icache=system.l1_cntrl3.L1IcacheMemory
+max_outstanding_requests=16
+physmem=system.physmem
+ruby_system=system.ruby
+using_network_tester=false
+using_ruby_tester=false
+version=3
+physMemPort=system.physmem.port[3]
+port=system.cpu3.test
+
 [system.l1_cntrl4]
 type=L1Cache_Controller
-children=L1DcacheMemory L1IcacheMemory
+children=L1DcacheMemory L1IcacheMemory sequencer
 L1DcacheMemory=system.l1_cntrl4.L1DcacheMemory
 L1IcacheMemory=system.l1_cntrl4.L1IcacheMemory
 buffer_size=0
@@ -333,7 +406,8 @@ l2_select_num_bits=0
 number_of_TBEs=256
 recycle_latency=10
 request_latency=2
-sequencer=system.ruby.cpu_ruby_ports4
+ruby_system=system.ruby
+sequencer=system.l1_cntrl4.sequencer
 transitions_per_cycle=32
 version=4
 
@@ -353,9 +427,24 @@ replacement_policy=PSEUDO_LRU
 size=256
 start_index_bit=6
 
+[system.l1_cntrl4.sequencer]
+type=RubySequencer
+access_phys_mem=false
+dcache=system.l1_cntrl4.L1DcacheMemory
+deadlock_threshold=1000000
+icache=system.l1_cntrl4.L1IcacheMemory
+max_outstanding_requests=16
+physmem=system.physmem
+ruby_system=system.ruby
+using_network_tester=false
+using_ruby_tester=false
+version=4
+physMemPort=system.physmem.port[4]
+port=system.cpu4.test
+
 [system.l1_cntrl5]
 type=L1Cache_Controller
-children=L1DcacheMemory L1IcacheMemory
+children=L1DcacheMemory L1IcacheMemory sequencer
 L1DcacheMemory=system.l1_cntrl5.L1DcacheMemory
 L1IcacheMemory=system.l1_cntrl5.L1IcacheMemory
 buffer_size=0
@@ -364,7 +453,8 @@ l2_select_num_bits=0
 number_of_TBEs=256
 recycle_latency=10
 request_latency=2
-sequencer=system.ruby.cpu_ruby_ports5
+ruby_system=system.ruby
+sequencer=system.l1_cntrl5.sequencer
 transitions_per_cycle=32
 version=5
 
@@ -384,9 +474,24 @@ replacement_policy=PSEUDO_LRU
 size=256
 start_index_bit=6
 
+[system.l1_cntrl5.sequencer]
+type=RubySequencer
+access_phys_mem=false
+dcache=system.l1_cntrl5.L1DcacheMemory
+deadlock_threshold=1000000
+icache=system.l1_cntrl5.L1IcacheMemory
+max_outstanding_requests=16
+physmem=system.physmem
+ruby_system=system.ruby
+using_network_tester=false
+using_ruby_tester=false
+version=5
+physMemPort=system.physmem.port[5]
+port=system.cpu5.test
+
 [system.l1_cntrl6]
 type=L1Cache_Controller
-children=L1DcacheMemory L1IcacheMemory
+children=L1DcacheMemory L1IcacheMemory sequencer
 L1DcacheMemory=system.l1_cntrl6.L1DcacheMemory
 L1IcacheMemory=system.l1_cntrl6.L1IcacheMemory
 buffer_size=0
@@ -395,7 +500,8 @@ l2_select_num_bits=0
 number_of_TBEs=256
 recycle_latency=10
 request_latency=2
-sequencer=system.ruby.cpu_ruby_ports6
+ruby_system=system.ruby
+sequencer=system.l1_cntrl6.sequencer
 transitions_per_cycle=32
 version=6
 
@@ -415,9 +521,24 @@ replacement_policy=PSEUDO_LRU
 size=256
 start_index_bit=6
 
+[system.l1_cntrl6.sequencer]
+type=RubySequencer
+access_phys_mem=false
+dcache=system.l1_cntrl6.L1DcacheMemory
+deadlock_threshold=1000000
+icache=system.l1_cntrl6.L1IcacheMemory
+max_outstanding_requests=16
+physmem=system.physmem
+ruby_system=system.ruby
+using_network_tester=false
+using_ruby_tester=false
+version=6
+physMemPort=system.physmem.port[6]
+port=system.cpu6.test
+
 [system.l1_cntrl7]
 type=L1Cache_Controller
-children=L1DcacheMemory L1IcacheMemory
+children=L1DcacheMemory L1IcacheMemory sequencer
 L1DcacheMemory=system.l1_cntrl7.L1DcacheMemory
 L1IcacheMemory=system.l1_cntrl7.L1IcacheMemory
 buffer_size=0
@@ -426,7 +547,8 @@ l2_select_num_bits=0
 number_of_TBEs=256
 recycle_latency=10
 request_latency=2
-sequencer=system.ruby.cpu_ruby_ports7
+ruby_system=system.ruby
+sequencer=system.l1_cntrl7.sequencer
 transitions_per_cycle=32
 version=7
 
@@ -446,6 +568,21 @@ replacement_policy=PSEUDO_LRU
 size=256
 start_index_bit=6
 
+[system.l1_cntrl7.sequencer]
+type=RubySequencer
+access_phys_mem=false
+dcache=system.l1_cntrl7.L1DcacheMemory
+deadlock_threshold=1000000
+icache=system.l1_cntrl7.L1IcacheMemory
+max_outstanding_requests=16
+physmem=system.physmem
+ruby_system=system.ruby
+using_network_tester=false
+using_ruby_tester=false
+version=7
+physMemPort=system.physmem.port[7]
+port=system.cpu7.test
+
 [system.l2_cntrl0]
 type=L2Cache_Controller
 children=L2cacheMemory
@@ -456,6 +593,7 @@ number_of_TBEs=256
 recycle_latency=10
 request_latency=2
 response_latency=2
+ruby_system=system.ruby
 transitions_per_cycle=32
 version=0
 
@@ -475,133 +613,18 @@ latency_var=0
 null=false
 range=0:134217727
 zero=false
-port=system.ruby.cpu_ruby_ports0.physMemPort system.ruby.cpu_ruby_ports1.physMemPort system.ruby.cpu_ruby_ports2.physMemPort system.ruby.cpu_ruby_ports3.physMemPort system.ruby.cpu_ruby_ports4.physMemPort system.ruby.cpu_ruby_ports5.physMemPort system.ruby.cpu_ruby_ports6.physMemPort system.ruby.cpu_ruby_ports7.physMemPort
+port=system.l1_cntrl0.sequencer.physMemPort system.l1_cntrl1.sequencer.physMemPort system.l1_cntrl2.sequencer.physMemPort system.l1_cntrl3.sequencer.physMemPort system.l1_cntrl4.sequencer.physMemPort system.l1_cntrl5.sequencer.physMemPort system.l1_cntrl6.sequencer.physMemPort system.l1_cntrl7.sequencer.physMemPort
 
 [system.ruby]
 type=RubySystem
-children=cpu_ruby_ports0 cpu_ruby_ports1 cpu_ruby_ports2 cpu_ruby_ports3 cpu_ruby_ports4 cpu_ruby_ports5 cpu_ruby_ports6 cpu_ruby_ports7 network profiler tracer
+children=network profiler tracer
 block_size_bytes=64
 clock=1
 mem_size=134217728
-network=system.ruby.network
 no_mem_vec=false
-profiler=system.ruby.profiler
 random_seed=1234
 randomization=false
 stats_filename=ruby.stats
-tracer=system.ruby.tracer
-
-[system.ruby.cpu_ruby_ports0]
-type=RubySequencer
-access_phys_mem=true
-dcache=system.l1_cntrl0.L1DcacheMemory
-deadlock_threshold=1000000
-icache=system.l1_cntrl0.L1IcacheMemory
-max_outstanding_requests=16
-physmem=system.physmem
-using_network_tester=false
-using_ruby_tester=false
-version=0
-physMemPort=system.physmem.port[0]
-port=system.cpu0.test
-
-[system.ruby.cpu_ruby_ports1]
-type=RubySequencer
-access_phys_mem=true
-dcache=system.l1_cntrl1.L1DcacheMemory
-deadlock_threshold=1000000
-icache=system.l1_cntrl1.L1IcacheMemory
-max_outstanding_requests=16
-physmem=system.physmem
-using_network_tester=false
-using_ruby_tester=false
-version=1
-physMemPort=system.physmem.port[1]
-port=system.cpu1.test
-
-[system.ruby.cpu_ruby_ports2]
-type=RubySequencer
-access_phys_mem=true
-dcache=system.l1_cntrl2.L1DcacheMemory
-deadlock_threshold=1000000
-icache=system.l1_cntrl2.L1IcacheMemory
-max_outstanding_requests=16
-physmem=system.physmem
-using_network_tester=false
-using_ruby_tester=false
-version=2
-physMemPort=system.physmem.port[2]
-port=system.cpu2.test
-
-[system.ruby.cpu_ruby_ports3]
-type=RubySequencer
-access_phys_mem=true
-dcache=system.l1_cntrl3.L1DcacheMemory
-deadlock_threshold=1000000
-icache=system.l1_cntrl3.L1IcacheMemory
-max_outstanding_requests=16
-physmem=system.physmem
-using_network_tester=false
-using_ruby_tester=false
-version=3
-physMemPort=system.physmem.port[3]
-port=system.cpu3.test
-
-[system.ruby.cpu_ruby_ports4]
-type=RubySequencer
-access_phys_mem=true
-dcache=system.l1_cntrl4.L1DcacheMemory
-deadlock_threshold=1000000
-icache=system.l1_cntrl4.L1IcacheMemory
-max_outstanding_requests=16
-physmem=system.physmem
-using_network_tester=false
-using_ruby_tester=false
-version=4
-physMemPort=system.physmem.port[4]
-port=system.cpu4.test
-
-[system.ruby.cpu_ruby_ports5]
-type=RubySequencer
-access_phys_mem=true
-dcache=system.l1_cntrl5.L1DcacheMemory
-deadlock_threshold=1000000
-icache=system.l1_cntrl5.L1IcacheMemory
-max_outstanding_requests=16
-physmem=system.physmem
-using_network_tester=false
-using_ruby_tester=false
-version=5
-physMemPort=system.physmem.port[5]
-port=system.cpu5.test
-
-[system.ruby.cpu_ruby_ports6]
-type=RubySequencer
-access_phys_mem=true
-dcache=system.l1_cntrl6.L1DcacheMemory
-deadlock_threshold=1000000
-icache=system.l1_cntrl6.L1IcacheMemory
-max_outstanding_requests=16
-physmem=system.physmem
-using_network_tester=false
-using_ruby_tester=false
-version=6
-physMemPort=system.physmem.port[6]
-port=system.cpu6.test
-
-[system.ruby.cpu_ruby_ports7]
-type=RubySequencer
-access_phys_mem=true
-dcache=system.l1_cntrl7.L1DcacheMemory
-deadlock_threshold=1000000
-icache=system.l1_cntrl7.L1IcacheMemory
-max_outstanding_requests=16
-physmem=system.physmem
-using_network_tester=false
-using_ruby_tester=false
-version=7
-physMemPort=system.physmem.port[7]
-port=system.cpu7.test
 
 [system.ruby.network]
 type=SimpleNetwork
@@ -611,6 +634,7 @@ buffer_size=0
 control_msg_size=8
 endpoint_bandwidth=1000
 number_of_virtual_networks=10
+ruby_system=system.ruby
 topology=system.ruby.network.topology
 
 [system.ruby.network.topology]
@@ -851,8 +875,10 @@ type=RubyProfiler
 all_instructions=false
 hot_lines=false
 num_of_sequencers=8
+ruby_system=system.ruby
 
 [system.ruby.tracer]
 type=RubyTracer
+ruby_system=system.ruby
 warmup_length=100000