From 86497571352cd3ce9edcbd5c6e0b5ed8f2f5dd6b Mon Sep 17 00:00:00 2001 From: Steve Reinhardt Date: Sun, 21 Sep 2014 16:15:14 -0400 Subject: stats: update eio stats for recent changes --- .../ref/alpha/eio/simple-atomic-mp/config.ini | 30 +- .../ref/alpha/eio/simple-atomic-mp/config.json | 767 ++++++++++------- .../ref/alpha/eio/simple-atomic-mp/simerr | 3 +- .../ref/alpha/eio/simple-atomic-mp/simout | 4 +- .../ref/alpha/eio/simple-atomic-mp/stats.txt | 76 +- .../ref/alpha/eio/simple-timing-mp/config.ini | 18 +- .../ref/alpha/eio/simple-timing-mp/config.json | 903 ++++++++++++--------- .../ref/alpha/eio/simple-timing-mp/simerr | 2 - .../ref/alpha/eio/simple-timing-mp/simout | 4 +- .../ref/alpha/eio/simple-timing-mp/stats.txt | 67 +- 10 files changed, 1115 insertions(+), 759 deletions(-) (limited to 'tests/quick/se/30.eio-mp/ref/alpha/eio') diff --git a/tests/quick/se/30.eio-mp/ref/alpha/eio/simple-atomic-mp/config.ini b/tests/quick/se/30.eio-mp/ref/alpha/eio/simple-atomic-mp/config.ini index cb6974d16..3cbe4882e 100644 --- a/tests/quick/se/30.eio-mp/ref/alpha/eio/simple-atomic-mp/config.ini +++ b/tests/quick/se/30.eio-mp/ref/alpha/eio/simple-atomic-mp/config.ini @@ -68,9 +68,6 @@ max_loads_any_thread=0 numThreads=1 profile=0 progress_interval=0 -simpoint_interval=100000000 -simpoint_profile=false -simpoint_profile_file=simpoint.bb.gz simpoint_start_insts= simulate_data_stalls=false simulate_inst_stalls=false @@ -181,11 +178,12 @@ type=EioProcess chkpt= errout=cerr eventq_index=0 -file=/scratch/nilay/GEM5/gem5/tests/test-progs/anagram/bin/alpha/eio/anagram-vshort.eio.gz +file=/dist/m5/regression/test-progs/anagram/bin/alpha/eio/anagram-vshort.eio.gz input=None max_stack_size=67108864 output=cout system=system +useArchPT=false [system.cpu1] type=AtomicSimpleCPU @@ -212,9 +210,6 @@ max_loads_any_thread=0 numThreads=1 profile=0 progress_interval=0 -simpoint_interval=100000000 -simpoint_profile=false -simpoint_profile_file=simpoint.bb.gz simpoint_start_insts= simulate_data_stalls=false simulate_inst_stalls=false @@ -325,11 +320,12 @@ type=EioProcess chkpt= errout=cerr eventq_index=0 -file=/scratch/nilay/GEM5/gem5/tests/test-progs/anagram/bin/alpha/eio/anagram-vshort.eio.gz +file=/dist/m5/regression/test-progs/anagram/bin/alpha/eio/anagram-vshort.eio.gz input=None max_stack_size=67108864 output=cout system=system +useArchPT=false [system.cpu2] type=AtomicSimpleCPU @@ -356,9 +352,6 @@ max_loads_any_thread=0 numThreads=1 profile=0 progress_interval=0 -simpoint_interval=100000000 -simpoint_profile=false -simpoint_profile_file=simpoint.bb.gz simpoint_start_insts= simulate_data_stalls=false simulate_inst_stalls=false @@ -469,11 +462,12 @@ type=EioProcess chkpt= errout=cerr eventq_index=0 -file=/scratch/nilay/GEM5/gem5/tests/test-progs/anagram/bin/alpha/eio/anagram-vshort.eio.gz +file=/dist/m5/regression/test-progs/anagram/bin/alpha/eio/anagram-vshort.eio.gz input=None max_stack_size=67108864 output=cout system=system +useArchPT=false [system.cpu3] type=AtomicSimpleCPU @@ -500,9 +494,6 @@ max_loads_any_thread=0 numThreads=1 profile=0 progress_interval=0 -simpoint_interval=100000000 -simpoint_profile=false -simpoint_profile_file=simpoint.bb.gz simpoint_start_insts= simulate_data_stalls=false simulate_inst_stalls=false @@ -613,11 +604,12 @@ type=EioProcess chkpt= errout=cerr eventq_index=0 -file=/scratch/nilay/GEM5/gem5/tests/test-progs/anagram/bin/alpha/eio/anagram-vshort.eio.gz +file=/dist/m5/regression/test-progs/anagram/bin/alpha/eio/anagram-vshort.eio.gz input=None max_stack_size=67108864 output=cout system=system +useArchPT=false [system.cpu_clk_domain] type=SrcClockDomain @@ -671,10 +663,11 @@ sequential_access=false size=4194304 [system.membus] -type=CoherentBus +type=CoherentXBar clk_domain=system.clk_domain eventq_index=0 header_cycles=1 +snoop_filter=Null system=system use_default_range=false width=8 @@ -695,10 +688,11 @@ range=0:134217727 port=system.membus.master[0] [system.toL2Bus] -type=CoherentBus +type=CoherentXBar clk_domain=system.cpu_clk_domain eventq_index=0 header_cycles=1 +snoop_filter=Null system=system use_default_range=false width=8 diff --git a/tests/quick/se/30.eio-mp/ref/alpha/eio/simple-atomic-mp/config.json b/tests/quick/se/30.eio-mp/ref/alpha/eio/simple-atomic-mp/config.json index 43749dee9..19d6c1397 100644 --- a/tests/quick/se/30.eio-mp/ref/alpha/eio/simple-atomic-mp/config.json +++ b/tests/quick/se/30.eio-mp/ref/alpha/eio/simple-atomic-mp/config.json @@ -2,44 +2,20 @@ "name": null, "sim_quantum": 0, "system": { - "membus": { - "slave": { - "peer": [ - "system.system_port", - "system.l2c.mem_side" - ], - "role": "SLAVE" - }, - "name": "membus", - "header_cycles": 1, - "width": 8, - "eventq_index": 0, - "master": { - "peer": [ - "system.physmem.port" - ], - "role": "MASTER" - }, - "cxx_class": "CoherentBus", - "path": "system.membus", - "type": "CoherentBus", - "use_default_range": false - }, + "kernel": "", "l2c": { - "assoc": 8, - "mem_side": { - "peer": "system.membus.slave[1]", - "role": "MASTER" - }, - "cpu_side": { - "peer": "system.toL2Bus.master[0]", - "role": "SLAVE" - }, - "name": "l2c", + "is_top_level": false, + "prefetcher": null, + "clk_domain": "system.cpu_clk_domain", + "write_buffers": 8, + "response_latency": 20, + "cxx_class": "BaseCache", + "size": 4194304, "tags": { "name": "tags", "eventq_index": 0, "hit_latency": 20, + "clk_domain": "system.cpu_clk_domain", "sequential_access": false, "assoc": 8, "cxx_class": "LRU", @@ -48,79 +24,137 @@ "type": "LRU", "size": 4194304 }, - "hit_latency": 20, - "mshrs": 20, - "response_latency": 20, - "is_top_level": false, - "tgts_per_mshr": 12, - "sequential_access": false, + "system": "system", "max_miss_count": 0, "eventq_index": 0, + "mem_side": { + "peer": "system.membus.slave[1]", + "role": "MASTER" + }, + "mshrs": 20, + "forward_snoops": true, + "hit_latency": 20, + "tgts_per_mshr": 12, + "addr_ranges": [ + "0:18446744073709551615" + ], + "assoc": 8, "prefetch_on_access": false, - "cxx_class": "BaseCache", "path": "system.l2c", - "write_buffers": 8, - "two_queue": false, + "name": "l2c", "type": "BaseCache", - "forward_snoops": true, - "size": 4194304 + "sequential_access": false, + "cpu_side": { + "peer": "system.toL2Bus.master[0]", + "role": "SLAVE" + }, + "two_queue": false }, "kernel_addr_check": true, - "physmem": { - "latency": 3.0000000000000004e-08, - "name": "physmem", - "eventq_index": 0, - "latency_var": 0.0, - "conf_table_reported": true, - "cxx_class": "SimpleMemory", - "path": "system.physmem", - "null": false, - "type": "SimpleMemory", - "port": { - "peer": "system.membus.master[0]", + "membus": { + "slave": { + "peer": [ + "system.system_port", + "system.l2c.mem_side" + ], "role": "SLAVE" }, - "in_addr_map": true + "name": "membus", + "snoop_filter": null, + "clk_domain": "system.clk_domain", + "header_cycles": 1, + "system": "system", + "width": 8, + "eventq_index": 0, + "master": { + "peer": [ + "system.physmem.port" + ], + "role": "MASTER" + }, + "cxx_class": "CoherentXBar", + "path": "system.membus", + "type": "CoherentXBar", + "use_default_range": false }, + "symbolfile": "", + "readfile": "", "cxx_class": "System", "load_offset": 0, "work_end_ckpt_count": 0, + "memories": [ + "system.physmem" + ], "work_begin_ckpt_count": 0, "clk_domain": { "name": "clk_domain", + "clock": [ + 1000 + ], "init_perf_level": 0, + "voltage_domain": "system.voltage_domain", "eventq_index": 0, "cxx_class": "SrcClockDomain", "path": "system.clk_domain", "type": "SrcClockDomain", "domain_id": -1 }, + "mem_ranges": [], "eventq_index": 0, "dvfs_handler": { "enable": false, "name": "dvfs_handler", - "transition_latency": 9.999999999999999e-05, + "sys_clk_domain": "system.clk_domain", + "transition_latency": 100000000, "eventq_index": 0, "cxx_class": "DVFSHandler", + "domains": [], "path": "system.dvfs_handler", "type": "DVFSHandler" }, "work_end_exit_count": 0, "type": "System", "voltage_domain": { + "name": "voltage_domain", "eventq_index": 0, + "voltage": [ + "1.0" + ], + "cxx_class": "VoltageDomain", "path": "system.voltage_domain", - "type": "VoltageDomain", - "name": "voltage_domain", - "cxx_class": "VoltageDomain" + "type": "VoltageDomain" }, "cache_line_size": 64, + "boot_osflags": "a", + "physmem": { + "range": "0:134217727", + "latency": 30000, + "name": "physmem", + "eventq_index": 0, + "clk_domain": "system.clk_domain", + "latency_var": 0, + "bandwidth": "73.000000", + "conf_table_reported": true, + "cxx_class": "SimpleMemory", + "path": "system.physmem", + "null": false, + "type": "SimpleMemory", + "port": { + "peer": "system.membus.master[0]", + "role": "SLAVE" + }, + "in_addr_map": true + }, "work_cpus_ckpt_count": 0, "work_begin_exit_count": 0, "path": "system", "cpu_clk_domain": { "name": "cpu_clk_domain", + "clock": [ + 500 + ], "init_perf_level": 0, + "voltage_domain": "system.voltage_domain", "eventq_index": 0, "cxx_class": "SrcClockDomain", "path": "system.cpu_clk_domain", @@ -142,7 +176,10 @@ "role": "SLAVE" }, "name": "toL2Bus", + "snoop_filter": null, + "clk_domain": "system.cpu_clk_domain", "header_cycles": 1, + "system": "system", "width": 8, "eventq_index": 0, "master": { @@ -151,9 +188,9 @@ ], "role": "MASTER" }, - "cxx_class": "CoherentBus", + "cxx_class": "CoherentXBar", "path": "system.toL2Bus", - "type": "CoherentBus", + "type": "CoherentXBar", "use_default_range": false }, "mem_mode": "atomic", @@ -164,11 +201,8 @@ "role": "MASTER" }, "load_addr_mask": 1099511627775, - "work_item_id": -1, - "num_work_ids": 16, "cpu": [ { - "simpoint_interval": 100000000, "do_statistics_insts": true, "numThreads": 1, "itb": { @@ -179,39 +213,39 @@ "type": "AlphaTLB", "size": 48 }, + "simulate_data_stalls": false, "function_trace": false, "do_checkpoint_insts": true, "cxx_class": "AtomicSimpleCPU", "max_loads_all_threads": 0, - "simpoint_profile": false, - "simulate_data_stalls": false, + "system": "system", + "clk_domain": "system.cpu_clk_domain", "function_trace_start": 0, "cpu_id": 0, "width": 1, + "checker": null, "eventq_index": 0, "do_quiesce": true, "type": "AtomicSimpleCPU", "fastmem": false, - "profile": 0.0, + "profile": 0, "icache_port": { "peer": "system.cpu0.icache.cpu_side", "role": "MASTER" }, "icache": { - "assoc": 1, - "mem_side": { - "peer": "system.toL2Bus.slave[0]", - "role": "MASTER" - }, - "cpu_side": { - "peer": "system.cpu0.icache_port", - "role": "SLAVE" - }, - "name": "icache", + "is_top_level": true, + "prefetcher": null, + "clk_domain": "system.cpu_clk_domain", + "write_buffers": 8, + "response_latency": 2, + "cxx_class": "BaseCache", + "size": 32768, "tags": { "name": "tags", "eventq_index": 0, "hit_latency": 2, + "clk_domain": "system.cpu_clk_domain", "sequential_access": false, "assoc": 1, "cxx_class": "LRU", @@ -220,22 +254,31 @@ "type": "LRU", "size": 32768 }, - "hit_latency": 2, - "mshrs": 4, - "response_latency": 2, - "is_top_level": true, - "tgts_per_mshr": 20, - "sequential_access": false, + "system": "system", "max_miss_count": 0, "eventq_index": 0, + "mem_side": { + "peer": "system.toL2Bus.slave[0]", + "role": "MASTER" + }, + "mshrs": 4, + "forward_snoops": true, + "hit_latency": 2, + "tgts_per_mshr": 20, + "addr_ranges": [ + "0:18446744073709551615" + ], + "assoc": 1, "prefetch_on_access": false, - "cxx_class": "BaseCache", "path": "system.cpu0.icache", - "write_buffers": 8, - "two_queue": false, + "name": "icache", "type": "BaseCache", - "forward_snoops": true, - "size": 32768 + "sequential_access": false, + "cpu_side": { + "peer": "system.cpu0.icache_port", + "role": "SLAVE" + }, + "two_queue": false }, "interrupts": { "eventq_index": 0, @@ -244,27 +287,30 @@ "name": "interrupts", "cxx_class": "AlphaISA::Interrupts" }, + "dcache_port": { + "peer": "system.cpu0.dcache.cpu_side", + "role": "MASTER" + }, "socket_id": 0, "max_insts_all_threads": 0, "path": "system.cpu0", - "isa": [ - { - "eventq_index": 0, - "path": "system.cpu0.isa", - "type": "AlphaISA", - "name": "isa", - "cxx_class": "AlphaISA::ISA" - } - ], + "max_loads_any_thread": 0, "switched_out": false, "workload": [ { "name": "workload", + "output": "cout", + "chkpt": "", + "errout": "cerr", + "system": "system", + "useArchPT": false, "eventq_index": 0, + "file": "/dist/m5/regression/test-progs/anagram/bin/alpha/eio/anagram-vshort.eio.gz", "cxx_class": "EioProcess", "path": "system.cpu0.workload", "max_stack_size": 67108864, - "type": "EioProcess" + "type": "EioProcess", + "input": "None" } ], "name": "cpu0", @@ -276,28 +322,24 @@ "type": "AlphaTLB", "size": 64 }, + "simpoint_start_insts": [], "max_insts_any_thread": 500000, "simulate_inst_stalls": false, - "progress_interval": 0.0, - "dcache_port": { - "peer": "system.cpu0.dcache.cpu_side", - "role": "MASTER" - }, + "progress_interval": 0, + "branchPred": null, "dcache": { - "assoc": 4, - "mem_side": { - "peer": "system.toL2Bus.slave[1]", - "role": "MASTER" - }, - "cpu_side": { - "peer": "system.cpu0.dcache_port", - "role": "SLAVE" - }, - "name": "dcache", + "is_top_level": true, + "prefetcher": null, + "clk_domain": "system.cpu_clk_domain", + "write_buffers": 8, + "response_latency": 2, + "cxx_class": "BaseCache", + "size": 32768, "tags": { "name": "tags", "eventq_index": 0, "hit_latency": 2, + "clk_domain": "system.cpu_clk_domain", "sequential_access": false, "assoc": 4, "cxx_class": "LRU", @@ -306,24 +348,42 @@ "type": "LRU", "size": 32768 }, - "hit_latency": 2, - "mshrs": 4, - "response_latency": 2, - "is_top_level": true, - "tgts_per_mshr": 20, - "sequential_access": false, + "system": "system", "max_miss_count": 0, "eventq_index": 0, + "mem_side": { + "peer": "system.toL2Bus.slave[1]", + "role": "MASTER" + }, + "mshrs": 4, + "forward_snoops": true, + "hit_latency": 2, + "tgts_per_mshr": 20, + "addr_ranges": [ + "0:18446744073709551615" + ], + "assoc": 4, "prefetch_on_access": false, - "cxx_class": "BaseCache", "path": "system.cpu0.dcache", - "write_buffers": 8, - "two_queue": false, + "name": "dcache", "type": "BaseCache", - "forward_snoops": true, - "size": 32768 + "sequential_access": false, + "cpu_side": { + "peer": "system.cpu0.dcache_port", + "role": "SLAVE" + }, + "two_queue": false }, - "max_loads_any_thread": 0, + "isa": [ + { + "name": "isa", + "system": "system", + "eventq_index": 0, + "cxx_class": "AlphaISA::ISA", + "path": "system.cpu0.isa", + "type": "AlphaISA" + } + ], "tracer": { "eventq_index": 0, "path": "system.cpu0.tracer", @@ -333,7 +393,6 @@ } }, { - "simpoint_interval": 100000000, "do_statistics_insts": true, "numThreads": 1, "itb": { @@ -344,39 +403,39 @@ "type": "AlphaTLB", "size": 48 }, + "simulate_data_stalls": false, "function_trace": false, "do_checkpoint_insts": true, "cxx_class": "AtomicSimpleCPU", "max_loads_all_threads": 0, - "simpoint_profile": false, - "simulate_data_stalls": false, + "system": "system", + "clk_domain": "system.cpu_clk_domain", "function_trace_start": 0, "cpu_id": 1, "width": 1, + "checker": null, "eventq_index": 0, "do_quiesce": true, "type": "AtomicSimpleCPU", "fastmem": false, - "profile": 0.0, + "profile": 0, "icache_port": { "peer": "system.cpu1.icache.cpu_side", "role": "MASTER" }, "icache": { - "assoc": 1, - "mem_side": { - "peer": "system.toL2Bus.slave[2]", - "role": "MASTER" - }, - "cpu_side": { - "peer": "system.cpu1.icache_port", - "role": "SLAVE" - }, - "name": "icache", + "is_top_level": true, + "prefetcher": null, + "clk_domain": "system.cpu_clk_domain", + "write_buffers": 8, + "response_latency": 2, + "cxx_class": "BaseCache", + "size": 32768, "tags": { "name": "tags", "eventq_index": 0, "hit_latency": 2, + "clk_domain": "system.cpu_clk_domain", "sequential_access": false, "assoc": 1, "cxx_class": "LRU", @@ -385,22 +444,31 @@ "type": "LRU", "size": 32768 }, - "hit_latency": 2, - "mshrs": 4, - "response_latency": 2, - "is_top_level": true, - "tgts_per_mshr": 20, - "sequential_access": false, + "system": "system", "max_miss_count": 0, "eventq_index": 0, + "mem_side": { + "peer": "system.toL2Bus.slave[2]", + "role": "MASTER" + }, + "mshrs": 4, + "forward_snoops": true, + "hit_latency": 2, + "tgts_per_mshr": 20, + "addr_ranges": [ + "0:18446744073709551615" + ], + "assoc": 1, "prefetch_on_access": false, - "cxx_class": "BaseCache", "path": "system.cpu1.icache", - "write_buffers": 8, - "two_queue": false, + "name": "icache", "type": "BaseCache", - "forward_snoops": true, - "size": 32768 + "sequential_access": false, + "cpu_side": { + "peer": "system.cpu1.icache_port", + "role": "SLAVE" + }, + "two_queue": false }, "interrupts": { "eventq_index": 0, @@ -409,27 +477,30 @@ "name": "interrupts", "cxx_class": "AlphaISA::Interrupts" }, + "dcache_port": { + "peer": "system.cpu1.dcache.cpu_side", + "role": "MASTER" + }, "socket_id": 0, "max_insts_all_threads": 0, "path": "system.cpu1", - "isa": [ - { - "eventq_index": 0, - "path": "system.cpu1.isa", - "type": "AlphaISA", - "name": "isa", - "cxx_class": "AlphaISA::ISA" - } - ], + "max_loads_any_thread": 0, "switched_out": false, "workload": [ { "name": "workload", + "output": "cout", + "chkpt": "", + "errout": "cerr", + "system": "system", + "useArchPT": false, "eventq_index": 0, + "file": "/dist/m5/regression/test-progs/anagram/bin/alpha/eio/anagram-vshort.eio.gz", "cxx_class": "EioProcess", "path": "system.cpu1.workload", "max_stack_size": 67108864, - "type": "EioProcess" + "type": "EioProcess", + "input": "None" } ], "name": "cpu1", @@ -441,28 +512,24 @@ "type": "AlphaTLB", "size": 64 }, + "simpoint_start_insts": [], "max_insts_any_thread": 500000, "simulate_inst_stalls": false, - "progress_interval": 0.0, - "dcache_port": { - "peer": "system.cpu1.dcache.cpu_side", - "role": "MASTER" - }, + "progress_interval": 0, + "branchPred": null, "dcache": { - "assoc": 4, - "mem_side": { - "peer": "system.toL2Bus.slave[3]", - "role": "MASTER" - }, - "cpu_side": { - "peer": "system.cpu1.dcache_port", - "role": "SLAVE" - }, - "name": "dcache", + "is_top_level": true, + "prefetcher": null, + "clk_domain": "system.cpu_clk_domain", + "write_buffers": 8, + "response_latency": 2, + "cxx_class": "BaseCache", + "size": 32768, "tags": { "name": "tags", "eventq_index": 0, "hit_latency": 2, + "clk_domain": "system.cpu_clk_domain", "sequential_access": false, "assoc": 4, "cxx_class": "LRU", @@ -471,24 +538,42 @@ "type": "LRU", "size": 32768 }, - "hit_latency": 2, - "mshrs": 4, - "response_latency": 2, - "is_top_level": true, - "tgts_per_mshr": 20, - "sequential_access": false, + "system": "system", "max_miss_count": 0, "eventq_index": 0, + "mem_side": { + "peer": "system.toL2Bus.slave[3]", + "role": "MASTER" + }, + "mshrs": 4, + "forward_snoops": true, + "hit_latency": 2, + "tgts_per_mshr": 20, + "addr_ranges": [ + "0:18446744073709551615" + ], + "assoc": 4, "prefetch_on_access": false, - "cxx_class": "BaseCache", "path": "system.cpu1.dcache", - "write_buffers": 8, - "two_queue": false, + "name": "dcache", "type": "BaseCache", - "forward_snoops": true, - "size": 32768 + "sequential_access": false, + "cpu_side": { + "peer": "system.cpu1.dcache_port", + "role": "SLAVE" + }, + "two_queue": false }, - "max_loads_any_thread": 0, + "isa": [ + { + "name": "isa", + "system": "system", + "eventq_index": 0, + "cxx_class": "AlphaISA::ISA", + "path": "system.cpu1.isa", + "type": "AlphaISA" + } + ], "tracer": { "eventq_index": 0, "path": "system.cpu1.tracer", @@ -498,7 +583,6 @@ } }, { - "simpoint_interval": 100000000, "do_statistics_insts": true, "numThreads": 1, "itb": { @@ -509,39 +593,39 @@ "type": "AlphaTLB", "size": 48 }, + "simulate_data_stalls": false, "function_trace": false, "do_checkpoint_insts": true, "cxx_class": "AtomicSimpleCPU", "max_loads_all_threads": 0, - "simpoint_profile": false, - "simulate_data_stalls": false, + "system": "system", + "clk_domain": "system.cpu_clk_domain", "function_trace_start": 0, "cpu_id": 2, "width": 1, + "checker": null, "eventq_index": 0, "do_quiesce": true, "type": "AtomicSimpleCPU", "fastmem": false, - "profile": 0.0, + "profile": 0, "icache_port": { "peer": "system.cpu2.icache.cpu_side", "role": "MASTER" }, "icache": { - "assoc": 1, - "mem_side": { - "peer": "system.toL2Bus.slave[4]", - "role": "MASTER" - }, - "cpu_side": { - "peer": "system.cpu2.icache_port", - "role": "SLAVE" - }, - "name": "icache", + "is_top_level": true, + "prefetcher": null, + "clk_domain": "system.cpu_clk_domain", + "write_buffers": 8, + "response_latency": 2, + "cxx_class": "BaseCache", + "size": 32768, "tags": { "name": "tags", "eventq_index": 0, "hit_latency": 2, + "clk_domain": "system.cpu_clk_domain", "sequential_access": false, "assoc": 1, "cxx_class": "LRU", @@ -550,22 +634,31 @@ "type": "LRU", "size": 32768 }, - "hit_latency": 2, - "mshrs": 4, - "response_latency": 2, - "is_top_level": true, - "tgts_per_mshr": 20, - "sequential_access": false, + "system": "system", "max_miss_count": 0, "eventq_index": 0, + "mem_side": { + "peer": "system.toL2Bus.slave[4]", + "role": "MASTER" + }, + "mshrs": 4, + "forward_snoops": true, + "hit_latency": 2, + "tgts_per_mshr": 20, + "addr_ranges": [ + "0:18446744073709551615" + ], + "assoc": 1, "prefetch_on_access": false, - "cxx_class": "BaseCache", "path": "system.cpu2.icache", - "write_buffers": 8, - "two_queue": false, + "name": "icache", "type": "BaseCache", - "forward_snoops": true, - "size": 32768 + "sequential_access": false, + "cpu_side": { + "peer": "system.cpu2.icache_port", + "role": "SLAVE" + }, + "two_queue": false }, "interrupts": { "eventq_index": 0, @@ -574,27 +667,30 @@ "name": "interrupts", "cxx_class": "AlphaISA::Interrupts" }, + "dcache_port": { + "peer": "system.cpu2.dcache.cpu_side", + "role": "MASTER" + }, "socket_id": 0, "max_insts_all_threads": 0, "path": "system.cpu2", - "isa": [ - { - "eventq_index": 0, - "path": "system.cpu2.isa", - "type": "AlphaISA", - "name": "isa", - "cxx_class": "AlphaISA::ISA" - } - ], + "max_loads_any_thread": 0, "switched_out": false, "workload": [ { "name": "workload", + "output": "cout", + "chkpt": "", + "errout": "cerr", + "system": "system", + "useArchPT": false, "eventq_index": 0, + "file": "/dist/m5/regression/test-progs/anagram/bin/alpha/eio/anagram-vshort.eio.gz", "cxx_class": "EioProcess", "path": "system.cpu2.workload", "max_stack_size": 67108864, - "type": "EioProcess" + "type": "EioProcess", + "input": "None" } ], "name": "cpu2", @@ -606,28 +702,24 @@ "type": "AlphaTLB", "size": 64 }, + "simpoint_start_insts": [], "max_insts_any_thread": 500000, "simulate_inst_stalls": false, - "progress_interval": 0.0, - "dcache_port": { - "peer": "system.cpu2.dcache.cpu_side", - "role": "MASTER" - }, + "progress_interval": 0, + "branchPred": null, "dcache": { - "assoc": 4, - "mem_side": { - "peer": "system.toL2Bus.slave[5]", - "role": "MASTER" - }, - "cpu_side": { - "peer": "system.cpu2.dcache_port", - "role": "SLAVE" - }, - "name": "dcache", + "is_top_level": true, + "prefetcher": null, + "clk_domain": "system.cpu_clk_domain", + "write_buffers": 8, + "response_latency": 2, + "cxx_class": "BaseCache", + "size": 32768, "tags": { "name": "tags", "eventq_index": 0, "hit_latency": 2, + "clk_domain": "system.cpu_clk_domain", "sequential_access": false, "assoc": 4, "cxx_class": "LRU", @@ -636,24 +728,42 @@ "type": "LRU", "size": 32768 }, - "hit_latency": 2, - "mshrs": 4, - "response_latency": 2, - "is_top_level": true, - "tgts_per_mshr": 20, - "sequential_access": false, + "system": "system", "max_miss_count": 0, "eventq_index": 0, + "mem_side": { + "peer": "system.toL2Bus.slave[5]", + "role": "MASTER" + }, + "mshrs": 4, + "forward_snoops": true, + "hit_latency": 2, + "tgts_per_mshr": 20, + "addr_ranges": [ + "0:18446744073709551615" + ], + "assoc": 4, "prefetch_on_access": false, - "cxx_class": "BaseCache", "path": "system.cpu2.dcache", - "write_buffers": 8, - "two_queue": false, + "name": "dcache", "type": "BaseCache", - "forward_snoops": true, - "size": 32768 + "sequential_access": false, + "cpu_side": { + "peer": "system.cpu2.dcache_port", + "role": "SLAVE" + }, + "two_queue": false }, - "max_loads_any_thread": 0, + "isa": [ + { + "name": "isa", + "system": "system", + "eventq_index": 0, + "cxx_class": "AlphaISA::ISA", + "path": "system.cpu2.isa", + "type": "AlphaISA" + } + ], "tracer": { "eventq_index": 0, "path": "system.cpu2.tracer", @@ -663,7 +773,6 @@ } }, { - "simpoint_interval": 100000000, "do_statistics_insts": true, "numThreads": 1, "itb": { @@ -674,39 +783,39 @@ "type": "AlphaTLB", "size": 48 }, + "simulate_data_stalls": false, "function_trace": false, "do_checkpoint_insts": true, "cxx_class": "AtomicSimpleCPU", "max_loads_all_threads": 0, - "simpoint_profile": false, - "simulate_data_stalls": false, + "system": "system", + "clk_domain": "system.cpu_clk_domain", "function_trace_start": 0, "cpu_id": 3, "width": 1, + "checker": null, "eventq_index": 0, "do_quiesce": true, "type": "AtomicSimpleCPU", "fastmem": false, - "profile": 0.0, + "profile": 0, "icache_port": { "peer": "system.cpu3.icache.cpu_side", "role": "MASTER" }, "icache": { - "assoc": 1, - "mem_side": { - "peer": "system.toL2Bus.slave[6]", - "role": "MASTER" - }, - "cpu_side": { - "peer": "system.cpu3.icache_port", - "role": "SLAVE" - }, - "name": "icache", + "is_top_level": true, + "prefetcher": null, + "clk_domain": "system.cpu_clk_domain", + "write_buffers": 8, + "response_latency": 2, + "cxx_class": "BaseCache", + "size": 32768, "tags": { "name": "tags", "eventq_index": 0, "hit_latency": 2, + "clk_domain": "system.cpu_clk_domain", "sequential_access": false, "assoc": 1, "cxx_class": "LRU", @@ -715,22 +824,31 @@ "type": "LRU", "size": 32768 }, - "hit_latency": 2, - "mshrs": 4, - "response_latency": 2, - "is_top_level": true, - "tgts_per_mshr": 20, - "sequential_access": false, + "system": "system", "max_miss_count": 0, "eventq_index": 0, + "mem_side": { + "peer": "system.toL2Bus.slave[6]", + "role": "MASTER" + }, + "mshrs": 4, + "forward_snoops": true, + "hit_latency": 2, + "tgts_per_mshr": 20, + "addr_ranges": [ + "0:18446744073709551615" + ], + "assoc": 1, "prefetch_on_access": false, - "cxx_class": "BaseCache", "path": "system.cpu3.icache", - "write_buffers": 8, - "two_queue": false, + "name": "icache", "type": "BaseCache", - "forward_snoops": true, - "size": 32768 + "sequential_access": false, + "cpu_side": { + "peer": "system.cpu3.icache_port", + "role": "SLAVE" + }, + "two_queue": false }, "interrupts": { "eventq_index": 0, @@ -739,27 +857,30 @@ "name": "interrupts", "cxx_class": "AlphaISA::Interrupts" }, + "dcache_port": { + "peer": "system.cpu3.dcache.cpu_side", + "role": "MASTER" + }, "socket_id": 0, "max_insts_all_threads": 0, "path": "system.cpu3", - "isa": [ - { - "eventq_index": 0, - "path": "system.cpu3.isa", - "type": "AlphaISA", - "name": "isa", - "cxx_class": "AlphaISA::ISA" - } - ], + "max_loads_any_thread": 0, "switched_out": false, "workload": [ { "name": "workload", + "output": "cout", + "chkpt": "", + "errout": "cerr", + "system": "system", + "useArchPT": false, "eventq_index": 0, + "file": "/dist/m5/regression/test-progs/anagram/bin/alpha/eio/anagram-vshort.eio.gz", "cxx_class": "EioProcess", "path": "system.cpu3.workload", "max_stack_size": 67108864, - "type": "EioProcess" + "type": "EioProcess", + "input": "None" } ], "name": "cpu3", @@ -771,28 +892,24 @@ "type": "AlphaTLB", "size": 64 }, + "simpoint_start_insts": [], "max_insts_any_thread": 500000, "simulate_inst_stalls": false, - "progress_interval": 0.0, - "dcache_port": { - "peer": "system.cpu3.dcache.cpu_side", - "role": "MASTER" - }, + "progress_interval": 0, + "branchPred": null, "dcache": { - "assoc": 4, - "mem_side": { - "peer": "system.toL2Bus.slave[7]", - "role": "MASTER" - }, - "cpu_side": { - "peer": "system.cpu3.dcache_port", - "role": "SLAVE" - }, - "name": "dcache", + "is_top_level": true, + "prefetcher": null, + "clk_domain": "system.cpu_clk_domain", + "write_buffers": 8, + "response_latency": 2, + "cxx_class": "BaseCache", + "size": 32768, "tags": { "name": "tags", "eventq_index": 0, "hit_latency": 2, + "clk_domain": "system.cpu_clk_domain", "sequential_access": false, "assoc": 4, "cxx_class": "LRU", @@ -801,24 +918,42 @@ "type": "LRU", "size": 32768 }, - "hit_latency": 2, - "mshrs": 4, - "response_latency": 2, - "is_top_level": true, - "tgts_per_mshr": 20, - "sequential_access": false, + "system": "system", "max_miss_count": 0, "eventq_index": 0, + "mem_side": { + "peer": "system.toL2Bus.slave[7]", + "role": "MASTER" + }, + "mshrs": 4, + "forward_snoops": true, + "hit_latency": 2, + "tgts_per_mshr": 20, + "addr_ranges": [ + "0:18446744073709551615" + ], + "assoc": 4, "prefetch_on_access": false, - "cxx_class": "BaseCache", "path": "system.cpu3.dcache", - "write_buffers": 8, - "two_queue": false, + "name": "dcache", "type": "BaseCache", - "forward_snoops": true, - "size": 32768 + "sequential_access": false, + "cpu_side": { + "peer": "system.cpu3.dcache_port", + "role": "SLAVE" + }, + "two_queue": false }, - "max_loads_any_thread": 0, + "isa": [ + { + "name": "isa", + "system": "system", + "eventq_index": 0, + "cxx_class": "AlphaISA::ISA", + "path": "system.cpu3.isa", + "type": "AlphaISA" + } + ], "tracer": { "eventq_index": 0, "path": "system.cpu3.tracer", @@ -828,11 +963,13 @@ } } ], + "num_work_ids": 16, + "work_item_id": -1, "work_begin_cpu_id_exit": -1 }, - "time_sync_period": 0.1, + "time_sync_period": 100000000000, "eventq_index": 0, - "time_sync_spin_threshold": 9.999999999999999e-05, + "time_sync_spin_threshold": 100000000, "cxx_class": "Root", "path": "root", "time_sync_enable": false, diff --git a/tests/quick/se/30.eio-mp/ref/alpha/eio/simple-atomic-mp/simerr b/tests/quick/se/30.eio-mp/ref/alpha/eio/simple-atomic-mp/simerr index 7bec60132..193b4989f 100755 --- a/tests/quick/se/30.eio-mp/ref/alpha/eio/simple-atomic-mp/simerr +++ b/tests/quick/se/30.eio-mp/ref/alpha/eio/simple-atomic-mp/simerr @@ -7,5 +7,4 @@ gzip: stdout: Broken pipe gzip: stdout: Broken pipe gzip: stdout: Broken pipe - -gzip: stdout: Broken pipe +stdout: Broken pipe diff --git a/tests/quick/se/30.eio-mp/ref/alpha/eio/simple-atomic-mp/simout b/tests/quick/se/30.eio-mp/ref/alpha/eio/simple-atomic-mp/simout index 7301ae168..0ed1fc9c8 100755 --- a/tests/quick/se/30.eio-mp/ref/alpha/eio/simple-atomic-mp/simout +++ b/tests/quick/se/30.eio-mp/ref/alpha/eio/simple-atomic-mp/simout @@ -1,8 +1,8 @@ gem5 Simulator System. http://gem5.org gem5 is copyrighted software; use the --copyright option for details. -gem5 compiled May 10 2014 16:25:16 -gem5 started May 10 2014 16:55:31 +gem5 compiled Sep 21 2014 15:53:23 +gem5 started Sep 21 2014 16:10:49 gem5 executing on zizzer command line: build/ALPHA/gem5.opt -d build/ALPHA/tests/opt/quick/se/30.eio-mp/alpha/eio/simple-atomic-mp -re /z/stever/hg/gem5/tests/run.py build/ALPHA/tests/opt/quick/se/30.eio-mp/alpha/eio/simple-atomic-mp Global frequency set at 1000000000000 ticks per second diff --git a/tests/quick/se/30.eio-mp/ref/alpha/eio/simple-atomic-mp/stats.txt b/tests/quick/se/30.eio-mp/ref/alpha/eio/simple-atomic-mp/stats.txt index 7757fcfab..ee7e01f12 100644 --- a/tests/quick/se/30.eio-mp/ref/alpha/eio/simple-atomic-mp/stats.txt +++ b/tests/quick/se/30.eio-mp/ref/alpha/eio/simple-atomic-mp/stats.txt @@ -4,11 +4,11 @@ sim_seconds 0.000250 # Nu sim_ticks 250015500 # Number of ticks simulated final_tick 250015500 # Number of ticks from beginning of simulation (restored from checkpoints and never reset) sim_freq 1000000000000 # Frequency of simulated ticks -host_inst_rate 2755592 # Simulator instruction rate (inst/s) -host_op_rate 2755527 # Simulator op (including micro ops) rate (op/s) -host_tick_rate 344450673 # Simulator tick rate (ticks/s) -host_mem_usage 240516 # Number of bytes of host memory used -host_seconds 0.73 # Real time elapsed on the host +host_inst_rate 2852799 # Simulator instruction rate (inst/s) +host_op_rate 2852705 # Simulator op (including micro ops) rate (op/s) +host_tick_rate 356601416 # Simulator tick rate (ticks/s) +host_mem_usage 239540 # Number of bytes of host memory used +host_seconds 0.70 # Real time elapsed on the host sim_insts 2000004 # Number of instructions simulated sim_ops 2000004 # Number of ops (including micro ops) simulated system.voltage_domain.voltage 1 # Voltage in Volts @@ -59,9 +59,25 @@ system.physmem.bw_total::cpu2.data 116216795 # To system.physmem.bw_total::cpu3.inst 103161604 # Total bandwidth to/from this memory (bytes/s) system.physmem.bw_total::cpu3.data 116216795 # Total bandwidth to/from this memory (bytes/s) system.physmem.bw_total::total 877513594 # Total bandwidth to/from this memory (bytes/s) -system.membus.throughput 877513594 # Throughput (bytes/s) -system.membus.data_through_bus 219392 # Total data (bytes) -system.membus.snoop_data_through_bus 0 # Total snoop data (bytes) +system.membus.trans_dist::ReadReq 2872 # Transaction distribution +system.membus.trans_dist::ReadResp 2872 # Transaction distribution +system.membus.trans_dist::ReadExReq 556 # Transaction distribution +system.membus.trans_dist::ReadExResp 556 # Transaction distribution +system.membus.pkt_count_system.l2c.mem_side::system.physmem.port 6856 # Packet count per connected master and slave (bytes) +system.membus.pkt_count::total 6856 # Packet count per connected master and slave (bytes) +system.membus.pkt_size_system.l2c.mem_side::system.physmem.port 219392 # Cumulative packet size per connected master and slave (bytes) +system.membus.pkt_size::total 219392 # Cumulative packet size per connected master and slave (bytes) +system.membus.snoops 0 # Total snoops (count) +system.membus.snoop_fanout::samples 3428 # Request fanout histogram +system.membus.snoop_fanout::mean 0 # Request fanout histogram +system.membus.snoop_fanout::stdev 0 # Request fanout histogram +system.membus.snoop_fanout::underflows 0 0.00% 0.00% # Request fanout histogram +system.membus.snoop_fanout::0 3428 100.00% 100.00% # Request fanout histogram +system.membus.snoop_fanout::1 0 0.00% 100.00% # Request fanout histogram +system.membus.snoop_fanout::overflows 0 0.00% 100.00% # Request fanout histogram +system.membus.snoop_fanout::min_value 0 # Request fanout histogram +system.membus.snoop_fanout::max_value 0 # Request fanout histogram +system.membus.snoop_fanout::total 3428 # Request fanout histogram system.cpu_clk_domain.clock 500 # Clock period in ticks system.l2c.tags.replacements 0 # number of replacements system.l2c.tags.tagsinuse 1962.780232 # Cycle average of tags in use @@ -231,9 +247,47 @@ system.l2c.avg_blocked_cycles::no_targets nan # a system.l2c.fast_writes 0 # number of fast writes performed system.l2c.cache_copies 0 # number of cache copies performed system.l2c.no_allocate_misses 0 # Number of misses that were no-allocate -system.toL2Bus.throughput 977859373 # Throughput (bytes/s) -system.toL2Bus.data_through_bus 244480 # Total data (bytes) -system.toL2Bus.snoop_data_through_bus 0 # Total snoop data (bytes) +system.toL2Bus.trans_dist::ReadReq 3148 # Transaction distribution +system.toL2Bus.trans_dist::ReadResp 3148 # Transaction distribution +system.toL2Bus.trans_dist::Writeback 116 # Transaction distribution +system.toL2Bus.trans_dist::ReadExReq 556 # Transaction distribution +system.toL2Bus.trans_dist::ReadExResp 556 # Transaction distribution +system.toL2Bus.pkt_count_system.cpu0.icache.mem_side::system.l2c.cpu_side 926 # Packet count per connected master and slave (bytes) +system.toL2Bus.pkt_count_system.cpu0.dcache.mem_side::system.l2c.cpu_side 955 # Packet count per connected master and slave (bytes) +system.toL2Bus.pkt_count_system.cpu1.icache.mem_side::system.l2c.cpu_side 926 # Packet count per connected master and slave (bytes) +system.toL2Bus.pkt_count_system.cpu1.dcache.mem_side::system.l2c.cpu_side 955 # Packet count per connected master and slave (bytes) +system.toL2Bus.pkt_count_system.cpu2.icache.mem_side::system.l2c.cpu_side 926 # Packet count per connected master and slave (bytes) +system.toL2Bus.pkt_count_system.cpu2.dcache.mem_side::system.l2c.cpu_side 955 # Packet count per connected master and slave (bytes) +system.toL2Bus.pkt_count_system.cpu3.icache.mem_side::system.l2c.cpu_side 926 # Packet count per connected master and slave (bytes) +system.toL2Bus.pkt_count_system.cpu3.dcache.mem_side::system.l2c.cpu_side 955 # Packet count per connected master and slave (bytes) +system.toL2Bus.pkt_count::total 7524 # Packet count per connected master and slave (bytes) +system.toL2Bus.pkt_size_system.cpu0.icache.mem_side::system.l2c.cpu_side 29632 # Cumulative packet size per connected master and slave (bytes) +system.toL2Bus.pkt_size_system.cpu0.dcache.mem_side::system.l2c.cpu_side 31488 # Cumulative packet size per connected master and slave (bytes) +system.toL2Bus.pkt_size_system.cpu1.icache.mem_side::system.l2c.cpu_side 29632 # Cumulative packet size per connected master and slave (bytes) +system.toL2Bus.pkt_size_system.cpu1.dcache.mem_side::system.l2c.cpu_side 31488 # Cumulative packet size per connected master and slave (bytes) +system.toL2Bus.pkt_size_system.cpu2.icache.mem_side::system.l2c.cpu_side 29632 # Cumulative packet size per connected master and slave (bytes) +system.toL2Bus.pkt_size_system.cpu2.dcache.mem_side::system.l2c.cpu_side 31488 # Cumulative packet size per connected master and slave (bytes) +system.toL2Bus.pkt_size_system.cpu3.icache.mem_side::system.l2c.cpu_side 29632 # Cumulative packet size per connected master and slave (bytes) +system.toL2Bus.pkt_size_system.cpu3.dcache.mem_side::system.l2c.cpu_side 31488 # Cumulative packet size per connected master and slave (bytes) +system.toL2Bus.pkt_size::total 244480 # Cumulative packet size per connected master and slave (bytes) +system.toL2Bus.snoops 0 # Total snoops (count) +system.toL2Bus.snoop_fanout::samples 3820 # Request fanout histogram +system.toL2Bus.snoop_fanout::mean 7 # Request fanout histogram +system.toL2Bus.snoop_fanout::stdev 0 # Request fanout histogram +system.toL2Bus.snoop_fanout::underflows 0 0.00% 0.00% # Request fanout histogram +system.toL2Bus.snoop_fanout::0 0 0.00% 0.00% # Request fanout histogram +system.toL2Bus.snoop_fanout::1 0 0.00% 0.00% # Request fanout histogram +system.toL2Bus.snoop_fanout::2 0 0.00% 0.00% # Request fanout histogram +system.toL2Bus.snoop_fanout::3 0 0.00% 0.00% # Request fanout histogram +system.toL2Bus.snoop_fanout::4 0 0.00% 0.00% # Request fanout histogram +system.toL2Bus.snoop_fanout::5 0 0.00% 0.00% # Request fanout histogram +system.toL2Bus.snoop_fanout::6 0 0.00% 0.00% # Request fanout histogram +system.toL2Bus.snoop_fanout::7 3820 100.00% 100.00% # Request fanout histogram +system.toL2Bus.snoop_fanout::8 0 0.00% 100.00% # Request fanout histogram +system.toL2Bus.snoop_fanout::overflows 0 0.00% 100.00% # Request fanout histogram +system.toL2Bus.snoop_fanout::min_value 7 # Request fanout histogram +system.toL2Bus.snoop_fanout::max_value 7 # Request fanout histogram +system.toL2Bus.snoop_fanout::total 3820 # Request fanout histogram system.cpu0.dtb.fetch_hits 0 # ITB hits system.cpu0.dtb.fetch_misses 0 # ITB misses system.cpu0.dtb.fetch_acv 0 # ITB acv diff --git a/tests/quick/se/30.eio-mp/ref/alpha/eio/simple-timing-mp/config.ini b/tests/quick/se/30.eio-mp/ref/alpha/eio/simple-timing-mp/config.ini index e4dca8242..0679aa6bf 100644 --- a/tests/quick/se/30.eio-mp/ref/alpha/eio/simple-timing-mp/config.ini +++ b/tests/quick/se/30.eio-mp/ref/alpha/eio/simple-timing-mp/config.ini @@ -174,11 +174,12 @@ type=EioProcess chkpt= errout=cerr eventq_index=0 -file=/scratch/nilay/GEM5/gem5/tests/test-progs/anagram/bin/alpha/eio/anagram-vshort.eio.gz +file=/dist/m5/regression/test-progs/anagram/bin/alpha/eio/anagram-vshort.eio.gz input=None max_stack_size=67108864 output=cout system=system +useArchPT=false [system.cpu1] type=TimingSimpleCPU @@ -311,11 +312,12 @@ type=EioProcess chkpt= errout=cerr eventq_index=0 -file=/scratch/nilay/GEM5/gem5/tests/test-progs/anagram/bin/alpha/eio/anagram-vshort.eio.gz +file=/dist/m5/regression/test-progs/anagram/bin/alpha/eio/anagram-vshort.eio.gz input=None max_stack_size=67108864 output=cout system=system +useArchPT=false [system.cpu2] type=TimingSimpleCPU @@ -448,11 +450,12 @@ type=EioProcess chkpt= errout=cerr eventq_index=0 -file=/scratch/nilay/GEM5/gem5/tests/test-progs/anagram/bin/alpha/eio/anagram-vshort.eio.gz +file=/dist/m5/regression/test-progs/anagram/bin/alpha/eio/anagram-vshort.eio.gz input=None max_stack_size=67108864 output=cout system=system +useArchPT=false [system.cpu3] type=TimingSimpleCPU @@ -585,11 +588,12 @@ type=EioProcess chkpt= errout=cerr eventq_index=0 -file=/scratch/nilay/GEM5/gem5/tests/test-progs/anagram/bin/alpha/eio/anagram-vshort.eio.gz +file=/dist/m5/regression/test-progs/anagram/bin/alpha/eio/anagram-vshort.eio.gz input=None max_stack_size=67108864 output=cout system=system +useArchPT=false [system.cpu_clk_domain] type=SrcClockDomain @@ -643,10 +647,11 @@ sequential_access=false size=4194304 [system.membus] -type=CoherentBus +type=CoherentXBar clk_domain=system.clk_domain eventq_index=0 header_cycles=1 +snoop_filter=Null system=system use_default_range=false width=8 @@ -667,10 +672,11 @@ range=0:134217727 port=system.membus.master[0] [system.toL2Bus] -type=CoherentBus +type=CoherentXBar clk_domain=system.cpu_clk_domain eventq_index=0 header_cycles=1 +snoop_filter=Null system=system use_default_range=false width=8 diff --git a/tests/quick/se/30.eio-mp/ref/alpha/eio/simple-timing-mp/config.json b/tests/quick/se/30.eio-mp/ref/alpha/eio/simple-timing-mp/config.json index 81af59151..0d2ee3731 100644 --- a/tests/quick/se/30.eio-mp/ref/alpha/eio/simple-timing-mp/config.json +++ b/tests/quick/se/30.eio-mp/ref/alpha/eio/simple-timing-mp/config.json @@ -2,44 +2,20 @@ "name": null, "sim_quantum": 0, "system": { - "membus": { - "slave": { - "peer": [ - "system.system_port", - "system.l2c.mem_side" - ], - "role": "SLAVE" - }, - "name": "membus", - "header_cycles": 1, - "width": 8, - "eventq_index": 0, - "master": { - "peer": [ - "system.physmem.port" - ], - "role": "MASTER" - }, - "cxx_class": "CoherentBus", - "path": "system.membus", - "type": "CoherentBus", - "use_default_range": false - }, + "kernel": "", "l2c": { - "assoc": 8, - "mem_side": { - "peer": "system.membus.slave[1]", - "role": "MASTER" - }, - "cpu_side": { - "peer": "system.toL2Bus.master[0]", - "role": "SLAVE" - }, - "name": "l2c", + "is_top_level": false, + "prefetcher": null, + "clk_domain": "system.cpu_clk_domain", + "write_buffers": 8, + "response_latency": 20, + "cxx_class": "BaseCache", + "size": 4194304, "tags": { "name": "tags", "eventq_index": 0, "hit_latency": 20, + "clk_domain": "system.cpu_clk_domain", "sequential_access": false, "assoc": 8, "cxx_class": "LRU", @@ -48,79 +24,137 @@ "type": "LRU", "size": 4194304 }, - "hit_latency": 20, - "mshrs": 20, - "response_latency": 20, - "is_top_level": false, - "tgts_per_mshr": 12, - "sequential_access": false, + "system": "system", "max_miss_count": 0, "eventq_index": 0, + "mem_side": { + "peer": "system.membus.slave[1]", + "role": "MASTER" + }, + "mshrs": 20, + "forward_snoops": true, + "hit_latency": 20, + "tgts_per_mshr": 12, + "addr_ranges": [ + "0:18446744073709551615" + ], + "assoc": 8, "prefetch_on_access": false, - "cxx_class": "BaseCache", "path": "system.l2c", - "write_buffers": 8, - "two_queue": false, + "name": "l2c", "type": "BaseCache", - "forward_snoops": true, - "size": 4194304 + "sequential_access": false, + "cpu_side": { + "peer": "system.toL2Bus.master[0]", + "role": "SLAVE" + }, + "two_queue": false }, "kernel_addr_check": true, - "physmem": { - "latency": 3.0000000000000004e-08, - "name": "physmem", - "eventq_index": 0, - "latency_var": 0.0, - "conf_table_reported": true, - "cxx_class": "SimpleMemory", - "path": "system.physmem", - "null": false, - "type": "SimpleMemory", - "port": { - "peer": "system.membus.master[0]", + "membus": { + "slave": { + "peer": [ + "system.system_port", + "system.l2c.mem_side" + ], "role": "SLAVE" }, - "in_addr_map": true + "name": "membus", + "snoop_filter": null, + "clk_domain": "system.clk_domain", + "header_cycles": 1, + "system": "system", + "width": 8, + "eventq_index": 0, + "master": { + "peer": [ + "system.physmem.port" + ], + "role": "MASTER" + }, + "cxx_class": "CoherentXBar", + "path": "system.membus", + "type": "CoherentXBar", + "use_default_range": false }, + "symbolfile": "", + "readfile": "", "cxx_class": "System", "load_offset": 0, "work_end_ckpt_count": 0, + "memories": [ + "system.physmem" + ], "work_begin_ckpt_count": 0, "clk_domain": { "name": "clk_domain", + "clock": [ + 1000 + ], "init_perf_level": 0, + "voltage_domain": "system.voltage_domain", "eventq_index": 0, "cxx_class": "SrcClockDomain", "path": "system.clk_domain", "type": "SrcClockDomain", "domain_id": -1 }, + "mem_ranges": [], "eventq_index": 0, "dvfs_handler": { "enable": false, "name": "dvfs_handler", - "transition_latency": 9.999999999999999e-05, + "sys_clk_domain": "system.clk_domain", + "transition_latency": 100000000, "eventq_index": 0, "cxx_class": "DVFSHandler", + "domains": [], "path": "system.dvfs_handler", "type": "DVFSHandler" }, "work_end_exit_count": 0, "type": "System", "voltage_domain": { + "name": "voltage_domain", "eventq_index": 0, + "voltage": [ + "1.0" + ], + "cxx_class": "VoltageDomain", "path": "system.voltage_domain", - "type": "VoltageDomain", - "name": "voltage_domain", - "cxx_class": "VoltageDomain" + "type": "VoltageDomain" }, "cache_line_size": 64, + "boot_osflags": "a", + "physmem": { + "range": "0:134217727", + "latency": 30000, + "name": "physmem", + "eventq_index": 0, + "clk_domain": "system.clk_domain", + "latency_var": 0, + "bandwidth": "73.000000", + "conf_table_reported": true, + "cxx_class": "SimpleMemory", + "path": "system.physmem", + "null": false, + "type": "SimpleMemory", + "port": { + "peer": "system.membus.master[0]", + "role": "SLAVE" + }, + "in_addr_map": true + }, "work_cpus_ckpt_count": 0, "work_begin_exit_count": 0, "path": "system", "cpu_clk_domain": { "name": "cpu_clk_domain", + "clock": [ + 500 + ], "init_perf_level": 0, + "voltage_domain": "system.voltage_domain", "eventq_index": 0, "cxx_class": "SrcClockDomain", "path": "system.cpu_clk_domain", @@ -142,7 +176,10 @@ "role": "SLAVE" }, "name": "toL2Bus", + "snoop_filter": null, + "clk_domain": "system.cpu_clk_domain", "header_cycles": 1, + "system": "system", "width": 8, "eventq_index": 0, "master": { @@ -151,9 +188,9 @@ ], "role": "MASTER" }, - "cxx_class": "CoherentBus", + "cxx_class": "CoherentXBar", "path": "system.toL2Bus", - "type": "CoherentBus", + "type": "CoherentXBar", "use_default_range": false }, "mem_mode": "timing", @@ -164,8 +201,6 @@ "role": "MASTER" }, "load_addr_mask": 1099511627775, - "work_item_id": -1, - "num_work_ids": 16, "cpu": [ { "do_statistics_insts": true, @@ -178,74 +213,36 @@ "type": "AlphaTLB", "size": 48 }, - "dcache": { - "assoc": 4, - "mem_side": { - "peer": "system.toL2Bus.slave[1]", - "role": "MASTER" - }, - "cpu_side": { - "peer": "system.cpu0.dcache_port", - "role": "SLAVE" - }, - "name": "dcache", - "tags": { - "name": "tags", - "eventq_index": 0, - "hit_latency": 2, - "sequential_access": false, - "assoc": 4, - "cxx_class": "LRU", - "path": "system.cpu0.dcache.tags", - "block_size": 64, - "type": "LRU", - "size": 32768 - }, - "hit_latency": 2, - "mshrs": 4, - "response_latency": 2, - "is_top_level": true, - "tgts_per_mshr": 20, - "sequential_access": false, - "max_miss_count": 0, - "eventq_index": 0, - "prefetch_on_access": false, - "cxx_class": "BaseCache", - "path": "system.cpu0.dcache", - "write_buffers": 8, - "two_queue": false, - "type": "BaseCache", - "forward_snoops": true, - "size": 32768 - }, + "system": "system", + "function_trace": false, "do_checkpoint_insts": true, "cxx_class": "TimingSimpleCPU", "max_loads_all_threads": 0, + "clk_domain": "system.cpu_clk_domain", "function_trace_start": 0, "cpu_id": 0, + "checker": null, "eventq_index": 0, "do_quiesce": true, "type": "TimingSimpleCPU", - "profile": 0.0, + "profile": 0, "icache_port": { "peer": "system.cpu0.icache.cpu_side", "role": "MASTER" }, "icache": { - "assoc": 1, - "mem_side": { - "peer": "system.toL2Bus.slave[0]", - "role": "MASTER" - }, - "cpu_side": { - "peer": "system.cpu0.icache_port", - "role": "SLAVE" - }, - "name": "icache", + "is_top_level": true, + "prefetcher": null, + "clk_domain": "system.cpu_clk_domain", + "write_buffers": 8, + "response_latency": 2, + "cxx_class": "BaseCache", + "size": 32768, "tags": { "name": "tags", "eventq_index": 0, "hit_latency": 2, + "clk_domain": "system.cpu_clk_domain", "sequential_access": false, "assoc": 1, "cxx_class": "LRU", @@ -254,22 +251,31 @@ "type": "LRU", "size": 32768 }, - "hit_latency": 2, - "mshrs": 4, - "response_latency": 2, - "is_top_level": true, - "tgts_per_mshr": 20, - "sequential_access": false, + "system": "system", "max_miss_count": 0, "eventq_index": 0, + "mem_side": { + "peer": "system.toL2Bus.slave[0]", + "role": "MASTER" + }, + "mshrs": 4, + "forward_snoops": true, + "hit_latency": 2, + "tgts_per_mshr": 20, + "addr_ranges": [ + "0:18446744073709551615" + ], + "assoc": 1, "prefetch_on_access": false, - "cxx_class": "BaseCache", "path": "system.cpu0.icache", - "write_buffers": 8, - "two_queue": false, + "name": "icache", "type": "BaseCache", - "forward_snoops": true, - "size": 32768 + "sequential_access": false, + "cpu_side": { + "peer": "system.cpu0.icache_port", + "role": "SLAVE" + }, + "two_queue": false }, "interrupts": { "eventq_index": 0, @@ -278,27 +284,30 @@ "name": "interrupts", "cxx_class": "AlphaISA::Interrupts" }, + "dcache_port": { + "peer": "system.cpu0.dcache.cpu_side", + "role": "MASTER" + }, "socket_id": 0, "max_insts_all_threads": 0, "path": "system.cpu0", - "isa": [ - { - "eventq_index": 0, - "path": "system.cpu0.isa", - "type": "AlphaISA", - "name": "isa", - "cxx_class": "AlphaISA::ISA" - } - ], + "max_loads_any_thread": 0, "switched_out": false, "workload": [ { "name": "workload", + "output": "cout", + "chkpt": "", + "errout": "cerr", + "system": "system", + "useArchPT": false, "eventq_index": 0, + "file": "/dist/m5/regression/test-progs/anagram/bin/alpha/eio/anagram-vshort.eio.gz", "cxx_class": "EioProcess", "path": "system.cpu0.workload", "max_stack_size": 67108864, - "type": "EioProcess" + "type": "EioProcess", + "input": "None" } ], "name": "cpu0", @@ -310,14 +319,67 @@ "type": "AlphaTLB", "size": 64 }, + "simpoint_start_insts": [], "max_insts_any_thread": 500000, - "progress_interval": 0.0, - "dcache_port": { - "peer": "system.cpu0.dcache.cpu_side", - "role": "MASTER" + "progress_interval": 0, + "branchPred": null, + "dcache": { + "is_top_level": true, + "prefetcher": null, + "clk_domain": "system.cpu_clk_domain", + "write_buffers": 8, + "response_latency": 2, + "cxx_class": "BaseCache", + "size": 32768, + "tags": { + "name": "tags", + "eventq_index": 0, + "hit_latency": 2, + "clk_domain": "system.cpu_clk_domain", + "sequential_access": false, + "assoc": 4, + "cxx_class": "LRU", + "path": "system.cpu0.dcache.tags", + "block_size": 64, + "type": "LRU", + "size": 32768 + }, + "system": "system", + "max_miss_count": 0, + "eventq_index": 0, + "mem_side": { + "peer": "system.toL2Bus.slave[1]", + "role": "MASTER" + }, + "mshrs": 4, + "forward_snoops": true, + "hit_latency": 2, + "tgts_per_mshr": 20, + "addr_ranges": [ + "0:18446744073709551615" + ], + "assoc": 4, + "prefetch_on_access": false, + "path": "system.cpu0.dcache", + "name": "dcache", + "type": "BaseCache", + "sequential_access": false, + "cpu_side": { + "peer": "system.cpu0.dcache_port", + "role": "SLAVE" + }, + "two_queue": false }, - "function_trace": false, - "max_loads_any_thread": 0, + "isa": [ + { + "name": "isa", + "system": "system", + "eventq_index": 0, + "cxx_class": "AlphaISA::ISA", + "path": "system.cpu0.isa", + "type": "AlphaISA" + } + ], "tracer": { "eventq_index": 0, "path": "system.cpu0.tracer", @@ -337,74 +399,36 @@ "type": "AlphaTLB", "size": 48 }, - "dcache": { - "assoc": 4, - "mem_side": { - "peer": "system.toL2Bus.slave[3]", - "role": "MASTER" - }, - "cpu_side": { - "peer": "system.cpu1.dcache_port", - "role": "SLAVE" - }, - "name": "dcache", - "tags": { - "name": "tags", - "eventq_index": 0, - "hit_latency": 2, - "sequential_access": false, - "assoc": 4, - "cxx_class": "LRU", - "path": "system.cpu1.dcache.tags", - "block_size": 64, - "type": "LRU", - "size": 32768 - }, - "hit_latency": 2, - "mshrs": 4, - "response_latency": 2, - "is_top_level": true, - "tgts_per_mshr": 20, - "sequential_access": false, - "max_miss_count": 0, - "eventq_index": 0, - "prefetch_on_access": false, - "cxx_class": "BaseCache", - "path": "system.cpu1.dcache", - "write_buffers": 8, - "two_queue": false, - "type": "BaseCache", - "forward_snoops": true, - "size": 32768 - }, + "system": "system", + "function_trace": false, "do_checkpoint_insts": true, "cxx_class": "TimingSimpleCPU", "max_loads_all_threads": 0, + "clk_domain": "system.cpu_clk_domain", "function_trace_start": 0, "cpu_id": 1, + "checker": null, "eventq_index": 0, "do_quiesce": true, "type": "TimingSimpleCPU", - "profile": 0.0, + "profile": 0, "icache_port": { "peer": "system.cpu1.icache.cpu_side", "role": "MASTER" }, "icache": { - "assoc": 1, - "mem_side": { - "peer": "system.toL2Bus.slave[2]", - "role": "MASTER" - }, - "cpu_side": { - "peer": "system.cpu1.icache_port", - "role": "SLAVE" - }, - "name": "icache", + "is_top_level": true, + "prefetcher": null, + "clk_domain": "system.cpu_clk_domain", + "write_buffers": 8, + "response_latency": 2, + "cxx_class": "BaseCache", + "size": 32768, "tags": { "name": "tags", "eventq_index": 0, "hit_latency": 2, + "clk_domain": "system.cpu_clk_domain", "sequential_access": false, "assoc": 1, "cxx_class": "LRU", @@ -413,22 +437,31 @@ "type": "LRU", "size": 32768 }, - "hit_latency": 2, - "mshrs": 4, - "response_latency": 2, - "is_top_level": true, - "tgts_per_mshr": 20, - "sequential_access": false, + "system": "system", "max_miss_count": 0, "eventq_index": 0, + "mem_side": { + "peer": "system.toL2Bus.slave[2]", + "role": "MASTER" + }, + "mshrs": 4, + "forward_snoops": true, + "hit_latency": 2, + "tgts_per_mshr": 20, + "addr_ranges": [ + "0:18446744073709551615" + ], + "assoc": 1, "prefetch_on_access": false, - "cxx_class": "BaseCache", "path": "system.cpu1.icache", - "write_buffers": 8, - "two_queue": false, + "name": "icache", "type": "BaseCache", - "forward_snoops": true, - "size": 32768 + "sequential_access": false, + "cpu_side": { + "peer": "system.cpu1.icache_port", + "role": "SLAVE" + }, + "two_queue": false }, "interrupts": { "eventq_index": 0, @@ -437,27 +470,30 @@ "name": "interrupts", "cxx_class": "AlphaISA::Interrupts" }, + "dcache_port": { + "peer": "system.cpu1.dcache.cpu_side", + "role": "MASTER" + }, "socket_id": 0, "max_insts_all_threads": 0, "path": "system.cpu1", - "isa": [ - { - "eventq_index": 0, - "path": "system.cpu1.isa", - "type": "AlphaISA", - "name": "isa", - "cxx_class": "AlphaISA::ISA" - } - ], + "max_loads_any_thread": 0, "switched_out": false, "workload": [ { "name": "workload", + "output": "cout", + "chkpt": "", + "errout": "cerr", + "system": "system", + "useArchPT": false, "eventq_index": 0, + "file": "/dist/m5/regression/test-progs/anagram/bin/alpha/eio/anagram-vshort.eio.gz", "cxx_class": "EioProcess", "path": "system.cpu1.workload", "max_stack_size": 67108864, - "type": "EioProcess" + "type": "EioProcess", + "input": "None" } ], "name": "cpu1", @@ -469,14 +505,67 @@ "type": "AlphaTLB", "size": 64 }, + "simpoint_start_insts": [], "max_insts_any_thread": 500000, - "progress_interval": 0.0, - "dcache_port": { - "peer": "system.cpu1.dcache.cpu_side", - "role": "MASTER" + "progress_interval": 0, + "branchPred": null, + "dcache": { + "is_top_level": true, + "prefetcher": null, + "clk_domain": "system.cpu_clk_domain", + "write_buffers": 8, + "response_latency": 2, + "cxx_class": "BaseCache", + "size": 32768, + "tags": { + "name": "tags", + "eventq_index": 0, + "hit_latency": 2, + "clk_domain": "system.cpu_clk_domain", + "sequential_access": false, + "assoc": 4, + "cxx_class": "LRU", + "path": "system.cpu1.dcache.tags", + "block_size": 64, + "type": "LRU", + "size": 32768 + }, + "system": "system", + "max_miss_count": 0, + "eventq_index": 0, + "mem_side": { + "peer": "system.toL2Bus.slave[3]", + "role": "MASTER" + }, + "mshrs": 4, + "forward_snoops": true, + "hit_latency": 2, + "tgts_per_mshr": 20, + "addr_ranges": [ + "0:18446744073709551615" + ], + "assoc": 4, + "prefetch_on_access": false, + "path": "system.cpu1.dcache", + "name": "dcache", + "type": "BaseCache", + "sequential_access": false, + "cpu_side": { + "peer": "system.cpu1.dcache_port", + "role": "SLAVE" + }, + "two_queue": false }, - "function_trace": false, - "max_loads_any_thread": 0, + "isa": [ + { + "name": "isa", + "system": "system", + "eventq_index": 0, + "cxx_class": "AlphaISA::ISA", + "path": "system.cpu1.isa", + "type": "AlphaISA" + } + ], "tracer": { "eventq_index": 0, "path": "system.cpu1.tracer", @@ -496,74 +585,36 @@ "type": "AlphaTLB", "size": 48 }, - "dcache": { - "assoc": 4, - "mem_side": { - "peer": "system.toL2Bus.slave[5]", - "role": "MASTER" - }, - "cpu_side": { - "peer": "system.cpu2.dcache_port", - "role": "SLAVE" - }, - "name": "dcache", - "tags": { - "name": "tags", - "eventq_index": 0, - "hit_latency": 2, - "sequential_access": false, - "assoc": 4, - "cxx_class": "LRU", - "path": "system.cpu2.dcache.tags", - "block_size": 64, - "type": "LRU", - "size": 32768 - }, - "hit_latency": 2, - "mshrs": 4, - "response_latency": 2, - "is_top_level": true, - "tgts_per_mshr": 20, - "sequential_access": false, - "max_miss_count": 0, - "eventq_index": 0, - "prefetch_on_access": false, - "cxx_class": "BaseCache", - "path": "system.cpu2.dcache", - "write_buffers": 8, - "two_queue": false, - "type": "BaseCache", - "forward_snoops": true, - "size": 32768 - }, + "system": "system", + "function_trace": false, "do_checkpoint_insts": true, "cxx_class": "TimingSimpleCPU", "max_loads_all_threads": 0, + "clk_domain": "system.cpu_clk_domain", "function_trace_start": 0, "cpu_id": 2, + "checker": null, "eventq_index": 0, "do_quiesce": true, "type": "TimingSimpleCPU", - "profile": 0.0, + "profile": 0, "icache_port": { "peer": "system.cpu2.icache.cpu_side", "role": "MASTER" }, "icache": { - "assoc": 1, - "mem_side": { - "peer": "system.toL2Bus.slave[4]", - "role": "MASTER" - }, - "cpu_side": { - "peer": "system.cpu2.icache_port", - "role": "SLAVE" - }, - "name": "icache", + "is_top_level": true, + "prefetcher": null, + "clk_domain": "system.cpu_clk_domain", + "write_buffers": 8, + "response_latency": 2, + "cxx_class": "BaseCache", + "size": 32768, "tags": { "name": "tags", "eventq_index": 0, "hit_latency": 2, + "clk_domain": "system.cpu_clk_domain", "sequential_access": false, "assoc": 1, "cxx_class": "LRU", @@ -572,22 +623,31 @@ "type": "LRU", "size": 32768 }, - "hit_latency": 2, - "mshrs": 4, - "response_latency": 2, - "is_top_level": true, - "tgts_per_mshr": 20, - "sequential_access": false, + "system": "system", "max_miss_count": 0, "eventq_index": 0, + "mem_side": { + "peer": "system.toL2Bus.slave[4]", + "role": "MASTER" + }, + "mshrs": 4, + "forward_snoops": true, + "hit_latency": 2, + "tgts_per_mshr": 20, + "addr_ranges": [ + "0:18446744073709551615" + ], + "assoc": 1, "prefetch_on_access": false, - "cxx_class": "BaseCache", "path": "system.cpu2.icache", - "write_buffers": 8, - "two_queue": false, + "name": "icache", "type": "BaseCache", - "forward_snoops": true, - "size": 32768 + "sequential_access": false, + "cpu_side": { + "peer": "system.cpu2.icache_port", + "role": "SLAVE" + }, + "two_queue": false }, "interrupts": { "eventq_index": 0, @@ -596,27 +656,30 @@ "name": "interrupts", "cxx_class": "AlphaISA::Interrupts" }, + "dcache_port": { + "peer": "system.cpu2.dcache.cpu_side", + "role": "MASTER" + }, "socket_id": 0, "max_insts_all_threads": 0, "path": "system.cpu2", - "isa": [ - { - "eventq_index": 0, - "path": "system.cpu2.isa", - "type": "AlphaISA", - "name": "isa", - "cxx_class": "AlphaISA::ISA" - } - ], + "max_loads_any_thread": 0, "switched_out": false, "workload": [ { "name": "workload", + "output": "cout", + "chkpt": "", + "errout": "cerr", + "system": "system", + "useArchPT": false, "eventq_index": 0, + "file": "/dist/m5/regression/test-progs/anagram/bin/alpha/eio/anagram-vshort.eio.gz", "cxx_class": "EioProcess", "path": "system.cpu2.workload", "max_stack_size": 67108864, - "type": "EioProcess" + "type": "EioProcess", + "input": "None" } ], "name": "cpu2", @@ -628,14 +691,67 @@ "type": "AlphaTLB", "size": 64 }, + "simpoint_start_insts": [], "max_insts_any_thread": 500000, - "progress_interval": 0.0, - "dcache_port": { - "peer": "system.cpu2.dcache.cpu_side", - "role": "MASTER" + "progress_interval": 0, + "branchPred": null, + "dcache": { + "is_top_level": true, + "prefetcher": null, + "clk_domain": "system.cpu_clk_domain", + "write_buffers": 8, + "response_latency": 2, + "cxx_class": "BaseCache", + "size": 32768, + "tags": { + "name": "tags", + "eventq_index": 0, + "hit_latency": 2, + "clk_domain": "system.cpu_clk_domain", + "sequential_access": false, + "assoc": 4, + "cxx_class": "LRU", + "path": "system.cpu2.dcache.tags", + "block_size": 64, + "type": "LRU", + "size": 32768 + }, + "system": "system", + "max_miss_count": 0, + "eventq_index": 0, + "mem_side": { + "peer": "system.toL2Bus.slave[5]", + "role": "MASTER" + }, + "mshrs": 4, + "forward_snoops": true, + "hit_latency": 2, + "tgts_per_mshr": 20, + "addr_ranges": [ + "0:18446744073709551615" + ], + "assoc": 4, + "prefetch_on_access": false, + "path": "system.cpu2.dcache", + "name": "dcache", + "type": "BaseCache", + "sequential_access": false, + "cpu_side": { + "peer": "system.cpu2.dcache_port", + "role": "SLAVE" + }, + "two_queue": false }, - "function_trace": false, - "max_loads_any_thread": 0, + "isa": [ + { + "name": "isa", + "system": "system", + "eventq_index": 0, + "cxx_class": "AlphaISA::ISA", + "path": "system.cpu2.isa", + "type": "AlphaISA" + } + ], "tracer": { "eventq_index": 0, "path": "system.cpu2.tracer", @@ -655,74 +771,36 @@ "type": "AlphaTLB", "size": 48 }, - "dcache": { - "assoc": 4, - "mem_side": { - "peer": "system.toL2Bus.slave[7]", - "role": "MASTER" - }, - "cpu_side": { - "peer": "system.cpu3.dcache_port", - "role": "SLAVE" - }, - "name": "dcache", - "tags": { - "name": "tags", - "eventq_index": 0, - "hit_latency": 2, - "sequential_access": false, - "assoc": 4, - "cxx_class": "LRU", - "path": "system.cpu3.dcache.tags", - "block_size": 64, - "type": "LRU", - "size": 32768 - }, - "hit_latency": 2, - "mshrs": 4, - "response_latency": 2, - "is_top_level": true, - "tgts_per_mshr": 20, - "sequential_access": false, - "max_miss_count": 0, - "eventq_index": 0, - "prefetch_on_access": false, - "cxx_class": "BaseCache", - "path": "system.cpu3.dcache", - "write_buffers": 8, - "two_queue": false, - "type": "BaseCache", - "forward_snoops": true, - "size": 32768 - }, + "system": "system", + "function_trace": false, "do_checkpoint_insts": true, "cxx_class": "TimingSimpleCPU", "max_loads_all_threads": 0, + "clk_domain": "system.cpu_clk_domain", "function_trace_start": 0, "cpu_id": 3, + "checker": null, "eventq_index": 0, "do_quiesce": true, "type": "TimingSimpleCPU", - "profile": 0.0, + "profile": 0, "icache_port": { "peer": "system.cpu3.icache.cpu_side", "role": "MASTER" }, "icache": { - "assoc": 1, - "mem_side": { - "peer": "system.toL2Bus.slave[6]", - "role": "MASTER" - }, - "cpu_side": { - "peer": "system.cpu3.icache_port", - "role": "SLAVE" - }, - "name": "icache", + "is_top_level": true, + "prefetcher": null, + "clk_domain": "system.cpu_clk_domain", + "write_buffers": 8, + "response_latency": 2, + "cxx_class": "BaseCache", + "size": 32768, "tags": { "name": "tags", "eventq_index": 0, "hit_latency": 2, + "clk_domain": "system.cpu_clk_domain", "sequential_access": false, "assoc": 1, "cxx_class": "LRU", @@ -731,22 +809,31 @@ "type": "LRU", "size": 32768 }, - "hit_latency": 2, - "mshrs": 4, - "response_latency": 2, - "is_top_level": true, - "tgts_per_mshr": 20, - "sequential_access": false, + "system": "system", "max_miss_count": 0, "eventq_index": 0, + "mem_side": { + "peer": "system.toL2Bus.slave[6]", + "role": "MASTER" + }, + "mshrs": 4, + "forward_snoops": true, + "hit_latency": 2, + "tgts_per_mshr": 20, + "addr_ranges": [ + "0:18446744073709551615" + ], + "assoc": 1, "prefetch_on_access": false, - "cxx_class": "BaseCache", "path": "system.cpu3.icache", - "write_buffers": 8, - "two_queue": false, + "name": "icache", "type": "BaseCache", - "forward_snoops": true, - "size": 32768 + "sequential_access": false, + "cpu_side": { + "peer": "system.cpu3.icache_port", + "role": "SLAVE" + }, + "two_queue": false }, "interrupts": { "eventq_index": 0, @@ -755,27 +842,30 @@ "name": "interrupts", "cxx_class": "AlphaISA::Interrupts" }, + "dcache_port": { + "peer": "system.cpu3.dcache.cpu_side", + "role": "MASTER" + }, "socket_id": 0, "max_insts_all_threads": 0, "path": "system.cpu3", - "isa": [ - { - "eventq_index": 0, - "path": "system.cpu3.isa", - "type": "AlphaISA", - "name": "isa", - "cxx_class": "AlphaISA::ISA" - } - ], + "max_loads_any_thread": 0, "switched_out": false, "workload": [ { "name": "workload", + "output": "cout", + "chkpt": "", + "errout": "cerr", + "system": "system", + "useArchPT": false, "eventq_index": 0, + "file": "/dist/m5/regression/test-progs/anagram/bin/alpha/eio/anagram-vshort.eio.gz", "cxx_class": "EioProcess", "path": "system.cpu3.workload", "max_stack_size": 67108864, - "type": "EioProcess" + "type": "EioProcess", + "input": "None" } ], "name": "cpu3", @@ -787,14 +877,67 @@ "type": "AlphaTLB", "size": 64 }, + "simpoint_start_insts": [], "max_insts_any_thread": 500000, - "progress_interval": 0.0, - "dcache_port": { - "peer": "system.cpu3.dcache.cpu_side", - "role": "MASTER" + "progress_interval": 0, + "branchPred": null, + "dcache": { + "is_top_level": true, + "prefetcher": null, + "clk_domain": "system.cpu_clk_domain", + "write_buffers": 8, + "response_latency": 2, + "cxx_class": "BaseCache", + "size": 32768, + "tags": { + "name": "tags", + "eventq_index": 0, + "hit_latency": 2, + "clk_domain": "system.cpu_clk_domain", + "sequential_access": false, + "assoc": 4, + "cxx_class": "LRU", + "path": "system.cpu3.dcache.tags", + "block_size": 64, + "type": "LRU", + "size": 32768 + }, + "system": "system", + "max_miss_count": 0, + "eventq_index": 0, + "mem_side": { + "peer": "system.toL2Bus.slave[7]", + "role": "MASTER" + }, + "mshrs": 4, + "forward_snoops": true, + "hit_latency": 2, + "tgts_per_mshr": 20, + "addr_ranges": [ + "0:18446744073709551615" + ], + "assoc": 4, + "prefetch_on_access": false, + "path": "system.cpu3.dcache", + "name": "dcache", + "type": "BaseCache", + "sequential_access": false, + "cpu_side": { + "peer": "system.cpu3.dcache_port", + "role": "SLAVE" + }, + "two_queue": false }, - "function_trace": false, - "max_loads_any_thread": 0, + "isa": [ + { + "name": "isa", + "system": "system", + "eventq_index": 0, + "cxx_class": "AlphaISA::ISA", + "path": "system.cpu3.isa", + "type": "AlphaISA" + } + ], "tracer": { "eventq_index": 0, "path": "system.cpu3.tracer", @@ -804,11 +947,13 @@ } } ], + "num_work_ids": 16, + "work_item_id": -1, "work_begin_cpu_id_exit": -1 }, - "time_sync_period": 0.1, + "time_sync_period": 100000000000, "eventq_index": 0, - "time_sync_spin_threshold": 9.999999999999999e-05, + "time_sync_spin_threshold": 100000000, "cxx_class": "Root", "path": "root", "time_sync_enable": false, diff --git a/tests/quick/se/30.eio-mp/ref/alpha/eio/simple-timing-mp/simerr b/tests/quick/se/30.eio-mp/ref/alpha/eio/simple-timing-mp/simerr index 7bec60132..12d988946 100755 --- a/tests/quick/se/30.eio-mp/ref/alpha/eio/simple-timing-mp/simerr +++ b/tests/quick/se/30.eio-mp/ref/alpha/eio/simple-timing-mp/simerr @@ -7,5 +7,3 @@ gzip: stdout: Broken pipe gzip: stdout: Broken pipe gzip: stdout: Broken pipe - -gzip: stdout: Broken pipe diff --git a/tests/quick/se/30.eio-mp/ref/alpha/eio/simple-timing-mp/simout b/tests/quick/se/30.eio-mp/ref/alpha/eio/simple-timing-mp/simout index a49149440..bb34829ad 100755 --- a/tests/quick/se/30.eio-mp/ref/alpha/eio/simple-timing-mp/simout +++ b/tests/quick/se/30.eio-mp/ref/alpha/eio/simple-timing-mp/simout @@ -1,8 +1,8 @@ gem5 Simulator System. http://gem5.org gem5 is copyrighted software; use the --copyright option for details. -gem5 compiled May 10 2014 16:25:16 -gem5 started May 10 2014 16:55:53 +gem5 compiled Sep 21 2014 15:53:23 +gem5 started Sep 21 2014 16:10:49 gem5 executing on zizzer command line: build/ALPHA/gem5.opt -d build/ALPHA/tests/opt/quick/se/30.eio-mp/alpha/eio/simple-timing-mp -re /z/stever/hg/gem5/tests/run.py build/ALPHA/tests/opt/quick/se/30.eio-mp/alpha/eio/simple-timing-mp Global frequency set at 1000000000000 ticks per second diff --git a/tests/quick/se/30.eio-mp/ref/alpha/eio/simple-timing-mp/stats.txt b/tests/quick/se/30.eio-mp/ref/alpha/eio/simple-timing-mp/stats.txt index 4ed73aa2b..844307bd8 100644 --- a/tests/quick/se/30.eio-mp/ref/alpha/eio/simple-timing-mp/stats.txt +++ b/tests/quick/se/30.eio-mp/ref/alpha/eio/simple-timing-mp/stats.txt @@ -4,11 +4,11 @@ sim_seconds 0.000729 # Nu sim_ticks 729024000 # Number of ticks simulated final_tick 729024000 # Number of ticks from beginning of simulation (restored from checkpoints and never reset) sim_freq 1000000000000 # Frequency of simulated ticks -host_inst_rate 1251613 # Simulator instruction rate (inst/s) -host_op_rate 1251599 # Simulator op (including micro ops) rate (op/s) -host_tick_rate 456227594 # Simulator tick rate (ticks/s) -host_mem_usage 240516 # Number of bytes of host memory used -host_seconds 1.60 # Real time elapsed on the host +host_inst_rate 1431965 # Simulator instruction rate (inst/s) +host_op_rate 1431947 # Simulator op (including micro ops) rate (op/s) +host_tick_rate 521966515 # Simulator tick rate (ticks/s) +host_mem_usage 239544 # Number of bytes of host memory used +host_seconds 1.40 # Real time elapsed on the host sim_insts 1999959 # Number of instructions simulated sim_ops 1999959 # Number of ops (including micro ops) simulated system.voltage_domain.voltage 1 # Voltage in Volts @@ -59,17 +59,25 @@ system.physmem.bw_total::cpu2.data 39856027 # To system.physmem.bw_total::cpu3.inst 35378808 # Total bandwidth to/from this memory (bytes/s) system.physmem.bw_total::cpu3.data 39856027 # Total bandwidth to/from this memory (bytes/s) system.physmem.bw_total::total 300939338 # Total bandwidth to/from this memory (bytes/s) -system.membus.throughput 300939338 # Throughput (bytes/s) system.membus.trans_dist::ReadReq 2872 # Transaction distribution system.membus.trans_dist::ReadResp 2872 # Transaction distribution system.membus.trans_dist::ReadExReq 556 # Transaction distribution system.membus.trans_dist::ReadExResp 556 # Transaction distribution system.membus.pkt_count_system.l2c.mem_side::system.physmem.port 6856 # Packet count per connected master and slave (bytes) system.membus.pkt_count::total 6856 # Packet count per connected master and slave (bytes) -system.membus.tot_pkt_size_system.l2c.mem_side::system.physmem.port 219392 # Cumulative packet size per connected master and slave (bytes) -system.membus.tot_pkt_size::total 219392 # Cumulative packet size per connected master and slave (bytes) -system.membus.data_through_bus 219392 # Total data (bytes) -system.membus.snoop_data_through_bus 0 # Total snoop data (bytes) +system.membus.pkt_size_system.l2c.mem_side::system.physmem.port 219392 # Cumulative packet size per connected master and slave (bytes) +system.membus.pkt_size::total 219392 # Cumulative packet size per connected master and slave (bytes) +system.membus.snoops 0 # Total snoops (count) +system.membus.snoop_fanout::samples 3431 # Request fanout histogram +system.membus.snoop_fanout::mean 0 # Request fanout histogram +system.membus.snoop_fanout::stdev 0 # Request fanout histogram +system.membus.snoop_fanout::underflows 0 0.00% 0.00% # Request fanout histogram +system.membus.snoop_fanout::0 3431 100.00% 100.00% # Request fanout histogram +system.membus.snoop_fanout::1 0 0.00% 100.00% # Request fanout histogram +system.membus.snoop_fanout::overflows 0 0.00% 100.00% # Request fanout histogram +system.membus.snoop_fanout::min_value 0 # Request fanout histogram +system.membus.snoop_fanout::max_value 0 # Request fanout histogram +system.membus.snoop_fanout::total 3431 # Request fanout histogram system.membus.reqLayer0.occupancy 4229968 # Layer occupancy (ticks) system.membus.reqLayer0.utilization 0.6 # Layer utilization (%) system.membus.respLayer1.occupancy 31051500 # Layer occupancy (ticks) @@ -435,7 +443,6 @@ system.l2c.overall_avg_mshr_miss_latency::cpu3.inst 40430.521092 system.l2c.overall_avg_mshr_miss_latency::cpu3.data 40124.449339 # average overall mshr miss latency system.l2c.overall_avg_mshr_miss_latency::total 40190.927655 # average overall mshr miss latency system.l2c.no_allocate_misses 0 # Number of misses that were no-allocate -system.toL2Bus.throughput 335352471 # Throughput (bytes/s) system.toL2Bus.trans_dist::ReadReq 3148 # Transaction distribution system.toL2Bus.trans_dist::ReadResp 3148 # Transaction distribution system.toL2Bus.trans_dist::Writeback 116 # Transaction distribution @@ -450,17 +457,33 @@ system.toL2Bus.pkt_count_system.cpu2.dcache.mem_side::system.l2c.cpu_side system.toL2Bus.pkt_count_system.cpu3.icache.mem_side::system.l2c.cpu_side 926 # Packet count per connected master and slave (bytes) system.toL2Bus.pkt_count_system.cpu3.dcache.mem_side::system.l2c.cpu_side 955 # Packet count per connected master and slave (bytes) system.toL2Bus.pkt_count::total 7524 # Packet count per connected master and slave (bytes) -system.toL2Bus.tot_pkt_size_system.cpu0.icache.mem_side::system.l2c.cpu_side 29632 # Cumulative packet size per connected master and slave (bytes) -system.toL2Bus.tot_pkt_size_system.cpu0.dcache.mem_side::system.l2c.cpu_side 31488 # Cumulative packet size per connected master and slave (bytes) -system.toL2Bus.tot_pkt_size_system.cpu1.icache.mem_side::system.l2c.cpu_side 29632 # Cumulative packet size per connected master and slave (bytes) -system.toL2Bus.tot_pkt_size_system.cpu1.dcache.mem_side::system.l2c.cpu_side 31488 # Cumulative packet size per connected master and slave (bytes) -system.toL2Bus.tot_pkt_size_system.cpu2.icache.mem_side::system.l2c.cpu_side 29632 # Cumulative packet size per connected master and slave (bytes) -system.toL2Bus.tot_pkt_size_system.cpu2.dcache.mem_side::system.l2c.cpu_side 31488 # Cumulative packet size per connected master and slave (bytes) -system.toL2Bus.tot_pkt_size_system.cpu3.icache.mem_side::system.l2c.cpu_side 29632 # Cumulative packet size per connected master and slave (bytes) -system.toL2Bus.tot_pkt_size_system.cpu3.dcache.mem_side::system.l2c.cpu_side 31488 # Cumulative packet size per connected master and slave (bytes) -system.toL2Bus.tot_pkt_size::total 244480 # Cumulative packet size per connected master and slave (bytes) -system.toL2Bus.data_through_bus 244480 # Total data (bytes) -system.toL2Bus.snoop_data_through_bus 0 # Total snoop data (bytes) +system.toL2Bus.pkt_size_system.cpu0.icache.mem_side::system.l2c.cpu_side 29632 # Cumulative packet size per connected master and slave (bytes) +system.toL2Bus.pkt_size_system.cpu0.dcache.mem_side::system.l2c.cpu_side 31488 # Cumulative packet size per connected master and slave (bytes) +system.toL2Bus.pkt_size_system.cpu1.icache.mem_side::system.l2c.cpu_side 29632 # Cumulative packet size per connected master and slave (bytes) +system.toL2Bus.pkt_size_system.cpu1.dcache.mem_side::system.l2c.cpu_side 31488 # Cumulative packet size per connected master and slave (bytes) +system.toL2Bus.pkt_size_system.cpu2.icache.mem_side::system.l2c.cpu_side 29632 # Cumulative packet size per connected master and slave (bytes) +system.toL2Bus.pkt_size_system.cpu2.dcache.mem_side::system.l2c.cpu_side 31488 # Cumulative packet size per connected master and slave (bytes) +system.toL2Bus.pkt_size_system.cpu3.icache.mem_side::system.l2c.cpu_side 29632 # Cumulative packet size per connected master and slave (bytes) +system.toL2Bus.pkt_size_system.cpu3.dcache.mem_side::system.l2c.cpu_side 31488 # Cumulative packet size per connected master and slave (bytes) +system.toL2Bus.pkt_size::total 244480 # Cumulative packet size per connected master and slave (bytes) +system.toL2Bus.snoops 0 # Total snoops (count) +system.toL2Bus.snoop_fanout::samples 3820 # Request fanout histogram +system.toL2Bus.snoop_fanout::mean 7 # Request fanout histogram +system.toL2Bus.snoop_fanout::stdev 0 # Request fanout histogram +system.toL2Bus.snoop_fanout::underflows 0 0.00% 0.00% # Request fanout histogram +system.toL2Bus.snoop_fanout::0 0 0.00% 0.00% # Request fanout histogram +system.toL2Bus.snoop_fanout::1 0 0.00% 0.00% # Request fanout histogram +system.toL2Bus.snoop_fanout::2 0 0.00% 0.00% # Request fanout histogram +system.toL2Bus.snoop_fanout::3 0 0.00% 0.00% # Request fanout histogram +system.toL2Bus.snoop_fanout::4 0 0.00% 0.00% # Request fanout histogram +system.toL2Bus.snoop_fanout::5 0 0.00% 0.00% # Request fanout histogram +system.toL2Bus.snoop_fanout::6 0 0.00% 0.00% # Request fanout histogram +system.toL2Bus.snoop_fanout::7 3820 100.00% 100.00% # Request fanout histogram +system.toL2Bus.snoop_fanout::8 0 0.00% 100.00% # Request fanout histogram +system.toL2Bus.snoop_fanout::overflows 0 0.00% 100.00% # Request fanout histogram +system.toL2Bus.snoop_fanout::min_value 7 # Request fanout histogram +system.toL2Bus.snoop_fanout::max_value 7 # Request fanout histogram +system.toL2Bus.snoop_fanout::total 3820 # Request fanout histogram system.toL2Bus.reqLayer0.occupancy 2374000 # Layer occupancy (ticks) system.toL2Bus.reqLayer0.utilization 0.3 # Layer utilization (%) system.toL2Bus.respLayer0.occupancy 2083500 # Layer occupancy (ticks) -- cgit v1.2.3