diff options
52 files changed, 738 insertions, 420 deletions
diff --git a/tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_CMP_directory/config.ini b/tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_CMP_directory/config.ini index d4842c1ef..4414972c3 100644 --- a/tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_CMP_directory/config.ini +++ b/tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_CMP_directory/config.ini @@ -1222,9 +1222,9 @@ pio=system.piobus.master[9] [system.physmem] type=SimpleMemory +bandwidth=73.000000 clock=1 conf_table_reported=false -file= in_addr_map=true latency=30000 latency_var=0 @@ -1286,8 +1286,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 @@ -1300,8 +1301,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 @@ -1314,8 +1316,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.ext_links3] type=SimpleExtLink @@ -1328,8 +1331,9 @@ link_id=3 weight=1 [system.ruby.network.topology.ext_links3.int_node] -type=BasicRouter +type=Switch router_id=3 +virt_nets=10 [system.ruby.network.topology.ext_links4] type=SimpleExtLink @@ -1342,8 +1346,9 @@ link_id=4 weight=1 [system.ruby.network.topology.ext_links4.int_node] -type=BasicRouter +type=Switch router_id=4 +virt_nets=10 [system.ruby.network.topology.int_links0] type=SimpleIntLink @@ -1356,8 +1361,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=5 +virt_nets=10 [system.ruby.network.topology.int_links1] type=SimpleIntLink 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 diff --git a/tests/quick/se/00.hello/ref/alpha/tru64/o3-timing/config.ini b/tests/quick/se/00.hello/ref/alpha/tru64/o3-timing/config.ini index 0de3d5fa0..35d1c924c 100644 --- a/tests/quick/se/00.hello/ref/alpha/tru64/o3-timing/config.ini +++ b/tests/quick/se/00.hello/ref/alpha/tru64/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/tru64/hello +executable=tests/test-progs/hello/bin/alpha/tru64/hello gid=100 input=cin max_stack_size=67108864 @@ -512,13 +518,14 @@ clock=1000 header_cycles=1 use_default_range=false width=8 -master=system.physmem.port[0] +master=system.physmem.port 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/tru64/simple-atomic/config.ini b/tests/quick/se/00.hello/ref/alpha/tru64/simple-atomic/config.ini index 198cad098..325eb7b2e 100644 --- a/tests/quick/se/00.hello/ref/alpha/tru64/simple-atomic/config.ini +++ b/tests/quick/se/00.hello/ref/alpha/tru64/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/tru64/hello +executable=tests/test-progs/hello/bin/alpha/tru64/hello gid=100 input=cin max_stack_size=67108864 @@ -99,14 +99,15 @@ block_size=64 clock=1000 header_cycles=1 use_default_range=false -width=64 -master=system.physmem.port[0] +width=8 +master=system.physmem.port 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/tru64/simple-timing-ruby-MESI_CMP_directory/config.ini b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_CMP_directory/config.ini index ae9a50a52..0b5dc966b 100644 --- a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_CMP_directory/config.ini +++ b/tests/quick/se/00.hello/ref/alpha/tru64/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/tru64/simple-timing-ruby-MOESI_CMP_directory/config.ini b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_directory/config.ini index 2e8369b1e..b8d188e49 100644 --- a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_directory/config.ini +++ b/tests/quick/se/00.hello/ref/alpha/tru64/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/tru64/simple-timing-ruby-MOESI_CMP_token/config.ini b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_token/config.ini index c24d0aba6..a59221a59 100644 --- a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_token/config.ini +++ b/tests/quick/se/00.hello/ref/alpha/tru64/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/tru64/simple-timing-ruby-MOESI_hammer/config.ini b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_hammer/config.ini index 4e9dec81e..b4847a744 100644 --- a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_hammer/config.ini +++ b/tests/quick/se/00.hello/ref/alpha/tru64/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/tru64/simple-timing-ruby/config.ini b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby/config.ini index fc347ac18..c527a672b 100644 --- a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby/config.ini +++ b/tests/quick/se/00.hello/ref/alpha/tru64/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/tru64/simple-timing/config.ini b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing/config.ini index b94afa836..03e65dd55 100644 --- a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing/config.ini +++ b/tests/quick/se/00.hello/ref/alpha/tru64/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/tru64/hello +executable=tests/test-progs/hello/bin/alpha/tru64/hello gid=100 input=cin max_stack_size=67108864 @@ -181,13 +187,14 @@ clock=1000 header_cycles=1 use_default_range=false width=8 -master=system.physmem.port[0] +master=system.physmem.port 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/mips/linux/inorder-timing/config.ini b/tests/quick/se/00.hello/ref/mips/linux/inorder-timing/config.ini index 877f80a3c..a81f3fb10 100644 --- a/tests/quick/se/00.hello/ref/mips/linux/inorder-timing/config.ini +++ b/tests/quick/se/00.hello/ref/mips/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/mips/linux/hello +executable=tests/test-progs/hello/bin/mips/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/mips/linux/o3-timing/config.ini b/tests/quick/se/00.hello/ref/mips/linux/o3-timing/config.ini index 332318216..453ce4d95 100644 --- a/tests/quick/se/00.hello/ref/mips/linux/o3-timing/config.ini +++ b/tests/quick/se/00.hello/ref/mips/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/mips/linux/hello +executable=tests/test-progs/hello/bin/mips/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/mips/linux/simple-atomic/config.ini b/tests/quick/se/00.hello/ref/mips/linux/simple-atomic/config.ini index f99a49f5d..f3b5a12e3 100644 --- a/tests/quick/se/00.hello/ref/mips/linux/simple-atomic/config.ini +++ b/tests/quick/se/00.hello/ref/mips/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/mips/linux/hello +executable=tests/test-progs/hello/bin/mips/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/mips/linux/simple-timing-ruby/config.ini b/tests/quick/se/00.hello/ref/mips/linux/simple-timing-ruby/config.ini index 6ebb273d9..10ce5543f 100644 --- a/tests/quick/se/00.hello/ref/mips/linux/simple-timing-ruby/config.ini +++ b/tests/quick/se/00.hello/ref/mips/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/mips/linux/simple-timing/config.ini b/tests/quick/se/00.hello/ref/mips/linux/simple-timing/config.ini index 67b7a624d..5e0921373 100644 --- a/tests/quick/se/00.hello/ref/mips/linux/simple-timing/config.ini +++ b/tests/quick/se/00.hello/ref/mips/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/mips/linux/hello +executable=tests/test-progs/hello/bin/mips/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 diff --git a/tests/quick/se/00.hello/ref/power/linux/o3-timing/config.ini b/tests/quick/se/00.hello/ref/power/linux/o3-timing/config.ini index 0b8702da2..7e4ac0c88 100644 --- a/tests/quick/se/00.hello/ref/power/linux/o3-timing/config.ini +++ b/tests/quick/se/00.hello/ref/power/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 @@ -96,7 +97,6 @@ numPhysIntRegs=256 numROBEntries=192 numRobs=1 numThreads=1 -phase=0 predType=tournament profile=0 progress_interval=0 @@ -130,16 +130,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 @@ -422,16 +424,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 @@ -454,16 +458,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 @@ -495,7 +501,7 @@ egid=100 env= errout=cerr euid=100 -executable=/dist/m5/regression/test-progs/hello/bin/power/linux/hello +executable=tests/test-progs/hello/bin/power/linux/hello gid=100 input=cin max_stack_size=67108864 @@ -518,8 +524,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/power/linux/simple-atomic/config.ini b/tests/quick/se/00.hello/ref/power/linux/simple-atomic/config.ini index 4d595ae50..85e19f079 100644 --- a/tests/quick/se/00.hello/ref/power/linux/simple-atomic/config.ini +++ b/tests/quick/se/00.hello/ref/power/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 @@ -49,7 +50,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 @@ -83,7 +83,7 @@ egid=100 env= errout=cerr euid=100 -executable=/dist/m5/regression/test-progs/hello/bin/power/linux/hello +executable=tests/test-progs/hello/bin/power/linux/hello gid=100 input=cin max_stack_size=67108864 @@ -106,8 +106,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/sparc/linux/inorder-timing/config.ini b/tests/quick/se/00.hello/ref/sparc/linux/inorder-timing/config.ini index 9d387b483..2fea3a81f 100644 --- a/tests/quick/se/00.hello/ref/sparc/linux/inorder-timing/config.ini +++ b/tests/quick/se/00.hello/ref/sparc/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/sparc/linux/hello +executable=tests/test-progs/hello/bin/sparc/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/sparc/linux/simple-atomic/config.ini b/tests/quick/se/00.hello/ref/sparc/linux/simple-atomic/config.ini index 69d80e31f..a6a41648e 100644 --- a/tests/quick/se/00.hello/ref/sparc/linux/simple-atomic/config.ini +++ b/tests/quick/se/00.hello/ref/sparc/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/sparc/linux/hello +executable=tests/test-progs/hello/bin/sparc/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/sparc/linux/simple-timing-ruby/config.ini b/tests/quick/se/00.hello/ref/sparc/linux/simple-timing-ruby/config.ini index de3d8b56f..61c642df2 100644 --- a/tests/quick/se/00.hello/ref/sparc/linux/simple-timing-ruby/config.ini +++ b/tests/quick/se/00.hello/ref/sparc/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/sparc/linux/simple-timing/config.ini b/tests/quick/se/00.hello/ref/sparc/linux/simple-timing/config.ini index 62c147fd5..135ea172c 100644 --- a/tests/quick/se/00.hello/ref/sparc/linux/simple-timing/config.ini +++ b/tests/quick/se/00.hello/ref/sparc/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/sparc/linux/hello +executable=tests/test-progs/hello/bin/sparc/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 diff --git a/tests/quick/se/00.hello/ref/x86/linux/o3-timing/config.ini b/tests/quick/se/00.hello/ref/x86/linux/o3-timing/config.ini index 6978d28ee..98b722b0c 100644 --- a/tests/quick/se/00.hello/ref/x86/linux/o3-timing/config.ini +++ b/tests/quick/se/00.hello/ref/x86/linux/o3-timing/config.ini @@ -132,14 +132,15 @@ 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 @@ -433,14 +434,15 @@ 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 @@ -482,14 +484,15 @@ 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 @@ -544,9 +547,9 @@ slave=system.system_port system.cpu.l2cache.mem_side system.cpu.interrupts.int_m [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/x86/linux/simple-timing-ruby/config.ini b/tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/config.ini index 8e358d7bf..d97af8c71 100644 --- a/tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/config.ini +++ b/tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/config.ini @@ -207,9 +207,9 @@ slave=system.cpu.icache_port system.cpu.dcache_port system.cpu.itb.walker.port s [system.physmem] type=SimpleMemory +bandwidth=0.000000 clock=1 conf_table_reported=false -file= in_addr_map=true latency=30 latency_var=0 @@ -259,8 +259,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 @@ -273,8 +274,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 @@ -287,8 +289,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/x86/linux/simple-timing/config.ini b/tests/quick/se/00.hello/ref/x86/linux/simple-timing/config.ini index e0483161d..45681eb64 100644 --- a/tests/quick/se/00.hello/ref/x86/linux/simple-timing/config.ini +++ b/tests/quick/se/00.hello/ref/x86/linux/simple-timing/config.ini @@ -64,14 +64,15 @@ 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 @@ -102,14 +103,15 @@ 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 @@ -151,14 +153,15 @@ 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 @@ -213,9 +216,9 @@ slave=system.system_port system.cpu.l2cache.mem_side system.cpu.interrupts.int_m [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/01.hello-2T-smt/ref/alpha/linux/o3-timing/config.ini b/tests/quick/se/01.hello-2T-smt/ref/alpha/linux/o3-timing/config.ini index c8fd94639..358d71402 100644 --- a/tests/quick/se/01.hello-2T-smt/ref/alpha/linux/o3-timing/config.ini +++ b/tests/quick/se/01.hello-2T-smt/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=2 -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 @@ -513,7 +519,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 @@ -536,8 +542,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/02.insttest/ref/sparc/linux/inorder-timing/config.ini b/tests/quick/se/02.insttest/ref/sparc/linux/inorder-timing/config.ini index 122f72766..ddb8a4949 100644 --- a/tests/quick/se/02.insttest/ref/sparc/linux/inorder-timing/config.ini +++ b/tests/quick/se/02.insttest/ref/sparc/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/insttest/bin/sparc/linux/insttest +executable=tests/test-progs/insttest/bin/sparc/linux/insttest 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/02.insttest/ref/sparc/linux/o3-timing/config.ini b/tests/quick/se/02.insttest/ref/sparc/linux/o3-timing/config.ini index c2f5f7c25..d68715156 100644 --- a/tests/quick/se/02.insttest/ref/sparc/linux/o3-timing/config.ini +++ b/tests/quick/se/02.insttest/ref/sparc/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/insttest/bin/sparc/linux/insttest +executable=tests/test-progs/insttest/bin/sparc/linux/insttest 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/02.insttest/ref/sparc/linux/simple-atomic/config.ini b/tests/quick/se/02.insttest/ref/sparc/linux/simple-atomic/config.ini index 2d696d139..8143784d6 100644 --- a/tests/quick/se/02.insttest/ref/sparc/linux/simple-atomic/config.ini +++ b/tests/quick/se/02.insttest/ref/sparc/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/insttest/bin/sparc/linux/insttest +executable=tests/test-progs/insttest/bin/sparc/linux/insttest 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/02.insttest/ref/sparc/linux/simple-timing/config.ini b/tests/quick/se/02.insttest/ref/sparc/linux/simple-timing/config.ini index a7594cb67..cd98523de 100644 --- a/tests/quick/se/02.insttest/ref/sparc/linux/simple-timing/config.ini +++ b/tests/quick/se/02.insttest/ref/sparc/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/insttest/bin/sparc/linux/insttest +executable=tests/test-progs/insttest/bin/sparc/linux/insttest 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 diff --git a/tests/quick/se/40.m5threads-test-atomic/ref/sparc/linux/o3-timing-mp/config.ini b/tests/quick/se/40.m5threads-test-atomic/ref/sparc/linux/o3-timing-mp/config.ini index 8f654c19e..07b9bbe53 100644 --- a/tests/quick/se/40.m5threads-test-atomic/ref/sparc/linux/o3-timing-mp/config.ini +++ b/tests/quick/se/40.m5threads-test-atomic/ref/sparc/linux/o3-timing-mp/config.ini @@ -10,6 +10,7 @@ time_sync_spin_threshold=100000000 type=System children=cpu0 cpu1 cpu2 cpu3 l2c membus physmem toL2Bus 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=4 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=4 prefetch_on_access=false prefetcher=Null prioritizeRequests=false repl=Null +response_latency=1000 size=32768 subblock_size=0 system=system @@ -421,16 +423,18 @@ type=BaseCache addr_ranges=0:18446744073709551615 assoc=1 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=4 prefetch_on_access=false prefetcher=Null prioritizeRequests=false repl=Null +response_latency=1000 size=32768 subblock_size=0 system=system @@ -459,7 +463,7 @@ egid=100 env= errout=cerr euid=100 -executable=/dist/m5/regression/test-progs/m5threads/bin/sparc/linux/test_atomic +executable=tests/test-progs/m5threads/bin/sparc/linux/test_atomic gid=100 input=cin max_stack_size=67108864 @@ -538,7 +542,6 @@ numPhysIntRegs=256 numROBEntries=192 numRobs=1 numThreads=1 -phase=0 predType=tournament profile=0 progress_interval=0 @@ -572,16 +575,18 @@ type=BaseCache addr_ranges=0:18446744073709551615 assoc=4 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=4 prefetch_on_access=false prefetcher=Null prioritizeRequests=false repl=Null +response_latency=1000 size=32768 subblock_size=0 system=system @@ -864,16 +869,18 @@ type=BaseCache addr_ranges=0:18446744073709551615 assoc=1 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=4 prefetch_on_access=false prefetcher=Null prioritizeRequests=false repl=Null +response_latency=1000 size=32768 subblock_size=0 system=system @@ -962,7 +969,6 @@ numPhysIntRegs=256 numROBEntries=192 numRobs=1 numThreads=1 -phase=0 predType=tournament profile=0 progress_interval=0 @@ -996,16 +1002,18 @@ type=BaseCache addr_ranges=0:18446744073709551615 assoc=4 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=4 prefetch_on_access=false prefetcher=Null prioritizeRequests=false repl=Null +response_latency=1000 size=32768 subblock_size=0 system=system @@ -1288,16 +1296,18 @@ type=BaseCache addr_ranges=0:18446744073709551615 assoc=1 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=4 prefetch_on_access=false prefetcher=Null prioritizeRequests=false repl=Null +response_latency=1000 size=32768 subblock_size=0 system=system @@ -1386,7 +1396,6 @@ numPhysIntRegs=256 numROBEntries=192 numRobs=1 numThreads=1 -phase=0 predType=tournament profile=0 progress_interval=0 @@ -1420,16 +1429,18 @@ type=BaseCache addr_ranges=0:18446744073709551615 assoc=4 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=4 prefetch_on_access=false prefetcher=Null prioritizeRequests=false repl=Null +response_latency=1000 size=32768 subblock_size=0 system=system @@ -1712,16 +1723,18 @@ type=BaseCache addr_ranges=0:18446744073709551615 assoc=1 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=4 prefetch_on_access=false prefetcher=Null prioritizeRequests=false repl=Null +response_latency=1000 size=32768 subblock_size=0 system=system @@ -1747,16 +1760,18 @@ type=BaseCache addr_ranges=0:18446744073709551615 assoc=8 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=92 prefetch_on_access=false prefetcher=Null prioritizeRequests=false repl=Null +response_latency=10000 size=4194304 subblock_size=0 system=system @@ -1779,8 +1794,9 @@ slave=system.l2c.mem_side system.system_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/40.m5threads-test-atomic/ref/sparc/linux/simple-atomic-mp/config.ini b/tests/quick/se/40.m5threads-test-atomic/ref/sparc/linux/simple-atomic-mp/config.ini index 85ad1df6b..980beb479 100644 --- a/tests/quick/se/40.m5threads-test-atomic/ref/sparc/linux/simple-atomic-mp/config.ini +++ b/tests/quick/se/40.m5threads-test-atomic/ref/sparc/linux/simple-atomic-mp/config.ini @@ -10,6 +10,7 @@ time_sync_spin_threshold=100000000 type=System children=cpu0 cpu1 cpu2 cpu3 l2c membus physmem toL2Bus 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 @@ -65,16 +65,18 @@ type=BaseCache addr_ranges=0:18446744073709551615 assoc=4 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=4 prefetch_on_access=false prefetcher=Null prioritizeRequests=false repl=Null +response_latency=1000 size=32768 subblock_size=0 system=system @@ -94,16 +96,18 @@ type=BaseCache addr_ranges=0:18446744073709551615 assoc=1 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=4 prefetch_on_access=false prefetcher=Null prioritizeRequests=false repl=Null +response_latency=1000 size=32768 subblock_size=0 system=system @@ -132,7 +136,7 @@ egid=100 env= errout=cerr euid=100 -executable=/dist/m5/regression/test-progs/m5threads/bin/sparc/linux/test_atomic +executable=tests/test-progs/m5threads/bin/sparc/linux/test_atomic gid=100 input=cin max_stack_size=67108864 @@ -164,7 +168,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 @@ -181,16 +184,18 @@ type=BaseCache addr_ranges=0:18446744073709551615 assoc=4 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=4 prefetch_on_access=false prefetcher=Null prioritizeRequests=false repl=Null +response_latency=1000 size=32768 subblock_size=0 system=system @@ -210,16 +215,18 @@ type=BaseCache addr_ranges=0:18446744073709551615 assoc=1 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=4 prefetch_on_access=false prefetcher=Null prioritizeRequests=false repl=Null +response_latency=1000 size=32768 subblock_size=0 system=system @@ -261,7 +268,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 @@ -278,16 +284,18 @@ type=BaseCache addr_ranges=0:18446744073709551615 assoc=4 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=4 prefetch_on_access=false prefetcher=Null prioritizeRequests=false repl=Null +response_latency=1000 size=32768 subblock_size=0 system=system @@ -307,16 +315,18 @@ type=BaseCache addr_ranges=0:18446744073709551615 assoc=1 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=4 prefetch_on_access=false prefetcher=Null prioritizeRequests=false repl=Null +response_latency=1000 size=32768 subblock_size=0 system=system @@ -358,7 +368,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 @@ -375,16 +384,18 @@ type=BaseCache addr_ranges=0:18446744073709551615 assoc=4 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=4 prefetch_on_access=false prefetcher=Null prioritizeRequests=false repl=Null +response_latency=1000 size=32768 subblock_size=0 system=system @@ -404,16 +415,18 @@ type=BaseCache addr_ranges=0:18446744073709551615 assoc=1 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=4 prefetch_on_access=false prefetcher=Null prioritizeRequests=false repl=Null +response_latency=1000 size=32768 subblock_size=0 system=system @@ -439,16 +452,18 @@ type=BaseCache addr_ranges=0:18446744073709551615 assoc=8 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=92 prefetch_on_access=false prefetcher=Null prioritizeRequests=false repl=Null +response_latency=10000 size=4194304 subblock_size=0 system=system @@ -471,8 +486,9 @@ slave=system.l2c.mem_side system.system_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/40.m5threads-test-atomic/ref/sparc/linux/simple-timing-mp/config.ini b/tests/quick/se/40.m5threads-test-atomic/ref/sparc/linux/simple-timing-mp/config.ini index 636fc646c..c224b90ec 100644 --- a/tests/quick/se/40.m5threads-test-atomic/ref/sparc/linux/simple-timing-mp/config.ini +++ b/tests/quick/se/40.m5threads-test-atomic/ref/sparc/linux/simple-timing-mp/config.ini @@ -10,6 +10,7 @@ time_sync_spin_threshold=100000000 type=System children=cpu0 cpu1 cpu2 cpu3 l2c membus physmem toL2Bus 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=4 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=4 prefetch_on_access=false prefetcher=Null prioritizeRequests=false repl=Null +response_latency=1000 size=32768 subblock_size=0 system=system @@ -90,16 +92,18 @@ type=BaseCache addr_ranges=0:18446744073709551615 assoc=1 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=4 prefetch_on_access=false prefetcher=Null prioritizeRequests=false repl=Null +response_latency=1000 size=32768 subblock_size=0 system=system @@ -128,7 +132,7 @@ egid=100 env= errout=cerr euid=100 -executable=/dist/m5/regression/test-progs/m5threads/bin/sparc/linux/test_atomic +executable=tests/test-progs/m5threads/bin/sparc/linux/test_atomic gid=100 input=cin max_stack_size=67108864 @@ -159,7 +163,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 @@ -173,16 +176,18 @@ type=BaseCache addr_ranges=0:18446744073709551615 assoc=4 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=4 prefetch_on_access=false prefetcher=Null prioritizeRequests=false repl=Null +response_latency=1000 size=32768 subblock_size=0 system=system @@ -202,16 +207,18 @@ type=BaseCache addr_ranges=0:18446744073709551615 assoc=1 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=4 prefetch_on_access=false prefetcher=Null prioritizeRequests=false repl=Null +response_latency=1000 size=32768 subblock_size=0 system=system @@ -252,7 +259,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 @@ -266,16 +272,18 @@ type=BaseCache addr_ranges=0:18446744073709551615 assoc=4 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=4 prefetch_on_access=false prefetcher=Null prioritizeRequests=false repl=Null +response_latency=1000 size=32768 subblock_size=0 system=system @@ -295,16 +303,18 @@ type=BaseCache addr_ranges=0:18446744073709551615 assoc=1 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=4 prefetch_on_access=false prefetcher=Null prioritizeRequests=false repl=Null +response_latency=1000 size=32768 subblock_size=0 system=system @@ -345,7 +355,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 @@ -359,16 +368,18 @@ type=BaseCache addr_ranges=0:18446744073709551615 assoc=4 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=4 prefetch_on_access=false prefetcher=Null prioritizeRequests=false repl=Null +response_latency=1000 size=32768 subblock_size=0 system=system @@ -388,16 +399,18 @@ type=BaseCache addr_ranges=0:18446744073709551615 assoc=1 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=4 prefetch_on_access=false prefetcher=Null prioritizeRequests=false repl=Null +response_latency=1000 size=32768 subblock_size=0 system=system @@ -423,16 +436,18 @@ type=BaseCache addr_ranges=0:18446744073709551615 assoc=8 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=92 prefetch_on_access=false prefetcher=Null prioritizeRequests=false repl=Null +response_latency=10000 size=4194304 subblock_size=0 system=system @@ -455,8 +470,9 @@ slave=system.l2c.mem_side system.system_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/50.memtest/ref/alpha/linux/memtest-ruby-MESI_CMP_directory/config.ini b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_CMP_directory/config.ini index 93b40e746..a34dc2d81 100644 --- a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_CMP_directory/config.ini +++ b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_CMP_directory/config.ini @@ -237,9 +237,9 @@ slave=system.cpu0.functional system.cpu1.functional system.cpu2.functional syste [system.funcmem] type=SimpleMemory +bandwidth=0.000000 clock=1 conf_table_reported=false -file= in_addr_map=false latency=30 latency_var=0 @@ -791,9 +791,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 @@ -843,8 +843,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 @@ -857,8 +858,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 @@ -871,8 +873,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.ext_links3] type=SimpleExtLink @@ -885,8 +888,9 @@ link_id=3 weight=1 [system.ruby.network.topology.ext_links3.int_node] -type=BasicRouter +type=Switch router_id=3 +virt_nets=10 [system.ruby.network.topology.ext_links4] type=SimpleExtLink @@ -899,8 +903,9 @@ link_id=4 weight=1 [system.ruby.network.topology.ext_links4.int_node] -type=BasicRouter +type=Switch router_id=4 +virt_nets=10 [system.ruby.network.topology.ext_links5] type=SimpleExtLink @@ -913,8 +918,9 @@ link_id=5 weight=1 [system.ruby.network.topology.ext_links5.int_node] -type=BasicRouter +type=Switch router_id=5 +virt_nets=10 [system.ruby.network.topology.ext_links6] type=SimpleExtLink @@ -927,8 +933,9 @@ link_id=6 weight=1 [system.ruby.network.topology.ext_links6.int_node] -type=BasicRouter +type=Switch router_id=6 +virt_nets=10 [system.ruby.network.topology.ext_links7] type=SimpleExtLink @@ -941,8 +948,9 @@ link_id=7 weight=1 [system.ruby.network.topology.ext_links7.int_node] -type=BasicRouter +type=Switch router_id=7 +virt_nets=10 [system.ruby.network.topology.ext_links8] type=SimpleExtLink @@ -955,8 +963,9 @@ link_id=8 weight=1 [system.ruby.network.topology.ext_links8.int_node] -type=BasicRouter +type=Switch router_id=8 +virt_nets=10 [system.ruby.network.topology.ext_links9] type=SimpleExtLink @@ -969,8 +978,9 @@ link_id=9 weight=1 [system.ruby.network.topology.ext_links9.int_node] -type=BasicRouter +type=Switch router_id=9 +virt_nets=10 [system.ruby.network.topology.int_links0] type=SimpleIntLink @@ -983,8 +993,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=10 +virt_nets=10 [system.ruby.network.topology.int_links1] type=SimpleIntLink diff --git a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_directory/config.ini b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_directory/config.ini index 42b10fe12..fd8f9a616 100644 --- a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_directory/config.ini +++ b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_directory/config.ini @@ -236,9 +236,9 @@ slave=system.cpu0.functional system.cpu1.functional system.cpu2.functional syste [system.funcmem] type=SimpleMemory +bandwidth=0.000000 clock=1 conf_table_reported=false -file= in_addr_map=false latency=30 latency_var=0 @@ -773,9 +773,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 @@ -825,8 +825,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 @@ -839,8 +840,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 @@ -853,8 +855,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.ext_links3] type=SimpleExtLink @@ -867,8 +870,9 @@ link_id=3 weight=1 [system.ruby.network.topology.ext_links3.int_node] -type=BasicRouter +type=Switch router_id=3 +virt_nets=10 [system.ruby.network.topology.ext_links4] type=SimpleExtLink @@ -881,8 +885,9 @@ link_id=4 weight=1 [system.ruby.network.topology.ext_links4.int_node] -type=BasicRouter +type=Switch router_id=4 +virt_nets=10 [system.ruby.network.topology.ext_links5] type=SimpleExtLink @@ -895,8 +900,9 @@ link_id=5 weight=1 [system.ruby.network.topology.ext_links5.int_node] -type=BasicRouter +type=Switch router_id=5 +virt_nets=10 [system.ruby.network.topology.ext_links6] type=SimpleExtLink @@ -909,8 +915,9 @@ link_id=6 weight=1 [system.ruby.network.topology.ext_links6.int_node] -type=BasicRouter +type=Switch router_id=6 +virt_nets=10 [system.ruby.network.topology.ext_links7] type=SimpleExtLink @@ -923,8 +930,9 @@ link_id=7 weight=1 [system.ruby.network.topology.ext_links7.int_node] -type=BasicRouter +type=Switch router_id=7 +virt_nets=10 [system.ruby.network.topology.ext_links8] type=SimpleExtLink @@ -937,8 +945,9 @@ link_id=8 weight=1 [system.ruby.network.topology.ext_links8.int_node] -type=BasicRouter +type=Switch router_id=8 +virt_nets=10 [system.ruby.network.topology.ext_links9] type=SimpleExtLink @@ -951,8 +960,9 @@ link_id=9 weight=1 [system.ruby.network.topology.ext_links9.int_node] -type=BasicRouter +type=Switch router_id=9 +virt_nets=10 [system.ruby.network.topology.int_links0] type=SimpleIntLink @@ -965,8 +975,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=10 +virt_nets=10 [system.ruby.network.topology.int_links1] type=SimpleIntLink diff --git a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_token/config.ini b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_token/config.ini index b7ddefe55..cf4014ca2 100644 --- a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_token/config.ini +++ b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_token/config.ini @@ -239,9 +239,9 @@ slave=system.cpu0.functional system.cpu1.functional system.cpu2.functional syste [system.funcmem] type=SimpleMemory +bandwidth=0.000000 clock=1 conf_table_reported=false -file= in_addr_map=false latency=30 latency_var=0 @@ -826,9 +826,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 @@ -878,8 +878,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 @@ -892,8 +893,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 @@ -906,8 +908,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.ext_links3] type=SimpleExtLink @@ -920,8 +923,9 @@ link_id=3 weight=1 [system.ruby.network.topology.ext_links3.int_node] -type=BasicRouter +type=Switch router_id=3 +virt_nets=10 [system.ruby.network.topology.ext_links4] type=SimpleExtLink @@ -934,8 +938,9 @@ link_id=4 weight=1 [system.ruby.network.topology.ext_links4.int_node] -type=BasicRouter +type=Switch router_id=4 +virt_nets=10 [system.ruby.network.topology.ext_links5] type=SimpleExtLink @@ -948,8 +953,9 @@ link_id=5 weight=1 [system.ruby.network.topology.ext_links5.int_node] -type=BasicRouter +type=Switch router_id=5 +virt_nets=10 [system.ruby.network.topology.ext_links6] type=SimpleExtLink @@ -962,8 +968,9 @@ link_id=6 weight=1 [system.ruby.network.topology.ext_links6.int_node] -type=BasicRouter +type=Switch router_id=6 +virt_nets=10 [system.ruby.network.topology.ext_links7] type=SimpleExtLink @@ -976,8 +983,9 @@ link_id=7 weight=1 [system.ruby.network.topology.ext_links7.int_node] -type=BasicRouter +type=Switch router_id=7 +virt_nets=10 [system.ruby.network.topology.ext_links8] type=SimpleExtLink @@ -990,8 +998,9 @@ link_id=8 weight=1 [system.ruby.network.topology.ext_links8.int_node] -type=BasicRouter +type=Switch router_id=8 +virt_nets=10 [system.ruby.network.topology.ext_links9] type=SimpleExtLink @@ -1004,8 +1013,9 @@ link_id=9 weight=1 [system.ruby.network.topology.ext_links9.int_node] -type=BasicRouter +type=Switch router_id=9 +virt_nets=10 [system.ruby.network.topology.int_links0] type=SimpleIntLink @@ -1018,8 +1028,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=10 +virt_nets=10 [system.ruby.network.topology.int_links1] type=SimpleIntLink diff --git a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/config.ini b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/config.ini index d06198c0e..2c0f889dc 100644 --- a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/config.ini +++ b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/config.ini @@ -253,9 +253,9 @@ slave=system.cpu0.functional system.cpu1.functional system.cpu2.functional syste [system.funcmem] type=SimpleMemory +bandwidth=0.000000 clock=1 conf_table_reported=false -file= in_addr_map=false latency=30 latency_var=0 @@ -898,9 +898,9 @@ slave=system.cpu7.test [system.physmem] type=SimpleMemory +bandwidth=0.000000 clock=1 conf_table_reported=false -file= in_addr_map=true latency=30 latency_var=0 @@ -950,8 +950,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 @@ -964,8 +965,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 @@ -978,8 +980,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.ext_links3] type=SimpleExtLink @@ -992,8 +995,9 @@ link_id=3 weight=1 [system.ruby.network.topology.ext_links3.int_node] -type=BasicRouter +type=Switch router_id=3 +virt_nets=10 [system.ruby.network.topology.ext_links4] type=SimpleExtLink @@ -1006,8 +1010,9 @@ link_id=4 weight=1 [system.ruby.network.topology.ext_links4.int_node] -type=BasicRouter +type=Switch router_id=4 +virt_nets=10 [system.ruby.network.topology.ext_links5] type=SimpleExtLink @@ -1020,8 +1025,9 @@ link_id=5 weight=1 [system.ruby.network.topology.ext_links5.int_node] -type=BasicRouter +type=Switch router_id=5 +virt_nets=10 [system.ruby.network.topology.ext_links6] type=SimpleExtLink @@ -1034,8 +1040,9 @@ link_id=6 weight=1 [system.ruby.network.topology.ext_links6.int_node] -type=BasicRouter +type=Switch router_id=6 +virt_nets=10 [system.ruby.network.topology.ext_links7] type=SimpleExtLink @@ -1048,8 +1055,9 @@ link_id=7 weight=1 [system.ruby.network.topology.ext_links7.int_node] -type=BasicRouter +type=Switch router_id=7 +virt_nets=10 [system.ruby.network.topology.ext_links8] type=SimpleExtLink @@ -1062,8 +1070,9 @@ link_id=8 weight=1 [system.ruby.network.topology.ext_links8.int_node] -type=BasicRouter +type=Switch router_id=8 +virt_nets=10 [system.ruby.network.topology.int_links0] type=SimpleIntLink @@ -1076,8 +1085,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=9 +virt_nets=10 [system.ruby.network.topology.int_links1] type=SimpleIntLink diff --git a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby/config.ini b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby/config.ini index 9db3e21d1..cb8e1b733 100644 --- a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby/config.ini +++ b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby/config.ini @@ -236,9 +236,9 @@ slave=system.cpu0.functional system.cpu1.functional system.cpu2.functional syste [system.funcmem] type=SimpleMemory +bandwidth=0.000000 clock=1 conf_table_reported=false -file= in_addr_map=false latency=30 latency_var=0 @@ -625,9 +625,9 @@ slave=system.cpu7.test [system.physmem] type=SimpleMemory +bandwidth=0.000000 clock=1 conf_table_reported=false -file= in_addr_map=true latency=30 latency_var=0 @@ -677,8 +677,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 @@ -691,8 +692,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 @@ -705,8 +707,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.ext_links3] type=SimpleExtLink @@ -719,8 +722,9 @@ link_id=3 weight=1 [system.ruby.network.topology.ext_links3.int_node] -type=BasicRouter +type=Switch router_id=3 +virt_nets=10 [system.ruby.network.topology.ext_links4] type=SimpleExtLink @@ -733,8 +737,9 @@ link_id=4 weight=1 [system.ruby.network.topology.ext_links4.int_node] -type=BasicRouter +type=Switch router_id=4 +virt_nets=10 [system.ruby.network.topology.ext_links5] type=SimpleExtLink @@ -747,8 +752,9 @@ link_id=5 weight=1 [system.ruby.network.topology.ext_links5.int_node] -type=BasicRouter +type=Switch router_id=5 +virt_nets=10 [system.ruby.network.topology.ext_links6] type=SimpleExtLink @@ -761,8 +767,9 @@ link_id=6 weight=1 [system.ruby.network.topology.ext_links6.int_node] -type=BasicRouter +type=Switch router_id=6 +virt_nets=10 [system.ruby.network.topology.ext_links7] type=SimpleExtLink @@ -775,8 +782,9 @@ link_id=7 weight=1 [system.ruby.network.topology.ext_links7.int_node] -type=BasicRouter +type=Switch router_id=7 +virt_nets=10 [system.ruby.network.topology.ext_links8] type=SimpleExtLink @@ -789,8 +797,9 @@ link_id=8 weight=1 [system.ruby.network.topology.ext_links8.int_node] -type=BasicRouter +type=Switch router_id=8 +virt_nets=10 [system.ruby.network.topology.int_links0] type=SimpleIntLink @@ -803,8 +812,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=9 +virt_nets=10 [system.ruby.network.topology.int_links1] type=SimpleIntLink diff --git a/tests/quick/se/50.memtest/ref/alpha/linux/memtest/config.ini b/tests/quick/se/50.memtest/ref/alpha/linux/memtest/config.ini index db9f08590..a24f176d8 100644 --- a/tests/quick/se/50.memtest/ref/alpha/linux/memtest/config.ini +++ b/tests/quick/se/50.memtest/ref/alpha/linux/memtest/config.ini @@ -8,8 +8,9 @@ time_sync_spin_threshold=100000000 [system] type=System -children=cpu0 cpu1 cpu2 cpu3 cpu4 cpu5 cpu6 cpu7 funcmem l2c membus physmem toL2Bus +children=cpu0 cpu1 cpu2 cpu3 cpu4 cpu5 cpu6 cpu7 funcbus funcmem l2c membus physmem toL2Bus boot_osflags=a +clock=1 init_param=0 kernel= load_addr_mask=1099511627775 @@ -31,6 +32,7 @@ system_port=system.membus.slave[1] type=MemTest children=l1c atomic=false +clock=1 issue_dmas=false max_loads=100000 memory_size=65536 @@ -43,7 +45,7 @@ progress_interval=10000 suppress_func_warnings=false sys=system trace_addr=0 -functional=system.funcmem.port[0] +functional=system.funcbus.slave[0] test=system.cpu0.l1c.cpu_side [system.cpu0.l1c] @@ -51,16 +53,18 @@ type=BaseCache addr_ranges=0:18446744073709551615 assoc=4 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=12 prefetch_on_access=false prefetcher=Null prioritizeRequests=false repl=Null +response_latency=1000 size=32768 subblock_size=0 system=system @@ -75,6 +79,7 @@ mem_side=system.toL2Bus.slave[0] type=MemTest children=l1c atomic=false +clock=1 issue_dmas=false max_loads=100000 memory_size=65536 @@ -87,7 +92,7 @@ progress_interval=10000 suppress_func_warnings=false sys=system trace_addr=0 -functional=system.funcmem.port[1] +functional=system.funcbus.slave[1] test=system.cpu1.l1c.cpu_side [system.cpu1.l1c] @@ -95,16 +100,18 @@ type=BaseCache addr_ranges=0:18446744073709551615 assoc=4 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=12 prefetch_on_access=false prefetcher=Null prioritizeRequests=false repl=Null +response_latency=1000 size=32768 subblock_size=0 system=system @@ -119,6 +126,7 @@ mem_side=system.toL2Bus.slave[1] type=MemTest children=l1c atomic=false +clock=1 issue_dmas=false max_loads=100000 memory_size=65536 @@ -131,7 +139,7 @@ progress_interval=10000 suppress_func_warnings=false sys=system trace_addr=0 -functional=system.funcmem.port[2] +functional=system.funcbus.slave[2] test=system.cpu2.l1c.cpu_side [system.cpu2.l1c] @@ -139,16 +147,18 @@ type=BaseCache addr_ranges=0:18446744073709551615 assoc=4 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=12 prefetch_on_access=false prefetcher=Null prioritizeRequests=false repl=Null +response_latency=1000 size=32768 subblock_size=0 system=system @@ -163,6 +173,7 @@ mem_side=system.toL2Bus.slave[2] type=MemTest children=l1c atomic=false +clock=1 issue_dmas=false max_loads=100000 memory_size=65536 @@ -175,7 +186,7 @@ progress_interval=10000 suppress_func_warnings=false sys=system trace_addr=0 -functional=system.funcmem.port[3] +functional=system.funcbus.slave[3] test=system.cpu3.l1c.cpu_side [system.cpu3.l1c] @@ -183,16 +194,18 @@ type=BaseCache addr_ranges=0:18446744073709551615 assoc=4 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=12 prefetch_on_access=false prefetcher=Null prioritizeRequests=false repl=Null +response_latency=1000 size=32768 subblock_size=0 system=system @@ -207,6 +220,7 @@ mem_side=system.toL2Bus.slave[3] type=MemTest children=l1c atomic=false +clock=1 issue_dmas=false max_loads=100000 memory_size=65536 @@ -219,7 +233,7 @@ progress_interval=10000 suppress_func_warnings=false sys=system trace_addr=0 -functional=system.funcmem.port[4] +functional=system.funcbus.slave[4] test=system.cpu4.l1c.cpu_side [system.cpu4.l1c] @@ -227,16 +241,18 @@ type=BaseCache addr_ranges=0:18446744073709551615 assoc=4 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=12 prefetch_on_access=false prefetcher=Null prioritizeRequests=false repl=Null +response_latency=1000 size=32768 subblock_size=0 system=system @@ -251,6 +267,7 @@ mem_side=system.toL2Bus.slave[4] type=MemTest children=l1c atomic=false +clock=1 issue_dmas=false max_loads=100000 memory_size=65536 @@ -263,7 +280,7 @@ progress_interval=10000 suppress_func_warnings=false sys=system trace_addr=0 -functional=system.funcmem.port[5] +functional=system.funcbus.slave[5] test=system.cpu5.l1c.cpu_side [system.cpu5.l1c] @@ -271,16 +288,18 @@ type=BaseCache addr_ranges=0:18446744073709551615 assoc=4 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=12 prefetch_on_access=false prefetcher=Null prioritizeRequests=false repl=Null +response_latency=1000 size=32768 subblock_size=0 system=system @@ -295,6 +314,7 @@ mem_side=system.toL2Bus.slave[5] type=MemTest children=l1c atomic=false +clock=1 issue_dmas=false max_loads=100000 memory_size=65536 @@ -307,7 +327,7 @@ progress_interval=10000 suppress_func_warnings=false sys=system trace_addr=0 -functional=system.funcmem.port[6] +functional=system.funcbus.slave[6] test=system.cpu6.l1c.cpu_side [system.cpu6.l1c] @@ -315,16 +335,18 @@ type=BaseCache addr_ranges=0:18446744073709551615 assoc=4 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=12 prefetch_on_access=false prefetcher=Null prioritizeRequests=false repl=Null +response_latency=1000 size=32768 subblock_size=0 system=system @@ -339,6 +361,7 @@ mem_side=system.toL2Bus.slave[6] type=MemTest children=l1c atomic=false +clock=1 issue_dmas=false max_loads=100000 memory_size=65536 @@ -351,7 +374,7 @@ progress_interval=10000 suppress_func_warnings=false sys=system trace_addr=0 -functional=system.funcmem.port[7] +functional=system.funcbus.slave[7] test=system.cpu7.l1c.cpu_side [system.cpu7.l1c] @@ -359,16 +382,18 @@ type=BaseCache addr_ranges=0:18446744073709551615 assoc=4 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=12 prefetch_on_access=false prefetcher=Null prioritizeRequests=false repl=Null +response_latency=1000 size=32768 subblock_size=0 system=system @@ -379,33 +404,46 @@ write_buffers=8 cpu_side=system.cpu7.test mem_side=system.toL2Bus.slave[7] +[system.funcbus] +type=NoncoherentBus +block_size=64 +clock=1000 +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 +clock=1 conf_table_reported=false -file= in_addr_map=false latency=30000 latency_var=0 null=false range=0:134217727 zero=false -port=system.cpu0.functional system.cpu1.functional system.cpu2.functional system.cpu3.functional system.cpu4.functional system.cpu5.functional system.cpu6.functional system.cpu7.functional +port=system.funcbus.master[0] [system.l2c] type=BaseCache addr_ranges=0:18446744073709551615 assoc=8 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=92 prefetch_on_access=false prefetcher=Null prioritizeRequests=false repl=Null +response_latency=10000 size=65536 subblock_size=0 system=system @@ -423,13 +461,14 @@ clock=2 header_cycles=1 use_default_range=false width=16 -master=system.physmem.port[0] +master=system.physmem.port slave=system.l2c.mem_side system.system_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/50.memtest/ref/alpha/linux/memtest/simerr b/tests/quick/se/50.memtest/ref/alpha/linux/memtest/simerr index b8bd8a115..e47dd4681 100755 --- a/tests/quick/se/50.memtest/ref/alpha/linux/memtest/simerr +++ b/tests/quick/se/50.memtest/ref/alpha/linux/memtest/simerr @@ -1,74 +1,74 @@ -system.cpu3: completed 10000 read, 5269 write accesses @22241329 -system.cpu6: completed 10000 read, 5339 write accesses @22510874 -system.cpu4: completed 10000 read, 5452 write accesses @22618520 -system.cpu2: completed 10000 read, 5274 write accesses @22652245 -system.cpu5: completed 10000 read, 5225 write accesses @22698654 -system.cpu0: completed 10000 read, 5313 write accesses @22972460 -system.cpu1: completed 10000 read, 5425 write accesses @23112052 -system.cpu7: completed 10000 read, 5664 write accesses @23303588 -system.cpu3: completed 20000 read, 10591 write accesses @44494817 -system.cpu6: completed 20000 read, 10810 write accesses @44620430 -system.cpu2: completed 20000 read, 10802 write accesses @45009184 -system.cpu0: completed 20000 read, 10643 write accesses @45009224 -system.cpu5: completed 20000 read, 10647 write accesses @45039314 -system.cpu1: completed 20000 read, 10757 write accesses @45068735 -system.cpu4: completed 20000 read, 10808 write accesses @45199458 -system.cpu7: completed 20000 read, 11080 write accesses @45757070 -system.cpu2: completed 30000 read, 16115 write accesses @67069204 -system.cpu3: completed 30000 read, 16110 write accesses @67286000 -system.cpu5: completed 30000 read, 16163 write accesses @67388496 -system.cpu4: completed 30000 read, 16262 write accesses @67495238 -system.cpu6: completed 30000 read, 16234 write accesses @67566368 -system.cpu0: completed 30000 read, 16102 write accesses @67625583 -system.cpu1: completed 30000 read, 16288 write accesses @67665372 -system.cpu7: completed 30000 read, 16608 write accesses @68406261 -system.cpu4: completed 40000 read, 21521 write accesses @88522458 -system.cpu2: completed 40000 read, 21461 write accesses @88760475 -system.cpu5: completed 40000 read, 21540 write accesses @88851958 -system.cpu3: completed 40000 read, 21536 write accesses @88901742 -system.cpu6: completed 40000 read, 21498 write accesses @88910943 -system.cpu1: completed 40000 read, 21730 write accesses @89071047 -system.cpu0: completed 40000 read, 21414 write accesses @89232143 -system.cpu7: completed 40000 read, 22063 write accesses @90453997 -system.cpu4: completed 50000 read, 26910 write accesses @111349230 -system.cpu1: completed 50000 read, 26996 write accesses @111399385 -system.cpu2: completed 50000 read, 26807 write accesses @111571994 -system.cpu6: completed 50000 read, 26876 write accesses @111619105 -system.cpu3: completed 50000 read, 27009 write accesses @111789131 -system.cpu0: completed 50000 read, 26777 write accesses @111829265 -system.cpu5: completed 50000 read, 26952 write accesses @111861140 -system.cpu7: completed 50000 read, 27397 write accesses @112901639 -system.cpu1: completed 60000 read, 32331 write accesses @134016224 -system.cpu2: completed 60000 read, 32246 write accesses @134236668 -system.cpu4: completed 60000 read, 32290 write accesses @134236929 -system.cpu5: completed 60000 read, 32370 write accesses @134256674 -system.cpu6: completed 60000 read, 32444 write accesses @134707450 -system.cpu0: completed 60000 read, 32183 write accesses @134767456 -system.cpu3: completed 60000 read, 32423 write accesses @134996472 -system.cpu7: completed 60000 read, 32735 write accesses @135678114 -system.cpu2: completed 70000 read, 37600 write accesses @156516476 -system.cpu1: completed 70000 read, 37730 write accesses @156721328 -system.cpu5: completed 70000 read, 37748 write accesses @156805205 -system.cpu6: completed 70000 read, 37760 write accesses @156910635 -system.cpu4: completed 70000 read, 37725 write accesses @156961462 -system.cpu0: completed 70000 read, 37635 write accesses @158012668 -system.cpu3: completed 70000 read, 37942 write accesses @158279756 -system.cpu7: completed 70000 read, 38031 write accesses @158283192 -system.cpu5: completed 80000 read, 43255 write accesses @179067469 -system.cpu2: completed 80000 read, 43125 write accesses @179091672 -system.cpu1: completed 80000 read, 43134 write accesses @179182044 -system.cpu6: completed 80000 read, 43119 write accesses @179350821 -system.cpu4: completed 80000 read, 43054 write accesses @179621308 -system.cpu7: completed 80000 read, 43393 write accesses @180749386 -system.cpu0: completed 80000 read, 43229 write accesses @180793374 -system.cpu3: completed 80000 read, 43339 write accesses @180920432 -system.cpu6: completed 90000 read, 48363 write accesses @201441693 -system.cpu2: completed 90000 read, 48516 write accesses @201463344 -system.cpu5: completed 90000 read, 48731 write accesses @201471872 -system.cpu1: completed 90000 read, 48576 write accesses @201752753 -system.cpu4: completed 90000 read, 48432 write accesses @201853284 -system.cpu7: completed 90000 read, 48666 write accesses @202980078 -system.cpu3: completed 90000 read, 48647 write accesses @203163876 -system.cpu0: completed 90000 read, 48482 write accesses @203365064 -system.cpu6: completed 100000 read, 53510 write accesses @223713460 +system.cpu1: completed 10000 read, 5306 write accesses @32059956 +system.cpu6: completed 10000 read, 5293 write accesses @32275139 +system.cpu7: completed 10000 read, 5474 write accesses @32325344 +system.cpu3: completed 10000 read, 5220 write accesses @32355571 +system.cpu2: completed 10000 read, 5392 write accesses @32378350 +system.cpu4: completed 10000 read, 5411 write accesses @32427761 +system.cpu5: completed 10000 read, 5317 write accesses @32754271 +system.cpu0: completed 10000 read, 5539 write accesses @32833317 +system.cpu1: completed 20000 read, 10662 write accesses @55871338 +system.cpu3: completed 20000 read, 10529 write accesses @56061050 +system.cpu2: completed 20000 read, 10630 write accesses @56140317 +system.cpu4: completed 20000 read, 10816 write accesses @56432989 +system.cpu7: completed 20000 read, 10899 write accesses @56513495 +system.cpu6: completed 20000 read, 10845 write accesses @56565627 +system.cpu5: completed 20000 read, 10626 write accesses @57072718 +system.cpu0: completed 20000 read, 11113 write accesses @57586418 +system.cpu2: completed 30000 read, 16017 write accesses @79407742 +system.cpu1: completed 30000 read, 16151 write accesses @79725766 +system.cpu3: completed 30000 read, 15856 write accesses @79754749 +system.cpu6: completed 30000 read, 16195 write accesses @80206236 +system.cpu4: completed 30000 read, 16333 write accesses @80758801 +system.cpu7: completed 30000 read, 16467 write accesses @80845126 +system.cpu5: completed 30000 read, 16040 write accesses @81280754 +system.cpu0: completed 30000 read, 16740 write accesses @81836055 +system.cpu3: completed 40000 read, 21110 write accesses @102187140 +system.cpu1: completed 40000 read, 21543 write accesses @102788912 +system.cpu2: completed 40000 read, 21441 write accesses @103129249 +system.cpu6: completed 40000 read, 21490 write accesses @103224826 +system.cpu7: completed 40000 read, 21781 write accesses @104248123 +system.cpu4: completed 40000 read, 21750 write accesses @104259134 +system.cpu5: completed 40000 read, 21538 write accesses @104623876 +system.cpu0: completed 40000 read, 22049 write accesses @105025965 +system.cpu3: completed 50000 read, 26445 write accesses @126560435 +system.cpu1: completed 50000 read, 27002 write accesses @127296516 +system.cpu6: completed 50000 read, 26751 write accesses @127652113 +system.cpu2: completed 50000 read, 26915 write accesses @127863043 +system.cpu5: completed 50000 read, 26795 write accesses @128758388 +system.cpu7: completed 50000 read, 27154 write accesses @128837444 +system.cpu4: completed 50000 read, 27195 write accesses @128884190 +system.cpu0: completed 50000 read, 27370 write accesses @129107611 +system.cpu3: completed 60000 read, 31813 write accesses @150500482 +system.cpu1: completed 60000 read, 32357 write accesses @151324410 +system.cpu6: completed 60000 read, 32276 write accesses @152241130 +system.cpu2: completed 60000 read, 32455 write accesses @152510509 +system.cpu4: completed 60000 read, 32625 write accesses @152799581 +system.cpu5: completed 60000 read, 32145 write accesses @152911895 +system.cpu7: completed 60000 read, 32658 write accesses @153053742 +system.cpu0: completed 60000 read, 32669 write accesses @153243898 +system.cpu3: completed 70000 read, 37148 write accesses @174290350 +system.cpu1: completed 70000 read, 37719 write accesses @175320592 +system.cpu6: completed 70000 read, 37631 write accesses @176658170 +system.cpu4: completed 70000 read, 37993 write accesses @176957081 +system.cpu2: completed 70000 read, 37835 write accesses @177152761 +system.cpu5: completed 70000 read, 37525 write accesses @177243860 +system.cpu7: completed 70000 read, 38186 write accesses @177800828 +system.cpu0: completed 70000 read, 38119 write accesses @178467538 +system.cpu3: completed 80000 read, 42562 write accesses @198146360 +system.cpu1: completed 80000 read, 43234 write accesses @199454254 +system.cpu4: completed 80000 read, 43314 write accesses @200406450 +system.cpu5: completed 80000 read, 42980 write accesses @200646810 +system.cpu2: completed 80000 read, 43306 write accesses @200927158 +system.cpu6: completed 80000 read, 43086 write accesses @200956315 +system.cpu7: completed 80000 read, 43539 write accesses @201412026 +system.cpu0: completed 80000 read, 43547 write accesses @202267757 +system.cpu3: completed 90000 read, 47828 write accesses @222074356 +system.cpu1: completed 90000 read, 48627 write accesses @223900144 +system.cpu5: completed 90000 read, 48291 write accesses @224840552 +system.cpu4: completed 90000 read, 48802 write accesses @224884716 +system.cpu6: completed 90000 read, 48479 write accesses @224938254 +system.cpu2: completed 90000 read, 48708 write accesses @225566271 +system.cpu7: completed 90000 read, 48770 write accesses @225725770 +system.cpu0: completed 90000 read, 48880 write accesses @226596871 +system.cpu3: completed 100000 read, 53214 write accesses @246648467 hack: be nice to actually delete the event here diff --git a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_CMP_directory/config.ini b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_CMP_directory/config.ini index 66023571f..eac1bafa5 100644 --- a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_CMP_directory/config.ini +++ b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_CMP_directory/config.ini @@ -168,9 +168,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 @@ -220,8 +220,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 @@ -234,8 +235,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 @@ -248,8 +250,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 @@ -262,8 +265,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/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_directory/config.ini b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_directory/config.ini index 783db058f..8a3bceec2 100644 --- a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_directory/config.ini +++ b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_directory/config.ini @@ -164,9 +164,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 @@ -216,8 +216,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 @@ -230,8 +231,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 @@ -244,8 +246,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 @@ -258,8 +261,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/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_token/config.ini b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_token/config.ini index 3e9d191ea..3722c14cb 100644 --- a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_token/config.ini +++ b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_token/config.ini @@ -175,9 +175,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 @@ -227,8 +227,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 @@ -241,8 +242,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 @@ -255,8 +257,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 @@ -269,8 +272,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/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_hammer/config.ini b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_hammer/config.ini index 2920575ea..77edef804 100644 --- a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_hammer/config.ini +++ b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_hammer/config.ini @@ -170,9 +170,9 @@ slave=system.tester.cpuDataPort[0] system.tester.cpuInstPort[0] [system.physmem] type=SimpleMemory +bandwidth=0.000000 clock=1 conf_table_reported=false -file= in_addr_map=true latency=30 latency_var=0 @@ -222,8 +222,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 @@ -236,8 +237,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 @@ -250,8 +252,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/60.rubytest/ref/alpha/linux/rubytest-ruby/config.ini b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby/config.ini index d66b5e6a2..2634ecc5e 100644 --- a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby/config.ini +++ b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby/config.ini @@ -121,9 +121,9 @@ slave=system.tester.cpuDataPort[0] system.tester.cpuInstPort[0] [system.physmem] type=SimpleMemory +bandwidth=0.000000 clock=1 conf_table_reported=false -file= in_addr_map=true latency=30 latency_var=0 @@ -173,8 +173,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 @@ -187,8 +188,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 @@ -201,8 +203,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 |