diff options
| author | Ali Saidi <Ali.Saidi@ARM.com> | 2014-01-24 15:29:33 -0600 |
|---|---|---|
| committer | Ali Saidi <Ali.Saidi@ARM.com> | 2014-01-24 15:29:33 -0600 |
| commit | f3585c841e964c98911784a187fc4f081a02a0a6 (patch) | |
| tree | 2a5a3edeaeb0ffe37ca3a04b884f8f66c7538bbf /tests/quick/se/50.memtest | |
| parent | cfc4a999828a5b51f4c514e3a7c47b4eebc450b9 (diff) | |
| download | gem5-f3585c841e964c98911784a187fc4f081a02a0a6.tar.xz | |
stats: update stats for cache occupancy and clock domain changes
Diffstat (limited to 'tests/quick/se/50.memtest')
23 files changed, 583 insertions, 133 deletions
diff --git a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_Two_Level/simerr b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_Two_Level/simerr index d0c477d0e..6c3b6657b 100755 --- a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_Two_Level/simerr +++ b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_Two_Level/simerr @@ -79,4 +79,3 @@ system.cpu4: completed 90000 read, 48685 write accesses @6602186 system.cpu5: completed 90000 read, 48384 write accesses @6637212 system.cpu3: completed 90000 read, 48869 write accesses @6654178 system.cpu6: completed 100000 read, 53414 write accesses @7257449 -hack: be nice to actually delete the event here diff --git a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_Two_Level/simout b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_Two_Level/simout index 53312cb70..d0305734f 100755 --- a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_Two_Level/simout +++ b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_Two_Level/simout @@ -1,12 +1,10 @@ -Redirecting stdout to build/ALPHA_MESI_CMP_directory/tests/opt/quick/se/50.memtest/alpha/linux/memtest-ruby-MESI_CMP_directory/simout -Redirecting stderr to build/ALPHA_MESI_CMP_directory/tests/opt/quick/se/50.memtest/alpha/linux/memtest-ruby-MESI_CMP_directory/simerr gem5 Simulator System. http://gem5.org gem5 is copyrighted software; use the --copyright option for details. -gem5 compiled Sep 22 2013 05:27:02 -gem5 started Sep 22 2013 05:27:23 -gem5 executing on zizzer -command line: build/ALPHA_MESI_CMP_directory/gem5.opt -d build/ALPHA_MESI_CMP_directory/tests/opt/quick/se/50.memtest/alpha/linux/memtest-ruby-MESI_CMP_directory -re tests/run.py build/ALPHA_MESI_CMP_directory/tests/opt/quick/se/50.memtest/alpha/linux/memtest-ruby-MESI_CMP_directory +gem5 compiled Jan 22 2014 16:37:52 +gem5 started Jan 22 2014 17:26:10 +gem5 executing on u200540-lin +command line: build/ALPHA_MESI_Two_Level/gem5.opt -d build/ALPHA_MESI_Two_Level/tests/opt/quick/se/50.memtest/alpha/linux/memtest-ruby-MESI_Two_Level -re tests/run.py build/ALPHA_MESI_Two_Level/tests/opt/quick/se/50.memtest/alpha/linux/memtest-ruby-MESI_Two_Level Global frequency set at 1000000000 ticks per second info: Entering event queue @ 0. Starting simulation... Exiting @ tick 7257449 because maximum number of loads reached diff --git a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_Two_Level/stats.txt b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_Two_Level/stats.txt index 173706474..6ebaf5618 100644 --- a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_Two_Level/stats.txt +++ b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_Two_Level/stats.txt @@ -4,9 +4,12 @@ sim_seconds 0.007257 # Nu sim_ticks 7257449 # Number of ticks simulated final_tick 7257449 # Number of ticks from beginning of simulation (restored from checkpoints and never reset) sim_freq 1000000000 # Frequency of simulated ticks -host_tick_rate 68193 # Simulator tick rate (ticks/s) -host_mem_usage 302480 # Number of bytes of host memory used -host_seconds 106.43 # Real time elapsed on the host +host_tick_rate 104409 # Simulator tick rate (ticks/s) +host_mem_usage 258924 # Number of bytes of host memory used +host_seconds 69.51 # Real time elapsed on the host +system.voltage_domain.voltage 1 # Voltage in Volts +system.clk_domain.clock 1 # Clock period in ticks +system.ruby.clk_domain.clock 1 # Clock period in ticks system.ruby.delayHist::bucket_size 128 # delay histogram for all message system.ruby.delayHist::max_bucket 1279 # delay histogram for all message system.ruby.delayHist::samples 4856797 # delay histogram for all message @@ -322,6 +325,7 @@ system.ruby.network.routers08.msg_bytes.Response_Control::2 4842768 system.ruby.network.routers08.msg_bytes.Writeback_Data::0 8120304 system.ruby.network.routers08.msg_bytes.Writeback_Data::1 28664064 system.ruby.network.routers08.msg_bytes.Writeback_Control::0 1656240 +system.ruby.memctrl_clk_domain.clock 3 # Clock period in ticks system.ruby.dir_cntrl0.memBuffer.memReq 817953 # Total number of memory requests system.ruby.dir_cntrl0.memBuffer.memRead 604997 # Number of memory reads system.ruby.dir_cntrl0.memBuffer.memWrite 212953 # Number of memory writes @@ -377,6 +381,7 @@ system.ruby.network.msg_byte.Writeback_Data 110353176 system.ruby.network.msg_byte.Writeback_Control 4968736 system.funcbus.throughput 0 # Throughput (bytes/s) system.funcbus.data_through_bus 0 # Total data (bytes) +system.cpu_clk_domain.clock 1 # Clock period in ticks system.cpu0.num_reads 99060 # number of read accesses completed system.cpu0.num_writes 53442 # number of write accesses completed system.cpu0.num_copies 0 # number of copy accesses completed diff --git a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_directory/config.ini b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_directory/config.ini index ba91b18e2..53be052ed 100644 --- a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_directory/config.ini +++ b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_directory/config.ini @@ -1,7 +1,9 @@ [root] type=Root children=system +eventq_index=0 full_system=false +sim_quantum=0 time_sync_enable=false time_sync_period=100000000 time_sync_spin_threshold=100000 @@ -12,12 +14,13 @@ children=clk_domain cpu0 cpu1 cpu2 cpu3 cpu4 cpu5 cpu6 cpu7 cpu_clk_domain funcb boot_osflags=a cache_line_size=64 clk_domain=system.clk_domain +eventq_index=0 init_param=0 kernel= load_addr_mask=1099511627775 mem_mode=timing mem_ranges=0:268435455 -memories=system.funcmem system.physmem +memories=system.physmem system.funcmem num_work_ids=16 readfile= symbolfile= @@ -33,12 +36,14 @@ system_port=system.sys_port_proxy.slave[0] [system.clk_domain] type=SrcClockDomain clock=1 +eventq_index=0 voltage_domain=system.voltage_domain [system.cpu0] type=MemTest atomic=false clk_domain=system.cpu_clk_domain +eventq_index=0 issue_dmas=false max_loads=100000 memory_size=65536 @@ -58,6 +63,7 @@ test=system.ruby.l1_cntrl0.sequencer.slave[0] type=MemTest atomic=false clk_domain=system.cpu_clk_domain +eventq_index=0 issue_dmas=false max_loads=100000 memory_size=65536 @@ -77,6 +83,7 @@ test=system.ruby.l1_cntrl1.sequencer.slave[0] type=MemTest atomic=false clk_domain=system.cpu_clk_domain +eventq_index=0 issue_dmas=false max_loads=100000 memory_size=65536 @@ -96,6 +103,7 @@ test=system.ruby.l1_cntrl2.sequencer.slave[0] type=MemTest atomic=false clk_domain=system.cpu_clk_domain +eventq_index=0 issue_dmas=false max_loads=100000 memory_size=65536 @@ -115,6 +123,7 @@ test=system.ruby.l1_cntrl3.sequencer.slave[0] type=MemTest atomic=false clk_domain=system.cpu_clk_domain +eventq_index=0 issue_dmas=false max_loads=100000 memory_size=65536 @@ -134,6 +143,7 @@ test=system.ruby.l1_cntrl4.sequencer.slave[0] type=MemTest atomic=false clk_domain=system.cpu_clk_domain +eventq_index=0 issue_dmas=false max_loads=100000 memory_size=65536 @@ -153,6 +163,7 @@ test=system.ruby.l1_cntrl5.sequencer.slave[0] type=MemTest atomic=false clk_domain=system.cpu_clk_domain +eventq_index=0 issue_dmas=false max_loads=100000 memory_size=65536 @@ -172,6 +183,7 @@ test=system.ruby.l1_cntrl6.sequencer.slave[0] type=MemTest atomic=false clk_domain=system.cpu_clk_domain +eventq_index=0 issue_dmas=false max_loads=100000 memory_size=65536 @@ -190,11 +202,13 @@ test=system.ruby.l1_cntrl7.sequencer.slave[0] [system.cpu_clk_domain] type=SrcClockDomain clock=1 +eventq_index=0 voltage_domain=system.voltage_domain [system.funcbus] type=NoncoherentBus clk_domain=system.clk_domain +eventq_index=0 header_cycles=1 use_default_range=false width=8 @@ -206,6 +220,7 @@ type=SimpleMemory bandwidth=0.000000 clk_domain=system.clk_domain conf_table_reported=true +eventq_index=0 in_addr_map=false latency=30 latency_var=0 @@ -218,6 +233,7 @@ type=SimpleMemory bandwidth=0.000000 clk_domain=system.clk_domain conf_table_reported=true +eventq_index=0 in_addr_map=true latency=30 latency_var=0 @@ -226,18 +242,22 @@ range=0:134217727 [system.ruby] type=RubySystem -children=clk_domain dir_cntrl0 l1_cntrl0 l1_cntrl1 l1_cntrl2 l1_cntrl3 l1_cntrl4 l1_cntrl5 l1_cntrl6 l1_cntrl7 l2_cntrl0 memctrl_clk_domain network profiler +children=clk_domain dir_cntrl0 l1_cntrl0 l1_cntrl1 l1_cntrl2 l1_cntrl3 l1_cntrl4 l1_cntrl5 l1_cntrl6 l1_cntrl7 l2_cntrl0 memctrl_clk_domain network +all_instructions=false block_size_bytes=64 clk_domain=system.ruby.clk_domain +eventq_index=0 +hot_lines=false mem_size=268435456 no_mem_vec=false +num_of_sequencers=8 random_seed=1234 randomization=false -stats_filename=ruby.stats [system.ruby.clk_domain] type=SrcClockDomain clock=1 +eventq_index=0 voltage_domain=system.voltage_domain [system.ruby.dir_cntrl0] @@ -245,9 +265,10 @@ type=Directory_Controller children=directory memBuffer buffer_size=0 clk_domain=system.ruby.clk_domain -cntrl_id=9 +cluster_id=0 directory=system.ruby.dir_cntrl0.directory directory_latency=6 +eventq_index=0 memBuffer=system.ruby.dir_cntrl0.memBuffer number_of_TBEs=256 peer=Null @@ -258,6 +279,7 @@ version=0 [system.ruby.dir_cntrl0.directory] type=RubyDirectoryMemory +eventq_index=0 map_levels=4 numa_high_bit=5 size=268435456 @@ -274,6 +296,7 @@ basic_bus_busy_time=2 clk_domain=system.ruby.memctrl_clk_domain dimm_bit_0=12 dimms_per_channel=2 +eventq_index=0 mem_ctl_latency=12 mem_fixed_delay=0 mem_random_arbitrate=0 @@ -293,7 +316,8 @@ L1Dcache=system.ruby.l1_cntrl0.L1Dcache L1Icache=system.ruby.l1_cntrl0.L1Icache buffer_size=0 clk_domain=system.ruby.clk_domain -cntrl_id=0 +cluster_id=0 +eventq_index=0 l2_select_num_bits=0 number_of_TBEs=256 peer=Null @@ -311,6 +335,7 @@ type=RubyCache assoc=2 dataAccessLatency=1 dataArrayBanks=1 +eventq_index=0 is_icache=false latency=3 replacement_policy=PSEUDO_LRU @@ -325,6 +350,7 @@ type=RubyCache assoc=2 dataAccessLatency=1 dataArrayBanks=1 +eventq_index=0 is_icache=true latency=3 replacement_policy=PSEUDO_LRU @@ -340,6 +366,7 @@ access_phys_mem=false clk_domain=system.ruby.clk_domain dcache=system.ruby.l1_cntrl0.L1Dcache deadlock_threshold=1000000 +eventq_index=0 icache=system.ruby.l1_cntrl0.L1Icache max_outstanding_requests=16 ruby_system=system.ruby @@ -358,7 +385,8 @@ L1Dcache=system.ruby.l1_cntrl1.L1Dcache L1Icache=system.ruby.l1_cntrl1.L1Icache buffer_size=0 clk_domain=system.ruby.clk_domain -cntrl_id=1 +cluster_id=0 +eventq_index=0 l2_select_num_bits=0 number_of_TBEs=256 peer=Null @@ -376,6 +404,7 @@ type=RubyCache assoc=2 dataAccessLatency=1 dataArrayBanks=1 +eventq_index=0 is_icache=false latency=3 replacement_policy=PSEUDO_LRU @@ -390,6 +419,7 @@ type=RubyCache assoc=2 dataAccessLatency=1 dataArrayBanks=1 +eventq_index=0 is_icache=true latency=3 replacement_policy=PSEUDO_LRU @@ -405,6 +435,7 @@ access_phys_mem=false clk_domain=system.ruby.clk_domain dcache=system.ruby.l1_cntrl1.L1Dcache deadlock_threshold=1000000 +eventq_index=0 icache=system.ruby.l1_cntrl1.L1Icache max_outstanding_requests=16 ruby_system=system.ruby @@ -423,7 +454,8 @@ L1Dcache=system.ruby.l1_cntrl2.L1Dcache L1Icache=system.ruby.l1_cntrl2.L1Icache buffer_size=0 clk_domain=system.ruby.clk_domain -cntrl_id=2 +cluster_id=0 +eventq_index=0 l2_select_num_bits=0 number_of_TBEs=256 peer=Null @@ -441,6 +473,7 @@ type=RubyCache assoc=2 dataAccessLatency=1 dataArrayBanks=1 +eventq_index=0 is_icache=false latency=3 replacement_policy=PSEUDO_LRU @@ -455,6 +488,7 @@ type=RubyCache assoc=2 dataAccessLatency=1 dataArrayBanks=1 +eventq_index=0 is_icache=true latency=3 replacement_policy=PSEUDO_LRU @@ -470,6 +504,7 @@ access_phys_mem=false clk_domain=system.ruby.clk_domain dcache=system.ruby.l1_cntrl2.L1Dcache deadlock_threshold=1000000 +eventq_index=0 icache=system.ruby.l1_cntrl2.L1Icache max_outstanding_requests=16 ruby_system=system.ruby @@ -488,7 +523,8 @@ L1Dcache=system.ruby.l1_cntrl3.L1Dcache L1Icache=system.ruby.l1_cntrl3.L1Icache buffer_size=0 clk_domain=system.ruby.clk_domain -cntrl_id=3 +cluster_id=0 +eventq_index=0 l2_select_num_bits=0 number_of_TBEs=256 peer=Null @@ -506,6 +542,7 @@ type=RubyCache assoc=2 dataAccessLatency=1 dataArrayBanks=1 +eventq_index=0 is_icache=false latency=3 replacement_policy=PSEUDO_LRU @@ -520,6 +557,7 @@ type=RubyCache assoc=2 dataAccessLatency=1 dataArrayBanks=1 +eventq_index=0 is_icache=true latency=3 replacement_policy=PSEUDO_LRU @@ -535,6 +573,7 @@ access_phys_mem=false clk_domain=system.ruby.clk_domain dcache=system.ruby.l1_cntrl3.L1Dcache deadlock_threshold=1000000 +eventq_index=0 icache=system.ruby.l1_cntrl3.L1Icache max_outstanding_requests=16 ruby_system=system.ruby @@ -553,7 +592,8 @@ L1Dcache=system.ruby.l1_cntrl4.L1Dcache L1Icache=system.ruby.l1_cntrl4.L1Icache buffer_size=0 clk_domain=system.ruby.clk_domain -cntrl_id=4 +cluster_id=0 +eventq_index=0 l2_select_num_bits=0 number_of_TBEs=256 peer=Null @@ -571,6 +611,7 @@ type=RubyCache assoc=2 dataAccessLatency=1 dataArrayBanks=1 +eventq_index=0 is_icache=false latency=3 replacement_policy=PSEUDO_LRU @@ -585,6 +626,7 @@ type=RubyCache assoc=2 dataAccessLatency=1 dataArrayBanks=1 +eventq_index=0 is_icache=true latency=3 replacement_policy=PSEUDO_LRU @@ -600,6 +642,7 @@ access_phys_mem=false clk_domain=system.ruby.clk_domain dcache=system.ruby.l1_cntrl4.L1Dcache deadlock_threshold=1000000 +eventq_index=0 icache=system.ruby.l1_cntrl4.L1Icache max_outstanding_requests=16 ruby_system=system.ruby @@ -618,7 +661,8 @@ L1Dcache=system.ruby.l1_cntrl5.L1Dcache L1Icache=system.ruby.l1_cntrl5.L1Icache buffer_size=0 clk_domain=system.ruby.clk_domain -cntrl_id=5 +cluster_id=0 +eventq_index=0 l2_select_num_bits=0 number_of_TBEs=256 peer=Null @@ -636,6 +680,7 @@ type=RubyCache assoc=2 dataAccessLatency=1 dataArrayBanks=1 +eventq_index=0 is_icache=false latency=3 replacement_policy=PSEUDO_LRU @@ -650,6 +695,7 @@ type=RubyCache assoc=2 dataAccessLatency=1 dataArrayBanks=1 +eventq_index=0 is_icache=true latency=3 replacement_policy=PSEUDO_LRU @@ -665,6 +711,7 @@ access_phys_mem=false clk_domain=system.ruby.clk_domain dcache=system.ruby.l1_cntrl5.L1Dcache deadlock_threshold=1000000 +eventq_index=0 icache=system.ruby.l1_cntrl5.L1Icache max_outstanding_requests=16 ruby_system=system.ruby @@ -683,7 +730,8 @@ L1Dcache=system.ruby.l1_cntrl6.L1Dcache L1Icache=system.ruby.l1_cntrl6.L1Icache buffer_size=0 clk_domain=system.ruby.clk_domain -cntrl_id=6 +cluster_id=0 +eventq_index=0 l2_select_num_bits=0 number_of_TBEs=256 peer=Null @@ -701,6 +749,7 @@ type=RubyCache assoc=2 dataAccessLatency=1 dataArrayBanks=1 +eventq_index=0 is_icache=false latency=3 replacement_policy=PSEUDO_LRU @@ -715,6 +764,7 @@ type=RubyCache assoc=2 dataAccessLatency=1 dataArrayBanks=1 +eventq_index=0 is_icache=true latency=3 replacement_policy=PSEUDO_LRU @@ -730,6 +780,7 @@ access_phys_mem=false clk_domain=system.ruby.clk_domain dcache=system.ruby.l1_cntrl6.L1Dcache deadlock_threshold=1000000 +eventq_index=0 icache=system.ruby.l1_cntrl6.L1Icache max_outstanding_requests=16 ruby_system=system.ruby @@ -748,7 +799,8 @@ L1Dcache=system.ruby.l1_cntrl7.L1Dcache L1Icache=system.ruby.l1_cntrl7.L1Icache buffer_size=0 clk_domain=system.ruby.clk_domain -cntrl_id=7 +cluster_id=0 +eventq_index=0 l2_select_num_bits=0 number_of_TBEs=256 peer=Null @@ -766,6 +818,7 @@ type=RubyCache assoc=2 dataAccessLatency=1 dataArrayBanks=1 +eventq_index=0 is_icache=false latency=3 replacement_policy=PSEUDO_LRU @@ -780,6 +833,7 @@ type=RubyCache assoc=2 dataAccessLatency=1 dataArrayBanks=1 +eventq_index=0 is_icache=true latency=3 replacement_policy=PSEUDO_LRU @@ -795,6 +849,7 @@ access_phys_mem=false clk_domain=system.ruby.clk_domain dcache=system.ruby.l1_cntrl7.L1Dcache deadlock_threshold=1000000 +eventq_index=0 icache=system.ruby.l1_cntrl7.L1Icache max_outstanding_requests=16 ruby_system=system.ruby @@ -812,7 +867,8 @@ children=L2cache L2cache=system.ruby.l2_cntrl0.L2cache buffer_size=0 clk_domain=system.ruby.clk_domain -cntrl_id=8 +cluster_id=0 +eventq_index=0 number_of_TBEs=256 peer=Null recycle_latency=10 @@ -827,6 +883,7 @@ type=RubyCache assoc=2 dataAccessLatency=1 dataArrayBanks=1 +eventq_index=0 is_icache=false latency=15 replacement_policy=PSEUDO_LRU @@ -840,6 +897,7 @@ tagArrayBanks=1 type=DerivedClockDomain clk_divider=3 clk_domain=system.ruby.clk_domain +eventq_index=0 [system.ruby.network] type=SimpleNetwork @@ -849,6 +907,7 @@ buffer_size=0 clk_domain=system.ruby.clk_domain control_msg_size=8 endpoint_bandwidth=1000 +eventq_index=0 ext_links=system.ruby.network.ext_links0 system.ruby.network.ext_links1 system.ruby.network.ext_links2 system.ruby.network.ext_links3 system.ruby.network.ext_links4 system.ruby.network.ext_links5 system.ruby.network.ext_links6 system.ruby.network.ext_links7 system.ruby.network.ext_links8 system.ruby.network.ext_links9 int_links=system.ruby.network.int_links0 system.ruby.network.int_links1 system.ruby.network.int_links2 system.ruby.network.int_links3 system.ruby.network.int_links4 system.ruby.network.int_links5 system.ruby.network.int_links6 system.ruby.network.int_links7 system.ruby.network.int_links8 system.ruby.network.int_links9 number_of_virtual_networks=10 @@ -859,6 +918,7 @@ topology=Crossbar [system.ruby.network.ext_links0] type=SimpleExtLink bandwidth_factor=16 +eventq_index=0 ext_node=system.ruby.l1_cntrl0 int_node=system.ruby.network.routers00 latency=1 @@ -868,6 +928,7 @@ weight=1 [system.ruby.network.ext_links1] type=SimpleExtLink bandwidth_factor=16 +eventq_index=0 ext_node=system.ruby.l1_cntrl1 int_node=system.ruby.network.routers01 latency=1 @@ -877,6 +938,7 @@ weight=1 [system.ruby.network.ext_links2] type=SimpleExtLink bandwidth_factor=16 +eventq_index=0 ext_node=system.ruby.l1_cntrl2 int_node=system.ruby.network.routers02 latency=1 @@ -886,6 +948,7 @@ weight=1 [system.ruby.network.ext_links3] type=SimpleExtLink bandwidth_factor=16 +eventq_index=0 ext_node=system.ruby.l1_cntrl3 int_node=system.ruby.network.routers03 latency=1 @@ -895,6 +958,7 @@ weight=1 [system.ruby.network.ext_links4] type=SimpleExtLink bandwidth_factor=16 +eventq_index=0 ext_node=system.ruby.l1_cntrl4 int_node=system.ruby.network.routers04 latency=1 @@ -904,6 +968,7 @@ weight=1 [system.ruby.network.ext_links5] type=SimpleExtLink bandwidth_factor=16 +eventq_index=0 ext_node=system.ruby.l1_cntrl5 int_node=system.ruby.network.routers05 latency=1 @@ -913,6 +978,7 @@ weight=1 [system.ruby.network.ext_links6] type=SimpleExtLink bandwidth_factor=16 +eventq_index=0 ext_node=system.ruby.l1_cntrl6 int_node=system.ruby.network.routers06 latency=1 @@ -922,6 +988,7 @@ weight=1 [system.ruby.network.ext_links7] type=SimpleExtLink bandwidth_factor=16 +eventq_index=0 ext_node=system.ruby.l1_cntrl7 int_node=system.ruby.network.routers07 latency=1 @@ -931,6 +998,7 @@ weight=1 [system.ruby.network.ext_links8] type=SimpleExtLink bandwidth_factor=16 +eventq_index=0 ext_node=system.ruby.l2_cntrl0 int_node=system.ruby.network.routers08 latency=1 @@ -940,6 +1008,7 @@ weight=1 [system.ruby.network.ext_links9] type=SimpleExtLink bandwidth_factor=16 +eventq_index=0 ext_node=system.ruby.dir_cntrl0 int_node=system.ruby.network.routers09 latency=1 @@ -949,6 +1018,7 @@ weight=1 [system.ruby.network.int_links0] type=SimpleIntLink bandwidth_factor=16 +eventq_index=0 latency=1 link_id=10 node_a=system.ruby.network.routers00 @@ -958,6 +1028,7 @@ weight=1 [system.ruby.network.int_links1] type=SimpleIntLink bandwidth_factor=16 +eventq_index=0 latency=1 link_id=11 node_a=system.ruby.network.routers01 @@ -967,6 +1038,7 @@ weight=1 [system.ruby.network.int_links2] type=SimpleIntLink bandwidth_factor=16 +eventq_index=0 latency=1 link_id=12 node_a=system.ruby.network.routers02 @@ -976,6 +1048,7 @@ weight=1 [system.ruby.network.int_links3] type=SimpleIntLink bandwidth_factor=16 +eventq_index=0 latency=1 link_id=13 node_a=system.ruby.network.routers03 @@ -985,6 +1058,7 @@ weight=1 [system.ruby.network.int_links4] type=SimpleIntLink bandwidth_factor=16 +eventq_index=0 latency=1 link_id=14 node_a=system.ruby.network.routers04 @@ -994,6 +1068,7 @@ weight=1 [system.ruby.network.int_links5] type=SimpleIntLink bandwidth_factor=16 +eventq_index=0 latency=1 link_id=15 node_a=system.ruby.network.routers05 @@ -1003,6 +1078,7 @@ weight=1 [system.ruby.network.int_links6] type=SimpleIntLink bandwidth_factor=16 +eventq_index=0 latency=1 link_id=16 node_a=system.ruby.network.routers06 @@ -1012,6 +1088,7 @@ weight=1 [system.ruby.network.int_links7] type=SimpleIntLink bandwidth_factor=16 +eventq_index=0 latency=1 link_id=17 node_a=system.ruby.network.routers07 @@ -1021,6 +1098,7 @@ weight=1 [system.ruby.network.int_links8] type=SimpleIntLink bandwidth_factor=16 +eventq_index=0 latency=1 link_id=18 node_a=system.ruby.network.routers08 @@ -1030,6 +1108,7 @@ weight=1 [system.ruby.network.int_links9] type=SimpleIntLink bandwidth_factor=16 +eventq_index=0 latency=1 link_id=19 node_a=system.ruby.network.routers09 @@ -1039,80 +1118,85 @@ weight=1 [system.ruby.network.routers00] type=Switch clk_domain=system.ruby.clk_domain +eventq_index=0 router_id=0 virt_nets=10 [system.ruby.network.routers01] type=Switch clk_domain=system.ruby.clk_domain +eventq_index=0 router_id=1 virt_nets=10 [system.ruby.network.routers02] type=Switch clk_domain=system.ruby.clk_domain +eventq_index=0 router_id=2 virt_nets=10 [system.ruby.network.routers03] type=Switch clk_domain=system.ruby.clk_domain +eventq_index=0 router_id=3 virt_nets=10 [system.ruby.network.routers04] type=Switch clk_domain=system.ruby.clk_domain +eventq_index=0 router_id=4 virt_nets=10 [system.ruby.network.routers05] type=Switch clk_domain=system.ruby.clk_domain +eventq_index=0 router_id=5 virt_nets=10 [system.ruby.network.routers06] type=Switch clk_domain=system.ruby.clk_domain +eventq_index=0 router_id=6 virt_nets=10 [system.ruby.network.routers07] type=Switch clk_domain=system.ruby.clk_domain +eventq_index=0 router_id=7 virt_nets=10 [system.ruby.network.routers08] type=Switch clk_domain=system.ruby.clk_domain +eventq_index=0 router_id=8 virt_nets=10 [system.ruby.network.routers09] type=Switch clk_domain=system.ruby.clk_domain +eventq_index=0 router_id=9 virt_nets=10 [system.ruby.network.routers10] type=Switch clk_domain=system.ruby.clk_domain +eventq_index=0 router_id=10 virt_nets=10 -[system.ruby.profiler] -type=RubyProfiler -all_instructions=false -hot_lines=false -num_of_sequencers=8 -ruby_system=system.ruby - [system.sys_port_proxy] type=RubyPortProxy access_phys_mem=true clk_domain=system.clk_domain +eventq_index=0 ruby_system=system.ruby support_data_reqs=true support_inst_reqs=true @@ -1124,5 +1208,6 @@ slave=system.system_port [system.voltage_domain] type=VoltageDomain +eventq_index=0 voltage=1.000000 diff --git a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_directory/simerr b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_directory/simerr index d888f2c0a..96061ea38 100755 --- a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_directory/simerr +++ b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_directory/simerr @@ -79,4 +79,3 @@ system.cpu3: completed 90000 read, 49090 write accesses @6783540 system.cpu7: completed 90000 read, 48766 write accesses @6785808 system.cpu2: completed 90000 read, 49113 write accesses @6821790 system.cpu6: completed 100000 read, 54332 write accesses @7481441 -hack: be nice to actually delete the event here diff --git a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_directory/simout b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_directory/simout index 802dd1a62..45c67b8ac 100755 --- a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_directory/simout +++ b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_directory/simout @@ -1,11 +1,9 @@ -Redirecting stdout to build/ALPHA_MOESI_CMP_directory/tests/opt/quick/se/50.memtest/alpha/linux/memtest-ruby-MOESI_CMP_directory/simout -Redirecting stderr to build/ALPHA_MOESI_CMP_directory/tests/opt/quick/se/50.memtest/alpha/linux/memtest-ruby-MOESI_CMP_directory/simerr gem5 Simulator System. http://gem5.org gem5 is copyrighted software; use the --copyright option for details. -gem5 compiled Sep 22 2013 05:36:12 -gem5 started Sep 22 2013 05:36:22 -gem5 executing on zizzer +gem5 compiled Jan 22 2014 16:42:56 +gem5 started Jan 22 2014 17:26:44 +gem5 executing on u200540-lin command line: build/ALPHA_MOESI_CMP_directory/gem5.opt -d build/ALPHA_MOESI_CMP_directory/tests/opt/quick/se/50.memtest/alpha/linux/memtest-ruby-MOESI_CMP_directory -re tests/run.py build/ALPHA_MOESI_CMP_directory/tests/opt/quick/se/50.memtest/alpha/linux/memtest-ruby-MOESI_CMP_directory Global frequency set at 1000000000 ticks per second info: Entering event queue @ 0. Starting simulation... diff --git a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_directory/stats.txt b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_directory/stats.txt index a1c353735..9ceb39be3 100644 --- a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_directory/stats.txt +++ b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_directory/stats.txt @@ -4,9 +4,12 @@ sim_seconds 0.007481 # Nu sim_ticks 7481441 # Number of ticks simulated final_tick 7481441 # Number of ticks from beginning of simulation (restored from checkpoints and never reset) sim_freq 1000000000 # Frequency of simulated ticks -host_tick_rate 40706 # Simulator tick rate (ticks/s) -host_mem_usage 305724 # Number of bytes of host memory used -host_seconds 183.79 # Real time elapsed on the host +host_tick_rate 57492 # Simulator tick rate (ticks/s) +host_mem_usage 261156 # Number of bytes of host memory used +host_seconds 130.13 # Real time elapsed on the host +system.voltage_domain.voltage 1 # Voltage in Volts +system.clk_domain.clock 1 # Clock period in ticks +system.ruby.clk_domain.clock 1 # Clock period in ticks system.ruby.outstanding_req_hist::bucket_size 2 system.ruby.outstanding_req_hist::max_bucket 19 system.ruby.outstanding_req_hist::samples 619788 @@ -280,6 +283,7 @@ system.ruby.network.routers08.msg_bytes.Writeback_Control::2 3115216 system.ruby.network.routers08.msg_bytes.Forwarded_Control::0 67368 system.ruby.network.routers08.msg_bytes.Invalidate_Control::0 152 system.ruby.network.routers08.msg_bytes.Unblock_Control::2 9858144 +system.ruby.memctrl_clk_domain.clock 3 # Clock period in ticks system.ruby.dir_cntrl0.memBuffer.memReq 820394 # Total number of memory requests system.ruby.dir_cntrl0.memBuffer.memRead 605143 # Number of memory reads system.ruby.dir_cntrl0.memBuffer.memWrite 215243 # Number of memory writes @@ -359,6 +363,7 @@ system.ruby.network.msg_byte.Invalidate_Control 456 system.ruby.network.msg_byte.Unblock_Control 29574432 system.funcbus.throughput 0 # Throughput (bytes/s) system.funcbus.data_through_bus 0 # Total data (bytes) +system.cpu_clk_domain.clock 1 # Clock period in ticks system.cpu0.num_reads 99553 # number of read accesses completed system.cpu0.num_writes 54274 # number of write accesses completed system.cpu0.num_copies 0 # number of copy accesses completed 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 a202baa14..4e078b123 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 @@ -1,7 +1,9 @@ [root] type=Root children=system +eventq_index=0 full_system=false +sim_quantum=0 time_sync_enable=false time_sync_period=100000000 time_sync_spin_threshold=100000 @@ -12,6 +14,7 @@ children=clk_domain cpu0 cpu1 cpu2 cpu3 cpu4 cpu5 cpu6 cpu7 cpu_clk_domain funcb boot_osflags=a cache_line_size=64 clk_domain=system.clk_domain +eventq_index=0 init_param=0 kernel= load_addr_mask=1099511627775 @@ -33,12 +36,14 @@ system_port=system.sys_port_proxy.slave[0] [system.clk_domain] type=SrcClockDomain clock=1 +eventq_index=0 voltage_domain=system.voltage_domain [system.cpu0] type=MemTest atomic=false clk_domain=system.cpu_clk_domain +eventq_index=0 issue_dmas=false max_loads=100000 memory_size=65536 @@ -58,6 +63,7 @@ test=system.ruby.l1_cntrl0.sequencer.slave[0] type=MemTest atomic=false clk_domain=system.cpu_clk_domain +eventq_index=0 issue_dmas=false max_loads=100000 memory_size=65536 @@ -77,6 +83,7 @@ test=system.ruby.l1_cntrl1.sequencer.slave[0] type=MemTest atomic=false clk_domain=system.cpu_clk_domain +eventq_index=0 issue_dmas=false max_loads=100000 memory_size=65536 @@ -96,6 +103,7 @@ test=system.ruby.l1_cntrl2.sequencer.slave[0] type=MemTest atomic=false clk_domain=system.cpu_clk_domain +eventq_index=0 issue_dmas=false max_loads=100000 memory_size=65536 @@ -115,6 +123,7 @@ test=system.ruby.l1_cntrl3.sequencer.slave[0] type=MemTest atomic=false clk_domain=system.cpu_clk_domain +eventq_index=0 issue_dmas=false max_loads=100000 memory_size=65536 @@ -134,6 +143,7 @@ test=system.ruby.l1_cntrl4.sequencer.slave[0] type=MemTest atomic=false clk_domain=system.cpu_clk_domain +eventq_index=0 issue_dmas=false max_loads=100000 memory_size=65536 @@ -153,6 +163,7 @@ test=system.ruby.l1_cntrl5.sequencer.slave[0] type=MemTest atomic=false clk_domain=system.cpu_clk_domain +eventq_index=0 issue_dmas=false max_loads=100000 memory_size=65536 @@ -172,6 +183,7 @@ test=system.ruby.l1_cntrl6.sequencer.slave[0] type=MemTest atomic=false clk_domain=system.cpu_clk_domain +eventq_index=0 issue_dmas=false max_loads=100000 memory_size=65536 @@ -190,11 +202,13 @@ test=system.ruby.l1_cntrl7.sequencer.slave[0] [system.cpu_clk_domain] type=SrcClockDomain clock=1 +eventq_index=0 voltage_domain=system.voltage_domain [system.funcbus] type=NoncoherentBus clk_domain=system.clk_domain +eventq_index=0 header_cycles=1 use_default_range=false width=8 @@ -206,6 +220,7 @@ type=SimpleMemory bandwidth=0.000000 clk_domain=system.clk_domain conf_table_reported=true +eventq_index=0 in_addr_map=false latency=30 latency_var=0 @@ -218,6 +233,7 @@ type=SimpleMemory bandwidth=0.000000 clk_domain=system.clk_domain conf_table_reported=true +eventq_index=0 in_addr_map=true latency=30 latency_var=0 @@ -226,18 +242,22 @@ range=0:134217727 [system.ruby] type=RubySystem -children=clk_domain dir_cntrl0 l1_cntrl0 l1_cntrl1 l1_cntrl2 l1_cntrl3 l1_cntrl4 l1_cntrl5 l1_cntrl6 l1_cntrl7 l2_cntrl0 memctrl_clk_domain network profiler +children=clk_domain dir_cntrl0 l1_cntrl0 l1_cntrl1 l1_cntrl2 l1_cntrl3 l1_cntrl4 l1_cntrl5 l1_cntrl6 l1_cntrl7 l2_cntrl0 memctrl_clk_domain network +all_instructions=false block_size_bytes=64 clk_domain=system.ruby.clk_domain +eventq_index=0 +hot_lines=false mem_size=268435456 no_mem_vec=false +num_of_sequencers=8 random_seed=1234 randomization=false -stats_filename=ruby.stats [system.ruby.clk_domain] type=SrcClockDomain clock=1 +eventq_index=0 voltage_domain=system.voltage_domain [system.ruby.dir_cntrl0] @@ -245,10 +265,11 @@ type=Directory_Controller children=directory memBuffer buffer_size=0 clk_domain=system.ruby.clk_domain -cntrl_id=9 +cluster_id=0 directory=system.ruby.dir_cntrl0.directory directory_latency=5 distributed_persistent=true +eventq_index=0 fixed_timeout_latency=100 l2_select_num_bits=0 memBuffer=system.ruby.dir_cntrl0.memBuffer @@ -262,6 +283,7 @@ version=0 [system.ruby.dir_cntrl0.directory] type=RubyDirectoryMemory +eventq_index=0 map_levels=4 numa_high_bit=5 size=268435456 @@ -278,6 +300,7 @@ basic_bus_busy_time=2 clk_domain=system.ruby.memctrl_clk_domain dimm_bit_0=12 dimms_per_channel=2 +eventq_index=0 mem_ctl_latency=12 mem_fixed_delay=0 mem_random_arbitrate=0 @@ -298,8 +321,9 @@ L1Icache=system.ruby.l1_cntrl0.L1Icache N_tokens=9 buffer_size=0 clk_domain=system.ruby.clk_domain -cntrl_id=0 +cluster_id=0 dynamic_timeout_enabled=true +eventq_index=0 fixed_timeout_latency=300 l1_request_latency=2 l1_response_latency=2 @@ -322,6 +346,7 @@ type=RubyCache assoc=2 dataAccessLatency=1 dataArrayBanks=1 +eventq_index=0 is_icache=false latency=2 replacement_policy=PSEUDO_LRU @@ -336,6 +361,7 @@ type=RubyCache assoc=2 dataAccessLatency=1 dataArrayBanks=1 +eventq_index=0 is_icache=false latency=2 replacement_policy=PSEUDO_LRU @@ -351,6 +377,7 @@ access_phys_mem=false clk_domain=system.ruby.clk_domain dcache=system.ruby.l1_cntrl0.L1Dcache deadlock_threshold=1000000 +eventq_index=0 icache=system.ruby.l1_cntrl0.L1Icache max_outstanding_requests=16 ruby_system=system.ruby @@ -370,8 +397,9 @@ L1Icache=system.ruby.l1_cntrl1.L1Icache N_tokens=9 buffer_size=0 clk_domain=system.ruby.clk_domain -cntrl_id=1 +cluster_id=0 dynamic_timeout_enabled=true +eventq_index=0 fixed_timeout_latency=300 l1_request_latency=2 l1_response_latency=2 @@ -394,6 +422,7 @@ type=RubyCache assoc=2 dataAccessLatency=1 dataArrayBanks=1 +eventq_index=0 is_icache=false latency=2 replacement_policy=PSEUDO_LRU @@ -408,6 +437,7 @@ type=RubyCache assoc=2 dataAccessLatency=1 dataArrayBanks=1 +eventq_index=0 is_icache=false latency=2 replacement_policy=PSEUDO_LRU @@ -423,6 +453,7 @@ access_phys_mem=false clk_domain=system.ruby.clk_domain dcache=system.ruby.l1_cntrl1.L1Dcache deadlock_threshold=1000000 +eventq_index=0 icache=system.ruby.l1_cntrl1.L1Icache max_outstanding_requests=16 ruby_system=system.ruby @@ -442,8 +473,9 @@ L1Icache=system.ruby.l1_cntrl2.L1Icache N_tokens=9 buffer_size=0 clk_domain=system.ruby.clk_domain -cntrl_id=2 +cluster_id=0 dynamic_timeout_enabled=true +eventq_index=0 fixed_timeout_latency=300 l1_request_latency=2 l1_response_latency=2 @@ -466,6 +498,7 @@ type=RubyCache assoc=2 dataAccessLatency=1 dataArrayBanks=1 +eventq_index=0 is_icache=false latency=2 replacement_policy=PSEUDO_LRU @@ -480,6 +513,7 @@ type=RubyCache assoc=2 dataAccessLatency=1 dataArrayBanks=1 +eventq_index=0 is_icache=false latency=2 replacement_policy=PSEUDO_LRU @@ -495,6 +529,7 @@ access_phys_mem=false clk_domain=system.ruby.clk_domain dcache=system.ruby.l1_cntrl2.L1Dcache deadlock_threshold=1000000 +eventq_index=0 icache=system.ruby.l1_cntrl2.L1Icache max_outstanding_requests=16 ruby_system=system.ruby @@ -514,8 +549,9 @@ L1Icache=system.ruby.l1_cntrl3.L1Icache N_tokens=9 buffer_size=0 clk_domain=system.ruby.clk_domain -cntrl_id=3 +cluster_id=0 dynamic_timeout_enabled=true +eventq_index=0 fixed_timeout_latency=300 l1_request_latency=2 l1_response_latency=2 @@ -538,6 +574,7 @@ type=RubyCache assoc=2 dataAccessLatency=1 dataArrayBanks=1 +eventq_index=0 is_icache=false latency=2 replacement_policy=PSEUDO_LRU @@ -552,6 +589,7 @@ type=RubyCache assoc=2 dataAccessLatency=1 dataArrayBanks=1 +eventq_index=0 is_icache=false latency=2 replacement_policy=PSEUDO_LRU @@ -567,6 +605,7 @@ access_phys_mem=false clk_domain=system.ruby.clk_domain dcache=system.ruby.l1_cntrl3.L1Dcache deadlock_threshold=1000000 +eventq_index=0 icache=system.ruby.l1_cntrl3.L1Icache max_outstanding_requests=16 ruby_system=system.ruby @@ -586,8 +625,9 @@ L1Icache=system.ruby.l1_cntrl4.L1Icache N_tokens=9 buffer_size=0 clk_domain=system.ruby.clk_domain -cntrl_id=4 +cluster_id=0 dynamic_timeout_enabled=true +eventq_index=0 fixed_timeout_latency=300 l1_request_latency=2 l1_response_latency=2 @@ -610,6 +650,7 @@ type=RubyCache assoc=2 dataAccessLatency=1 dataArrayBanks=1 +eventq_index=0 is_icache=false latency=2 replacement_policy=PSEUDO_LRU @@ -624,6 +665,7 @@ type=RubyCache assoc=2 dataAccessLatency=1 dataArrayBanks=1 +eventq_index=0 is_icache=false latency=2 replacement_policy=PSEUDO_LRU @@ -639,6 +681,7 @@ access_phys_mem=false clk_domain=system.ruby.clk_domain dcache=system.ruby.l1_cntrl4.L1Dcache deadlock_threshold=1000000 +eventq_index=0 icache=system.ruby.l1_cntrl4.L1Icache max_outstanding_requests=16 ruby_system=system.ruby @@ -658,8 +701,9 @@ L1Icache=system.ruby.l1_cntrl5.L1Icache N_tokens=9 buffer_size=0 clk_domain=system.ruby.clk_domain -cntrl_id=5 +cluster_id=0 dynamic_timeout_enabled=true +eventq_index=0 fixed_timeout_latency=300 l1_request_latency=2 l1_response_latency=2 @@ -682,6 +726,7 @@ type=RubyCache assoc=2 dataAccessLatency=1 dataArrayBanks=1 +eventq_index=0 is_icache=false latency=2 replacement_policy=PSEUDO_LRU @@ -696,6 +741,7 @@ type=RubyCache assoc=2 dataAccessLatency=1 dataArrayBanks=1 +eventq_index=0 is_icache=false latency=2 replacement_policy=PSEUDO_LRU @@ -711,6 +757,7 @@ access_phys_mem=false clk_domain=system.ruby.clk_domain dcache=system.ruby.l1_cntrl5.L1Dcache deadlock_threshold=1000000 +eventq_index=0 icache=system.ruby.l1_cntrl5.L1Icache max_outstanding_requests=16 ruby_system=system.ruby @@ -730,8 +777,9 @@ L1Icache=system.ruby.l1_cntrl6.L1Icache N_tokens=9 buffer_size=0 clk_domain=system.ruby.clk_domain -cntrl_id=6 +cluster_id=0 dynamic_timeout_enabled=true +eventq_index=0 fixed_timeout_latency=300 l1_request_latency=2 l1_response_latency=2 @@ -754,6 +802,7 @@ type=RubyCache assoc=2 dataAccessLatency=1 dataArrayBanks=1 +eventq_index=0 is_icache=false latency=2 replacement_policy=PSEUDO_LRU @@ -768,6 +817,7 @@ type=RubyCache assoc=2 dataAccessLatency=1 dataArrayBanks=1 +eventq_index=0 is_icache=false latency=2 replacement_policy=PSEUDO_LRU @@ -783,6 +833,7 @@ access_phys_mem=false clk_domain=system.ruby.clk_domain dcache=system.ruby.l1_cntrl6.L1Dcache deadlock_threshold=1000000 +eventq_index=0 icache=system.ruby.l1_cntrl6.L1Icache max_outstanding_requests=16 ruby_system=system.ruby @@ -802,8 +853,9 @@ L1Icache=system.ruby.l1_cntrl7.L1Icache N_tokens=9 buffer_size=0 clk_domain=system.ruby.clk_domain -cntrl_id=7 +cluster_id=0 dynamic_timeout_enabled=true +eventq_index=0 fixed_timeout_latency=300 l1_request_latency=2 l1_response_latency=2 @@ -826,6 +878,7 @@ type=RubyCache assoc=2 dataAccessLatency=1 dataArrayBanks=1 +eventq_index=0 is_icache=false latency=2 replacement_policy=PSEUDO_LRU @@ -840,6 +893,7 @@ type=RubyCache assoc=2 dataAccessLatency=1 dataArrayBanks=1 +eventq_index=0 is_icache=false latency=2 replacement_policy=PSEUDO_LRU @@ -855,6 +909,7 @@ access_phys_mem=false clk_domain=system.ruby.clk_domain dcache=system.ruby.l1_cntrl7.L1Dcache deadlock_threshold=1000000 +eventq_index=0 icache=system.ruby.l1_cntrl7.L1Icache max_outstanding_requests=16 ruby_system=system.ruby @@ -873,7 +928,8 @@ L2cache=system.ruby.l2_cntrl0.L2cache N_tokens=9 buffer_size=0 clk_domain=system.ruby.clk_domain -cntrl_id=8 +cluster_id=0 +eventq_index=0 filtering_enabled=true l2_request_latency=5 l2_response_latency=5 @@ -889,6 +945,7 @@ type=RubyCache assoc=2 dataAccessLatency=1 dataArrayBanks=1 +eventq_index=0 is_icache=false latency=10 replacement_policy=PSEUDO_LRU @@ -902,6 +959,7 @@ tagArrayBanks=1 type=DerivedClockDomain clk_divider=3 clk_domain=system.ruby.clk_domain +eventq_index=0 [system.ruby.network] type=SimpleNetwork @@ -911,6 +969,7 @@ buffer_size=0 clk_domain=system.ruby.clk_domain control_msg_size=8 endpoint_bandwidth=1000 +eventq_index=0 ext_links=system.ruby.network.ext_links0 system.ruby.network.ext_links1 system.ruby.network.ext_links2 system.ruby.network.ext_links3 system.ruby.network.ext_links4 system.ruby.network.ext_links5 system.ruby.network.ext_links6 system.ruby.network.ext_links7 system.ruby.network.ext_links8 system.ruby.network.ext_links9 int_links=system.ruby.network.int_links0 system.ruby.network.int_links1 system.ruby.network.int_links2 system.ruby.network.int_links3 system.ruby.network.int_links4 system.ruby.network.int_links5 system.ruby.network.int_links6 system.ruby.network.int_links7 system.ruby.network.int_links8 system.ruby.network.int_links9 number_of_virtual_networks=10 @@ -921,6 +980,7 @@ topology=Crossbar [system.ruby.network.ext_links0] type=SimpleExtLink bandwidth_factor=16 +eventq_index=0 ext_node=system.ruby.l1_cntrl0 int_node=system.ruby.network.routers00 latency=1 @@ -930,6 +990,7 @@ weight=1 [system.ruby.network.ext_links1] type=SimpleExtLink bandwidth_factor=16 +eventq_index=0 ext_node=system.ruby.l1_cntrl1 int_node=system.ruby.network.routers01 latency=1 @@ -939,6 +1000,7 @@ weight=1 [system.ruby.network.ext_links2] type=SimpleExtLink bandwidth_factor=16 +eventq_index=0 ext_node=system.ruby.l1_cntrl2 int_node=system.ruby.network.routers02 latency=1 @@ -948,6 +1010,7 @@ weight=1 [system.ruby.network.ext_links3] type=SimpleExtLink bandwidth_factor=16 +eventq_index=0 ext_node=system.ruby.l1_cntrl3 int_node=system.ruby.network.routers03 latency=1 @@ -957,6 +1020,7 @@ weight=1 [system.ruby.network.ext_links4] type=SimpleExtLink bandwidth_factor=16 +eventq_index=0 ext_node=system.ruby.l1_cntrl4 int_node=system.ruby.network.routers04 latency=1 @@ -966,6 +1030,7 @@ weight=1 [system.ruby.network.ext_links5] type=SimpleExtLink bandwidth_factor=16 +eventq_index=0 ext_node=system.ruby.l1_cntrl5 int_node=system.ruby.network.routers05 latency=1 @@ -975,6 +1040,7 @@ weight=1 [system.ruby.network.ext_links6] type=SimpleExtLink bandwidth_factor=16 +eventq_index=0 ext_node=system.ruby.l1_cntrl6 int_node=system.ruby.network.routers06 latency=1 @@ -984,6 +1050,7 @@ weight=1 [system.ruby.network.ext_links7] type=SimpleExtLink bandwidth_factor=16 +eventq_index=0 ext_node=system.ruby.l1_cntrl7 int_node=system.ruby.network.routers07 latency=1 @@ -993,6 +1060,7 @@ weight=1 [system.ruby.network.ext_links8] type=SimpleExtLink bandwidth_factor=16 +eventq_index=0 ext_node=system.ruby.l2_cntrl0 int_node=system.ruby.network.routers08 latency=1 @@ -1002,6 +1070,7 @@ weight=1 [system.ruby.network.ext_links9] type=SimpleExtLink bandwidth_factor=16 +eventq_index=0 ext_node=system.ruby.dir_cntrl0 int_node=system.ruby.network.routers09 latency=1 @@ -1011,6 +1080,7 @@ weight=1 [system.ruby.network.int_links0] type=SimpleIntLink bandwidth_factor=16 +eventq_index=0 latency=1 link_id=10 node_a=system.ruby.network.routers00 @@ -1020,6 +1090,7 @@ weight=1 [system.ruby.network.int_links1] type=SimpleIntLink bandwidth_factor=16 +eventq_index=0 latency=1 link_id=11 node_a=system.ruby.network.routers01 @@ -1029,6 +1100,7 @@ weight=1 [system.ruby.network.int_links2] type=SimpleIntLink bandwidth_factor=16 +eventq_index=0 latency=1 link_id=12 node_a=system.ruby.network.routers02 @@ -1038,6 +1110,7 @@ weight=1 [system.ruby.network.int_links3] type=SimpleIntLink bandwidth_factor=16 +eventq_index=0 latency=1 link_id=13 node_a=system.ruby.network.routers03 @@ -1047,6 +1120,7 @@ weight=1 [system.ruby.network.int_links4] type=SimpleIntLink bandwidth_factor=16 +eventq_index=0 latency=1 link_id=14 node_a=system.ruby.network.routers04 @@ -1056,6 +1130,7 @@ weight=1 [system.ruby.network.int_links5] type=SimpleIntLink bandwidth_factor=16 +eventq_index=0 latency=1 link_id=15 node_a=system.ruby.network.routers05 @@ -1065,6 +1140,7 @@ weight=1 [system.ruby.network.int_links6] type=SimpleIntLink bandwidth_factor=16 +eventq_index=0 latency=1 link_id=16 node_a=system.ruby.network.routers06 @@ -1074,6 +1150,7 @@ weight=1 [system.ruby.network.int_links7] type=SimpleIntLink bandwidth_factor=16 +eventq_index=0 latency=1 link_id=17 node_a=system.ruby.network.routers07 @@ -1083,6 +1160,7 @@ weight=1 [system.ruby.network.int_links8] type=SimpleIntLink bandwidth_factor=16 +eventq_index=0 latency=1 link_id=18 node_a=system.ruby.network.routers08 @@ -1092,6 +1170,7 @@ weight=1 [system.ruby.network.int_links9] type=SimpleIntLink bandwidth_factor=16 +eventq_index=0 latency=1 link_id=19 node_a=system.ruby.network.routers09 @@ -1101,80 +1180,85 @@ weight=1 [system.ruby.network.routers00] type=Switch clk_domain=system.ruby.clk_domain +eventq_index=0 router_id=0 virt_nets=10 [system.ruby.network.routers01] type=Switch clk_domain=system.ruby.clk_domain +eventq_index=0 router_id=1 virt_nets=10 [system.ruby.network.routers02] type=Switch clk_domain=system.ruby.clk_domain +eventq_index=0 router_id=2 virt_nets=10 [system.ruby.network.routers03] type=Switch clk_domain=system.ruby.clk_domain +eventq_index=0 router_id=3 virt_nets=10 [system.ruby.network.routers04] type=Switch clk_domain=system.ruby.clk_domain +eventq_index=0 router_id=4 virt_nets=10 [system.ruby.network.routers05] type=Switch clk_domain=system.ruby.clk_domain +eventq_index=0 router_id=5 virt_nets=10 [system.ruby.network.routers06] type=Switch clk_domain=system.ruby.clk_domain +eventq_index=0 router_id=6 virt_nets=10 [system.ruby.network.routers07] type=Switch clk_domain=system.ruby.clk_domain +eventq_index=0 router_id=7 virt_nets=10 [system.ruby.network.routers08] type=Switch clk_domain=system.ruby.clk_domain +eventq_index=0 router_id=8 virt_nets=10 [system.ruby.network.routers09] type=Switch clk_domain=system.ruby.clk_domain +eventq_index=0 router_id=9 virt_nets=10 [system.ruby.network.routers10] type=Switch clk_domain=system.ruby.clk_domain +eventq_index=0 router_id=10 virt_nets=10 -[system.ruby.profiler] -type=RubyProfiler -all_instructions=false -hot_lines=false -num_of_sequencers=8 -ruby_system=system.ruby - [system.sys_port_proxy] type=RubyPortProxy access_phys_mem=true clk_domain=system.clk_domain +eventq_index=0 ruby_system=system.ruby support_data_reqs=true support_inst_reqs=true @@ -1186,5 +1270,6 @@ slave=system.system_port [system.voltage_domain] type=VoltageDomain +eventq_index=0 voltage=1.000000 diff --git a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_token/simerr b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_token/simerr index 03befb105..78259ab68 100755 --- a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_token/simerr +++ b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_token/simerr @@ -79,4 +79,3 @@ system.cpu7: completed 90000 read, 48273 write accesses @5561660 system.cpu4: completed 90000 read, 48720 write accesses @5589754 system.cpu6: completed 90000 read, 49134 write accesses @5592253 system.cpu0: completed 100000 read, 54250 write accesses @6151475 -hack: be nice to actually delete the event here diff --git a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_token/simout b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_token/simout index 9d06307c2..b764ed210 100755 --- a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_token/simout +++ b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_token/simout @@ -1,11 +1,9 @@ -Redirecting stdout to build/ALPHA_MOESI_CMP_token/tests/opt/quick/se/50.memtest/alpha/linux/memtest-ruby-MOESI_CMP_token/simout -Redirecting stderr to build/ALPHA_MOESI_CMP_token/tests/opt/quick/se/50.memtest/alpha/linux/memtest-ruby-MOESI_CMP_token/simerr gem5 Simulator System. http://gem5.org gem5 is copyrighted software; use the --copyright option for details. -gem5 compiled Sep 22 2013 05:44:48 -gem5 started Sep 22 2013 05:44:59 -gem5 executing on zizzer +gem5 compiled Jan 22 2014 16:47:59 +gem5 started Jan 22 2014 17:27:37 +gem5 executing on u200540-lin command line: build/ALPHA_MOESI_CMP_token/gem5.opt -d build/ALPHA_MOESI_CMP_token/tests/opt/quick/se/50.memtest/alpha/linux/memtest-ruby-MOESI_CMP_token -re tests/run.py build/ALPHA_MOESI_CMP_token/tests/opt/quick/se/50.memtest/alpha/linux/memtest-ruby-MOESI_CMP_token Global frequency set at 1000000000 ticks per second info: Entering event queue @ 0. Starting simulation... diff --git a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_token/stats.txt b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_token/stats.txt index 83fd02236..7d7ea198b 100644 --- a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_token/stats.txt +++ b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_token/stats.txt @@ -4,9 +4,12 @@ sim_seconds 0.006151 # Nu sim_ticks 6151475 # Number of ticks simulated final_tick 6151475 # Number of ticks from beginning of simulation (restored from checkpoints and never reset) sim_freq 1000000000 # Frequency of simulated ticks -host_tick_rate 45886 # Simulator tick rate (ticks/s) -host_mem_usage 303616 # Number of bytes of host memory used -host_seconds 134.06 # Real time elapsed on the host +host_tick_rate 74061 # Simulator tick rate (ticks/s) +host_mem_usage 259044 # Number of bytes of host memory used +host_seconds 83.06 # Real time elapsed on the host +system.voltage_domain.voltage 1 # Voltage in Volts +system.clk_domain.clock 1 # Clock period in ticks +system.ruby.clk_domain.clock 1 # Clock period in ticks system.ruby.outstanding_req_hist::bucket_size 2 system.ruby.outstanding_req_hist::max_bucket 19 system.ruby.outstanding_req_hist::samples 617095 @@ -245,6 +248,7 @@ system.ruby.network.routers08.msg_bytes.Response_Control::4 11184 system.ruby.network.routers08.msg_bytes.Writeback_Data::4 61234056 system.ruby.network.routers08.msg_bytes.Writeback_Control::4 3020648 system.ruby.network.routers08.msg_bytes.Persistent_Control::3 2077536 +system.ruby.memctrl_clk_domain.clock 3 # Clock period in ticks system.ruby.dir_cntrl0.memBuffer.memReq 844944 # Total number of memory requests system.ruby.dir_cntrl0.memBuffer.memRead 610587 # Number of memory reads system.ruby.dir_cntrl0.memBuffer.memWrite 234338 # Number of memory writes @@ -318,6 +322,7 @@ system.ruby.network.msg_byte.Broadcast_Control 74018760 system.ruby.network.msg_byte.Persistent_Control 41550720 system.funcbus.throughput 0 # Throughput (bytes/s) system.funcbus.data_through_bus 0 # Total data (bytes) +system.cpu_clk_domain.clock 1 # Clock period in ticks system.cpu0.num_reads 100000 # number of read accesses completed system.cpu0.num_writes 54250 # number of write accesses completed system.cpu0.num_copies 0 # number of copy accesses completed diff --git a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/config.ini b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/config.ini index 490bbc6b4..bb19b17fd 100644 --- a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/config.ini +++ b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/config.ini @@ -1,7 +1,9 @@ [root] type=Root children=system +eventq_index=0 full_system=false +sim_quantum=0 time_sync_enable=false time_sync_period=100000000 time_sync_spin_threshold=100000 @@ -12,12 +14,13 @@ children=clk_domain cpu0 cpu1 cpu2 cpu3 cpu4 cpu5 cpu6 cpu7 cpu_clk_domain funcb boot_osflags=a cache_line_size=64 clk_domain=system.clk_domain +eventq_index=0 init_param=0 kernel= load_addr_mask=1099511627775 mem_mode=timing mem_ranges=0:268435455 -memories=system.funcmem system.physmem +memories=system.physmem system.funcmem num_work_ids=16 readfile= symbolfile= @@ -33,12 +36,14 @@ system_port=system.sys_port_proxy.slave[0] [system.clk_domain] type=SrcClockDomain clock=1 +eventq_index=0 voltage_domain=system.voltage_domain [system.cpu0] type=MemTest atomic=false clk_domain=system.cpu_clk_domain +eventq_index=0 issue_dmas=false max_loads=100000 memory_size=65536 @@ -58,6 +63,7 @@ test=system.ruby.l1_cntrl0.sequencer.slave[0] type=MemTest atomic=false clk_domain=system.cpu_clk_domain +eventq_index=0 issue_dmas=false max_loads=100000 memory_size=65536 @@ -77,6 +83,7 @@ test=system.ruby.l1_cntrl1.sequencer.slave[0] type=MemTest atomic=false clk_domain=system.cpu_clk_domain +eventq_index=0 issue_dmas=false max_loads=100000 memory_size=65536 @@ -96,6 +103,7 @@ test=system.ruby.l1_cntrl2.sequencer.slave[0] type=MemTest atomic=false clk_domain=system.cpu_clk_domain +eventq_index=0 issue_dmas=false max_loads=100000 memory_size=65536 @@ -115,6 +123,7 @@ test=system.ruby.l1_cntrl3.sequencer.slave[0] type=MemTest atomic=false clk_domain=system.cpu_clk_domain +eventq_index=0 issue_dmas=false max_loads=100000 memory_size=65536 @@ -134,6 +143,7 @@ test=system.ruby.l1_cntrl4.sequencer.slave[0] type=MemTest atomic=false clk_domain=system.cpu_clk_domain +eventq_index=0 issue_dmas=false max_loads=100000 memory_size=65536 @@ -153,6 +163,7 @@ test=system.ruby.l1_cntrl5.sequencer.slave[0] type=MemTest atomic=false clk_domain=system.cpu_clk_domain +eventq_index=0 issue_dmas=false max_loads=100000 memory_size=65536 @@ -172,6 +183,7 @@ test=system.ruby.l1_cntrl6.sequencer.slave[0] type=MemTest atomic=false clk_domain=system.cpu_clk_domain +eventq_index=0 issue_dmas=false max_loads=100000 memory_size=65536 @@ -190,11 +202,13 @@ test=system.ruby.l1_cntrl7.sequencer.slave[0] [system.cpu_clk_domain] type=SrcClockDomain clock=1 +eventq_index=0 voltage_domain=system.voltage_domain [system.funcbus] type=NoncoherentBus clk_domain=system.clk_domain +eventq_index=0 header_cycles=1 use_default_range=false width=8 @@ -206,6 +220,7 @@ type=SimpleMemory bandwidth=0.000000 clk_domain=system.clk_domain conf_table_reported=true +eventq_index=0 in_addr_map=false latency=30 latency_var=0 @@ -218,6 +233,7 @@ type=SimpleMemory bandwidth=0.000000 clk_domain=system.clk_domain conf_table_reported=true +eventq_index=0 in_addr_map=true latency=30 latency_var=0 @@ -226,18 +242,22 @@ range=0:134217727 [system.ruby] type=RubySystem -children=clk_domain dir_cntrl0 l1_cntrl0 l1_cntrl1 l1_cntrl2 l1_cntrl3 l1_cntrl4 l1_cntrl5 l1_cntrl6 l1_cntrl7 memctrl_clk_domain network profiler +children=clk_domain dir_cntrl0 l1_cntrl0 l1_cntrl1 l1_cntrl2 l1_cntrl3 l1_cntrl4 l1_cntrl5 l1_cntrl6 l1_cntrl7 memctrl_clk_domain network +all_instructions=false block_size_bytes=64 clk_domain=system.ruby.clk_domain +eventq_index=0 +hot_lines=false mem_size=268435456 no_mem_vec=false +num_of_sequencers=8 random_seed=1234 randomization=false -stats_filename=ruby.stats [system.ruby.clk_domain] type=SrcClockDomain clock=1 +eventq_index=0 voltage_domain=system.voltage_domain [system.ruby.dir_cntrl0] @@ -245,8 +265,9 @@ type=Directory_Controller children=directory memBuffer probeFilter buffer_size=0 clk_domain=system.ruby.clk_domain -cntrl_id=8 +cluster_id=0 directory=system.ruby.dir_cntrl0.directory +eventq_index=0 full_bit_dir_enabled=false memBuffer=system.ruby.dir_cntrl0.memBuffer memory_controller_latency=2 @@ -261,6 +282,7 @@ version=0 [system.ruby.dir_cntrl0.directory] type=RubyDirectoryMemory +eventq_index=0 map_levels=4 numa_high_bit=5 size=268435456 @@ -277,6 +299,7 @@ basic_bus_busy_time=2 clk_domain=system.ruby.memctrl_clk_domain dimm_bit_0=12 dimms_per_channel=2 +eventq_index=0 mem_ctl_latency=12 mem_fixed_delay=0 mem_random_arbitrate=0 @@ -294,6 +317,7 @@ type=RubyCache assoc=4 dataAccessLatency=1 dataArrayBanks=1 +eventq_index=0 is_icache=false latency=1 replacement_policy=PSEUDO_LRU @@ -312,7 +336,8 @@ L2cache=system.ruby.l1_cntrl0.L2cache buffer_size=0 cache_response_latency=10 clk_domain=system.ruby.clk_domain -cntrl_id=0 +cluster_id=0 +eventq_index=0 issue_latency=2 l2_cache_hit_latency=10 no_mig_atomic=true @@ -330,6 +355,7 @@ type=RubyCache assoc=2 dataAccessLatency=1 dataArrayBanks=1 +eventq_index=0 is_icache=false latency=2 replacement_policy=PSEUDO_LRU @@ -344,6 +370,7 @@ type=RubyCache assoc=2 dataAccessLatency=1 dataArrayBanks=1 +eventq_index=0 is_icache=true latency=2 replacement_policy=PSEUDO_LRU @@ -358,6 +385,7 @@ type=RubyCache assoc=2 dataAccessLatency=1 dataArrayBanks=1 +eventq_index=0 is_icache=false latency=10 replacement_policy=PSEUDO_LRU @@ -373,6 +401,7 @@ access_phys_mem=false clk_domain=system.ruby.clk_domain dcache=system.ruby.l1_cntrl0.L1Dcache deadlock_threshold=1000000 +eventq_index=0 icache=system.ruby.l1_cntrl0.L1Icache max_outstanding_requests=16 ruby_system=system.ruby @@ -393,7 +422,8 @@ L2cache=system.ruby.l1_cntrl1.L2cache buffer_size=0 cache_response_latency=10 clk_domain=system.ruby.clk_domain -cntrl_id=1 +cluster_id=0 +eventq_index=0 issue_latency=2 l2_cache_hit_latency=10 no_mig_atomic=true @@ -411,6 +441,7 @@ type=RubyCache assoc=2 dataAccessLatency=1 dataArrayBanks=1 +eventq_index=0 is_icache=false latency=2 replacement_policy=PSEUDO_LRU @@ -425,6 +456,7 @@ type=RubyCache assoc=2 dataAccessLatency=1 dataArrayBanks=1 +eventq_index=0 is_icache=true latency=2 replacement_policy=PSEUDO_LRU @@ -439,6 +471,7 @@ type=RubyCache assoc=2 dataAccessLatency=1 dataArrayBanks=1 +eventq_index=0 is_icache=false latency=10 replacement_policy=PSEUDO_LRU @@ -454,6 +487,7 @@ access_phys_mem=false clk_domain=system.ruby.clk_domain dcache=system.ruby.l1_cntrl1.L1Dcache deadlock_threshold=1000000 +eventq_index=0 icache=system.ruby.l1_cntrl1.L1Icache max_outstanding_requests=16 ruby_system=system.ruby @@ -474,7 +508,8 @@ L2cache=system.ruby.l1_cntrl2.L2cache buffer_size=0 cache_response_latency=10 clk_domain=system.ruby.clk_domain -cntrl_id=2 +cluster_id=0 +eventq_index=0 issue_latency=2 l2_cache_hit_latency=10 no_mig_atomic=true @@ -492,6 +527,7 @@ type=RubyCache assoc=2 dataAccessLatency=1 dataArrayBanks=1 +eventq_index=0 is_icache=false latency=2 replacement_policy=PSEUDO_LRU @@ -506,6 +542,7 @@ type=RubyCache assoc=2 dataAccessLatency=1 dataArrayBanks=1 +eventq_index=0 is_icache=true latency=2 replacement_policy=PSEUDO_LRU @@ -520,6 +557,7 @@ type=RubyCache assoc=2 dataAccessLatency=1 dataArrayBanks=1 +eventq_index=0 is_icache=false latency=10 replacement_policy=PSEUDO_LRU @@ -535,6 +573,7 @@ access_phys_mem=false clk_domain=system.ruby.clk_domain dcache=system.ruby.l1_cntrl2.L1Dcache deadlock_threshold=1000000 +eventq_index=0 icache=system.ruby.l1_cntrl2.L1Icache max_outstanding_requests=16 ruby_system=system.ruby @@ -555,7 +594,8 @@ L2cache=system.ruby.l1_cntrl3.L2cache buffer_size=0 cache_response_latency=10 clk_domain=system.ruby.clk_domain -cntrl_id=3 +cluster_id=0 +eventq_index=0 issue_latency=2 l2_cache_hit_latency=10 no_mig_atomic=true @@ -573,6 +613,7 @@ type=RubyCache assoc=2 dataAccessLatency=1 dataArrayBanks=1 +eventq_index=0 is_icache=false latency=2 replacement_policy=PSEUDO_LRU @@ -587,6 +628,7 @@ type=RubyCache assoc=2 dataAccessLatency=1 dataArrayBanks=1 +eventq_index=0 is_icache=true latency=2 replacement_policy=PSEUDO_LRU @@ -601,6 +643,7 @@ type=RubyCache assoc=2 dataAccessLatency=1 dataArrayBanks=1 +eventq_index=0 is_icache=false latency=10 replacement_policy=PSEUDO_LRU @@ -616,6 +659,7 @@ access_phys_mem=false clk_domain=system.ruby.clk_domain dcache=system.ruby.l1_cntrl3.L1Dcache deadlock_threshold=1000000 +eventq_index=0 icache=system.ruby.l1_cntrl3.L1Icache max_outstanding_requests=16 ruby_system=system.ruby @@ -636,7 +680,8 @@ L2cache=system.ruby.l1_cntrl4.L2cache buffer_size=0 cache_response_latency=10 clk_domain=system.ruby.clk_domain -cntrl_id=4 +cluster_id=0 +eventq_index=0 issue_latency=2 l2_cache_hit_latency=10 no_mig_atomic=true @@ -654,6 +699,7 @@ type=RubyCache assoc=2 dataAccessLatency=1 dataArrayBanks=1 +eventq_index=0 is_icache=false latency=2 replacement_policy=PSEUDO_LRU @@ -668,6 +714,7 @@ type=RubyCache assoc=2 dataAccessLatency=1 dataArrayBanks=1 +eventq_index=0 is_icache=true latency=2 replacement_policy=PSEUDO_LRU @@ -682,6 +729,7 @@ type=RubyCache assoc=2 dataAccessLatency=1 dataArrayBanks=1 +eventq_index=0 is_icache=false latency=10 replacement_policy=PSEUDO_LRU @@ -697,6 +745,7 @@ access_phys_mem=false clk_domain=system.ruby.clk_domain dcache=system.ruby.l1_cntrl4.L1Dcache deadlock_threshold=1000000 +eventq_index=0 icache=system.ruby.l1_cntrl4.L1Icache max_outstanding_requests=16 ruby_system=system.ruby @@ -717,7 +766,8 @@ L2cache=system.ruby.l1_cntrl5.L2cache buffer_size=0 cache_response_latency=10 clk_domain=system.ruby.clk_domain -cntrl_id=5 +cluster_id=0 +eventq_index=0 issue_latency=2 l2_cache_hit_latency=10 no_mig_atomic=true @@ -735,6 +785,7 @@ type=RubyCache assoc=2 dataAccessLatency=1 dataArrayBanks=1 +eventq_index=0 is_icache=false latency=2 replacement_policy=PSEUDO_LRU @@ -749,6 +800,7 @@ type=RubyCache assoc=2 dataAccessLatency=1 dataArrayBanks=1 +eventq_index=0 is_icache=true latency=2 replacement_policy=PSEUDO_LRU @@ -763,6 +815,7 @@ type=RubyCache assoc=2 dataAccessLatency=1 dataArrayBanks=1 +eventq_index=0 is_icache=false latency=10 replacement_policy=PSEUDO_LRU @@ -778,6 +831,7 @@ access_phys_mem=false clk_domain=system.ruby.clk_domain dcache=system.ruby.l1_cntrl5.L1Dcache deadlock_threshold=1000000 +eventq_index=0 icache=system.ruby.l1_cntrl5.L1Icache max_outstanding_requests=16 ruby_system=system.ruby @@ -798,7 +852,8 @@ L2cache=system.ruby.l1_cntrl6.L2cache buffer_size=0 cache_response_latency=10 clk_domain=system.ruby.clk_domain -cntrl_id=6 +cluster_id=0 +eventq_index=0 issue_latency=2 l2_cache_hit_latency=10 no_mig_atomic=true @@ -816,6 +871,7 @@ type=RubyCache assoc=2 dataAccessLatency=1 dataArrayBanks=1 +eventq_index=0 is_icache=false latency=2 replacement_policy=PSEUDO_LRU @@ -830,6 +886,7 @@ type=RubyCache assoc=2 dataAccessLatency=1 dataArrayBanks=1 +eventq_index=0 is_icache=true latency=2 replacement_policy=PSEUDO_LRU @@ -844,6 +901,7 @@ type=RubyCache assoc=2 dataAccessLatency=1 dataArrayBanks=1 +eventq_index=0 is_icache=false latency=10 replacement_policy=PSEUDO_LRU @@ -859,6 +917,7 @@ access_phys_mem=false clk_domain=system.ruby.clk_domain dcache=system.ruby.l1_cntrl6.L1Dcache deadlock_threshold=1000000 +eventq_index=0 icache=system.ruby.l1_cntrl6.L1Icache max_outstanding_requests=16 ruby_system=system.ruby @@ -879,7 +938,8 @@ L2cache=system.ruby.l1_cntrl7.L2cache buffer_size=0 cache_response_latency=10 clk_domain=system.ruby.clk_domain -cntrl_id=7 +cluster_id=0 +eventq_index=0 issue_latency=2 l2_cache_hit_latency=10 no_mig_atomic=true @@ -897,6 +957,7 @@ type=RubyCache assoc=2 dataAccessLatency=1 dataArrayBanks=1 +eventq_index=0 is_icache=false latency=2 replacement_policy=PSEUDO_LRU @@ -911,6 +972,7 @@ type=RubyCache assoc=2 dataAccessLatency=1 dataArrayBanks=1 +eventq_index=0 is_icache=true latency=2 replacement_policy=PSEUDO_LRU @@ -925,6 +987,7 @@ type=RubyCache assoc=2 dataAccessLatency=1 dataArrayBanks=1 +eventq_index=0 is_icache=false latency=10 replacement_policy=PSEUDO_LRU @@ -940,6 +1003,7 @@ access_phys_mem=false clk_domain=system.ruby.clk_domain dcache=system.ruby.l1_cntrl7.L1Dcache deadlock_threshold=1000000 +eventq_index=0 icache=system.ruby.l1_cntrl7.L1Icache max_outstanding_requests=16 ruby_system=system.ruby @@ -955,6 +1019,7 @@ slave=system.cpu7.test type=DerivedClockDomain clk_divider=3 clk_domain=system.ruby.clk_domain +eventq_index=0 [system.ruby.network] type=SimpleNetwork @@ -964,6 +1029,7 @@ buffer_size=0 clk_domain=system.ruby.clk_domain control_msg_size=8 endpoint_bandwidth=1000 +eventq_index=0 ext_links=system.ruby.network.ext_links0 system.ruby.network.ext_links1 system.ruby.network.ext_links2 system.ruby.network.ext_links3 system.ruby.network.ext_links4 system.ruby.network.ext_links5 system.ruby.network.ext_links6 system.ruby.network.ext_links7 system.ruby.network.ext_links8 int_links=system.ruby.network.int_links0 system.ruby.network.int_links1 system.ruby.network.int_links2 system.ruby.network.int_links3 system.ruby.network.int_links4 system.ruby.network.int_links5 system.ruby.network.int_links6 system.ruby.network.int_links7 system.ruby.network.int_links8 number_of_virtual_networks=10 @@ -974,6 +1040,7 @@ topology=Crossbar [system.ruby.network.ext_links0] type=SimpleExtLink bandwidth_factor=16 +eventq_index=0 ext_node=system.ruby.l1_cntrl0 int_node=system.ruby.network.routers0 latency=1 @@ -983,6 +1050,7 @@ weight=1 [system.ruby.network.ext_links1] type=SimpleExtLink bandwidth_factor=16 +eventq_index=0 ext_node=system.ruby.l1_cntrl1 int_node=system.ruby.network.routers1 latency=1 @@ -992,6 +1060,7 @@ weight=1 [system.ruby.network.ext_links2] type=SimpleExtLink bandwidth_factor=16 +eventq_index=0 ext_node=system.ruby.l1_cntrl2 int_node=system.ruby.network.routers2 latency=1 @@ -1001,6 +1070,7 @@ weight=1 [system.ruby.network.ext_links3] type=SimpleExtLink bandwidth_factor=16 +eventq_index=0 ext_node=system.ruby.l1_cntrl3 int_node=system.ruby.network.routers3 latency=1 @@ -1010,6 +1080,7 @@ weight=1 [system.ruby.network.ext_links4] type=SimpleExtLink bandwidth_factor=16 +eventq_index=0 ext_node=system.ruby.l1_cntrl4 int_node=system.ruby.network.routers4 latency=1 @@ -1019,6 +1090,7 @@ weight=1 [system.ruby.network.ext_links5] type=SimpleExtLink bandwidth_factor=16 +eventq_index=0 ext_node=system.ruby.l1_cntrl5 int_node=system.ruby.network.routers5 latency=1 @@ -1028,6 +1100,7 @@ weight=1 [system.ruby.network.ext_links6] type=SimpleExtLink bandwidth_factor=16 +eventq_index=0 ext_node=system.ruby.l1_cntrl6 int_node=system.ruby.network.routers6 latency=1 @@ -1037,6 +1110,7 @@ weight=1 [system.ruby.network.ext_links7] type=SimpleExtLink bandwidth_factor=16 +eventq_index=0 ext_node=system.ruby.l1_cntrl7 int_node=system.ruby.network.routers7 latency=1 @@ -1046,6 +1120,7 @@ weight=1 [system.ruby.network.ext_links8] type=SimpleExtLink bandwidth_factor=16 +eventq_index=0 ext_node=system.ruby.dir_cntrl0 int_node=system.ruby.network.routers8 latency=1 @@ -1055,6 +1130,7 @@ weight=1 [system.ruby.network.int_links0] type=SimpleIntLink bandwidth_factor=16 +eventq_index=0 latency=1 link_id=9 node_a=system.ruby.network.routers0 @@ -1064,6 +1140,7 @@ weight=1 [system.ruby.network.int_links1] type=SimpleIntLink bandwidth_factor=16 +eventq_index=0 latency=1 link_id=10 node_a=system.ruby.network.routers1 @@ -1073,6 +1150,7 @@ weight=1 [system.ruby.network.int_links2] type=SimpleIntLink bandwidth_factor=16 +eventq_index=0 latency=1 link_id=11 node_a=system.ruby.network.routers2 @@ -1082,6 +1160,7 @@ weight=1 [system.ruby.network.int_links3] type=SimpleIntLink bandwidth_factor=16 +eventq_index=0 latency=1 link_id=12 node_a=system.ruby.network.routers3 @@ -1091,6 +1170,7 @@ weight=1 [system.ruby.network.int_links4] type=SimpleIntLink bandwidth_factor=16 +eventq_index=0 latency=1 link_id=13 node_a=system.ruby.network.routers4 @@ -1100,6 +1180,7 @@ weight=1 [system.ruby.network.int_links5] type=SimpleIntLink bandwidth_factor=16 +eventq_index=0 latency=1 link_id=14 node_a=system.ruby.network.routers5 @@ -1109,6 +1190,7 @@ weight=1 [system.ruby.network.int_links6] type=SimpleIntLink bandwidth_factor=16 +eventq_index=0 latency=1 link_id=15 node_a=system.ruby.network.routers6 @@ -1118,6 +1200,7 @@ weight=1 [system.ruby.network.int_links7] type=SimpleIntLink bandwidth_factor=16 +eventq_index=0 latency=1 link_id=16 node_a=system.ruby.network.routers7 @@ -1127,6 +1210,7 @@ weight=1 [system.ruby.network.int_links8] type=SimpleIntLink bandwidth_factor=16 +eventq_index=0 latency=1 link_id=17 node_a=system.ruby.network.routers8 @@ -1136,74 +1220,78 @@ weight=1 [system.ruby.network.routers0] type=Switch clk_domain=system.ruby.clk_domain +eventq_index=0 router_id=0 virt_nets=10 [system.ruby.network.routers1] type=Switch clk_domain=system.ruby.clk_domain +eventq_index=0 router_id=1 virt_nets=10 [system.ruby.network.routers2] type=Switch clk_domain=system.ruby.clk_domain +eventq_index=0 router_id=2 virt_nets=10 [system.ruby.network.routers3] type=Switch clk_domain=system.ruby.clk_domain +eventq_index=0 router_id=3 virt_nets=10 [system.ruby.network.routers4] type=Switch clk_domain=system.ruby.clk_domain +eventq_index=0 router_id=4 virt_nets=10 [system.ruby.network.routers5] type=Switch clk_domain=system.ruby.clk_domain +eventq_index=0 router_id=5 virt_nets=10 [system.ruby.network.routers6] type=Switch clk_domain=system.ruby.clk_domain +eventq_index=0 router_id=6 virt_nets=10 [system.ruby.network.routers7] type=Switch clk_domain=system.ruby.clk_domain +eventq_index=0 router_id=7 virt_nets=10 [system.ruby.network.routers8] type=Switch clk_domain=system.ruby.clk_domain +eventq_index=0 router_id=8 virt_nets=10 [system.ruby.network.routers9] type=Switch clk_domain=system.ruby.clk_domain +eventq_index=0 router_id=9 virt_nets=10 -[system.ruby.profiler] -type=RubyProfiler -all_instructions=false -hot_lines=false -num_of_sequencers=8 -ruby_system=system.ruby - [system.sys_port_proxy] type=RubyPortProxy access_phys_mem=true clk_domain=system.clk_domain +eventq_index=0 ruby_system=system.ruby support_data_reqs=true support_inst_reqs=true @@ -1215,5 +1303,6 @@ slave=system.system_port [system.voltage_domain] type=VoltageDomain +eventq_index=0 voltage=1.000000 diff --git a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/simerr b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/simerr index a5b70c1a7..f2f8ae71c 100755 --- a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/simerr +++ b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/simerr @@ -79,4 +79,3 @@ system.cpu0: completed 90000 read, 48602 write accesses @5246963 system.cpu4: completed 90000 read, 48456 write accesses @5248509 system.cpu7: completed 90000 read, 48936 write accesses @5260982 system.cpu2: completed 100000 read, 54294 write accesses @5795833 -hack: be nice to actually delete the event here diff --git a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/simout b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/simout index 5f6410683..4c8b54d81 100755 --- a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/simout +++ b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/simout @@ -1,11 +1,9 @@ -Redirecting stdout to build/ALPHA_MOESI_hammer/tests/opt/quick/se/50.memtest/alpha/linux/memtest-ruby-MOESI_hammer/simout -Redirecting stderr to build/ALPHA_MOESI_hammer/tests/opt/quick/se/50.memtest/alpha/linux/memtest-ruby-MOESI_hammer/simerr gem5 Simulator System. http://gem5.org gem5 is copyrighted software; use the --copyright option for details. -gem5 compiled Sep 22 2013 05:17:28 -gem5 started Sep 22 2013 05:17:37 -gem5 executing on zizzer +gem5 compiled Jan 22 2014 16:32:54 +gem5 started Jan 22 2014 17:25:37 +gem5 executing on u200540-lin command line: build/ALPHA_MOESI_hammer/gem5.opt -d build/ALPHA_MOESI_hammer/tests/opt/quick/se/50.memtest/alpha/linux/memtest-ruby-MOESI_hammer -re tests/run.py build/ALPHA_MOESI_hammer/tests/opt/quick/se/50.memtest/alpha/linux/memtest-ruby-MOESI_hammer Global frequency set at 1000000000 ticks per second info: Entering event queue @ 0. Starting simulation... diff --git a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/stats.txt b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/stats.txt index dccaff688..c7c9aeb58 100644 --- a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/stats.txt +++ b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/stats.txt @@ -4,9 +4,12 @@ sim_seconds 0.005796 # Nu sim_ticks 5795833 # Number of ticks simulated final_tick 5795833 # Number of ticks from beginning of simulation (restored from checkpoints and never reset) sim_freq 1000000000 # Frequency of simulated ticks -host_tick_rate 40133 # Simulator tick rate (ticks/s) -host_mem_usage 303548 # Number of bytes of host memory used -host_seconds 144.41 # Real time elapsed on the host +host_tick_rate 66984 # Simulator tick rate (ticks/s) +host_mem_usage 260008 # Number of bytes of host memory used +host_seconds 86.53 # Real time elapsed on the host +system.voltage_domain.voltage 1 # Voltage in Volts +system.clk_domain.clock 1 # Clock period in ticks +system.ruby.clk_domain.clock 1 # Clock period in ticks system.ruby.outstanding_req_hist::bucket_size 2 system.ruby.outstanding_req_hist::max_bucket 19 system.ruby.outstanding_req_hist::samples 618244 @@ -280,6 +283,7 @@ system.ruby.network.routers7.msg_bytes.Writeback_Control::3 578720 system.ruby.network.routers7.msg_bytes.Writeback_Control::5 365344 system.ruby.network.routers7.msg_bytes.Broadcast_Control::3 4321008 system.ruby.network.routers7.msg_bytes.Unblock_Control::5 615240 +system.ruby.memctrl_clk_domain.clock 3 # Clock period in ticks system.ruby.dir_cntrl0.memBuffer.memReq 811546 # Total number of memory requests system.ruby.dir_cntrl0.memBuffer.memRead 597507 # Number of memory reads system.ruby.dir_cntrl0.memBuffer.memWrite 214013 # Number of memory writes @@ -356,6 +360,7 @@ system.ruby.network.msg_byte.Broadcast_Control 74035320 system.ruby.network.msg_byte.Unblock_Control 14822312 system.funcbus.throughput 0 # Throughput (bytes/s) system.funcbus.data_through_bus 0 # Total data (bytes) +system.cpu_clk_domain.clock 1 # Clock period in ticks system.cpu0.num_reads 99395 # number of read accesses completed system.cpu0.num_writes 53721 # number of write accesses completed system.cpu0.num_copies 0 # number of copy accesses completed diff --git a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby/config.ini b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby/config.ini index cd6eb6e26..717e12af4 100644 --- a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby/config.ini +++ b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby/config.ini @@ -1,7 +1,9 @@ [root] type=Root children=system +eventq_index=0 full_system=false +sim_quantum=0 time_sync_enable=false time_sync_period=100000000 time_sync_spin_threshold=100000 @@ -12,12 +14,13 @@ children=clk_domain cpu0 cpu1 cpu2 cpu3 cpu4 cpu5 cpu6 cpu7 cpu_clk_domain funcb boot_osflags=a cache_line_size=64 clk_domain=system.clk_domain +eventq_index=0 init_param=0 kernel= load_addr_mask=1099511627775 mem_mode=timing mem_ranges=0:268435455 -memories=system.funcmem system.physmem +memories=system.physmem system.funcmem num_work_ids=16 readfile= symbolfile= @@ -33,12 +36,14 @@ system_port=system.sys_port_proxy.slave[0] [system.clk_domain] type=SrcClockDomain clock=1 +eventq_index=0 voltage_domain=system.voltage_domain [system.cpu0] type=MemTest atomic=false clk_domain=system.cpu_clk_domain +eventq_index=0 issue_dmas=false max_loads=100000 memory_size=65536 @@ -58,6 +63,7 @@ test=system.ruby.l1_cntrl0.sequencer.slave[0] type=MemTest atomic=false clk_domain=system.cpu_clk_domain +eventq_index=0 issue_dmas=false max_loads=100000 memory_size=65536 @@ -77,6 +83,7 @@ test=system.ruby.l1_cntrl1.sequencer.slave[0] type=MemTest atomic=false clk_domain=system.cpu_clk_domain +eventq_index=0 issue_dmas=false max_loads=100000 memory_size=65536 @@ -96,6 +103,7 @@ test=system.ruby.l1_cntrl2.sequencer.slave[0] type=MemTest atomic=false clk_domain=system.cpu_clk_domain +eventq_index=0 issue_dmas=false max_loads=100000 memory_size=65536 @@ -115,6 +123,7 @@ test=system.ruby.l1_cntrl3.sequencer.slave[0] type=MemTest atomic=false clk_domain=system.cpu_clk_domain +eventq_index=0 issue_dmas=false max_loads=100000 memory_size=65536 @@ -134,6 +143,7 @@ test=system.ruby.l1_cntrl4.sequencer.slave[0] type=MemTest atomic=false clk_domain=system.cpu_clk_domain +eventq_index=0 issue_dmas=false max_loads=100000 memory_size=65536 @@ -153,6 +163,7 @@ test=system.ruby.l1_cntrl5.sequencer.slave[0] type=MemTest atomic=false clk_domain=system.cpu_clk_domain +eventq_index=0 issue_dmas=false max_loads=100000 memory_size=65536 @@ -172,6 +183,7 @@ test=system.ruby.l1_cntrl6.sequencer.slave[0] type=MemTest atomic=false clk_domain=system.cpu_clk_domain +eventq_index=0 issue_dmas=false max_loads=100000 memory_size=65536 @@ -190,11 +202,13 @@ test=system.ruby.l1_cntrl7.sequencer.slave[0] [system.cpu_clk_domain] type=SrcClockDomain clock=1 +eventq_index=0 voltage_domain=system.voltage_domain [system.funcbus] type=NoncoherentBus clk_domain=system.clk_domain +eventq_index=0 header_cycles=1 use_default_range=false width=8 @@ -206,6 +220,7 @@ type=SimpleMemory bandwidth=0.000000 clk_domain=system.clk_domain conf_table_reported=true +eventq_index=0 in_addr_map=false latency=30 latency_var=0 @@ -218,6 +233,7 @@ type=SimpleMemory bandwidth=0.000000 clk_domain=system.clk_domain conf_table_reported=true +eventq_index=0 in_addr_map=true latency=30 latency_var=0 @@ -226,18 +242,22 @@ range=0:134217727 [system.ruby] type=RubySystem -children=clk_domain dir_cntrl0 l1_cntrl0 l1_cntrl1 l1_cntrl2 l1_cntrl3 l1_cntrl4 l1_cntrl5 l1_cntrl6 l1_cntrl7 memctrl_clk_domain network profiler +children=clk_domain dir_cntrl0 l1_cntrl0 l1_cntrl1 l1_cntrl2 l1_cntrl3 l1_cntrl4 l1_cntrl5 l1_cntrl6 l1_cntrl7 memctrl_clk_domain network +all_instructions=false block_size_bytes=64 clk_domain=system.ruby.clk_domain +eventq_index=0 +hot_lines=false mem_size=268435456 no_mem_vec=false +num_of_sequencers=8 random_seed=1234 randomization=false -stats_filename=ruby.stats [system.ruby.clk_domain] type=SrcClockDomain clock=1 +eventq_index=0 voltage_domain=system.voltage_domain [system.ruby.dir_cntrl0] @@ -245,9 +265,10 @@ type=Directory_Controller children=directory memBuffer buffer_size=0 clk_domain=system.ruby.clk_domain -cntrl_id=8 +cluster_id=0 directory=system.ruby.dir_cntrl0.directory directory_latency=12 +eventq_index=0 memBuffer=system.ruby.dir_cntrl0.memBuffer number_of_TBEs=256 peer=Null @@ -258,6 +279,7 @@ version=0 [system.ruby.dir_cntrl0.directory] type=RubyDirectoryMemory +eventq_index=0 map_levels=4 numa_high_bit=5 size=268435456 @@ -274,6 +296,7 @@ basic_bus_busy_time=2 clk_domain=system.ruby.memctrl_clk_domain dimm_bit_0=12 dimms_per_channel=2 +eventq_index=0 mem_ctl_latency=12 mem_fixed_delay=0 mem_random_arbitrate=0 @@ -293,7 +316,8 @@ buffer_size=0 cacheMemory=system.ruby.l1_cntrl0.cacheMemory cache_response_latency=12 clk_domain=system.ruby.clk_domain -cntrl_id=0 +cluster_id=0 +eventq_index=0 issue_latency=2 number_of_TBEs=256 peer=Null @@ -309,6 +333,7 @@ type=RubyCache assoc=2 dataAccessLatency=1 dataArrayBanks=1 +eventq_index=0 is_icache=false latency=3 replacement_policy=PSEUDO_LRU @@ -324,6 +349,7 @@ access_phys_mem=false clk_domain=system.ruby.clk_domain dcache=system.ruby.l1_cntrl0.cacheMemory deadlock_threshold=1000000 +eventq_index=0 icache=system.ruby.l1_cntrl0.cacheMemory max_outstanding_requests=16 ruby_system=system.ruby @@ -342,7 +368,8 @@ buffer_size=0 cacheMemory=system.ruby.l1_cntrl1.cacheMemory cache_response_latency=12 clk_domain=system.ruby.clk_domain -cntrl_id=1 +cluster_id=0 +eventq_index=0 issue_latency=2 number_of_TBEs=256 peer=Null @@ -358,6 +385,7 @@ type=RubyCache assoc=2 dataAccessLatency=1 dataArrayBanks=1 +eventq_index=0 is_icache=false latency=3 replacement_policy=PSEUDO_LRU @@ -373,6 +401,7 @@ access_phys_mem=false clk_domain=system.ruby.clk_domain dcache=system.ruby.l1_cntrl1.cacheMemory deadlock_threshold=1000000 +eventq_index=0 icache=system.ruby.l1_cntrl1.cacheMemory max_outstanding_requests=16 ruby_system=system.ruby @@ -391,7 +420,8 @@ buffer_size=0 cacheMemory=system.ruby.l1_cntrl2.cacheMemory cache_response_latency=12 clk_domain=system.ruby.clk_domain -cntrl_id=2 +cluster_id=0 +eventq_index=0 issue_latency=2 number_of_TBEs=256 peer=Null @@ -407,6 +437,7 @@ type=RubyCache assoc=2 dataAccessLatency=1 dataArrayBanks=1 +eventq_index=0 is_icache=false latency=3 replacement_policy=PSEUDO_LRU @@ -422,6 +453,7 @@ access_phys_mem=false clk_domain=system.ruby.clk_domain dcache=system.ruby.l1_cntrl2.cacheMemory deadlock_threshold=1000000 +eventq_index=0 icache=system.ruby.l1_cntrl2.cacheMemory max_outstanding_requests=16 ruby_system=system.ruby @@ -440,7 +472,8 @@ buffer_size=0 cacheMemory=system.ruby.l1_cntrl3.cacheMemory cache_response_latency=12 clk_domain=system.ruby.clk_domain -cntrl_id=3 +cluster_id=0 +eventq_index=0 issue_latency=2 number_of_TBEs=256 peer=Null @@ -456,6 +489,7 @@ type=RubyCache assoc=2 dataAccessLatency=1 dataArrayBanks=1 +eventq_index=0 is_icache=false latency=3 replacement_policy=PSEUDO_LRU @@ -471,6 +505,7 @@ access_phys_mem=false clk_domain=system.ruby.clk_domain dcache=system.ruby.l1_cntrl3.cacheMemory deadlock_threshold=1000000 +eventq_index=0 icache=system.ruby.l1_cntrl3.cacheMemory max_outstanding_requests=16 ruby_system=system.ruby @@ -489,7 +524,8 @@ buffer_size=0 cacheMemory=system.ruby.l1_cntrl4.cacheMemory cache_response_latency=12 clk_domain=system.ruby.clk_domain -cntrl_id=4 +cluster_id=0 +eventq_index=0 issue_latency=2 number_of_TBEs=256 peer=Null @@ -505,6 +541,7 @@ type=RubyCache assoc=2 dataAccessLatency=1 dataArrayBanks=1 +eventq_index=0 is_icache=false latency=3 replacement_policy=PSEUDO_LRU @@ -520,6 +557,7 @@ access_phys_mem=false clk_domain=system.ruby.clk_domain dcache=system.ruby.l1_cntrl4.cacheMemory deadlock_threshold=1000000 +eventq_index=0 icache=system.ruby.l1_cntrl4.cacheMemory max_outstanding_requests=16 ruby_system=system.ruby @@ -538,7 +576,8 @@ buffer_size=0 cacheMemory=system.ruby.l1_cntrl5.cacheMemory cache_response_latency=12 clk_domain=system.ruby.clk_domain -cntrl_id=5 +cluster_id=0 +eventq_index=0 issue_latency=2 number_of_TBEs=256 peer=Null @@ -554,6 +593,7 @@ type=RubyCache assoc=2 dataAccessLatency=1 dataArrayBanks=1 +eventq_index=0 is_icache=false latency=3 replacement_policy=PSEUDO_LRU @@ -569,6 +609,7 @@ access_phys_mem=false clk_domain=system.ruby.clk_domain dcache=system.ruby.l1_cntrl5.cacheMemory deadlock_threshold=1000000 +eventq_index=0 icache=system.ruby.l1_cntrl5.cacheMemory max_outstanding_requests=16 ruby_system=system.ruby @@ -587,7 +628,8 @@ buffer_size=0 cacheMemory=system.ruby.l1_cntrl6.cacheMemory cache_response_latency=12 clk_domain=system.ruby.clk_domain -cntrl_id=6 +cluster_id=0 +eventq_index=0 issue_latency=2 number_of_TBEs=256 peer=Null @@ -603,6 +645,7 @@ type=RubyCache assoc=2 dataAccessLatency=1 dataArrayBanks=1 +eventq_index=0 is_icache=false latency=3 replacement_policy=PSEUDO_LRU @@ -618,6 +661,7 @@ access_phys_mem=false clk_domain=system.ruby.clk_domain dcache=system.ruby.l1_cntrl6.cacheMemory deadlock_threshold=1000000 +eventq_index=0 icache=system.ruby.l1_cntrl6.cacheMemory max_outstanding_requests=16 ruby_system=system.ruby @@ -636,7 +680,8 @@ buffer_size=0 cacheMemory=system.ruby.l1_cntrl7.cacheMemory cache_response_latency=12 clk_domain=system.ruby.clk_domain -cntrl_id=7 +cluster_id=0 +eventq_index=0 issue_latency=2 number_of_TBEs=256 peer=Null @@ -652,6 +697,7 @@ type=RubyCache assoc=2 dataAccessLatency=1 dataArrayBanks=1 +eventq_index=0 is_icache=false latency=3 replacement_policy=PSEUDO_LRU @@ -667,6 +713,7 @@ access_phys_mem=false clk_domain=system.ruby.clk_domain dcache=system.ruby.l1_cntrl7.cacheMemory deadlock_threshold=1000000 +eventq_index=0 icache=system.ruby.l1_cntrl7.cacheMemory max_outstanding_requests=16 ruby_system=system.ruby @@ -682,6 +729,7 @@ slave=system.cpu7.test type=DerivedClockDomain clk_divider=3 clk_domain=system.ruby.clk_domain +eventq_index=0 [system.ruby.network] type=SimpleNetwork @@ -691,6 +739,7 @@ buffer_size=0 clk_domain=system.ruby.clk_domain control_msg_size=8 endpoint_bandwidth=1000 +eventq_index=0 ext_links=system.ruby.network.ext_links0 system.ruby.network.ext_links1 system.ruby.network.ext_links2 system.ruby.network.ext_links3 system.ruby.network.ext_links4 system.ruby.network.ext_links5 system.ruby.network.ext_links6 system.ruby.network.ext_links7 system.ruby.network.ext_links8 int_links=system.ruby.network.int_links0 system.ruby.network.int_links1 system.ruby.network.int_links2 system.ruby.network.int_links3 system.ruby.network.int_links4 system.ruby.network.int_links5 system.ruby.network.int_links6 system.ruby.network.int_links7 system.ruby.network.int_links8 number_of_virtual_networks=10 @@ -701,6 +750,7 @@ topology=Crossbar [system.ruby.network.ext_links0] type=SimpleExtLink bandwidth_factor=16 +eventq_index=0 ext_node=system.ruby.l1_cntrl0 int_node=system.ruby.network.routers0 latency=1 @@ -710,6 +760,7 @@ weight=1 [system.ruby.network.ext_links1] type=SimpleExtLink bandwidth_factor=16 +eventq_index=0 ext_node=system.ruby.l1_cntrl1 int_node=system.ruby.network.routers1 latency=1 @@ -719,6 +770,7 @@ weight=1 [system.ruby.network.ext_links2] type=SimpleExtLink bandwidth_factor=16 +eventq_index=0 ext_node=system.ruby.l1_cntrl2 int_node=system.ruby.network.routers2 latency=1 @@ -728,6 +780,7 @@ weight=1 [system.ruby.network.ext_links3] type=SimpleExtLink bandwidth_factor=16 +eventq_index=0 ext_node=system.ruby.l1_cntrl3 int_node=system.ruby.network.routers3 latency=1 @@ -737,6 +790,7 @@ weight=1 [system.ruby.network.ext_links4] type=SimpleExtLink bandwidth_factor=16 +eventq_index=0 ext_node=system.ruby.l1_cntrl4 int_node=system.ruby.network.routers4 latency=1 @@ -746,6 +800,7 @@ weight=1 [system.ruby.network.ext_links5] type=SimpleExtLink bandwidth_factor=16 +eventq_index=0 ext_node=system.ruby.l1_cntrl5 int_node=system.ruby.network.routers5 latency=1 @@ -755,6 +810,7 @@ weight=1 [system.ruby.network.ext_links6] type=SimpleExtLink bandwidth_factor=16 +eventq_index=0 ext_node=system.ruby.l1_cntrl6 int_node=system.ruby.network.routers6 latency=1 @@ -764,6 +820,7 @@ weight=1 [system.ruby.network.ext_links7] type=SimpleExtLink bandwidth_factor=16 +eventq_index=0 ext_node=system.ruby.l1_cntrl7 int_node=system.ruby.network.routers7 latency=1 @@ -773,6 +830,7 @@ weight=1 [system.ruby.network.ext_links8] type=SimpleExtLink bandwidth_factor=16 +eventq_index=0 ext_node=system.ruby.dir_cntrl0 int_node=system.ruby.network.routers8 latency=1 @@ -782,6 +840,7 @@ weight=1 [system.ruby.network.int_links0] type=SimpleIntLink bandwidth_factor=16 +eventq_index=0 latency=1 link_id=9 node_a=system.ruby.network.routers0 @@ -791,6 +850,7 @@ weight=1 [system.ruby.network.int_links1] type=SimpleIntLink bandwidth_factor=16 +eventq_index=0 latency=1 link_id=10 node_a=system.ruby.network.routers1 @@ -800,6 +860,7 @@ weight=1 [system.ruby.network.int_links2] type=SimpleIntLink bandwidth_factor=16 +eventq_index=0 latency=1 link_id=11 node_a=system.ruby.network.routers2 @@ -809,6 +870,7 @@ weight=1 [system.ruby.network.int_links3] type=SimpleIntLink bandwidth_factor=16 +eventq_index=0 latency=1 link_id=12 node_a=system.ruby.network.routers3 @@ -818,6 +880,7 @@ weight=1 [system.ruby.network.int_links4] type=SimpleIntLink bandwidth_factor=16 +eventq_index=0 latency=1 link_id=13 node_a=system.ruby.network.routers4 @@ -827,6 +890,7 @@ weight=1 [system.ruby.network.int_links5] type=SimpleIntLink bandwidth_factor=16 +eventq_index=0 latency=1 link_id=14 node_a=system.ruby.network.routers5 @@ -836,6 +900,7 @@ weight=1 [system.ruby.network.int_links6] type=SimpleIntLink bandwidth_factor=16 +eventq_index=0 latency=1 link_id=15 node_a=system.ruby.network.routers6 @@ -845,6 +910,7 @@ weight=1 [system.ruby.network.int_links7] type=SimpleIntLink bandwidth_factor=16 +eventq_index=0 latency=1 link_id=16 node_a=system.ruby.network.routers7 @@ -854,6 +920,7 @@ weight=1 [system.ruby.network.int_links8] type=SimpleIntLink bandwidth_factor=16 +eventq_index=0 latency=1 link_id=17 node_a=system.ruby.network.routers8 @@ -863,74 +930,78 @@ weight=1 [system.ruby.network.routers0] type=Switch clk_domain=system.ruby.clk_domain +eventq_index=0 router_id=0 virt_nets=10 [system.ruby.network.routers1] type=Switch clk_domain=system.ruby.clk_domain +eventq_index=0 router_id=1 virt_nets=10 [system.ruby.network.routers2] type=Switch clk_domain=system.ruby.clk_domain +eventq_index=0 router_id=2 virt_nets=10 [system.ruby.network.routers3] type=Switch clk_domain=system.ruby.clk_domain +eventq_index=0 router_id=3 virt_nets=10 [system.ruby.network.routers4] type=Switch clk_domain=system.ruby.clk_domain +eventq_index=0 router_id=4 virt_nets=10 [system.ruby.network.routers5] type=Switch clk_domain=system.ruby.clk_domain +eventq_index=0 router_id=5 virt_nets=10 [system.ruby.network.routers6] type=Switch clk_domain=system.ruby.clk_domain +eventq_index=0 router_id=6 virt_nets=10 [system.ruby.network.routers7] type=Switch clk_domain=system.ruby.clk_domain +eventq_index=0 router_id=7 virt_nets=10 [system.ruby.network.routers8] type=Switch clk_domain=system.ruby.clk_domain +eventq_index=0 router_id=8 virt_nets=10 [system.ruby.network.routers9] type=Switch clk_domain=system.ruby.clk_domain +eventq_index=0 router_id=9 virt_nets=10 -[system.ruby.profiler] -type=RubyProfiler -all_instructions=false -hot_lines=false -num_of_sequencers=8 -ruby_system=system.ruby - [system.sys_port_proxy] type=RubyPortProxy access_phys_mem=true clk_domain=system.clk_domain +eventq_index=0 ruby_system=system.ruby support_data_reqs=true support_inst_reqs=true @@ -942,5 +1013,6 @@ slave=system.system_port [system.voltage_domain] type=VoltageDomain +eventq_index=0 voltage=1.000000 diff --git a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby/simerr b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby/simerr index 082530ace..5a7e36bf9 100755 --- a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby/simerr +++ b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby/simerr @@ -79,4 +79,3 @@ system.cpu3: completed 90000 read, 49017 write accesses @7850422 system.cpu5: completed 90000 read, 49075 write accesses @7851926 system.cpu4: completed 90000 read, 49432 write accesses @7874435 system.cpu7: completed 100000 read, 53796 write accesses @8664886 -hack: be nice to actually delete the event here diff --git a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby/simout b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby/simout index 1c746b09a..1137a773d 100755 --- a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby/simout +++ b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby/simout @@ -1,11 +1,9 @@ -Redirecting stdout to build/ALPHA/tests/opt/quick/se/50.memtest/alpha/linux/memtest-ruby/simout -Redirecting stderr to build/ALPHA/tests/opt/quick/se/50.memtest/alpha/linux/memtest-ruby/simerr gem5 Simulator System. http://gem5.org gem5 is copyrighted software; use the --copyright option for details. -gem5 compiled Sep 24 2013 03:08:53 -gem5 started Sep 28 2013 03:05:49 -gem5 executing on zizzer +gem5 compiled Jan 22 2014 16:27:55 +gem5 started Jan 22 2014 17:24:32 +gem5 executing on u200540-lin command line: build/ALPHA/gem5.opt -d build/ALPHA/tests/opt/quick/se/50.memtest/alpha/linux/memtest-ruby -re tests/run.py build/ALPHA/tests/opt/quick/se/50.memtest/alpha/linux/memtest-ruby Global frequency set at 1000000000 ticks per second info: Entering event queue @ 0. Starting simulation... diff --git a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby/stats.txt b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby/stats.txt index d75cefcef..ab5af9666 100644 --- a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby/stats.txt +++ b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby/stats.txt @@ -4,9 +4,12 @@ sim_seconds 0.008665 # Nu sim_ticks 8664886 # Number of ticks simulated final_tick 8664886 # Number of ticks from beginning of simulation (restored from checkpoints and never reset) sim_freq 1000000000 # Frequency of simulated ticks -host_tick_rate 151755 # Simulator tick rate (ticks/s) -host_mem_usage 301056 # Number of bytes of host memory used -host_seconds 57.10 # Real time elapsed on the host +host_tick_rate 261960 # Simulator tick rate (ticks/s) +host_mem_usage 257512 # Number of bytes of host memory used +host_seconds 33.08 # Real time elapsed on the host +system.voltage_domain.voltage 1 # Voltage in Volts +system.clk_domain.clock 1 # Clock period in ticks +system.ruby.clk_domain.clock 1 # Clock period in ticks system.ruby.delayHist::bucket_size 4 # delay histogram for all message system.ruby.delayHist::max_bucket 39 # delay histogram for all message system.ruby.delayHist::samples 1237687 # delay histogram for all message @@ -136,6 +139,7 @@ system.ruby.network.routers7.msg_bytes.Control::2 618216 system.ruby.network.routers7.msg_bytes.Data::2 5512896 system.ruby.network.routers7.msg_bytes.Response_Data::4 5637312 system.ruby.network.routers7.msg_bytes.Writeback_Control::3 620680 +system.ruby.memctrl_clk_domain.clock 3 # Clock period in ticks system.ruby.dir_cntrl0.memBuffer.memReq 1218678 # Total number of memory requests system.ruby.dir_cntrl0.memBuffer.memRead 609346 # Number of memory reads system.ruby.dir_cntrl0.memBuffer.memWrite 609308 # Number of memory writes @@ -181,6 +185,7 @@ system.ruby.network.msg_byte.Response_Data 133391376 system.ruby.network.msg_byte.Writeback_Control 14883240 system.funcbus.throughput 0 # Throughput (bytes/s) system.funcbus.data_through_bus 0 # Total data (bytes) +system.cpu_clk_domain.clock 1 # Clock period in ticks system.cpu0.num_reads 99885 # number of read accesses completed system.cpu0.num_writes 54375 # number of write accesses completed system.cpu0.num_copies 0 # number of copy accesses completed diff --git a/tests/quick/se/50.memtest/ref/null/none/memtest/config.ini b/tests/quick/se/50.memtest/ref/null/none/memtest/config.ini index 0b50bed4c..dd37e6b1e 100644 --- a/tests/quick/se/50.memtest/ref/null/none/memtest/config.ini +++ b/tests/quick/se/50.memtest/ref/null/none/memtest/config.ini @@ -1,7 +1,9 @@ [root] type=Root children=system +eventq_index=0 full_system=false +sim_quantum=0 time_sync_enable=false time_sync_period=100000000000 time_sync_spin_threshold=100000000 @@ -12,12 +14,13 @@ children=clk_domain cpu0 cpu1 cpu2 cpu3 cpu4 cpu5 cpu6 cpu7 cpu_clk_domain funcb boot_osflags=a cache_line_size=64 clk_domain=system.clk_domain +eventq_index=0 init_param=0 kernel= load_addr_mask=1099511627775 mem_mode=timing mem_ranges= -memories=system.physmem system.funcmem +memories=system.funcmem system.physmem num_work_ids=16 readfile= symbolfile= @@ -33,6 +36,7 @@ system_port=system.membus.slave[1] [system.clk_domain] type=SrcClockDomain clock=1000 +eventq_index=0 voltage_domain=system.voltage_domain [system.cpu0] @@ -40,6 +44,7 @@ type=MemTest children=l1c atomic=false clk_domain=system.cpu_clk_domain +eventq_index=0 issue_dmas=false max_loads=100000 memory_size=65536 @@ -61,6 +66,7 @@ children=tags addr_ranges=0:18446744073709551615 assoc=4 clk_domain=system.cpu_clk_domain +eventq_index=0 forward_snoops=true hit_latency=2 is_top_level=true @@ -69,6 +75,7 @@ mshrs=4 prefetch_on_access=false prefetcher=Null response_latency=2 +sequential_access=false size=32768 system=system tags=system.cpu0.l1c.tags @@ -83,7 +90,9 @@ type=LRU assoc=4 block_size=64 clk_domain=system.cpu_clk_domain +eventq_index=0 hit_latency=2 +sequential_access=false size=32768 [system.cpu1] @@ -91,6 +100,7 @@ type=MemTest children=l1c atomic=false clk_domain=system.cpu_clk_domain +eventq_index=0 issue_dmas=false max_loads=100000 memory_size=65536 @@ -112,6 +122,7 @@ children=tags addr_ranges=0:18446744073709551615 assoc=4 clk_domain=system.cpu_clk_domain +eventq_index=0 forward_snoops=true hit_latency=2 is_top_level=true @@ -120,6 +131,7 @@ mshrs=4 prefetch_on_access=false prefetcher=Null response_latency=2 +sequential_access=false size=32768 system=system tags=system.cpu1.l1c.tags @@ -134,7 +146,9 @@ type=LRU assoc=4 block_size=64 clk_domain=system.cpu_clk_domain +eventq_index=0 hit_latency=2 +sequential_access=false size=32768 [system.cpu2] @@ -142,6 +156,7 @@ type=MemTest children=l1c atomic=false clk_domain=system.cpu_clk_domain +eventq_index=0 issue_dmas=false max_loads=100000 memory_size=65536 @@ -163,6 +178,7 @@ children=tags addr_ranges=0:18446744073709551615 assoc=4 clk_domain=system.cpu_clk_domain +eventq_index=0 forward_snoops=true hit_latency=2 is_top_level=true @@ -171,6 +187,7 @@ mshrs=4 prefetch_on_access=false prefetcher=Null response_latency=2 +sequential_access=false size=32768 system=system tags=system.cpu2.l1c.tags @@ -185,7 +202,9 @@ type=LRU assoc=4 block_size=64 clk_domain=system.cpu_clk_domain +eventq_index=0 hit_latency=2 +sequential_access=false size=32768 [system.cpu3] @@ -193,6 +212,7 @@ type=MemTest children=l1c atomic=false clk_domain=system.cpu_clk_domain +eventq_index=0 issue_dmas=false max_loads=100000 memory_size=65536 @@ -214,6 +234,7 @@ children=tags addr_ranges=0:18446744073709551615 assoc=4 clk_domain=system.cpu_clk_domain +eventq_index=0 forward_snoops=true hit_latency=2 is_top_level=true @@ -222,6 +243,7 @@ mshrs=4 prefetch_on_access=false prefetcher=Null response_latency=2 +sequential_access=false size=32768 system=system tags=system.cpu3.l1c.tags @@ -236,7 +258,9 @@ type=LRU assoc=4 block_size=64 clk_domain=system.cpu_clk_domain +eventq_index=0 hit_latency=2 +sequential_access=false size=32768 [system.cpu4] @@ -244,6 +268,7 @@ type=MemTest children=l1c atomic=false clk_domain=system.cpu_clk_domain +eventq_index=0 issue_dmas=false max_loads=100000 memory_size=65536 @@ -265,6 +290,7 @@ children=tags addr_ranges=0:18446744073709551615 assoc=4 clk_domain=system.cpu_clk_domain +eventq_index=0 forward_snoops=true hit_latency=2 is_top_level=true @@ -273,6 +299,7 @@ mshrs=4 prefetch_on_access=false prefetcher=Null response_latency=2 +sequential_access=false size=32768 system=system tags=system.cpu4.l1c.tags @@ -287,7 +314,9 @@ type=LRU assoc=4 block_size=64 clk_domain=system.cpu_clk_domain +eventq_index=0 hit_latency=2 +sequential_access=false size=32768 [system.cpu5] @@ -295,6 +324,7 @@ type=MemTest children=l1c atomic=false clk_domain=system.cpu_clk_domain +eventq_index=0 issue_dmas=false max_loads=100000 memory_size=65536 @@ -316,6 +346,7 @@ children=tags addr_ranges=0:18446744073709551615 assoc=4 clk_domain=system.cpu_clk_domain +eventq_index=0 forward_snoops=true hit_latency=2 is_top_level=true @@ -324,6 +355,7 @@ mshrs=4 prefetch_on_access=false prefetcher=Null response_latency=2 +sequential_access=false size=32768 system=system tags=system.cpu5.l1c.tags @@ -338,7 +370,9 @@ type=LRU assoc=4 block_size=64 clk_domain=system.cpu_clk_domain +eventq_index=0 hit_latency=2 +sequential_access=false size=32768 [system.cpu6] @@ -346,6 +380,7 @@ type=MemTest children=l1c atomic=false clk_domain=system.cpu_clk_domain +eventq_index=0 issue_dmas=false max_loads=100000 memory_size=65536 @@ -367,6 +402,7 @@ children=tags addr_ranges=0:18446744073709551615 assoc=4 clk_domain=system.cpu_clk_domain +eventq_index=0 forward_snoops=true hit_latency=2 is_top_level=true @@ -375,6 +411,7 @@ mshrs=4 prefetch_on_access=false prefetcher=Null response_latency=2 +sequential_access=false size=32768 system=system tags=system.cpu6.l1c.tags @@ -389,7 +426,9 @@ type=LRU assoc=4 block_size=64 clk_domain=system.cpu_clk_domain +eventq_index=0 hit_latency=2 +sequential_access=false size=32768 [system.cpu7] @@ -397,6 +436,7 @@ type=MemTest children=l1c atomic=false clk_domain=system.cpu_clk_domain +eventq_index=0 issue_dmas=false max_loads=100000 memory_size=65536 @@ -418,6 +458,7 @@ children=tags addr_ranges=0:18446744073709551615 assoc=4 clk_domain=system.cpu_clk_domain +eventq_index=0 forward_snoops=true hit_latency=2 is_top_level=true @@ -426,6 +467,7 @@ mshrs=4 prefetch_on_access=false prefetcher=Null response_latency=2 +sequential_access=false size=32768 system=system tags=system.cpu7.l1c.tags @@ -440,17 +482,21 @@ type=LRU assoc=4 block_size=64 clk_domain=system.cpu_clk_domain +eventq_index=0 hit_latency=2 +sequential_access=false size=32768 [system.cpu_clk_domain] type=SrcClockDomain clock=500 +eventq_index=0 voltage_domain=system.voltage_domain [system.funcbus] type=NoncoherentBus clk_domain=system.clk_domain +eventq_index=0 header_cycles=1 use_default_range=false width=8 @@ -462,6 +508,7 @@ type=SimpleMemory bandwidth=73.000000 clk_domain=system.clk_domain conf_table_reported=true +eventq_index=0 in_addr_map=false latency=30000 latency_var=0 @@ -475,6 +522,7 @@ children=tags addr_ranges=0:18446744073709551615 assoc=8 clk_domain=system.cpu_clk_domain +eventq_index=0 forward_snoops=true hit_latency=20 is_top_level=false @@ -483,6 +531,7 @@ mshrs=20 prefetch_on_access=false prefetcher=Null response_latency=20 +sequential_access=false size=65536 system=system tags=system.l2c.tags @@ -497,12 +546,15 @@ type=LRU assoc=8 block_size=64 clk_domain=system.cpu_clk_domain +eventq_index=0 hit_latency=20 +sequential_access=false size=65536 [system.membus] type=CoherentBus clk_domain=system.clk_domain +eventq_index=0 header_cycles=1 system=system use_default_range=false @@ -515,6 +567,7 @@ type=SimpleMemory bandwidth=73.000000 clk_domain=system.clk_domain conf_table_reported=true +eventq_index=0 in_addr_map=true latency=30000 latency_var=0 @@ -525,6 +578,7 @@ port=system.membus.master[0] [system.toL2Bus] type=CoherentBus clk_domain=system.cpu_clk_domain +eventq_index=0 header_cycles=1 system=system use_default_range=false @@ -534,5 +588,6 @@ slave=system.cpu0.l1c.mem_side system.cpu1.l1c.mem_side system.cpu2.l1c.mem_side [system.voltage_domain] type=VoltageDomain +eventq_index=0 voltage=1.000000 diff --git a/tests/quick/se/50.memtest/ref/null/none/memtest/simerr b/tests/quick/se/50.memtest/ref/null/none/memtest/simerr index ad8539d90..084f6f6ab 100755 --- a/tests/quick/se/50.memtest/ref/null/none/memtest/simerr +++ b/tests/quick/se/50.memtest/ref/null/none/memtest/simerr @@ -71,4 +71,3 @@ system.cpu2: completed 90000 read, 48395 write accesses @591584000 system.cpu7: completed 90000 read, 48496 write accesses @592485000 system.cpu0: completed 90000 read, 48680 write accesses @594831500 system.cpu3: completed 100000 read, 53536 write accesses @652606500 -hack: be nice to actually delete the event here diff --git a/tests/quick/se/50.memtest/ref/null/none/memtest/simout b/tests/quick/se/50.memtest/ref/null/none/memtest/simout index de32ac2d8..831211e6c 100755 --- a/tests/quick/se/50.memtest/ref/null/none/memtest/simout +++ b/tests/quick/se/50.memtest/ref/null/none/memtest/simout @@ -1,11 +1,9 @@ -Redirecting stdout to build/NULL/tests/opt/quick/se/50.memtest/null/none/memtest/simout -Redirecting stderr to build/NULL/tests/opt/quick/se/50.memtest/null/none/memtest/simerr gem5 Simulator System. http://gem5.org gem5 is copyrighted software; use the --copyright option for details. -gem5 compiled Sep 22 2013 05:53:51 -gem5 started Sep 22 2013 05:53:54 -gem5 executing on zizzer +gem5 compiled Jan 22 2014 16:54:17 +gem5 started Jan 22 2014 17:28:45 +gem5 executing on u200540-lin command line: build/NULL/gem5.opt -d build/NULL/tests/opt/quick/se/50.memtest/null/none/memtest -re tests/run.py build/NULL/tests/opt/quick/se/50.memtest/null/none/memtest Global frequency set at 1000000000000 ticks per second info: Entering event queue @ 0. Starting simulation... diff --git a/tests/quick/se/50.memtest/ref/null/none/memtest/stats.txt b/tests/quick/se/50.memtest/ref/null/none/memtest/stats.txt index 6f84c5ba1..d30a7aa16 100644 --- a/tests/quick/se/50.memtest/ref/null/none/memtest/stats.txt +++ b/tests/quick/se/50.memtest/ref/null/none/memtest/stats.txt @@ -4,9 +4,11 @@ sim_seconds 0.000653 # Nu sim_ticks 652606500 # Number of ticks simulated final_tick 652606500 # Number of ticks from beginning of simulation (restored from checkpoints and never reset) sim_freq 1000000000000 # Frequency of simulated ticks -host_tick_rate 158104978 # Simulator tick rate (ticks/s) -host_mem_usage 355504 # Number of bytes of host memory used -host_seconds 4.13 # Real time elapsed on the host +host_tick_rate 148113487 # Simulator tick rate (ticks/s) +host_mem_usage 336812 # Number of bytes of host memory used +host_seconds 4.41 # Real time elapsed on the host +system.voltage_domain.voltage 1 # Voltage in Volts +system.clk_domain.clock 1000 # Clock period in ticks system.physmem.bytes_read::cpu0 80014 # Number of bytes read from this memory system.physmem.bytes_read::cpu1 82049 # Number of bytes read from this memory system.physmem.bytes_read::cpu2 81047 # Number of bytes read from this memory @@ -94,6 +96,7 @@ system.membus.reqLayer0.occupancy 286485584 # La system.membus.reqLayer0.utilization 43.9 # Layer utilization (%) system.membus.respLayer0.occupancy 311361500 # Layer occupancy (ticks) system.membus.respLayer0.utilization 47.7 # Layer utilization (%) +system.cpu_clk_domain.clock 500 # Clock period in ticks system.l2c.tags.replacements 13254 # number of replacements system.l2c.tags.tagsinuse 783.820018 # Cycle average of tags in use system.l2c.tags.total_refs 149317 # Total number of references to valid blocks. @@ -119,6 +122,12 @@ system.l2c.tags.occ_percent::cpu5 0.006825 # Av system.l2c.tags.occ_percent::cpu6 0.006582 # Average percentage of cache occupancy system.l2c.tags.occ_percent::cpu7 0.006846 # Average percentage of cache occupancy system.l2c.tags.occ_percent::total 0.765449 # Average percentage of cache occupancy +system.l2c.tags.occ_task_id_blocks::1024 811 # Occupied blocks per task id +system.l2c.tags.age_task_id_blocks_1024::0 611 # Occupied blocks per task id +system.l2c.tags.age_task_id_blocks_1024::1 200 # Occupied blocks per task id +system.l2c.tags.occ_task_id_percent::1024 0.791992 # Percentage of cache occupancy per task id +system.l2c.tags.tag_accesses 1942968 # Number of tag accesses +system.l2c.tags.data_accesses 1942968 # Number of data accesses system.l2c.ReadReq_hits::cpu0 10635 # number of ReadReq hits system.l2c.ReadReq_hits::cpu1 10552 # number of ReadReq hits system.l2c.ReadReq_hits::cpu2 10744 # number of ReadReq hits @@ -740,6 +749,12 @@ system.cpu0.l1c.tags.warmup_cycle 0 # Cy system.cpu0.l1c.tags.occ_blocks::cpu0 393.709596 # Average occupied blocks per requestor system.cpu0.l1c.tags.occ_percent::cpu0 0.768964 # Average percentage of cache occupancy system.cpu0.l1c.tags.occ_percent::total 0.768964 # Average percentage of cache occupancy +system.cpu0.l1c.tags.occ_task_id_blocks::1024 400 # Occupied blocks per task id +system.cpu0.l1c.tags.age_task_id_blocks_1024::0 380 # Occupied blocks per task id +system.cpu0.l1c.tags.age_task_id_blocks_1024::1 20 # Occupied blocks per task id +system.cpu0.l1c.tags.occ_task_id_percent::1024 0.781250 # Percentage of cache occupancy per task id +system.cpu0.l1c.tags.tag_accesses 330568 # Number of tag accesses +system.cpu0.l1c.tags.data_accesses 330568 # Number of data accesses system.cpu0.l1c.ReadReq_hits::cpu0 8685 # number of ReadReq hits system.cpu0.l1c.ReadReq_hits::total 8685 # number of ReadReq hits system.cpu0.l1c.WriteReq_hits::cpu0 1118 # number of WriteReq hits @@ -855,6 +870,12 @@ system.cpu1.l1c.tags.warmup_cycle 0 # Cy system.cpu1.l1c.tags.occ_blocks::cpu1 395.298418 # Average occupied blocks per requestor system.cpu1.l1c.tags.occ_percent::cpu1 0.772067 # Average percentage of cache occupancy system.cpu1.l1c.tags.occ_percent::total 0.772067 # Average percentage of cache occupancy +system.cpu1.l1c.tags.occ_task_id_blocks::1024 407 # Occupied blocks per task id +system.cpu1.l1c.tags.age_task_id_blocks_1024::0 374 # Occupied blocks per task id +system.cpu1.l1c.tags.age_task_id_blocks_1024::1 33 # Occupied blocks per task id +system.cpu1.l1c.tags.occ_task_id_percent::1024 0.794922 # Percentage of cache occupancy per task id +system.cpu1.l1c.tags.tag_accesses 332439 # Number of tag accesses +system.cpu1.l1c.tags.data_accesses 332439 # Number of data accesses system.cpu1.l1c.ReadReq_hits::cpu1 8757 # number of ReadReq hits system.cpu1.l1c.ReadReq_hits::total 8757 # number of ReadReq hits system.cpu1.l1c.WriteReq_hits::cpu1 1135 # number of WriteReq hits @@ -970,6 +991,12 @@ system.cpu2.l1c.tags.warmup_cycle 0 # Cy system.cpu2.l1c.tags.occ_blocks::cpu2 394.859577 # Average occupied blocks per requestor system.cpu2.l1c.tags.occ_percent::cpu2 0.771210 # Average percentage of cache occupancy system.cpu2.l1c.tags.occ_percent::total 0.771210 # Average percentage of cache occupancy +system.cpu2.l1c.tags.occ_task_id_blocks::1024 400 # Occupied blocks per task id +system.cpu2.l1c.tags.age_task_id_blocks_1024::0 381 # Occupied blocks per task id +system.cpu2.l1c.tags.age_task_id_blocks_1024::1 19 # Occupied blocks per task id +system.cpu2.l1c.tags.occ_task_id_percent::1024 0.781250 # Percentage of cache occupancy per task id +system.cpu2.l1c.tags.tag_accesses 331261 # Number of tag accesses +system.cpu2.l1c.tags.data_accesses 331261 # Number of data accesses system.cpu2.l1c.ReadReq_hits::cpu2 8708 # number of ReadReq hits system.cpu2.l1c.ReadReq_hits::total 8708 # number of ReadReq hits system.cpu2.l1c.WriteReq_hits::cpu2 1070 # number of WriteReq hits @@ -1085,6 +1112,12 @@ system.cpu3.l1c.tags.warmup_cycle 0 # Cy system.cpu3.l1c.tags.occ_blocks::cpu3 397.838914 # Average occupied blocks per requestor system.cpu3.l1c.tags.occ_percent::cpu3 0.777029 # Average percentage of cache occupancy system.cpu3.l1c.tags.occ_percent::total 0.777029 # Average percentage of cache occupancy +system.cpu3.l1c.tags.occ_task_id_blocks::1024 398 # Occupied blocks per task id +system.cpu3.l1c.tags.age_task_id_blocks_1024::0 380 # Occupied blocks per task id +system.cpu3.l1c.tags.age_task_id_blocks_1024::1 18 # Occupied blocks per task id +system.cpu3.l1c.tags.occ_task_id_percent::1024 0.777344 # Percentage of cache occupancy per task id +system.cpu3.l1c.tags.tag_accesses 331508 # Number of tag accesses +system.cpu3.l1c.tags.data_accesses 331508 # Number of data accesses system.cpu3.l1c.ReadReq_hits::cpu3 8781 # number of ReadReq hits system.cpu3.l1c.ReadReq_hits::total 8781 # number of ReadReq hits system.cpu3.l1c.WriteReq_hits::cpu3 1109 # number of WriteReq hits @@ -1200,6 +1233,12 @@ system.cpu4.l1c.tags.warmup_cycle 0 # Cy system.cpu4.l1c.tags.occ_blocks::cpu4 393.544066 # Average occupied blocks per requestor system.cpu4.l1c.tags.occ_percent::cpu4 0.768641 # Average percentage of cache occupancy system.cpu4.l1c.tags.occ_percent::total 0.768641 # Average percentage of cache occupancy +system.cpu4.l1c.tags.occ_task_id_blocks::1024 404 # Occupied blocks per task id +system.cpu4.l1c.tags.age_task_id_blocks_1024::0 378 # Occupied blocks per task id +system.cpu4.l1c.tags.age_task_id_blocks_1024::1 26 # Occupied blocks per task id +system.cpu4.l1c.tags.occ_task_id_percent::1024 0.789062 # Percentage of cache occupancy per task id +system.cpu4.l1c.tags.tag_accesses 331555 # Number of tag accesses +system.cpu4.l1c.tags.data_accesses 331555 # Number of data accesses system.cpu4.l1c.ReadReq_hits::cpu4 8712 # number of ReadReq hits system.cpu4.l1c.ReadReq_hits::total 8712 # number of ReadReq hits system.cpu4.l1c.WriteReq_hits::cpu4 1102 # number of WriteReq hits @@ -1315,6 +1354,12 @@ system.cpu5.l1c.tags.warmup_cycle 0 # Cy system.cpu5.l1c.tags.occ_blocks::cpu5 395.592742 # Average occupied blocks per requestor system.cpu5.l1c.tags.occ_percent::cpu5 0.772642 # Average percentage of cache occupancy system.cpu5.l1c.tags.occ_percent::total 0.772642 # Average percentage of cache occupancy +system.cpu5.l1c.tags.occ_task_id_blocks::1024 399 # Occupied blocks per task id +system.cpu5.l1c.tags.age_task_id_blocks_1024::0 375 # Occupied blocks per task id +system.cpu5.l1c.tags.age_task_id_blocks_1024::1 24 # Occupied blocks per task id +system.cpu5.l1c.tags.occ_task_id_percent::1024 0.779297 # Percentage of cache occupancy per task id +system.cpu5.l1c.tags.tag_accesses 332072 # Number of tag accesses +system.cpu5.l1c.tags.data_accesses 332072 # Number of data accesses system.cpu5.l1c.ReadReq_hits::cpu5 8824 # number of ReadReq hits system.cpu5.l1c.ReadReq_hits::total 8824 # number of ReadReq hits system.cpu5.l1c.WriteReq_hits::cpu5 1160 # number of WriteReq hits @@ -1430,6 +1475,12 @@ system.cpu6.l1c.tags.warmup_cycle 0 # Cy system.cpu6.l1c.tags.occ_blocks::cpu6 395.582005 # Average occupied blocks per requestor system.cpu6.l1c.tags.occ_percent::cpu6 0.772621 # Average percentage of cache occupancy system.cpu6.l1c.tags.occ_percent::total 0.772621 # Average percentage of cache occupancy +system.cpu6.l1c.tags.occ_task_id_blocks::1024 408 # Occupied blocks per task id +system.cpu6.l1c.tags.age_task_id_blocks_1024::0 376 # Occupied blocks per task id +system.cpu6.l1c.tags.age_task_id_blocks_1024::1 32 # Occupied blocks per task id +system.cpu6.l1c.tags.occ_task_id_percent::1024 0.796875 # Percentage of cache occupancy per task id +system.cpu6.l1c.tags.tag_accesses 332017 # Number of tag accesses +system.cpu6.l1c.tags.data_accesses 332017 # Number of data accesses system.cpu6.l1c.ReadReq_hits::cpu6 8715 # number of ReadReq hits system.cpu6.l1c.ReadReq_hits::total 8715 # number of ReadReq hits system.cpu6.l1c.WriteReq_hits::cpu6 1094 # number of WriteReq hits @@ -1545,6 +1596,12 @@ system.cpu7.l1c.tags.warmup_cycle 0 # Cy system.cpu7.l1c.tags.occ_blocks::cpu7 394.587693 # Average occupied blocks per requestor system.cpu7.l1c.tags.occ_percent::cpu7 0.770679 # Average percentage of cache occupancy system.cpu7.l1c.tags.occ_percent::total 0.770679 # Average percentage of cache occupancy +system.cpu7.l1c.tags.occ_task_id_blocks::1024 401 # Occupied blocks per task id +system.cpu7.l1c.tags.age_task_id_blocks_1024::0 370 # Occupied blocks per task id +system.cpu7.l1c.tags.age_task_id_blocks_1024::1 31 # Occupied blocks per task id +system.cpu7.l1c.tags.occ_task_id_percent::1024 0.783203 # Percentage of cache occupancy per task id +system.cpu7.l1c.tags.tag_accesses 331300 # Number of tag accesses +system.cpu7.l1c.tags.data_accesses 331300 # Number of data accesses system.cpu7.l1c.ReadReq_hits::cpu7 8635 # number of ReadReq hits system.cpu7.l1c.ReadReq_hits::total 8635 # number of ReadReq hits system.cpu7.l1c.WriteReq_hits::cpu7 1078 # number of WriteReq hits |