Regression Tests: Update statistics

9 files changed, 84 insertions, 46 deletions

diff --git a/tests/quick/se/00.hello/ref/alpha/linux/inorder-timing/config.ini b/tests/quick/se/00.hello/ref/alpha/linux/inorder-timing/config.ini
index 741def846..f7aca5bc7 100644
--- a/tests/quick/se/00.hello/ref/alpha/linux/inorder-timing/config.ini
+++ b/tests/quick/se/00.hello/ref/alpha/linux/inorder-timing/config.ini
@@ -10,6 +10,7 @@ time_sync_spin_threshold=100000000
 type=System
 children=cpu membus physmem
 boot_osflags=a
+clock=1
 init_param=0
 kernel=
 load_addr_mask=1099511627775
@@ -54,8 +55,6 @@ do_quiesce=true
 do_statistics_insts=true
 dtb=system.cpu.dtb
 fetchBuffSize=4
-functionTrace=false
-functionTraceStart=0
 function_trace=false
 function_trace_start=0
 globalCtrBits=2
@@ -76,7 +75,6 @@ memBlockSize=64
 multLatency=1
 multRepeatRate=1
 numThreads=1
-phase=0
 predType=tournament
 profile=0
 progress_interval=0
@@ -94,16 +92,18 @@ type=BaseCache
 addr_ranges=0:18446744073709551615
 assoc=2
 block_size=64
+clock=1
 forward_snoops=true
 hash_delay=1
+hit_latency=1000
 is_top_level=true
-latency=1000
 max_miss_count=0
 mshrs=10
 prefetch_on_access=false
 prefetcher=Null
 prioritizeRequests=false
 repl=Null
+response_latency=1000
 size=262144
 subblock_size=0
 system=system
@@ -123,16 +123,18 @@ type=BaseCache
 addr_ranges=0:18446744073709551615
 assoc=2
 block_size=64
+clock=1
 forward_snoops=true
 hash_delay=1
+hit_latency=1000
 is_top_level=true
-latency=1000
 max_miss_count=0
 mshrs=10
 prefetch_on_access=false
 prefetcher=Null
 prioritizeRequests=false
 repl=Null
+response_latency=1000
 size=131072
 subblock_size=0
 system=system
@@ -155,16 +157,18 @@ type=BaseCache
 addr_ranges=0:18446744073709551615
 assoc=2
 block_size=64
+clock=1
 forward_snoops=true
 hash_delay=1
+hit_latency=10000
 is_top_level=false
-latency=10000
 max_miss_count=0
 mshrs=10
 prefetch_on_access=false
 prefetcher=Null
 prioritizeRequests=false
 repl=Null
+response_latency=10000
 size=2097152
 subblock_size=0
 system=system
@@ -196,7 +200,7 @@ egid=100
 env=
 errout=cerr
 euid=100
-executable=/dist/m5/regression/test-progs/hello/bin/alpha/linux/hello
+executable=tests/test-progs/hello/bin/alpha/linux/hello
 gid=100
 input=cin
 max_stack_size=67108864
@@ -219,8 +223,9 @@ slave=system.system_port system.cpu.l2cache.mem_side
 
 [system.physmem]
 type=SimpleMemory
+bandwidth=73.000000
+clock=1
 conf_table_reported=false
-file=
 in_addr_map=true
 latency=30000
 latency_var=0
diff --git a/tests/quick/se/00.hello/ref/alpha/linux/o3-timing/config.ini b/tests/quick/se/00.hello/ref/alpha/linux/o3-timing/config.ini
index 3f0b5bf4d..6c764cc38 100644
--- a/tests/quick/se/00.hello/ref/alpha/linux/o3-timing/config.ini
+++ b/tests/quick/se/00.hello/ref/alpha/linux/o3-timing/config.ini
@@ -10,6 +10,7 @@ time_sync_spin_threshold=100000000
 type=System
 children=cpu membus physmem
 boot_osflags=a
+clock=1
 init_param=0
 kernel=
 load_addr_mask=1099511627775
@@ -95,7 +96,6 @@ numPhysIntRegs=256
 numROBEntries=192
 numRobs=1
 numThreads=1
-phase=0
 predType=tournament
 profile=0
 progress_interval=0
@@ -129,16 +129,18 @@ type=BaseCache
 addr_ranges=0:18446744073709551615
 assoc=2
 block_size=64
+clock=1
 forward_snoops=true
 hash_delay=1
+hit_latency=1000
 is_top_level=true
-latency=1000
 max_miss_count=0
 mshrs=10
 prefetch_on_access=false
 prefetcher=Null
 prioritizeRequests=false
 repl=Null
+response_latency=1000
 size=262144
 subblock_size=0
 system=system
@@ -421,16 +423,18 @@ type=BaseCache
 addr_ranges=0:18446744073709551615
 assoc=2
 block_size=64
+clock=1
 forward_snoops=true
 hash_delay=1
+hit_latency=1000
 is_top_level=true
-latency=1000
 max_miss_count=0
 mshrs=10
 prefetch_on_access=false
 prefetcher=Null
 prioritizeRequests=false
 repl=Null
+response_latency=1000
 size=131072
 subblock_size=0
 system=system
@@ -453,16 +457,18 @@ type=BaseCache
 addr_ranges=0:18446744073709551615
 assoc=2
 block_size=64
+clock=1
 forward_snoops=true
 hash_delay=1
+hit_latency=1000
 is_top_level=false
-latency=1000
 max_miss_count=0
 mshrs=10
 prefetch_on_access=false
 prefetcher=Null
 prioritizeRequests=false
 repl=Null
+response_latency=1000
 size=2097152
 subblock_size=0
 system=system
@@ -494,7 +500,7 @@ egid=100
 env=
 errout=cerr
 euid=100
-executable=/dist/m5/regression/test-progs/hello/bin/alpha/linux/hello
+executable=tests/test-progs/hello/bin/alpha/linux/hello
 gid=100
 input=cin
 max_stack_size=67108864
@@ -517,8 +523,9 @@ slave=system.system_port system.cpu.l2cache.mem_side
 
 [system.physmem]
 type=SimpleMemory
+bandwidth=73.000000
+clock=1
 conf_table_reported=false
-file=
 in_addr_map=true
 latency=30000
 latency_var=0
diff --git a/tests/quick/se/00.hello/ref/alpha/linux/simple-atomic/config.ini b/tests/quick/se/00.hello/ref/alpha/linux/simple-atomic/config.ini
index 63c93b86f..8484e6949 100644
--- a/tests/quick/se/00.hello/ref/alpha/linux/simple-atomic/config.ini
+++ b/tests/quick/se/00.hello/ref/alpha/linux/simple-atomic/config.ini
@@ -10,6 +10,7 @@ time_sync_spin_threshold=100000000
 type=System
 children=cpu membus physmem
 boot_osflags=a
+clock=1
 init_param=0
 kernel=
 load_addr_mask=1099511627775
@@ -48,7 +49,6 @@ max_insts_any_thread=0
 max_loads_all_threads=0
 max_loads_any_thread=0
 numThreads=1
-phase=0
 profile=0
 progress_interval=0
 simulate_data_stalls=false
@@ -82,7 +82,7 @@ egid=100
 env=
 errout=cerr
 euid=100
-executable=/dist/m5/regression/test-progs/hello/bin/alpha/linux/hello
+executable=tests/test-progs/hello/bin/alpha/linux/hello
 gid=100
 input=cin
 max_stack_size=67108864
@@ -105,8 +105,9 @@ slave=system.system_port system.cpu.icache_port system.cpu.dcache_port
 
 [system.physmem]
 type=SimpleMemory
+bandwidth=73.000000
+clock=1
 conf_table_reported=false
-file=
 in_addr_map=true
 latency=30000
 latency_var=0
diff --git a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_CMP_directory/config.ini b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_CMP_directory/config.ini
index 80e83bbd8..dff340707 100644
--- a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_CMP_directory/config.ini
+++ b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_CMP_directory/config.ini
@@ -229,9 +229,9 @@ tagArrayBanks=1
 
 [system.physmem]
 type=SimpleMemory
+bandwidth=0.000000
 clock=1
 conf_table_reported=false
-file=
 in_addr_map=true
 latency=30
 latency_var=0
@@ -281,8 +281,9 @@ link_id=0
 weight=1
 
 [system.ruby.network.topology.ext_links0.int_node]
-type=BasicRouter
+type=Switch
 router_id=0
+virt_nets=10
 
 [system.ruby.network.topology.ext_links1]
 type=SimpleExtLink
@@ -295,8 +296,9 @@ link_id=1
 weight=1
 
 [system.ruby.network.topology.ext_links1.int_node]
-type=BasicRouter
+type=Switch
 router_id=1
+virt_nets=10
 
 [system.ruby.network.topology.ext_links2]
 type=SimpleExtLink
@@ -309,8 +311,9 @@ link_id=2
 weight=1
 
 [system.ruby.network.topology.ext_links2.int_node]
-type=BasicRouter
+type=Switch
 router_id=2
+virt_nets=10
 
 [system.ruby.network.topology.int_links0]
 type=SimpleIntLink
@@ -323,8 +326,9 @@ node_b=system.ruby.network.topology.int_links0.node_b
 weight=1
 
 [system.ruby.network.topology.int_links0.node_b]
-type=BasicRouter
+type=Switch
 router_id=3
+virt_nets=10
 
 [system.ruby.network.topology.int_links1]
 type=SimpleIntLink
diff --git a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_directory/config.ini b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_directory/config.ini
index 562053d7f..6be2ae196 100644
--- a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_directory/config.ini
+++ b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_directory/config.ini
@@ -225,9 +225,9 @@ tagArrayBanks=1
 
 [system.physmem]
 type=SimpleMemory
+bandwidth=0.000000
 clock=1
 conf_table_reported=false
-file=
 in_addr_map=true
 latency=30
 latency_var=0
@@ -277,8 +277,9 @@ link_id=0
 weight=1
 
 [system.ruby.network.topology.ext_links0.int_node]
-type=BasicRouter
+type=Switch
 router_id=0
+virt_nets=10
 
 [system.ruby.network.topology.ext_links1]
 type=SimpleExtLink
@@ -291,8 +292,9 @@ link_id=1
 weight=1
 
 [system.ruby.network.topology.ext_links1.int_node]
-type=BasicRouter
+type=Switch
 router_id=1
+virt_nets=10
 
 [system.ruby.network.topology.ext_links2]
 type=SimpleExtLink
@@ -305,8 +307,9 @@ link_id=2
 weight=1
 
 [system.ruby.network.topology.ext_links2.int_node]
-type=BasicRouter
+type=Switch
 router_id=2
+virt_nets=10
 
 [system.ruby.network.topology.int_links0]
 type=SimpleIntLink
@@ -319,8 +322,9 @@ node_b=system.ruby.network.topology.int_links0.node_b
 weight=1
 
 [system.ruby.network.topology.int_links0.node_b]
-type=BasicRouter
+type=Switch
 router_id=3
+virt_nets=10
 
 [system.ruby.network.topology.int_links1]
 type=SimpleIntLink
diff --git a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_token/config.ini b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_token/config.ini
index 57a963b50..1f7e18219 100644
--- a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_token/config.ini
+++ b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_token/config.ini
@@ -236,9 +236,9 @@ tagArrayBanks=1
 
 [system.physmem]
 type=SimpleMemory
+bandwidth=0.000000
 clock=1
 conf_table_reported=false
-file=
 in_addr_map=true
 latency=30
 latency_var=0
@@ -288,8 +288,9 @@ link_id=0
 weight=1
 
 [system.ruby.network.topology.ext_links0.int_node]
-type=BasicRouter
+type=Switch
 router_id=0
+virt_nets=10
 
 [system.ruby.network.topology.ext_links1]
 type=SimpleExtLink
@@ -302,8 +303,9 @@ link_id=1
 weight=1
 
 [system.ruby.network.topology.ext_links1.int_node]
-type=BasicRouter
+type=Switch
 router_id=1
+virt_nets=10
 
 [system.ruby.network.topology.ext_links2]
 type=SimpleExtLink
@@ -316,8 +318,9 @@ link_id=2
 weight=1
 
 [system.ruby.network.topology.ext_links2.int_node]
-type=BasicRouter
+type=Switch
 router_id=2
+virt_nets=10
 
 [system.ruby.network.topology.int_links0]
 type=SimpleIntLink
@@ -330,8 +333,9 @@ node_b=system.ruby.network.topology.int_links0.node_b
 weight=1
 
 [system.ruby.network.topology.int_links0.node_b]
-type=BasicRouter
+type=Switch
 router_id=3
+virt_nets=10
 
 [system.ruby.network.topology.int_links1]
 type=SimpleIntLink
diff --git a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_hammer/config.ini b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_hammer/config.ini
index 490417398..0d406345b 100644
--- a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_hammer/config.ini
+++ b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_hammer/config.ini
@@ -231,9 +231,9 @@ slave=system.cpu.icache_port system.cpu.dcache_port
 
 [system.physmem]
 type=SimpleMemory
+bandwidth=0.000000
 clock=1
 conf_table_reported=false
-file=
 in_addr_map=true
 latency=30
 latency_var=0
@@ -283,8 +283,9 @@ link_id=0
 weight=1
 
 [system.ruby.network.topology.ext_links0.int_node]
-type=BasicRouter
+type=Switch
 router_id=0
+virt_nets=10
 
 [system.ruby.network.topology.ext_links1]
 type=SimpleExtLink
@@ -297,8 +298,9 @@ link_id=1
 weight=1
 
 [system.ruby.network.topology.ext_links1.int_node]
-type=BasicRouter
+type=Switch
 router_id=1
+virt_nets=10
 
 [system.ruby.network.topology.int_links0]
 type=SimpleIntLink
@@ -311,8 +313,9 @@ node_b=system.ruby.network.topology.int_links0.node_b
 weight=1
 
 [system.ruby.network.topology.int_links0.node_b]
-type=BasicRouter
+type=Switch
 router_id=2
+virt_nets=10
 
 [system.ruby.network.topology.int_links1]
 type=SimpleIntLink
diff --git a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby/config.ini b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby/config.ini
index e4e42d50c..8ba053a74 100644
--- a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby/config.ini
+++ b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby/config.ini
@@ -182,9 +182,9 @@ slave=system.cpu.icache_port system.cpu.dcache_port
 
 [system.physmem]
 type=SimpleMemory
+bandwidth=0.000000
 clock=1
 conf_table_reported=false
-file=
 in_addr_map=true
 latency=30
 latency_var=0
@@ -234,8 +234,9 @@ link_id=0
 weight=1
 
 [system.ruby.network.topology.ext_links0.int_node]
-type=BasicRouter
+type=Switch
 router_id=0
+virt_nets=10
 
 [system.ruby.network.topology.ext_links1]
 type=SimpleExtLink
@@ -248,8 +249,9 @@ link_id=1
 weight=1
 
 [system.ruby.network.topology.ext_links1.int_node]
-type=BasicRouter
+type=Switch
 router_id=1
+virt_nets=10
 
 [system.ruby.network.topology.int_links0]
 type=SimpleIntLink
@@ -262,8 +264,9 @@ node_b=system.ruby.network.topology.int_links0.node_b
 weight=1
 
 [system.ruby.network.topology.int_links0.node_b]
-type=BasicRouter
+type=Switch
 router_id=2
+virt_nets=10
 
 [system.ruby.network.topology.int_links1]
 type=SimpleIntLink
diff --git a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing/config.ini b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing/config.ini
index b5ef1f793..92dcab639 100644
--- a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing/config.ini
+++ b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing/config.ini
@@ -10,6 +10,7 @@ time_sync_spin_threshold=100000000
 type=System
 children=cpu membus physmem
 boot_osflags=a
+clock=1
 init_param=0
 kernel=
 load_addr_mask=1099511627775
@@ -47,7 +48,6 @@ max_insts_any_thread=0
 max_loads_all_threads=0
 max_loads_any_thread=0
 numThreads=1
-phase=0
 profile=0
 progress_interval=0
 system=system
@@ -61,16 +61,18 @@ type=BaseCache
 addr_ranges=0:18446744073709551615
 assoc=2
 block_size=64
+clock=1
 forward_snoops=true
 hash_delay=1
+hit_latency=1000
 is_top_level=true
-latency=1000
 max_miss_count=0
 mshrs=10
 prefetch_on_access=false
 prefetcher=Null
 prioritizeRequests=false
 repl=Null
+response_latency=1000
 size=262144
 subblock_size=0
 system=system
@@ -90,16 +92,18 @@ type=BaseCache
 addr_ranges=0:18446744073709551615
 assoc=2
 block_size=64
+clock=1
 forward_snoops=true
 hash_delay=1
+hit_latency=1000
 is_top_level=true
-latency=1000
 max_miss_count=0
 mshrs=10
 prefetch_on_access=false
 prefetcher=Null
 prioritizeRequests=false
 repl=Null
+response_latency=1000
 size=131072
 subblock_size=0
 system=system
@@ -122,16 +126,18 @@ type=BaseCache
 addr_ranges=0:18446744073709551615
 assoc=2
 block_size=64
+clock=1
 forward_snoops=true
 hash_delay=1
+hit_latency=10000
 is_top_level=false
-latency=10000
 max_miss_count=0
 mshrs=10
 prefetch_on_access=false
 prefetcher=Null
 prioritizeRequests=false
 repl=Null
+response_latency=10000
 size=2097152
 subblock_size=0
 system=system
@@ -163,7 +169,7 @@ egid=100
 env=
 errout=cerr
 euid=100
-executable=/dist/m5/regression/test-progs/hello/bin/alpha/linux/hello
+executable=tests/test-progs/hello/bin/alpha/linux/hello
 gid=100
 input=cin
 max_stack_size=67108864
@@ -186,8 +192,9 @@ slave=system.system_port system.cpu.l2cache.mem_side
 
 [system.physmem]
 type=SimpleMemory
+bandwidth=73.000000
+clock=1
 conf_table_reported=false
-file=
 in_addr_map=true
 latency=30000
 latency_var=0