From 19cc023cf51268f3c4f3a83d95319f37660d94f7 Mon Sep 17 00:00:00 2001 From: Ali Saidi Date: Sat, 28 Jul 2012 13:48:04 -0400 Subject: stats: fix some miss-committed changes from the icache change --- .../linux/memtest-ruby-MOESI_CMP_token/config.ini | 278 ++++++++++++++------- 1 file changed, 192 insertions(+), 86 deletions(-) (limited to 'tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_token/config.ini') 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 4af9d9478..eb0775893 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 @@ -8,7 +8,7 @@ time_sync_spin_threshold=100000 [system] type=System -children=cpu0 cpu1 cpu2 cpu3 cpu4 cpu5 cpu6 cpu7 dir_cntrl0 funcmem l1_cntrl0 l1_cntrl1 l1_cntrl2 l1_cntrl3 l1_cntrl4 l1_cntrl5 l1_cntrl6 l1_cntrl7 l2_cntrl0 physmem ruby sys_port_proxy +children=cpu0 cpu1 cpu2 cpu3 cpu4 cpu5 cpu6 cpu7 dir_cntrl0 funcbus funcmem l1_cntrl0 l1_cntrl1 l1_cntrl2 l1_cntrl3 l1_cntrl4 l1_cntrl5 l1_cntrl6 l1_cntrl7 l2_cntrl0 physmem ruby sys_port_proxy boot_osflags=a init_param=0 kernel= @@ -42,7 +42,7 @@ progress_interval=10000 suppress_func_warnings=true sys=system trace_addr=0 -functional=system.funcmem.port[0] +functional=system.funcbus.slave[0] test=system.l1_cntrl0.sequencer.slave[0] [system.cpu1] @@ -60,7 +60,7 @@ progress_interval=10000 suppress_func_warnings=true sys=system trace_addr=0 -functional=system.funcmem.port[1] +functional=system.funcbus.slave[1] test=system.l1_cntrl1.sequencer.slave[0] [system.cpu2] @@ -78,7 +78,7 @@ progress_interval=10000 suppress_func_warnings=true sys=system trace_addr=0 -functional=system.funcmem.port[2] +functional=system.funcbus.slave[2] test=system.l1_cntrl2.sequencer.slave[0] [system.cpu3] @@ -96,7 +96,7 @@ progress_interval=10000 suppress_func_warnings=true sys=system trace_addr=0 -functional=system.funcmem.port[3] +functional=system.funcbus.slave[3] test=system.l1_cntrl3.sequencer.slave[0] [system.cpu4] @@ -114,7 +114,7 @@ progress_interval=10000 suppress_func_warnings=true sys=system trace_addr=0 -functional=system.funcmem.port[4] +functional=system.funcbus.slave[4] test=system.l1_cntrl4.sequencer.slave[0] [system.cpu5] @@ -132,7 +132,7 @@ progress_interval=10000 suppress_func_warnings=true sys=system trace_addr=0 -functional=system.funcmem.port[5] +functional=system.funcbus.slave[5] test=system.l1_cntrl5.sequencer.slave[0] [system.cpu6] @@ -150,7 +150,7 @@ progress_interval=10000 suppress_func_warnings=true sys=system trace_addr=0 -functional=system.funcmem.port[6] +functional=system.funcbus.slave[6] test=system.l1_cntrl6.sequencer.slave[0] [system.cpu7] @@ -168,7 +168,7 @@ progress_interval=10000 suppress_func_warnings=true sys=system trace_addr=0 -functional=system.funcmem.port[7] +functional=system.funcbus.slave[7] test=system.l1_cntrl7.sequencer.slave[0] [system.dir_cntrl0] @@ -217,6 +217,16 @@ refresh_period=1560 tFaw=0 version=0 +[system.funcbus] +type=NoncoherentBus +block_size=64 +clock=1 +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 conf_table_reported=false @@ -227,7 +237,7 @@ 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.l1_cntrl0] type=L1Cache_Controller @@ -255,20 +265,30 @@ version=0 [system.l1_cntrl0.L1DcacheMemory] type=RubyCache assoc=2 +dataAccessLatency=1 +dataArrayBanks=1 is_icache=false latency=2 replacement_policy=PSEUDO_LRU +resourceStalls=false size=256 start_index_bit=6 +tagAccessLatency=1 +tagArrayBanks=1 [system.l1_cntrl0.L1IcacheMemory] type=RubyCache assoc=2 +dataAccessLatency=1 +dataArrayBanks=1 is_icache=false latency=2 replacement_policy=PSEUDO_LRU +resourceStalls=false size=256 start_index_bit=6 +tagAccessLatency=1 +tagArrayBanks=1 [system.l1_cntrl0.sequencer] type=RubySequencer @@ -312,20 +332,30 @@ version=1 [system.l1_cntrl1.L1DcacheMemory] type=RubyCache assoc=2 +dataAccessLatency=1 +dataArrayBanks=1 is_icache=false latency=2 replacement_policy=PSEUDO_LRU +resourceStalls=false size=256 start_index_bit=6 +tagAccessLatency=1 +tagArrayBanks=1 [system.l1_cntrl1.L1IcacheMemory] type=RubyCache assoc=2 +dataAccessLatency=1 +dataArrayBanks=1 is_icache=false latency=2 replacement_policy=PSEUDO_LRU +resourceStalls=false size=256 start_index_bit=6 +tagAccessLatency=1 +tagArrayBanks=1 [system.l1_cntrl1.sequencer] type=RubySequencer @@ -369,20 +399,30 @@ version=2 [system.l1_cntrl2.L1DcacheMemory] type=RubyCache assoc=2 +dataAccessLatency=1 +dataArrayBanks=1 is_icache=false latency=2 replacement_policy=PSEUDO_LRU +resourceStalls=false size=256 start_index_bit=6 +tagAccessLatency=1 +tagArrayBanks=1 [system.l1_cntrl2.L1IcacheMemory] type=RubyCache assoc=2 +dataAccessLatency=1 +dataArrayBanks=1 is_icache=false latency=2 replacement_policy=PSEUDO_LRU +resourceStalls=false size=256 start_index_bit=6 +tagAccessLatency=1 +tagArrayBanks=1 [system.l1_cntrl2.sequencer] type=RubySequencer @@ -426,20 +466,30 @@ version=3 [system.l1_cntrl3.L1DcacheMemory] type=RubyCache assoc=2 +dataAccessLatency=1 +dataArrayBanks=1 is_icache=false latency=2 replacement_policy=PSEUDO_LRU +resourceStalls=false size=256 start_index_bit=6 +tagAccessLatency=1 +tagArrayBanks=1 [system.l1_cntrl3.L1IcacheMemory] type=RubyCache assoc=2 +dataAccessLatency=1 +dataArrayBanks=1 is_icache=false latency=2 replacement_policy=PSEUDO_LRU +resourceStalls=false size=256 start_index_bit=6 +tagAccessLatency=1 +tagArrayBanks=1 [system.l1_cntrl3.sequencer] type=RubySequencer @@ -483,20 +533,30 @@ version=4 [system.l1_cntrl4.L1DcacheMemory] type=RubyCache assoc=2 +dataAccessLatency=1 +dataArrayBanks=1 is_icache=false latency=2 replacement_policy=PSEUDO_LRU +resourceStalls=false size=256 start_index_bit=6 +tagAccessLatency=1 +tagArrayBanks=1 [system.l1_cntrl4.L1IcacheMemory] type=RubyCache assoc=2 +dataAccessLatency=1 +dataArrayBanks=1 is_icache=false latency=2 replacement_policy=PSEUDO_LRU +resourceStalls=false size=256 start_index_bit=6 +tagAccessLatency=1 +tagArrayBanks=1 [system.l1_cntrl4.sequencer] type=RubySequencer @@ -540,20 +600,30 @@ version=5 [system.l1_cntrl5.L1DcacheMemory] type=RubyCache assoc=2 +dataAccessLatency=1 +dataArrayBanks=1 is_icache=false latency=2 replacement_policy=PSEUDO_LRU +resourceStalls=false size=256 start_index_bit=6 +tagAccessLatency=1 +tagArrayBanks=1 [system.l1_cntrl5.L1IcacheMemory] type=RubyCache assoc=2 +dataAccessLatency=1 +dataArrayBanks=1 is_icache=false latency=2 replacement_policy=PSEUDO_LRU +resourceStalls=false size=256 start_index_bit=6 +tagAccessLatency=1 +tagArrayBanks=1 [system.l1_cntrl5.sequencer] type=RubySequencer @@ -597,20 +667,30 @@ version=6 [system.l1_cntrl6.L1DcacheMemory] type=RubyCache assoc=2 +dataAccessLatency=1 +dataArrayBanks=1 is_icache=false latency=2 replacement_policy=PSEUDO_LRU +resourceStalls=false size=256 start_index_bit=6 +tagAccessLatency=1 +tagArrayBanks=1 [system.l1_cntrl6.L1IcacheMemory] type=RubyCache assoc=2 +dataAccessLatency=1 +dataArrayBanks=1 is_icache=false latency=2 replacement_policy=PSEUDO_LRU +resourceStalls=false size=256 start_index_bit=6 +tagAccessLatency=1 +tagArrayBanks=1 [system.l1_cntrl6.sequencer] type=RubySequencer @@ -654,20 +734,30 @@ version=7 [system.l1_cntrl7.L1DcacheMemory] type=RubyCache assoc=2 +dataAccessLatency=1 +dataArrayBanks=1 is_icache=false latency=2 replacement_policy=PSEUDO_LRU +resourceStalls=false size=256 start_index_bit=6 +tagAccessLatency=1 +tagArrayBanks=1 [system.l1_cntrl7.L1IcacheMemory] type=RubyCache assoc=2 +dataAccessLatency=1 +dataArrayBanks=1 is_icache=false latency=2 replacement_policy=PSEUDO_LRU +resourceStalls=false size=256 start_index_bit=6 +tagAccessLatency=1 +tagArrayBanks=1 [system.l1_cntrl7.sequencer] type=RubySequencer @@ -704,11 +794,16 @@ version=0 [system.l2_cntrl0.L2cacheMemory] type=RubyCache assoc=2 +dataAccessLatency=1 +dataArrayBanks=1 is_icache=false latency=10 replacement_policy=PSEUDO_LRU +resourceStalls=false size=512 start_index_bit=6 +tagAccessLatency=1 +tagArrayBanks=1 [system.physmem] type=SimpleMemory @@ -745,119 +840,174 @@ topology=system.ruby.network.topology [system.ruby.network.topology] type=Topology -children=ext_links0 ext_links1 ext_links2 ext_links3 ext_links4 ext_links5 ext_links6 ext_links7 ext_links8 ext_links9 int_links0 int_links1 int_links2 int_links3 int_links4 int_links5 int_links6 int_links7 int_links8 int_links9 routers00 routers01 routers02 routers03 routers04 routers05 routers06 routers07 routers08 routers09 routers10 +children=ext_links0 ext_links1 ext_links2 ext_links3 ext_links4 ext_links5 ext_links6 ext_links7 ext_links8 ext_links9 int_links0 int_links1 int_links2 int_links3 int_links4 int_links5 int_links6 int_links7 int_links8 int_links9 description=Crossbar ext_links=system.ruby.network.topology.ext_links0 system.ruby.network.topology.ext_links1 system.ruby.network.topology.ext_links2 system.ruby.network.topology.ext_links3 system.ruby.network.topology.ext_links4 system.ruby.network.topology.ext_links5 system.ruby.network.topology.ext_links6 system.ruby.network.topology.ext_links7 system.ruby.network.topology.ext_links8 system.ruby.network.topology.ext_links9 int_links=system.ruby.network.topology.int_links0 system.ruby.network.topology.int_links1 system.ruby.network.topology.int_links2 system.ruby.network.topology.int_links3 system.ruby.network.topology.int_links4 system.ruby.network.topology.int_links5 system.ruby.network.topology.int_links6 system.ruby.network.topology.int_links7 system.ruby.network.topology.int_links8 system.ruby.network.topology.int_links9 print_config=false -routers=system.ruby.network.topology.routers00 system.ruby.network.topology.routers01 system.ruby.network.topology.routers02 system.ruby.network.topology.routers03 system.ruby.network.topology.routers04 system.ruby.network.topology.routers05 system.ruby.network.topology.routers06 system.ruby.network.topology.routers07 system.ruby.network.topology.routers08 system.ruby.network.topology.routers09 system.ruby.network.topology.routers10 +routers=system.ruby.network.topology.ext_links0.int_node system.ruby.network.topology.ext_links1.int_node system.ruby.network.topology.ext_links2.int_node system.ruby.network.topology.ext_links3.int_node system.ruby.network.topology.ext_links4.int_node system.ruby.network.topology.ext_links5.int_node system.ruby.network.topology.ext_links6.int_node system.ruby.network.topology.ext_links7.int_node system.ruby.network.topology.ext_links8.int_node system.ruby.network.topology.ext_links9.int_node system.ruby.network.topology.int_links0.node_b [system.ruby.network.topology.ext_links0] type=SimpleExtLink +children=int_node bandwidth_factor=16 ext_node=system.l1_cntrl0 -int_node=system.ruby.network.topology.routers00 +int_node=system.ruby.network.topology.ext_links0.int_node latency=1 link_id=0 weight=1 +[system.ruby.network.topology.ext_links0.int_node] +type=BasicRouter +router_id=0 + [system.ruby.network.topology.ext_links1] type=SimpleExtLink +children=int_node bandwidth_factor=16 ext_node=system.l1_cntrl1 -int_node=system.ruby.network.topology.routers01 +int_node=system.ruby.network.topology.ext_links1.int_node latency=1 link_id=1 weight=1 +[system.ruby.network.topology.ext_links1.int_node] +type=BasicRouter +router_id=1 + [system.ruby.network.topology.ext_links2] type=SimpleExtLink +children=int_node bandwidth_factor=16 ext_node=system.l1_cntrl2 -int_node=system.ruby.network.topology.routers02 +int_node=system.ruby.network.topology.ext_links2.int_node latency=1 link_id=2 weight=1 +[system.ruby.network.topology.ext_links2.int_node] +type=BasicRouter +router_id=2 + [system.ruby.network.topology.ext_links3] type=SimpleExtLink +children=int_node bandwidth_factor=16 ext_node=system.l1_cntrl3 -int_node=system.ruby.network.topology.routers03 +int_node=system.ruby.network.topology.ext_links3.int_node latency=1 link_id=3 weight=1 +[system.ruby.network.topology.ext_links3.int_node] +type=BasicRouter +router_id=3 + [system.ruby.network.topology.ext_links4] type=SimpleExtLink +children=int_node bandwidth_factor=16 ext_node=system.l1_cntrl4 -int_node=system.ruby.network.topology.routers04 +int_node=system.ruby.network.topology.ext_links4.int_node latency=1 link_id=4 weight=1 +[system.ruby.network.topology.ext_links4.int_node] +type=BasicRouter +router_id=4 + [system.ruby.network.topology.ext_links5] type=SimpleExtLink +children=int_node bandwidth_factor=16 ext_node=system.l1_cntrl5 -int_node=system.ruby.network.topology.routers05 +int_node=system.ruby.network.topology.ext_links5.int_node latency=1 link_id=5 weight=1 +[system.ruby.network.topology.ext_links5.int_node] +type=BasicRouter +router_id=5 + [system.ruby.network.topology.ext_links6] type=SimpleExtLink +children=int_node bandwidth_factor=16 ext_node=system.l1_cntrl6 -int_node=system.ruby.network.topology.routers06 +int_node=system.ruby.network.topology.ext_links6.int_node latency=1 link_id=6 weight=1 +[system.ruby.network.topology.ext_links6.int_node] +type=BasicRouter +router_id=6 + [system.ruby.network.topology.ext_links7] type=SimpleExtLink +children=int_node bandwidth_factor=16 ext_node=system.l1_cntrl7 -int_node=system.ruby.network.topology.routers07 +int_node=system.ruby.network.topology.ext_links7.int_node latency=1 link_id=7 weight=1 +[system.ruby.network.topology.ext_links7.int_node] +type=BasicRouter +router_id=7 + [system.ruby.network.topology.ext_links8] type=SimpleExtLink +children=int_node bandwidth_factor=16 ext_node=system.l2_cntrl0 -int_node=system.ruby.network.topology.routers08 +int_node=system.ruby.network.topology.ext_links8.int_node latency=1 link_id=8 weight=1 +[system.ruby.network.topology.ext_links8.int_node] +type=BasicRouter +router_id=8 + [system.ruby.network.topology.ext_links9] type=SimpleExtLink +children=int_node bandwidth_factor=16 ext_node=system.dir_cntrl0 -int_node=system.ruby.network.topology.routers09 +int_node=system.ruby.network.topology.ext_links9.int_node latency=1 link_id=9 weight=1 +[system.ruby.network.topology.ext_links9.int_node] +type=BasicRouter +router_id=9 + [system.ruby.network.topology.int_links0] type=SimpleIntLink +children=node_b bandwidth_factor=16 latency=1 link_id=10 -node_a=system.ruby.network.topology.routers00 -node_b=system.ruby.network.topology.routers10 +node_a=system.ruby.network.topology.ext_links0.int_node +node_b=system.ruby.network.topology.int_links0.node_b weight=1 +[system.ruby.network.topology.int_links0.node_b] +type=BasicRouter +router_id=10 + [system.ruby.network.topology.int_links1] type=SimpleIntLink bandwidth_factor=16 latency=1 link_id=11 -node_a=system.ruby.network.topology.routers01 -node_b=system.ruby.network.topology.routers10 +node_a=system.ruby.network.topology.ext_links1.int_node +node_b=system.ruby.network.topology.int_links0.node_b weight=1 [system.ruby.network.topology.int_links2] @@ -865,8 +1015,8 @@ type=SimpleIntLink bandwidth_factor=16 latency=1 link_id=12 -node_a=system.ruby.network.topology.routers02 -node_b=system.ruby.network.topology.routers10 +node_a=system.ruby.network.topology.ext_links2.int_node +node_b=system.ruby.network.topology.int_links0.node_b weight=1 [system.ruby.network.topology.int_links3] @@ -874,8 +1024,8 @@ type=SimpleIntLink bandwidth_factor=16 latency=1 link_id=13 -node_a=system.ruby.network.topology.routers03 -node_b=system.ruby.network.topology.routers10 +node_a=system.ruby.network.topology.ext_links3.int_node +node_b=system.ruby.network.topology.int_links0.node_b weight=1 [system.ruby.network.topology.int_links4] @@ -883,8 +1033,8 @@ type=SimpleIntLink bandwidth_factor=16 latency=1 link_id=14 -node_a=system.ruby.network.topology.routers04 -node_b=system.ruby.network.topology.routers10 +node_a=system.ruby.network.topology.ext_links4.int_node +node_b=system.ruby.network.topology.int_links0.node_b weight=1 [system.ruby.network.topology.int_links5] @@ -892,8 +1042,8 @@ type=SimpleIntLink bandwidth_factor=16 latency=1 link_id=15 -node_a=system.ruby.network.topology.routers05 -node_b=system.ruby.network.topology.routers10 +node_a=system.ruby.network.topology.ext_links5.int_node +node_b=system.ruby.network.topology.int_links0.node_b weight=1 [system.ruby.network.topology.int_links6] @@ -901,8 +1051,8 @@ type=SimpleIntLink bandwidth_factor=16 latency=1 link_id=16 -node_a=system.ruby.network.topology.routers06 -node_b=system.ruby.network.topology.routers10 +node_a=system.ruby.network.topology.ext_links6.int_node +node_b=system.ruby.network.topology.int_links0.node_b weight=1 [system.ruby.network.topology.int_links7] @@ -910,8 +1060,8 @@ type=SimpleIntLink bandwidth_factor=16 latency=1 link_id=17 -node_a=system.ruby.network.topology.routers07 -node_b=system.ruby.network.topology.routers10 +node_a=system.ruby.network.topology.ext_links7.int_node +node_b=system.ruby.network.topology.int_links0.node_b weight=1 [system.ruby.network.topology.int_links8] @@ -919,8 +1069,8 @@ type=SimpleIntLink bandwidth_factor=16 latency=1 link_id=18 -node_a=system.ruby.network.topology.routers08 -node_b=system.ruby.network.topology.routers10 +node_a=system.ruby.network.topology.ext_links8.int_node +node_b=system.ruby.network.topology.int_links0.node_b weight=1 [system.ruby.network.topology.int_links9] @@ -928,54 +1078,10 @@ type=SimpleIntLink bandwidth_factor=16 latency=1 link_id=19 -node_a=system.ruby.network.topology.routers09 -node_b=system.ruby.network.topology.routers10 +node_a=system.ruby.network.topology.ext_links9.int_node +node_b=system.ruby.network.topology.int_links0.node_b weight=1 -[system.ruby.network.topology.routers00] -type=BasicRouter -router_id=0 - -[system.ruby.network.topology.routers01] -type=BasicRouter -router_id=1 - -[system.ruby.network.topology.routers02] -type=BasicRouter -router_id=2 - -[system.ruby.network.topology.routers03] -type=BasicRouter -router_id=3 - -[system.ruby.network.topology.routers04] -type=BasicRouter -router_id=4 - -[system.ruby.network.topology.routers05] -type=BasicRouter -router_id=5 - -[system.ruby.network.topology.routers06] -type=BasicRouter -router_id=6 - -[system.ruby.network.topology.routers07] -type=BasicRouter -router_id=7 - -[system.ruby.network.topology.routers08] -type=BasicRouter -router_id=8 - -[system.ruby.network.topology.routers09] -type=BasicRouter -router_id=9 - -[system.ruby.network.topology.routers10] -type=BasicRouter -router_id=10 - [system.ruby.profiler] type=RubyProfiler all_instructions=false -- cgit v1.2.3