diff options
Diffstat (limited to 'tests/quick/se/60.rubytest/ref')
15 files changed, 547 insertions, 506 deletions
diff --git a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_CMP_directory/config.ini b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_CMP_directory/config.ini index 748354cc7..cfaf3b4cc 100644 --- a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_CMP_directory/config.ini +++ b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_CMP_directory/config.ini @@ -8,13 +8,14 @@ time_sync_spin_threshold=100000 [system] type=System -children=dir_cntrl0 l1_cntrl0 l2_cntrl0 physmem ruby sys_port_proxy tester +children=physmem ruby sys_port_proxy tester boot_osflags=a clock=1 init_param=0 kernel= load_addr_mask=1099511627775 mem_mode=timing +mem_ranges= memories=system.physmem num_work_ids=16 readfile= @@ -28,14 +29,38 @@ work_end_exit_count=0 work_item_id=-1 system_port=system.sys_port_proxy.slave[0] -[system.dir_cntrl0] +[system.physmem] +type=SimpleMemory +bandwidth=0.000000 +clock=1 +conf_table_reported=false +in_addr_map=true +latency=30 +latency_var=0 +null=false +range=0:134217727 +zero=false + +[system.ruby] +type=RubySystem +children=dir_cntrl0 l1_cntrl0 l2_cntrl0 network profiler +block_size_bytes=64 +clock=1 +mem_size=134217728 +no_mem_vec=false +random_seed=1234 +randomization=true +stats_filename=ruby.stats + +[system.ruby.dir_cntrl0] type=Directory_Controller children=directory memBuffer buffer_size=0 +clock=1 cntrl_id=2 -directory=system.dir_cntrl0.directory +directory=system.ruby.dir_cntrl0.directory directory_latency=6 -memBuffer=system.dir_cntrl0.memBuffer +memBuffer=system.ruby.dir_cntrl0.memBuffer number_of_TBEs=256 recycle_latency=10 ruby_system=system.ruby @@ -43,7 +68,7 @@ to_mem_ctrl_latency=1 transitions_per_cycle=32 version=0 -[system.dir_cntrl0.directory] +[system.ruby.dir_cntrl0.directory] type=RubyDirectoryMemory map_levels=4 numa_high_bit=5 @@ -51,7 +76,7 @@ size=134217728 use_map=false version=0 -[system.dir_cntrl0.memBuffer] +[system.ruby.dir_cntrl0.memBuffer] type=RubyMemoryControl bank_bit_0=8 bank_busy_time=11 @@ -73,28 +98,29 @@ ruby_system=system.ruby tFaw=0 version=0 -[system.l1_cntrl0] +[system.ruby.l1_cntrl0] type=L1Cache_Controller children=L1DcacheMemory L1IcacheMemory prefetcher sequencer -L1DcacheMemory=system.l1_cntrl0.L1DcacheMemory -L1IcacheMemory=system.l1_cntrl0.L1IcacheMemory +L1DcacheMemory=system.ruby.l1_cntrl0.L1DcacheMemory +L1IcacheMemory=system.ruby.l1_cntrl0.L1IcacheMemory buffer_size=0 +clock=1 cntrl_id=0 enable_prefetch=false l1_request_latency=2 l1_response_latency=2 l2_select_num_bits=0 number_of_TBEs=256 -prefetcher=system.l1_cntrl0.prefetcher +prefetcher=system.ruby.l1_cntrl0.prefetcher recycle_latency=10 ruby_system=system.ruby send_evictions=false -sequencer=system.l1_cntrl0.sequencer +sequencer=system.ruby.l1_cntrl0.sequencer to_l2_latency=1 transitions_per_cycle=32 version=0 -[system.l1_cntrl0.L1DcacheMemory] +[system.ruby.l1_cntrl0.L1DcacheMemory] type=RubyCache assoc=2 dataAccessLatency=1 @@ -108,7 +134,7 @@ start_index_bit=6 tagAccessLatency=1 tagArrayBanks=1 -[system.l1_cntrl0.L1IcacheMemory] +[system.ruby.l1_cntrl0.L1IcacheMemory] type=RubyCache assoc=2 dataAccessLatency=1 @@ -122,7 +148,7 @@ start_index_bit=6 tagAccessLatency=1 tagArrayBanks=1 -[system.l1_cntrl0.prefetcher] +[system.ruby.l1_cntrl0.prefetcher] type=Prefetcher cross_page=false nonunit_filter=8 @@ -132,13 +158,13 @@ pf_per_stream=1 train_misses=4 unit_filter=8 -[system.l1_cntrl0.sequencer] +[system.ruby.l1_cntrl0.sequencer] type=RubySequencer access_phys_mem=false clock=1 -dcache=system.l1_cntrl0.L1DcacheMemory +dcache=system.ruby.l1_cntrl0.L1DcacheMemory deadlock_threshold=500000 -icache=system.l1_cntrl0.L1IcacheMemory +icache=system.ruby.l1_cntrl0.L1IcacheMemory max_outstanding_requests=16 ruby_system=system.ruby support_data_reqs=true @@ -149,11 +175,12 @@ using_ruby_tester=true version=0 slave=system.tester.cpuDataPort[0] system.tester.cpuInstPort[0] -[system.l2_cntrl0] +[system.ruby.l2_cntrl0] type=L2Cache_Controller children=L2cacheMemory -L2cacheMemory=system.l2_cntrl0.L2cacheMemory +L2cacheMemory=system.ruby.l2_cntrl0.L2cacheMemory buffer_size=0 +clock=1 cntrl_id=1 l2_request_latency=2 l2_response_latency=2 @@ -164,7 +191,7 @@ to_l1_latency=1 transitions_per_cycle=32 version=0 -[system.l2_cntrl0.L2cacheMemory] +[system.ruby.l2_cntrl0.L2cacheMemory] type=RubyCache assoc=2 dataAccessLatency=1 @@ -178,34 +205,12 @@ start_index_bit=6 tagAccessLatency=1 tagArrayBanks=1 -[system.physmem] -type=SimpleMemory -bandwidth=0.000000 -clock=1 -conf_table_reported=false -in_addr_map=true -latency=30 -latency_var=0 -null=false -range=0:134217727 -zero=false - -[system.ruby] -type=RubySystem -children=network profiler -block_size_bytes=64 -clock=1 -mem_size=134217728 -no_mem_vec=false -random_seed=1234 -randomization=true -stats_filename=ruby.stats - [system.ruby.network] type=SimpleNetwork children=topology adaptive_routing=false buffer_size=0 +clock=1 control_msg_size=8 endpoint_bandwidth=1000 number_of_virtual_networks=10 @@ -225,7 +230,7 @@ routers=system.ruby.network.topology.ext_links0.int_node system.ruby.network.top type=SimpleExtLink children=int_node bandwidth_factor=16 -ext_node=system.l1_cntrl0 +ext_node=system.ruby.l1_cntrl0 int_node=system.ruby.network.topology.ext_links0.int_node latency=1 link_id=0 @@ -233,6 +238,7 @@ weight=1 [system.ruby.network.topology.ext_links0.int_node] type=Switch +clock=1 router_id=0 virt_nets=10 @@ -240,7 +246,7 @@ virt_nets=10 type=SimpleExtLink children=int_node bandwidth_factor=16 -ext_node=system.l2_cntrl0 +ext_node=system.ruby.l2_cntrl0 int_node=system.ruby.network.topology.ext_links1.int_node latency=1 link_id=1 @@ -248,6 +254,7 @@ weight=1 [system.ruby.network.topology.ext_links1.int_node] type=Switch +clock=1 router_id=1 virt_nets=10 @@ -255,7 +262,7 @@ virt_nets=10 type=SimpleExtLink children=int_node bandwidth_factor=16 -ext_node=system.dir_cntrl0 +ext_node=system.ruby.dir_cntrl0 int_node=system.ruby.network.topology.ext_links2.int_node latency=1 link_id=2 @@ -263,6 +270,7 @@ weight=1 [system.ruby.network.topology.ext_links2.int_node] type=Switch +clock=1 router_id=2 virt_nets=10 @@ -278,6 +286,7 @@ weight=1 [system.ruby.network.topology.int_links0.node_b] type=Switch +clock=1 router_id=3 virt_nets=10 @@ -328,6 +337,6 @@ deadlock_threshold=50000 num_cpus=1 system=system wakeup_frequency=10 -cpuDataPort=system.l1_cntrl0.sequencer.slave[0] -cpuInstPort=system.l1_cntrl0.sequencer.slave[1] +cpuDataPort=system.ruby.l1_cntrl0.sequencer.slave[0] +cpuInstPort=system.ruby.l1_cntrl0.sequencer.slave[1] diff --git a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_CMP_directory/ruby.stats b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_CMP_directory/ruby.stats index 708a70aaa..aec2b1b3a 100644 --- a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_CMP_directory/ruby.stats +++ b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_CMP_directory/ruby.stats @@ -1,4 +1,4 @@ -Real time: Dec/11/2012 09:10:20 +Real time: Jan/14/2013 08:20:11 Profiler Stats -------------- @@ -16,9 +16,9 @@ Ruby_current_time: 318321 Ruby_start_time: 0 Ruby_cycles: 318321 -mbytes_resident: 49.5391 -mbytes_total: 264.797 -resident_ratio: 0.187128 +mbytes_resident: 50.0117 +mbytes_total: 270.859 +resident_ratio: 0.184684 ruby_cycles_executed: [ 318322 ] @@ -83,11 +83,11 @@ Resource Usage page_size: 4096 user_time: 0 system_time: 0 -page_reclaims: 9268 +page_reclaims: 10464 page_faults: 0 swaps: 0 block_inputs: 0 -block_outputs: 88 +block_outputs: 80 Network Stats ------------- @@ -161,28 +161,28 @@ links_utilized_percent_switch_3: 2.05746 outgoing_messages_switch_3_link_2_Response_Data: 786 56592 [ 0 786 0 0 0 0 0 0 0 0 ] base_latency: 1 outgoing_messages_switch_3_link_2_Response_Control: 84 672 [ 0 84 0 0 0 0 0 0 0 0 ] base_latency: 1 -Cache Stats: system.l1_cntrl0.L1IcacheMemory - system.l1_cntrl0.L1IcacheMemory_total_misses: 56 - system.l1_cntrl0.L1IcacheMemory_total_demand_misses: 56 - system.l1_cntrl0.L1IcacheMemory_total_prefetches: 0 - system.l1_cntrl0.L1IcacheMemory_total_sw_prefetches: 0 - system.l1_cntrl0.L1IcacheMemory_total_hw_prefetches: 0 +Cache Stats: system.ruby.l1_cntrl0.L1IcacheMemory + system.ruby.l1_cntrl0.L1IcacheMemory_total_misses: 56 + system.ruby.l1_cntrl0.L1IcacheMemory_total_demand_misses: 56 + system.ruby.l1_cntrl0.L1IcacheMemory_total_prefetches: 0 + system.ruby.l1_cntrl0.L1IcacheMemory_total_sw_prefetches: 0 + system.ruby.l1_cntrl0.L1IcacheMemory_total_hw_prefetches: 0 - system.l1_cntrl0.L1IcacheMemory_request_type_IFETCH: 100% + system.ruby.l1_cntrl0.L1IcacheMemory_request_type_IFETCH: 100% - system.l1_cntrl0.L1IcacheMemory_access_mode_type_Supervisor: 56 100% + system.ruby.l1_cntrl0.L1IcacheMemory_access_mode_type_Supervisor: 56 100% -Cache Stats: system.l1_cntrl0.L1DcacheMemory - system.l1_cntrl0.L1DcacheMemory_total_misses: 861 - system.l1_cntrl0.L1DcacheMemory_total_demand_misses: 861 - system.l1_cntrl0.L1DcacheMemory_total_prefetches: 0 - system.l1_cntrl0.L1DcacheMemory_total_sw_prefetches: 0 - system.l1_cntrl0.L1DcacheMemory_total_hw_prefetches: 0 +Cache Stats: system.ruby.l1_cntrl0.L1DcacheMemory + system.ruby.l1_cntrl0.L1DcacheMemory_total_misses: 861 + system.ruby.l1_cntrl0.L1DcacheMemory_total_demand_misses: 861 + system.ruby.l1_cntrl0.L1DcacheMemory_total_prefetches: 0 + system.ruby.l1_cntrl0.L1DcacheMemory_total_sw_prefetches: 0 + system.ruby.l1_cntrl0.L1DcacheMemory_total_hw_prefetches: 0 - system.l1_cntrl0.L1DcacheMemory_request_type_LD: 4.87805% - system.l1_cntrl0.L1DcacheMemory_request_type_ST: 95.122% + system.ruby.l1_cntrl0.L1DcacheMemory_request_type_LD: 4.87805% + system.ruby.l1_cntrl0.L1DcacheMemory_request_type_ST: 95.122% - system.l1_cntrl0.L1DcacheMemory_access_mode_type_Supervisor: 861 100% + system.ruby.l1_cntrl0.L1DcacheMemory_access_mode_type_Supervisor: 861 100% --- L1Cache --- - Event Counts - @@ -356,18 +356,18 @@ PF_IS_I Data_Exclusive [0 ] 0 PF_IS_I DataS_fromL1 [0 ] 0 PF_IS_I Data_all_Acks [0 ] 0 -Cache Stats: system.l2_cntrl0.L2cacheMemory - system.l2_cntrl0.L2cacheMemory_total_misses: 874 - system.l2_cntrl0.L2cacheMemory_total_demand_misses: 874 - system.l2_cntrl0.L2cacheMemory_total_prefetches: 0 - system.l2_cntrl0.L2cacheMemory_total_sw_prefetches: 0 - system.l2_cntrl0.L2cacheMemory_total_hw_prefetches: 0 +Cache Stats: system.ruby.l2_cntrl0.L2cacheMemory + system.ruby.l2_cntrl0.L2cacheMemory_total_misses: 874 + system.ruby.l2_cntrl0.L2cacheMemory_total_demand_misses: 874 + system.ruby.l2_cntrl0.L2cacheMemory_total_prefetches: 0 + system.ruby.l2_cntrl0.L2cacheMemory_total_sw_prefetches: 0 + system.ruby.l2_cntrl0.L2cacheMemory_total_hw_prefetches: 0 - system.l2_cntrl0.L2cacheMemory_request_type_GETS: 4.69108% - system.l2_cntrl0.L2cacheMemory_request_type_GET_INSTR: 5.26316% - system.l2_cntrl0.L2cacheMemory_request_type_GETX: 90.0458% + system.ruby.l2_cntrl0.L2cacheMemory_request_type_GETS: 4.69108% + system.ruby.l2_cntrl0.L2cacheMemory_request_type_GET_INSTR: 5.26316% + system.ruby.l2_cntrl0.L2cacheMemory_request_type_GETX: 90.0458% - system.l2_cntrl0.L2cacheMemory_access_mode_type_Supervisor: 874 100% + system.ruby.l2_cntrl0.L2cacheMemory_access_mode_type_Supervisor: 874 100% --- L2Cache --- - Event Counts - @@ -579,7 +579,7 @@ MT_SB L2_Replacement_clean [0 ] 0 MT_SB Unblock [0 ] 0 MT_SB MEM_Inv [0 ] 0 -Memory controller: system.dir_cntrl0.memBuffer: +Memory controller: system.ruby.dir_cntrl0.memBuffer: memory_total_requests: 1660 memory_reads: 874 memory_writes: 786 diff --git a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_CMP_directory/stats.txt b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_CMP_directory/stats.txt index 4ea61ad84..6206d371a 100644 --- a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_CMP_directory/stats.txt +++ b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_CMP_directory/stats.txt @@ -4,35 +4,35 @@ sim_seconds 0.000318 # Nu sim_ticks 318321 # Number of ticks simulated final_tick 318321 # Number of ticks from beginning of simulation (restored from checkpoints and never reset) sim_freq 1000000000 # Frequency of simulated ticks -host_tick_rate 1374742 # Simulator tick rate (ticks/s) -host_mem_usage 271156 # Number of bytes of host memory used -host_seconds 0.23 # Real time elapsed on the host -system.l1_cntrl0.L1DcacheMemory.num_data_array_reads 0 # number of data array reads -system.l1_cntrl0.L1DcacheMemory.num_data_array_writes 0 # number of data array writes -system.l1_cntrl0.L1DcacheMemory.num_tag_array_reads 0 # number of tag array reads -system.l1_cntrl0.L1DcacheMemory.num_tag_array_writes 0 # number of tag array writes -system.l1_cntrl0.L1DcacheMemory.num_tag_array_stalls 0 # number of stalls caused by tag array -system.l1_cntrl0.L1DcacheMemory.num_data_array_stalls 0 # number of stalls caused by data array -system.l1_cntrl0.L1IcacheMemory.num_data_array_reads 0 # number of data array reads -system.l1_cntrl0.L1IcacheMemory.num_data_array_writes 0 # number of data array writes -system.l1_cntrl0.L1IcacheMemory.num_tag_array_reads 0 # number of tag array reads -system.l1_cntrl0.L1IcacheMemory.num_tag_array_writes 0 # number of tag array writes -system.l1_cntrl0.L1IcacheMemory.num_tag_array_stalls 0 # number of stalls caused by tag array -system.l1_cntrl0.L1IcacheMemory.num_data_array_stalls 0 # number of stalls caused by data array -system.l1_cntrl0.prefetcher.miss_observed 0 # number of misses observed -system.l1_cntrl0.prefetcher.allocated_streams 0 # number of streams allocated for prefetching -system.l1_cntrl0.prefetcher.prefetches_requested 0 # number of prefetch requests made -system.l1_cntrl0.prefetcher.prefetches_accepted 0 # number of prefetch requests accepted -system.l1_cntrl0.prefetcher.dropped_prefetches 0 # number of prefetch requests dropped -system.l1_cntrl0.prefetcher.hits 0 # number of prefetched blocks accessed -system.l1_cntrl0.prefetcher.partial_hits 0 # number of misses observed for a block being prefetched -system.l1_cntrl0.prefetcher.pages_crossed 0 # number of prefetches across pages -system.l1_cntrl0.prefetcher.misses_on_prefetched_blocks 0 # number of misses for blocks that were prefetched, yet missed -system.l2_cntrl0.L2cacheMemory.num_data_array_reads 0 # number of data array reads -system.l2_cntrl0.L2cacheMemory.num_data_array_writes 0 # number of data array writes -system.l2_cntrl0.L2cacheMemory.num_tag_array_reads 0 # number of tag array reads -system.l2_cntrl0.L2cacheMemory.num_tag_array_writes 0 # number of tag array writes -system.l2_cntrl0.L2cacheMemory.num_tag_array_stalls 0 # number of stalls caused by tag array -system.l2_cntrl0.L2cacheMemory.num_data_array_stalls 0 # number of stalls caused by data array +host_tick_rate 1534160 # Simulator tick rate (ticks/s) +host_mem_usage 277364 # Number of bytes of host memory used +host_seconds 0.21 # Real time elapsed on the host +system.ruby.l2_cntrl0.L2cacheMemory.num_data_array_reads 0 # number of data array reads +system.ruby.l2_cntrl0.L2cacheMemory.num_data_array_writes 0 # number of data array writes +system.ruby.l2_cntrl0.L2cacheMemory.num_tag_array_reads 0 # number of tag array reads +system.ruby.l2_cntrl0.L2cacheMemory.num_tag_array_writes 0 # number of tag array writes +system.ruby.l2_cntrl0.L2cacheMemory.num_tag_array_stalls 0 # number of stalls caused by tag array +system.ruby.l2_cntrl0.L2cacheMemory.num_data_array_stalls 0 # number of stalls caused by data array +system.ruby.l1_cntrl0.L1DcacheMemory.num_data_array_reads 0 # number of data array reads +system.ruby.l1_cntrl0.L1DcacheMemory.num_data_array_writes 0 # number of data array writes +system.ruby.l1_cntrl0.L1DcacheMemory.num_tag_array_reads 0 # number of tag array reads +system.ruby.l1_cntrl0.L1DcacheMemory.num_tag_array_writes 0 # number of tag array writes +system.ruby.l1_cntrl0.L1DcacheMemory.num_tag_array_stalls 0 # number of stalls caused by tag array +system.ruby.l1_cntrl0.L1DcacheMemory.num_data_array_stalls 0 # number of stalls caused by data array +system.ruby.l1_cntrl0.L1IcacheMemory.num_data_array_reads 0 # number of data array reads +system.ruby.l1_cntrl0.L1IcacheMemory.num_data_array_writes 0 # number of data array writes +system.ruby.l1_cntrl0.L1IcacheMemory.num_tag_array_reads 0 # number of tag array reads +system.ruby.l1_cntrl0.L1IcacheMemory.num_tag_array_writes 0 # number of tag array writes +system.ruby.l1_cntrl0.L1IcacheMemory.num_tag_array_stalls 0 # number of stalls caused by tag array +system.ruby.l1_cntrl0.L1IcacheMemory.num_data_array_stalls 0 # number of stalls caused by data array +system.ruby.l1_cntrl0.prefetcher.miss_observed 0 # number of misses observed +system.ruby.l1_cntrl0.prefetcher.allocated_streams 0 # number of streams allocated for prefetching +system.ruby.l1_cntrl0.prefetcher.prefetches_requested 0 # number of prefetch requests made +system.ruby.l1_cntrl0.prefetcher.prefetches_accepted 0 # number of prefetch requests accepted +system.ruby.l1_cntrl0.prefetcher.dropped_prefetches 0 # number of prefetch requests dropped +system.ruby.l1_cntrl0.prefetcher.hits 0 # number of prefetched blocks accessed +system.ruby.l1_cntrl0.prefetcher.partial_hits 0 # number of misses observed for a block being prefetched +system.ruby.l1_cntrl0.prefetcher.pages_crossed 0 # number of prefetches across pages +system.ruby.l1_cntrl0.prefetcher.misses_on_prefetched_blocks 0 # number of misses for blocks that were prefetched, yet missed ---------- End Simulation Statistics ---------- diff --git a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_directory/config.ini b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_directory/config.ini index 8a3bceec2..c6d6fc44e 100644 --- a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_directory/config.ini +++ b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_directory/config.ini @@ -8,13 +8,14 @@ time_sync_spin_threshold=100000 [system] type=System -children=dir_cntrl0 l1_cntrl0 l2_cntrl0 physmem ruby sys_port_proxy tester +children=physmem ruby sys_port_proxy tester boot_osflags=a clock=1 init_param=0 kernel= load_addr_mask=1099511627775 mem_mode=timing +mem_ranges= memories=system.physmem num_work_ids=16 readfile= @@ -28,29 +29,53 @@ work_end_exit_count=0 work_item_id=-1 system_port=system.sys_port_proxy.slave[0] -[system.dir_cntrl0] +[system.physmem] +type=SimpleMemory +bandwidth=0.000000 +clock=1 +conf_table_reported=false +in_addr_map=true +latency=30 +latency_var=0 +null=false +range=0:134217727 +zero=false + +[system.ruby] +type=RubySystem +children=dir_cntrl0 l1_cntrl0 l2_cntrl0 network profiler +block_size_bytes=64 +clock=1 +mem_size=134217728 +no_mem_vec=false +random_seed=1234 +randomization=true +stats_filename=ruby.stats + +[system.ruby.dir_cntrl0] type=Directory_Controller children=directory memBuffer buffer_size=0 +clock=1 cntrl_id=2 -directory=system.dir_cntrl0.directory +directory=system.ruby.dir_cntrl0.directory directory_latency=6 -memBuffer=system.dir_cntrl0.memBuffer +memBuffer=system.ruby.dir_cntrl0.memBuffer number_of_TBEs=256 recycle_latency=10 ruby_system=system.ruby transitions_per_cycle=32 version=0 -[system.dir_cntrl0.directory] +[system.ruby.dir_cntrl0.directory] type=RubyDirectoryMemory map_levels=4 -numa_high_bit=6 +numa_high_bit=5 size=134217728 use_map=false version=0 -[system.dir_cntrl0.memBuffer] +[system.ruby.dir_cntrl0.memBuffer] type=RubyMemoryControl bank_bit_0=8 bank_busy_time=11 @@ -72,12 +97,13 @@ ruby_system=system.ruby tFaw=0 version=0 -[system.l1_cntrl0] +[system.ruby.l1_cntrl0] type=L1Cache_Controller children=L1DcacheMemory L1IcacheMemory sequencer -L1DcacheMemory=system.l1_cntrl0.L1DcacheMemory -L1IcacheMemory=system.l1_cntrl0.L1IcacheMemory +L1DcacheMemory=system.ruby.l1_cntrl0.L1DcacheMemory +L1IcacheMemory=system.ruby.l1_cntrl0.L1IcacheMemory buffer_size=0 +clock=1 cntrl_id=0 l2_select_num_bits=0 number_of_TBEs=256 @@ -85,11 +111,11 @@ recycle_latency=10 request_latency=2 ruby_system=system.ruby send_evictions=false -sequencer=system.l1_cntrl0.sequencer +sequencer=system.ruby.l1_cntrl0.sequencer transitions_per_cycle=32 version=0 -[system.l1_cntrl0.L1DcacheMemory] +[system.ruby.l1_cntrl0.L1DcacheMemory] type=RubyCache assoc=2 dataAccessLatency=1 @@ -103,12 +129,12 @@ start_index_bit=6 tagAccessLatency=1 tagArrayBanks=1 -[system.l1_cntrl0.L1IcacheMemory] +[system.ruby.l1_cntrl0.L1IcacheMemory] type=RubyCache assoc=2 dataAccessLatency=1 dataArrayBanks=1 -is_icache=false +is_icache=true latency=3 replacement_policy=PSEUDO_LRU resourceStalls=false @@ -117,13 +143,13 @@ start_index_bit=6 tagAccessLatency=1 tagArrayBanks=1 -[system.l1_cntrl0.sequencer] +[system.ruby.l1_cntrl0.sequencer] type=RubySequencer access_phys_mem=false clock=1 -dcache=system.l1_cntrl0.L1DcacheMemory +dcache=system.ruby.l1_cntrl0.L1DcacheMemory deadlock_threshold=500000 -icache=system.l1_cntrl0.L1IcacheMemory +icache=system.ruby.l1_cntrl0.L1IcacheMemory max_outstanding_requests=16 ruby_system=system.ruby support_data_reqs=true @@ -134,11 +160,12 @@ using_ruby_tester=true version=0 slave=system.tester.cpuDataPort[0] system.tester.cpuInstPort[0] -[system.l2_cntrl0] +[system.ruby.l2_cntrl0] type=L2Cache_Controller children=L2cacheMemory -L2cacheMemory=system.l2_cntrl0.L2cacheMemory +L2cacheMemory=system.ruby.l2_cntrl0.L2cacheMemory buffer_size=0 +clock=1 cntrl_id=1 number_of_TBEs=256 recycle_latency=10 @@ -148,7 +175,7 @@ ruby_system=system.ruby transitions_per_cycle=32 version=0 -[system.l2_cntrl0.L2cacheMemory] +[system.ruby.l2_cntrl0.L2cacheMemory] type=RubyCache assoc=2 dataAccessLatency=1 @@ -162,34 +189,12 @@ start_index_bit=6 tagAccessLatency=1 tagArrayBanks=1 -[system.physmem] -type=SimpleMemory -bandwidth=0.000000 -clock=1 -conf_table_reported=false -in_addr_map=true -latency=30 -latency_var=0 -null=false -range=0:134217727 -zero=false - -[system.ruby] -type=RubySystem -children=network profiler -block_size_bytes=64 -clock=1 -mem_size=134217728 -no_mem_vec=false -random_seed=1234 -randomization=true -stats_filename=ruby.stats - [system.ruby.network] type=SimpleNetwork children=topology adaptive_routing=false buffer_size=0 +clock=1 control_msg_size=8 endpoint_bandwidth=1000 number_of_virtual_networks=10 @@ -209,7 +214,7 @@ routers=system.ruby.network.topology.ext_links0.int_node system.ruby.network.top type=SimpleExtLink children=int_node bandwidth_factor=16 -ext_node=system.l1_cntrl0 +ext_node=system.ruby.l1_cntrl0 int_node=system.ruby.network.topology.ext_links0.int_node latency=1 link_id=0 @@ -217,6 +222,7 @@ weight=1 [system.ruby.network.topology.ext_links0.int_node] type=Switch +clock=1 router_id=0 virt_nets=10 @@ -224,7 +230,7 @@ virt_nets=10 type=SimpleExtLink children=int_node bandwidth_factor=16 -ext_node=system.l2_cntrl0 +ext_node=system.ruby.l2_cntrl0 int_node=system.ruby.network.topology.ext_links1.int_node latency=1 link_id=1 @@ -232,6 +238,7 @@ weight=1 [system.ruby.network.topology.ext_links1.int_node] type=Switch +clock=1 router_id=1 virt_nets=10 @@ -239,7 +246,7 @@ virt_nets=10 type=SimpleExtLink children=int_node bandwidth_factor=16 -ext_node=system.dir_cntrl0 +ext_node=system.ruby.dir_cntrl0 int_node=system.ruby.network.topology.ext_links2.int_node latency=1 link_id=2 @@ -247,6 +254,7 @@ weight=1 [system.ruby.network.topology.ext_links2.int_node] type=Switch +clock=1 router_id=2 virt_nets=10 @@ -262,6 +270,7 @@ weight=1 [system.ruby.network.topology.int_links0.node_b] type=Switch +clock=1 router_id=3 virt_nets=10 @@ -312,6 +321,6 @@ deadlock_threshold=50000 num_cpus=1 system=system wakeup_frequency=10 -cpuDataPort=system.l1_cntrl0.sequencer.slave[0] -cpuInstPort=system.l1_cntrl0.sequencer.slave[1] +cpuDataPort=system.ruby.l1_cntrl0.sequencer.slave[0] +cpuInstPort=system.ruby.l1_cntrl0.sequencer.slave[1] diff --git a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_directory/ruby.stats b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_directory/ruby.stats index 19907d578..9d03fe01e 100644 --- a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_directory/ruby.stats +++ b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_directory/ruby.stats @@ -1,24 +1,24 @@ -Real time: Sep/01/2012 14:14:50 +Real time: Jan/14/2013 08:23:28 Profiler Stats -------------- -Elapsed_time_in_seconds: 1 -Elapsed_time_in_minutes: 0.0166667 -Elapsed_time_in_hours: 0.000277778 -Elapsed_time_in_days: 1.15741e-05 +Elapsed_time_in_seconds: 0 +Elapsed_time_in_minutes: 0 +Elapsed_time_in_hours: 0 +Elapsed_time_in_days: 0 -Virtual_time_in_seconds: 0.83 -Virtual_time_in_minutes: 0.0138333 -Virtual_time_in_hours: 0.000230556 -Virtual_time_in_days: 9.60648e-06 +Virtual_time_in_seconds: 0.91 +Virtual_time_in_minutes: 0.0151667 +Virtual_time_in_hours: 0.000252778 +Virtual_time_in_days: 1.05324e-05 Ruby_current_time: 316521 Ruby_start_time: 0 Ruby_cycles: 316521 -mbytes_resident: 44.0977 -mbytes_total: 254.852 -resident_ratio: 0.173094 +mbytes_resident: 50.1406 +mbytes_total: 271.051 +resident_ratio: 0.185029 ruby_cycles_executed: [ 316522 ] @@ -83,7 +83,7 @@ Resource Usage page_size: 4096 user_time: 0 system_time: 0 -page_reclaims: 8272 +page_reclaims: 9989 page_faults: 0 swaps: 0 block_inputs: 0 @@ -165,20 +165,20 @@ links_utilized_percent_switch_3: 1.93331 outgoing_messages_switch_3_link_2_Writeback_Control: 899 7192 [ 0 823 76 0 0 0 0 0 0 0 ] base_latency: 1 outgoing_messages_switch_3_link_2_Unblock_Control: 831 6648 [ 0 0 831 0 0 0 0 0 0 0 ] base_latency: 1 -Cache Stats: system.l1_cntrl0.L1IcacheMemory - system.l1_cntrl0.L1IcacheMemory_total_misses: 0 - system.l1_cntrl0.L1IcacheMemory_total_demand_misses: 0 - system.l1_cntrl0.L1IcacheMemory_total_prefetches: 0 - system.l1_cntrl0.L1IcacheMemory_total_sw_prefetches: 0 - system.l1_cntrl0.L1IcacheMemory_total_hw_prefetches: 0 +Cache Stats: system.ruby.l1_cntrl0.L1IcacheMemory + system.ruby.l1_cntrl0.L1IcacheMemory_total_misses: 0 + system.ruby.l1_cntrl0.L1IcacheMemory_total_demand_misses: 0 + system.ruby.l1_cntrl0.L1IcacheMemory_total_prefetches: 0 + system.ruby.l1_cntrl0.L1IcacheMemory_total_sw_prefetches: 0 + system.ruby.l1_cntrl0.L1IcacheMemory_total_hw_prefetches: 0 -Cache Stats: system.l1_cntrl0.L1DcacheMemory - system.l1_cntrl0.L1DcacheMemory_total_misses: 0 - system.l1_cntrl0.L1DcacheMemory_total_demand_misses: 0 - system.l1_cntrl0.L1DcacheMemory_total_prefetches: 0 - system.l1_cntrl0.L1DcacheMemory_total_sw_prefetches: 0 - system.l1_cntrl0.L1DcacheMemory_total_hw_prefetches: 0 +Cache Stats: system.ruby.l1_cntrl0.L1DcacheMemory + system.ruby.l1_cntrl0.L1DcacheMemory_total_misses: 0 + system.ruby.l1_cntrl0.L1DcacheMemory_total_demand_misses: 0 + system.ruby.l1_cntrl0.L1DcacheMemory_total_prefetches: 0 + system.ruby.l1_cntrl0.L1DcacheMemory_total_sw_prefetches: 0 + system.ruby.l1_cntrl0.L1DcacheMemory_total_hw_prefetches: 0 --- L1Cache --- @@ -343,12 +343,12 @@ II Writeback_Ack [0 ] 0 II Writeback_Ack_Data [0 ] 0 II Writeback_Nack [0 ] 0 -Cache Stats: system.l2_cntrl0.L2cacheMemory - system.l2_cntrl0.L2cacheMemory_total_misses: 0 - system.l2_cntrl0.L2cacheMemory_total_demand_misses: 0 - system.l2_cntrl0.L2cacheMemory_total_prefetches: 0 - system.l2_cntrl0.L2cacheMemory_total_sw_prefetches: 0 - system.l2_cntrl0.L2cacheMemory_total_hw_prefetches: 0 +Cache Stats: system.ruby.l2_cntrl0.L2cacheMemory + system.ruby.l2_cntrl0.L2cacheMemory_total_misses: 0 + system.ruby.l2_cntrl0.L2cacheMemory_total_demand_misses: 0 + system.ruby.l2_cntrl0.L2cacheMemory_total_prefetches: 0 + system.ruby.l2_cntrl0.L2cacheMemory_total_sw_prefetches: 0 + system.ruby.l2_cntrl0.L2cacheMemory_total_hw_prefetches: 0 --- L2Cache --- @@ -1195,7 +1195,7 @@ ILOXD Inv [0 ] 0 ILOXD DmaAck [0 ] 0 ILOXD L2_Replacement [0 ] 0 -Memory controller: system.dir_cntrl0.memBuffer: +Memory controller: system.ruby.dir_cntrl0.memBuffer: memory_total_requests: 1578 memory_reads: 832 memory_writes: 746 diff --git a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_directory/stats.txt b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_directory/stats.txt index 150be1ab5..fec1bbb41 100644 --- a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_directory/stats.txt +++ b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_directory/stats.txt @@ -4,26 +4,26 @@ sim_seconds 0.000317 # Nu sim_ticks 316521 # Number of ticks simulated final_tick 316521 # Number of ticks from beginning of simulation (restored from checkpoints and never reset) sim_freq 1000000000 # Frequency of simulated ticks -host_tick_rate 596457 # Simulator tick rate (ticks/s) -host_mem_usage 260972 # Number of bytes of host memory used -host_seconds 0.53 # Real time elapsed on the host -system.l1_cntrl0.L1DcacheMemory.num_data_array_reads 0 # number of data array reads -system.l1_cntrl0.L1DcacheMemory.num_data_array_writes 0 # number of data array writes -system.l1_cntrl0.L1DcacheMemory.num_tag_array_reads 0 # number of tag array reads -system.l1_cntrl0.L1DcacheMemory.num_tag_array_writes 0 # number of tag array writes -system.l1_cntrl0.L1DcacheMemory.num_tag_array_stalls 0 # number of stalls caused by tag array -system.l1_cntrl0.L1DcacheMemory.num_data_array_stalls 0 # number of stalls caused by data array -system.l1_cntrl0.L1IcacheMemory.num_data_array_reads 0 # number of data array reads -system.l1_cntrl0.L1IcacheMemory.num_data_array_writes 0 # number of data array writes -system.l1_cntrl0.L1IcacheMemory.num_tag_array_reads 0 # number of tag array reads -system.l1_cntrl0.L1IcacheMemory.num_tag_array_writes 0 # number of tag array writes -system.l1_cntrl0.L1IcacheMemory.num_tag_array_stalls 0 # number of stalls caused by tag array -system.l1_cntrl0.L1IcacheMemory.num_data_array_stalls 0 # number of stalls caused by data array -system.l2_cntrl0.L2cacheMemory.num_data_array_reads 0 # number of data array reads -system.l2_cntrl0.L2cacheMemory.num_data_array_writes 0 # number of data array writes -system.l2_cntrl0.L2cacheMemory.num_tag_array_reads 0 # number of tag array reads -system.l2_cntrl0.L2cacheMemory.num_tag_array_writes 0 # number of tag array writes -system.l2_cntrl0.L2cacheMemory.num_tag_array_stalls 0 # number of stalls caused by tag array -system.l2_cntrl0.L2cacheMemory.num_data_array_stalls 0 # number of stalls caused by data array +host_tick_rate 577725 # Simulator tick rate (ticks/s) +host_mem_usage 277560 # Number of bytes of host memory used +host_seconds 0.55 # Real time elapsed on the host +system.ruby.l2_cntrl0.L2cacheMemory.num_data_array_reads 0 # number of data array reads +system.ruby.l2_cntrl0.L2cacheMemory.num_data_array_writes 0 # number of data array writes +system.ruby.l2_cntrl0.L2cacheMemory.num_tag_array_reads 0 # number of tag array reads +system.ruby.l2_cntrl0.L2cacheMemory.num_tag_array_writes 0 # number of tag array writes +system.ruby.l2_cntrl0.L2cacheMemory.num_tag_array_stalls 0 # number of stalls caused by tag array +system.ruby.l2_cntrl0.L2cacheMemory.num_data_array_stalls 0 # number of stalls caused by data array +system.ruby.l1_cntrl0.L1DcacheMemory.num_data_array_reads 0 # number of data array reads +system.ruby.l1_cntrl0.L1DcacheMemory.num_data_array_writes 0 # number of data array writes +system.ruby.l1_cntrl0.L1DcacheMemory.num_tag_array_reads 0 # number of tag array reads +system.ruby.l1_cntrl0.L1DcacheMemory.num_tag_array_writes 0 # number of tag array writes +system.ruby.l1_cntrl0.L1DcacheMemory.num_tag_array_stalls 0 # number of stalls caused by tag array +system.ruby.l1_cntrl0.L1DcacheMemory.num_data_array_stalls 0 # number of stalls caused by data array +system.ruby.l1_cntrl0.L1IcacheMemory.num_data_array_reads 0 # number of data array reads +system.ruby.l1_cntrl0.L1IcacheMemory.num_data_array_writes 0 # number of data array writes +system.ruby.l1_cntrl0.L1IcacheMemory.num_tag_array_reads 0 # number of tag array reads +system.ruby.l1_cntrl0.L1IcacheMemory.num_tag_array_writes 0 # number of tag array writes +system.ruby.l1_cntrl0.L1IcacheMemory.num_tag_array_stalls 0 # number of stalls caused by tag array +system.ruby.l1_cntrl0.L1IcacheMemory.num_data_array_stalls 0 # number of stalls caused by data array ---------- End Simulation Statistics ---------- diff --git a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_token/config.ini b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_token/config.ini index 3722c14cb..7fac9388b 100644 --- a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_token/config.ini +++ b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_token/config.ini @@ -8,13 +8,14 @@ time_sync_spin_threshold=100000 [system] type=System -children=dir_cntrl0 l1_cntrl0 l2_cntrl0 physmem ruby sys_port_proxy tester +children=physmem ruby sys_port_proxy tester boot_osflags=a clock=1 init_param=0 kernel= load_addr_mask=1099511627775 mem_mode=timing +mem_ranges= memories=system.physmem num_work_ids=16 readfile= @@ -28,32 +29,56 @@ work_end_exit_count=0 work_item_id=-1 system_port=system.sys_port_proxy.slave[0] -[system.dir_cntrl0] +[system.physmem] +type=SimpleMemory +bandwidth=0.000000 +clock=1 +conf_table_reported=false +in_addr_map=true +latency=30 +latency_var=0 +null=false +range=0:134217727 +zero=false + +[system.ruby] +type=RubySystem +children=dir_cntrl0 l1_cntrl0 l2_cntrl0 network profiler +block_size_bytes=64 +clock=1 +mem_size=134217728 +no_mem_vec=false +random_seed=1234 +randomization=true +stats_filename=ruby.stats + +[system.ruby.dir_cntrl0] type=Directory_Controller children=directory memBuffer buffer_size=0 +clock=1 cntrl_id=2 -directory=system.dir_cntrl0.directory +directory=system.ruby.dir_cntrl0.directory directory_latency=5 distributed_persistent=true fixed_timeout_latency=100 l2_select_num_bits=0 -memBuffer=system.dir_cntrl0.memBuffer +memBuffer=system.ruby.dir_cntrl0.memBuffer number_of_TBEs=256 recycle_latency=10 ruby_system=system.ruby transitions_per_cycle=32 version=0 -[system.dir_cntrl0.directory] +[system.ruby.dir_cntrl0.directory] type=RubyDirectoryMemory map_levels=4 -numa_high_bit=6 +numa_high_bit=5 size=134217728 use_map=false version=0 -[system.dir_cntrl0.memBuffer] +[system.ruby.dir_cntrl0.memBuffer] type=RubyMemoryControl bank_bit_0=8 bank_busy_time=11 @@ -75,13 +100,14 @@ ruby_system=system.ruby tFaw=0 version=0 -[system.l1_cntrl0] +[system.ruby.l1_cntrl0] type=L1Cache_Controller children=L1DcacheMemory L1IcacheMemory sequencer -L1DcacheMemory=system.l1_cntrl0.L1DcacheMemory -L1IcacheMemory=system.l1_cntrl0.L1IcacheMemory +L1DcacheMemory=system.ruby.l1_cntrl0.L1DcacheMemory +L1IcacheMemory=system.ruby.l1_cntrl0.L1IcacheMemory N_tokens=2 buffer_size=0 +clock=1 cntrl_id=0 dynamic_timeout_enabled=true fixed_timeout_latency=300 @@ -94,11 +120,11 @@ recycle_latency=10 retry_threshold=1 ruby_system=system.ruby send_evictions=false -sequencer=system.l1_cntrl0.sequencer +sequencer=system.ruby.l1_cntrl0.sequencer transitions_per_cycle=32 version=0 -[system.l1_cntrl0.L1DcacheMemory] +[system.ruby.l1_cntrl0.L1DcacheMemory] type=RubyCache assoc=2 dataAccessLatency=1 @@ -112,7 +138,7 @@ start_index_bit=6 tagAccessLatency=1 tagArrayBanks=1 -[system.l1_cntrl0.L1IcacheMemory] +[system.ruby.l1_cntrl0.L1IcacheMemory] type=RubyCache assoc=2 dataAccessLatency=1 @@ -126,13 +152,13 @@ start_index_bit=6 tagAccessLatency=1 tagArrayBanks=1 -[system.l1_cntrl0.sequencer] +[system.ruby.l1_cntrl0.sequencer] type=RubySequencer access_phys_mem=false clock=1 -dcache=system.l1_cntrl0.L1DcacheMemory +dcache=system.ruby.l1_cntrl0.L1DcacheMemory deadlock_threshold=500000 -icache=system.l1_cntrl0.L1IcacheMemory +icache=system.ruby.l1_cntrl0.L1IcacheMemory max_outstanding_requests=16 ruby_system=system.ruby support_data_reqs=true @@ -143,12 +169,13 @@ using_ruby_tester=true version=0 slave=system.tester.cpuDataPort[0] system.tester.cpuInstPort[0] -[system.l2_cntrl0] +[system.ruby.l2_cntrl0] type=L2Cache_Controller children=L2cacheMemory -L2cacheMemory=system.l2_cntrl0.L2cacheMemory +L2cacheMemory=system.ruby.l2_cntrl0.L2cacheMemory N_tokens=2 buffer_size=0 +clock=1 cntrl_id=1 filtering_enabled=true l2_request_latency=5 @@ -159,7 +186,7 @@ ruby_system=system.ruby transitions_per_cycle=32 version=0 -[system.l2_cntrl0.L2cacheMemory] +[system.ruby.l2_cntrl0.L2cacheMemory] type=RubyCache assoc=2 dataAccessLatency=1 @@ -173,34 +200,12 @@ start_index_bit=6 tagAccessLatency=1 tagArrayBanks=1 -[system.physmem] -type=SimpleMemory -bandwidth=0.000000 -clock=1 -conf_table_reported=false -in_addr_map=true -latency=30 -latency_var=0 -null=false -range=0:134217727 -zero=false - -[system.ruby] -type=RubySystem -children=network profiler -block_size_bytes=64 -clock=1 -mem_size=134217728 -no_mem_vec=false -random_seed=1234 -randomization=true -stats_filename=ruby.stats - [system.ruby.network] type=SimpleNetwork children=topology adaptive_routing=false buffer_size=0 +clock=1 control_msg_size=8 endpoint_bandwidth=1000 number_of_virtual_networks=10 @@ -220,7 +225,7 @@ routers=system.ruby.network.topology.ext_links0.int_node system.ruby.network.top type=SimpleExtLink children=int_node bandwidth_factor=16 -ext_node=system.l1_cntrl0 +ext_node=system.ruby.l1_cntrl0 int_node=system.ruby.network.topology.ext_links0.int_node latency=1 link_id=0 @@ -228,6 +233,7 @@ weight=1 [system.ruby.network.topology.ext_links0.int_node] type=Switch +clock=1 router_id=0 virt_nets=10 @@ -235,7 +241,7 @@ virt_nets=10 type=SimpleExtLink children=int_node bandwidth_factor=16 -ext_node=system.l2_cntrl0 +ext_node=system.ruby.l2_cntrl0 int_node=system.ruby.network.topology.ext_links1.int_node latency=1 link_id=1 @@ -243,6 +249,7 @@ weight=1 [system.ruby.network.topology.ext_links1.int_node] type=Switch +clock=1 router_id=1 virt_nets=10 @@ -250,7 +257,7 @@ virt_nets=10 type=SimpleExtLink children=int_node bandwidth_factor=16 -ext_node=system.dir_cntrl0 +ext_node=system.ruby.dir_cntrl0 int_node=system.ruby.network.topology.ext_links2.int_node latency=1 link_id=2 @@ -258,6 +265,7 @@ weight=1 [system.ruby.network.topology.ext_links2.int_node] type=Switch +clock=1 router_id=2 virt_nets=10 @@ -273,6 +281,7 @@ weight=1 [system.ruby.network.topology.int_links0.node_b] type=Switch +clock=1 router_id=3 virt_nets=10 @@ -323,6 +332,6 @@ deadlock_threshold=50000 num_cpus=1 system=system wakeup_frequency=10 -cpuDataPort=system.l1_cntrl0.sequencer.slave[0] -cpuInstPort=system.l1_cntrl0.sequencer.slave[1] +cpuDataPort=system.ruby.l1_cntrl0.sequencer.slave[0] +cpuInstPort=system.ruby.l1_cntrl0.sequencer.slave[1] diff --git a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_token/ruby.stats b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_token/ruby.stats index 48f057069..1515df5d0 100644 --- a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_token/ruby.stats +++ b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_token/ruby.stats @@ -1,4 +1,4 @@ -Real time: Sep/09/2012 13:38:15 +Real time: Jan/14/2013 08:26:50 Profiler Stats -------------- @@ -7,18 +7,18 @@ Elapsed_time_in_minutes: 0 Elapsed_time_in_hours: 0 Elapsed_time_in_days: 0 -Virtual_time_in_seconds: 0.52 -Virtual_time_in_minutes: 0.00866667 -Virtual_time_in_hours: 0.000144444 -Virtual_time_in_days: 6.01852e-06 +Virtual_time_in_seconds: 0.54 +Virtual_time_in_minutes: 0.009 +Virtual_time_in_hours: 0.00015 +Virtual_time_in_days: 6.25e-06 Ruby_current_time: 225141 Ruby_start_time: 0 Ruby_cycles: 225141 -mbytes_resident: 48.582 -mbytes_total: 262.523 -resident_ratio: 0.185073 +mbytes_resident: 50.0586 +mbytes_total: 271.023 +resident_ratio: 0.18476 ruby_cycles_executed: [ 225142 ] @@ -90,7 +90,7 @@ Resource Usage page_size: 4096 user_time: 0 system_time: 0 -page_reclaims: 9521 +page_reclaims: 10002 page_faults: 0 swaps: 0 block_inputs: 0 @@ -174,28 +174,28 @@ links_utilized_percent_switch_3: 1.99349 outgoing_messages_switch_3_link_2_Writeback_Control: 72 576 [ 0 0 0 0 72 0 0 0 0 0 ] base_latency: 1 outgoing_messages_switch_3_link_2_Persistent_Control: 373 2984 [ 0 0 0 373 0 0 0 0 0 0 ] base_latency: 1 -Cache Stats: system.l1_cntrl0.L1IcacheMemory - system.l1_cntrl0.L1IcacheMemory_total_misses: 47 - system.l1_cntrl0.L1IcacheMemory_total_demand_misses: 47 - system.l1_cntrl0.L1IcacheMemory_total_prefetches: 0 - system.l1_cntrl0.L1IcacheMemory_total_sw_prefetches: 0 - system.l1_cntrl0.L1IcacheMemory_total_hw_prefetches: 0 +Cache Stats: system.ruby.l1_cntrl0.L1IcacheMemory + system.ruby.l1_cntrl0.L1IcacheMemory_total_misses: 47 + system.ruby.l1_cntrl0.L1IcacheMemory_total_demand_misses: 47 + system.ruby.l1_cntrl0.L1IcacheMemory_total_prefetches: 0 + system.ruby.l1_cntrl0.L1IcacheMemory_total_sw_prefetches: 0 + system.ruby.l1_cntrl0.L1IcacheMemory_total_hw_prefetches: 0 - system.l1_cntrl0.L1IcacheMemory_request_type_IFETCH: 100% + system.ruby.l1_cntrl0.L1IcacheMemory_request_type_IFETCH: 100% - system.l1_cntrl0.L1IcacheMemory_access_mode_type_Supervisor: 47 100% + system.ruby.l1_cntrl0.L1IcacheMemory_access_mode_type_Supervisor: 47 100% -Cache Stats: system.l1_cntrl0.L1DcacheMemory - system.l1_cntrl0.L1DcacheMemory_total_misses: 864 - system.l1_cntrl0.L1DcacheMemory_total_demand_misses: 864 - system.l1_cntrl0.L1DcacheMemory_total_prefetches: 0 - system.l1_cntrl0.L1DcacheMemory_total_sw_prefetches: 0 - system.l1_cntrl0.L1DcacheMemory_total_hw_prefetches: 0 +Cache Stats: system.ruby.l1_cntrl0.L1DcacheMemory + system.ruby.l1_cntrl0.L1DcacheMemory_total_misses: 864 + system.ruby.l1_cntrl0.L1DcacheMemory_total_demand_misses: 864 + system.ruby.l1_cntrl0.L1DcacheMemory_total_prefetches: 0 + system.ruby.l1_cntrl0.L1DcacheMemory_total_sw_prefetches: 0 + system.ruby.l1_cntrl0.L1DcacheMemory_total_hw_prefetches: 0 - system.l1_cntrl0.L1DcacheMemory_request_type_LD: 5.55556% - system.l1_cntrl0.L1DcacheMemory_request_type_ST: 94.4444% + system.ruby.l1_cntrl0.L1DcacheMemory_request_type_LD: 5.55556% + system.ruby.l1_cntrl0.L1DcacheMemory_request_type_ST: 94.4444% - system.l1_cntrl0.L1DcacheMemory_access_mode_type_Supervisor: 864 100% + system.ruby.l1_cntrl0.L1DcacheMemory_access_mode_type_Supervisor: 864 100% --- L1Cache --- - Event Counts - @@ -548,17 +548,17 @@ IS_L Persistent_GETS [0 ] 0 IS_L Own_Lock_or_Unlock [0 ] 0 IS_L Request_Timeout [0 ] 0 -Cache Stats: system.l2_cntrl0.L2cacheMemory - system.l2_cntrl0.L2cacheMemory_total_misses: 872 - system.l2_cntrl0.L2cacheMemory_total_demand_misses: 872 - system.l2_cntrl0.L2cacheMemory_total_prefetches: 0 - system.l2_cntrl0.L2cacheMemory_total_sw_prefetches: 0 - system.l2_cntrl0.L2cacheMemory_total_hw_prefetches: 0 +Cache Stats: system.ruby.l2_cntrl0.L2cacheMemory + system.ruby.l2_cntrl0.L2cacheMemory_total_misses: 872 + system.ruby.l2_cntrl0.L2cacheMemory_total_demand_misses: 872 + system.ruby.l2_cntrl0.L2cacheMemory_total_prefetches: 0 + system.ruby.l2_cntrl0.L2cacheMemory_total_sw_prefetches: 0 + system.ruby.l2_cntrl0.L2cacheMemory_total_hw_prefetches: 0 - system.l2_cntrl0.L2cacheMemory_request_type_GETS: 10.5505% - system.l2_cntrl0.L2cacheMemory_request_type_GETX: 89.4495% + system.ruby.l2_cntrl0.L2cacheMemory_request_type_GETS: 10.5505% + system.ruby.l2_cntrl0.L2cacheMemory_request_type_GETX: 89.4495% - system.l2_cntrl0.L2cacheMemory_access_mode_type_Supervisor: 872 100% + system.ruby.l2_cntrl0.L2cacheMemory_access_mode_type_Supervisor: 872 100% --- L2Cache --- - Event Counts - @@ -715,7 +715,7 @@ S_L Persistent_GETS [0 ] 0 S_L Persistent_GETS_Last_Token [0 ] 0 S_L Own_Lock_or_Unlock [0 ] 0 -Memory controller: system.dir_cntrl0.memBuffer: +Memory controller: system.ruby.dir_cntrl0.memBuffer: memory_total_requests: 1655 memory_reads: 868 memory_writes: 787 diff --git a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_token/stats.txt b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_token/stats.txt index 6ab4e149a..f620f0e27 100644 --- a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_token/stats.txt +++ b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_token/stats.txt @@ -4,26 +4,26 @@ sim_seconds 0.000225 # Nu sim_ticks 225141 # Number of ticks simulated final_tick 225141 # Number of ticks from beginning of simulation (restored from checkpoints and never reset) sim_freq 1000000000 # Frequency of simulated ticks -host_tick_rate 821000 # Simulator tick rate (ticks/s) -host_mem_usage 230520 # Number of bytes of host memory used -host_seconds 0.27 # Real time elapsed on the host -system.l1_cntrl0.L1DcacheMemory.num_data_array_reads 0 # number of data array reads -system.l1_cntrl0.L1DcacheMemory.num_data_array_writes 0 # number of data array writes -system.l1_cntrl0.L1DcacheMemory.num_tag_array_reads 0 # number of tag array reads -system.l1_cntrl0.L1DcacheMemory.num_tag_array_writes 0 # number of tag array writes -system.l1_cntrl0.L1DcacheMemory.num_tag_array_stalls 0 # number of stalls caused by tag array -system.l1_cntrl0.L1DcacheMemory.num_data_array_stalls 0 # number of stalls caused by data array -system.l1_cntrl0.L1IcacheMemory.num_data_array_reads 0 # number of data array reads -system.l1_cntrl0.L1IcacheMemory.num_data_array_writes 0 # number of data array writes -system.l1_cntrl0.L1IcacheMemory.num_tag_array_reads 0 # number of tag array reads -system.l1_cntrl0.L1IcacheMemory.num_tag_array_writes 0 # number of tag array writes -system.l1_cntrl0.L1IcacheMemory.num_tag_array_stalls 0 # number of stalls caused by tag array -system.l1_cntrl0.L1IcacheMemory.num_data_array_stalls 0 # number of stalls caused by data array -system.l2_cntrl0.L2cacheMemory.num_data_array_reads 0 # number of data array reads -system.l2_cntrl0.L2cacheMemory.num_data_array_writes 0 # number of data array writes -system.l2_cntrl0.L2cacheMemory.num_tag_array_reads 0 # number of tag array reads -system.l2_cntrl0.L2cacheMemory.num_tag_array_writes 0 # number of tag array writes -system.l2_cntrl0.L2cacheMemory.num_tag_array_stalls 0 # number of stalls caused by tag array -system.l2_cntrl0.L2cacheMemory.num_data_array_stalls 0 # number of stalls caused by data array +host_tick_rate 1324121 # Simulator tick rate (ticks/s) +host_mem_usage 277532 # Number of bytes of host memory used +host_seconds 0.17 # Real time elapsed on the host +system.ruby.l2_cntrl0.L2cacheMemory.num_data_array_reads 0 # number of data array reads +system.ruby.l2_cntrl0.L2cacheMemory.num_data_array_writes 0 # number of data array writes +system.ruby.l2_cntrl0.L2cacheMemory.num_tag_array_reads 0 # number of tag array reads +system.ruby.l2_cntrl0.L2cacheMemory.num_tag_array_writes 0 # number of tag array writes +system.ruby.l2_cntrl0.L2cacheMemory.num_tag_array_stalls 0 # number of stalls caused by tag array +system.ruby.l2_cntrl0.L2cacheMemory.num_data_array_stalls 0 # number of stalls caused by data array +system.ruby.l1_cntrl0.L1DcacheMemory.num_data_array_reads 0 # number of data array reads +system.ruby.l1_cntrl0.L1DcacheMemory.num_data_array_writes 0 # number of data array writes +system.ruby.l1_cntrl0.L1DcacheMemory.num_tag_array_reads 0 # number of tag array reads +system.ruby.l1_cntrl0.L1DcacheMemory.num_tag_array_writes 0 # number of tag array writes +system.ruby.l1_cntrl0.L1DcacheMemory.num_tag_array_stalls 0 # number of stalls caused by tag array +system.ruby.l1_cntrl0.L1DcacheMemory.num_data_array_stalls 0 # number of stalls caused by data array +system.ruby.l1_cntrl0.L1IcacheMemory.num_data_array_reads 0 # number of data array reads +system.ruby.l1_cntrl0.L1IcacheMemory.num_data_array_writes 0 # number of data array writes +system.ruby.l1_cntrl0.L1IcacheMemory.num_tag_array_reads 0 # number of tag array reads +system.ruby.l1_cntrl0.L1IcacheMemory.num_tag_array_writes 0 # number of tag array writes +system.ruby.l1_cntrl0.L1IcacheMemory.num_tag_array_stalls 0 # number of stalls caused by tag array +system.ruby.l1_cntrl0.L1IcacheMemory.num_data_array_stalls 0 # number of stalls caused by data array ---------- End Simulation Statistics ---------- diff --git a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_hammer/config.ini b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_hammer/config.ini index 77edef804..17b6da2d7 100644 --- a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_hammer/config.ini +++ b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_hammer/config.ini @@ -8,13 +8,14 @@ time_sync_spin_threshold=100000 [system] type=System -children=dir_cntrl0 l1_cntrl0 physmem ruby sys_port_proxy tester +children=physmem ruby sys_port_proxy tester boot_osflags=a clock=1 init_param=0 kernel= load_addr_mask=1099511627775 mem_mode=timing +mem_ranges= memories=system.physmem num_work_ids=16 readfile= @@ -28,32 +29,56 @@ work_end_exit_count=0 work_item_id=-1 system_port=system.sys_port_proxy.slave[0] -[system.dir_cntrl0] +[system.physmem] +type=SimpleMemory +bandwidth=0.000000 +clock=1 +conf_table_reported=false +in_addr_map=true +latency=30 +latency_var=0 +null=false +range=0:134217727 +zero=false + +[system.ruby] +type=RubySystem +children=dir_cntrl0 l1_cntrl0 network profiler +block_size_bytes=64 +clock=1 +mem_size=134217728 +no_mem_vec=false +random_seed=1234 +randomization=true +stats_filename=ruby.stats + +[system.ruby.dir_cntrl0] type=Directory_Controller children=directory memBuffer probeFilter buffer_size=0 +clock=1 cntrl_id=1 -directory=system.dir_cntrl0.directory +directory=system.ruby.dir_cntrl0.directory full_bit_dir_enabled=false -memBuffer=system.dir_cntrl0.memBuffer +memBuffer=system.ruby.dir_cntrl0.memBuffer memory_controller_latency=2 number_of_TBEs=256 -probeFilter=system.dir_cntrl0.probeFilter +probeFilter=system.ruby.dir_cntrl0.probeFilter probe_filter_enabled=false recycle_latency=10 ruby_system=system.ruby transitions_per_cycle=32 version=0 -[system.dir_cntrl0.directory] +[system.ruby.dir_cntrl0.directory] type=RubyDirectoryMemory map_levels=4 -numa_high_bit=6 +numa_high_bit=5 size=134217728 use_map=false version=0 -[system.dir_cntrl0.memBuffer] +[system.ruby.dir_cntrl0.memBuffer] type=RubyMemoryControl bank_bit_0=8 bank_busy_time=11 @@ -75,7 +100,7 @@ ruby_system=system.ruby tFaw=0 version=0 -[system.dir_cntrl0.probeFilter] +[system.ruby.dir_cntrl0.probeFilter] type=RubyCache assoc=4 dataAccessLatency=1 @@ -89,14 +114,15 @@ start_index_bit=6 tagAccessLatency=1 tagArrayBanks=1 -[system.l1_cntrl0] +[system.ruby.l1_cntrl0] type=L1Cache_Controller children=L1DcacheMemory L1IcacheMemory L2cacheMemory sequencer -L1DcacheMemory=system.l1_cntrl0.L1DcacheMemory -L1IcacheMemory=system.l1_cntrl0.L1IcacheMemory -L2cacheMemory=system.l1_cntrl0.L2cacheMemory +L1DcacheMemory=system.ruby.l1_cntrl0.L1DcacheMemory +L1IcacheMemory=system.ruby.l1_cntrl0.L1IcacheMemory +L2cacheMemory=system.ruby.l1_cntrl0.L2cacheMemory buffer_size=0 cache_response_latency=10 +clock=1 cntrl_id=0 issue_latency=2 l2_cache_hit_latency=10 @@ -105,11 +131,11 @@ number_of_TBEs=256 recycle_latency=10 ruby_system=system.ruby send_evictions=false -sequencer=system.l1_cntrl0.sequencer +sequencer=system.ruby.l1_cntrl0.sequencer transitions_per_cycle=32 version=0 -[system.l1_cntrl0.L1DcacheMemory] +[system.ruby.l1_cntrl0.L1DcacheMemory] type=RubyCache assoc=2 dataAccessLatency=1 @@ -123,7 +149,7 @@ start_index_bit=6 tagAccessLatency=1 tagArrayBanks=1 -[system.l1_cntrl0.L1IcacheMemory] +[system.ruby.l1_cntrl0.L1IcacheMemory] type=RubyCache assoc=2 dataAccessLatency=1 @@ -137,7 +163,7 @@ start_index_bit=6 tagAccessLatency=1 tagArrayBanks=1 -[system.l1_cntrl0.L2cacheMemory] +[system.ruby.l1_cntrl0.L2cacheMemory] type=RubyCache assoc=2 dataAccessLatency=1 @@ -151,13 +177,13 @@ start_index_bit=6 tagAccessLatency=1 tagArrayBanks=1 -[system.l1_cntrl0.sequencer] +[system.ruby.l1_cntrl0.sequencer] type=RubySequencer access_phys_mem=false clock=1 -dcache=system.l1_cntrl0.L1DcacheMemory +dcache=system.ruby.l1_cntrl0.L1DcacheMemory deadlock_threshold=500000 -icache=system.l1_cntrl0.L1IcacheMemory +icache=system.ruby.l1_cntrl0.L1IcacheMemory max_outstanding_requests=16 ruby_system=system.ruby support_data_reqs=true @@ -168,34 +194,12 @@ using_ruby_tester=true version=0 slave=system.tester.cpuDataPort[0] system.tester.cpuInstPort[0] -[system.physmem] -type=SimpleMemory -bandwidth=0.000000 -clock=1 -conf_table_reported=false -in_addr_map=true -latency=30 -latency_var=0 -null=false -range=0:134217727 -zero=false - -[system.ruby] -type=RubySystem -children=network profiler -block_size_bytes=64 -clock=1 -mem_size=134217728 -no_mem_vec=false -random_seed=1234 -randomization=true -stats_filename=ruby.stats - [system.ruby.network] type=SimpleNetwork children=topology adaptive_routing=false buffer_size=0 +clock=1 control_msg_size=8 endpoint_bandwidth=1000 number_of_virtual_networks=10 @@ -215,7 +219,7 @@ routers=system.ruby.network.topology.ext_links0.int_node system.ruby.network.top type=SimpleExtLink children=int_node bandwidth_factor=16 -ext_node=system.l1_cntrl0 +ext_node=system.ruby.l1_cntrl0 int_node=system.ruby.network.topology.ext_links0.int_node latency=1 link_id=0 @@ -223,6 +227,7 @@ weight=1 [system.ruby.network.topology.ext_links0.int_node] type=Switch +clock=1 router_id=0 virt_nets=10 @@ -230,7 +235,7 @@ virt_nets=10 type=SimpleExtLink children=int_node bandwidth_factor=16 -ext_node=system.dir_cntrl0 +ext_node=system.ruby.dir_cntrl0 int_node=system.ruby.network.topology.ext_links1.int_node latency=1 link_id=1 @@ -238,6 +243,7 @@ weight=1 [system.ruby.network.topology.ext_links1.int_node] type=Switch +clock=1 router_id=1 virt_nets=10 @@ -253,6 +259,7 @@ weight=1 [system.ruby.network.topology.int_links0.node_b] type=Switch +clock=1 router_id=2 virt_nets=10 @@ -294,6 +301,6 @@ deadlock_threshold=50000 num_cpus=1 system=system wakeup_frequency=10 -cpuDataPort=system.l1_cntrl0.sequencer.slave[0] -cpuInstPort=system.l1_cntrl0.sequencer.slave[1] +cpuDataPort=system.ruby.l1_cntrl0.sequencer.slave[0] +cpuInstPort=system.ruby.l1_cntrl0.sequencer.slave[1] diff --git a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_hammer/ruby.stats b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_hammer/ruby.stats index 31072bf7e..fe7f5ca34 100644 --- a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_hammer/ruby.stats +++ b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_hammer/ruby.stats @@ -1,4 +1,4 @@ -Real time: Sep/01/2012 13:57:00 +Real time: Jan/14/2013 08:16:37 Profiler Stats -------------- @@ -7,18 +7,18 @@ Elapsed_time_in_minutes: 0 Elapsed_time_in_hours: 0 Elapsed_time_in_days: 0 -Virtual_time_in_seconds: 0.44 -Virtual_time_in_minutes: 0.00733333 -Virtual_time_in_hours: 0.000122222 -Virtual_time_in_days: 5.09259e-06 +Virtual_time_in_seconds: 0.47 +Virtual_time_in_minutes: 0.00783333 +Virtual_time_in_hours: 0.000130556 +Virtual_time_in_days: 5.43981e-06 Ruby_current_time: 172201 Ruby_start_time: 0 Ruby_cycles: 172201 -mbytes_resident: 44.8359 -mbytes_total: 254.68 -resident_ratio: 0.176125 +mbytes_resident: 49.8672 +mbytes_total: 271.008 +resident_ratio: 0.18405 ruby_cycles_executed: [ 172202 ] @@ -91,7 +91,7 @@ Resource Usage page_size: 4096 user_time: 0 system_time: 0 -page_reclaims: 8466 +page_reclaims: 9423 page_faults: 0 swaps: 0 block_inputs: 0 @@ -146,43 +146,43 @@ links_utilized_percent_switch_2: 2.61613 outgoing_messages_switch_2_link_1_Writeback_Control: 918 7344 [ 0 0 843 0 0 75 0 0 0 0 ] base_latency: 1 outgoing_messages_switch_2_link_1_Unblock_Control: 845 6760 [ 0 0 0 0 0 845 0 0 0 0 ] base_latency: 1 -Cache Stats: system.l1_cntrl0.L1IcacheMemory - system.l1_cntrl0.L1IcacheMemory_total_misses: 49 - system.l1_cntrl0.L1IcacheMemory_total_demand_misses: 49 - system.l1_cntrl0.L1IcacheMemory_total_prefetches: 0 - system.l1_cntrl0.L1IcacheMemory_total_sw_prefetches: 0 - system.l1_cntrl0.L1IcacheMemory_total_hw_prefetches: 0 +Cache Stats: system.ruby.l1_cntrl0.L1IcacheMemory + system.ruby.l1_cntrl0.L1IcacheMemory_total_misses: 49 + system.ruby.l1_cntrl0.L1IcacheMemory_total_demand_misses: 49 + system.ruby.l1_cntrl0.L1IcacheMemory_total_prefetches: 0 + system.ruby.l1_cntrl0.L1IcacheMemory_total_sw_prefetches: 0 + system.ruby.l1_cntrl0.L1IcacheMemory_total_hw_prefetches: 0 - system.l1_cntrl0.L1IcacheMemory_request_type_IFETCH: 100% + system.ruby.l1_cntrl0.L1IcacheMemory_request_type_IFETCH: 100% - system.l1_cntrl0.L1IcacheMemory_access_mode_type_Supervisor: 49 100% + system.ruby.l1_cntrl0.L1IcacheMemory_access_mode_type_Supervisor: 49 100% -Cache Stats: system.l1_cntrl0.L1DcacheMemory - system.l1_cntrl0.L1DcacheMemory_total_misses: 849 - system.l1_cntrl0.L1DcacheMemory_total_demand_misses: 849 - system.l1_cntrl0.L1DcacheMemory_total_prefetches: 0 - system.l1_cntrl0.L1DcacheMemory_total_sw_prefetches: 0 - system.l1_cntrl0.L1DcacheMemory_total_hw_prefetches: 0 +Cache Stats: system.ruby.l1_cntrl0.L1DcacheMemory + system.ruby.l1_cntrl0.L1DcacheMemory_total_misses: 849 + system.ruby.l1_cntrl0.L1DcacheMemory_total_demand_misses: 849 + system.ruby.l1_cntrl0.L1DcacheMemory_total_prefetches: 0 + system.ruby.l1_cntrl0.L1DcacheMemory_total_sw_prefetches: 0 + system.ruby.l1_cntrl0.L1DcacheMemory_total_hw_prefetches: 0 - system.l1_cntrl0.L1DcacheMemory_request_type_LD: 5.41814% - system.l1_cntrl0.L1DcacheMemory_request_type_ST: 94.4641% - system.l1_cntrl0.L1DcacheMemory_request_type_FLUSH: 0.117786% + system.ruby.l1_cntrl0.L1DcacheMemory_request_type_LD: 5.41814% + system.ruby.l1_cntrl0.L1DcacheMemory_request_type_ST: 94.4641% + system.ruby.l1_cntrl0.L1DcacheMemory_request_type_FLUSH: 0.117786% - system.l1_cntrl0.L1DcacheMemory_access_mode_type_Supervisor: 849 100% + system.ruby.l1_cntrl0.L1DcacheMemory_access_mode_type_Supervisor: 849 100% -Cache Stats: system.l1_cntrl0.L2cacheMemory - system.l1_cntrl0.L2cacheMemory_total_misses: 902 - system.l1_cntrl0.L2cacheMemory_total_demand_misses: 902 - system.l1_cntrl0.L2cacheMemory_total_prefetches: 0 - system.l1_cntrl0.L2cacheMemory_total_sw_prefetches: 0 - system.l1_cntrl0.L2cacheMemory_total_hw_prefetches: 0 +Cache Stats: system.ruby.l1_cntrl0.L2cacheMemory + system.ruby.l1_cntrl0.L2cacheMemory_total_misses: 902 + system.ruby.l1_cntrl0.L2cacheMemory_total_demand_misses: 902 + system.ruby.l1_cntrl0.L2cacheMemory_total_prefetches: 0 + system.ruby.l1_cntrl0.L2cacheMemory_total_sw_prefetches: 0 + system.ruby.l1_cntrl0.L2cacheMemory_total_hw_prefetches: 0 - system.l1_cntrl0.L2cacheMemory_request_type_LD: 5.09978% - system.l1_cntrl0.L2cacheMemory_request_type_ST: 88.9135% - system.l1_cntrl0.L2cacheMemory_request_type_IFETCH: 5.43237% - system.l1_cntrl0.L2cacheMemory_request_type_FLUSH: 0.554324% + system.ruby.l1_cntrl0.L2cacheMemory_request_type_LD: 5.09978% + system.ruby.l1_cntrl0.L2cacheMemory_request_type_ST: 88.9135% + system.ruby.l1_cntrl0.L2cacheMemory_request_type_IFETCH: 5.43237% + system.ruby.l1_cntrl0.L2cacheMemory_request_type_FLUSH: 0.554324% - system.l1_cntrl0.L2cacheMemory_access_mode_type_Supervisor: 902 100% + system.ruby.l1_cntrl0.L2cacheMemory_access_mode_type_Supervisor: 902 100% --- L1Cache --- - Event Counts - @@ -581,15 +581,15 @@ MM_WF Ack [0 ] 0 MM_WF All_acks_no_sharers [4 ] 4 MM_WF Flush_line [0 ] 0 -Cache Stats: system.dir_cntrl0.probeFilter - system.dir_cntrl0.probeFilter_total_misses: 0 - system.dir_cntrl0.probeFilter_total_demand_misses: 0 - system.dir_cntrl0.probeFilter_total_prefetches: 0 - system.dir_cntrl0.probeFilter_total_sw_prefetches: 0 - system.dir_cntrl0.probeFilter_total_hw_prefetches: 0 +Cache Stats: system.ruby.dir_cntrl0.probeFilter + system.ruby.dir_cntrl0.probeFilter_total_misses: 0 + system.ruby.dir_cntrl0.probeFilter_total_demand_misses: 0 + system.ruby.dir_cntrl0.probeFilter_total_prefetches: 0 + system.ruby.dir_cntrl0.probeFilter_total_sw_prefetches: 0 + system.ruby.dir_cntrl0.probeFilter_total_hw_prefetches: 0 -Memory controller: system.dir_cntrl0.memBuffer: +Memory controller: system.ruby.dir_cntrl0.memBuffer: memory_total_requests: 1617 memory_reads: 850 memory_writes: 767 diff --git a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_hammer/stats.txt b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_hammer/stats.txt index 9f304868a..17783b065 100644 --- a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_hammer/stats.txt +++ b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_hammer/stats.txt @@ -4,32 +4,32 @@ sim_seconds 0.000172 # Nu sim_ticks 172201 # Number of ticks simulated final_tick 172201 # Number of ticks from beginning of simulation (restored from checkpoints and never reset) sim_freq 1000000000 # Frequency of simulated ticks -host_tick_rate 1185587 # Simulator tick rate (ticks/s) -host_mem_usage 260796 # Number of bytes of host memory used -host_seconds 0.15 # Real time elapsed on the host -system.l1_cntrl0.L1DcacheMemory.num_data_array_reads 0 # number of data array reads -system.l1_cntrl0.L1DcacheMemory.num_data_array_writes 0 # number of data array writes -system.l1_cntrl0.L1DcacheMemory.num_tag_array_reads 0 # number of tag array reads -system.l1_cntrl0.L1DcacheMemory.num_tag_array_writes 0 # number of tag array writes -system.l1_cntrl0.L1DcacheMemory.num_tag_array_stalls 0 # number of stalls caused by tag array -system.l1_cntrl0.L1DcacheMemory.num_data_array_stalls 0 # number of stalls caused by data array -system.l1_cntrl0.L1IcacheMemory.num_data_array_reads 0 # number of data array reads -system.l1_cntrl0.L1IcacheMemory.num_data_array_writes 0 # number of data array writes -system.l1_cntrl0.L1IcacheMemory.num_tag_array_reads 0 # number of tag array reads -system.l1_cntrl0.L1IcacheMemory.num_tag_array_writes 0 # number of tag array writes -system.l1_cntrl0.L1IcacheMemory.num_tag_array_stalls 0 # number of stalls caused by tag array -system.l1_cntrl0.L1IcacheMemory.num_data_array_stalls 0 # number of stalls caused by data array -system.l1_cntrl0.L2cacheMemory.num_data_array_reads 0 # number of data array reads -system.l1_cntrl0.L2cacheMemory.num_data_array_writes 0 # number of data array writes -system.l1_cntrl0.L2cacheMemory.num_tag_array_reads 0 # number of tag array reads -system.l1_cntrl0.L2cacheMemory.num_tag_array_writes 0 # number of tag array writes -system.l1_cntrl0.L2cacheMemory.num_tag_array_stalls 0 # number of stalls caused by tag array -system.l1_cntrl0.L2cacheMemory.num_data_array_stalls 0 # number of stalls caused by data array -system.dir_cntrl0.probeFilter.num_data_array_reads 0 # number of data array reads -system.dir_cntrl0.probeFilter.num_data_array_writes 0 # number of data array writes -system.dir_cntrl0.probeFilter.num_tag_array_reads 0 # number of tag array reads -system.dir_cntrl0.probeFilter.num_tag_array_writes 0 # number of tag array writes -system.dir_cntrl0.probeFilter.num_tag_array_stalls 0 # number of stalls caused by tag array -system.dir_cntrl0.probeFilter.num_data_array_stalls 0 # number of stalls caused by data array +host_tick_rate 1354339 # Simulator tick rate (ticks/s) +host_mem_usage 277516 # Number of bytes of host memory used +host_seconds 0.13 # Real time elapsed on the host +system.ruby.l1_cntrl0.L1DcacheMemory.num_data_array_reads 0 # number of data array reads +system.ruby.l1_cntrl0.L1DcacheMemory.num_data_array_writes 0 # number of data array writes +system.ruby.l1_cntrl0.L1DcacheMemory.num_tag_array_reads 0 # number of tag array reads +system.ruby.l1_cntrl0.L1DcacheMemory.num_tag_array_writes 0 # number of tag array writes +system.ruby.l1_cntrl0.L1DcacheMemory.num_tag_array_stalls 0 # number of stalls caused by tag array +system.ruby.l1_cntrl0.L1DcacheMemory.num_data_array_stalls 0 # number of stalls caused by data array +system.ruby.l1_cntrl0.L1IcacheMemory.num_data_array_reads 0 # number of data array reads +system.ruby.l1_cntrl0.L1IcacheMemory.num_data_array_writes 0 # number of data array writes +system.ruby.l1_cntrl0.L1IcacheMemory.num_tag_array_reads 0 # number of tag array reads +system.ruby.l1_cntrl0.L1IcacheMemory.num_tag_array_writes 0 # number of tag array writes +system.ruby.l1_cntrl0.L1IcacheMemory.num_tag_array_stalls 0 # number of stalls caused by tag array +system.ruby.l1_cntrl0.L1IcacheMemory.num_data_array_stalls 0 # number of stalls caused by data array +system.ruby.l1_cntrl0.L2cacheMemory.num_data_array_reads 0 # number of data array reads +system.ruby.l1_cntrl0.L2cacheMemory.num_data_array_writes 0 # number of data array writes +system.ruby.l1_cntrl0.L2cacheMemory.num_tag_array_reads 0 # number of tag array reads +system.ruby.l1_cntrl0.L2cacheMemory.num_tag_array_writes 0 # number of tag array writes +system.ruby.l1_cntrl0.L2cacheMemory.num_tag_array_stalls 0 # number of stalls caused by tag array +system.ruby.l1_cntrl0.L2cacheMemory.num_data_array_stalls 0 # number of stalls caused by data array +system.ruby.dir_cntrl0.probeFilter.num_data_array_reads 0 # number of data array reads +system.ruby.dir_cntrl0.probeFilter.num_data_array_writes 0 # number of data array writes +system.ruby.dir_cntrl0.probeFilter.num_tag_array_reads 0 # number of tag array reads +system.ruby.dir_cntrl0.probeFilter.num_tag_array_writes 0 # number of tag array writes +system.ruby.dir_cntrl0.probeFilter.num_tag_array_stalls 0 # number of stalls caused by tag array +system.ruby.dir_cntrl0.probeFilter.num_data_array_stalls 0 # number of stalls caused by data array ---------- End Simulation Statistics ---------- diff --git a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby/config.ini b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby/config.ini index 2634ecc5e..e897d9566 100644 --- a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby/config.ini +++ b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby/config.ini @@ -8,13 +8,14 @@ time_sync_spin_threshold=100000 [system] type=System -children=dir_cntrl0 l1_cntrl0 physmem ruby sys_port_proxy tester +children=physmem ruby sys_port_proxy tester boot_osflags=a clock=1 init_param=0 kernel= load_addr_mask=1099511627775 mem_mode=timing +mem_ranges= memories=system.physmem num_work_ids=16 readfile= @@ -28,29 +29,53 @@ work_end_exit_count=0 work_item_id=-1 system_port=system.sys_port_proxy.slave[0] -[system.dir_cntrl0] +[system.physmem] +type=SimpleMemory +bandwidth=0.000000 +clock=1 +conf_table_reported=false +in_addr_map=true +latency=30 +latency_var=0 +null=false +range=0:134217727 +zero=false + +[system.ruby] +type=RubySystem +children=dir_cntrl0 l1_cntrl0 network profiler +block_size_bytes=64 +clock=1 +mem_size=134217728 +no_mem_vec=false +random_seed=1234 +randomization=true +stats_filename=ruby.stats + +[system.ruby.dir_cntrl0] type=Directory_Controller children=directory memBuffer buffer_size=0 +clock=1 cntrl_id=1 -directory=system.dir_cntrl0.directory +directory=system.ruby.dir_cntrl0.directory directory_latency=12 -memBuffer=system.dir_cntrl0.memBuffer +memBuffer=system.ruby.dir_cntrl0.memBuffer number_of_TBEs=256 recycle_latency=10 ruby_system=system.ruby transitions_per_cycle=32 version=0 -[system.dir_cntrl0.directory] +[system.ruby.dir_cntrl0.directory] type=RubyDirectoryMemory map_levels=4 -numa_high_bit=6 +numa_high_bit=5 size=134217728 use_map=false version=0 -[system.dir_cntrl0.memBuffer] +[system.ruby.dir_cntrl0.memBuffer] type=RubyMemoryControl bank_bit_0=8 bank_busy_time=11 @@ -72,23 +97,24 @@ ruby_system=system.ruby tFaw=0 version=0 -[system.l1_cntrl0] +[system.ruby.l1_cntrl0] type=L1Cache_Controller children=cacheMemory sequencer buffer_size=0 -cacheMemory=system.l1_cntrl0.cacheMemory +cacheMemory=system.ruby.l1_cntrl0.cacheMemory cache_response_latency=12 +clock=1 cntrl_id=0 issue_latency=2 number_of_TBEs=256 recycle_latency=10 ruby_system=system.ruby send_evictions=false -sequencer=system.l1_cntrl0.sequencer +sequencer=system.ruby.l1_cntrl0.sequencer transitions_per_cycle=32 version=0 -[system.l1_cntrl0.cacheMemory] +[system.ruby.l1_cntrl0.cacheMemory] type=RubyCache assoc=2 dataAccessLatency=1 @@ -102,13 +128,13 @@ start_index_bit=6 tagAccessLatency=1 tagArrayBanks=1 -[system.l1_cntrl0.sequencer] +[system.ruby.l1_cntrl0.sequencer] type=RubySequencer access_phys_mem=false clock=1 -dcache=system.l1_cntrl0.cacheMemory +dcache=system.ruby.l1_cntrl0.cacheMemory deadlock_threshold=500000 -icache=system.l1_cntrl0.cacheMemory +icache=system.ruby.l1_cntrl0.cacheMemory max_outstanding_requests=16 ruby_system=system.ruby support_data_reqs=true @@ -119,34 +145,12 @@ using_ruby_tester=true version=0 slave=system.tester.cpuDataPort[0] system.tester.cpuInstPort[0] -[system.physmem] -type=SimpleMemory -bandwidth=0.000000 -clock=1 -conf_table_reported=false -in_addr_map=true -latency=30 -latency_var=0 -null=false -range=0:134217727 -zero=false - -[system.ruby] -type=RubySystem -children=network profiler -block_size_bytes=64 -clock=1 -mem_size=134217728 -no_mem_vec=false -random_seed=1234 -randomization=true -stats_filename=ruby.stats - [system.ruby.network] type=SimpleNetwork children=topology adaptive_routing=false buffer_size=0 +clock=1 control_msg_size=8 endpoint_bandwidth=1000 number_of_virtual_networks=10 @@ -166,7 +170,7 @@ routers=system.ruby.network.topology.ext_links0.int_node system.ruby.network.top type=SimpleExtLink children=int_node bandwidth_factor=16 -ext_node=system.l1_cntrl0 +ext_node=system.ruby.l1_cntrl0 int_node=system.ruby.network.topology.ext_links0.int_node latency=1 link_id=0 @@ -174,6 +178,7 @@ weight=1 [system.ruby.network.topology.ext_links0.int_node] type=Switch +clock=1 router_id=0 virt_nets=10 @@ -181,7 +186,7 @@ virt_nets=10 type=SimpleExtLink children=int_node bandwidth_factor=16 -ext_node=system.dir_cntrl0 +ext_node=system.ruby.dir_cntrl0 int_node=system.ruby.network.topology.ext_links1.int_node latency=1 link_id=1 @@ -189,6 +194,7 @@ weight=1 [system.ruby.network.topology.ext_links1.int_node] type=Switch +clock=1 router_id=1 virt_nets=10 @@ -204,6 +210,7 @@ weight=1 [system.ruby.network.topology.int_links0.node_b] type=Switch +clock=1 router_id=2 virt_nets=10 @@ -245,6 +252,6 @@ deadlock_threshold=50000 num_cpus=1 system=system wakeup_frequency=10 -cpuDataPort=system.l1_cntrl0.sequencer.slave[0] -cpuInstPort=system.l1_cntrl0.sequencer.slave[1] +cpuDataPort=system.ruby.l1_cntrl0.sequencer.slave[0] +cpuInstPort=system.ruby.l1_cntrl0.sequencer.slave[1] diff --git a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby/ruby.stats b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby/ruby.stats index ec81e3ed4..959a2542d 100644 --- a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby/ruby.stats +++ b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby/ruby.stats @@ -1,4 +1,4 @@ -Real time: Sep/01/2012 13:48:35 +Real time: Jan/14/2013 08:13:02 Profiler Stats -------------- @@ -7,18 +7,18 @@ Elapsed_time_in_minutes: 0 Elapsed_time_in_hours: 0 Elapsed_time_in_days: 0 -Virtual_time_in_seconds: 0.41 -Virtual_time_in_minutes: 0.00683333 -Virtual_time_in_hours: 0.000113889 -Virtual_time_in_days: 4.74537e-06 +Virtual_time_in_seconds: 0.43 +Virtual_time_in_minutes: 0.00716667 +Virtual_time_in_hours: 0.000119444 +Virtual_time_in_days: 4.97685e-06 Ruby_current_time: 221941 Ruby_start_time: 0 Ruby_cycles: 221941 -mbytes_resident: 43.6133 -mbytes_total: 254.102 -resident_ratio: 0.171699 +mbytes_resident: 49.6133 +mbytes_total: 270.469 +resident_ratio: 0.183478 ruby_cycles_executed: [ 221942 ] @@ -85,7 +85,7 @@ Resource Usage page_size: 4096 user_time: 0 system_time: 0 -page_reclaims: 8164 +page_reclaims: 9333 page_faults: 0 swaps: 0 block_inputs: 0 @@ -133,18 +133,18 @@ links_utilized_percent_switch_2: 2.06125 outgoing_messages_switch_2_link_1_Control: 916 7328 [ 0 0 916 0 0 0 0 0 0 0 ] base_latency: 1 outgoing_messages_switch_2_link_1_Data: 914 65808 [ 0 0 914 0 0 0 0 0 0 0 ] base_latency: 1 -Cache Stats: system.l1_cntrl0.cacheMemory - system.l1_cntrl0.cacheMemory_total_misses: 917 - system.l1_cntrl0.cacheMemory_total_demand_misses: 917 - system.l1_cntrl0.cacheMemory_total_prefetches: 0 - system.l1_cntrl0.cacheMemory_total_sw_prefetches: 0 - system.l1_cntrl0.cacheMemory_total_hw_prefetches: 0 +Cache Stats: system.ruby.l1_cntrl0.cacheMemory + system.ruby.l1_cntrl0.cacheMemory_total_misses: 917 + system.ruby.l1_cntrl0.cacheMemory_total_demand_misses: 917 + system.ruby.l1_cntrl0.cacheMemory_total_prefetches: 0 + system.ruby.l1_cntrl0.cacheMemory_total_sw_prefetches: 0 + system.ruby.l1_cntrl0.cacheMemory_total_hw_prefetches: 0 - system.l1_cntrl0.cacheMemory_request_type_LD: 4.58015% - system.l1_cntrl0.cacheMemory_request_type_ST: 89.313% - system.l1_cntrl0.cacheMemory_request_type_IFETCH: 6.10687% + system.ruby.l1_cntrl0.cacheMemory_request_type_LD: 4.58015% + system.ruby.l1_cntrl0.cacheMemory_request_type_ST: 89.313% + system.ruby.l1_cntrl0.cacheMemory_request_type_IFETCH: 6.10687% - system.l1_cntrl0.cacheMemory_access_mode_type_Supervisor: 917 100% + system.ruby.l1_cntrl0.cacheMemory_access_mode_type_Supervisor: 917 100% --- L1Cache --- - Event Counts - @@ -185,7 +185,7 @@ IS Data [98 ] 98 IM Data [818 ] 818 -Memory controller: system.dir_cntrl0.memBuffer: +Memory controller: system.ruby.dir_cntrl0.memBuffer: memory_total_requests: 1830 memory_reads: 916 memory_writes: 914 diff --git a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby/stats.txt b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby/stats.txt index 1afc580a0..12a80b158 100644 --- a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby/stats.txt +++ b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby/stats.txt @@ -4,14 +4,14 @@ sim_seconds 0.000222 # Nu sim_ticks 221941 # Number of ticks simulated final_tick 221941 # Number of ticks from beginning of simulation (restored from checkpoints and never reset) sim_freq 1000000000 # Frequency of simulated ticks -host_tick_rate 2057251 # Simulator tick rate (ticks/s) -host_mem_usage 260204 # Number of bytes of host memory used -host_seconds 0.11 # Real time elapsed on the host -system.l1_cntrl0.cacheMemory.num_data_array_reads 0 # number of data array reads -system.l1_cntrl0.cacheMemory.num_data_array_writes 0 # number of data array writes -system.l1_cntrl0.cacheMemory.num_tag_array_reads 0 # number of tag array reads -system.l1_cntrl0.cacheMemory.num_tag_array_writes 0 # number of tag array writes -system.l1_cntrl0.cacheMemory.num_tag_array_stalls 0 # number of stalls caused by tag array -system.l1_cntrl0.cacheMemory.num_data_array_stalls 0 # number of stalls caused by data array +host_tick_rate 2209832 # Simulator tick rate (ticks/s) +host_mem_usage 276964 # Number of bytes of host memory used +host_seconds 0.10 # Real time elapsed on the host +system.ruby.l1_cntrl0.cacheMemory.num_data_array_reads 0 # number of data array reads +system.ruby.l1_cntrl0.cacheMemory.num_data_array_writes 0 # number of data array writes +system.ruby.l1_cntrl0.cacheMemory.num_tag_array_reads 0 # number of tag array reads +system.ruby.l1_cntrl0.cacheMemory.num_tag_array_writes 0 # number of tag array writes +system.ruby.l1_cntrl0.cacheMemory.num_tag_array_stalls 0 # number of stalls caused by tag array +system.ruby.l1_cntrl0.cacheMemory.num_data_array_stalls 0 # number of stalls caused by data array ---------- End Simulation Statistics ---------- |