From 99fb8f81407efa54008ddf443718e492f583b142 Mon Sep 17 00:00:00 2001
From: Nilay Vaish <nilay@cs.wisc.edu>
Date: Mon, 9 Mar 2015 09:39:09 -0500
Subject: stats: changes to due to recent set of patches

---
 .../ref/null/none/memtest-filter/config.ini        | 181 ++++++++-------------
 1 file changed, 71 insertions(+), 110 deletions(-)

(limited to 'tests/quick/se/50.memtest/ref/null/none/memtest-filter')

diff --git a/tests/quick/se/50.memtest/ref/null/none/memtest-filter/config.ini b/tests/quick/se/50.memtest/ref/null/none/memtest-filter/config.ini
index 6605d530a..27d9847c3 100644
--- a/tests/quick/se/50.memtest/ref/null/none/memtest-filter/config.ini
+++ b/tests/quick/se/50.memtest/ref/null/none/memtest-filter/config.ini
@@ -10,7 +10,7 @@ time_sync_spin_threshold=100000000
 
 [system]
 type=System
-children=clk_domain cpu0 cpu1 cpu2 cpu3 cpu4 cpu5 cpu6 cpu7 cpu_clk_domain dvfs_handler funcbus funcmem l2c membus physmem toL2Bus voltage_domain
+children=clk_domain cpu0 cpu1 cpu2 cpu3 cpu4 cpu5 cpu6 cpu7 cpu_clk_domain dvfs_handler l2c membus physmem toL2Bus voltage_domain
 boot_osflags=a
 cache_line_size=64
 clk_domain=system.clk_domain
@@ -22,7 +22,8 @@ load_addr_mask=1099511627775
 load_offset=0
 mem_mode=timing
 mem_ranges=
-memories=system.physmem system.funcmem
+memories=system.physmem
+mmap_using_noreserve=false
 num_work_ids=16
 readfile=
 symbolfile=
@@ -46,23 +47,19 @@ voltage_domain=system.voltage_domain
 [system.cpu0]
 type=MemTest
 children=l1c
-atomic=false
 clk_domain=system.cpu_clk_domain
 eventq_index=0
-issue_dmas=false
+interval=1
 max_loads=100000
-memory_size=65536
-percent_dest_unaligned=50
 percent_functional=50
 percent_reads=65
-percent_source_unaligned=50
 percent_uncacheable=10
+progress_check=5000000
 progress_interval=10000
+size=65536
 suppress_func_warnings=false
-sys=system
-trace_addr=0
-functional=system.funcbus.slave[0]
-test=system.cpu0.l1c.cpu_side
+system=system
+port=system.cpu0.l1c.cpu_side
 
 [system.cpu0.l1c]
 type=BaseCache
@@ -70,6 +67,7 @@ children=tags
 addr_ranges=0:18446744073709551615
 assoc=4
 clk_domain=system.cpu_clk_domain
+demand_mshr_reserve=1
 eventq_index=0
 forward_snoops=true
 hit_latency=2
@@ -86,7 +84,7 @@ tags=system.cpu0.l1c.tags
 tgts_per_mshr=20
 two_queue=false
 write_buffers=8
-cpu_side=system.cpu0.test
+cpu_side=system.cpu0.port
 mem_side=system.toL2Bus.slave[0]
 
 [system.cpu0.l1c.tags]
@@ -102,23 +100,19 @@ size=32768
 [system.cpu1]
 type=MemTest
 children=l1c
-atomic=false
 clk_domain=system.cpu_clk_domain
 eventq_index=0
-issue_dmas=false
+interval=1
 max_loads=100000
-memory_size=65536
-percent_dest_unaligned=50
 percent_functional=50
 percent_reads=65
-percent_source_unaligned=50
 percent_uncacheable=10
+progress_check=5000000
 progress_interval=10000
+size=65536
 suppress_func_warnings=false
-sys=system
-trace_addr=0
-functional=system.funcbus.slave[1]
-test=system.cpu1.l1c.cpu_side
+system=system
+port=system.cpu1.l1c.cpu_side
 
 [system.cpu1.l1c]
 type=BaseCache
@@ -126,6 +120,7 @@ children=tags
 addr_ranges=0:18446744073709551615
 assoc=4
 clk_domain=system.cpu_clk_domain
+demand_mshr_reserve=1
 eventq_index=0
 forward_snoops=true
 hit_latency=2
@@ -142,7 +137,7 @@ tags=system.cpu1.l1c.tags
 tgts_per_mshr=20
 two_queue=false
 write_buffers=8
-cpu_side=system.cpu1.test
+cpu_side=system.cpu1.port
 mem_side=system.toL2Bus.slave[1]
 
 [system.cpu1.l1c.tags]
@@ -158,23 +153,19 @@ size=32768
 [system.cpu2]
 type=MemTest
 children=l1c
-atomic=false
 clk_domain=system.cpu_clk_domain
 eventq_index=0
-issue_dmas=false
+interval=1
 max_loads=100000
-memory_size=65536
-percent_dest_unaligned=50
 percent_functional=50
 percent_reads=65
-percent_source_unaligned=50
 percent_uncacheable=10
+progress_check=5000000
 progress_interval=10000
+size=65536
 suppress_func_warnings=false
-sys=system
-trace_addr=0
-functional=system.funcbus.slave[2]
-test=system.cpu2.l1c.cpu_side
+system=system
+port=system.cpu2.l1c.cpu_side
 
 [system.cpu2.l1c]
 type=BaseCache
@@ -182,6 +173,7 @@ children=tags
 addr_ranges=0:18446744073709551615
 assoc=4
 clk_domain=system.cpu_clk_domain
+demand_mshr_reserve=1
 eventq_index=0
 forward_snoops=true
 hit_latency=2
@@ -198,7 +190,7 @@ tags=system.cpu2.l1c.tags
 tgts_per_mshr=20
 two_queue=false
 write_buffers=8
-cpu_side=system.cpu2.test
+cpu_side=system.cpu2.port
 mem_side=system.toL2Bus.slave[2]
 
 [system.cpu2.l1c.tags]
@@ -214,23 +206,19 @@ size=32768
 [system.cpu3]
 type=MemTest
 children=l1c
-atomic=false
 clk_domain=system.cpu_clk_domain
 eventq_index=0
-issue_dmas=false
+interval=1
 max_loads=100000
-memory_size=65536
-percent_dest_unaligned=50
 percent_functional=50
 percent_reads=65
-percent_source_unaligned=50
 percent_uncacheable=10
+progress_check=5000000
 progress_interval=10000
+size=65536
 suppress_func_warnings=false
-sys=system
-trace_addr=0
-functional=system.funcbus.slave[3]
-test=system.cpu3.l1c.cpu_side
+system=system
+port=system.cpu3.l1c.cpu_side
 
 [system.cpu3.l1c]
 type=BaseCache
@@ -238,6 +226,7 @@ children=tags
 addr_ranges=0:18446744073709551615
 assoc=4
 clk_domain=system.cpu_clk_domain
+demand_mshr_reserve=1
 eventq_index=0
 forward_snoops=true
 hit_latency=2
@@ -254,7 +243,7 @@ tags=system.cpu3.l1c.tags
 tgts_per_mshr=20
 two_queue=false
 write_buffers=8
-cpu_side=system.cpu3.test
+cpu_side=system.cpu3.port
 mem_side=system.toL2Bus.slave[3]
 
 [system.cpu3.l1c.tags]
@@ -270,23 +259,19 @@ size=32768
 [system.cpu4]
 type=MemTest
 children=l1c
-atomic=false
 clk_domain=system.cpu_clk_domain
 eventq_index=0
-issue_dmas=false
+interval=1
 max_loads=100000
-memory_size=65536
-percent_dest_unaligned=50
 percent_functional=50
 percent_reads=65
-percent_source_unaligned=50
 percent_uncacheable=10
+progress_check=5000000
 progress_interval=10000
+size=65536
 suppress_func_warnings=false
-sys=system
-trace_addr=0
-functional=system.funcbus.slave[4]
-test=system.cpu4.l1c.cpu_side
+system=system
+port=system.cpu4.l1c.cpu_side
 
 [system.cpu4.l1c]
 type=BaseCache
@@ -294,6 +279,7 @@ children=tags
 addr_ranges=0:18446744073709551615
 assoc=4
 clk_domain=system.cpu_clk_domain
+demand_mshr_reserve=1
 eventq_index=0
 forward_snoops=true
 hit_latency=2
@@ -310,7 +296,7 @@ tags=system.cpu4.l1c.tags
 tgts_per_mshr=20
 two_queue=false
 write_buffers=8
-cpu_side=system.cpu4.test
+cpu_side=system.cpu4.port
 mem_side=system.toL2Bus.slave[4]
 
 [system.cpu4.l1c.tags]
@@ -326,23 +312,19 @@ size=32768
 [system.cpu5]
 type=MemTest
 children=l1c
-atomic=false
 clk_domain=system.cpu_clk_domain
 eventq_index=0
-issue_dmas=false
+interval=1
 max_loads=100000
-memory_size=65536
-percent_dest_unaligned=50
 percent_functional=50
 percent_reads=65
-percent_source_unaligned=50
 percent_uncacheable=10
+progress_check=5000000
 progress_interval=10000
+size=65536
 suppress_func_warnings=false
-sys=system
-trace_addr=0
-functional=system.funcbus.slave[5]
-test=system.cpu5.l1c.cpu_side
+system=system
+port=system.cpu5.l1c.cpu_side
 
 [system.cpu5.l1c]
 type=BaseCache
@@ -350,6 +332,7 @@ children=tags
 addr_ranges=0:18446744073709551615
 assoc=4
 clk_domain=system.cpu_clk_domain
+demand_mshr_reserve=1
 eventq_index=0
 forward_snoops=true
 hit_latency=2
@@ -366,7 +349,7 @@ tags=system.cpu5.l1c.tags
 tgts_per_mshr=20
 two_queue=false
 write_buffers=8
-cpu_side=system.cpu5.test
+cpu_side=system.cpu5.port
 mem_side=system.toL2Bus.slave[5]
 
 [system.cpu5.l1c.tags]
@@ -382,23 +365,19 @@ size=32768
 [system.cpu6]
 type=MemTest
 children=l1c
-atomic=false
 clk_domain=system.cpu_clk_domain
 eventq_index=0
-issue_dmas=false
+interval=1
 max_loads=100000
-memory_size=65536
-percent_dest_unaligned=50
 percent_functional=50
 percent_reads=65
-percent_source_unaligned=50
 percent_uncacheable=10
+progress_check=5000000
 progress_interval=10000
+size=65536
 suppress_func_warnings=false
-sys=system
-trace_addr=0
-functional=system.funcbus.slave[6]
-test=system.cpu6.l1c.cpu_side
+system=system
+port=system.cpu6.l1c.cpu_side
 
 [system.cpu6.l1c]
 type=BaseCache
@@ -406,6 +385,7 @@ children=tags
 addr_ranges=0:18446744073709551615
 assoc=4
 clk_domain=system.cpu_clk_domain
+demand_mshr_reserve=1
 eventq_index=0
 forward_snoops=true
 hit_latency=2
@@ -422,7 +402,7 @@ tags=system.cpu6.l1c.tags
 tgts_per_mshr=20
 two_queue=false
 write_buffers=8
-cpu_side=system.cpu6.test
+cpu_side=system.cpu6.port
 mem_side=system.toL2Bus.slave[6]
 
 [system.cpu6.l1c.tags]
@@ -438,23 +418,19 @@ size=32768
 [system.cpu7]
 type=MemTest
 children=l1c
-atomic=false
 clk_domain=system.cpu_clk_domain
 eventq_index=0
-issue_dmas=false
+interval=1
 max_loads=100000
-memory_size=65536
-percent_dest_unaligned=50
 percent_functional=50
 percent_reads=65
-percent_source_unaligned=50
 percent_uncacheable=10
+progress_check=5000000
 progress_interval=10000
+size=65536
 suppress_func_warnings=false
-sys=system
-trace_addr=0
-functional=system.funcbus.slave[7]
-test=system.cpu7.l1c.cpu_side
+system=system
+port=system.cpu7.l1c.cpu_side
 
 [system.cpu7.l1c]
 type=BaseCache
@@ -462,6 +438,7 @@ children=tags
 addr_ranges=0:18446744073709551615
 assoc=4
 clk_domain=system.cpu_clk_domain
+demand_mshr_reserve=1
 eventq_index=0
 forward_snoops=true
 hit_latency=2
@@ -478,7 +455,7 @@ tags=system.cpu7.l1c.tags
 tgts_per_mshr=20
 two_queue=false
 write_buffers=8
-cpu_side=system.cpu7.test
+cpu_side=system.cpu7.port
 mem_side=system.toL2Bus.slave[7]
 
 [system.cpu7.l1c.tags]
@@ -507,35 +484,13 @@ eventq_index=0
 sys_clk_domain=system.clk_domain
 transition_latency=100000000
 
-[system.funcbus]
-type=NoncoherentXBar
-clk_domain=system.clk_domain
-eventq_index=0
-header_cycles=1
-use_default_range=false
-width=8
-master=system.funcmem.port
-slave=system.cpu0.functional system.cpu1.functional system.cpu2.functional system.cpu3.functional system.cpu4.functional system.cpu5.functional system.cpu6.functional system.cpu7.functional
-
-[system.funcmem]
-type=SimpleMemory
-bandwidth=73.000000
-clk_domain=system.clk_domain
-conf_table_reported=true
-eventq_index=0
-in_addr_map=false
-latency=30000
-latency_var=0
-null=false
-range=0:134217727
-port=system.funcbus.master[0]
-
 [system.l2c]
 type=BaseCache
 children=tags
 addr_ranges=0:18446744073709551615
 assoc=8
 clk_domain=system.cpu_clk_domain
+demand_mshr_reserve=1
 eventq_index=0
 forward_snoops=true
 hit_latency=20
@@ -570,8 +525,11 @@ type=CoherentXBar
 children=snoop_filter
 clk_domain=system.clk_domain
 eventq_index=0
-header_cycles=1
+forward_latency=4
+frontend_latency=3
+response_latency=2
 snoop_filter=system.membus.snoop_filter
+snoop_response_latency=4
 system=system
 use_default_range=false
 width=16
@@ -581,7 +539,7 @@ slave=system.l2c.mem_side system.system_port
 [system.membus.snoop_filter]
 type=SnoopFilter
 eventq_index=0
-lookup_latency=3
+lookup_latency=1
 system=system
 
 [system.physmem]
@@ -602,18 +560,21 @@ type=CoherentXBar
 children=snoop_filter
 clk_domain=system.cpu_clk_domain
 eventq_index=0
-header_cycles=1
+forward_latency=0
+frontend_latency=1
+response_latency=1
 snoop_filter=system.toL2Bus.snoop_filter
+snoop_response_latency=1
 system=system
 use_default_range=false
-width=16
+width=32
 master=system.l2c.cpu_side
 slave=system.cpu0.l1c.mem_side system.cpu1.l1c.mem_side system.cpu2.l1c.mem_side system.cpu3.l1c.mem_side system.cpu4.l1c.mem_side system.cpu5.l1c.mem_side system.cpu6.l1c.mem_side system.cpu7.l1c.mem_side
 
 [system.toL2Bus.snoop_filter]
 type=SnoopFilter
 eventq_index=0
-lookup_latency=3
+lookup_latency=1
 system=system
 
 [system.voltage_domain]
-- 
cgit v1.2.3