regressions: update stats due to changes in ruby obj hierarchy

diff --git a/tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_CMP_directory/config.ini b/tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_CMP_directory/config.ini
index 0ce5d3fc81756f4a1e3e218c2cce316d8e700ebd..e06ccfe9d0d9dcd69e0bbff0ffcc981820a7b24c 100644 (file)
--- a/tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_CMP_directory/config.ini
+++ b/tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_CMP_directory/config.ini
@@ -8,7 +8,7 @@ time_sync_spin_threshold=100000000
 
 [system]
 type=LinuxX86System
-children=acpi_description_table_pointer cpu0 cpu1 dir_cntrl0 dma_cntrl0 e820_table intel_mp_pointer intel_mp_table intrctrl l1_cntrl0 l1_cntrl1 l2_cntrl0 pc physmem piobus ruby smbios_table sys_port_proxy
+children=acpi_description_table_pointer cpu0 cpu1 e820_table intel_mp_pointer intel_mp_table intrctrl pc physmem piobus ruby smbios_table sys_port_proxy
 acpi_description_table_pointer=system.acpi_description_table_pointer
 boot_osflags=earlyprintk=ttyS0 console=ttyS0 lpj=7999923 root=/dev/hda1
 clock=1000
@@ -19,6 +19,7 @@ intel_mp_table=system.intel_mp_table
 kernel=/scratch/nilay/GEM5/system/binaries/x86_64-vmlinux-2.6.22.9.smp
 load_addr_mask=18446744073709551615
 mem_mode=timing
+mem_ranges=0:134217727
 memories=system.physmem
 num_work_ids=16
 readfile=tests/halt.sh
@@ -52,11 +53,10 @@ oem_table_id=
 
 [system.cpu0]
 type=TimingSimpleCPU
-children=dtb interrupts itb tracer
+children=dtb interrupts isa itb tracer
 checker=Null
 clock=500
 cpu_id=0
-defer_registration=false
 do_checkpoint_insts=true
 do_quiesce=true
 do_statistics_insts=true
@@ -64,6 +64,7 @@ dtb=system.cpu0.dtb
 function_trace=false
 function_trace_start=0
 interrupts=system.cpu0.interrupts
+isa=system.cpu0.isa
 itb=system.cpu0.itb
 max_insts_all_threads=0
 max_insts_any_thread=0
@@ -72,11 +73,12 @@ max_loads_any_thread=0
 numThreads=1
 profile=0
 progress_interval=0
+switched_out=false
 system=system
 tracer=system.cpu0.tracer
 workload=
-dcache_port=system.l1_cntrl0.sequencer.slave[1]
-icache_port=system.l1_cntrl0.sequencer.slave[0]
+dcache_port=system.ruby.l1_cntrl0.sequencer.slave[1]
+icache_port=system.ruby.l1_cntrl0.sequencer.slave[0]
 
 [system.cpu0.dtb]
 type=X86TLB
@@ -88,7 +90,7 @@ walker=system.cpu0.dtb.walker
 type=X86PagetableWalker
 clock=500
 system=system
-port=system.l1_cntrl0.sequencer.slave[3]
+port=system.ruby.l1_cntrl0.sequencer.slave[3]
 
 [system.cpu0.interrupts]
 type=X86LocalApic
@@ -101,6 +103,9 @@ int_master=system.piobus.slave[4]
 int_slave=system.piobus.master[19]
 pio=system.piobus.master[18]
 
+[system.cpu0.isa]
+type=X86ISA
+
 [system.cpu0.itb]
 type=X86TLB
 children=walker
@@ -111,18 +116,17 @@ walker=system.cpu0.itb.walker
 type=X86PagetableWalker
 clock=500
 system=system
-port=system.l1_cntrl0.sequencer.slave[2]
+port=system.ruby.l1_cntrl0.sequencer.slave[2]
 
 [system.cpu0.tracer]
 type=ExeTracer
 
 [system.cpu1]
 type=TimingSimpleCPU
-children=dtb interrupts itb tracer
+children=dtb interrupts isa itb tracer
 checker=Null
 clock=500
 cpu_id=1
-defer_registration=false
 do_checkpoint_insts=true
 do_quiesce=true
 do_statistics_insts=true
@@ -130,6 +134,7 @@ dtb=system.cpu1.dtb
 function_trace=false
 function_trace_start=0
 interrupts=system.cpu1.interrupts
+isa=system.cpu1.isa
 itb=system.cpu1.itb
 max_insts_all_threads=0
 max_insts_any_thread=0
@@ -138,11 +143,12 @@ max_loads_any_thread=0
 numThreads=1
 profile=0
 progress_interval=0
+switched_out=false
 system=system
 tracer=system.cpu1.tracer
 workload=
-dcache_port=system.l1_cntrl1.sequencer.slave[1]
-icache_port=system.l1_cntrl1.sequencer.slave[0]
+dcache_port=system.ruby.l1_cntrl1.sequencer.slave[1]
+icache_port=system.ruby.l1_cntrl1.sequencer.slave[0]
 
 [system.cpu1.dtb]
 type=X86TLB
@@ -154,7 +160,7 @@ walker=system.cpu1.dtb.walker
 type=X86PagetableWalker
 clock=500
 system=system
-port=system.l1_cntrl1.sequencer.slave[3]
+port=system.ruby.l1_cntrl1.sequencer.slave[3]
 
 [system.cpu1.interrupts]
 type=X86LocalApic
@@ -167,6 +173,9 @@ int_master=system.piobus.slave[5]
 int_slave=system.piobus.master[21]
 pio=system.piobus.master[20]
 
+[system.cpu1.isa]
+type=X86ISA
+
 [system.cpu1.itb]
 type=X86TLB
 children=walker
@@ -177,82 +186,11 @@ walker=system.cpu1.itb.walker
 type=X86PagetableWalker
 clock=500
 system=system
-port=system.l1_cntrl1.sequencer.slave[2]
+port=system.ruby.l1_cntrl1.sequencer.slave[2]
 
 [system.cpu1.tracer]
 type=ExeTracer
 
-[system.dir_cntrl0]
-type=Directory_Controller
-children=directory memBuffer
-buffer_size=0
-cntrl_id=3
-directory=system.dir_cntrl0.directory
-directory_latency=6
-memBuffer=system.dir_cntrl0.memBuffer
-number_of_TBEs=256
-recycle_latency=10
-ruby_system=system.ruby
-to_mem_ctrl_latency=1
-transitions_per_cycle=32
-version=0
-
-[system.dir_cntrl0.directory]
-type=RubyDirectoryMemory
-map_levels=4
-numa_high_bit=5
-size=134217728
-use_map=false
-version=0
-
-[system.dir_cntrl0.memBuffer]
-type=RubyMemoryControl
-bank_bit_0=8
-bank_busy_time=11
-bank_queue_size=12
-banks_per_rank=8
-basic_bus_busy_time=2
-clock=2500
-dimm_bit_0=12
-dimms_per_channel=2
-mem_ctl_latency=12
-mem_fixed_delay=0
-mem_random_arbitrate=0
-rank_bit_0=11
-rank_rank_delay=1
-ranks_per_dimm=2
-read_write_delay=2
-refresh_period=1560
-ruby_system=system.ruby
-tFaw=0
-version=0
-
-[system.dma_cntrl0]
-type=DMA_Controller
-children=dma_sequencer
-buffer_size=0
-cntrl_id=4
-dma_sequencer=system.dma_cntrl0.dma_sequencer
-number_of_TBEs=256
-recycle_latency=10
-request_latency=6
-ruby_system=system.ruby
-transitions_per_cycle=32
-version=0
-
-[system.dma_cntrl0.dma_sequencer]
-type=DMASequencer
-access_phys_mem=true
-clock=1000
-ruby_system=system.ruby
-support_data_reqs=true
-support_inst_reqs=true
-system=system
-using_network_tester=false
-using_ruby_tester=false
-version=0
-slave=system.pc.south_bridge.ide.dma
-
 [system.e820_table]
 type=X86E820Table
 children=entries0 entries1
@@ -627,189 +565,6 @@ subtractive_decode=true
 type=IntrControl
 sys=system
 
-[system.l1_cntrl0]
-type=L1Cache_Controller
-children=L1DcacheMemory L1IcacheMemory prefetcher sequencer
-L1DcacheMemory=system.l1_cntrl0.L1DcacheMemory
-L1IcacheMemory=system.l1_cntrl0.L1IcacheMemory
-buffer_size=0
-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
-recycle_latency=10
-ruby_system=system.ruby
-send_evictions=false
-sequencer=system.l1_cntrl0.sequencer
-to_l2_latency=1
-transitions_per_cycle=32
-version=0
-
-[system.l1_cntrl0.L1DcacheMemory]
-type=RubyCache
-assoc=2
-dataAccessLatency=1
-dataArrayBanks=1
-is_icache=false
-latency=3
-replacement_policy=PSEUDO_LRU
-resourceStalls=false
-size=32768
-start_index_bit=6
-tagAccessLatency=1
-tagArrayBanks=1
-
-[system.l1_cntrl0.L1IcacheMemory]
-type=RubyCache
-assoc=2
-dataAccessLatency=1
-dataArrayBanks=1
-is_icache=true
-latency=3
-replacement_policy=PSEUDO_LRU
-resourceStalls=false
-size=32768
-start_index_bit=6
-tagAccessLatency=1
-tagArrayBanks=1
-
-[system.l1_cntrl0.prefetcher]
-type=Prefetcher
-cross_page=false
-nonunit_filter=8
-num_startup_pfs=1
-num_streams=4
-pf_per_stream=1
-train_misses=4
-unit_filter=8
-
-[system.l1_cntrl0.sequencer]
-type=RubySequencer
-access_phys_mem=true
-clock=1000
-dcache=system.l1_cntrl0.L1DcacheMemory
-deadlock_threshold=500000
-icache=system.l1_cntrl0.L1IcacheMemory
-max_outstanding_requests=16
-ruby_system=system.ruby
-support_data_reqs=true
-support_inst_reqs=true
-system=system
-using_network_tester=false
-using_ruby_tester=false
-version=0
-pio_port=system.piobus.slave[2]
-slave=system.cpu0.icache_port system.cpu0.dcache_port system.cpu0.itb.walker.port system.cpu0.dtb.walker.port
-
-[system.l1_cntrl1]
-type=L1Cache_Controller
-children=L1DcacheMemory L1IcacheMemory prefetcher sequencer
-L1DcacheMemory=system.l1_cntrl1.L1DcacheMemory
-L1IcacheMemory=system.l1_cntrl1.L1IcacheMemory
-buffer_size=0
-cntrl_id=1
-enable_prefetch=false
-l1_request_latency=2
-l1_response_latency=2
-l2_select_num_bits=0
-number_of_TBEs=256
-prefetcher=system.l1_cntrl1.prefetcher
-recycle_latency=10
-ruby_system=system.ruby
-send_evictions=false
-sequencer=system.l1_cntrl1.sequencer
-to_l2_latency=1
-transitions_per_cycle=32
-version=1
-
-[system.l1_cntrl1.L1DcacheMemory]
-type=RubyCache
-assoc=2
-dataAccessLatency=1
-dataArrayBanks=1
-is_icache=false
-latency=3
-replacement_policy=PSEUDO_LRU
-resourceStalls=false
-size=32768
-start_index_bit=6
-tagAccessLatency=1
-tagArrayBanks=1
-
-[system.l1_cntrl1.L1IcacheMemory]
-type=RubyCache
-assoc=2
-dataAccessLatency=1
-dataArrayBanks=1
-is_icache=true
-latency=3
-replacement_policy=PSEUDO_LRU
-resourceStalls=false
-size=32768
-start_index_bit=6
-tagAccessLatency=1
-tagArrayBanks=1
-
-[system.l1_cntrl1.prefetcher]
-type=Prefetcher
-cross_page=false
-nonunit_filter=8
-num_startup_pfs=1
-num_streams=4
-pf_per_stream=1
-train_misses=4
-unit_filter=8
-
-[system.l1_cntrl1.sequencer]
-type=RubySequencer
-access_phys_mem=true
-clock=1000
-dcache=system.l1_cntrl1.L1DcacheMemory
-deadlock_threshold=500000
-icache=system.l1_cntrl1.L1IcacheMemory
-max_outstanding_requests=16
-ruby_system=system.ruby
-support_data_reqs=true
-support_inst_reqs=true
-system=system
-using_network_tester=false
-using_ruby_tester=false
-version=1
-pio_port=system.piobus.slave[3]
-slave=system.cpu1.icache_port system.cpu1.dcache_port system.cpu1.itb.walker.port system.cpu1.dtb.walker.port
-
-[system.l2_cntrl0]
-type=L2Cache_Controller
-children=L2cacheMemory
-L2cacheMemory=system.l2_cntrl0.L2cacheMemory
-buffer_size=0
-cntrl_id=2
-l2_request_latency=2
-l2_response_latency=2
-number_of_TBEs=256
-recycle_latency=10
-ruby_system=system.ruby
-to_l1_latency=1
-transitions_per_cycle=32
-version=0
-
-[system.l2_cntrl0.L2cacheMemory]
-type=RubyCache
-assoc=2
-dataAccessLatency=1
-dataArrayBanks=1
-is_icache=false
-latency=15
-replacement_policy=PSEUDO_LRU
-resourceStalls=false
-size=4194304
-start_index_bit=6
-tagAccessLatency=1
-tagArrayBanks=1
-
 [system.pc]
 type=Pc
 children=behind_pci com_1 fake_com_2 fake_com_3 fake_com_4 fake_floppy i_dont_exist pciconfig south_bridge terminal
@@ -1279,11 +1034,11 @@ use_default_range=true
 width=8
 default=system.pc.pciconfig.pio
 master=system.physmem.port system.pc.south_bridge.cmos.pio system.pc.south_bridge.dma1.pio system.pc.south_bridge.ide.pio system.pc.south_bridge.ide.config system.pc.south_bridge.keyboard.pio system.pc.south_bridge.pic1.pio system.pc.south_bridge.pic2.pio system.pc.south_bridge.pit.pio system.pc.south_bridge.speaker.pio system.pc.south_bridge.io_apic.pio system.pc.i_dont_exist.pio system.pc.behind_pci.pio system.pc.com_1.pio system.pc.fake_com_2.pio system.pc.fake_com_3.pio system.pc.fake_com_4.pio system.pc.fake_floppy.pio system.cpu0.interrupts.pio system.cpu0.interrupts.int_slave system.cpu1.interrupts.pio system.cpu1.interrupts.int_slave
-slave=system.pc.south_bridge.ide.dma system.pc.south_bridge.io_apic.int_master system.l1_cntrl0.sequencer.pio_port system.l1_cntrl1.sequencer.pio_port system.cpu0.interrupts.int_master system.cpu1.interrupts.int_master
+slave=system.pc.south_bridge.ide.dma system.pc.south_bridge.io_apic.int_master system.ruby.l1_cntrl0.sequencer.pio_port system.ruby.l1_cntrl1.sequencer.pio_port system.cpu0.interrupts.int_master system.cpu1.interrupts.int_master
 
 [system.ruby]
 type=RubySystem
-children=network profiler
+children=dir_cntrl0 dma_cntrl0 l1_cntrl0 l1_cntrl1 l2_cntrl0 network profiler
 block_size_bytes=64
 clock=500
 mem_size=134217728
@@ -1292,11 +1047,271 @@ random_seed=1234
 randomization=false
 stats_filename=ruby.stats
 
+[system.ruby.dir_cntrl0]
+type=Directory_Controller
+children=directory memBuffer
+buffer_size=0
+clock=500
+cntrl_id=3
+directory=system.ruby.dir_cntrl0.directory
+directory_latency=6
+memBuffer=system.ruby.dir_cntrl0.memBuffer
+number_of_TBEs=256
+recycle_latency=10
+ruby_system=system.ruby
+to_mem_ctrl_latency=1
+transitions_per_cycle=32
+version=0
+
+[system.ruby.dir_cntrl0.directory]
+type=RubyDirectoryMemory
+map_levels=4
+numa_high_bit=5
+size=134217728
+use_map=false
+version=0
+
+[system.ruby.dir_cntrl0.memBuffer]
+type=RubyMemoryControl
+bank_bit_0=8
+bank_busy_time=11
+bank_queue_size=12
+banks_per_rank=8
+basic_bus_busy_time=2
+clock=2500
+dimm_bit_0=12
+dimms_per_channel=2
+mem_ctl_latency=12
+mem_fixed_delay=0
+mem_random_arbitrate=0
+rank_bit_0=11
+rank_rank_delay=1
+ranks_per_dimm=2
+read_write_delay=2
+refresh_period=1560
+ruby_system=system.ruby
+tFaw=0
+version=0
+
+[system.ruby.dma_cntrl0]
+type=DMA_Controller
+children=dma_sequencer
+buffer_size=0
+clock=500
+cntrl_id=4
+dma_sequencer=system.ruby.dma_cntrl0.dma_sequencer
+number_of_TBEs=256
+recycle_latency=10
+request_latency=6
+ruby_system=system.ruby
+transitions_per_cycle=32
+version=0
+
+[system.ruby.dma_cntrl0.dma_sequencer]
+type=DMASequencer
+access_phys_mem=true
+clock=500
+ruby_system=system.ruby
+support_data_reqs=true
+support_inst_reqs=true
+system=system
+using_network_tester=false
+using_ruby_tester=false
+version=0
+slave=system.pc.south_bridge.ide.dma
+
+[system.ruby.l1_cntrl0]
+type=L1Cache_Controller
+children=L1DcacheMemory L1IcacheMemory prefetcher sequencer
+L1DcacheMemory=system.ruby.l1_cntrl0.L1DcacheMemory
+L1IcacheMemory=system.ruby.l1_cntrl0.L1IcacheMemory
+buffer_size=0
+clock=500
+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.ruby.l1_cntrl0.prefetcher
+recycle_latency=10
+ruby_system=system.ruby
+send_evictions=false
+sequencer=system.ruby.l1_cntrl0.sequencer
+to_l2_latency=1
+transitions_per_cycle=32
+version=0
+
+[system.ruby.l1_cntrl0.L1DcacheMemory]
+type=RubyCache
+assoc=2
+dataAccessLatency=1
+dataArrayBanks=1
+is_icache=false
+latency=3
+replacement_policy=PSEUDO_LRU
+resourceStalls=false
+size=32768
+start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
+
+[system.ruby.l1_cntrl0.L1IcacheMemory]
+type=RubyCache
+assoc=2
+dataAccessLatency=1
+dataArrayBanks=1
+is_icache=true
+latency=3
+replacement_policy=PSEUDO_LRU
+resourceStalls=false
+size=32768
+start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
+
+[system.ruby.l1_cntrl0.prefetcher]
+type=Prefetcher
+cross_page=false
+nonunit_filter=8
+num_startup_pfs=1
+num_streams=4
+pf_per_stream=1
+train_misses=4
+unit_filter=8
+
+[system.ruby.l1_cntrl0.sequencer]
+type=RubySequencer
+access_phys_mem=true
+clock=500
+dcache=system.ruby.l1_cntrl0.L1DcacheMemory
+deadlock_threshold=500000
+icache=system.ruby.l1_cntrl0.L1IcacheMemory
+max_outstanding_requests=16
+ruby_system=system.ruby
+support_data_reqs=true
+support_inst_reqs=true
+system=system
+using_network_tester=false
+using_ruby_tester=false
+version=0
+pio_port=system.piobus.slave[2]
+slave=system.cpu0.icache_port system.cpu0.dcache_port system.cpu0.itb.walker.port system.cpu0.dtb.walker.port
+
+[system.ruby.l1_cntrl1]
+type=L1Cache_Controller
+children=L1DcacheMemory L1IcacheMemory prefetcher sequencer
+L1DcacheMemory=system.ruby.l1_cntrl1.L1DcacheMemory
+L1IcacheMemory=system.ruby.l1_cntrl1.L1IcacheMemory
+buffer_size=0
+clock=500
+cntrl_id=1
+enable_prefetch=false
+l1_request_latency=2
+l1_response_latency=2
+l2_select_num_bits=0
+number_of_TBEs=256
+prefetcher=system.ruby.l1_cntrl1.prefetcher
+recycle_latency=10
+ruby_system=system.ruby
+send_evictions=false
+sequencer=system.ruby.l1_cntrl1.sequencer
+to_l2_latency=1
+transitions_per_cycle=32
+version=1
+
+[system.ruby.l1_cntrl1.L1DcacheMemory]
+type=RubyCache
+assoc=2
+dataAccessLatency=1
+dataArrayBanks=1
+is_icache=false
+latency=3
+replacement_policy=PSEUDO_LRU
+resourceStalls=false
+size=32768
+start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
+
+[system.ruby.l1_cntrl1.L1IcacheMemory]
+type=RubyCache
+assoc=2
+dataAccessLatency=1
+dataArrayBanks=1
+is_icache=true
+latency=3
+replacement_policy=PSEUDO_LRU
+resourceStalls=false
+size=32768
+start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
+
+[system.ruby.l1_cntrl1.prefetcher]
+type=Prefetcher
+cross_page=false
+nonunit_filter=8
+num_startup_pfs=1
+num_streams=4
+pf_per_stream=1
+train_misses=4
+unit_filter=8
+
+[system.ruby.l1_cntrl1.sequencer]
+type=RubySequencer
+access_phys_mem=true
+clock=500
+dcache=system.ruby.l1_cntrl1.L1DcacheMemory
+deadlock_threshold=500000
+icache=system.ruby.l1_cntrl1.L1IcacheMemory
+max_outstanding_requests=16
+ruby_system=system.ruby
+support_data_reqs=true
+support_inst_reqs=true
+system=system
+using_network_tester=false
+using_ruby_tester=false
+version=1
+pio_port=system.piobus.slave[3]
+slave=system.cpu1.icache_port system.cpu1.dcache_port system.cpu1.itb.walker.port system.cpu1.dtb.walker.port
+
+[system.ruby.l2_cntrl0]
+type=L2Cache_Controller
+children=L2cacheMemory
+L2cacheMemory=system.ruby.l2_cntrl0.L2cacheMemory
+buffer_size=0
+clock=500
+cntrl_id=2
+l2_request_latency=2
+l2_response_latency=2
+number_of_TBEs=256
+recycle_latency=10
+ruby_system=system.ruby
+to_l1_latency=1
+transitions_per_cycle=32
+version=0
+
+[system.ruby.l2_cntrl0.L2cacheMemory]
+type=RubyCache
+assoc=2
+dataAccessLatency=1
+dataArrayBanks=1
+is_icache=false
+latency=15
+replacement_policy=PSEUDO_LRU
+resourceStalls=false
+size=4194304
+start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
+
 [system.ruby.network]
 type=SimpleNetwork
 children=topology
 adaptive_routing=false
 buffer_size=0
+clock=500
 control_msg_size=8
 endpoint_bandwidth=1000
 number_of_virtual_networks=10
@@ -1316,7 +1331,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
@@ -1324,6 +1339,7 @@ weight=1
 
 [system.ruby.network.topology.ext_links0.int_node]
 type=Switch
+clock=500
 router_id=0
 virt_nets=10
 
@@ -1331,7 +1347,7 @@ virt_nets=10
 type=SimpleExtLink
 children=int_node
 bandwidth_factor=16
-ext_node=system.l1_cntrl1
+ext_node=system.ruby.l1_cntrl1
 int_node=system.ruby.network.topology.ext_links1.int_node
 latency=1
 link_id=1
@@ -1339,6 +1355,7 @@ weight=1
 
 [system.ruby.network.topology.ext_links1.int_node]
 type=Switch
+clock=500
 router_id=1
 virt_nets=10
 
@@ -1346,7 +1363,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_links2.int_node
 latency=1
 link_id=2
@@ -1354,6 +1371,7 @@ weight=1
 
 [system.ruby.network.topology.ext_links2.int_node]
 type=Switch
+clock=500
 router_id=2
 virt_nets=10
 
@@ -1361,7 +1379,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_links3.int_node
 latency=1
 link_id=3
@@ -1369,6 +1387,7 @@ weight=1
 
 [system.ruby.network.topology.ext_links3.int_node]
 type=Switch
+clock=500
 router_id=3
 virt_nets=10
 
@@ -1376,7 +1395,7 @@ virt_nets=10
 type=SimpleExtLink
 children=int_node
 bandwidth_factor=16
-ext_node=system.dma_cntrl0
+ext_node=system.ruby.dma_cntrl0
 int_node=system.ruby.network.topology.ext_links4.int_node
 latency=1
 link_id=4
@@ -1384,6 +1403,7 @@ weight=1
 
 [system.ruby.network.topology.ext_links4.int_node]
 type=Switch
+clock=500
 router_id=4
 virt_nets=10
 
@@ -1399,6 +1419,7 @@ weight=1
 
 [system.ruby.network.topology.int_links0.node_b]
 type=Switch
+clock=500
 router_id=5
 virt_nets=10
 

diff --git a/tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_CMP_directory/ruby.stats b/tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_CMP_directory/ruby.stats
index 4cac199f9a832f692528335e80a19a0d60066d03..067b3523c4217d8e3cdf18e337be03e47b8a499f 100644 (file)
--- a/tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_CMP_directory/ruby.stats
+++ b/tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_CMP_directory/ruby.stats
@@ -1,24 +1,24 @@
-Real time: Dec/11/2012 06:57:21
+Real time: Jan/14/2013 10:13:32
 
 Profiler Stats
 --------------
-Elapsed_time_in_seconds: 720
-Elapsed_time_in_minutes: 12
-Elapsed_time_in_hours: 0.2
-Elapsed_time_in_days: 0.00833333
+Elapsed_time_in_seconds: 413
+Elapsed_time_in_minutes: 6.88333
+Elapsed_time_in_hours: 0.114722
+Elapsed_time_in_days: 0.00478009
 
-Virtual_time_in_seconds: 718.24
-Virtual_time_in_minutes: 11.9707
-Virtual_time_in_hours:   0.199511
-Virtual_time_in_days:    0.00831296
+Virtual_time_in_seconds: 413.38
+Virtual_time_in_minutes: 6.88967
+Virtual_time_in_hours:   0.114828
+Virtual_time_in_days:    0.00478449
 
 Ruby_current_time: 10410012988
 Ruby_start_time: 0
 Ruby_cycles: 10410012988
 
-mbytes_resident: 260.055
-mbytes_total: 495.168
-resident_ratio: 0.525201
+mbytes_resident: 588.977
+mbytes_total: 828.605
+resident_ratio: 0.710814
 
 ruby_cycles_executed: [ 10410012989 10410012989 ]
 
@@ -87,13 +87,13 @@ Total_nonPF_delay_cycles: [binsize: 1 max: 9 count: 4899179 average: 0.0429682 |
 Resource Usage
 --------------
 page_size: 4096
-user_time: 718
+user_time: 413
 system_time: 0
-page_reclaims: 57537
-page_faults: 25
+page_reclaims: 142263
+page_faults: 0
 swaps: 0
-block_inputs: 16336
-block_outputs: 512
+block_inputs: 16
+block_outputs: 504
 
 Network Stats
 -------------
@@ -195,28 +195,28 @@ links_utilized_percent_switch_5: 0.0460715
   outgoing_messages_switch_5_link_3_Response_Data: 94890 6832080 [ 0 94890 0 0 0 0 0 0 0 0 ] base_latency: 1
   outgoing_messages_switch_5_link_3_Response_Control: 12815 102520 [ 0 12815 0 0 0 0 0 0 0 0 ] base_latency: 1
 
-Cache Stats: system.l1_cntrl0.L1IcacheMemory
-  system.l1_cntrl0.L1IcacheMemory_total_misses: 500458
-  system.l1_cntrl0.L1IcacheMemory_total_demand_misses: 500458
-  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: 500458
+  system.ruby.l1_cntrl0.L1IcacheMemory_total_demand_misses: 500458
+  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:   500458    100%
+  system.ruby.l1_cntrl0.L1IcacheMemory_access_mode_type_Supervisor:   500458    100%
 
-Cache Stats: system.l1_cntrl0.L1DcacheMemory
-  system.l1_cntrl0.L1DcacheMemory_total_misses: 1625146
-  system.l1_cntrl0.L1DcacheMemory_total_demand_misses: 1625146
-  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: 1625146
+  system.ruby.l1_cntrl0.L1DcacheMemory_total_demand_misses: 1625146
+  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:   80.0217%
-  system.l1_cntrl0.L1DcacheMemory_request_type_ST:   19.9783%
+  system.ruby.l1_cntrl0.L1DcacheMemory_request_type_LD:   80.0217%
+  system.ruby.l1_cntrl0.L1DcacheMemory_request_type_ST:   19.9783%
 
-  system.l1_cntrl0.L1DcacheMemory_access_mode_type_Supervisor:   1625146    100%
+  system.ruby.l1_cntrl0.L1DcacheMemory_access_mode_type_Supervisor:   1625146    100%
 
  --- L1Cache ---
  - Event Counts -
@@ -390,42 +390,42 @@ PF_IS_I  Data_Exclusive [0 0 ] 0
 PF_IS_I  DataS_fromL1 [0 0 ] 0
 PF_IS_I  Data_all_Acks [0 0 ] 0
 
-Cache Stats: system.l1_cntrl1.L1IcacheMemory
-  system.l1_cntrl1.L1IcacheMemory_total_misses: 286580
-  system.l1_cntrl1.L1IcacheMemory_total_demand_misses: 286580
-  system.l1_cntrl1.L1IcacheMemory_total_prefetches: 0
-  system.l1_cntrl1.L1IcacheMemory_total_sw_prefetches: 0
-  system.l1_cntrl1.L1IcacheMemory_total_hw_prefetches: 0
+Cache Stats: system.ruby.l1_cntrl1.L1IcacheMemory
+  system.ruby.l1_cntrl1.L1IcacheMemory_total_misses: 286580
+  system.ruby.l1_cntrl1.L1IcacheMemory_total_demand_misses: 286580
+  system.ruby.l1_cntrl1.L1IcacheMemory_total_prefetches: 0
+  system.ruby.l1_cntrl1.L1IcacheMemory_total_sw_prefetches: 0
+  system.ruby.l1_cntrl1.L1IcacheMemory_total_hw_prefetches: 0
 
-  system.l1_cntrl1.L1IcacheMemory_request_type_IFETCH:   100%
+  system.ruby.l1_cntrl1.L1IcacheMemory_request_type_IFETCH:   100%
 
-  system.l1_cntrl1.L1IcacheMemory_access_mode_type_Supervisor:   286580    100%
+  system.ruby.l1_cntrl1.L1IcacheMemory_access_mode_type_Supervisor:   286580    100%
 
-Cache Stats: system.l1_cntrl1.L1DcacheMemory
-  system.l1_cntrl1.L1DcacheMemory_total_misses: 272543
-  system.l1_cntrl1.L1DcacheMemory_total_demand_misses: 272543
-  system.l1_cntrl1.L1DcacheMemory_total_prefetches: 0
-  system.l1_cntrl1.L1DcacheMemory_total_sw_prefetches: 0
-  system.l1_cntrl1.L1DcacheMemory_total_hw_prefetches: 0
+Cache Stats: system.ruby.l1_cntrl1.L1DcacheMemory
+  system.ruby.l1_cntrl1.L1DcacheMemory_total_misses: 272543
+  system.ruby.l1_cntrl1.L1DcacheMemory_total_demand_misses: 272543
+  system.ruby.l1_cntrl1.L1DcacheMemory_total_prefetches: 0
+  system.ruby.l1_cntrl1.L1DcacheMemory_total_sw_prefetches: 0
+  system.ruby.l1_cntrl1.L1DcacheMemory_total_hw_prefetches: 0
 
-  system.l1_cntrl1.L1DcacheMemory_request_type_LD:   47.7224%
-  system.l1_cntrl1.L1DcacheMemory_request_type_ST:   52.2776%
+  system.ruby.l1_cntrl1.L1DcacheMemory_request_type_LD:   47.7224%
+  system.ruby.l1_cntrl1.L1DcacheMemory_request_type_ST:   52.2776%
 
-  system.l1_cntrl1.L1DcacheMemory_access_mode_type_Supervisor:   272543    100%
+  system.ruby.l1_cntrl1.L1DcacheMemory_access_mode_type_Supervisor:   272543    100%
 
-Cache Stats: system.l2_cntrl0.L2cacheMemory
-  system.l2_cntrl0.L2cacheMemory_total_misses: 252639
-  system.l2_cntrl0.L2cacheMemory_total_demand_misses: 252639
-  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: 252639
+  system.ruby.l2_cntrl0.L2cacheMemory_total_demand_misses: 252639
+  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:   31.2133%
-  system.l2_cntrl0.L2cacheMemory_request_type_GET_INSTR:   6.11307%
-  system.l2_cntrl0.L2cacheMemory_request_type_GETX:   62.6732%
-  system.l2_cntrl0.L2cacheMemory_request_type_UPGRADE:   0.000395822%
+  system.ruby.l2_cntrl0.L2cacheMemory_request_type_GETS:   31.2133%
+  system.ruby.l2_cntrl0.L2cacheMemory_request_type_GET_INSTR:   6.11307%
+  system.ruby.l2_cntrl0.L2cacheMemory_request_type_GETX:   62.6732%
+  system.ruby.l2_cntrl0.L2cacheMemory_request_type_UPGRADE:   0.000395822%
 
-  system.l2_cntrl0.L2cacheMemory_access_mode_type_Supervisor:   252639    100%
+  system.ruby.l2_cntrl0.L2cacheMemory_access_mode_type_Supervisor:   252639    100%
 
  --- L2Cache ---
  - Event Counts -
@@ -637,7 +637,7 @@ MT_SB  L2_Replacement_clean [0 ] 0
 MT_SB  Unblock [47755 ] 47755
 MT_SB  MEM_Inv [0 ] 0
 
-Memory controller: system.dir_cntrl0.memBuffer:
+Memory controller: system.ruby.dir_cntrl0.memBuffer:
   memory_total_requests: 268120
   memory_reads: 173230
   memory_writes: 94890

diff --git a/tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_CMP_directory/stats.txt b/tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_CMP_directory/stats.txt
index 42a2727f001f92a02963ce1233705febfd651cfe..d9c6555b317ab909d3a1d883568f92cba24e91f7 100644 (file)
--- a/tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_CMP_directory/stats.txt
+++ b/tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_CMP_directory/stats.txt
@@ -4,11 +4,11 @@ sim_seconds                                  5.205006                       # Nu
 sim_ticks                                5205006494000                       # Number of ticks simulated
 final_tick                               5205006494000                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                 1000000000000                       # Frequency of simulated ticks
-host_inst_rate                                 150447                       # Simulator instruction rate (inst/s)
-host_op_rate                                   288677                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                             7238673236                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 507056                       # Number of bytes of host memory used
-host_seconds                                   719.06                       # Real time elapsed on the host
+host_inst_rate                                 261635                       # Simulator instruction rate (inst/s)
+host_op_rate                                   502023                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                            12588404140                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 848496                       # Number of bytes of host memory used
+host_seconds                                   413.48                       # Real time elapsed on the host
 sim_insts                                   108179755                       # Number of instructions simulated
 sim_ops                                     207574747                       # Number of ops (including micro ops) simulated
 system.physmem.bytes_read::pc.south_bridge.ide        35216                       # Number of bytes read from this memory
@@ -230,54 +230,6 @@ system.physmem.writeRowHits                     45891                       # Nu
 system.physmem.readRowHitRate                   84.96                       # Row buffer hit rate for reads
 system.physmem.writeRowHitRate                  98.19                       # Row buffer hit rate for writes
 system.physmem.avgGap                      1329213.65                       # Average gap between requests
-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.l1_cntrl1.L1DcacheMemory.num_data_array_reads            0                       # number of data array reads
-system.l1_cntrl1.L1DcacheMemory.num_data_array_writes            0                       # number of data array writes
-system.l1_cntrl1.L1DcacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.l1_cntrl1.L1DcacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.l1_cntrl1.L1DcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.l1_cntrl1.L1DcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-system.l1_cntrl1.L1IcacheMemory.num_data_array_reads            0                       # number of data array reads
-system.l1_cntrl1.L1IcacheMemory.num_data_array_writes            0                       # number of data array writes
-system.l1_cntrl1.L1IcacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.l1_cntrl1.L1IcacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.l1_cntrl1.L1IcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.l1_cntrl1.L1IcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-system.l1_cntrl1.prefetcher.miss_observed            0                       # number of misses observed
-system.l1_cntrl1.prefetcher.allocated_streams            0                       # number of streams allocated for prefetching
-system.l1_cntrl1.prefetcher.prefetches_requested            0                       # number of prefetch requests made
-system.l1_cntrl1.prefetcher.prefetches_accepted            0                       # number of prefetch requests accepted
-system.l1_cntrl1.prefetcher.dropped_prefetches            0                       # number of prefetch requests dropped
-system.l1_cntrl1.prefetcher.hits                    0                       # number of prefetched blocks accessed
-system.l1_cntrl1.prefetcher.partial_hits            0                       # number of misses observed for a block being prefetched
-system.l1_cntrl1.prefetcher.pages_crossed            0                       # number of prefetches across pages
-system.l1_cntrl1.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
 system.pc.south_bridge.ide.disks0.dma_read_full_pages            0                       # Number of full page size DMA reads (not PRD).
 system.pc.south_bridge.ide.disks0.dma_read_bytes        32768                       # Number of bytes transfered via DMA reads (not PRD).
 system.pc.south_bridge.ide.disks0.dma_read_txs           30                       # Number of DMA read transactions (not PRD).
@@ -290,6 +242,54 @@ system.pc.south_bridge.ide.disks1.dma_read_txs            0
 system.pc.south_bridge.ide.disks1.dma_write_full_pages            1                       # Number of full page size DMA writes.
 system.pc.south_bridge.ide.disks1.dma_write_bytes         4096                       # Number of bytes transfered via DMA writes.
 system.pc.south_bridge.ide.disks1.dma_write_txs            1                       # Number of DMA write transactions.
+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
+system.ruby.l1_cntrl1.L1DcacheMemory.num_data_array_reads            0                       # number of data array reads
+system.ruby.l1_cntrl1.L1DcacheMemory.num_data_array_writes            0                       # number of data array writes
+system.ruby.l1_cntrl1.L1DcacheMemory.num_tag_array_reads            0                       # number of tag array reads
+system.ruby.l1_cntrl1.L1DcacheMemory.num_tag_array_writes            0                       # number of tag array writes
+system.ruby.l1_cntrl1.L1DcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
+system.ruby.l1_cntrl1.L1DcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
+system.ruby.l1_cntrl1.L1IcacheMemory.num_data_array_reads            0                       # number of data array reads
+system.ruby.l1_cntrl1.L1IcacheMemory.num_data_array_writes            0                       # number of data array writes
+system.ruby.l1_cntrl1.L1IcacheMemory.num_tag_array_reads            0                       # number of tag array reads
+system.ruby.l1_cntrl1.L1IcacheMemory.num_tag_array_writes            0                       # number of tag array writes
+system.ruby.l1_cntrl1.L1IcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
+system.ruby.l1_cntrl1.L1IcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
+system.ruby.l1_cntrl1.prefetcher.miss_observed            0                       # number of misses observed
+system.ruby.l1_cntrl1.prefetcher.allocated_streams            0                       # number of streams allocated for prefetching
+system.ruby.l1_cntrl1.prefetcher.prefetches_requested            0                       # number of prefetch requests made
+system.ruby.l1_cntrl1.prefetcher.prefetches_accepted            0                       # number of prefetch requests accepted
+system.ruby.l1_cntrl1.prefetcher.dropped_prefetches            0                       # number of prefetch requests dropped
+system.ruby.l1_cntrl1.prefetcher.hits               0                       # number of prefetched blocks accessed
+system.ruby.l1_cntrl1.prefetcher.partial_hits            0                       # number of misses observed for a block being prefetched
+system.ruby.l1_cntrl1.prefetcher.pages_crossed            0                       # number of prefetches across pages
+system.ruby.l1_cntrl1.prefetcher.misses_on_prefetched_blocks            0                       # number of misses for blocks that were prefetched, yet missed
+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.cpu0.numCycles                     10410012988                       # number of cpu cycles simulated
 system.cpu0.numWorkItemsStarted                     0                       # number of work items this cpu started
 system.cpu0.numWorkItemsCompleted                   0                       # number of work items this cpu completed

diff --git a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_CMP_directory/config.ini b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_CMP_directory/config.ini
index d3529005ceb65fb470059d938999e9ef25810c4e..16b1abfc8132766cb3da623b9890b0c025bb3076 100644 (file)
--- a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_CMP_directory/config.ini
+++ b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_CMP_directory/config.ini
@@ -8,13 +8,14 @@ time_sync_spin_threshold=100000
 
 [system]
 type=System
-children=cpu dir_cntrl0 l1_cntrl0 l2_cntrl0 physmem ruby sys_port_proxy
+children=cpu physmem ruby sys_port_proxy
 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=
@@ -30,11 +31,10 @@ system_port=system.sys_port_proxy.slave[0]
 
 [system.cpu]
 type=TimingSimpleCPU
-children=dtb interrupts itb tracer workload
+children=dtb interrupts isa itb tracer workload
 checker=Null
 clock=1
 cpu_id=0
-defer_registration=false
 do_checkpoint_insts=true
 do_quiesce=true
 do_statistics_insts=true
@@ -42,6 +42,7 @@ dtb=system.cpu.dtb
 function_trace=false
 function_trace_start=0
 interrupts=system.cpu.interrupts
+isa=system.cpu.isa
 itb=system.cpu.itb
 max_insts_all_threads=0
 max_insts_any_thread=0
@@ -50,11 +51,12 @@ max_loads_any_thread=0
 numThreads=1
 profile=0
 progress_interval=0
+switched_out=false
 system=system
 tracer=system.cpu.tracer
 workload=system.cpu.workload
-dcache_port=system.l1_cntrl0.sequencer.slave[1]
-icache_port=system.l1_cntrl0.sequencer.slave[0]
+dcache_port=system.ruby.l1_cntrl0.sequencer.slave[1]
+icache_port=system.ruby.l1_cntrl0.sequencer.slave[0]
 
 [system.cpu.dtb]
 type=AlphaTLB
@@ -63,6 +65,9 @@ size=64
 [system.cpu.interrupts]
 type=AlphaInterrupts
 
+[system.cpu.isa]
+type=AlphaISA
+
 [system.cpu.itb]
 type=AlphaTLB
 size=48
@@ -89,14 +94,38 @@ simpoint=0
 system=system
 uid=100
 
-[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=false
+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
@@ -104,7 +133,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
@@ -112,7 +141,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
@@ -134,28 +163,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
@@ -169,7 +199,7 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.l1_cntrl0.L1IcacheMemory]
+[system.ruby.l1_cntrl0.L1IcacheMemory]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -183,7 +213,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
@@ -193,13 +223,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=true
 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
@@ -210,11 +240,12 @@ using_ruby_tester=false
 version=0
 slave=system.cpu.icache_port system.cpu.dcache_port
 
-[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
@@ -225,7 +256,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
@@ -239,34 +270,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=false
-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
@@ -286,7 +295,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
@@ -294,6 +303,7 @@ weight=1
 
 [system.ruby.network.topology.ext_links0.int_node]
 type=Switch
+clock=1
 router_id=0
 virt_nets=10
 
@@ -301,7 +311,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
@@ -309,6 +319,7 @@ weight=1
 
 [system.ruby.network.topology.ext_links1.int_node]
 type=Switch
+clock=1
 router_id=1
 virt_nets=10
 
@@ -316,7 +327,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
@@ -324,6 +335,7 @@ weight=1
 
 [system.ruby.network.topology.ext_links2.int_node]
 type=Switch
+clock=1
 router_id=2
 virt_nets=10
 
@@ -339,6 +351,7 @@ weight=1
 
 [system.ruby.network.topology.int_links0.node_b]
 type=Switch
+clock=1
 router_id=3
 virt_nets=10
 

diff --git a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_CMP_directory/ruby.stats b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_CMP_directory/ruby.stats
index 24e9d84c64e475bf7b0aead1efd89e1ac0edc1cc..b369159aa07e0da601ec8b5623e02ab70c2538c8 100644 (file)
--- a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_CMP_directory/ruby.stats
+++ b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_CMP_directory/ruby.stats
@@ -1,4 +1,4 @@
-Real time: Dec/11/2012 09:10:21
+Real time: Jan/14/2013 08:20:12
 
 Profiler Stats
 --------------
@@ -7,18 +7,18 @@ Elapsed_time_in_minutes: 0.0166667
 Elapsed_time_in_hours: 0.000277778
 Elapsed_time_in_days: 1.15741e-05
 
-Virtual_time_in_seconds: 0.61
-Virtual_time_in_minutes: 0.0101667
-Virtual_time_in_hours:   0.000169444
-Virtual_time_in_days:    7.06019e-06
+Virtual_time_in_seconds: 0.59
+Virtual_time_in_minutes: 0.00983333
+Virtual_time_in_hours:   0.000163889
+Virtual_time_in_days:    6.8287e-06
 
 Ruby_current_time: 138616
 Ruby_start_time: 0
 Ruby_cycles: 138616
 
-mbytes_resident: 56.7109
-mbytes_total: 269.371
-resident_ratio: 0.210574
+mbytes_resident: 55.8359
+mbytes_total: 275.438
+resident_ratio: 0.20276
 
 ruby_cycles_executed: [ 138617 ]
 
@@ -83,7 +83,7 @@ Resource Usage
 page_size: 4096
 user_time: 0
 system_time: 0
-page_reclaims: 11129
+page_reclaims: 11953
 page_faults: 0
 swaps: 0
 block_inputs: 0
@@ -161,28 +161,28 @@ links_utilized_percent_switch_3: 4.89085
   outgoing_messages_switch_3_link_2_Response_Data: 277 19944 [ 0 277 0 0 0 0 0 0 0 0 ] base_latency: 1
   outgoing_messages_switch_3_link_2_Response_Control: 1175 9400 [ 0 1175 0 0 0 0 0 0 0 0 ] base_latency: 1
 
-Cache Stats: system.l1_cntrl0.L1IcacheMemory
-  system.l1_cntrl0.L1IcacheMemory_total_misses: 691
-  system.l1_cntrl0.L1IcacheMemory_total_demand_misses: 691
-  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: 691
+  system.ruby.l1_cntrl0.L1IcacheMemory_total_demand_misses: 691
+  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:   691    100%
+  system.ruby.l1_cntrl0.L1IcacheMemory_access_mode_type_Supervisor:   691    100%
 
-Cache Stats: system.l1_cntrl0.L1DcacheMemory
-  system.l1_cntrl0.L1DcacheMemory_total_misses: 799
-  system.l1_cntrl0.L1DcacheMemory_total_demand_misses: 799
-  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: 799
+  system.ruby.l1_cntrl0.L1DcacheMemory_total_demand_misses: 799
+  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:   72.9662%
-  system.l1_cntrl0.L1DcacheMemory_request_type_ST:   27.0338%
+  system.ruby.l1_cntrl0.L1DcacheMemory_request_type_LD:   72.9662%
+  system.ruby.l1_cntrl0.L1DcacheMemory_request_type_ST:   27.0338%
 
-  system.l1_cntrl0.L1DcacheMemory_access_mode_type_Supervisor:   799    100%
+  system.ruby.l1_cntrl0.L1DcacheMemory_access_mode_type_Supervisor:   799    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: 1460
-  system.l2_cntrl0.L2cacheMemory_total_demand_misses: 1460
-  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: 1460
+  system.ruby.l2_cntrl0.L2cacheMemory_total_demand_misses: 1460
+  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:   39.0411%
-  system.l2_cntrl0.L2cacheMemory_request_type_GET_INSTR:   46.9863%
-  system.l2_cntrl0.L2cacheMemory_request_type_GETX:   13.9726%
+  system.ruby.l2_cntrl0.L2cacheMemory_request_type_GETS:   39.0411%
+  system.ruby.l2_cntrl0.L2cacheMemory_request_type_GET_INSTR:   46.9863%
+  system.ruby.l2_cntrl0.L2cacheMemory_request_type_GETX:   13.9726%
 
-  system.l2_cntrl0.L2cacheMemory_access_mode_type_Supervisor:   1460    100%
+  system.ruby.l2_cntrl0.L2cacheMemory_access_mode_type_Supervisor:   1460    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: 1737
   memory_reads: 1460
   memory_writes: 277

diff --git a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_CMP_directory/stats.txt b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_CMP_directory/stats.txt
index 3a0effc081f13a9077acc1286a27009be4a9b0b2..f4ccf60c784a10319e94bf72c3d09e98a5a1307e 100644 (file)
--- a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_CMP_directory/stats.txt
+++ b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_CMP_directory/stats.txt
@@ -4,11 +4,11 @@ sim_seconds                                  0.000139                       # Nu
 sim_ticks                                      138616                       # Number of ticks simulated
 final_tick                                     138616                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                   1000000000                       # Frequency of simulated ticks
-host_inst_rate                                  20296                       # Simulator instruction rate (inst/s)
-host_op_rate                                    20294                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                                 440211                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 275840                       # Number of bytes of host memory used
-host_seconds                                     0.32                       # Real time elapsed on the host
+host_inst_rate                                  24985                       # Simulator instruction rate (inst/s)
+host_op_rate                                    24983                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                                 541917                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 282052                       # Number of bytes of host memory used
+host_seconds                                     0.26                       # Real time elapsed on the host
 sim_insts                                        6390                       # Number of instructions simulated
 sim_ops                                          6390                       # Number of ops (including micro ops) simulated
 system.physmem.bytes_read::cpu.inst             25600                       # Number of bytes read from this memory
@@ -33,33 +33,33 @@ system.physmem.bw_write::total               48306112                       # Wr
 system.physmem.bw_total::cpu.inst           184682865                       # Total bandwidth to/from this memory (bytes/s)
 system.physmem.bw_total::cpu.data           111704277                       # Total bandwidth to/from this memory (bytes/s)
 system.physmem.bw_total::total              296387141                       # Total bandwidth to/from this memory (bytes/s)
-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
+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
 system.cpu.dtb.fetch_hits                           0                       # ITB hits
 system.cpu.dtb.fetch_misses                         0                       # ITB misses
 system.cpu.dtb.fetch_acv                            0                       # ITB acv

diff --git a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_directory/config.ini b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_directory/config.ini
index 6be2ae1960d5da7bf9daabc1b3736d076d2adbcb..a0df0ea5f9b1f4e4f88bc98f1635924af8a85d20 100644 (file)
--- a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_directory/config.ini
+++ b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_directory/config.ini
@@ -8,13 +8,14 @@ time_sync_spin_threshold=100000
 
 [system]
 type=System
-children=cpu dir_cntrl0 l1_cntrl0 l2_cntrl0 physmem ruby sys_port_proxy
+children=cpu physmem ruby sys_port_proxy
 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=
@@ -30,11 +31,10 @@ system_port=system.sys_port_proxy.slave[0]
 
 [system.cpu]
 type=TimingSimpleCPU
-children=dtb interrupts itb tracer workload
+children=dtb interrupts isa itb tracer workload
 checker=Null
 clock=1
 cpu_id=0
-defer_registration=false
 do_checkpoint_insts=true
 do_quiesce=true
 do_statistics_insts=true
@@ -42,6 +42,7 @@ dtb=system.cpu.dtb
 function_trace=false
 function_trace_start=0
 interrupts=system.cpu.interrupts
+isa=system.cpu.isa
 itb=system.cpu.itb
 max_insts_all_threads=0
 max_insts_any_thread=0
@@ -50,11 +51,12 @@ max_loads_any_thread=0
 numThreads=1
 profile=0
 progress_interval=0
+switched_out=false
 system=system
 tracer=system.cpu.tracer
 workload=system.cpu.workload
-dcache_port=system.l1_cntrl0.sequencer.slave[1]
-icache_port=system.l1_cntrl0.sequencer.slave[0]
+dcache_port=system.ruby.l1_cntrl0.sequencer.slave[1]
+icache_port=system.ruby.l1_cntrl0.sequencer.slave[0]
 
 [system.cpu.dtb]
 type=AlphaTLB
@@ -63,6 +65,9 @@ size=64
 [system.cpu.interrupts]
 type=AlphaInterrupts
 
+[system.cpu.isa]
+type=AlphaISA
+
 [system.cpu.itb]
 type=AlphaTLB
 size=48
@@ -89,29 +94,53 @@ simpoint=0
 system=system
 uid=100
 
-[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=false
+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
@@ -133,12 +162,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
@@ -146,11 +176,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
@@ -164,12 +194,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
@@ -178,13 +208,13 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.l1_cntrl0.sequencer]
+[system.ruby.l1_cntrl0.sequencer]
 type=RubySequencer
 access_phys_mem=true
 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
@@ -195,11 +225,12 @@ using_ruby_tester=false
 version=0
 slave=system.cpu.icache_port system.cpu.dcache_port
 
-[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
@@ -209,7 +240,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
@@ -223,34 +254,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=false
-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
@@ -270,7 +279,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
@@ -278,6 +287,7 @@ weight=1
 
 [system.ruby.network.topology.ext_links0.int_node]
 type=Switch
+clock=1
 router_id=0
 virt_nets=10
 
@@ -285,7 +295,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
@@ -293,6 +303,7 @@ weight=1
 
 [system.ruby.network.topology.ext_links1.int_node]
 type=Switch
+clock=1
 router_id=1
 virt_nets=10
 
@@ -300,7 +311,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
@@ -308,6 +319,7 @@ weight=1
 
 [system.ruby.network.topology.ext_links2.int_node]
 type=Switch
+clock=1
 router_id=2
 virt_nets=10
 
@@ -323,6 +335,7 @@ weight=1
 
 [system.ruby.network.topology.int_links0.node_b]
 type=Switch
+clock=1
 router_id=3
 virt_nets=10
 

diff --git a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_directory/ruby.stats b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_directory/ruby.stats
index 1e3f433da4f7737c78451ed16f05aadbaec675ae..b82041ded0e7ac6b870cf8ec75043e90ad26c1de 100644 (file)
--- a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_directory/ruby.stats
+++ b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_directory/ruby.stats
@@ -1,4 +1,4 @@
-Real time: Sep/01/2012 14:11:17
+Real time: Jan/14/2013 08:23:28
 
 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.58
-Virtual_time_in_minutes: 0.00966667
-Virtual_time_in_hours:   0.000161111
-Virtual_time_in_days:    6.71296e-06
+Virtual_time_in_seconds: 0.64
+Virtual_time_in_minutes: 0.0106667
+Virtual_time_in_hours:   0.000177778
+Virtual_time_in_days:    7.40741e-06
 
 Ruby_current_time: 117611
 Ruby_start_time: 0
 Ruby_cycles: 117611
 
-mbytes_resident: 49.6211
-mbytes_total: 260.035
-resident_ratio: 0.190885
+mbytes_resident: 55.9805
+mbytes_total: 275.633
+resident_ratio: 0.203141
 
 ruby_cycles_executed: [ 117612 ]
 
@@ -83,11 +83,11 @@ Resource Usage
 page_size: 4096
 user_time: 0
 system_time: 0
-page_reclaims: 10188
-page_faults: 19
+page_reclaims: 11040
+page_faults: 0
 swaps: 0
-block_inputs: 1176
-block_outputs: 80
+block_inputs: 0
+block_outputs: 96
 
 Network Stats
 -------------
@@ -165,20 +165,20 @@ links_utilized_percent_switch_3: 6.64705
   outgoing_messages_switch_3_link_2_Writeback_Control: 1992 15936 [ 0 1093 899 0 0 0 0 0 0 0 ] base_latency: 1
   outgoing_messages_switch_3_link_2_Unblock_Control: 1109 8872 [ 0 0 1109 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: 1303
   memory_reads: 1109
   memory_writes: 194

diff --git a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_directory/stats.txt b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_directory/stats.txt
index 05d596c9a9c8d172c60549a40cb205819d9a5095..8b05bd2cdc7ab7e80b742397cd9bd507f336aad4 100644 (file)
--- a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_directory/stats.txt
+++ b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_directory/stats.txt
@@ -4,11 +4,11 @@ sim_seconds                                  0.000118                       # Nu
 sim_ticks                                      117611                       # Number of ticks simulated
 final_tick                                     117611                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                   1000000000                       # Frequency of simulated ticks
-host_inst_rate                                  24451                       # Simulator instruction rate (inst/s)
-host_op_rate                                    24449                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                                 449950                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 266280                       # Number of bytes of host memory used
-host_seconds                                     0.26                       # Real time elapsed on the host
+host_inst_rate                                  22099                       # Simulator instruction rate (inst/s)
+host_op_rate                                    22098                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                                 406693                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 282252                       # Number of bytes of host memory used
+host_seconds                                     0.29                       # Real time elapsed on the host
 sim_insts                                        6390                       # Number of instructions simulated
 sim_ops                                          6390                       # Number of ops (including micro ops) simulated
 system.physmem.bytes_read::cpu.inst             25600                       # Number of bytes read from this memory
@@ -33,24 +33,24 @@ system.physmem.bw_write::total               56933450                       # Wr
 system.physmem.bw_total::cpu.inst           217666715                       # Total bandwidth to/from this memory (bytes/s)
 system.physmem.bw_total::cpu.data           131654352                       # Total bandwidth to/from this memory (bytes/s)
 system.physmem.bw_total::total              349321067                       # Total bandwidth to/from this memory (bytes/s)
-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
+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.cpu.dtb.fetch_hits                           0                       # ITB hits
 system.cpu.dtb.fetch_misses                         0                       # ITB misses
 system.cpu.dtb.fetch_acv                            0                       # ITB acv

diff --git a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_token/config.ini b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_token/config.ini
index 1f7e18219bb8190475a6cdd4d577cd65e39e03ac..704324832359505fa4efc844d5c0e4a6baff43ee 100644 (file)
--- a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_token/config.ini
+++ b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_token/config.ini
@@ -8,13 +8,14 @@ time_sync_spin_threshold=100000
 
 [system]
 type=System
-children=cpu dir_cntrl0 l1_cntrl0 l2_cntrl0 physmem ruby sys_port_proxy
+children=cpu physmem ruby sys_port_proxy
 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=
@@ -30,11 +31,10 @@ system_port=system.sys_port_proxy.slave[0]
 
 [system.cpu]
 type=TimingSimpleCPU
-children=dtb interrupts itb tracer workload
+children=dtb interrupts isa itb tracer workload
 checker=Null
 clock=1
 cpu_id=0
-defer_registration=false
 do_checkpoint_insts=true
 do_quiesce=true
 do_statistics_insts=true
@@ -42,6 +42,7 @@ dtb=system.cpu.dtb
 function_trace=false
 function_trace_start=0
 interrupts=system.cpu.interrupts
+isa=system.cpu.isa
 itb=system.cpu.itb
 max_insts_all_threads=0
 max_insts_any_thread=0
@@ -50,11 +51,12 @@ max_loads_any_thread=0
 numThreads=1
 profile=0
 progress_interval=0
+switched_out=false
 system=system
 tracer=system.cpu.tracer
 workload=system.cpu.workload
-dcache_port=system.l1_cntrl0.sequencer.slave[1]
-icache_port=system.l1_cntrl0.sequencer.slave[0]
+dcache_port=system.ruby.l1_cntrl0.sequencer.slave[1]
+icache_port=system.ruby.l1_cntrl0.sequencer.slave[0]
 
 [system.cpu.dtb]
 type=AlphaTLB
@@ -63,6 +65,9 @@ size=64
 [system.cpu.interrupts]
 type=AlphaInterrupts
 
+[system.cpu.isa]
+type=AlphaISA
+
 [system.cpu.itb]
 type=AlphaTLB
 size=48
@@ -89,32 +94,56 @@ simpoint=0
 system=system
 uid=100
 
-[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=false
+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
@@ -136,13 +165,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
@@ -155,11 +185,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
@@ -173,7 +203,7 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.l1_cntrl0.L1IcacheMemory]
+[system.ruby.l1_cntrl0.L1IcacheMemory]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -187,13 +217,13 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.l1_cntrl0.sequencer]
+[system.ruby.l1_cntrl0.sequencer]
 type=RubySequencer
 access_phys_mem=true
 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
@@ -204,12 +234,13 @@ using_ruby_tester=false
 version=0
 slave=system.cpu.icache_port system.cpu.dcache_port
 
-[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
@@ -220,7 +251,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
@@ -234,34 +265,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=false
-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
@@ -281,7 +290,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
@@ -289,6 +298,7 @@ weight=1
 
 [system.ruby.network.topology.ext_links0.int_node]
 type=Switch
+clock=1
 router_id=0
 virt_nets=10
 
@@ -296,7 +306,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
@@ -304,6 +314,7 @@ weight=1
 
 [system.ruby.network.topology.ext_links1.int_node]
 type=Switch
+clock=1
 router_id=1
 virt_nets=10
 
@@ -311,7 +322,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
@@ -319,6 +330,7 @@ weight=1
 
 [system.ruby.network.topology.ext_links2.int_node]
 type=Switch
+clock=1
 router_id=2
 virt_nets=10
 
@@ -334,6 +346,7 @@ weight=1
 
 [system.ruby.network.topology.int_links0.node_b]
 type=Switch
+clock=1
 router_id=3
 virt_nets=10
 

diff --git a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_token/ruby.stats b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_token/ruby.stats
index b8ccc1417b6d5dc5982fc9a747dee4cbb76fb1a6..88b0d5ce8fbdcf82f96c31161eb2bd5402b6ac26 100644 (file)
--- a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_token/ruby.stats
+++ b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-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.59
-Virtual_time_in_minutes: 0.00983333
-Virtual_time_in_hours:   0.000163889
-Virtual_time_in_days:    6.8287e-06
+Virtual_time_in_seconds: 0.55
+Virtual_time_in_minutes: 0.00916667
+Virtual_time_in_hours:   0.000152778
+Virtual_time_in_days:    6.36574e-06
 
 Ruby_current_time: 113627
 Ruby_start_time: 0
 Ruby_cycles: 113627
 
-mbytes_resident: 52.8594
-mbytes_total: 266.098
-resident_ratio: 0.198661
+mbytes_resident: 56.1602
+mbytes_total: 274.602
+resident_ratio: 0.204572
 
 ruby_cycles_executed: [ 113628 ]
 
@@ -91,11 +91,11 @@ Resource Usage
 page_size: 4096
 user_time: 0
 system_time: 0
-page_reclaims: 10608
+page_reclaims: 10534
 page_faults: 0
 swaps: 0
 block_inputs: 0
-block_outputs: 112
+block_outputs: 96
 
 Network Stats
 -------------
@@ -161,28 +161,28 @@ links_utilized_percent_switch_3: 4.4341
   outgoing_messages_switch_3_link_2_Writeback_Data: 229 16488 [ 0 0 0 0 229 0 0 0 0 0 ] base_latency: 1
   outgoing_messages_switch_3_link_2_Writeback_Control: 967 7736 [ 0 0 0 0 967 0 0 0 0 0 ] base_latency: 1
 
-Cache Stats: system.l1_cntrl0.L1IcacheMemory
-  system.l1_cntrl0.L1IcacheMemory_total_misses: 646
-  system.l1_cntrl0.L1IcacheMemory_total_demand_misses: 646
-  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: 646
+  system.ruby.l1_cntrl0.L1IcacheMemory_total_demand_misses: 646
+  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:   646    100%
+  system.ruby.l1_cntrl0.L1IcacheMemory_access_mode_type_Supervisor:   646    100%
 
-Cache Stats: system.l1_cntrl0.L1DcacheMemory
-  system.l1_cntrl0.L1DcacheMemory_total_misses: 736
-  system.l1_cntrl0.L1DcacheMemory_total_demand_misses: 736
-  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: 736
+  system.ruby.l1_cntrl0.L1DcacheMemory_total_demand_misses: 736
+  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:   71.3315%
-  system.l1_cntrl0.L1DcacheMemory_request_type_ST:   28.6685%
+  system.ruby.l1_cntrl0.L1DcacheMemory_request_type_LD:   71.3315%
+  system.ruby.l1_cntrl0.L1DcacheMemory_request_type_ST:   28.6685%
 
-  system.l1_cntrl0.L1DcacheMemory_access_mode_type_Supervisor:   736    100%
+  system.ruby.l1_cntrl0.L1DcacheMemory_access_mode_type_Supervisor:   736    100%
 
  --- L1Cache ---
  - Event Counts -
@@ -535,17 +535,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: 1195
-  system.l2_cntrl0.L2cacheMemory_total_demand_misses: 1195
-  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: 1195
+  system.ruby.l2_cntrl0.L2cacheMemory_total_demand_misses: 1195
+  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:   84.5188%
-  system.l2_cntrl0.L2cacheMemory_request_type_GETX:   15.4812%
+  system.ruby.l2_cntrl0.L2cacheMemory_request_type_GETS:   84.5188%
+  system.ruby.l2_cntrl0.L2cacheMemory_request_type_GETX:   15.4812%
 
-  system.l2_cntrl0.L2cacheMemory_access_mode_type_Supervisor:   1195    100%
+  system.ruby.l2_cntrl0.L2cacheMemory_access_mode_type_Supervisor:   1195    100%
 
  --- L2Cache ---
  - Event Counts -
@@ -702,7 +702,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: 1407
   memory_reads: 1178
   memory_writes: 229

diff --git a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_token/stats.txt b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_token/stats.txt
index 96fed3546bd52785015c5e6722085425e31acd9f..3d4ce611d4781950ebd208516af5190060ec9694 100644 (file)
--- a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_token/stats.txt
+++ b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_token/stats.txt
@@ -4,11 +4,11 @@ sim_seconds                                  0.000114                       # Nu
 sim_ticks                                      113627                       # Number of ticks simulated
 final_tick                                     113627                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                   1000000000                       # Frequency of simulated ticks
-host_inst_rate                                  34338                       # Simulator instruction rate (inst/s)
-host_op_rate                                    34335                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                                 610492                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 233152                       # Number of bytes of host memory used
-host_seconds                                     0.19                       # Real time elapsed on the host
+host_inst_rate                                  30093                       # Simulator instruction rate (inst/s)
+host_op_rate                                    30090                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                                 535014                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 281196                       # Number of bytes of host memory used
+host_seconds                                     0.21                       # Real time elapsed on the host
 sim_insts                                        6390                       # Number of instructions simulated
 sim_ops                                          6390                       # Number of ops (including micro ops) simulated
 system.physmem.bytes_read::cpu.inst             25600                       # Number of bytes read from this memory
@@ -33,24 +33,24 @@ system.physmem.bw_write::total               58929656                       # Wr
 system.physmem.bw_total::cpu.inst           225298565                       # Total bandwidth to/from this memory (bytes/s)
 system.physmem.bw_total::cpu.data           136270429                       # Total bandwidth to/from this memory (bytes/s)
 system.physmem.bw_total::total              361568993                       # Total bandwidth to/from this memory (bytes/s)
-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
+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.cpu.dtb.fetch_hits                           0                       # ITB hits
 system.cpu.dtb.fetch_misses                         0                       # ITB misses
 system.cpu.dtb.fetch_acv                            0                       # ITB acv

diff --git a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_hammer/config.ini b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_hammer/config.ini
index 0d406345bc36f6b4ae2a32b5a3a3ddcf4fe0fe02..716b7d322d3832bd1fc2f761191aee6816ec53cd 100644 (file)
--- a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_hammer/config.ini
+++ b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_hammer/config.ini
@@ -8,13 +8,14 @@ time_sync_spin_threshold=100000
 
 [system]
 type=System
-children=cpu dir_cntrl0 l1_cntrl0 physmem ruby sys_port_proxy
+children=cpu physmem ruby sys_port_proxy
 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=
@@ -30,11 +31,10 @@ system_port=system.sys_port_proxy.slave[0]
 
 [system.cpu]
 type=TimingSimpleCPU
-children=dtb interrupts itb tracer workload
+children=dtb interrupts isa itb tracer workload
 checker=Null
 clock=1
 cpu_id=0
-defer_registration=false
 do_checkpoint_insts=true
 do_quiesce=true
 do_statistics_insts=true
@@ -42,6 +42,7 @@ dtb=system.cpu.dtb
 function_trace=false
 function_trace_start=0
 interrupts=system.cpu.interrupts
+isa=system.cpu.isa
 itb=system.cpu.itb
 max_insts_all_threads=0
 max_insts_any_thread=0
@@ -50,11 +51,12 @@ max_loads_any_thread=0
 numThreads=1
 profile=0
 progress_interval=0
+switched_out=false
 system=system
 tracer=system.cpu.tracer
 workload=system.cpu.workload
-dcache_port=system.l1_cntrl0.sequencer.slave[1]
-icache_port=system.l1_cntrl0.sequencer.slave[0]
+dcache_port=system.ruby.l1_cntrl0.sequencer.slave[1]
+icache_port=system.ruby.l1_cntrl0.sequencer.slave[0]
 
 [system.cpu.dtb]
 type=AlphaTLB
@@ -63,6 +65,9 @@ size=64
 [system.cpu.interrupts]
 type=AlphaInterrupts
 
+[system.cpu.isa]
+type=AlphaISA
+
 [system.cpu.itb]
 type=AlphaTLB
 size=48
@@ -89,32 +94,56 @@ simpoint=0
 system=system
 uid=100
 
-[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=false
+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
@@ -136,7 +165,7 @@ ruby_system=system.ruby
 tFaw=0
 version=0
 
-[system.dir_cntrl0.probeFilter]
+[system.ruby.dir_cntrl0.probeFilter]
 type=RubyCache
 assoc=4
 dataAccessLatency=1
@@ -150,14 +179,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
@@ -166,11 +196,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
@@ -184,7 +214,7 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.l1_cntrl0.L1IcacheMemory]
+[system.ruby.l1_cntrl0.L1IcacheMemory]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -198,7 +228,7 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.l1_cntrl0.L2cacheMemory]
+[system.ruby.l1_cntrl0.L2cacheMemory]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -212,13 +242,13 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.l1_cntrl0.sequencer]
+[system.ruby.l1_cntrl0.sequencer]
 type=RubySequencer
 access_phys_mem=true
 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
@@ -229,34 +259,12 @@ using_ruby_tester=false
 version=0
 slave=system.cpu.icache_port system.cpu.dcache_port
 
-[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=false
-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
@@ -276,7 +284,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
@@ -284,6 +292,7 @@ weight=1
 
 [system.ruby.network.topology.ext_links0.int_node]
 type=Switch
+clock=1
 router_id=0
 virt_nets=10
 
@@ -291,7 +300,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
@@ -299,6 +308,7 @@ weight=1
 
 [system.ruby.network.topology.ext_links1.int_node]
 type=Switch
+clock=1
 router_id=1
 virt_nets=10
 
@@ -314,6 +324,7 @@ weight=1
 
 [system.ruby.network.topology.int_links0.node_b]
 type=Switch
+clock=1
 router_id=2
 virt_nets=10
 

diff --git a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_hammer/ruby.stats b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_hammer/ruby.stats
index 6604bf6a9d32212d0e68a0633a3dc338f4411a71..ea8b6e77824ae1c5c5d2463c08f5dbbf593848e3 100644 (file)
--- a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_hammer/ruby.stats
+++ b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_hammer/ruby.stats
@@ -1,4 +1,4 @@
-Real time: Sep/01/2012 13:54:22
+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.47
-Virtual_time_in_minutes: 0.00783333
-Virtual_time_in_hours:   0.000130556
-Virtual_time_in_days:    5.43981e-06
+Virtual_time_in_seconds: 0.51
+Virtual_time_in_minutes: 0.0085
+Virtual_time_in_hours:   0.000141667
+Virtual_time_in_days:    5.90278e-06
 
 Ruby_current_time: 93341
 Ruby_start_time: 0
 Ruby_cycles: 93341
 
-mbytes_resident: 47.3203
-mbytes_total: 257.496
-resident_ratio: 0.183832
+mbytes_resident: 53.7617
+mbytes_total: 273.586
+resident_ratio: 0.19655
 
 ruby_cycles_executed: [ 93342 ]
 
@@ -90,11 +90,11 @@ Resource Usage
 page_size: 4096
 user_time: 0
 system_time: 0
-page_reclaims: 9600
-page_faults: 19
+page_reclaims: 10424
+page_faults: 0
 swaps: 0
-block_inputs: 1136
-block_outputs: 80
+block_inputs: 0
+block_outputs: 88
 
 Network Stats
 -------------
@@ -145,41 +145,41 @@ links_utilized_percent_switch_2: 4.80443
   outgoing_messages_switch_2_link_1_Writeback_Control: 2066 16528 [ 0 0 1143 0 0 923 0 0 0 0 ] base_latency: 1
   outgoing_messages_switch_2_link_1_Unblock_Control: 1159 9272 [ 0 0 0 0 0 1159 0 0 0 0 ] base_latency: 1
 
-Cache Stats: system.l1_cntrl0.L1IcacheMemory
-  system.l1_cntrl0.L1IcacheMemory_total_misses: 646
-  system.l1_cntrl0.L1IcacheMemory_total_demand_misses: 646
-  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: 646
+  system.ruby.l1_cntrl0.L1IcacheMemory_total_demand_misses: 646
+  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:   646    100%
+  system.ruby.l1_cntrl0.L1IcacheMemory_access_mode_type_Supervisor:   646    100%
 
-Cache Stats: system.l1_cntrl0.L1DcacheMemory
-  system.l1_cntrl0.L1DcacheMemory_total_misses: 716
-  system.l1_cntrl0.L1DcacheMemory_total_demand_misses: 716
-  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: 716
+  system.ruby.l1_cntrl0.L1DcacheMemory_total_demand_misses: 716
+  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:   73.324%
-  system.l1_cntrl0.L1DcacheMemory_request_type_ST:   26.676%
+  system.ruby.l1_cntrl0.L1DcacheMemory_request_type_LD:   73.324%
+  system.ruby.l1_cntrl0.L1DcacheMemory_request_type_ST:   26.676%
 
-  system.l1_cntrl0.L1DcacheMemory_access_mode_type_Supervisor:   716    100%
+  system.ruby.l1_cntrl0.L1DcacheMemory_access_mode_type_Supervisor:   716    100%
 
-Cache Stats: system.l1_cntrl0.L2cacheMemory
-  system.l1_cntrl0.L2cacheMemory_total_misses: 1362
-  system.l1_cntrl0.L2cacheMemory_total_demand_misses: 1362
-  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: 1362
+  system.ruby.l1_cntrl0.L2cacheMemory_total_demand_misses: 1362
+  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:   38.5463%
-  system.l1_cntrl0.L2cacheMemory_request_type_ST:   14.0235%
-  system.l1_cntrl0.L2cacheMemory_request_type_IFETCH:   47.4302%
+  system.ruby.l1_cntrl0.L2cacheMemory_request_type_LD:   38.5463%
+  system.ruby.l1_cntrl0.L2cacheMemory_request_type_ST:   14.0235%
+  system.ruby.l1_cntrl0.L2cacheMemory_request_type_IFETCH:   47.4302%
 
-  system.l1_cntrl0.L2cacheMemory_access_mode_type_Supervisor:   1362    100%
+  system.ruby.l1_cntrl0.L2cacheMemory_access_mode_type_Supervisor:   1362    100%
 
  --- L1Cache ---
  - Event Counts -
@@ -578,15 +578,15 @@ MM_WF  Ack [0 ] 0
 MM_WF  All_acks_no_sharers [0 ] 0
 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: 1379
   memory_reads: 1159
   memory_writes: 220

diff --git a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_hammer/stats.txt b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_hammer/stats.txt
index c852b744db8bf09921a270fad1494075520c15d4..2f2f26835669ac179060d0cb6d5dfd929a221c59 100644 (file)
--- a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_hammer/stats.txt
+++ b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_hammer/stats.txt
@@ -4,11 +4,11 @@ sim_seconds                                  0.000093                       # Nu
 sim_ticks                                       93341                       # Number of ticks simulated
 final_tick                                      93341                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                   1000000000                       # Frequency of simulated ticks
-host_inst_rate                                  42148                       # Simulator instruction rate (inst/s)
-host_op_rate                                    42141                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                                 615474                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 263680                       # Number of bytes of host memory used
-host_seconds                                     0.15                       # Real time elapsed on the host
+host_inst_rate                                  33922                       # Simulator instruction rate (inst/s)
+host_op_rate                                    33919                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                                 495414                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 280156                       # Number of bytes of host memory used
+host_seconds                                     0.19                       # Real time elapsed on the host
 sim_insts                                        6390                       # Number of instructions simulated
 sim_ops                                          6390                       # Number of ops (including micro ops) simulated
 system.physmem.bytes_read::cpu.inst             25600                       # Number of bytes read from this memory
@@ -33,30 +33,30 @@ system.physmem.bw_write::total               71736964                       # Wr
 system.physmem.bw_total::cpu.inst           274263186                       # Total bandwidth to/from this memory (bytes/s)
 system.physmem.bw_total::cpu.data           165886374                       # Total bandwidth to/from this memory (bytes/s)
 system.physmem.bw_total::total              440149559                       # Total bandwidth to/from this memory (bytes/s)
-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
+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
 system.cpu.dtb.fetch_hits                           0                       # ITB hits
 system.cpu.dtb.fetch_misses                         0                       # ITB misses
 system.cpu.dtb.fetch_acv                            0                       # ITB acv

diff --git a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby/config.ini b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby/config.ini
index 8ba053a748128f43ddbc696fed7da5ab862e66ce..9c198f1c4b65c6a6bc68de2fb645ebe4b3e0af44 100644 (file)
--- a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby/config.ini
+++ b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby/config.ini
@@ -8,13 +8,14 @@ time_sync_spin_threshold=100000
 
 [system]
 type=System
-children=cpu dir_cntrl0 l1_cntrl0 physmem ruby sys_port_proxy
+children=cpu physmem ruby sys_port_proxy
 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=
@@ -30,11 +31,10 @@ system_port=system.sys_port_proxy.slave[0]
 
 [system.cpu]
 type=TimingSimpleCPU
-children=dtb interrupts itb tracer workload
+children=dtb interrupts isa itb tracer workload
 checker=Null
 clock=1
 cpu_id=0
-defer_registration=false
 do_checkpoint_insts=true
 do_quiesce=true
 do_statistics_insts=true
@@ -42,6 +42,7 @@ dtb=system.cpu.dtb
 function_trace=false
 function_trace_start=0
 interrupts=system.cpu.interrupts
+isa=system.cpu.isa
 itb=system.cpu.itb
 max_insts_all_threads=0
 max_insts_any_thread=0
@@ -50,11 +51,12 @@ max_loads_any_thread=0
 numThreads=1
 profile=0
 progress_interval=0
+switched_out=false
 system=system
 tracer=system.cpu.tracer
 workload=system.cpu.workload
-dcache_port=system.l1_cntrl0.sequencer.slave[1]
-icache_port=system.l1_cntrl0.sequencer.slave[0]
+dcache_port=system.ruby.l1_cntrl0.sequencer.slave[1]
+icache_port=system.ruby.l1_cntrl0.sequencer.slave[0]
 
 [system.cpu.dtb]
 type=AlphaTLB
@@ -63,6 +65,9 @@ size=64
 [system.cpu.interrupts]
 type=AlphaInterrupts
 
+[system.cpu.isa]
+type=AlphaISA
+
 [system.cpu.itb]
 type=AlphaTLB
 size=48
@@ -89,29 +94,53 @@ simpoint=0
 system=system
 uid=100
 
-[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=false
+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
@@ -133,23 +162,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
@@ -163,13 +193,13 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.l1_cntrl0.sequencer]
+[system.ruby.l1_cntrl0.sequencer]
 type=RubySequencer
 access_phys_mem=true
 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
@@ -180,34 +210,12 @@ using_ruby_tester=false
 version=0
 slave=system.cpu.icache_port system.cpu.dcache_port
 
-[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=false
-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
@@ -227,7 +235,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
@@ -235,6 +243,7 @@ weight=1
 
 [system.ruby.network.topology.ext_links0.int_node]
 type=Switch
+clock=1
 router_id=0
 virt_nets=10
 
@@ -242,7 +251,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
@@ -250,6 +259,7 @@ weight=1
 
 [system.ruby.network.topology.ext_links1.int_node]
 type=Switch
+clock=1
 router_id=1
 virt_nets=10
 
@@ -265,6 +275,7 @@ weight=1
 
 [system.ruby.network.topology.int_links0.node_b]
 type=Switch
+clock=1
 router_id=2
 virt_nets=10
 

diff --git a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby/ruby.stats b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby/ruby.stats
index 12453125c83ed1d172ea280074688ef65da8f1c3..6e22a35186d6c4e0979a88040437940c954a4486 100644 (file)
--- a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby/ruby.stats
+++ b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby/ruby.stats
@@ -1,4 +1,4 @@
-Real time: Sep/01/2012 13:43:15
+Real time: Jan/14/2013 08:12:30
 
 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.47
-Virtual_time_in_minutes: 0.00783333
-Virtual_time_in_hours:   0.000130556
-Virtual_time_in_days:    5.43981e-06
+Virtual_time_in_seconds: 0.51
+Virtual_time_in_minutes: 0.0085
+Virtual_time_in_hours:   0.000141667
+Virtual_time_in_days:    5.90278e-06
 
 Ruby_current_time: 143853
 Ruby_start_time: 0
 Ruby_cycles: 143853
 
-mbytes_resident: 48.5508
-mbytes_total: 258.688
-resident_ratio: 0.187727
+mbytes_resident: 54.9062
+mbytes_total: 274.051
+resident_ratio: 0.200393
 
 ruby_cycles_executed: [ 143854 ]
 
@@ -86,11 +86,11 @@ Resource Usage
 page_size: 4096
 user_time: 0
 system_time: 0
-page_reclaims: 9931
+page_reclaims: 11208
 page_faults: 0
 swaps: 0
 block_inputs: 0
-block_outputs: 80
+block_outputs: 88
 
 Network Stats
 -------------
@@ -134,18 +134,18 @@ links_utilized_percent_switch_2: 6.00613
   outgoing_messages_switch_2_link_1_Control: 1730 13840 [ 0 0 1730 0 0 0 0 0 0 0 ] base_latency: 1
   outgoing_messages_switch_2_link_1_Data: 1726 124272 [ 0 0 1726 0 0 0 0 0 0 0 ] base_latency: 1
 
-Cache Stats: system.l1_cntrl0.cacheMemory
-  system.l1_cntrl0.cacheMemory_total_misses: 1730
-  system.l1_cntrl0.cacheMemory_total_demand_misses: 1730
-  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: 1730
+  system.ruby.l1_cntrl0.cacheMemory_total_demand_misses: 1730
+  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:   42.0231%
-  system.l1_cntrl0.cacheMemory_request_type_ST:   15.7803%
-  system.l1_cntrl0.cacheMemory_request_type_IFETCH:   42.1965%
+  system.ruby.l1_cntrl0.cacheMemory_request_type_LD:   42.0231%
+  system.ruby.l1_cntrl0.cacheMemory_request_type_ST:   15.7803%
+  system.ruby.l1_cntrl0.cacheMemory_request_type_IFETCH:   42.1965%
 
-  system.l1_cntrl0.cacheMemory_access_mode_type_Supervisor:   1730    100%
+  system.ruby.l1_cntrl0.cacheMemory_access_mode_type_Supervisor:   1730    100%
 
  --- L1Cache ---
  - Event Counts -
@@ -186,7 +186,7 @@ IS  Data [1457 ] 1457
 
 IM  Data [273 ] 273
 
-Memory controller: system.dir_cntrl0.memBuffer:
+Memory controller: system.ruby.dir_cntrl0.memBuffer:
   memory_total_requests: 3456
   memory_reads: 1730
   memory_writes: 1726

diff --git a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby/stats.txt b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby/stats.txt
index c15797da9019e696f48c30b6fff0c6ef5e611876..2a07a4255419f0f39590b173cf811b57e2e0c93a 100644 (file)
--- a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby/stats.txt
+++ b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby/stats.txt
@@ -4,11 +4,11 @@ sim_seconds                                  0.000144                       # Nu
 sim_ticks                                      143853                       # Number of ticks simulated
 final_tick                                     143853                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                   1000000000                       # Frequency of simulated ticks
-host_inst_rate                                  43143                       # Simulator instruction rate (inst/s)
-host_op_rate                                    43136                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                                 970941                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 264900                       # Number of bytes of host memory used
-host_seconds                                     0.15                       # Real time elapsed on the host
+host_inst_rate                                  34510                       # Simulator instruction rate (inst/s)
+host_op_rate                                    34507                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                                 776735                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 280632                       # Number of bytes of host memory used
+host_seconds                                     0.19                       # Real time elapsed on the host
 sim_insts                                        6390                       # Number of instructions simulated
 sim_ops                                          6390                       # Number of ops (including micro ops) simulated
 system.physmem.bytes_read::cpu.inst             25600                       # Number of bytes read from this memory
@@ -33,12 +33,12 @@ system.physmem.bw_write::total               46547517                       # Wr
 system.physmem.bw_total::cpu.inst           177959445                       # Total bandwidth to/from this memory (bytes/s)
 system.physmem.bw_total::cpu.data           107637658                       # Total bandwidth to/from this memory (bytes/s)
 system.physmem.bw_total::total              285597103                       # Total bandwidth to/from this memory (bytes/s)
-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
+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
 system.cpu.dtb.fetch_hits                           0                       # ITB hits
 system.cpu.dtb.fetch_misses                         0                       # ITB misses
 system.cpu.dtb.fetch_acv                            0                       # ITB acv

diff --git a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_CMP_directory/config.ini b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_CMP_directory/config.ini
index 08d94aa42786a889ae819392f0cc59ddddb71118..918bf8974bb02273695431c787e502da2377a4ef 100644 (file)
--- a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_CMP_directory/config.ini
+++ b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_CMP_directory/config.ini
@@ -8,13 +8,14 @@ time_sync_spin_threshold=100000
 
 [system]
 type=System
-children=cpu dir_cntrl0 l1_cntrl0 l2_cntrl0 physmem ruby sys_port_proxy
+children=cpu physmem ruby sys_port_proxy
 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=
@@ -30,11 +31,10 @@ system_port=system.sys_port_proxy.slave[0]
 
 [system.cpu]
 type=TimingSimpleCPU
-children=dtb interrupts itb tracer workload
+children=dtb interrupts isa itb tracer workload
 checker=Null
 clock=1
 cpu_id=0
-defer_registration=false
 do_checkpoint_insts=true
 do_quiesce=true
 do_statistics_insts=true
@@ -42,6 +42,7 @@ dtb=system.cpu.dtb
 function_trace=false
 function_trace_start=0
 interrupts=system.cpu.interrupts
+isa=system.cpu.isa
 itb=system.cpu.itb
 max_insts_all_threads=0
 max_insts_any_thread=0
@@ -50,11 +51,12 @@ max_loads_any_thread=0
 numThreads=1
 profile=0
 progress_interval=0
+switched_out=false
 system=system
 tracer=system.cpu.tracer
 workload=system.cpu.workload
-dcache_port=system.l1_cntrl0.sequencer.slave[1]
-icache_port=system.l1_cntrl0.sequencer.slave[0]
+dcache_port=system.ruby.l1_cntrl0.sequencer.slave[1]
+icache_port=system.ruby.l1_cntrl0.sequencer.slave[0]
 
 [system.cpu.dtb]
 type=AlphaTLB
@@ -63,6 +65,9 @@ size=64
 [system.cpu.interrupts]
 type=AlphaInterrupts
 
+[system.cpu.isa]
+type=AlphaISA
+
 [system.cpu.itb]
 type=AlphaTLB
 size=48
@@ -89,14 +94,38 @@ simpoint=0
 system=system
 uid=100
 
-[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=false
+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
@@ -104,7 +133,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
@@ -112,7 +141,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
@@ -134,28 +163,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
@@ -169,7 +199,7 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.l1_cntrl0.L1IcacheMemory]
+[system.ruby.l1_cntrl0.L1IcacheMemory]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -183,7 +213,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
@@ -193,13 +223,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=true
 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
@@ -210,11 +240,12 @@ using_ruby_tester=false
 version=0
 slave=system.cpu.icache_port system.cpu.dcache_port
 
-[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
@@ -225,7 +256,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
@@ -239,34 +270,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=false
-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
@@ -286,7 +295,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
@@ -294,6 +303,7 @@ weight=1
 
 [system.ruby.network.topology.ext_links0.int_node]
 type=Switch
+clock=1
 router_id=0
 virt_nets=10
 
@@ -301,7 +311,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
@@ -309,6 +319,7 @@ weight=1
 
 [system.ruby.network.topology.ext_links1.int_node]
 type=Switch
+clock=1
 router_id=1
 virt_nets=10
 
@@ -316,7 +327,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
@@ -324,6 +335,7 @@ weight=1
 
 [system.ruby.network.topology.ext_links2.int_node]
 type=Switch
+clock=1
 router_id=2
 virt_nets=10
 
@@ -339,6 +351,7 @@ weight=1
 
 [system.ruby.network.topology.int_links0.node_b]
 type=Switch
+clock=1
 router_id=3
 virt_nets=10
 

diff --git a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_CMP_directory/ruby.stats b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_CMP_directory/ruby.stats
index e49c679fb7679ef5b2a1227783b3aee978c93e25..432697885c0f6d07d98df28c9c82bc2ac09bb661 100644 (file)
--- a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_CMP_directory/ruby.stats
+++ b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-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: 52575
 Ruby_start_time: 0
 Ruby_cycles: 52575
 
-mbytes_resident: 52.6172
-mbytes_total: 267.098
-resident_ratio: 0.19704
+mbytes_resident: 53.3828
+mbytes_total: 273.156
+resident_ratio: 0.195472
 
 ruby_cycles_executed: [ 52576 ]
 
@@ -83,7 +83,7 @@ Resource Usage
 page_size: 4096
 user_time: 0
 system_time: 0
-page_reclaims: 10056
+page_reclaims: 10812
 page_faults: 0
 swaps: 0
 block_inputs: 0
@@ -161,28 +161,28 @@ links_utilized_percent_switch_3: 4.8648
   outgoing_messages_switch_3_link_2_Response_Data: 103 7416 [ 0 103 0 0 0 0 0 0 0 0 ] base_latency: 1
   outgoing_messages_switch_3_link_2_Response_Control: 436 3488 [ 0 436 0 0 0 0 0 0 0 0 ] base_latency: 1
 
-Cache Stats: system.l1_cntrl0.L1IcacheMemory
-  system.l1_cntrl0.L1IcacheMemory_total_misses: 300
-  system.l1_cntrl0.L1IcacheMemory_total_demand_misses: 300
-  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: 300
+  system.ruby.l1_cntrl0.L1IcacheMemory_total_demand_misses: 300
+  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:   300    100%
+  system.ruby.l1_cntrl0.L1IcacheMemory_access_mode_type_Supervisor:   300    100%
 
-Cache Stats: system.l1_cntrl0.L1DcacheMemory
-  system.l1_cntrl0.L1DcacheMemory_total_misses: 272
-  system.l1_cntrl0.L1DcacheMemory_total_demand_misses: 272
-  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: 272
+  system.ruby.l1_cntrl0.L1DcacheMemory_total_demand_misses: 272
+  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:   75%
-  system.l1_cntrl0.L1DcacheMemory_request_type_ST:   25%
+  system.ruby.l1_cntrl0.L1DcacheMemory_request_type_LD:   75%
+  system.ruby.l1_cntrl0.L1DcacheMemory_request_type_ST:   25%
 
-  system.l1_cntrl0.L1DcacheMemory_access_mode_type_Supervisor:   272    100%
+  system.ruby.l1_cntrl0.L1DcacheMemory_access_mode_type_Supervisor:   272    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: 547
-  system.l2_cntrl0.L2cacheMemory_total_demand_misses: 547
-  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: 547
+  system.ruby.l2_cntrl0.L2cacheMemory_total_demand_misses: 547
+  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:   35.1005%
-  system.l2_cntrl0.L2cacheMemory_request_type_GET_INSTR:   53.1993%
-  system.l2_cntrl0.L2cacheMemory_request_type_GETX:   11.7002%
+  system.ruby.l2_cntrl0.L2cacheMemory_request_type_GETS:   35.1005%
+  system.ruby.l2_cntrl0.L2cacheMemory_request_type_GET_INSTR:   53.1993%
+  system.ruby.l2_cntrl0.L2cacheMemory_request_type_GETX:   11.7002%
 
-  system.l2_cntrl0.L2cacheMemory_access_mode_type_Supervisor:   547    100%
+  system.ruby.l2_cntrl0.L2cacheMemory_access_mode_type_Supervisor:   547    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: 650
   memory_reads: 547
   memory_writes: 103

diff --git a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_CMP_directory/stats.txt b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_CMP_directory/stats.txt
index 381866200419bc8e41ad982eb7e1c460386cdb8a..f2add4688cd9c4db20c8e6234c9affb53c3a83c3 100644 (file)
--- a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_CMP_directory/stats.txt
+++ b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_CMP_directory/stats.txt
@@ -4,11 +4,11 @@ sim_seconds                                  0.000053                       # Nu
 sim_ticks                                       52575                       # Number of ticks simulated
 final_tick                                      52575                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                   1000000000                       # Frequency of simulated ticks
-host_inst_rate                                  11415                       # Simulator instruction rate (inst/s)
-host_op_rate                                    11414                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                                 232838                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 273512                       # Number of bytes of host memory used
-host_seconds                                     0.23                       # Real time elapsed on the host
+host_inst_rate                                  17753                       # Simulator instruction rate (inst/s)
+host_op_rate                                    17751                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                                 362102                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 279716                       # Number of bytes of host memory used
+host_seconds                                     0.15                       # Real time elapsed on the host
 sim_insts                                        2577                       # Number of instructions simulated
 sim_ops                                          2577                       # Number of ops (including micro ops) simulated
 system.physmem.bytes_read::cpu.inst             10340                       # Number of bytes read from this memory
@@ -33,33 +33,33 @@ system.physmem.bw_write::total               39144080                       # Wr
 system.physmem.bw_total::cpu.inst           196671422                       # Total bandwidth to/from this memory (bytes/s)
 system.physmem.bw_total::cpu.data            96509748                       # Total bandwidth to/from this memory (bytes/s)
 system.physmem.bw_total::total              293181170                       # Total bandwidth to/from this memory (bytes/s)
-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
+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
 system.cpu.dtb.fetch_hits                           0                       # ITB hits
 system.cpu.dtb.fetch_misses                         0                       # ITB misses
 system.cpu.dtb.fetch_acv                            0                       # ITB acv

diff --git a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_directory/config.ini b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_directory/config.ini
index b8d188e49cda5ba524fda08422f7951d79456d42..e191f8fa1cfbbf5d183cb951fd5be7a76782da8d 100644 (file)
--- a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_directory/config.ini
+++ b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_directory/config.ini
@@ -8,13 +8,14 @@ time_sync_spin_threshold=100000
 
 [system]
 type=System
-children=cpu dir_cntrl0 l1_cntrl0 l2_cntrl0 physmem ruby sys_port_proxy
+children=cpu physmem ruby sys_port_proxy
 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=
@@ -30,11 +31,10 @@ system_port=system.sys_port_proxy.slave[0]
 
 [system.cpu]
 type=TimingSimpleCPU
-children=dtb interrupts itb tracer workload
+children=dtb interrupts isa itb tracer workload
 checker=Null
 clock=1
 cpu_id=0
-defer_registration=false
 do_checkpoint_insts=true
 do_quiesce=true
 do_statistics_insts=true
@@ -42,6 +42,7 @@ dtb=system.cpu.dtb
 function_trace=false
 function_trace_start=0
 interrupts=system.cpu.interrupts
+isa=system.cpu.isa
 itb=system.cpu.itb
 max_insts_all_threads=0
 max_insts_any_thread=0
@@ -50,11 +51,12 @@ max_loads_any_thread=0
 numThreads=1
 profile=0
 progress_interval=0
+switched_out=false
 system=system
 tracer=system.cpu.tracer
 workload=system.cpu.workload
-dcache_port=system.l1_cntrl0.sequencer.slave[1]
-icache_port=system.l1_cntrl0.sequencer.slave[0]
+dcache_port=system.ruby.l1_cntrl0.sequencer.slave[1]
+icache_port=system.ruby.l1_cntrl0.sequencer.slave[0]
 
 [system.cpu.dtb]
 type=AlphaTLB
@@ -63,6 +65,9 @@ size=64
 [system.cpu.interrupts]
 type=AlphaInterrupts
 
+[system.cpu.isa]
+type=AlphaISA
+
 [system.cpu.itb]
 type=AlphaTLB
 size=48
@@ -89,29 +94,53 @@ simpoint=0
 system=system
 uid=100
 
-[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=false
+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
@@ -133,12 +162,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
@@ -146,11 +176,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
@@ -164,12 +194,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
@@ -178,13 +208,13 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.l1_cntrl0.sequencer]
+[system.ruby.l1_cntrl0.sequencer]
 type=RubySequencer
 access_phys_mem=true
 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
@@ -195,11 +225,12 @@ using_ruby_tester=false
 version=0
 slave=system.cpu.icache_port system.cpu.dcache_port
 
-[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
@@ -209,7 +240,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
@@ -223,34 +254,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=false
-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
@@ -270,7 +279,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
@@ -278,6 +287,7 @@ weight=1
 
 [system.ruby.network.topology.ext_links0.int_node]
 type=Switch
+clock=1
 router_id=0
 virt_nets=10
 
@@ -285,7 +295,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
@@ -293,6 +303,7 @@ weight=1
 
 [system.ruby.network.topology.ext_links1.int_node]
 type=Switch
+clock=1
 router_id=1
 virt_nets=10
 
@@ -300,7 +311,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
@@ -308,6 +319,7 @@ weight=1
 
 [system.ruby.network.topology.ext_links2.int_node]
 type=Switch
+clock=1
 router_id=2
 virt_nets=10
 
@@ -323,6 +335,7 @@ weight=1
 
 [system.ruby.network.topology.int_links0.node_b]
 type=Switch
+clock=1
 router_id=3
 virt_nets=10
 

diff --git a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_directory/ruby.stats b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_directory/ruby.stats
index 9e474b916e95d709247f1f871b1a82a4e31bad48..c2a59d13f6c0ddfbd7a5f722941d7835e7c0c7a0 100644 (file)
--- a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_directory/ruby.stats
+++ b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_directory/ruby.stats
@@ -1,4 +1,4 @@
-Real time: Sep/01/2012 14:11:29
+Real time: Jan/14/2013 08:23:28
 
 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.43
-Virtual_time_in_minutes: 0.00716667
-Virtual_time_in_hours:   0.000119444
-Virtual_time_in_days:    4.97685e-06
+Virtual_time_in_seconds: 0.5
+Virtual_time_in_minutes: 0.00833333
+Virtual_time_in_hours:   0.000138889
+Virtual_time_in_days:    5.78704e-06
 
 Ruby_current_time: 44968
 Ruby_start_time: 0
 Ruby_cycles: 44968
 
-mbytes_resident: 46.9961
-mbytes_total: 257.863
-resident_ratio: 0.182313
+mbytes_resident: 53.4805
+mbytes_total: 273.355
+resident_ratio: 0.195687
 
 ruby_cycles_executed: [ 44969 ]
 
@@ -83,11 +83,11 @@ Resource Usage
 page_size: 4096
 user_time: 0
 system_time: 0
-page_reclaims: 9533
+page_reclaims: 11358
 page_faults: 0
 swaps: 0
 block_inputs: 0
-block_outputs: 80
+block_outputs: 96
 
 Network Stats
 -------------
@@ -165,20 +165,20 @@ links_utilized_percent_switch_3: 6.52835
   outgoing_messages_switch_3_link_2_Writeback_Control: 738 5904 [ 0 407 331 0 0 0 0 0 0 0 ] base_latency: 1
   outgoing_messages_switch_3_link_2_Unblock_Control: 423 3384 [ 0 0 423 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: 499
   memory_reads: 423
   memory_writes: 76

diff --git a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_directory/stats.txt b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_directory/stats.txt
index b192d2700b5e35daed02beceaae0ebd5cf38bc80..464fdb6991fa3d028662c43a10a5947a81bae461 100644 (file)
--- a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_directory/stats.txt
+++ b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_directory/stats.txt
@@ -4,11 +4,11 @@ sim_seconds                                  0.000045                       # Nu
 sim_ticks                                       44968                       # Number of ticks simulated
 final_tick                                      44968                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                   1000000000                       # Frequency of simulated ticks
-host_inst_rate                                  22673                       # Simulator instruction rate (inst/s)
-host_op_rate                                    22668                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                                 395469                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 264056                       # Number of bytes of host memory used
-host_seconds                                     0.11                       # Real time elapsed on the host
+host_inst_rate                                  16697                       # Simulator instruction rate (inst/s)
+host_op_rate                                    16695                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                                 291294                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 279920                       # Number of bytes of host memory used
+host_seconds                                     0.15                       # Real time elapsed on the host
 sim_insts                                        2577                       # Number of instructions simulated
 sim_ops                                          2577                       # Number of ops (including micro ops) simulated
 system.physmem.bytes_read::cpu.inst             10340                       # Number of bytes read from this memory
@@ -33,24 +33,24 @@ system.physmem.bw_write::total               45765878                       # Wr
 system.physmem.bw_total::cpu.inst           229941292                       # Total bandwidth to/from this memory (bytes/s)
 system.physmem.bw_total::cpu.data           112835794                       # Total bandwidth to/from this memory (bytes/s)
 system.physmem.bw_total::total              342777086                       # Total bandwidth to/from this memory (bytes/s)
-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
+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.cpu.dtb.fetch_hits                           0                       # ITB hits
 system.cpu.dtb.fetch_misses                         0                       # ITB misses
 system.cpu.dtb.fetch_acv                            0                       # ITB acv

diff --git a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_token/config.ini b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_token/config.ini
index a59221a59018f35c76eda6c261a51888b19ed238..be6b4014601eeee1073e8ba852008968f978949d 100644 (file)
--- a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_token/config.ini
+++ b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_token/config.ini
@@ -8,13 +8,14 @@ time_sync_spin_threshold=100000
 
 [system]
 type=System
-children=cpu dir_cntrl0 l1_cntrl0 l2_cntrl0 physmem ruby sys_port_proxy
+children=cpu physmem ruby sys_port_proxy
 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=
@@ -30,11 +31,10 @@ system_port=system.sys_port_proxy.slave[0]
 
 [system.cpu]
 type=TimingSimpleCPU
-children=dtb interrupts itb tracer workload
+children=dtb interrupts isa itb tracer workload
 checker=Null
 clock=1
 cpu_id=0
-defer_registration=false
 do_checkpoint_insts=true
 do_quiesce=true
 do_statistics_insts=true
@@ -42,6 +42,7 @@ dtb=system.cpu.dtb
 function_trace=false
 function_trace_start=0
 interrupts=system.cpu.interrupts
+isa=system.cpu.isa
 itb=system.cpu.itb
 max_insts_all_threads=0
 max_insts_any_thread=0
@@ -50,11 +51,12 @@ max_loads_any_thread=0
 numThreads=1
 profile=0
 progress_interval=0
+switched_out=false
 system=system
 tracer=system.cpu.tracer
 workload=system.cpu.workload
-dcache_port=system.l1_cntrl0.sequencer.slave[1]
-icache_port=system.l1_cntrl0.sequencer.slave[0]
+dcache_port=system.ruby.l1_cntrl0.sequencer.slave[1]
+icache_port=system.ruby.l1_cntrl0.sequencer.slave[0]
 
 [system.cpu.dtb]
 type=AlphaTLB
@@ -63,6 +65,9 @@ size=64
 [system.cpu.interrupts]
 type=AlphaInterrupts
 
+[system.cpu.isa]
+type=AlphaISA
+
 [system.cpu.itb]
 type=AlphaTLB
 size=48
@@ -89,32 +94,56 @@ simpoint=0
 system=system
 uid=100
 
-[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=false
+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
@@ -136,13 +165,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
@@ -155,11 +185,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
@@ -173,7 +203,7 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.l1_cntrl0.L1IcacheMemory]
+[system.ruby.l1_cntrl0.L1IcacheMemory]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -187,13 +217,13 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.l1_cntrl0.sequencer]
+[system.ruby.l1_cntrl0.sequencer]
 type=RubySequencer
 access_phys_mem=true
 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
@@ -204,12 +234,13 @@ using_ruby_tester=false
 version=0
 slave=system.cpu.icache_port system.cpu.dcache_port
 
-[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
@@ -220,7 +251,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
@@ -234,34 +265,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=false
-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
@@ -281,7 +290,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
@@ -289,6 +298,7 @@ weight=1
 
 [system.ruby.network.topology.ext_links0.int_node]
 type=Switch
+clock=1
 router_id=0
 virt_nets=10
 
@@ -296,7 +306,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
@@ -304,6 +314,7 @@ weight=1
 
 [system.ruby.network.topology.ext_links1.int_node]
 type=Switch
+clock=1
 router_id=1
 virt_nets=10
 
@@ -311,7 +322,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
@@ -319,6 +330,7 @@ weight=1
 
 [system.ruby.network.topology.ext_links2.int_node]
 type=Switch
+clock=1
 router_id=2
 virt_nets=10
 
@@ -334,6 +346,7 @@ weight=1
 
 [system.ruby.network.topology.int_links0.node_b]
 type=Switch
+clock=1
 router_id=3
 virt_nets=10
 

diff --git a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_token/ruby.stats b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_token/ruby.stats
index 0cd5b5b0f83b93d04af732d6ec9fe41b7e53dff8..b78176d2026b58dc6e0aa2fad0b756c71fb36b0b 100644 (file)
--- a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_token/ruby.stats
+++ b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-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.43
-Virtual_time_in_minutes: 0.00716667
-Virtual_time_in_hours:   0.000119444
-Virtual_time_in_days:    4.97685e-06
+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
 
 Ruby_current_time: 43073
 Ruby_start_time: 0
 Ruby_cycles: 43073
 
-mbytes_resident: 51.0586
-mbytes_total: 264.82
-resident_ratio: 0.192819
+mbytes_resident: 52.7383
+mbytes_total: 273.328
+resident_ratio: 0.193006
 
 ruby_cycles_executed: [ 43074 ]
 
@@ -91,11 +91,11 @@ Resource Usage
 page_size: 4096
 user_time: 0
 system_time: 0
-page_reclaims: 10155
+page_reclaims: 10157
 page_faults: 0
 swaps: 0
 block_inputs: 0
-block_outputs: 80
+block_outputs: 96
 
 Network Stats
 -------------
@@ -161,28 +161,28 @@ links_utilized_percent_switch_3: 4.36236
   outgoing_messages_switch_3_link_2_Writeback_Data: 84 6048 [ 0 0 0 0 84 0 0 0 0 0 ] base_latency: 1
   outgoing_messages_switch_3_link_2_Writeback_Control: 365 2920 [ 0 0 0 0 365 0 0 0 0 0 ] base_latency: 1
 
-Cache Stats: system.l1_cntrl0.L1IcacheMemory
-  system.l1_cntrl0.L1IcacheMemory_total_misses: 270
-  system.l1_cntrl0.L1IcacheMemory_total_demand_misses: 270
-  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: 270
+  system.ruby.l1_cntrl0.L1IcacheMemory_total_demand_misses: 270
+  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:   270    100%
+  system.ruby.l1_cntrl0.L1IcacheMemory_access_mode_type_Supervisor:   270    100%
 
-Cache Stats: system.l1_cntrl0.L1DcacheMemory
-  system.l1_cntrl0.L1DcacheMemory_total_misses: 248
-  system.l1_cntrl0.L1DcacheMemory_total_demand_misses: 248
-  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: 248
+  system.ruby.l1_cntrl0.L1DcacheMemory_total_demand_misses: 248
+  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:   73.3871%
-  system.l1_cntrl0.L1DcacheMemory_request_type_ST:   26.6129%
+  system.ruby.l1_cntrl0.L1DcacheMemory_request_type_LD:   73.3871%
+  system.ruby.l1_cntrl0.L1DcacheMemory_request_type_ST:   26.6129%
 
-  system.l1_cntrl0.L1DcacheMemory_access_mode_type_Supervisor:   248    100%
+  system.ruby.l1_cntrl0.L1DcacheMemory_access_mode_type_Supervisor:   248    100%
 
  --- L1Cache ---
  - Event Counts -
@@ -535,17 +535,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: 454
-  system.l2_cntrl0.L2cacheMemory_total_demand_misses: 454
-  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: 454
+  system.ruby.l2_cntrl0.L2cacheMemory_total_demand_misses: 454
+  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:   87.2247%
-  system.l2_cntrl0.L2cacheMemory_request_type_GETX:   12.7753%
+  system.ruby.l2_cntrl0.L2cacheMemory_request_type_GETS:   87.2247%
+  system.ruby.l2_cntrl0.L2cacheMemory_request_type_GETX:   12.7753%
 
-  system.l2_cntrl0.L2cacheMemory_access_mode_type_Supervisor:   454    100%
+  system.ruby.l2_cntrl0.L2cacheMemory_access_mode_type_Supervisor:   454    100%
 
  --- L2Cache ---
  - Event Counts -
@@ -702,7 +702,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: 532
   memory_reads: 448
   memory_writes: 84

diff --git a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_token/stats.txt b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_token/stats.txt
index 1cfc617f8c0a4498db60b9fbe955e2c4960fb7f0..cef9f9d7801426b21707cf0ee4e0ea5d05f57508 100644 (file)
--- a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_token/stats.txt
+++ b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_token/stats.txt
@@ -4,10 +4,10 @@ sim_seconds                                  0.000043                       # Nu
 sim_ticks                                       43073                       # Number of ticks simulated
 final_tick                                      43073                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                   1000000000                       # Frequency of simulated ticks
-host_inst_rate                                  22520                       # Simulator instruction rate (inst/s)
-host_op_rate                                    22517                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                                 376297                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 231852                       # Number of bytes of host memory used
+host_inst_rate                                  22783                       # Simulator instruction rate (inst/s)
+host_op_rate                                    22779                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                                 380677                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 279892                       # Number of bytes of host memory used
 host_seconds                                     0.11                       # Real time elapsed on the host
 sim_insts                                        2577                       # Number of instructions simulated
 sim_ops                                          2577                       # Number of ops (including micro ops) simulated
@@ -33,24 +33,24 @@ system.physmem.bw_write::total               47779351                       # Wr
 system.physmem.bw_total::cpu.inst           240057577                       # Total bandwidth to/from this memory (bytes/s)
 system.physmem.bw_total::cpu.data           117800014                       # Total bandwidth to/from this memory (bytes/s)
 system.physmem.bw_total::total              357857591                       # Total bandwidth to/from this memory (bytes/s)
-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
+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.cpu.dtb.fetch_hits                           0                       # ITB hits
 system.cpu.dtb.fetch_misses                         0                       # ITB misses
 system.cpu.dtb.fetch_acv                            0                       # ITB acv

diff --git a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_hammer/config.ini b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_hammer/config.ini
index b4847a744673d6f9ac53ce11cae34647f2a8deec..0d61ec3c3782d40caf032c9363f4a93f77ffdb94 100644 (file)
--- a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_hammer/config.ini
+++ b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_hammer/config.ini
@@ -8,13 +8,14 @@ time_sync_spin_threshold=100000
 
 [system]
 type=System
-children=cpu dir_cntrl0 l1_cntrl0 physmem ruby sys_port_proxy
+children=cpu physmem ruby sys_port_proxy
 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=
@@ -30,11 +31,10 @@ system_port=system.sys_port_proxy.slave[0]
 
 [system.cpu]
 type=TimingSimpleCPU
-children=dtb interrupts itb tracer workload
+children=dtb interrupts isa itb tracer workload
 checker=Null
 clock=1
 cpu_id=0
-defer_registration=false
 do_checkpoint_insts=true
 do_quiesce=true
 do_statistics_insts=true
@@ -42,6 +42,7 @@ dtb=system.cpu.dtb
 function_trace=false
 function_trace_start=0
 interrupts=system.cpu.interrupts
+isa=system.cpu.isa
 itb=system.cpu.itb
 max_insts_all_threads=0
 max_insts_any_thread=0
@@ -50,11 +51,12 @@ max_loads_any_thread=0
 numThreads=1
 profile=0
 progress_interval=0
+switched_out=false
 system=system
 tracer=system.cpu.tracer
 workload=system.cpu.workload
-dcache_port=system.l1_cntrl0.sequencer.slave[1]
-icache_port=system.l1_cntrl0.sequencer.slave[0]
+dcache_port=system.ruby.l1_cntrl0.sequencer.slave[1]
+icache_port=system.ruby.l1_cntrl0.sequencer.slave[0]
 
 [system.cpu.dtb]
 type=AlphaTLB
@@ -63,6 +65,9 @@ size=64
 [system.cpu.interrupts]
 type=AlphaInterrupts
 
+[system.cpu.isa]
+type=AlphaISA
+
 [system.cpu.itb]
 type=AlphaTLB
 size=48
@@ -89,32 +94,56 @@ simpoint=0
 system=system
 uid=100
 
-[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=false
+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
@@ -136,7 +165,7 @@ ruby_system=system.ruby
 tFaw=0
 version=0
 
-[system.dir_cntrl0.probeFilter]
+[system.ruby.dir_cntrl0.probeFilter]
 type=RubyCache
 assoc=4
 dataAccessLatency=1
@@ -150,14 +179,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
@@ -166,11 +196,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
@@ -184,7 +214,7 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.l1_cntrl0.L1IcacheMemory]
+[system.ruby.l1_cntrl0.L1IcacheMemory]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -198,7 +228,7 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.l1_cntrl0.L2cacheMemory]
+[system.ruby.l1_cntrl0.L2cacheMemory]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -212,13 +242,13 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.l1_cntrl0.sequencer]
+[system.ruby.l1_cntrl0.sequencer]
 type=RubySequencer
 access_phys_mem=true
 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
@@ -229,34 +259,12 @@ using_ruby_tester=false
 version=0
 slave=system.cpu.icache_port system.cpu.dcache_port
 
-[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=false
-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
@@ -276,7 +284,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
@@ -284,6 +292,7 @@ weight=1
 
 [system.ruby.network.topology.ext_links0.int_node]
 type=Switch
+clock=1
 router_id=0
 virt_nets=10
 
@@ -291,7 +300,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
@@ -299,6 +308,7 @@ weight=1
 
 [system.ruby.network.topology.ext_links1.int_node]
 type=Switch
+clock=1
 router_id=1
 virt_nets=10
 
@@ -314,6 +324,7 @@ weight=1
 
 [system.ruby.network.topology.int_links0.node_b]
 type=Switch
+clock=1
 router_id=2
 virt_nets=10
 

diff --git a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_hammer/ruby.stats b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_hammer/ruby.stats
index 9e9602eaf34ad3911aa05b61cf02018ccceefef6..5c65ffbd7a4b9115d0e2da564d0ebff147c7450f 100644 (file)
--- a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_hammer/ruby.stats
+++ b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_hammer/ruby.stats
@@ -1,4 +1,4 @@
-Real time: Sep/01/2012 13:54:35
+Real time: Jan/14/2013 08:16:38
 
 Profiler Stats
 --------------
@@ -7,18 +7,18 @@ Elapsed_time_in_minutes: 0.0166667
 Elapsed_time_in_hours: 0.000277778
 Elapsed_time_in_days: 1.15741e-05
 
-Virtual_time_in_seconds: 0.39
-Virtual_time_in_minutes: 0.0065
-Virtual_time_in_hours:   0.000108333
-Virtual_time_in_days:    4.51389e-06
+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
 
 Ruby_current_time: 35432
 Ruby_start_time: 0
 Ruby_cycles: 35432
 
-mbytes_resident: 47.6953
-mbytes_total: 256.324
-resident_ratio: 0.186135
+mbytes_resident: 52.2109
+mbytes_total: 272.309
+resident_ratio: 0.191777
 
 ruby_cycles_executed: [ 35433 ]
 
@@ -90,11 +90,11 @@ Resource Usage
 page_size: 4096
 user_time: 0
 system_time: 0
-page_reclaims: 9203
+page_reclaims: 10038
 page_faults: 0
 swaps: 0
 block_inputs: 0
-block_outputs: 80
+block_outputs: 88
 
 Network Stats
 -------------
@@ -145,41 +145,41 @@ links_utilized_percent_switch_2: 4.77887
   outgoing_messages_switch_2_link_1_Writeback_Control: 769 6152 [ 0 0 425 0 0 344 0 0 0 0 ] base_latency: 1
   outgoing_messages_switch_2_link_1_Unblock_Control: 440 3520 [ 0 0 0 0 0 440 0 0 0 0 ] base_latency: 1
 
-Cache Stats: system.l1_cntrl0.L1IcacheMemory
-  system.l1_cntrl0.L1IcacheMemory_total_misses: 270
-  system.l1_cntrl0.L1IcacheMemory_total_demand_misses: 270
-  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: 270
+  system.ruby.l1_cntrl0.L1IcacheMemory_total_demand_misses: 270
+  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:   270    100%
+  system.ruby.l1_cntrl0.L1IcacheMemory_access_mode_type_Supervisor:   270    100%
 
-Cache Stats: system.l1_cntrl0.L1DcacheMemory
-  system.l1_cntrl0.L1DcacheMemory_total_misses: 240
-  system.l1_cntrl0.L1DcacheMemory_total_demand_misses: 240
-  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: 240
+  system.ruby.l1_cntrl0.L1DcacheMemory_total_demand_misses: 240
+  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:   75.8333%
-  system.l1_cntrl0.L1DcacheMemory_request_type_ST:   24.1667%
+  system.ruby.l1_cntrl0.L1DcacheMemory_request_type_LD:   75.8333%
+  system.ruby.l1_cntrl0.L1DcacheMemory_request_type_ST:   24.1667%
 
-  system.l1_cntrl0.L1DcacheMemory_access_mode_type_Supervisor:   240    100%
+  system.ruby.l1_cntrl0.L1DcacheMemory_access_mode_type_Supervisor:   240    100%
 
-Cache Stats: system.l1_cntrl0.L2cacheMemory
-  system.l1_cntrl0.L2cacheMemory_total_misses: 510
-  system.l1_cntrl0.L2cacheMemory_total_demand_misses: 510
-  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: 510
+  system.ruby.l1_cntrl0.L2cacheMemory_total_demand_misses: 510
+  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:   35.6863%
-  system.l1_cntrl0.L2cacheMemory_request_type_ST:   11.3725%
-  system.l1_cntrl0.L2cacheMemory_request_type_IFETCH:   52.9412%
+  system.ruby.l1_cntrl0.L2cacheMemory_request_type_LD:   35.6863%
+  system.ruby.l1_cntrl0.L2cacheMemory_request_type_ST:   11.3725%
+  system.ruby.l1_cntrl0.L2cacheMemory_request_type_IFETCH:   52.9412%
 
-  system.l1_cntrl0.L2cacheMemory_access_mode_type_Supervisor:   510    100%
+  system.ruby.l1_cntrl0.L2cacheMemory_access_mode_type_Supervisor:   510    100%
 
  --- L1Cache ---
  - Event Counts -
@@ -578,15 +578,15 @@ MM_WF  Ack [0 ] 0
 MM_WF  All_acks_no_sharers [0 ] 0
 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: 522
   memory_reads: 441
   memory_writes: 81

diff --git a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_hammer/stats.txt b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_hammer/stats.txt
index c2b9c6eb8988af4dddb34fa93d310c59fd337cdc..637f1a7d6f4063f2407cd0bc6f3b258cc7a21835 100644 (file)
--- a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_hammer/stats.txt
+++ b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_hammer/stats.txt
@@ -4,11 +4,11 @@ sim_seconds                                  0.000035                       # Nu
 sim_ticks                                       35432                       # Number of ticks simulated
 final_tick                                      35432                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                   1000000000                       # Frequency of simulated ticks
-host_inst_rate                                  32925                       # Simulator instruction rate (inst/s)
-host_op_rate                                    32915                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                                 452422                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 262480                       # Number of bytes of host memory used
-host_seconds                                     0.08                       # Real time elapsed on the host
+host_inst_rate                                  22356                       # Simulator instruction rate (inst/s)
+host_op_rate                                    22352                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                                 307273                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 278848                       # Number of bytes of host memory used
+host_seconds                                     0.12                       # Real time elapsed on the host
 sim_insts                                        2577                       # Number of instructions simulated
 sim_ops                                          2577                       # Number of ops (including micro ops) simulated
 system.physmem.bytes_read::cpu.inst             10340                       # Number of bytes read from this memory
@@ -33,30 +33,30 @@ system.physmem.bw_write::total               58083089                       # Wr
 system.physmem.bw_total::cpu.inst           291826597                       # Total bandwidth to/from this memory (bytes/s)
 system.physmem.bw_total::cpu.data           143203883                       # Total bandwidth to/from this memory (bytes/s)
 system.physmem.bw_total::total              435030481                       # Total bandwidth to/from this memory (bytes/s)
-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
+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
 system.cpu.dtb.fetch_hits                           0                       # ITB hits
 system.cpu.dtb.fetch_misses                         0                       # ITB misses
 system.cpu.dtb.fetch_acv                            0                       # ITB acv

diff --git a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby/config.ini b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby/config.ini
index c527a672b27a43ffc5c81c2477974b7826dec8ed..f9f9df41290b32f9755ff055e2aeffdaf8e39522 100644 (file)
--- a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby/config.ini
+++ b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby/config.ini
@@ -8,13 +8,14 @@ time_sync_spin_threshold=100000
 
 [system]
 type=System
-children=cpu dir_cntrl0 l1_cntrl0 physmem ruby sys_port_proxy
+children=cpu physmem ruby sys_port_proxy
 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=
@@ -30,11 +31,10 @@ system_port=system.sys_port_proxy.slave[0]
 
 [system.cpu]
 type=TimingSimpleCPU
-children=dtb interrupts itb tracer workload
+children=dtb interrupts isa itb tracer workload
 checker=Null
 clock=1
 cpu_id=0
-defer_registration=false
 do_checkpoint_insts=true
 do_quiesce=true
 do_statistics_insts=true
@@ -42,6 +42,7 @@ dtb=system.cpu.dtb
 function_trace=false
 function_trace_start=0
 interrupts=system.cpu.interrupts
+isa=system.cpu.isa
 itb=system.cpu.itb
 max_insts_all_threads=0
 max_insts_any_thread=0
@@ -50,11 +51,12 @@ max_loads_any_thread=0
 numThreads=1
 profile=0
 progress_interval=0
+switched_out=false
 system=system
 tracer=system.cpu.tracer
 workload=system.cpu.workload
-dcache_port=system.l1_cntrl0.sequencer.slave[1]
-icache_port=system.l1_cntrl0.sequencer.slave[0]
+dcache_port=system.ruby.l1_cntrl0.sequencer.slave[1]
+icache_port=system.ruby.l1_cntrl0.sequencer.slave[0]
 
 [system.cpu.dtb]
 type=AlphaTLB
@@ -63,6 +65,9 @@ size=64
 [system.cpu.interrupts]
 type=AlphaInterrupts
 
+[system.cpu.isa]
+type=AlphaISA
+
 [system.cpu.itb]
 type=AlphaTLB
 size=48
@@ -89,29 +94,53 @@ simpoint=0
 system=system
 uid=100
 
-[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=false
+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
@@ -133,23 +162,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
@@ -163,13 +193,13 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.l1_cntrl0.sequencer]
+[system.ruby.l1_cntrl0.sequencer]
 type=RubySequencer
 access_phys_mem=true
 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
@@ -180,34 +210,12 @@ using_ruby_tester=false
 version=0
 slave=system.cpu.icache_port system.cpu.dcache_port
 
-[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=false
-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
@@ -227,7 +235,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
@@ -235,6 +243,7 @@ weight=1
 
 [system.ruby.network.topology.ext_links0.int_node]
 type=Switch
+clock=1
 router_id=0
 virt_nets=10
 
@@ -242,7 +251,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
@@ -250,6 +259,7 @@ weight=1
 
 [system.ruby.network.topology.ext_links1.int_node]
 type=Switch
+clock=1
 router_id=1
 virt_nets=10
 
@@ -265,6 +275,7 @@ weight=1
 
 [system.ruby.network.topology.int_links0.node_b]
 type=Switch
+clock=1
 router_id=2
 virt_nets=10
 

diff --git a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby/ruby.stats b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby/ruby.stats
index d2ee4991b20cebb6f49d09964b40415b4546b077..1f1d21982bf3bb4127d5d0c3417c925f7e19daa0 100644 (file)
--- a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby/ruby.stats
+++ b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby/ruby.stats
@@ -1,4 +1,4 @@
-Real time: Sep/09/2012 13:26:05
+Real time: Jan/14/2013 08:12:30
 
 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.39
-Virtual_time_in_minutes: 0.0065
-Virtual_time_in_hours:   0.000108333
-Virtual_time_in_days:    4.51389e-06
+Virtual_time_in_seconds: 0.42
+Virtual_time_in_minutes: 0.007
+Virtual_time_in_hours:   0.000116667
+Virtual_time_in_days:    4.86111e-06
 
 Ruby_current_time: 52498
 Ruby_start_time: 0
 Ruby_cycles: 52498
 
-mbytes_resident: 53.1406
-mbytes_total: 264.43
-resident_ratio: 0.200978
+mbytes_resident: 52.5664
+mbytes_total: 272.77
+resident_ratio: 0.192757
 
 ruby_cycles_executed: [ 52499 ]
 
@@ -86,11 +86,11 @@ Resource Usage
 page_size: 4096
 user_time: 0
 system_time: 0
-page_reclaims: 10146
+page_reclaims: 10106
 page_faults: 0
 swaps: 0
 block_inputs: 0
-block_outputs: 80
+block_outputs: 88
 
 Network Stats
 -------------
@@ -134,18 +134,18 @@ links_utilized_percent_switch_2: 5.94308
   outgoing_messages_switch_2_link_1_Control: 626 5008 [ 0 0 626 0 0 0 0 0 0 0 ] base_latency: 1
   outgoing_messages_switch_2_link_1_Data: 622 44784 [ 0 0 622 0 0 0 0 0 0 0 ] base_latency: 1
 
-Cache Stats: system.l1_cntrl0.cacheMemory
-  system.l1_cntrl0.cacheMemory_total_misses: 626
-  system.l1_cntrl0.cacheMemory_total_demand_misses: 626
-  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: 626
+  system.ruby.l1_cntrl0.cacheMemory_total_demand_misses: 626
+  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:   39.1374%
-  system.l1_cntrl0.cacheMemory_request_type_ST:   13.4185%
-  system.l1_cntrl0.cacheMemory_request_type_IFETCH:   47.4441%
+  system.ruby.l1_cntrl0.cacheMemory_request_type_LD:   39.1374%
+  system.ruby.l1_cntrl0.cacheMemory_request_type_ST:   13.4185%
+  system.ruby.l1_cntrl0.cacheMemory_request_type_IFETCH:   47.4441%
 
-  system.l1_cntrl0.cacheMemory_access_mode_type_Supervisor:   626    100%
+  system.ruby.l1_cntrl0.cacheMemory_access_mode_type_Supervisor:   626    100%
 
  --- L1Cache ---
  - Event Counts -
@@ -186,7 +186,7 @@ IS  Data [542 ] 542
 
 IM  Data [84 ] 84
 
-Memory controller: system.dir_cntrl0.memBuffer:
+Memory controller: system.ruby.dir_cntrl0.memBuffer:
   memory_total_requests: 1248
   memory_reads: 626
   memory_writes: 622

diff --git a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby/stats.txt b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby/stats.txt
index 082021b654044351aa0983a71184561b2cdb640c..520abecf4330679f88770df6d380949237351b08 100644 (file)
--- a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby/stats.txt
+++ b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby/stats.txt
@@ -4,11 +4,11 @@ sim_seconds                                  0.000052                       # Nu
 sim_ticks                                       52498                       # Number of ticks simulated
 final_tick                                      52498                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                   1000000000                       # Frequency of simulated ticks
-host_inst_rate                                  23489                       # Simulator instruction rate (inst/s)
-host_op_rate                                    23485                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                                 478350                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 231456                       # Number of bytes of host memory used
-host_seconds                                     0.11                       # Real time elapsed on the host
+host_inst_rate                                  26806                       # Simulator instruction rate (inst/s)
+host_op_rate                                    26801                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                                 545876                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 279320                       # Number of bytes of host memory used
+host_seconds                                     0.10                       # Real time elapsed on the host
 sim_insts                                        2577                       # Number of instructions simulated
 sim_ops                                          2577                       # Number of ops (including micro ops) simulated
 system.physmem.bytes_read::cpu.inst             10340                       # Number of bytes read from this memory
@@ -33,12 +33,12 @@ system.physmem.bw_write::total               39201493                       # Wr
 system.physmem.bw_total::cpu.inst           196959884                       # Total bandwidth to/from this memory (bytes/s)
 system.physmem.bw_total::cpu.data            96651301                       # Total bandwidth to/from this memory (bytes/s)
 system.physmem.bw_total::total              293611185                       # Total bandwidth to/from this memory (bytes/s)
-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
+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
 system.cpu.dtb.fetch_hits                           0                       # ITB hits
 system.cpu.dtb.fetch_misses                         0                       # ITB misses
 system.cpu.dtb.fetch_acv                            0                       # ITB acv

diff --git a/tests/quick/se/00.hello/ref/mips/linux/simple-timing-ruby/config.ini b/tests/quick/se/00.hello/ref/mips/linux/simple-timing-ruby/config.ini
index 10ce5543fa81df35c52002c4527c75a209bcdab6..59f6aa1fe68c4982636a84ccb8ad841f745cab07 100644 (file)
--- a/tests/quick/se/00.hello/ref/mips/linux/simple-timing-ruby/config.ini
+++ b/tests/quick/se/00.hello/ref/mips/linux/simple-timing-ruby/config.ini
@@ -8,13 +8,14 @@ time_sync_spin_threshold=100000
 
 [system]
 type=System
-children=cpu dir_cntrl0 l1_cntrl0 physmem ruby sys_port_proxy
+children=cpu physmem ruby sys_port_proxy
 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=
@@ -30,11 +31,10 @@ system_port=system.sys_port_proxy.slave[0]
 
 [system.cpu]
 type=TimingSimpleCPU
-children=dtb interrupts itb tracer workload
+children=dtb interrupts isa itb tracer workload
 checker=Null
 clock=1
 cpu_id=0
-defer_registration=false
 do_checkpoint_insts=true
 do_quiesce=true
 do_statistics_insts=true
@@ -42,6 +42,7 @@ dtb=system.cpu.dtb
 function_trace=false
 function_trace_start=0
 interrupts=system.cpu.interrupts
+isa=system.cpu.isa
 itb=system.cpu.itb
 max_insts_all_threads=0
 max_insts_any_thread=0
@@ -50,11 +51,12 @@ max_loads_any_thread=0
 numThreads=1
 profile=0
 progress_interval=0
+switched_out=false
 system=system
 tracer=system.cpu.tracer
 workload=system.cpu.workload
-dcache_port=system.l1_cntrl0.sequencer.slave[1]
-icache_port=system.l1_cntrl0.sequencer.slave[0]
+dcache_port=system.ruby.l1_cntrl0.sequencer.slave[1]
+icache_port=system.ruby.l1_cntrl0.sequencer.slave[0]
 
 [system.cpu.dtb]
 type=MipsTLB
@@ -63,6 +65,11 @@ size=64
 [system.cpu.interrupts]
 type=MipsInterrupts
 
+[system.cpu.isa]
+type=MipsISA
+num_threads=1
+num_vpes=1
+
 [system.cpu.itb]
 type=MipsTLB
 size=64
@@ -89,29 +96,53 @@ simpoint=0
 system=system
 uid=100
 
-[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=false
+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
@@ -133,23 +164,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
@@ -163,13 +195,13 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.l1_cntrl0.sequencer]
+[system.ruby.l1_cntrl0.sequencer]
 type=RubySequencer
 access_phys_mem=true
 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
@@ -180,34 +212,12 @@ using_ruby_tester=false
 version=0
 slave=system.cpu.icache_port system.cpu.dcache_port
 
-[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=false
-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
@@ -227,7 +237,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
@@ -235,6 +245,7 @@ weight=1
 
 [system.ruby.network.topology.ext_links0.int_node]
 type=Switch
+clock=1
 router_id=0
 virt_nets=10
 
@@ -242,7 +253,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
@@ -250,6 +261,7 @@ weight=1
 
 [system.ruby.network.topology.ext_links1.int_node]
 type=Switch
+clock=1
 router_id=1
 virt_nets=10
 
@@ -265,6 +277,7 @@ weight=1
 
 [system.ruby.network.topology.int_links0.node_b]
 type=Switch
+clock=1
 router_id=2
 virt_nets=10
 

diff --git a/tests/quick/se/00.hello/ref/mips/linux/simple-timing-ruby/stats.txt b/tests/quick/se/00.hello/ref/mips/linux/simple-timing-ruby/stats.txt
index 461dc447db5fd6f321076cd29c673cea4e930b84..6c61d4a4ff5b429c66056b73a5e3cd9e9898fba2 100644 (file)
--- a/tests/quick/se/00.hello/ref/mips/linux/simple-timing-ruby/stats.txt
+++ b/tests/quick/se/00.hello/ref/mips/linux/simple-timing-ruby/stats.txt
@@ -4,11 +4,11 @@ sim_seconds                                  0.000125                       # Nu
 sim_ticks                                      125334                       # Number of ticks simulated
 final_tick                                     125334                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                   1000000000                       # Frequency of simulated ticks
-host_inst_rate                                  39466                       # Simulator instruction rate (inst/s)
-host_op_rate                                    39462                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                                 850593                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 235544                       # Number of bytes of host memory used
-host_seconds                                     0.15                       # Real time elapsed on the host
+host_inst_rate                                  23120                       # Simulator instruction rate (inst/s)
+host_op_rate                                    23118                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                                 498325                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 282364                       # Number of bytes of host memory used
+host_seconds                                     0.25                       # Real time elapsed on the host
 sim_insts                                        5814                       # Number of instructions simulated
 sim_ops                                          5814                       # Number of ops (including micro ops) simulated
 system.physmem.bytes_read::cpu.inst             23260                       # Number of bytes read from this memory
@@ -33,12 +33,12 @@ system.physmem.bw_write::total               29186015                       # Wr
 system.physmem.bw_total::cpu.inst           185584119                       # Total bandwidth to/from this memory (bytes/s)
 system.physmem.bw_total::cpu.data            64084766                       # Total bandwidth to/from this memory (bytes/s)
 system.physmem.bw_total::total              249668885                       # Total bandwidth to/from this memory (bytes/s)
-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
+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
 system.cpu.dtb.read_hits                            0                       # DTB read hits
 system.cpu.dtb.read_misses                          0                       # DTB read misses
 system.cpu.dtb.read_accesses                        0                       # DTB read accesses

diff --git a/tests/quick/se/00.hello/ref/sparc/linux/simple-timing-ruby/config.ini b/tests/quick/se/00.hello/ref/sparc/linux/simple-timing-ruby/config.ini
index ab18e451dbd7591e3b28c17b6ba9404ad3fe4a4b..f73262840a00b73599bcbcc29c5415e1dd3d0bb1 100644 (file)
--- a/tests/quick/se/00.hello/ref/sparc/linux/simple-timing-ruby/config.ini
+++ b/tests/quick/se/00.hello/ref/sparc/linux/simple-timing-ruby/config.ini
@@ -8,13 +8,14 @@ time_sync_spin_threshold=100000
 
 [system]
 type=System
-children=cpu dir_cntrl0 l1_cntrl0 physmem ruby sys_port_proxy
+children=cpu physmem ruby sys_port_proxy
 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=
@@ -30,11 +31,10 @@ system_port=system.sys_port_proxy.slave[0]
 
 [system.cpu]
 type=TimingSimpleCPU
-children=dtb interrupts itb tracer workload
+children=dtb interrupts isa itb tracer workload
 checker=Null
 clock=1
 cpu_id=0
-defer_registration=false
 do_checkpoint_insts=true
 do_quiesce=true
 do_statistics_insts=true
@@ -42,6 +42,7 @@ dtb=system.cpu.dtb
 function_trace=false
 function_trace_start=0
 interrupts=system.cpu.interrupts
+isa=system.cpu.isa
 itb=system.cpu.itb
 max_insts_all_threads=0
 max_insts_any_thread=0
@@ -50,11 +51,12 @@ max_loads_any_thread=0
 numThreads=1
 profile=0
 progress_interval=0
+switched_out=false
 system=system
 tracer=system.cpu.tracer
 workload=system.cpu.workload
-dcache_port=system.l1_cntrl0.sequencer.slave[1]
-icache_port=system.l1_cntrl0.sequencer.slave[0]
+dcache_port=system.ruby.l1_cntrl0.sequencer.slave[1]
+icache_port=system.ruby.l1_cntrl0.sequencer.slave[0]
 
 [system.cpu.dtb]
 type=SparcTLB
@@ -63,6 +65,9 @@ size=64
 [system.cpu.interrupts]
 type=SparcInterrupts
 
+[system.cpu.isa]
+type=SparcISA
+
 [system.cpu.itb]
 type=SparcTLB
 size=64
@@ -78,7 +83,7 @@ egid=100
 env=
 errout=cerr
 euid=100
-executable=/projects/pd/randd/dist/test-progs/hello/bin/sparc/linux/hello
+executable=tests/test-progs/hello/bin/sparc/linux/hello
 gid=100
 input=cin
 max_stack_size=67108864
@@ -89,21 +94,45 @@ simpoint=0
 system=system
 uid=100
 
-[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=false
+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=5
@@ -111,7 +140,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
@@ -133,23 +162,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
@@ -163,13 +193,13 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.l1_cntrl0.sequencer]
+[system.ruby.l1_cntrl0.sequencer]
 type=RubySequencer
 access_phys_mem=true
 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
@@ -180,34 +210,12 @@ using_ruby_tester=false
 version=0
 slave=system.cpu.icache_port system.cpu.dcache_port
 
-[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=false
-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
@@ -227,7 +235,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
@@ -235,6 +243,7 @@ weight=1
 
 [system.ruby.network.topology.ext_links0.int_node]
 type=Switch
+clock=1
 router_id=0
 virt_nets=10
 
@@ -242,7 +251,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
@@ -250,6 +259,7 @@ weight=1
 
 [system.ruby.network.topology.ext_links1.int_node]
 type=Switch
+clock=1
 router_id=1
 virt_nets=10
 
@@ -265,6 +275,7 @@ weight=1
 
 [system.ruby.network.topology.int_links0.node_b]
 type=Switch
+clock=1
 router_id=2
 virt_nets=10
 

diff --git a/tests/quick/se/00.hello/ref/sparc/linux/simple-timing-ruby/ruby.stats b/tests/quick/se/00.hello/ref/sparc/linux/simple-timing-ruby/ruby.stats
index b9367ba4b42455198287e6f22c1df3d7c6cc6a03..c5c22fe6956ce020b1de90e7c040814e49bc5d9e 100644 (file)
--- a/tests/quick/se/00.hello/ref/sparc/linux/simple-timing-ruby/ruby.stats
+++ b/tests/quick/se/00.hello/ref/sparc/linux/simple-timing-ruby/ruby.stats
@@ -1,4 +1,4 @@
-Real time: Sep/09/2012 13:47:33
+Real time: Jan/14/2013 08:36:36
 
 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.42
-Virtual_time_in_minutes: 0.007
-Virtual_time_in_hours:   0.000116667
-Virtual_time_in_days:    4.86111e-06
+Virtual_time_in_seconds: 0.57
+Virtual_time_in_minutes: 0.0095
+Virtual_time_in_hours:   0.000158333
+Virtual_time_in_days:    6.59722e-06
 
 Ruby_current_time: 107952
 Ruby_start_time: 0
 Ruby_cycles: 107952
 
-mbytes_resident: 54.2266
-mbytes_total: 273.301
-resident_ratio: 0.198428
+mbytes_resident: 55.6602
+mbytes_total: 282.727
+resident_ratio: 0.196911
 
 ruby_cycles_executed: [ 107953 ]
 
@@ -86,11 +86,11 @@ Resource Usage
 page_size: 4096
 user_time: 0
 system_time: 0
-page_reclaims: 10992
+page_reclaims: 11405
 page_faults: 0
 swaps: 0
 block_inputs: 0
-block_outputs: 80
+block_outputs: 88
 
 Network Stats
 -------------
@@ -134,18 +134,18 @@ links_utilized_percent_switch_2: 5.96098
   outgoing_messages_switch_2_link_1_Control: 1289 10312 [ 0 0 1289 0 0 0 0 0 0 0 ] base_latency: 1
   outgoing_messages_switch_2_link_1_Data: 1285 92520 [ 0 0 1285 0 0 0 0 0 0 0 ] base_latency: 1
 
-Cache Stats: system.l1_cntrl0.cacheMemory
-  system.l1_cntrl0.cacheMemory_total_misses: 1289
-  system.l1_cntrl0.cacheMemory_total_demand_misses: 1289
-  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: 1289
+  system.ruby.l1_cntrl0.cacheMemory_total_demand_misses: 1289
+  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:   30.6439%
-  system.l1_cntrl0.cacheMemory_request_type_ST:   13.8867%
-  system.l1_cntrl0.cacheMemory_request_type_IFETCH:   55.4694%
+  system.ruby.l1_cntrl0.cacheMemory_request_type_LD:   30.6439%
+  system.ruby.l1_cntrl0.cacheMemory_request_type_ST:   13.8867%
+  system.ruby.l1_cntrl0.cacheMemory_request_type_IFETCH:   55.4694%
 
-  system.l1_cntrl0.cacheMemory_access_mode_type_Supervisor:   1289    100%
+  system.ruby.l1_cntrl0.cacheMemory_access_mode_type_Supervisor:   1289    100%
 
  --- L1Cache ---
  - Event Counts -
@@ -186,7 +186,7 @@ IS  Data [1110 ] 1110
 
 IM  Data [179 ] 179
 
-Memory controller: system.dir_cntrl0.memBuffer:
+Memory controller: system.ruby.dir_cntrl0.memBuffer:
   memory_total_requests: 2574
   memory_reads: 1289
   memory_writes: 1285

diff --git a/tests/quick/se/00.hello/ref/sparc/linux/simple-timing-ruby/stats.txt b/tests/quick/se/00.hello/ref/sparc/linux/simple-timing-ruby/stats.txt
index 0ee67c48815582dac6cd53e6821cea71bb699bcc..78e09ef17d5bafd01d7d8b11fc080528b143f781 100644 (file)
--- a/tests/quick/se/00.hello/ref/sparc/linux/simple-timing-ruby/stats.txt
+++ b/tests/quick/se/00.hello/ref/sparc/linux/simple-timing-ruby/stats.txt
@@ -4,11 +4,11 @@ sim_seconds                                  0.000108                       # Nu
 sim_ticks                                      107952                       # Number of ticks simulated
 final_tick                                     107952                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                   1000000000                       # Frequency of simulated ticks
-host_inst_rate                                  33106                       # Simulator instruction rate (inst/s)
-host_op_rate                                    33103                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                                 670773                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 232832                       # Number of bytes of host memory used
-host_seconds                                     0.16                       # Real time elapsed on the host
+host_inst_rate                                  20687                       # Simulator instruction rate (inst/s)
+host_op_rate                                    20685                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                                 419155                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 289516                       # Number of bytes of host memory used
+host_seconds                                     0.26                       # Real time elapsed on the host
 sim_insts                                        5327                       # Number of instructions simulated
 sim_ops                                          5327                       # Number of ops (including micro ops) simulated
 system.physmem.bytes_read::cpu.inst             21480                       # Number of bytes read from this memory
@@ -33,12 +33,12 @@ system.physmem.bw_write::total               46919001                       # Wr
 system.physmem.bw_total::cpu.inst           198977323                       # Total bandwidth to/from this memory (bytes/s)
 system.physmem.bw_total::cpu.data            89549059                       # Total bandwidth to/from this memory (bytes/s)
 system.physmem.bw_total::total              288526382                       # Total bandwidth to/from this memory (bytes/s)
-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
+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
 system.cpu.workload.num_syscalls                   11                       # Number of system calls
 system.cpu.numCycles                           107952                       # number of cpu cycles simulated
 system.cpu.numWorkItemsStarted                      0                       # number of work items this cpu started

diff --git a/tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/config.ini b/tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/config.ini
index 33bd113007dc14bbe80ffa5b9e6ae53ccac4c638..f8bb08914e663bc23694d9bc0730fb1c0cc7ae11 100644 (file)
--- a/tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/config.ini
+++ b/tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/config.ini
@@ -8,13 +8,14 @@ time_sync_spin_threshold=100000
 
 [system]
 type=System
-children=cpu dir_cntrl0 l1_cntrl0 physmem ruby sys_port_proxy
+children=cpu physmem ruby sys_port_proxy
 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=
@@ -30,11 +31,10 @@ system_port=system.sys_port_proxy.slave[0]
 
 [system.cpu]
 type=TimingSimpleCPU
-children=dtb interrupts itb tracer workload
+children=dtb interrupts isa itb tracer workload
 checker=Null
 clock=1
 cpu_id=0
-defer_registration=false
 do_checkpoint_insts=true
 do_quiesce=true
 do_statistics_insts=true
@@ -42,6 +42,7 @@ dtb=system.cpu.dtb
 function_trace=false
 function_trace_start=0
 interrupts=system.cpu.interrupts
+isa=system.cpu.isa
 itb=system.cpu.itb
 max_insts_all_threads=0
 max_insts_any_thread=0
@@ -50,11 +51,12 @@ max_loads_any_thread=0
 numThreads=1
 profile=0
 progress_interval=0
+switched_out=false
 system=system
 tracer=system.cpu.tracer
 workload=system.cpu.workload
-dcache_port=system.l1_cntrl0.sequencer.slave[1]
-icache_port=system.l1_cntrl0.sequencer.slave[0]
+dcache_port=system.ruby.l1_cntrl0.sequencer.slave[1]
+icache_port=system.ruby.l1_cntrl0.sequencer.slave[0]
 
 [system.cpu.dtb]
 type=X86TLB
@@ -66,7 +68,7 @@ walker=system.cpu.dtb.walker
 type=X86PagetableWalker
 clock=1
 system=system
-port=system.l1_cntrl0.sequencer.slave[3]
+port=system.ruby.l1_cntrl0.sequencer.slave[3]
 
 [system.cpu.interrupts]
 type=X86LocalApic
@@ -75,9 +77,12 @@ int_latency=1
 pio_addr=2305843009213693952
 pio_latency=100
 system=system
-int_master=system.l1_cntrl0.sequencer.slave[4]
-int_slave=system.l1_cntrl0.sequencer.master[1]
-pio=system.l1_cntrl0.sequencer.master[0]
+int_master=system.ruby.l1_cntrl0.sequencer.slave[4]
+int_slave=system.ruby.l1_cntrl0.sequencer.master[1]
+pio=system.ruby.l1_cntrl0.sequencer.master[0]
+
+[system.cpu.isa]
+type=X86ISA
 
 [system.cpu.itb]
 type=X86TLB
@@ -89,7 +94,7 @@ walker=system.cpu.itb.walker
 type=X86PagetableWalker
 clock=1
 system=system
-port=system.l1_cntrl0.sequencer.slave[2]
+port=system.ruby.l1_cntrl0.sequencer.slave[2]
 
 [system.cpu.tracer]
 type=ExeTracer
@@ -113,21 +118,45 @@ simpoint=0
 system=system
 uid=100
 
-[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=false
+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=5
@@ -135,7 +164,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
@@ -157,23 +186,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
@@ -187,13 +217,13 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.l1_cntrl0.sequencer]
+[system.ruby.l1_cntrl0.sequencer]
 type=RubySequencer
 access_phys_mem=true
 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
@@ -205,34 +235,12 @@ version=0
 master=system.cpu.interrupts.pio system.cpu.interrupts.int_slave
 slave=system.cpu.icache_port system.cpu.dcache_port system.cpu.itb.walker.port system.cpu.dtb.walker.port system.cpu.interrupts.int_master
 
-[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=false
-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
@@ -252,7 +260,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
@@ -260,6 +268,7 @@ weight=1
 
 [system.ruby.network.topology.ext_links0.int_node]
 type=Switch
+clock=1
 router_id=0
 virt_nets=10
 
@@ -267,7 +276,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
@@ -275,6 +284,7 @@ weight=1
 
 [system.ruby.network.topology.ext_links1.int_node]
 type=Switch
+clock=1
 router_id=1
 virt_nets=10
 
@@ -290,6 +300,7 @@ weight=1
 
 [system.ruby.network.topology.int_links0.node_b]
 type=Switch
+clock=1
 router_id=2
 virt_nets=10
 

diff --git a/tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/ruby.stats b/tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/ruby.stats
index 87c404fd624242519dca03ded301e436a07c8fbd..48dddeab78d8f829734cb58b06a4b5a43485f188 100644 (file)
--- a/tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/ruby.stats
+++ b/tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/ruby.stats
@@ -1,4 +1,4 @@
-Real time: Dec/30/2012 01:12:43
+Real time: Jan/14/2013 08:41:48
 
 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.51
-Virtual_time_in_minutes: 0.0085
-Virtual_time_in_hours:   0.000141667
-Virtual_time_in_days:    5.90278e-06
+Virtual_time_in_seconds: 0.61
+Virtual_time_in_minutes: 0.0101667
+Virtual_time_in_hours:   0.000169444
+Virtual_time_in_days:    7.06019e-06
 
 Ruby_current_time: 121759
 Ruby_start_time: 0
 Ruby_cycles: 121759
 
-mbytes_resident: 60.1836
-mbytes_total: 277.391
-resident_ratio: 0.217006
+mbytes_resident: 66.375
+mbytes_total: 290.48
+resident_ratio: 0.228541
 
 ruby_cycles_executed: [ 121760 ]
 
@@ -89,11 +89,11 @@ Resource Usage
 page_size: 4096
 user_time: 0
 system_time: 0
-page_reclaims: 12527
-page_faults: 3
+page_reclaims: 13678
+page_faults: 0
 swaps: 0
-block_inputs: 1360
-block_outputs: 88
+block_inputs: 240
+block_outputs: 152
 
 Network Stats
 -------------
@@ -137,18 +137,18 @@ links_utilized_percent_switch_2: 5.6464
   outgoing_messages_switch_2_link_1_Control: 1377 11016 [ 0 0 1377 0 0 0 0 0 0 0 ] base_latency: 1
   outgoing_messages_switch_2_link_1_Data: 1373 98856 [ 0 0 1373 0 0 0 0 0 0 0 ] base_latency: 1
 
-Cache Stats: system.l1_cntrl0.cacheMemory
-  system.l1_cntrl0.cacheMemory_total_misses: 1377
-  system.l1_cntrl0.cacheMemory_total_demand_misses: 1377
-  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: 1377
+  system.ruby.l1_cntrl0.cacheMemory_total_demand_misses: 1377
+  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:   36.2382%
-  system.l1_cntrl0.cacheMemory_request_type_ST:   18.5185%
-  system.l1_cntrl0.cacheMemory_request_type_IFETCH:   45.2433%
+  system.ruby.l1_cntrl0.cacheMemory_request_type_LD:   36.2382%
+  system.ruby.l1_cntrl0.cacheMemory_request_type_ST:   18.5185%
+  system.ruby.l1_cntrl0.cacheMemory_request_type_IFETCH:   45.2433%
 
-  system.l1_cntrl0.cacheMemory_access_mode_type_Supervisor:   1377    100%
+  system.ruby.l1_cntrl0.cacheMemory_access_mode_type_Supervisor:   1377    100%
 
  --- L1Cache ---
  - Event Counts -
@@ -189,7 +189,7 @@ IS  Data [1122 ] 1122
 
 IM  Data [255 ] 255
 
-Memory controller: system.dir_cntrl0.memBuffer:
+Memory controller: system.ruby.dir_cntrl0.memBuffer:
   memory_total_requests: 2750
   memory_reads: 1377
   memory_writes: 1373

diff --git a/tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/stats.txt b/tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/stats.txt
index 36958969e44d2b861baf221bf43ca02c0567fc1d..538b5b79e1dd82c8617886d4121ba1519879061b 100644 (file)
--- a/tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/stats.txt
+++ b/tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/stats.txt
@@ -4,11 +4,11 @@ sim_seconds                                  0.000122                       # Nu
 sim_ticks                                      121759                       # Number of ticks simulated
 final_tick                                     121759                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                   1000000000                       # Frequency of simulated ticks
-host_inst_rate                                  28531                       # Simulator instruction rate (inst/s)
-host_op_rate                                    51675                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                                 645460                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 284052                       # Number of bytes of host memory used
-host_seconds                                     0.19                       # Real time elapsed on the host
+host_inst_rate                                  22533                       # Simulator instruction rate (inst/s)
+host_op_rate                                    40812                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                                 509771                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 297456                       # Number of bytes of host memory used
+host_seconds                                     0.24                       # Real time elapsed on the host
 sim_insts                                        5381                       # Number of instructions simulated
 sim_ops                                          9747                       # Number of ops (including micro ops) simulated
 system.physmem.bytes_read::cpu.inst             54912                       # Number of bytes read from this memory
@@ -33,12 +33,12 @@ system.physmem.bw_write::total               58410467                       # Wr
 system.physmem.bw_total::cpu.inst           450989249                       # Total bandwidth to/from this memory (bytes/s)
 system.physmem.bw_total::cpu.data           116426712                       # Total bandwidth to/from this memory (bytes/s)
 system.physmem.bw_total::total              567415961                       # Total bandwidth to/from this memory (bytes/s)
-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
+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
 system.cpu.workload.num_syscalls                   11                       # Number of system calls
 system.cpu.numCycles                           121759                       # number of cpu cycles simulated
 system.cpu.numWorkItemsStarted                      0                       # number of work items this cpu started

diff --git a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_CMP_directory/config.ini b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_CMP_directory/config.ini
index 5acc189754f4afb2179819622b8aa7ea450dcb3d..e333e6d6e5e6b292ba5dc0f82e00705fe8060461 100644 (file)
--- a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_CMP_directory/config.ini
+++ b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_CMP_directory/config.ini
@@ -8,14 +8,15 @@ time_sync_spin_threshold=100000
 
 [system]
 type=System
-children=cpu0 cpu1 cpu2 cpu3 cpu4 cpu5 cpu6 cpu7 dir_cntrl0 funcbus funcmem l1_cntrl0 l1_cntrl1 l1_cntrl2 l1_cntrl3 l1_cntrl4 l1_cntrl5 l1_cntrl6 l1_cntrl7 l2_cntrl0 physmem ruby sys_port_proxy
+children=cpu0 cpu1 cpu2 cpu3 cpu4 cpu5 cpu6 cpu7 funcbus funcmem physmem ruby sys_port_proxy
 boot_osflags=a
 clock=1
 init_param=0
 kernel=
 load_addr_mask=1099511627775
 mem_mode=timing
-memories=system.physmem system.funcmem
+mem_ranges=
+memories=system.funcmem system.physmem
 num_work_ids=16
 readfile=
 symbolfile=
@@ -45,7 +46,7 @@ suppress_func_warnings=true
 sys=system
 trace_addr=0
 functional=system.funcbus.slave[0]
-test=system.l1_cntrl0.sequencer.slave[0]
+test=system.ruby.l1_cntrl0.sequencer.slave[0]
 
 [system.cpu1]
 type=MemTest
@@ -64,7 +65,7 @@ suppress_func_warnings=true
 sys=system
 trace_addr=0
 functional=system.funcbus.slave[1]
-test=system.l1_cntrl1.sequencer.slave[0]
+test=system.ruby.l1_cntrl1.sequencer.slave[0]
 
 [system.cpu2]
 type=MemTest
@@ -83,7 +84,7 @@ suppress_func_warnings=true
 sys=system
 trace_addr=0
 functional=system.funcbus.slave[2]
-test=system.l1_cntrl2.sequencer.slave[0]
+test=system.ruby.l1_cntrl2.sequencer.slave[0]
 
 [system.cpu3]
 type=MemTest
@@ -102,7 +103,7 @@ suppress_func_warnings=true
 sys=system
 trace_addr=0
 functional=system.funcbus.slave[3]
-test=system.l1_cntrl3.sequencer.slave[0]
+test=system.ruby.l1_cntrl3.sequencer.slave[0]
 
 [system.cpu4]
 type=MemTest
@@ -121,7 +122,7 @@ suppress_func_warnings=true
 sys=system
 trace_addr=0
 functional=system.funcbus.slave[4]
-test=system.l1_cntrl4.sequencer.slave[0]
+test=system.ruby.l1_cntrl4.sequencer.slave[0]
 
 [system.cpu5]
 type=MemTest
@@ -140,7 +141,7 @@ suppress_func_warnings=true
 sys=system
 trace_addr=0
 functional=system.funcbus.slave[5]
-test=system.l1_cntrl5.sequencer.slave[0]
+test=system.ruby.l1_cntrl5.sequencer.slave[0]
 
 [system.cpu6]
 type=MemTest
@@ -159,7 +160,7 @@ suppress_func_warnings=true
 sys=system
 trace_addr=0
 functional=system.funcbus.slave[6]
-test=system.l1_cntrl6.sequencer.slave[0]
+test=system.ruby.l1_cntrl6.sequencer.slave[0]
 
 [system.cpu7]
 type=MemTest
@@ -178,16 +179,63 @@ suppress_func_warnings=true
 sys=system
 trace_addr=0
 functional=system.funcbus.slave[7]
-test=system.l1_cntrl7.sequencer.slave[0]
+test=system.ruby.l1_cntrl7.sequencer.slave[0]
 
-[system.dir_cntrl0]
+[system.funcbus]
+type=NoncoherentBus
+block_size=64
+clock=1
+header_cycles=1
+use_default_range=false
+width=8
+master=system.funcmem.port
+slave=system.cpu0.functional system.cpu1.functional system.cpu2.functional system.cpu3.functional system.cpu4.functional system.cpu5.functional system.cpu6.functional system.cpu7.functional
+
+[system.funcmem]
+type=SimpleMemory
+bandwidth=0.000000
+clock=1
+conf_table_reported=false
+in_addr_map=false
+latency=30
+latency_var=0
+null=false
+range=0:134217727
+zero=false
+port=system.funcbus.master[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=dir_cntrl0 l1_cntrl0 l1_cntrl1 l1_cntrl2 l1_cntrl3 l1_cntrl4 l1_cntrl5 l1_cntrl6 l1_cntrl7 l2_cntrl0 network profiler
+block_size_bytes=64
+clock=1
+mem_size=268435456
+no_mem_vec=false
+random_seed=1234
+randomization=false
+stats_filename=ruby.stats
+
+[system.ruby.dir_cntrl0]
 type=Directory_Controller
 children=directory memBuffer
 buffer_size=0
+clock=1
 cntrl_id=9
-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
@@ -195,7 +243,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
@@ -203,7 +251,7 @@ size=268435456
 use_map=false
 version=0
 
-[system.dir_cntrl0.memBuffer]
+[system.ruby.dir_cntrl0.memBuffer]
 type=RubyMemoryControl
 bank_bit_0=8
 bank_busy_time=11
@@ -225,51 +273,29 @@ ruby_system=system.ruby
 tFaw=0
 version=0
 
-[system.funcbus]
-type=NoncoherentBus
-block_size=64
-clock=1
-header_cycles=1
-use_default_range=false
-width=8
-master=system.funcmem.port
-slave=system.cpu0.functional system.cpu1.functional system.cpu2.functional system.cpu3.functional system.cpu4.functional system.cpu5.functional system.cpu6.functional system.cpu7.functional
-
-[system.funcmem]
-type=SimpleMemory
-bandwidth=0.000000
-clock=1
-conf_table_reported=false
-in_addr_map=false
-latency=30
-latency_var=0
-null=false
-range=0:134217727
-zero=false
-port=system.funcbus.master[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
@@ -283,7 +309,7 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.l1_cntrl0.L1IcacheMemory]
+[system.ruby.l1_cntrl0.L1IcacheMemory]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -297,7 +323,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
@@ -307,13 +333,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=1000000
-icache=system.l1_cntrl0.L1IcacheMemory
+icache=system.ruby.l1_cntrl0.L1IcacheMemory
 max_outstanding_requests=16
 ruby_system=system.ruby
 support_data_reqs=true
@@ -324,28 +350,29 @@ using_ruby_tester=false
 version=0
 slave=system.cpu0.test
 
-[system.l1_cntrl1]
+[system.ruby.l1_cntrl1]
 type=L1Cache_Controller
 children=L1DcacheMemory L1IcacheMemory prefetcher sequencer
-L1DcacheMemory=system.l1_cntrl1.L1DcacheMemory
-L1IcacheMemory=system.l1_cntrl1.L1IcacheMemory
+L1DcacheMemory=system.ruby.l1_cntrl1.L1DcacheMemory
+L1IcacheMemory=system.ruby.l1_cntrl1.L1IcacheMemory
 buffer_size=0
+clock=1
 cntrl_id=1
 enable_prefetch=false
 l1_request_latency=2
 l1_response_latency=2
 l2_select_num_bits=0
 number_of_TBEs=256
-prefetcher=system.l1_cntrl1.prefetcher
+prefetcher=system.ruby.l1_cntrl1.prefetcher
 recycle_latency=10
 ruby_system=system.ruby
 send_evictions=false
-sequencer=system.l1_cntrl1.sequencer
+sequencer=system.ruby.l1_cntrl1.sequencer
 to_l2_latency=1
 transitions_per_cycle=32
 version=1
 
-[system.l1_cntrl1.L1DcacheMemory]
+[system.ruby.l1_cntrl1.L1DcacheMemory]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -359,7 +386,7 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.l1_cntrl1.L1IcacheMemory]
+[system.ruby.l1_cntrl1.L1IcacheMemory]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -373,7 +400,7 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.l1_cntrl1.prefetcher]
+[system.ruby.l1_cntrl1.prefetcher]
 type=Prefetcher
 cross_page=false
 nonunit_filter=8
@@ -383,13 +410,13 @@ pf_per_stream=1
 train_misses=4
 unit_filter=8
 
-[system.l1_cntrl1.sequencer]
+[system.ruby.l1_cntrl1.sequencer]
 type=RubySequencer
 access_phys_mem=false
 clock=1
-dcache=system.l1_cntrl1.L1DcacheMemory
+dcache=system.ruby.l1_cntrl1.L1DcacheMemory
 deadlock_threshold=1000000
-icache=system.l1_cntrl1.L1IcacheMemory
+icache=system.ruby.l1_cntrl1.L1IcacheMemory
 max_outstanding_requests=16
 ruby_system=system.ruby
 support_data_reqs=true
@@ -400,28 +427,29 @@ using_ruby_tester=false
 version=1
 slave=system.cpu1.test
 
-[system.l1_cntrl2]
+[system.ruby.l1_cntrl2]
 type=L1Cache_Controller
 children=L1DcacheMemory L1IcacheMemory prefetcher sequencer
-L1DcacheMemory=system.l1_cntrl2.L1DcacheMemory
-L1IcacheMemory=system.l1_cntrl2.L1IcacheMemory
+L1DcacheMemory=system.ruby.l1_cntrl2.L1DcacheMemory
+L1IcacheMemory=system.ruby.l1_cntrl2.L1IcacheMemory
 buffer_size=0
+clock=1
 cntrl_id=2
 enable_prefetch=false
 l1_request_latency=2
 l1_response_latency=2
 l2_select_num_bits=0
 number_of_TBEs=256
-prefetcher=system.l1_cntrl2.prefetcher
+prefetcher=system.ruby.l1_cntrl2.prefetcher
 recycle_latency=10
 ruby_system=system.ruby
 send_evictions=false
-sequencer=system.l1_cntrl2.sequencer
+sequencer=system.ruby.l1_cntrl2.sequencer
 to_l2_latency=1
 transitions_per_cycle=32
 version=2
 
-[system.l1_cntrl2.L1DcacheMemory]
+[system.ruby.l1_cntrl2.L1DcacheMemory]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -435,7 +463,7 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.l1_cntrl2.L1IcacheMemory]
+[system.ruby.l1_cntrl2.L1IcacheMemory]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -449,7 +477,7 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.l1_cntrl2.prefetcher]
+[system.ruby.l1_cntrl2.prefetcher]
 type=Prefetcher
 cross_page=false
 nonunit_filter=8
@@ -459,13 +487,13 @@ pf_per_stream=1
 train_misses=4
 unit_filter=8
 
-[system.l1_cntrl2.sequencer]
+[system.ruby.l1_cntrl2.sequencer]
 type=RubySequencer
 access_phys_mem=false
 clock=1
-dcache=system.l1_cntrl2.L1DcacheMemory
+dcache=system.ruby.l1_cntrl2.L1DcacheMemory
 deadlock_threshold=1000000
-icache=system.l1_cntrl2.L1IcacheMemory
+icache=system.ruby.l1_cntrl2.L1IcacheMemory
 max_outstanding_requests=16
 ruby_system=system.ruby
 support_data_reqs=true
@@ -476,28 +504,29 @@ using_ruby_tester=false
 version=2
 slave=system.cpu2.test
 
-[system.l1_cntrl3]
+[system.ruby.l1_cntrl3]
 type=L1Cache_Controller
 children=L1DcacheMemory L1IcacheMemory prefetcher sequencer
-L1DcacheMemory=system.l1_cntrl3.L1DcacheMemory
-L1IcacheMemory=system.l1_cntrl3.L1IcacheMemory
+L1DcacheMemory=system.ruby.l1_cntrl3.L1DcacheMemory
+L1IcacheMemory=system.ruby.l1_cntrl3.L1IcacheMemory
 buffer_size=0
+clock=1
 cntrl_id=3
 enable_prefetch=false
 l1_request_latency=2
 l1_response_latency=2
 l2_select_num_bits=0
 number_of_TBEs=256
-prefetcher=system.l1_cntrl3.prefetcher
+prefetcher=system.ruby.l1_cntrl3.prefetcher
 recycle_latency=10
 ruby_system=system.ruby
 send_evictions=false
-sequencer=system.l1_cntrl3.sequencer
+sequencer=system.ruby.l1_cntrl3.sequencer
 to_l2_latency=1
 transitions_per_cycle=32
 version=3
 
-[system.l1_cntrl3.L1DcacheMemory]
+[system.ruby.l1_cntrl3.L1DcacheMemory]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -511,7 +540,7 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.l1_cntrl3.L1IcacheMemory]
+[system.ruby.l1_cntrl3.L1IcacheMemory]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -525,7 +554,7 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.l1_cntrl3.prefetcher]
+[system.ruby.l1_cntrl3.prefetcher]
 type=Prefetcher
 cross_page=false
 nonunit_filter=8
@@ -535,13 +564,13 @@ pf_per_stream=1
 train_misses=4
 unit_filter=8
 
-[system.l1_cntrl3.sequencer]
+[system.ruby.l1_cntrl3.sequencer]
 type=RubySequencer
 access_phys_mem=false
 clock=1
-dcache=system.l1_cntrl3.L1DcacheMemory
+dcache=system.ruby.l1_cntrl3.L1DcacheMemory
 deadlock_threshold=1000000
-icache=system.l1_cntrl3.L1IcacheMemory
+icache=system.ruby.l1_cntrl3.L1IcacheMemory
 max_outstanding_requests=16
 ruby_system=system.ruby
 support_data_reqs=true
@@ -552,28 +581,29 @@ using_ruby_tester=false
 version=3
 slave=system.cpu3.test
 
-[system.l1_cntrl4]
+[system.ruby.l1_cntrl4]
 type=L1Cache_Controller
 children=L1DcacheMemory L1IcacheMemory prefetcher sequencer
-L1DcacheMemory=system.l1_cntrl4.L1DcacheMemory
-L1IcacheMemory=system.l1_cntrl4.L1IcacheMemory
+L1DcacheMemory=system.ruby.l1_cntrl4.L1DcacheMemory
+L1IcacheMemory=system.ruby.l1_cntrl4.L1IcacheMemory
 buffer_size=0
+clock=1
 cntrl_id=4
 enable_prefetch=false
 l1_request_latency=2
 l1_response_latency=2
 l2_select_num_bits=0
 number_of_TBEs=256
-prefetcher=system.l1_cntrl4.prefetcher
+prefetcher=system.ruby.l1_cntrl4.prefetcher
 recycle_latency=10
 ruby_system=system.ruby
 send_evictions=false
-sequencer=system.l1_cntrl4.sequencer
+sequencer=system.ruby.l1_cntrl4.sequencer
 to_l2_latency=1
 transitions_per_cycle=32
 version=4
 
-[system.l1_cntrl4.L1DcacheMemory]
+[system.ruby.l1_cntrl4.L1DcacheMemory]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -587,7 +617,7 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.l1_cntrl4.L1IcacheMemory]
+[system.ruby.l1_cntrl4.L1IcacheMemory]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -601,7 +631,7 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.l1_cntrl4.prefetcher]
+[system.ruby.l1_cntrl4.prefetcher]
 type=Prefetcher
 cross_page=false
 nonunit_filter=8
@@ -611,13 +641,13 @@ pf_per_stream=1
 train_misses=4
 unit_filter=8
 
-[system.l1_cntrl4.sequencer]
+[system.ruby.l1_cntrl4.sequencer]
 type=RubySequencer
 access_phys_mem=false
 clock=1
-dcache=system.l1_cntrl4.L1DcacheMemory
+dcache=system.ruby.l1_cntrl4.L1DcacheMemory
 deadlock_threshold=1000000
-icache=system.l1_cntrl4.L1IcacheMemory
+icache=system.ruby.l1_cntrl4.L1IcacheMemory
 max_outstanding_requests=16
 ruby_system=system.ruby
 support_data_reqs=true
@@ -628,28 +658,29 @@ using_ruby_tester=false
 version=4
 slave=system.cpu4.test
 
-[system.l1_cntrl5]
+[system.ruby.l1_cntrl5]
 type=L1Cache_Controller
 children=L1DcacheMemory L1IcacheMemory prefetcher sequencer
-L1DcacheMemory=system.l1_cntrl5.L1DcacheMemory
-L1IcacheMemory=system.l1_cntrl5.L1IcacheMemory
+L1DcacheMemory=system.ruby.l1_cntrl5.L1DcacheMemory
+L1IcacheMemory=system.ruby.l1_cntrl5.L1IcacheMemory
 buffer_size=0
+clock=1
 cntrl_id=5
 enable_prefetch=false
 l1_request_latency=2
 l1_response_latency=2
 l2_select_num_bits=0
 number_of_TBEs=256
-prefetcher=system.l1_cntrl5.prefetcher
+prefetcher=system.ruby.l1_cntrl5.prefetcher
 recycle_latency=10
 ruby_system=system.ruby
 send_evictions=false
-sequencer=system.l1_cntrl5.sequencer
+sequencer=system.ruby.l1_cntrl5.sequencer
 to_l2_latency=1
 transitions_per_cycle=32
 version=5
 
-[system.l1_cntrl5.L1DcacheMemory]
+[system.ruby.l1_cntrl5.L1DcacheMemory]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -663,7 +694,7 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.l1_cntrl5.L1IcacheMemory]
+[system.ruby.l1_cntrl5.L1IcacheMemory]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -677,7 +708,7 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.l1_cntrl5.prefetcher]
+[system.ruby.l1_cntrl5.prefetcher]
 type=Prefetcher
 cross_page=false
 nonunit_filter=8
@@ -687,13 +718,13 @@ pf_per_stream=1
 train_misses=4
 unit_filter=8
 
-[system.l1_cntrl5.sequencer]
+[system.ruby.l1_cntrl5.sequencer]
 type=RubySequencer
 access_phys_mem=false
 clock=1
-dcache=system.l1_cntrl5.L1DcacheMemory
+dcache=system.ruby.l1_cntrl5.L1DcacheMemory
 deadlock_threshold=1000000
-icache=system.l1_cntrl5.L1IcacheMemory
+icache=system.ruby.l1_cntrl5.L1IcacheMemory
 max_outstanding_requests=16
 ruby_system=system.ruby
 support_data_reqs=true
@@ -704,28 +735,29 @@ using_ruby_tester=false
 version=5
 slave=system.cpu5.test
 
-[system.l1_cntrl6]
+[system.ruby.l1_cntrl6]
 type=L1Cache_Controller
 children=L1DcacheMemory L1IcacheMemory prefetcher sequencer
-L1DcacheMemory=system.l1_cntrl6.L1DcacheMemory
-L1IcacheMemory=system.l1_cntrl6.L1IcacheMemory
+L1DcacheMemory=system.ruby.l1_cntrl6.L1DcacheMemory
+L1IcacheMemory=system.ruby.l1_cntrl6.L1IcacheMemory
 buffer_size=0
+clock=1
 cntrl_id=6
 enable_prefetch=false
 l1_request_latency=2
 l1_response_latency=2
 l2_select_num_bits=0
 number_of_TBEs=256
-prefetcher=system.l1_cntrl6.prefetcher
+prefetcher=system.ruby.l1_cntrl6.prefetcher
 recycle_latency=10
 ruby_system=system.ruby
 send_evictions=false
-sequencer=system.l1_cntrl6.sequencer
+sequencer=system.ruby.l1_cntrl6.sequencer
 to_l2_latency=1
 transitions_per_cycle=32
 version=6
 
-[system.l1_cntrl6.L1DcacheMemory]
+[system.ruby.l1_cntrl6.L1DcacheMemory]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -739,7 +771,7 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.l1_cntrl6.L1IcacheMemory]
+[system.ruby.l1_cntrl6.L1IcacheMemory]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -753,7 +785,7 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.l1_cntrl6.prefetcher]
+[system.ruby.l1_cntrl6.prefetcher]
 type=Prefetcher
 cross_page=false
 nonunit_filter=8
@@ -763,13 +795,13 @@ pf_per_stream=1
 train_misses=4
 unit_filter=8
 
-[system.l1_cntrl6.sequencer]
+[system.ruby.l1_cntrl6.sequencer]
 type=RubySequencer
 access_phys_mem=false
 clock=1
-dcache=system.l1_cntrl6.L1DcacheMemory
+dcache=system.ruby.l1_cntrl6.L1DcacheMemory
 deadlock_threshold=1000000
-icache=system.l1_cntrl6.L1IcacheMemory
+icache=system.ruby.l1_cntrl6.L1IcacheMemory
 max_outstanding_requests=16
 ruby_system=system.ruby
 support_data_reqs=true
@@ -780,28 +812,29 @@ using_ruby_tester=false
 version=6
 slave=system.cpu6.test
 
-[system.l1_cntrl7]
+[system.ruby.l1_cntrl7]
 type=L1Cache_Controller
 children=L1DcacheMemory L1IcacheMemory prefetcher sequencer
-L1DcacheMemory=system.l1_cntrl7.L1DcacheMemory
-L1IcacheMemory=system.l1_cntrl7.L1IcacheMemory
+L1DcacheMemory=system.ruby.l1_cntrl7.L1DcacheMemory
+L1IcacheMemory=system.ruby.l1_cntrl7.L1IcacheMemory
 buffer_size=0
+clock=1
 cntrl_id=7
 enable_prefetch=false
 l1_request_latency=2
 l1_response_latency=2
 l2_select_num_bits=0
 number_of_TBEs=256
-prefetcher=system.l1_cntrl7.prefetcher
+prefetcher=system.ruby.l1_cntrl7.prefetcher
 recycle_latency=10
 ruby_system=system.ruby
 send_evictions=false
-sequencer=system.l1_cntrl7.sequencer
+sequencer=system.ruby.l1_cntrl7.sequencer
 to_l2_latency=1
 transitions_per_cycle=32
 version=7
 
-[system.l1_cntrl7.L1DcacheMemory]
+[system.ruby.l1_cntrl7.L1DcacheMemory]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -815,7 +848,7 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.l1_cntrl7.L1IcacheMemory]
+[system.ruby.l1_cntrl7.L1IcacheMemory]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -829,7 +862,7 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.l1_cntrl7.prefetcher]
+[system.ruby.l1_cntrl7.prefetcher]
 type=Prefetcher
 cross_page=false
 nonunit_filter=8
@@ -839,13 +872,13 @@ pf_per_stream=1
 train_misses=4
 unit_filter=8
 
-[system.l1_cntrl7.sequencer]
+[system.ruby.l1_cntrl7.sequencer]
 type=RubySequencer
 access_phys_mem=false
 clock=1
-dcache=system.l1_cntrl7.L1DcacheMemory
+dcache=system.ruby.l1_cntrl7.L1DcacheMemory
 deadlock_threshold=1000000
-icache=system.l1_cntrl7.L1IcacheMemory
+icache=system.ruby.l1_cntrl7.L1IcacheMemory
 max_outstanding_requests=16
 ruby_system=system.ruby
 support_data_reqs=true
@@ -856,11 +889,12 @@ using_ruby_tester=false
 version=7
 slave=system.cpu7.test
 
-[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=8
 l2_request_latency=2
 l2_response_latency=2
@@ -871,7 +905,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
@@ -885,34 +919,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=268435456
-no_mem_vec=false
-random_seed=1234
-randomization=false
-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
@@ -932,7 +944,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
@@ -940,6 +952,7 @@ weight=1
 
 [system.ruby.network.topology.ext_links0.int_node]
 type=Switch
+clock=1
 router_id=0
 virt_nets=10
 
@@ -947,7 +960,7 @@ virt_nets=10
 type=SimpleExtLink
 children=int_node
 bandwidth_factor=16
-ext_node=system.l1_cntrl1
+ext_node=system.ruby.l1_cntrl1
 int_node=system.ruby.network.topology.ext_links1.int_node
 latency=1
 link_id=1
@@ -955,6 +968,7 @@ weight=1
 
 [system.ruby.network.topology.ext_links1.int_node]
 type=Switch
+clock=1
 router_id=1
 virt_nets=10
 
@@ -962,7 +976,7 @@ virt_nets=10
 type=SimpleExtLink
 children=int_node
 bandwidth_factor=16
-ext_node=system.l1_cntrl2
+ext_node=system.ruby.l1_cntrl2
 int_node=system.ruby.network.topology.ext_links2.int_node
 latency=1
 link_id=2
@@ -970,6 +984,7 @@ weight=1
 
 [system.ruby.network.topology.ext_links2.int_node]
 type=Switch
+clock=1
 router_id=2
 virt_nets=10
 
@@ -977,7 +992,7 @@ virt_nets=10
 type=SimpleExtLink
 children=int_node
 bandwidth_factor=16
-ext_node=system.l1_cntrl3
+ext_node=system.ruby.l1_cntrl3
 int_node=system.ruby.network.topology.ext_links3.int_node
 latency=1
 link_id=3
@@ -985,6 +1000,7 @@ weight=1
 
 [system.ruby.network.topology.ext_links3.int_node]
 type=Switch
+clock=1
 router_id=3
 virt_nets=10
 
@@ -992,7 +1008,7 @@ virt_nets=10
 type=SimpleExtLink
 children=int_node
 bandwidth_factor=16
-ext_node=system.l1_cntrl4
+ext_node=system.ruby.l1_cntrl4
 int_node=system.ruby.network.topology.ext_links4.int_node
 latency=1
 link_id=4
@@ -1000,6 +1016,7 @@ weight=1
 
 [system.ruby.network.topology.ext_links4.int_node]
 type=Switch
+clock=1
 router_id=4
 virt_nets=10
 
@@ -1007,7 +1024,7 @@ virt_nets=10
 type=SimpleExtLink
 children=int_node
 bandwidth_factor=16
-ext_node=system.l1_cntrl5
+ext_node=system.ruby.l1_cntrl5
 int_node=system.ruby.network.topology.ext_links5.int_node
 latency=1
 link_id=5
@@ -1015,6 +1032,7 @@ weight=1
 
 [system.ruby.network.topology.ext_links5.int_node]
 type=Switch
+clock=1
 router_id=5
 virt_nets=10
 
@@ -1022,7 +1040,7 @@ virt_nets=10
 type=SimpleExtLink
 children=int_node
 bandwidth_factor=16
-ext_node=system.l1_cntrl6
+ext_node=system.ruby.l1_cntrl6
 int_node=system.ruby.network.topology.ext_links6.int_node
 latency=1
 link_id=6
@@ -1030,6 +1048,7 @@ weight=1
 
 [system.ruby.network.topology.ext_links6.int_node]
 type=Switch
+clock=1
 router_id=6
 virt_nets=10
 
@@ -1037,7 +1056,7 @@ virt_nets=10
 type=SimpleExtLink
 children=int_node
 bandwidth_factor=16
-ext_node=system.l1_cntrl7
+ext_node=system.ruby.l1_cntrl7
 int_node=system.ruby.network.topology.ext_links7.int_node
 latency=1
 link_id=7
@@ -1045,6 +1064,7 @@ weight=1
 
 [system.ruby.network.topology.ext_links7.int_node]
 type=Switch
+clock=1
 router_id=7
 virt_nets=10
 
@@ -1052,7 +1072,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_links8.int_node
 latency=1
 link_id=8
@@ -1060,6 +1080,7 @@ weight=1
 
 [system.ruby.network.topology.ext_links8.int_node]
 type=Switch
+clock=1
 router_id=8
 virt_nets=10
 
@@ -1067,7 +1088,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_links9.int_node
 latency=1
 link_id=9
@@ -1075,6 +1096,7 @@ weight=1
 
 [system.ruby.network.topology.ext_links9.int_node]
 type=Switch
+clock=1
 router_id=9
 virt_nets=10
 
@@ -1090,6 +1112,7 @@ weight=1
 
 [system.ruby.network.topology.int_links0.node_b]
 type=Switch
+clock=1
 router_id=10
 virt_nets=10
 

diff --git a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_CMP_directory/ruby.stats b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_CMP_directory/ruby.stats
index 8b52d58057288fe84ee5dcd2ff8e2f5d4a8de8b4..b7894d3dcd82948446064d5ffc447923ad3de80c 100644 (file)
--- a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_CMP_directory/ruby.stats
+++ b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_CMP_directory/ruby.stats
@@ -1,24 +1,24 @@
-Real time: Dec/11/2012 09:13:04
+Real time: Jan/14/2013 08:21:52
 
 Profiler Stats
 --------------
-Elapsed_time_in_seconds: 164
-Elapsed_time_in_minutes: 2.73333
-Elapsed_time_in_hours: 0.0455556
-Elapsed_time_in_days: 0.00189815
+Elapsed_time_in_seconds: 101
+Elapsed_time_in_minutes: 1.68333
+Elapsed_time_in_hours: 0.0280556
+Elapsed_time_in_days: 0.00116898
 
-Virtual_time_in_seconds: 103.36
-Virtual_time_in_minutes: 1.72267
-Virtual_time_in_hours:   0.0287111
-Virtual_time_in_days:    0.0011963
+Virtual_time_in_seconds: 101.26
+Virtual_time_in_minutes: 1.68767
+Virtual_time_in_hours:   0.0281278
+Virtual_time_in_days:    0.00117199
 
 Ruby_current_time: 7257449
 Ruby_start_time: 0
 Ruby_cycles: 7257449
 
-mbytes_resident: 71.4336
-mbytes_total: 409.793
-resident_ratio: 0.174345
+mbytes_resident: 71.9961
+mbytes_total: 416.859
+resident_ratio: 0.172739
 
 ruby_cycles_executed: [ 7257450 7257450 7257450 7257450 7257450 7257450 7257450 7257450 ]
 
@@ -80,13 +80,13 @@ Total_nonPF_delay_cycles: [binsize: 1 max: 36 count: 3321263 average: 1.55988 |
 Resource Usage
 --------------
 page_size: 4096
-user_time: 103
+user_time: 101
 system_time: 0
-page_reclaims: 9692
+page_reclaims: 9902
 page_faults: 0
 swaps: 0
 block_inputs: 0
-block_outputs: 296
+block_outputs: 272
 
 Network Stats
 -------------
@@ -294,25 +294,25 @@ links_utilized_percent_switch_10: 14.8743
   outgoing_messages_switch_10_link_9_Response_Data: 212955 15332760 [ 0 212955 0 0 0 0 0 0 0 0 ] base_latency: 1
   outgoing_messages_switch_10_link_9_Response_Control: 392034 3136272 [ 0 392034 0 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: 76561
-  system.l1_cntrl0.L1DcacheMemory_total_demand_misses: 76561
-  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: 76561
+  system.ruby.l1_cntrl0.L1DcacheMemory_total_demand_misses: 76561
+  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:   65.0148%
-  system.l1_cntrl0.L1DcacheMemory_request_type_ST:   34.9852%
+  system.ruby.l1_cntrl0.L1DcacheMemory_request_type_LD:   65.0148%
+  system.ruby.l1_cntrl0.L1DcacheMemory_request_type_ST:   34.9852%
 
-  system.l1_cntrl0.L1DcacheMemory_access_mode_type_Supervisor:   76561    100%
+  system.ruby.l1_cntrl0.L1DcacheMemory_access_mode_type_Supervisor:   76561    100%
 
  --- L1Cache ---
  - Event Counts -
@@ -486,157 +486,157 @@ PF_IS_I  Data_Exclusive [0 0 0 0 0 0 0 0 ] 0
 PF_IS_I  DataS_fromL1 [0 0 0 0 0 0 0 0 ] 0
 PF_IS_I  Data_all_Acks [0 0 0 0 0 0 0 0 ] 0
 
-Cache Stats: system.l1_cntrl1.L1IcacheMemory
-  system.l1_cntrl1.L1IcacheMemory_total_misses: 0
-  system.l1_cntrl1.L1IcacheMemory_total_demand_misses: 0
-  system.l1_cntrl1.L1IcacheMemory_total_prefetches: 0
-  system.l1_cntrl1.L1IcacheMemory_total_sw_prefetches: 0
-  system.l1_cntrl1.L1IcacheMemory_total_hw_prefetches: 0
+Cache Stats: system.ruby.l1_cntrl1.L1IcacheMemory
+  system.ruby.l1_cntrl1.L1IcacheMemory_total_misses: 0
+  system.ruby.l1_cntrl1.L1IcacheMemory_total_demand_misses: 0
+  system.ruby.l1_cntrl1.L1IcacheMemory_total_prefetches: 0
+  system.ruby.l1_cntrl1.L1IcacheMemory_total_sw_prefetches: 0
+  system.ruby.l1_cntrl1.L1IcacheMemory_total_hw_prefetches: 0
 
 
-Cache Stats: system.l1_cntrl1.L1DcacheMemory
-  system.l1_cntrl1.L1DcacheMemory_total_misses: 76056
-  system.l1_cntrl1.L1DcacheMemory_total_demand_misses: 76056
-  system.l1_cntrl1.L1DcacheMemory_total_prefetches: 0
-  system.l1_cntrl1.L1DcacheMemory_total_sw_prefetches: 0
-  system.l1_cntrl1.L1DcacheMemory_total_hw_prefetches: 0
+Cache Stats: system.ruby.l1_cntrl1.L1DcacheMemory
+  system.ruby.l1_cntrl1.L1DcacheMemory_total_misses: 76056
+  system.ruby.l1_cntrl1.L1DcacheMemory_total_demand_misses: 76056
+  system.ruby.l1_cntrl1.L1DcacheMemory_total_prefetches: 0
+  system.ruby.l1_cntrl1.L1DcacheMemory_total_sw_prefetches: 0
+  system.ruby.l1_cntrl1.L1DcacheMemory_total_hw_prefetches: 0
 
-  system.l1_cntrl1.L1DcacheMemory_request_type_LD:   64.9219%
-  system.l1_cntrl1.L1DcacheMemory_request_type_ST:   35.0781%
+  system.ruby.l1_cntrl1.L1DcacheMemory_request_type_LD:   64.9219%
+  system.ruby.l1_cntrl1.L1DcacheMemory_request_type_ST:   35.0781%
 
-  system.l1_cntrl1.L1DcacheMemory_access_mode_type_Supervisor:   76056    100%
+  system.ruby.l1_cntrl1.L1DcacheMemory_access_mode_type_Supervisor:   76056    100%
 
-Cache Stats: system.l1_cntrl2.L1IcacheMemory
-  system.l1_cntrl2.L1IcacheMemory_total_misses: 0
-  system.l1_cntrl2.L1IcacheMemory_total_demand_misses: 0
-  system.l1_cntrl2.L1IcacheMemory_total_prefetches: 0
-  system.l1_cntrl2.L1IcacheMemory_total_sw_prefetches: 0
-  system.l1_cntrl2.L1IcacheMemory_total_hw_prefetches: 0
+Cache Stats: system.ruby.l1_cntrl2.L1IcacheMemory
+  system.ruby.l1_cntrl2.L1IcacheMemory_total_misses: 0
+  system.ruby.l1_cntrl2.L1IcacheMemory_total_demand_misses: 0
+  system.ruby.l1_cntrl2.L1IcacheMemory_total_prefetches: 0
+  system.ruby.l1_cntrl2.L1IcacheMemory_total_sw_prefetches: 0
+  system.ruby.l1_cntrl2.L1IcacheMemory_total_hw_prefetches: 0
 
 
-Cache Stats: system.l1_cntrl2.L1DcacheMemory
-  system.l1_cntrl2.L1DcacheMemory_total_misses: 76165
-  system.l1_cntrl2.L1DcacheMemory_total_demand_misses: 76165
-  system.l1_cntrl2.L1DcacheMemory_total_prefetches: 0
-  system.l1_cntrl2.L1DcacheMemory_total_sw_prefetches: 0
-  system.l1_cntrl2.L1DcacheMemory_total_hw_prefetches: 0
+Cache Stats: system.ruby.l1_cntrl2.L1DcacheMemory
+  system.ruby.l1_cntrl2.L1DcacheMemory_total_misses: 76165
+  system.ruby.l1_cntrl2.L1DcacheMemory_total_demand_misses: 76165
+  system.ruby.l1_cntrl2.L1DcacheMemory_total_prefetches: 0
+  system.ruby.l1_cntrl2.L1DcacheMemory_total_sw_prefetches: 0
+  system.ruby.l1_cntrl2.L1DcacheMemory_total_hw_prefetches: 0
 
-  system.l1_cntrl2.L1DcacheMemory_request_type_LD:   65.0102%
-  system.l1_cntrl2.L1DcacheMemory_request_type_ST:   34.9898%
+  system.ruby.l1_cntrl2.L1DcacheMemory_request_type_LD:   65.0102%
+  system.ruby.l1_cntrl2.L1DcacheMemory_request_type_ST:   34.9898%
 
-  system.l1_cntrl2.L1DcacheMemory_access_mode_type_Supervisor:   76165    100%
+  system.ruby.l1_cntrl2.L1DcacheMemory_access_mode_type_Supervisor:   76165    100%
 
-Cache Stats: system.l1_cntrl3.L1IcacheMemory
-  system.l1_cntrl3.L1IcacheMemory_total_misses: 0
-  system.l1_cntrl3.L1IcacheMemory_total_demand_misses: 0
-  system.l1_cntrl3.L1IcacheMemory_total_prefetches: 0
-  system.l1_cntrl3.L1IcacheMemory_total_sw_prefetches: 0
-  system.l1_cntrl3.L1IcacheMemory_total_hw_prefetches: 0
+Cache Stats: system.ruby.l1_cntrl3.L1IcacheMemory
+  system.ruby.l1_cntrl3.L1IcacheMemory_total_misses: 0
+  system.ruby.l1_cntrl3.L1IcacheMemory_total_demand_misses: 0
+  system.ruby.l1_cntrl3.L1IcacheMemory_total_prefetches: 0
+  system.ruby.l1_cntrl3.L1IcacheMemory_total_sw_prefetches: 0
+  system.ruby.l1_cntrl3.L1IcacheMemory_total_hw_prefetches: 0
 
 
-Cache Stats: system.l1_cntrl3.L1DcacheMemory
-  system.l1_cntrl3.L1DcacheMemory_total_misses: 75953
-  system.l1_cntrl3.L1DcacheMemory_total_demand_misses: 75953
-  system.l1_cntrl3.L1DcacheMemory_total_prefetches: 0
-  system.l1_cntrl3.L1DcacheMemory_total_sw_prefetches: 0
-  system.l1_cntrl3.L1DcacheMemory_total_hw_prefetches: 0
+Cache Stats: system.ruby.l1_cntrl3.L1DcacheMemory
+  system.ruby.l1_cntrl3.L1DcacheMemory_total_misses: 75953
+  system.ruby.l1_cntrl3.L1DcacheMemory_total_demand_misses: 75953
+  system.ruby.l1_cntrl3.L1DcacheMemory_total_prefetches: 0
+  system.ruby.l1_cntrl3.L1DcacheMemory_total_sw_prefetches: 0
+  system.ruby.l1_cntrl3.L1DcacheMemory_total_hw_prefetches: 0
 
-  system.l1_cntrl3.L1DcacheMemory_request_type_LD:   65.0126%
-  system.l1_cntrl3.L1DcacheMemory_request_type_ST:   34.9874%
+  system.ruby.l1_cntrl3.L1DcacheMemory_request_type_LD:   65.0126%
+  system.ruby.l1_cntrl3.L1DcacheMemory_request_type_ST:   34.9874%
 
-  system.l1_cntrl3.L1DcacheMemory_access_mode_type_Supervisor:   75953    100%
+  system.ruby.l1_cntrl3.L1DcacheMemory_access_mode_type_Supervisor:   75953    100%
 
-Cache Stats: system.l1_cntrl4.L1IcacheMemory
-  system.l1_cntrl4.L1IcacheMemory_total_misses: 0
-  system.l1_cntrl4.L1IcacheMemory_total_demand_misses: 0
-  system.l1_cntrl4.L1IcacheMemory_total_prefetches: 0
-  system.l1_cntrl4.L1IcacheMemory_total_sw_prefetches: 0
-  system.l1_cntrl4.L1IcacheMemory_total_hw_prefetches: 0
+Cache Stats: system.ruby.l1_cntrl4.L1IcacheMemory
+  system.ruby.l1_cntrl4.L1IcacheMemory_total_misses: 0
+  system.ruby.l1_cntrl4.L1IcacheMemory_total_demand_misses: 0
+  system.ruby.l1_cntrl4.L1IcacheMemory_total_prefetches: 0
+  system.ruby.l1_cntrl4.L1IcacheMemory_total_sw_prefetches: 0
+  system.ruby.l1_cntrl4.L1IcacheMemory_total_hw_prefetches: 0
 
 
-Cache Stats: system.l1_cntrl4.L1DcacheMemory
-  system.l1_cntrl4.L1DcacheMemory_total_misses: 76641
-  system.l1_cntrl4.L1DcacheMemory_total_demand_misses: 76641
-  system.l1_cntrl4.L1DcacheMemory_total_prefetches: 0
-  system.l1_cntrl4.L1DcacheMemory_total_sw_prefetches: 0
-  system.l1_cntrl4.L1DcacheMemory_total_hw_prefetches: 0
+Cache Stats: system.ruby.l1_cntrl4.L1DcacheMemory
+  system.ruby.l1_cntrl4.L1DcacheMemory_total_misses: 76641
+  system.ruby.l1_cntrl4.L1DcacheMemory_total_demand_misses: 76641
+  system.ruby.l1_cntrl4.L1DcacheMemory_total_prefetches: 0
+  system.ruby.l1_cntrl4.L1DcacheMemory_total_sw_prefetches: 0
+  system.ruby.l1_cntrl4.L1DcacheMemory_total_hw_prefetches: 0
 
-  system.l1_cntrl4.L1DcacheMemory_request_type_LD:   64.9065%
-  system.l1_cntrl4.L1DcacheMemory_request_type_ST:   35.0935%
+  system.ruby.l1_cntrl4.L1DcacheMemory_request_type_LD:   64.9065%
+  system.ruby.l1_cntrl4.L1DcacheMemory_request_type_ST:   35.0935%
 
-  system.l1_cntrl4.L1DcacheMemory_access_mode_type_Supervisor:   76641    100%
+  system.ruby.l1_cntrl4.L1DcacheMemory_access_mode_type_Supervisor:   76641    100%
 
-Cache Stats: system.l1_cntrl5.L1IcacheMemory
-  system.l1_cntrl5.L1IcacheMemory_total_misses: 0
-  system.l1_cntrl5.L1IcacheMemory_total_demand_misses: 0
-  system.l1_cntrl5.L1IcacheMemory_total_prefetches: 0
-  system.l1_cntrl5.L1IcacheMemory_total_sw_prefetches: 0
-  system.l1_cntrl5.L1IcacheMemory_total_hw_prefetches: 0
+Cache Stats: system.ruby.l1_cntrl5.L1IcacheMemory
+  system.ruby.l1_cntrl5.L1IcacheMemory_total_misses: 0
+  system.ruby.l1_cntrl5.L1IcacheMemory_total_demand_misses: 0
+  system.ruby.l1_cntrl5.L1IcacheMemory_total_prefetches: 0
+  system.ruby.l1_cntrl5.L1IcacheMemory_total_sw_prefetches: 0
+  system.ruby.l1_cntrl5.L1IcacheMemory_total_hw_prefetches: 0
 
 
-Cache Stats: system.l1_cntrl5.L1DcacheMemory
-  system.l1_cntrl5.L1DcacheMemory_total_misses: 75966
-  system.l1_cntrl5.L1DcacheMemory_total_demand_misses: 75966
-  system.l1_cntrl5.L1DcacheMemory_total_prefetches: 0
-  system.l1_cntrl5.L1DcacheMemory_total_sw_prefetches: 0
-  system.l1_cntrl5.L1DcacheMemory_total_hw_prefetches: 0
+Cache Stats: system.ruby.l1_cntrl5.L1DcacheMemory
+  system.ruby.l1_cntrl5.L1DcacheMemory_total_misses: 75966
+  system.ruby.l1_cntrl5.L1DcacheMemory_total_demand_misses: 75966
+  system.ruby.l1_cntrl5.L1DcacheMemory_total_prefetches: 0
+  system.ruby.l1_cntrl5.L1DcacheMemory_total_sw_prefetches: 0
+  system.ruby.l1_cntrl5.L1DcacheMemory_total_hw_prefetches: 0
 
-  system.l1_cntrl5.L1DcacheMemory_request_type_LD:   64.9857%
-  system.l1_cntrl5.L1DcacheMemory_request_type_ST:   35.0143%
+  system.ruby.l1_cntrl5.L1DcacheMemory_request_type_LD:   64.9857%
+  system.ruby.l1_cntrl5.L1DcacheMemory_request_type_ST:   35.0143%
 
-  system.l1_cntrl5.L1DcacheMemory_access_mode_type_Supervisor:   75966    100%
+  system.ruby.l1_cntrl5.L1DcacheMemory_access_mode_type_Supervisor:   75966    100%
 
-Cache Stats: system.l1_cntrl6.L1IcacheMemory
-  system.l1_cntrl6.L1IcacheMemory_total_misses: 0
-  system.l1_cntrl6.L1IcacheMemory_total_demand_misses: 0
-  system.l1_cntrl6.L1IcacheMemory_total_prefetches: 0
-  system.l1_cntrl6.L1IcacheMemory_total_sw_prefetches: 0
-  system.l1_cntrl6.L1IcacheMemory_total_hw_prefetches: 0
+Cache Stats: system.ruby.l1_cntrl6.L1IcacheMemory
+  system.ruby.l1_cntrl6.L1IcacheMemory_total_misses: 0
+  system.ruby.l1_cntrl6.L1IcacheMemory_total_demand_misses: 0
+  system.ruby.l1_cntrl6.L1IcacheMemory_total_prefetches: 0
+  system.ruby.l1_cntrl6.L1IcacheMemory_total_sw_prefetches: 0
+  system.ruby.l1_cntrl6.L1IcacheMemory_total_hw_prefetches: 0
 
 
-Cache Stats: system.l1_cntrl6.L1DcacheMemory
-  system.l1_cntrl6.L1DcacheMemory_total_misses: 76675
-  system.l1_cntrl6.L1DcacheMemory_total_demand_misses: 76675
-  system.l1_cntrl6.L1DcacheMemory_total_prefetches: 0
-  system.l1_cntrl6.L1DcacheMemory_total_sw_prefetches: 0
-  system.l1_cntrl6.L1DcacheMemory_total_hw_prefetches: 0
+Cache Stats: system.ruby.l1_cntrl6.L1DcacheMemory
+  system.ruby.l1_cntrl6.L1DcacheMemory_total_misses: 76675
+  system.ruby.l1_cntrl6.L1DcacheMemory_total_demand_misses: 76675
+  system.ruby.l1_cntrl6.L1DcacheMemory_total_prefetches: 0
+  system.ruby.l1_cntrl6.L1DcacheMemory_total_sw_prefetches: 0
+  system.ruby.l1_cntrl6.L1DcacheMemory_total_hw_prefetches: 0
 
-  system.l1_cntrl6.L1DcacheMemory_request_type_LD:   65.2677%
-  system.l1_cntrl6.L1DcacheMemory_request_type_ST:   34.7323%
+  system.ruby.l1_cntrl6.L1DcacheMemory_request_type_LD:   65.2677%
+  system.ruby.l1_cntrl6.L1DcacheMemory_request_type_ST:   34.7323%
 
-  system.l1_cntrl6.L1DcacheMemory_access_mode_type_Supervisor:   76675    100%
+  system.ruby.l1_cntrl6.L1DcacheMemory_access_mode_type_Supervisor:   76675    100%
 
-Cache Stats: system.l1_cntrl7.L1IcacheMemory
-  system.l1_cntrl7.L1IcacheMemory_total_misses: 0
-  system.l1_cntrl7.L1IcacheMemory_total_demand_misses: 0
-  system.l1_cntrl7.L1IcacheMemory_total_prefetches: 0
-  system.l1_cntrl7.L1IcacheMemory_total_sw_prefetches: 0
-  system.l1_cntrl7.L1IcacheMemory_total_hw_prefetches: 0
+Cache Stats: system.ruby.l1_cntrl7.L1IcacheMemory
+  system.ruby.l1_cntrl7.L1IcacheMemory_total_misses: 0
+  system.ruby.l1_cntrl7.L1IcacheMemory_total_demand_misses: 0
+  system.ruby.l1_cntrl7.L1IcacheMemory_total_prefetches: 0
+  system.ruby.l1_cntrl7.L1IcacheMemory_total_sw_prefetches: 0
+  system.ruby.l1_cntrl7.L1IcacheMemory_total_hw_prefetches: 0
 
 
-Cache Stats: system.l1_cntrl7.L1DcacheMemory
-  system.l1_cntrl7.L1DcacheMemory_total_misses: 76386
-  system.l1_cntrl7.L1DcacheMemory_total_demand_misses: 76386
-  system.l1_cntrl7.L1DcacheMemory_total_prefetches: 0
-  system.l1_cntrl7.L1DcacheMemory_total_sw_prefetches: 0
-  system.l1_cntrl7.L1DcacheMemory_total_hw_prefetches: 0
+Cache Stats: system.ruby.l1_cntrl7.L1DcacheMemory
+  system.ruby.l1_cntrl7.L1DcacheMemory_total_misses: 76386
+  system.ruby.l1_cntrl7.L1DcacheMemory_total_demand_misses: 76386
+  system.ruby.l1_cntrl7.L1DcacheMemory_total_prefetches: 0
+  system.ruby.l1_cntrl7.L1DcacheMemory_total_sw_prefetches: 0
+  system.ruby.l1_cntrl7.L1DcacheMemory_total_hw_prefetches: 0
 
-  system.l1_cntrl7.L1DcacheMemory_request_type_LD:   64.9857%
-  system.l1_cntrl7.L1DcacheMemory_request_type_ST:   35.0143%
+  system.ruby.l1_cntrl7.L1DcacheMemory_request_type_LD:   64.9857%
+  system.ruby.l1_cntrl7.L1DcacheMemory_request_type_ST:   35.0143%
 
-  system.l1_cntrl7.L1DcacheMemory_access_mode_type_Supervisor:   76386    100%
+  system.ruby.l1_cntrl7.L1DcacheMemory_access_mode_type_Supervisor:   76386    100%
 
-Cache Stats: system.l2_cntrl0.L2cacheMemory
-  system.l2_cntrl0.L2cacheMemory_total_misses: 610348
-  system.l2_cntrl0.L2cacheMemory_total_demand_misses: 610348
-  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: 610348
+  system.ruby.l2_cntrl0.L2cacheMemory_total_demand_misses: 610348
+  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:   65.0144%
-  system.l2_cntrl0.L2cacheMemory_request_type_GETX:   34.9856%
+  system.ruby.l2_cntrl0.L2cacheMemory_request_type_GETS:   65.0144%
+  system.ruby.l2_cntrl0.L2cacheMemory_request_type_GETX:   34.9856%
 
-  system.l2_cntrl0.L2cacheMemory_access_mode_type_Supervisor:   610348    100%
+  system.ruby.l2_cntrl0.L2cacheMemory_access_mode_type_Supervisor:   610348    100%
 
  --- L2Cache ---
  - Event Counts -
@@ -848,7 +848,7 @@ MT_SB  L2_Replacement_clean [0 ] 0
 MT_SB  Unblock [780 ] 780
 MT_SB  MEM_Inv [0 ] 0
 
-Memory controller: system.dir_cntrl0.memBuffer:
+Memory controller: system.ruby.dir_cntrl0.memBuffer:
   memory_total_requests: 817953
   memory_reads: 604997
   memory_writes: 212953

diff --git a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_CMP_directory/stats.txt b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_CMP_directory/stats.txt
index 5e837a981017f13ed5c9ac090165d817f948fe61..bbb60b17433b61dc63a355d90921dbd3a6dad21b 100644 (file)
--- a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_CMP_directory/stats.txt
+++ b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_CMP_directory/stats.txt
@@ -4,183 +4,183 @@ 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                                  44253                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 419632                       # Number of bytes of host memory used
-host_seconds                                   164.00                       # Real time elapsed on the host
-system.l1_cntrl4.L1DcacheMemory.num_data_array_reads            0                       # number of data array reads
-system.l1_cntrl4.L1DcacheMemory.num_data_array_writes            0                       # number of data array writes
-system.l1_cntrl4.L1DcacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.l1_cntrl4.L1DcacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.l1_cntrl4.L1DcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.l1_cntrl4.L1DcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-system.l1_cntrl4.L1IcacheMemory.num_data_array_reads            0                       # number of data array reads
-system.l1_cntrl4.L1IcacheMemory.num_data_array_writes            0                       # number of data array writes
-system.l1_cntrl4.L1IcacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.l1_cntrl4.L1IcacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.l1_cntrl4.L1IcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.l1_cntrl4.L1IcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-system.l1_cntrl4.prefetcher.miss_observed            0                       # number of misses observed
-system.l1_cntrl4.prefetcher.allocated_streams            0                       # number of streams allocated for prefetching
-system.l1_cntrl4.prefetcher.prefetches_requested            0                       # number of prefetch requests made
-system.l1_cntrl4.prefetcher.prefetches_accepted            0                       # number of prefetch requests accepted
-system.l1_cntrl4.prefetcher.dropped_prefetches            0                       # number of prefetch requests dropped
-system.l1_cntrl4.prefetcher.hits                    0                       # number of prefetched blocks accessed
-system.l1_cntrl4.prefetcher.partial_hits            0                       # number of misses observed for a block being prefetched
-system.l1_cntrl4.prefetcher.pages_crossed            0                       # number of prefetches across pages
-system.l1_cntrl4.prefetcher.misses_on_prefetched_blocks            0                       # number of misses for blocks that were prefetched, yet missed
-system.l1_cntrl5.L1DcacheMemory.num_data_array_reads            0                       # number of data array reads
-system.l1_cntrl5.L1DcacheMemory.num_data_array_writes            0                       # number of data array writes
-system.l1_cntrl5.L1DcacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.l1_cntrl5.L1DcacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.l1_cntrl5.L1DcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.l1_cntrl5.L1DcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-system.l1_cntrl5.L1IcacheMemory.num_data_array_reads            0                       # number of data array reads
-system.l1_cntrl5.L1IcacheMemory.num_data_array_writes            0                       # number of data array writes
-system.l1_cntrl5.L1IcacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.l1_cntrl5.L1IcacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.l1_cntrl5.L1IcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.l1_cntrl5.L1IcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-system.l1_cntrl5.prefetcher.miss_observed            0                       # number of misses observed
-system.l1_cntrl5.prefetcher.allocated_streams            0                       # number of streams allocated for prefetching
-system.l1_cntrl5.prefetcher.prefetches_requested            0                       # number of prefetch requests made
-system.l1_cntrl5.prefetcher.prefetches_accepted            0                       # number of prefetch requests accepted
-system.l1_cntrl5.prefetcher.dropped_prefetches            0                       # number of prefetch requests dropped
-system.l1_cntrl5.prefetcher.hits                    0                       # number of prefetched blocks accessed
-system.l1_cntrl5.prefetcher.partial_hits            0                       # number of misses observed for a block being prefetched
-system.l1_cntrl5.prefetcher.pages_crossed            0                       # number of prefetches across pages
-system.l1_cntrl5.prefetcher.misses_on_prefetched_blocks            0                       # number of misses for blocks that were prefetched, yet missed
-system.l1_cntrl6.L1DcacheMemory.num_data_array_reads            0                       # number of data array reads
-system.l1_cntrl6.L1DcacheMemory.num_data_array_writes            0                       # number of data array writes
-system.l1_cntrl6.L1DcacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.l1_cntrl6.L1DcacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.l1_cntrl6.L1DcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.l1_cntrl6.L1DcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-system.l1_cntrl6.L1IcacheMemory.num_data_array_reads            0                       # number of data array reads
-system.l1_cntrl6.L1IcacheMemory.num_data_array_writes            0                       # number of data array writes
-system.l1_cntrl6.L1IcacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.l1_cntrl6.L1IcacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.l1_cntrl6.L1IcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.l1_cntrl6.L1IcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-system.l1_cntrl6.prefetcher.miss_observed            0                       # number of misses observed
-system.l1_cntrl6.prefetcher.allocated_streams            0                       # number of streams allocated for prefetching
-system.l1_cntrl6.prefetcher.prefetches_requested            0                       # number of prefetch requests made
-system.l1_cntrl6.prefetcher.prefetches_accepted            0                       # number of prefetch requests accepted
-system.l1_cntrl6.prefetcher.dropped_prefetches            0                       # number of prefetch requests dropped
-system.l1_cntrl6.prefetcher.hits                    0                       # number of prefetched blocks accessed
-system.l1_cntrl6.prefetcher.partial_hits            0                       # number of misses observed for a block being prefetched
-system.l1_cntrl6.prefetcher.pages_crossed            0                       # number of prefetches across pages
-system.l1_cntrl6.prefetcher.misses_on_prefetched_blocks            0                       # number of misses for blocks that were prefetched, yet missed
-system.l1_cntrl7.L1DcacheMemory.num_data_array_reads            0                       # number of data array reads
-system.l1_cntrl7.L1DcacheMemory.num_data_array_writes            0                       # number of data array writes
-system.l1_cntrl7.L1DcacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.l1_cntrl7.L1DcacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.l1_cntrl7.L1DcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.l1_cntrl7.L1DcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-system.l1_cntrl7.L1IcacheMemory.num_data_array_reads            0                       # number of data array reads
-system.l1_cntrl7.L1IcacheMemory.num_data_array_writes            0                       # number of data array writes
-system.l1_cntrl7.L1IcacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.l1_cntrl7.L1IcacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.l1_cntrl7.L1IcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.l1_cntrl7.L1IcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-system.l1_cntrl7.prefetcher.miss_observed            0                       # number of misses observed
-system.l1_cntrl7.prefetcher.allocated_streams            0                       # number of streams allocated for prefetching
-system.l1_cntrl7.prefetcher.prefetches_requested            0                       # number of prefetch requests made
-system.l1_cntrl7.prefetcher.prefetches_accepted            0                       # number of prefetch requests accepted
-system.l1_cntrl7.prefetcher.dropped_prefetches            0                       # number of prefetch requests dropped
-system.l1_cntrl7.prefetcher.hits                    0                       # number of prefetched blocks accessed
-system.l1_cntrl7.prefetcher.partial_hits            0                       # number of misses observed for a block being prefetched
-system.l1_cntrl7.prefetcher.pages_crossed            0                       # number of prefetches across pages
-system.l1_cntrl7.prefetcher.misses_on_prefetched_blocks            0                       # number of misses for blocks that were prefetched, yet missed
-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.l1_cntrl1.L1DcacheMemory.num_data_array_reads            0                       # number of data array reads
-system.l1_cntrl1.L1DcacheMemory.num_data_array_writes            0                       # number of data array writes
-system.l1_cntrl1.L1DcacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.l1_cntrl1.L1DcacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.l1_cntrl1.L1DcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.l1_cntrl1.L1DcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-system.l1_cntrl1.L1IcacheMemory.num_data_array_reads            0                       # number of data array reads
-system.l1_cntrl1.L1IcacheMemory.num_data_array_writes            0                       # number of data array writes
-system.l1_cntrl1.L1IcacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.l1_cntrl1.L1IcacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.l1_cntrl1.L1IcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.l1_cntrl1.L1IcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-system.l1_cntrl1.prefetcher.miss_observed            0                       # number of misses observed
-system.l1_cntrl1.prefetcher.allocated_streams            0                       # number of streams allocated for prefetching
-system.l1_cntrl1.prefetcher.prefetches_requested            0                       # number of prefetch requests made
-system.l1_cntrl1.prefetcher.prefetches_accepted            0                       # number of prefetch requests accepted
-system.l1_cntrl1.prefetcher.dropped_prefetches            0                       # number of prefetch requests dropped
-system.l1_cntrl1.prefetcher.hits                    0                       # number of prefetched blocks accessed
-system.l1_cntrl1.prefetcher.partial_hits            0                       # number of misses observed for a block being prefetched
-system.l1_cntrl1.prefetcher.pages_crossed            0                       # number of prefetches across pages
-system.l1_cntrl1.prefetcher.misses_on_prefetched_blocks            0                       # number of misses for blocks that were prefetched, yet missed
-system.l1_cntrl2.L1DcacheMemory.num_data_array_reads            0                       # number of data array reads
-system.l1_cntrl2.L1DcacheMemory.num_data_array_writes            0                       # number of data array writes
-system.l1_cntrl2.L1DcacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.l1_cntrl2.L1DcacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.l1_cntrl2.L1DcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.l1_cntrl2.L1DcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-system.l1_cntrl2.L1IcacheMemory.num_data_array_reads            0                       # number of data array reads
-system.l1_cntrl2.L1IcacheMemory.num_data_array_writes            0                       # number of data array writes
-system.l1_cntrl2.L1IcacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.l1_cntrl2.L1IcacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.l1_cntrl2.L1IcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.l1_cntrl2.L1IcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-system.l1_cntrl2.prefetcher.miss_observed            0                       # number of misses observed
-system.l1_cntrl2.prefetcher.allocated_streams            0                       # number of streams allocated for prefetching
-system.l1_cntrl2.prefetcher.prefetches_requested            0                       # number of prefetch requests made
-system.l1_cntrl2.prefetcher.prefetches_accepted            0                       # number of prefetch requests accepted
-system.l1_cntrl2.prefetcher.dropped_prefetches            0                       # number of prefetch requests dropped
-system.l1_cntrl2.prefetcher.hits                    0                       # number of prefetched blocks accessed
-system.l1_cntrl2.prefetcher.partial_hits            0                       # number of misses observed for a block being prefetched
-system.l1_cntrl2.prefetcher.pages_crossed            0                       # number of prefetches across pages
-system.l1_cntrl2.prefetcher.misses_on_prefetched_blocks            0                       # number of misses for blocks that were prefetched, yet missed
-system.l1_cntrl3.L1DcacheMemory.num_data_array_reads            0                       # number of data array reads
-system.l1_cntrl3.L1DcacheMemory.num_data_array_writes            0                       # number of data array writes
-system.l1_cntrl3.L1DcacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.l1_cntrl3.L1DcacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.l1_cntrl3.L1DcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.l1_cntrl3.L1DcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-system.l1_cntrl3.L1IcacheMemory.num_data_array_reads            0                       # number of data array reads
-system.l1_cntrl3.L1IcacheMemory.num_data_array_writes            0                       # number of data array writes
-system.l1_cntrl3.L1IcacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.l1_cntrl3.L1IcacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.l1_cntrl3.L1IcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.l1_cntrl3.L1IcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-system.l1_cntrl3.prefetcher.miss_observed            0                       # number of misses observed
-system.l1_cntrl3.prefetcher.allocated_streams            0                       # number of streams allocated for prefetching
-system.l1_cntrl3.prefetcher.prefetches_requested            0                       # number of prefetch requests made
-system.l1_cntrl3.prefetcher.prefetches_accepted            0                       # number of prefetch requests accepted
-system.l1_cntrl3.prefetcher.dropped_prefetches            0                       # number of prefetch requests dropped
-system.l1_cntrl3.prefetcher.hits                    0                       # number of prefetched blocks accessed
-system.l1_cntrl3.prefetcher.partial_hits            0                       # number of misses observed for a block being prefetched
-system.l1_cntrl3.prefetcher.pages_crossed            0                       # number of prefetches across pages
-system.l1_cntrl3.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                                  71811                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 426868                       # Number of bytes of host memory used
+host_seconds                                   101.06                       # Real time elapsed on the host
+system.ruby.l1_cntrl4.L1DcacheMemory.num_data_array_reads            0                       # number of data array reads
+system.ruby.l1_cntrl4.L1DcacheMemory.num_data_array_writes            0                       # number of data array writes
+system.ruby.l1_cntrl4.L1DcacheMemory.num_tag_array_reads            0                       # number of tag array reads
+system.ruby.l1_cntrl4.L1DcacheMemory.num_tag_array_writes            0                       # number of tag array writes
+system.ruby.l1_cntrl4.L1DcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
+system.ruby.l1_cntrl4.L1DcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
+system.ruby.l1_cntrl4.L1IcacheMemory.num_data_array_reads            0                       # number of data array reads
+system.ruby.l1_cntrl4.L1IcacheMemory.num_data_array_writes            0                       # number of data array writes
+system.ruby.l1_cntrl4.L1IcacheMemory.num_tag_array_reads            0                       # number of tag array reads
+system.ruby.l1_cntrl4.L1IcacheMemory.num_tag_array_writes            0                       # number of tag array writes
+system.ruby.l1_cntrl4.L1IcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
+system.ruby.l1_cntrl4.L1IcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
+system.ruby.l1_cntrl4.prefetcher.miss_observed            0                       # number of misses observed
+system.ruby.l1_cntrl4.prefetcher.allocated_streams            0                       # number of streams allocated for prefetching
+system.ruby.l1_cntrl4.prefetcher.prefetches_requested            0                       # number of prefetch requests made
+system.ruby.l1_cntrl4.prefetcher.prefetches_accepted            0                       # number of prefetch requests accepted
+system.ruby.l1_cntrl4.prefetcher.dropped_prefetches            0                       # number of prefetch requests dropped
+system.ruby.l1_cntrl4.prefetcher.hits               0                       # number of prefetched blocks accessed
+system.ruby.l1_cntrl4.prefetcher.partial_hits            0                       # number of misses observed for a block being prefetched
+system.ruby.l1_cntrl4.prefetcher.pages_crossed            0                       # number of prefetches across pages
+system.ruby.l1_cntrl4.prefetcher.misses_on_prefetched_blocks            0                       # number of misses for blocks that were prefetched, yet missed
+system.ruby.l1_cntrl5.L1DcacheMemory.num_data_array_reads            0                       # number of data array reads
+system.ruby.l1_cntrl5.L1DcacheMemory.num_data_array_writes            0                       # number of data array writes
+system.ruby.l1_cntrl5.L1DcacheMemory.num_tag_array_reads            0                       # number of tag array reads
+system.ruby.l1_cntrl5.L1DcacheMemory.num_tag_array_writes            0                       # number of tag array writes
+system.ruby.l1_cntrl5.L1DcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
+system.ruby.l1_cntrl5.L1DcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
+system.ruby.l1_cntrl5.L1IcacheMemory.num_data_array_reads            0                       # number of data array reads
+system.ruby.l1_cntrl5.L1IcacheMemory.num_data_array_writes            0                       # number of data array writes
+system.ruby.l1_cntrl5.L1IcacheMemory.num_tag_array_reads            0                       # number of tag array reads
+system.ruby.l1_cntrl5.L1IcacheMemory.num_tag_array_writes            0                       # number of tag array writes
+system.ruby.l1_cntrl5.L1IcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
+system.ruby.l1_cntrl5.L1IcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
+system.ruby.l1_cntrl5.prefetcher.miss_observed            0                       # number of misses observed
+system.ruby.l1_cntrl5.prefetcher.allocated_streams            0                       # number of streams allocated for prefetching
+system.ruby.l1_cntrl5.prefetcher.prefetches_requested            0                       # number of prefetch requests made
+system.ruby.l1_cntrl5.prefetcher.prefetches_accepted            0                       # number of prefetch requests accepted
+system.ruby.l1_cntrl5.prefetcher.dropped_prefetches            0                       # number of prefetch requests dropped
+system.ruby.l1_cntrl5.prefetcher.hits               0                       # number of prefetched blocks accessed
+system.ruby.l1_cntrl5.prefetcher.partial_hits            0                       # number of misses observed for a block being prefetched
+system.ruby.l1_cntrl5.prefetcher.pages_crossed            0                       # number of prefetches across pages
+system.ruby.l1_cntrl5.prefetcher.misses_on_prefetched_blocks            0                       # number of misses for blocks that were prefetched, yet missed
+system.ruby.l1_cntrl6.L1DcacheMemory.num_data_array_reads            0                       # number of data array reads
+system.ruby.l1_cntrl6.L1DcacheMemory.num_data_array_writes            0                       # number of data array writes
+system.ruby.l1_cntrl6.L1DcacheMemory.num_tag_array_reads            0                       # number of tag array reads
+system.ruby.l1_cntrl6.L1DcacheMemory.num_tag_array_writes            0                       # number of tag array writes
+system.ruby.l1_cntrl6.L1DcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
+system.ruby.l1_cntrl6.L1DcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
+system.ruby.l1_cntrl6.L1IcacheMemory.num_data_array_reads            0                       # number of data array reads
+system.ruby.l1_cntrl6.L1IcacheMemory.num_data_array_writes            0                       # number of data array writes
+system.ruby.l1_cntrl6.L1IcacheMemory.num_tag_array_reads            0                       # number of tag array reads
+system.ruby.l1_cntrl6.L1IcacheMemory.num_tag_array_writes            0                       # number of tag array writes
+system.ruby.l1_cntrl6.L1IcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
+system.ruby.l1_cntrl6.L1IcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
+system.ruby.l1_cntrl6.prefetcher.miss_observed            0                       # number of misses observed
+system.ruby.l1_cntrl6.prefetcher.allocated_streams            0                       # number of streams allocated for prefetching
+system.ruby.l1_cntrl6.prefetcher.prefetches_requested            0                       # number of prefetch requests made
+system.ruby.l1_cntrl6.prefetcher.prefetches_accepted            0                       # number of prefetch requests accepted
+system.ruby.l1_cntrl6.prefetcher.dropped_prefetches            0                       # number of prefetch requests dropped
+system.ruby.l1_cntrl6.prefetcher.hits               0                       # number of prefetched blocks accessed
+system.ruby.l1_cntrl6.prefetcher.partial_hits            0                       # number of misses observed for a block being prefetched
+system.ruby.l1_cntrl6.prefetcher.pages_crossed            0                       # number of prefetches across pages
+system.ruby.l1_cntrl6.prefetcher.misses_on_prefetched_blocks            0                       # number of misses for blocks that were prefetched, yet missed
+system.ruby.l1_cntrl7.L1DcacheMemory.num_data_array_reads            0                       # number of data array reads
+system.ruby.l1_cntrl7.L1DcacheMemory.num_data_array_writes            0                       # number of data array writes
+system.ruby.l1_cntrl7.L1DcacheMemory.num_tag_array_reads            0                       # number of tag array reads
+system.ruby.l1_cntrl7.L1DcacheMemory.num_tag_array_writes            0                       # number of tag array writes
+system.ruby.l1_cntrl7.L1DcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
+system.ruby.l1_cntrl7.L1DcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
+system.ruby.l1_cntrl7.L1IcacheMemory.num_data_array_reads            0                       # number of data array reads
+system.ruby.l1_cntrl7.L1IcacheMemory.num_data_array_writes            0                       # number of data array writes
+system.ruby.l1_cntrl7.L1IcacheMemory.num_tag_array_reads            0                       # number of tag array reads
+system.ruby.l1_cntrl7.L1IcacheMemory.num_tag_array_writes            0                       # number of tag array writes
+system.ruby.l1_cntrl7.L1IcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
+system.ruby.l1_cntrl7.L1IcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
+system.ruby.l1_cntrl7.prefetcher.miss_observed            0                       # number of misses observed
+system.ruby.l1_cntrl7.prefetcher.allocated_streams            0                       # number of streams allocated for prefetching
+system.ruby.l1_cntrl7.prefetcher.prefetches_requested            0                       # number of prefetch requests made
+system.ruby.l1_cntrl7.prefetcher.prefetches_accepted            0                       # number of prefetch requests accepted
+system.ruby.l1_cntrl7.prefetcher.dropped_prefetches            0                       # number of prefetch requests dropped
+system.ruby.l1_cntrl7.prefetcher.hits               0                       # number of prefetched blocks accessed
+system.ruby.l1_cntrl7.prefetcher.partial_hits            0                       # number of misses observed for a block being prefetched
+system.ruby.l1_cntrl7.prefetcher.pages_crossed            0                       # number of prefetches across pages
+system.ruby.l1_cntrl7.prefetcher.misses_on_prefetched_blocks            0                       # number of misses for blocks that were prefetched, yet missed
+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
+system.ruby.l1_cntrl1.L1DcacheMemory.num_data_array_reads            0                       # number of data array reads
+system.ruby.l1_cntrl1.L1DcacheMemory.num_data_array_writes            0                       # number of data array writes
+system.ruby.l1_cntrl1.L1DcacheMemory.num_tag_array_reads            0                       # number of tag array reads
+system.ruby.l1_cntrl1.L1DcacheMemory.num_tag_array_writes            0                       # number of tag array writes
+system.ruby.l1_cntrl1.L1DcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
+system.ruby.l1_cntrl1.L1DcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
+system.ruby.l1_cntrl1.L1IcacheMemory.num_data_array_reads            0                       # number of data array reads
+system.ruby.l1_cntrl1.L1IcacheMemory.num_data_array_writes            0                       # number of data array writes
+system.ruby.l1_cntrl1.L1IcacheMemory.num_tag_array_reads            0                       # number of tag array reads
+system.ruby.l1_cntrl1.L1IcacheMemory.num_tag_array_writes            0                       # number of tag array writes
+system.ruby.l1_cntrl1.L1IcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
+system.ruby.l1_cntrl1.L1IcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
+system.ruby.l1_cntrl1.prefetcher.miss_observed            0                       # number of misses observed
+system.ruby.l1_cntrl1.prefetcher.allocated_streams            0                       # number of streams allocated for prefetching
+system.ruby.l1_cntrl1.prefetcher.prefetches_requested            0                       # number of prefetch requests made
+system.ruby.l1_cntrl1.prefetcher.prefetches_accepted            0                       # number of prefetch requests accepted
+system.ruby.l1_cntrl1.prefetcher.dropped_prefetches            0                       # number of prefetch requests dropped
+system.ruby.l1_cntrl1.prefetcher.hits               0                       # number of prefetched blocks accessed
+system.ruby.l1_cntrl1.prefetcher.partial_hits            0                       # number of misses observed for a block being prefetched
+system.ruby.l1_cntrl1.prefetcher.pages_crossed            0                       # number of prefetches across pages
+system.ruby.l1_cntrl1.prefetcher.misses_on_prefetched_blocks            0                       # number of misses for blocks that were prefetched, yet missed
+system.ruby.l1_cntrl2.L1DcacheMemory.num_data_array_reads            0                       # number of data array reads
+system.ruby.l1_cntrl2.L1DcacheMemory.num_data_array_writes            0                       # number of data array writes
+system.ruby.l1_cntrl2.L1DcacheMemory.num_tag_array_reads            0                       # number of tag array reads
+system.ruby.l1_cntrl2.L1DcacheMemory.num_tag_array_writes            0                       # number of tag array writes
+system.ruby.l1_cntrl2.L1DcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
+system.ruby.l1_cntrl2.L1DcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
+system.ruby.l1_cntrl2.L1IcacheMemory.num_data_array_reads            0                       # number of data array reads
+system.ruby.l1_cntrl2.L1IcacheMemory.num_data_array_writes            0                       # number of data array writes
+system.ruby.l1_cntrl2.L1IcacheMemory.num_tag_array_reads            0                       # number of tag array reads
+system.ruby.l1_cntrl2.L1IcacheMemory.num_tag_array_writes            0                       # number of tag array writes
+system.ruby.l1_cntrl2.L1IcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
+system.ruby.l1_cntrl2.L1IcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
+system.ruby.l1_cntrl2.prefetcher.miss_observed            0                       # number of misses observed
+system.ruby.l1_cntrl2.prefetcher.allocated_streams            0                       # number of streams allocated for prefetching
+system.ruby.l1_cntrl2.prefetcher.prefetches_requested            0                       # number of prefetch requests made
+system.ruby.l1_cntrl2.prefetcher.prefetches_accepted            0                       # number of prefetch requests accepted
+system.ruby.l1_cntrl2.prefetcher.dropped_prefetches            0                       # number of prefetch requests dropped
+system.ruby.l1_cntrl2.prefetcher.hits               0                       # number of prefetched blocks accessed
+system.ruby.l1_cntrl2.prefetcher.partial_hits            0                       # number of misses observed for a block being prefetched
+system.ruby.l1_cntrl2.prefetcher.pages_crossed            0                       # number of prefetches across pages
+system.ruby.l1_cntrl2.prefetcher.misses_on_prefetched_blocks            0                       # number of misses for blocks that were prefetched, yet missed
+system.ruby.l1_cntrl3.L1DcacheMemory.num_data_array_reads            0                       # number of data array reads
+system.ruby.l1_cntrl3.L1DcacheMemory.num_data_array_writes            0                       # number of data array writes
+system.ruby.l1_cntrl3.L1DcacheMemory.num_tag_array_reads            0                       # number of tag array reads
+system.ruby.l1_cntrl3.L1DcacheMemory.num_tag_array_writes            0                       # number of tag array writes
+system.ruby.l1_cntrl3.L1DcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
+system.ruby.l1_cntrl3.L1DcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
+system.ruby.l1_cntrl3.L1IcacheMemory.num_data_array_reads            0                       # number of data array reads
+system.ruby.l1_cntrl3.L1IcacheMemory.num_data_array_writes            0                       # number of data array writes
+system.ruby.l1_cntrl3.L1IcacheMemory.num_tag_array_reads            0                       # number of tag array reads
+system.ruby.l1_cntrl3.L1IcacheMemory.num_tag_array_writes            0                       # number of tag array writes
+system.ruby.l1_cntrl3.L1IcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
+system.ruby.l1_cntrl3.L1IcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
+system.ruby.l1_cntrl3.prefetcher.miss_observed            0                       # number of misses observed
+system.ruby.l1_cntrl3.prefetcher.allocated_streams            0                       # number of streams allocated for prefetching
+system.ruby.l1_cntrl3.prefetcher.prefetches_requested            0                       # number of prefetch requests made
+system.ruby.l1_cntrl3.prefetcher.prefetches_accepted            0                       # number of prefetch requests accepted
+system.ruby.l1_cntrl3.prefetcher.dropped_prefetches            0                       # number of prefetch requests dropped
+system.ruby.l1_cntrl3.prefetcher.hits               0                       # number of prefetched blocks accessed
+system.ruby.l1_cntrl3.prefetcher.partial_hits            0                       # number of misses observed for a block being prefetched
+system.ruby.l1_cntrl3.prefetcher.pages_crossed            0                       # number of prefetches across pages
+system.ruby.l1_cntrl3.prefetcher.misses_on_prefetched_blocks            0                       # number of misses for blocks that were prefetched, yet missed
+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.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 1ed7f9d52671cef2f20daf031e7634655720e5de..e177be99ca9c0aee9120c4f09e19dc1cc5015b1a 100644 (file)
--- 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
@@ -8,13 +8,14 @@ time_sync_spin_threshold=100000
 
 [system]
 type=System
-children=cpu0 cpu1 cpu2 cpu3 cpu4 cpu5 cpu6 cpu7 dir_cntrl0 funcbus funcmem l1_cntrl0 l1_cntrl1 l1_cntrl2 l1_cntrl3 l1_cntrl4 l1_cntrl5 l1_cntrl6 l1_cntrl7 l2_cntrl0 physmem ruby sys_port_proxy
+children=cpu0 cpu1 cpu2 cpu3 cpu4 cpu5 cpu6 cpu7 funcbus funcmem physmem ruby sys_port_proxy
 boot_osflags=a
 clock=1
 init_param=0
 kernel=
 load_addr_mask=1099511627775
 mem_mode=timing
+mem_ranges=
 memories=system.physmem system.funcmem
 num_work_ids=16
 readfile=
@@ -45,7 +46,7 @@ suppress_func_warnings=true
 sys=system
 trace_addr=0
 functional=system.funcbus.slave[0]
-test=system.l1_cntrl0.sequencer.slave[0]
+test=system.ruby.l1_cntrl0.sequencer.slave[0]
 
 [system.cpu1]
 type=MemTest
@@ -64,7 +65,7 @@ suppress_func_warnings=true
 sys=system
 trace_addr=0
 functional=system.funcbus.slave[1]
-test=system.l1_cntrl1.sequencer.slave[0]
+test=system.ruby.l1_cntrl1.sequencer.slave[0]
 
 [system.cpu2]
 type=MemTest
@@ -83,7 +84,7 @@ suppress_func_warnings=true
 sys=system
 trace_addr=0
 functional=system.funcbus.slave[2]
-test=system.l1_cntrl2.sequencer.slave[0]
+test=system.ruby.l1_cntrl2.sequencer.slave[0]
 
 [system.cpu3]
 type=MemTest
@@ -102,7 +103,7 @@ suppress_func_warnings=true
 sys=system
 trace_addr=0
 functional=system.funcbus.slave[3]
-test=system.l1_cntrl3.sequencer.slave[0]
+test=system.ruby.l1_cntrl3.sequencer.slave[0]
 
 [system.cpu4]
 type=MemTest
@@ -121,7 +122,7 @@ suppress_func_warnings=true
 sys=system
 trace_addr=0
 functional=system.funcbus.slave[4]
-test=system.l1_cntrl4.sequencer.slave[0]
+test=system.ruby.l1_cntrl4.sequencer.slave[0]
 
 [system.cpu5]
 type=MemTest
@@ -140,7 +141,7 @@ suppress_func_warnings=true
 sys=system
 trace_addr=0
 functional=system.funcbus.slave[5]
-test=system.l1_cntrl5.sequencer.slave[0]
+test=system.ruby.l1_cntrl5.sequencer.slave[0]
 
 [system.cpu6]
 type=MemTest
@@ -159,7 +160,7 @@ suppress_func_warnings=true
 sys=system
 trace_addr=0
 functional=system.funcbus.slave[6]
-test=system.l1_cntrl6.sequencer.slave[0]
+test=system.ruby.l1_cntrl6.sequencer.slave[0]
 
 [system.cpu7]
 type=MemTest
@@ -178,23 +179,70 @@ suppress_func_warnings=true
 sys=system
 trace_addr=0
 functional=system.funcbus.slave[7]
-test=system.l1_cntrl7.sequencer.slave[0]
+test=system.ruby.l1_cntrl7.sequencer.slave[0]
 
-[system.dir_cntrl0]
+[system.funcbus]
+type=NoncoherentBus
+block_size=64
+clock=1
+header_cycles=1
+use_default_range=false
+width=8
+master=system.funcmem.port
+slave=system.cpu0.functional system.cpu1.functional system.cpu2.functional system.cpu3.functional system.cpu4.functional system.cpu5.functional system.cpu6.functional system.cpu7.functional
+
+[system.funcmem]
+type=SimpleMemory
+bandwidth=0.000000
+clock=1
+conf_table_reported=false
+in_addr_map=false
+latency=30
+latency_var=0
+null=false
+range=0:134217727
+zero=false
+port=system.funcbus.master[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=dir_cntrl0 l1_cntrl0 l1_cntrl1 l1_cntrl2 l1_cntrl3 l1_cntrl4 l1_cntrl5 l1_cntrl6 l1_cntrl7 l2_cntrl0 network profiler
+block_size_bytes=64
+clock=1
+mem_size=268435456
+no_mem_vec=false
+random_seed=1234
+randomization=false
+stats_filename=ruby.stats
+
+[system.ruby.dir_cntrl0]
 type=Directory_Controller
 children=directory memBuffer
 buffer_size=0
+clock=1
 cntrl_id=9
-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=5
@@ -202,7 +250,7 @@ size=268435456
 use_map=false
 version=0
 
-[system.dir_cntrl0.memBuffer]
+[system.ruby.dir_cntrl0.memBuffer]
 type=RubyMemoryControl
 bank_bit_0=8
 bank_busy_time=11
@@ -224,35 +272,13 @@ ruby_system=system.ruby
 tFaw=0
 version=0
 
-[system.funcbus]
-type=NoncoherentBus
-block_size=64
-clock=1
-header_cycles=1
-use_default_range=false
-width=8
-master=system.funcmem.port
-slave=system.cpu0.functional system.cpu1.functional system.cpu2.functional system.cpu3.functional system.cpu4.functional system.cpu5.functional system.cpu6.functional system.cpu7.functional
-
-[system.funcmem]
-type=SimpleMemory
-bandwidth=0.000000
-clock=1
-conf_table_reported=false
-in_addr_map=false
-latency=30
-latency_var=0
-null=false
-range=0:134217727
-zero=false
-port=system.funcbus.master[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
@@ -260,11 +286,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
@@ -278,7 +304,7 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.l1_cntrl0.L1IcacheMemory]
+[system.ruby.l1_cntrl0.L1IcacheMemory]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -292,13 +318,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=1000000
-icache=system.l1_cntrl0.L1IcacheMemory
+icache=system.ruby.l1_cntrl0.L1IcacheMemory
 max_outstanding_requests=16
 ruby_system=system.ruby
 support_data_reqs=true
@@ -309,12 +335,13 @@ using_ruby_tester=false
 version=0
 slave=system.cpu0.test
 
-[system.l1_cntrl1]
+[system.ruby.l1_cntrl1]
 type=L1Cache_Controller
 children=L1DcacheMemory L1IcacheMemory sequencer
-L1DcacheMemory=system.l1_cntrl1.L1DcacheMemory
-L1IcacheMemory=system.l1_cntrl1.L1IcacheMemory
+L1DcacheMemory=system.ruby.l1_cntrl1.L1DcacheMemory
+L1IcacheMemory=system.ruby.l1_cntrl1.L1IcacheMemory
 buffer_size=0
+clock=1
 cntrl_id=1
 l2_select_num_bits=0
 number_of_TBEs=256
@@ -322,11 +349,11 @@ recycle_latency=10
 request_latency=2
 ruby_system=system.ruby
 send_evictions=false
-sequencer=system.l1_cntrl1.sequencer
+sequencer=system.ruby.l1_cntrl1.sequencer
 transitions_per_cycle=32
 version=1
 
-[system.l1_cntrl1.L1DcacheMemory]
+[system.ruby.l1_cntrl1.L1DcacheMemory]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -340,7 +367,7 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.l1_cntrl1.L1IcacheMemory]
+[system.ruby.l1_cntrl1.L1IcacheMemory]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -354,13 +381,13 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.l1_cntrl1.sequencer]
+[system.ruby.l1_cntrl1.sequencer]
 type=RubySequencer
 access_phys_mem=false
 clock=1
-dcache=system.l1_cntrl1.L1DcacheMemory
+dcache=system.ruby.l1_cntrl1.L1DcacheMemory
 deadlock_threshold=1000000
-icache=system.l1_cntrl1.L1IcacheMemory
+icache=system.ruby.l1_cntrl1.L1IcacheMemory
 max_outstanding_requests=16
 ruby_system=system.ruby
 support_data_reqs=true
@@ -371,12 +398,13 @@ using_ruby_tester=false
 version=1
 slave=system.cpu1.test
 
-[system.l1_cntrl2]
+[system.ruby.l1_cntrl2]
 type=L1Cache_Controller
 children=L1DcacheMemory L1IcacheMemory sequencer
-L1DcacheMemory=system.l1_cntrl2.L1DcacheMemory
-L1IcacheMemory=system.l1_cntrl2.L1IcacheMemory
+L1DcacheMemory=system.ruby.l1_cntrl2.L1DcacheMemory
+L1IcacheMemory=system.ruby.l1_cntrl2.L1IcacheMemory
 buffer_size=0
+clock=1
 cntrl_id=2
 l2_select_num_bits=0
 number_of_TBEs=256
@@ -384,11 +412,11 @@ recycle_latency=10
 request_latency=2
 ruby_system=system.ruby
 send_evictions=false
-sequencer=system.l1_cntrl2.sequencer
+sequencer=system.ruby.l1_cntrl2.sequencer
 transitions_per_cycle=32
 version=2
 
-[system.l1_cntrl2.L1DcacheMemory]
+[system.ruby.l1_cntrl2.L1DcacheMemory]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -402,7 +430,7 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.l1_cntrl2.L1IcacheMemory]
+[system.ruby.l1_cntrl2.L1IcacheMemory]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -416,13 +444,13 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.l1_cntrl2.sequencer]
+[system.ruby.l1_cntrl2.sequencer]
 type=RubySequencer
 access_phys_mem=false
 clock=1
-dcache=system.l1_cntrl2.L1DcacheMemory
+dcache=system.ruby.l1_cntrl2.L1DcacheMemory
 deadlock_threshold=1000000
-icache=system.l1_cntrl2.L1IcacheMemory
+icache=system.ruby.l1_cntrl2.L1IcacheMemory
 max_outstanding_requests=16
 ruby_system=system.ruby
 support_data_reqs=true
@@ -433,12 +461,13 @@ using_ruby_tester=false
 version=2
 slave=system.cpu2.test
 
-[system.l1_cntrl3]
+[system.ruby.l1_cntrl3]
 type=L1Cache_Controller
 children=L1DcacheMemory L1IcacheMemory sequencer
-L1DcacheMemory=system.l1_cntrl3.L1DcacheMemory
-L1IcacheMemory=system.l1_cntrl3.L1IcacheMemory
+L1DcacheMemory=system.ruby.l1_cntrl3.L1DcacheMemory
+L1IcacheMemory=system.ruby.l1_cntrl3.L1IcacheMemory
 buffer_size=0
+clock=1
 cntrl_id=3
 l2_select_num_bits=0
 number_of_TBEs=256
@@ -446,11 +475,11 @@ recycle_latency=10
 request_latency=2
 ruby_system=system.ruby
 send_evictions=false
-sequencer=system.l1_cntrl3.sequencer
+sequencer=system.ruby.l1_cntrl3.sequencer
 transitions_per_cycle=32
 version=3
 
-[system.l1_cntrl3.L1DcacheMemory]
+[system.ruby.l1_cntrl3.L1DcacheMemory]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -464,7 +493,7 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.l1_cntrl3.L1IcacheMemory]
+[system.ruby.l1_cntrl3.L1IcacheMemory]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -478,13 +507,13 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.l1_cntrl3.sequencer]
+[system.ruby.l1_cntrl3.sequencer]
 type=RubySequencer
 access_phys_mem=false
 clock=1
-dcache=system.l1_cntrl3.L1DcacheMemory
+dcache=system.ruby.l1_cntrl3.L1DcacheMemory
 deadlock_threshold=1000000
-icache=system.l1_cntrl3.L1IcacheMemory
+icache=system.ruby.l1_cntrl3.L1IcacheMemory
 max_outstanding_requests=16
 ruby_system=system.ruby
 support_data_reqs=true
@@ -495,12 +524,13 @@ using_ruby_tester=false
 version=3
 slave=system.cpu3.test
 
-[system.l1_cntrl4]
+[system.ruby.l1_cntrl4]
 type=L1Cache_Controller
 children=L1DcacheMemory L1IcacheMemory sequencer
-L1DcacheMemory=system.l1_cntrl4.L1DcacheMemory
-L1IcacheMemory=system.l1_cntrl4.L1IcacheMemory
+L1DcacheMemory=system.ruby.l1_cntrl4.L1DcacheMemory
+L1IcacheMemory=system.ruby.l1_cntrl4.L1IcacheMemory
 buffer_size=0
+clock=1
 cntrl_id=4
 l2_select_num_bits=0
 number_of_TBEs=256
@@ -508,11 +538,11 @@ recycle_latency=10
 request_latency=2
 ruby_system=system.ruby
 send_evictions=false
-sequencer=system.l1_cntrl4.sequencer
+sequencer=system.ruby.l1_cntrl4.sequencer
 transitions_per_cycle=32
 version=4
 
-[system.l1_cntrl4.L1DcacheMemory]
+[system.ruby.l1_cntrl4.L1DcacheMemory]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -526,7 +556,7 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.l1_cntrl4.L1IcacheMemory]
+[system.ruby.l1_cntrl4.L1IcacheMemory]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -540,13 +570,13 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.l1_cntrl4.sequencer]
+[system.ruby.l1_cntrl4.sequencer]
 type=RubySequencer
 access_phys_mem=false
 clock=1
-dcache=system.l1_cntrl4.L1DcacheMemory
+dcache=system.ruby.l1_cntrl4.L1DcacheMemory
 deadlock_threshold=1000000
-icache=system.l1_cntrl4.L1IcacheMemory
+icache=system.ruby.l1_cntrl4.L1IcacheMemory
 max_outstanding_requests=16
 ruby_system=system.ruby
 support_data_reqs=true
@@ -557,12 +587,13 @@ using_ruby_tester=false
 version=4
 slave=system.cpu4.test
 
-[system.l1_cntrl5]
+[system.ruby.l1_cntrl5]
 type=L1Cache_Controller
 children=L1DcacheMemory L1IcacheMemory sequencer
-L1DcacheMemory=system.l1_cntrl5.L1DcacheMemory
-L1IcacheMemory=system.l1_cntrl5.L1IcacheMemory
+L1DcacheMemory=system.ruby.l1_cntrl5.L1DcacheMemory
+L1IcacheMemory=system.ruby.l1_cntrl5.L1IcacheMemory
 buffer_size=0
+clock=1
 cntrl_id=5
 l2_select_num_bits=0
 number_of_TBEs=256
@@ -570,11 +601,11 @@ recycle_latency=10
 request_latency=2
 ruby_system=system.ruby
 send_evictions=false
-sequencer=system.l1_cntrl5.sequencer
+sequencer=system.ruby.l1_cntrl5.sequencer
 transitions_per_cycle=32
 version=5
 
-[system.l1_cntrl5.L1DcacheMemory]
+[system.ruby.l1_cntrl5.L1DcacheMemory]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -588,7 +619,7 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.l1_cntrl5.L1IcacheMemory]
+[system.ruby.l1_cntrl5.L1IcacheMemory]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -602,13 +633,13 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.l1_cntrl5.sequencer]
+[system.ruby.l1_cntrl5.sequencer]
 type=RubySequencer
 access_phys_mem=false
 clock=1
-dcache=system.l1_cntrl5.L1DcacheMemory
+dcache=system.ruby.l1_cntrl5.L1DcacheMemory
 deadlock_threshold=1000000
-icache=system.l1_cntrl5.L1IcacheMemory
+icache=system.ruby.l1_cntrl5.L1IcacheMemory
 max_outstanding_requests=16
 ruby_system=system.ruby
 support_data_reqs=true
@@ -619,12 +650,13 @@ using_ruby_tester=false
 version=5
 slave=system.cpu5.test
 
-[system.l1_cntrl6]
+[system.ruby.l1_cntrl6]
 type=L1Cache_Controller
 children=L1DcacheMemory L1IcacheMemory sequencer
-L1DcacheMemory=system.l1_cntrl6.L1DcacheMemory
-L1IcacheMemory=system.l1_cntrl6.L1IcacheMemory
+L1DcacheMemory=system.ruby.l1_cntrl6.L1DcacheMemory
+L1IcacheMemory=system.ruby.l1_cntrl6.L1IcacheMemory
 buffer_size=0
+clock=1
 cntrl_id=6
 l2_select_num_bits=0
 number_of_TBEs=256
@@ -632,11 +664,11 @@ recycle_latency=10
 request_latency=2
 ruby_system=system.ruby
 send_evictions=false
-sequencer=system.l1_cntrl6.sequencer
+sequencer=system.ruby.l1_cntrl6.sequencer
 transitions_per_cycle=32
 version=6
 
-[system.l1_cntrl6.L1DcacheMemory]
+[system.ruby.l1_cntrl6.L1DcacheMemory]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -650,7 +682,7 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.l1_cntrl6.L1IcacheMemory]
+[system.ruby.l1_cntrl6.L1IcacheMemory]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -664,13 +696,13 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.l1_cntrl6.sequencer]
+[system.ruby.l1_cntrl6.sequencer]
 type=RubySequencer
 access_phys_mem=false
 clock=1
-dcache=system.l1_cntrl6.L1DcacheMemory
+dcache=system.ruby.l1_cntrl6.L1DcacheMemory
 deadlock_threshold=1000000
-icache=system.l1_cntrl6.L1IcacheMemory
+icache=system.ruby.l1_cntrl6.L1IcacheMemory
 max_outstanding_requests=16
 ruby_system=system.ruby
 support_data_reqs=true
@@ -681,12 +713,13 @@ using_ruby_tester=false
 version=6
 slave=system.cpu6.test
 
-[system.l1_cntrl7]
+[system.ruby.l1_cntrl7]
 type=L1Cache_Controller
 children=L1DcacheMemory L1IcacheMemory sequencer
-L1DcacheMemory=system.l1_cntrl7.L1DcacheMemory
-L1IcacheMemory=system.l1_cntrl7.L1IcacheMemory
+L1DcacheMemory=system.ruby.l1_cntrl7.L1DcacheMemory
+L1IcacheMemory=system.ruby.l1_cntrl7.L1IcacheMemory
 buffer_size=0
+clock=1
 cntrl_id=7
 l2_select_num_bits=0
 number_of_TBEs=256
@@ -694,11 +727,11 @@ recycle_latency=10
 request_latency=2
 ruby_system=system.ruby
 send_evictions=false
-sequencer=system.l1_cntrl7.sequencer
+sequencer=system.ruby.l1_cntrl7.sequencer
 transitions_per_cycle=32
 version=7
 
-[system.l1_cntrl7.L1DcacheMemory]
+[system.ruby.l1_cntrl7.L1DcacheMemory]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -712,7 +745,7 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.l1_cntrl7.L1IcacheMemory]
+[system.ruby.l1_cntrl7.L1IcacheMemory]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -726,13 +759,13 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.l1_cntrl7.sequencer]
+[system.ruby.l1_cntrl7.sequencer]
 type=RubySequencer
 access_phys_mem=false
 clock=1
-dcache=system.l1_cntrl7.L1DcacheMemory
+dcache=system.ruby.l1_cntrl7.L1DcacheMemory
 deadlock_threshold=1000000
-icache=system.l1_cntrl7.L1IcacheMemory
+icache=system.ruby.l1_cntrl7.L1IcacheMemory
 max_outstanding_requests=16
 ruby_system=system.ruby
 support_data_reqs=true
@@ -743,11 +776,12 @@ using_ruby_tester=false
 version=7
 slave=system.cpu7.test
 
-[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=8
 number_of_TBEs=256
 recycle_latency=10
@@ -757,7 +791,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
@@ -771,34 +805,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=268435456
-no_mem_vec=false
-random_seed=1234
-randomization=false
-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
@@ -818,7 +830,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
@@ -826,6 +838,7 @@ weight=1
 
 [system.ruby.network.topology.ext_links0.int_node]
 type=Switch
+clock=1
 router_id=0
 virt_nets=10
 
@@ -833,7 +846,7 @@ virt_nets=10
 type=SimpleExtLink
 children=int_node
 bandwidth_factor=16
-ext_node=system.l1_cntrl1
+ext_node=system.ruby.l1_cntrl1
 int_node=system.ruby.network.topology.ext_links1.int_node
 latency=1
 link_id=1
@@ -841,6 +854,7 @@ weight=1
 
 [system.ruby.network.topology.ext_links1.int_node]
 type=Switch
+clock=1
 router_id=1
 virt_nets=10
 
@@ -848,7 +862,7 @@ virt_nets=10
 type=SimpleExtLink
 children=int_node
 bandwidth_factor=16
-ext_node=system.l1_cntrl2
+ext_node=system.ruby.l1_cntrl2
 int_node=system.ruby.network.topology.ext_links2.int_node
 latency=1
 link_id=2
@@ -856,6 +870,7 @@ weight=1
 
 [system.ruby.network.topology.ext_links2.int_node]
 type=Switch
+clock=1
 router_id=2
 virt_nets=10
 
@@ -863,7 +878,7 @@ virt_nets=10
 type=SimpleExtLink
 children=int_node
 bandwidth_factor=16
-ext_node=system.l1_cntrl3
+ext_node=system.ruby.l1_cntrl3
 int_node=system.ruby.network.topology.ext_links3.int_node
 latency=1
 link_id=3
@@ -871,6 +886,7 @@ weight=1
 
 [system.ruby.network.topology.ext_links3.int_node]
 type=Switch
+clock=1
 router_id=3
 virt_nets=10
 
@@ -878,7 +894,7 @@ virt_nets=10
 type=SimpleExtLink
 children=int_node
 bandwidth_factor=16
-ext_node=system.l1_cntrl4
+ext_node=system.ruby.l1_cntrl4
 int_node=system.ruby.network.topology.ext_links4.int_node
 latency=1
 link_id=4
@@ -886,6 +902,7 @@ weight=1
 
 [system.ruby.network.topology.ext_links4.int_node]
 type=Switch
+clock=1
 router_id=4
 virt_nets=10
 
@@ -893,7 +910,7 @@ virt_nets=10
 type=SimpleExtLink
 children=int_node
 bandwidth_factor=16
-ext_node=system.l1_cntrl5
+ext_node=system.ruby.l1_cntrl5
 int_node=system.ruby.network.topology.ext_links5.int_node
 latency=1
 link_id=5
@@ -901,6 +918,7 @@ weight=1
 
 [system.ruby.network.topology.ext_links5.int_node]
 type=Switch
+clock=1
 router_id=5
 virt_nets=10
 
@@ -908,7 +926,7 @@ virt_nets=10
 type=SimpleExtLink
 children=int_node
 bandwidth_factor=16
-ext_node=system.l1_cntrl6
+ext_node=system.ruby.l1_cntrl6
 int_node=system.ruby.network.topology.ext_links6.int_node
 latency=1
 link_id=6
@@ -916,6 +934,7 @@ weight=1
 
 [system.ruby.network.topology.ext_links6.int_node]
 type=Switch
+clock=1
 router_id=6
 virt_nets=10
 
@@ -923,7 +942,7 @@ virt_nets=10
 type=SimpleExtLink
 children=int_node
 bandwidth_factor=16
-ext_node=system.l1_cntrl7
+ext_node=system.ruby.l1_cntrl7
 int_node=system.ruby.network.topology.ext_links7.int_node
 latency=1
 link_id=7
@@ -931,6 +950,7 @@ weight=1
 
 [system.ruby.network.topology.ext_links7.int_node]
 type=Switch
+clock=1
 router_id=7
 virt_nets=10
 
@@ -938,7 +958,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_links8.int_node
 latency=1
 link_id=8
@@ -946,6 +966,7 @@ weight=1
 
 [system.ruby.network.topology.ext_links8.int_node]
 type=Switch
+clock=1
 router_id=8
 virt_nets=10
 
@@ -953,7 +974,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_links9.int_node
 latency=1
 link_id=9
@@ -961,6 +982,7 @@ weight=1
 
 [system.ruby.network.topology.ext_links9.int_node]
 type=Switch
+clock=1
 router_id=9
 virt_nets=10
 
@@ -976,6 +998,7 @@ weight=1
 
 [system.ruby.network.topology.int_links0.node_b]
 type=Switch
+clock=1
 router_id=10
 virt_nets=10
 

diff --git a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_directory/ruby.stats b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_directory/ruby.stats
index 5a6c45be80e0ede66e4e642da082d27a324fa371..25a635c6eec2eca9ba80f4fbb83a56d0d4a48d75 100644 (file)
--- a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_directory/ruby.stats
+++ b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_directory/ruby.stats
@@ -1,24 +1,24 @@
-Real time: Nov/10/2012 16:14:51
+Real time: Jan/14/2013 08:26:27
 
 Profiler Stats
 --------------
-Elapsed_time_in_seconds: 184
-Elapsed_time_in_minutes: 3.06667
-Elapsed_time_in_hours: 0.0511111
-Elapsed_time_in_days: 0.00212963
+Elapsed_time_in_seconds: 179
+Elapsed_time_in_minutes: 2.98333
+Elapsed_time_in_hours: 0.0497222
+Elapsed_time_in_days: 0.00207176
 
-Virtual_time_in_seconds: 183.88
-Virtual_time_in_minutes: 3.06467
-Virtual_time_in_hours:   0.0510778
-Virtual_time_in_days:    0.00212824
+Virtual_time_in_seconds: 178.39
+Virtual_time_in_minutes: 2.97317
+Virtual_time_in_hours:   0.0495528
+Virtual_time_in_days:    0.0020647
 
 Ruby_current_time: 7473494
 Ruby_start_time: 0
 Ruby_cycles: 7473494
 
-mbytes_resident: 71.2734
-mbytes_total: 409.457
-resident_ratio: 0.174078
+mbytes_resident: 71.9219
+mbytes_total: 417.055
+resident_ratio: 0.17248
 
 ruby_cycles_executed: [ 7473495 7473495 7473495 7473495 7473495 7473495 7473495 7473495 ]
 
@@ -80,13 +80,13 @@ Total_nonPF_delay_cycles: [binsize: 1 max: 0 count: 0 average: NaN |standard dev
 Resource Usage
 --------------
 page_size: 4096
-user_time: 183
+user_time: 178
 system_time: 0
-page_reclaims: 10545
-page_faults: 152
+page_reclaims: 10461
+page_faults: 0
 swaps: 0
-block_inputs: 27544
-block_outputs: 272
+block_inputs: 0
+block_outputs: 288
 
 Network Stats
 -------------
@@ -374,20 +374,20 @@ links_utilized_percent_switch_10: 15.884
   outgoing_messages_switch_10_link_9_Writeback_Control: 992796 7942368 [ 0 604048 388748 0 0 0 0 0 0 0 ] base_latency: 1
   outgoing_messages_switch_10_link_9_Unblock_Control: 604436 4835488 [ 0 0 604436 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 ---
@@ -552,124 +552,124 @@ II  Writeback_Ack [0 0 0 0 0 0 0 0 ] 0
 II  Writeback_Ack_Data [312 330 347 359 329 342 345 312 ] 2676
 II  Writeback_Nack [1 2 1 1 4 1 2 4 ] 16
 
-Cache Stats: system.l1_cntrl1.L1IcacheMemory
-  system.l1_cntrl1.L1IcacheMemory_total_misses: 0
-  system.l1_cntrl1.L1IcacheMemory_total_demand_misses: 0
-  system.l1_cntrl1.L1IcacheMemory_total_prefetches: 0
-  system.l1_cntrl1.L1IcacheMemory_total_sw_prefetches: 0
-  system.l1_cntrl1.L1IcacheMemory_total_hw_prefetches: 0
+Cache Stats: system.ruby.l1_cntrl1.L1IcacheMemory
+  system.ruby.l1_cntrl1.L1IcacheMemory_total_misses: 0
+  system.ruby.l1_cntrl1.L1IcacheMemory_total_demand_misses: 0
+  system.ruby.l1_cntrl1.L1IcacheMemory_total_prefetches: 0
+  system.ruby.l1_cntrl1.L1IcacheMemory_total_sw_prefetches: 0
+  system.ruby.l1_cntrl1.L1IcacheMemory_total_hw_prefetches: 0
 
 
-Cache Stats: system.l1_cntrl1.L1DcacheMemory
-  system.l1_cntrl1.L1DcacheMemory_total_misses: 0
-  system.l1_cntrl1.L1DcacheMemory_total_demand_misses: 0
-  system.l1_cntrl1.L1DcacheMemory_total_prefetches: 0
-  system.l1_cntrl1.L1DcacheMemory_total_sw_prefetches: 0
-  system.l1_cntrl1.L1DcacheMemory_total_hw_prefetches: 0
+Cache Stats: system.ruby.l1_cntrl1.L1DcacheMemory
+  system.ruby.l1_cntrl1.L1DcacheMemory_total_misses: 0
+  system.ruby.l1_cntrl1.L1DcacheMemory_total_demand_misses: 0
+  system.ruby.l1_cntrl1.L1DcacheMemory_total_prefetches: 0
+  system.ruby.l1_cntrl1.L1DcacheMemory_total_sw_prefetches: 0
+  system.ruby.l1_cntrl1.L1DcacheMemory_total_hw_prefetches: 0
 
 
-Cache Stats: system.l1_cntrl2.L1IcacheMemory
-  system.l1_cntrl2.L1IcacheMemory_total_misses: 0
-  system.l1_cntrl2.L1IcacheMemory_total_demand_misses: 0
-  system.l1_cntrl2.L1IcacheMemory_total_prefetches: 0
-  system.l1_cntrl2.L1IcacheMemory_total_sw_prefetches: 0
-  system.l1_cntrl2.L1IcacheMemory_total_hw_prefetches: 0
+Cache Stats: system.ruby.l1_cntrl2.L1IcacheMemory
+  system.ruby.l1_cntrl2.L1IcacheMemory_total_misses: 0
+  system.ruby.l1_cntrl2.L1IcacheMemory_total_demand_misses: 0
+  system.ruby.l1_cntrl2.L1IcacheMemory_total_prefetches: 0
+  system.ruby.l1_cntrl2.L1IcacheMemory_total_sw_prefetches: 0
+  system.ruby.l1_cntrl2.L1IcacheMemory_total_hw_prefetches: 0
 
 
-Cache Stats: system.l1_cntrl2.L1DcacheMemory
-  system.l1_cntrl2.L1DcacheMemory_total_misses: 0
-  system.l1_cntrl2.L1DcacheMemory_total_demand_misses: 0
-  system.l1_cntrl2.L1DcacheMemory_total_prefetches: 0
-  system.l1_cntrl2.L1DcacheMemory_total_sw_prefetches: 0
-  system.l1_cntrl2.L1DcacheMemory_total_hw_prefetches: 0
+Cache Stats: system.ruby.l1_cntrl2.L1DcacheMemory
+  system.ruby.l1_cntrl2.L1DcacheMemory_total_misses: 0
+  system.ruby.l1_cntrl2.L1DcacheMemory_total_demand_misses: 0
+  system.ruby.l1_cntrl2.L1DcacheMemory_total_prefetches: 0
+  system.ruby.l1_cntrl2.L1DcacheMemory_total_sw_prefetches: 0
+  system.ruby.l1_cntrl2.L1DcacheMemory_total_hw_prefetches: 0
 
 
-Cache Stats: system.l1_cntrl3.L1IcacheMemory
-  system.l1_cntrl3.L1IcacheMemory_total_misses: 0
-  system.l1_cntrl3.L1IcacheMemory_total_demand_misses: 0
-  system.l1_cntrl3.L1IcacheMemory_total_prefetches: 0
-  system.l1_cntrl3.L1IcacheMemory_total_sw_prefetches: 0
-  system.l1_cntrl3.L1IcacheMemory_total_hw_prefetches: 0
+Cache Stats: system.ruby.l1_cntrl3.L1IcacheMemory
+  system.ruby.l1_cntrl3.L1IcacheMemory_total_misses: 0
+  system.ruby.l1_cntrl3.L1IcacheMemory_total_demand_misses: 0
+  system.ruby.l1_cntrl3.L1IcacheMemory_total_prefetches: 0
+  system.ruby.l1_cntrl3.L1IcacheMemory_total_sw_prefetches: 0
+  system.ruby.l1_cntrl3.L1IcacheMemory_total_hw_prefetches: 0
 
 
-Cache Stats: system.l1_cntrl3.L1DcacheMemory
-  system.l1_cntrl3.L1DcacheMemory_total_misses: 0
-  system.l1_cntrl3.L1DcacheMemory_total_demand_misses: 0
-  system.l1_cntrl3.L1DcacheMemory_total_prefetches: 0
-  system.l1_cntrl3.L1DcacheMemory_total_sw_prefetches: 0
-  system.l1_cntrl3.L1DcacheMemory_total_hw_prefetches: 0
+Cache Stats: system.ruby.l1_cntrl3.L1DcacheMemory
+  system.ruby.l1_cntrl3.L1DcacheMemory_total_misses: 0
+  system.ruby.l1_cntrl3.L1DcacheMemory_total_demand_misses: 0
+  system.ruby.l1_cntrl3.L1DcacheMemory_total_prefetches: 0
+  system.ruby.l1_cntrl3.L1DcacheMemory_total_sw_prefetches: 0
+  system.ruby.l1_cntrl3.L1DcacheMemory_total_hw_prefetches: 0
 
 
-Cache Stats: system.l1_cntrl4.L1IcacheMemory
-  system.l1_cntrl4.L1IcacheMemory_total_misses: 0
-  system.l1_cntrl4.L1IcacheMemory_total_demand_misses: 0
-  system.l1_cntrl4.L1IcacheMemory_total_prefetches: 0
-  system.l1_cntrl4.L1IcacheMemory_total_sw_prefetches: 0
-  system.l1_cntrl4.L1IcacheMemory_total_hw_prefetches: 0
+Cache Stats: system.ruby.l1_cntrl4.L1IcacheMemory
+  system.ruby.l1_cntrl4.L1IcacheMemory_total_misses: 0
+  system.ruby.l1_cntrl4.L1IcacheMemory_total_demand_misses: 0
+  system.ruby.l1_cntrl4.L1IcacheMemory_total_prefetches: 0
+  system.ruby.l1_cntrl4.L1IcacheMemory_total_sw_prefetches: 0
+  system.ruby.l1_cntrl4.L1IcacheMemory_total_hw_prefetches: 0
 
 
-Cache Stats: system.l1_cntrl4.L1DcacheMemory
-  system.l1_cntrl4.L1DcacheMemory_total_misses: 0
-  system.l1_cntrl4.L1DcacheMemory_total_demand_misses: 0
-  system.l1_cntrl4.L1DcacheMemory_total_prefetches: 0
-  system.l1_cntrl4.L1DcacheMemory_total_sw_prefetches: 0
-  system.l1_cntrl4.L1DcacheMemory_total_hw_prefetches: 0
+Cache Stats: system.ruby.l1_cntrl4.L1DcacheMemory
+  system.ruby.l1_cntrl4.L1DcacheMemory_total_misses: 0
+  system.ruby.l1_cntrl4.L1DcacheMemory_total_demand_misses: 0
+  system.ruby.l1_cntrl4.L1DcacheMemory_total_prefetches: 0
+  system.ruby.l1_cntrl4.L1DcacheMemory_total_sw_prefetches: 0
+  system.ruby.l1_cntrl4.L1DcacheMemory_total_hw_prefetches: 0
 
 
-Cache Stats: system.l1_cntrl5.L1IcacheMemory
-  system.l1_cntrl5.L1IcacheMemory_total_misses: 0
-  system.l1_cntrl5.L1IcacheMemory_total_demand_misses: 0
-  system.l1_cntrl5.L1IcacheMemory_total_prefetches: 0
-  system.l1_cntrl5.L1IcacheMemory_total_sw_prefetches: 0
-  system.l1_cntrl5.L1IcacheMemory_total_hw_prefetches: 0
+Cache Stats: system.ruby.l1_cntrl5.L1IcacheMemory
+  system.ruby.l1_cntrl5.L1IcacheMemory_total_misses: 0
+  system.ruby.l1_cntrl5.L1IcacheMemory_total_demand_misses: 0
+  system.ruby.l1_cntrl5.L1IcacheMemory_total_prefetches: 0
+  system.ruby.l1_cntrl5.L1IcacheMemory_total_sw_prefetches: 0
+  system.ruby.l1_cntrl5.L1IcacheMemory_total_hw_prefetches: 0
 
 
-Cache Stats: system.l1_cntrl5.L1DcacheMemory
-  system.l1_cntrl5.L1DcacheMemory_total_misses: 0
-  system.l1_cntrl5.L1DcacheMemory_total_demand_misses: 0
-  system.l1_cntrl5.L1DcacheMemory_total_prefetches: 0
-  system.l1_cntrl5.L1DcacheMemory_total_sw_prefetches: 0
-  system.l1_cntrl5.L1DcacheMemory_total_hw_prefetches: 0
+Cache Stats: system.ruby.l1_cntrl5.L1DcacheMemory
+  system.ruby.l1_cntrl5.L1DcacheMemory_total_misses: 0
+  system.ruby.l1_cntrl5.L1DcacheMemory_total_demand_misses: 0
+  system.ruby.l1_cntrl5.L1DcacheMemory_total_prefetches: 0
+  system.ruby.l1_cntrl5.L1DcacheMemory_total_sw_prefetches: 0
+  system.ruby.l1_cntrl5.L1DcacheMemory_total_hw_prefetches: 0
 
 
-Cache Stats: system.l1_cntrl6.L1IcacheMemory
-  system.l1_cntrl6.L1IcacheMemory_total_misses: 0
-  system.l1_cntrl6.L1IcacheMemory_total_demand_misses: 0
-  system.l1_cntrl6.L1IcacheMemory_total_prefetches: 0
-  system.l1_cntrl6.L1IcacheMemory_total_sw_prefetches: 0
-  system.l1_cntrl6.L1IcacheMemory_total_hw_prefetches: 0
+Cache Stats: system.ruby.l1_cntrl6.L1IcacheMemory
+  system.ruby.l1_cntrl6.L1IcacheMemory_total_misses: 0
+  system.ruby.l1_cntrl6.L1IcacheMemory_total_demand_misses: 0
+  system.ruby.l1_cntrl6.L1IcacheMemory_total_prefetches: 0
+  system.ruby.l1_cntrl6.L1IcacheMemory_total_sw_prefetches: 0
+  system.ruby.l1_cntrl6.L1IcacheMemory_total_hw_prefetches: 0
 
 
-Cache Stats: system.l1_cntrl6.L1DcacheMemory
-  system.l1_cntrl6.L1DcacheMemory_total_misses: 0
-  system.l1_cntrl6.L1DcacheMemory_total_demand_misses: 0
-  system.l1_cntrl6.L1DcacheMemory_total_prefetches: 0
-  system.l1_cntrl6.L1DcacheMemory_total_sw_prefetches: 0
-  system.l1_cntrl6.L1DcacheMemory_total_hw_prefetches: 0
+Cache Stats: system.ruby.l1_cntrl6.L1DcacheMemory
+  system.ruby.l1_cntrl6.L1DcacheMemory_total_misses: 0
+  system.ruby.l1_cntrl6.L1DcacheMemory_total_demand_misses: 0
+  system.ruby.l1_cntrl6.L1DcacheMemory_total_prefetches: 0
+  system.ruby.l1_cntrl6.L1DcacheMemory_total_sw_prefetches: 0
+  system.ruby.l1_cntrl6.L1DcacheMemory_total_hw_prefetches: 0
 
 
-Cache Stats: system.l1_cntrl7.L1IcacheMemory
-  system.l1_cntrl7.L1IcacheMemory_total_misses: 0
-  system.l1_cntrl7.L1IcacheMemory_total_demand_misses: 0
-  system.l1_cntrl7.L1IcacheMemory_total_prefetches: 0
-  system.l1_cntrl7.L1IcacheMemory_total_sw_prefetches: 0
-  system.l1_cntrl7.L1IcacheMemory_total_hw_prefetches: 0
+Cache Stats: system.ruby.l1_cntrl7.L1IcacheMemory
+  system.ruby.l1_cntrl7.L1IcacheMemory_total_misses: 0
+  system.ruby.l1_cntrl7.L1IcacheMemory_total_demand_misses: 0
+  system.ruby.l1_cntrl7.L1IcacheMemory_total_prefetches: 0
+  system.ruby.l1_cntrl7.L1IcacheMemory_total_sw_prefetches: 0
+  system.ruby.l1_cntrl7.L1IcacheMemory_total_hw_prefetches: 0
 
 
-Cache Stats: system.l1_cntrl7.L1DcacheMemory
-  system.l1_cntrl7.L1DcacheMemory_total_misses: 0
-  system.l1_cntrl7.L1DcacheMemory_total_demand_misses: 0
-  system.l1_cntrl7.L1DcacheMemory_total_prefetches: 0
-  system.l1_cntrl7.L1DcacheMemory_total_sw_prefetches: 0
-  system.l1_cntrl7.L1DcacheMemory_total_hw_prefetches: 0
+Cache Stats: system.ruby.l1_cntrl7.L1DcacheMemory
+  system.ruby.l1_cntrl7.L1DcacheMemory_total_misses: 0
+  system.ruby.l1_cntrl7.L1DcacheMemory_total_demand_misses: 0
+  system.ruby.l1_cntrl7.L1DcacheMemory_total_prefetches: 0
+  system.ruby.l1_cntrl7.L1DcacheMemory_total_sw_prefetches: 0
+  system.ruby.l1_cntrl7.L1DcacheMemory_total_hw_prefetches: 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 ---
@@ -1516,7 +1516,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: 819736
   memory_reads: 604464
   memory_writes: 215272

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 b949b2888f8969b5b5e68e22495324c8c7ccbd4e..3f68ae65b168dbfb8a56265bc23d6318f1229e6e 100644 (file)
--- 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,111 +4,111 @@ sim_seconds                                  0.007473                       # Nu
 sim_ticks                                     7473494                       # Number of ticks simulated
 final_tick                                    7473494                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                   1000000000                       # Frequency of simulated ticks
-host_tick_rate                                  40647                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 419288                       # Number of bytes of host memory used
-host_seconds                                   183.86                       # Real time elapsed on the host
-system.l1_cntrl4.L1DcacheMemory.num_data_array_reads            0                       # number of data array reads
-system.l1_cntrl4.L1DcacheMemory.num_data_array_writes            0                       # number of data array writes
-system.l1_cntrl4.L1DcacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.l1_cntrl4.L1DcacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.l1_cntrl4.L1DcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.l1_cntrl4.L1DcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-system.l1_cntrl4.L1IcacheMemory.num_data_array_reads            0                       # number of data array reads
-system.l1_cntrl4.L1IcacheMemory.num_data_array_writes            0                       # number of data array writes
-system.l1_cntrl4.L1IcacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.l1_cntrl4.L1IcacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.l1_cntrl4.L1IcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.l1_cntrl4.L1IcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-system.l1_cntrl5.L1DcacheMemory.num_data_array_reads            0                       # number of data array reads
-system.l1_cntrl5.L1DcacheMemory.num_data_array_writes            0                       # number of data array writes
-system.l1_cntrl5.L1DcacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.l1_cntrl5.L1DcacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.l1_cntrl5.L1DcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.l1_cntrl5.L1DcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-system.l1_cntrl5.L1IcacheMemory.num_data_array_reads            0                       # number of data array reads
-system.l1_cntrl5.L1IcacheMemory.num_data_array_writes            0                       # number of data array writes
-system.l1_cntrl5.L1IcacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.l1_cntrl5.L1IcacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.l1_cntrl5.L1IcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.l1_cntrl5.L1IcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-system.l1_cntrl6.L1DcacheMemory.num_data_array_reads            0                       # number of data array reads
-system.l1_cntrl6.L1DcacheMemory.num_data_array_writes            0                       # number of data array writes
-system.l1_cntrl6.L1DcacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.l1_cntrl6.L1DcacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.l1_cntrl6.L1DcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.l1_cntrl6.L1DcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-system.l1_cntrl6.L1IcacheMemory.num_data_array_reads            0                       # number of data array reads
-system.l1_cntrl6.L1IcacheMemory.num_data_array_writes            0                       # number of data array writes
-system.l1_cntrl6.L1IcacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.l1_cntrl6.L1IcacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.l1_cntrl6.L1IcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.l1_cntrl6.L1IcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-system.l1_cntrl7.L1DcacheMemory.num_data_array_reads            0                       # number of data array reads
-system.l1_cntrl7.L1DcacheMemory.num_data_array_writes            0                       # number of data array writes
-system.l1_cntrl7.L1DcacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.l1_cntrl7.L1DcacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.l1_cntrl7.L1DcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.l1_cntrl7.L1DcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-system.l1_cntrl7.L1IcacheMemory.num_data_array_reads            0                       # number of data array reads
-system.l1_cntrl7.L1IcacheMemory.num_data_array_writes            0                       # number of data array writes
-system.l1_cntrl7.L1IcacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.l1_cntrl7.L1IcacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.l1_cntrl7.L1IcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.l1_cntrl7.L1IcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-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_cntrl1.L1DcacheMemory.num_data_array_reads            0                       # number of data array reads
-system.l1_cntrl1.L1DcacheMemory.num_data_array_writes            0                       # number of data array writes
-system.l1_cntrl1.L1DcacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.l1_cntrl1.L1DcacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.l1_cntrl1.L1DcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.l1_cntrl1.L1DcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-system.l1_cntrl1.L1IcacheMemory.num_data_array_reads            0                       # number of data array reads
-system.l1_cntrl1.L1IcacheMemory.num_data_array_writes            0                       # number of data array writes
-system.l1_cntrl1.L1IcacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.l1_cntrl1.L1IcacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.l1_cntrl1.L1IcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.l1_cntrl1.L1IcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-system.l1_cntrl2.L1DcacheMemory.num_data_array_reads            0                       # number of data array reads
-system.l1_cntrl2.L1DcacheMemory.num_data_array_writes            0                       # number of data array writes
-system.l1_cntrl2.L1DcacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.l1_cntrl2.L1DcacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.l1_cntrl2.L1DcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.l1_cntrl2.L1DcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-system.l1_cntrl2.L1IcacheMemory.num_data_array_reads            0                       # number of data array reads
-system.l1_cntrl2.L1IcacheMemory.num_data_array_writes            0                       # number of data array writes
-system.l1_cntrl2.L1IcacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.l1_cntrl2.L1IcacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.l1_cntrl2.L1IcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.l1_cntrl2.L1IcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-system.l1_cntrl3.L1DcacheMemory.num_data_array_reads            0                       # number of data array reads
-system.l1_cntrl3.L1DcacheMemory.num_data_array_writes            0                       # number of data array writes
-system.l1_cntrl3.L1DcacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.l1_cntrl3.L1DcacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.l1_cntrl3.L1DcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.l1_cntrl3.L1DcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-system.l1_cntrl3.L1IcacheMemory.num_data_array_reads            0                       # number of data array reads
-system.l1_cntrl3.L1IcacheMemory.num_data_array_writes            0                       # number of data array writes
-system.l1_cntrl3.L1IcacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.l1_cntrl3.L1IcacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.l1_cntrl3.L1IcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.l1_cntrl3.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                                  41811                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 427068                       # Number of bytes of host memory used
+host_seconds                                   178.74                       # Real time elapsed on the host
+system.ruby.l1_cntrl4.L1DcacheMemory.num_data_array_reads            0                       # number of data array reads
+system.ruby.l1_cntrl4.L1DcacheMemory.num_data_array_writes            0                       # number of data array writes
+system.ruby.l1_cntrl4.L1DcacheMemory.num_tag_array_reads            0                       # number of tag array reads
+system.ruby.l1_cntrl4.L1DcacheMemory.num_tag_array_writes            0                       # number of tag array writes
+system.ruby.l1_cntrl4.L1DcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
+system.ruby.l1_cntrl4.L1DcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
+system.ruby.l1_cntrl4.L1IcacheMemory.num_data_array_reads            0                       # number of data array reads
+system.ruby.l1_cntrl4.L1IcacheMemory.num_data_array_writes            0                       # number of data array writes
+system.ruby.l1_cntrl4.L1IcacheMemory.num_tag_array_reads            0                       # number of tag array reads
+system.ruby.l1_cntrl4.L1IcacheMemory.num_tag_array_writes            0                       # number of tag array writes
+system.ruby.l1_cntrl4.L1IcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
+system.ruby.l1_cntrl4.L1IcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
+system.ruby.l1_cntrl5.L1DcacheMemory.num_data_array_reads            0                       # number of data array reads
+system.ruby.l1_cntrl5.L1DcacheMemory.num_data_array_writes            0                       # number of data array writes
+system.ruby.l1_cntrl5.L1DcacheMemory.num_tag_array_reads            0                       # number of tag array reads
+system.ruby.l1_cntrl5.L1DcacheMemory.num_tag_array_writes            0                       # number of tag array writes
+system.ruby.l1_cntrl5.L1DcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
+system.ruby.l1_cntrl5.L1DcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
+system.ruby.l1_cntrl5.L1IcacheMemory.num_data_array_reads            0                       # number of data array reads
+system.ruby.l1_cntrl5.L1IcacheMemory.num_data_array_writes            0                       # number of data array writes
+system.ruby.l1_cntrl5.L1IcacheMemory.num_tag_array_reads            0                       # number of tag array reads
+system.ruby.l1_cntrl5.L1IcacheMemory.num_tag_array_writes            0                       # number of tag array writes
+system.ruby.l1_cntrl5.L1IcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
+system.ruby.l1_cntrl5.L1IcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
+system.ruby.l1_cntrl6.L1DcacheMemory.num_data_array_reads            0                       # number of data array reads
+system.ruby.l1_cntrl6.L1DcacheMemory.num_data_array_writes            0                       # number of data array writes
+system.ruby.l1_cntrl6.L1DcacheMemory.num_tag_array_reads            0                       # number of tag array reads
+system.ruby.l1_cntrl6.L1DcacheMemory.num_tag_array_writes            0                       # number of tag array writes
+system.ruby.l1_cntrl6.L1DcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
+system.ruby.l1_cntrl6.L1DcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
+system.ruby.l1_cntrl6.L1IcacheMemory.num_data_array_reads            0                       # number of data array reads
+system.ruby.l1_cntrl6.L1IcacheMemory.num_data_array_writes            0                       # number of data array writes
+system.ruby.l1_cntrl6.L1IcacheMemory.num_tag_array_reads            0                       # number of tag array reads
+system.ruby.l1_cntrl6.L1IcacheMemory.num_tag_array_writes            0                       # number of tag array writes
+system.ruby.l1_cntrl6.L1IcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
+system.ruby.l1_cntrl6.L1IcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
+system.ruby.l1_cntrl7.L1DcacheMemory.num_data_array_reads            0                       # number of data array reads
+system.ruby.l1_cntrl7.L1DcacheMemory.num_data_array_writes            0                       # number of data array writes
+system.ruby.l1_cntrl7.L1DcacheMemory.num_tag_array_reads            0                       # number of tag array reads
+system.ruby.l1_cntrl7.L1DcacheMemory.num_tag_array_writes            0                       # number of tag array writes
+system.ruby.l1_cntrl7.L1DcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
+system.ruby.l1_cntrl7.L1DcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
+system.ruby.l1_cntrl7.L1IcacheMemory.num_data_array_reads            0                       # number of data array reads
+system.ruby.l1_cntrl7.L1IcacheMemory.num_data_array_writes            0                       # number of data array writes
+system.ruby.l1_cntrl7.L1IcacheMemory.num_tag_array_reads            0                       # number of tag array reads
+system.ruby.l1_cntrl7.L1IcacheMemory.num_tag_array_writes            0                       # number of tag array writes
+system.ruby.l1_cntrl7.L1IcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
+system.ruby.l1_cntrl7.L1IcacheMemory.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_cntrl1.L1DcacheMemory.num_data_array_reads            0                       # number of data array reads
+system.ruby.l1_cntrl1.L1DcacheMemory.num_data_array_writes            0                       # number of data array writes
+system.ruby.l1_cntrl1.L1DcacheMemory.num_tag_array_reads            0                       # number of tag array reads
+system.ruby.l1_cntrl1.L1DcacheMemory.num_tag_array_writes            0                       # number of tag array writes
+system.ruby.l1_cntrl1.L1DcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
+system.ruby.l1_cntrl1.L1DcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
+system.ruby.l1_cntrl1.L1IcacheMemory.num_data_array_reads            0                       # number of data array reads
+system.ruby.l1_cntrl1.L1IcacheMemory.num_data_array_writes            0                       # number of data array writes
+system.ruby.l1_cntrl1.L1IcacheMemory.num_tag_array_reads            0                       # number of tag array reads
+system.ruby.l1_cntrl1.L1IcacheMemory.num_tag_array_writes            0                       # number of tag array writes
+system.ruby.l1_cntrl1.L1IcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
+system.ruby.l1_cntrl1.L1IcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
+system.ruby.l1_cntrl2.L1DcacheMemory.num_data_array_reads            0                       # number of data array reads
+system.ruby.l1_cntrl2.L1DcacheMemory.num_data_array_writes            0                       # number of data array writes
+system.ruby.l1_cntrl2.L1DcacheMemory.num_tag_array_reads            0                       # number of tag array reads
+system.ruby.l1_cntrl2.L1DcacheMemory.num_tag_array_writes            0                       # number of tag array writes
+system.ruby.l1_cntrl2.L1DcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
+system.ruby.l1_cntrl2.L1DcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
+system.ruby.l1_cntrl2.L1IcacheMemory.num_data_array_reads            0                       # number of data array reads
+system.ruby.l1_cntrl2.L1IcacheMemory.num_data_array_writes            0                       # number of data array writes
+system.ruby.l1_cntrl2.L1IcacheMemory.num_tag_array_reads            0                       # number of tag array reads
+system.ruby.l1_cntrl2.L1IcacheMemory.num_tag_array_writes            0                       # number of tag array writes
+system.ruby.l1_cntrl2.L1IcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
+system.ruby.l1_cntrl2.L1IcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
+system.ruby.l1_cntrl3.L1DcacheMemory.num_data_array_reads            0                       # number of data array reads
+system.ruby.l1_cntrl3.L1DcacheMemory.num_data_array_writes            0                       # number of data array writes
+system.ruby.l1_cntrl3.L1DcacheMemory.num_tag_array_reads            0                       # number of tag array reads
+system.ruby.l1_cntrl3.L1DcacheMemory.num_tag_array_writes            0                       # number of tag array writes
+system.ruby.l1_cntrl3.L1DcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
+system.ruby.l1_cntrl3.L1DcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
+system.ruby.l1_cntrl3.L1IcacheMemory.num_data_array_reads            0                       # number of data array reads
+system.ruby.l1_cntrl3.L1IcacheMemory.num_data_array_writes            0                       # number of data array writes
+system.ruby.l1_cntrl3.L1IcacheMemory.num_tag_array_reads            0                       # number of tag array reads
+system.ruby.l1_cntrl3.L1IcacheMemory.num_tag_array_writes            0                       # number of tag array writes
+system.ruby.l1_cntrl3.L1IcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
+system.ruby.l1_cntrl3.L1IcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
+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.cpu0.num_reads                           99081                       # number of read accesses completed
 system.cpu0.num_writes                          54103                       # 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 e2748beb9caa2359a51b10f901fa5d9a52030815..6b761c13cba813bbb32dc08132c191d9daf71df8 100644 (file)
--- a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_token/config.ini
+++ b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_token/config.ini
@@ -8,14 +8,15 @@ time_sync_spin_threshold=100000
 
 [system]
 type=System
-children=cpu0 cpu1 cpu2 cpu3 cpu4 cpu5 cpu6 cpu7 dir_cntrl0 funcbus funcmem l1_cntrl0 l1_cntrl1 l1_cntrl2 l1_cntrl3 l1_cntrl4 l1_cntrl5 l1_cntrl6 l1_cntrl7 l2_cntrl0 physmem ruby sys_port_proxy
+children=cpu0 cpu1 cpu2 cpu3 cpu4 cpu5 cpu6 cpu7 funcbus funcmem physmem ruby sys_port_proxy
 boot_osflags=a
 clock=1
 init_param=0
 kernel=
 load_addr_mask=1099511627775
 mem_mode=timing
-memories=system.physmem system.funcmem
+mem_ranges=
+memories=system.funcmem system.physmem
 num_work_ids=16
 readfile=
 symbolfile=
@@ -45,7 +46,7 @@ suppress_func_warnings=true
 sys=system
 trace_addr=0
 functional=system.funcbus.slave[0]
-test=system.l1_cntrl0.sequencer.slave[0]
+test=system.ruby.l1_cntrl0.sequencer.slave[0]
 
 [system.cpu1]
 type=MemTest
@@ -64,7 +65,7 @@ suppress_func_warnings=true
 sys=system
 trace_addr=0
 functional=system.funcbus.slave[1]
-test=system.l1_cntrl1.sequencer.slave[0]
+test=system.ruby.l1_cntrl1.sequencer.slave[0]
 
 [system.cpu2]
 type=MemTest
@@ -83,7 +84,7 @@ suppress_func_warnings=true
 sys=system
 trace_addr=0
 functional=system.funcbus.slave[2]
-test=system.l1_cntrl2.sequencer.slave[0]
+test=system.ruby.l1_cntrl2.sequencer.slave[0]
 
 [system.cpu3]
 type=MemTest
@@ -102,7 +103,7 @@ suppress_func_warnings=true
 sys=system
 trace_addr=0
 functional=system.funcbus.slave[3]
-test=system.l1_cntrl3.sequencer.slave[0]
+test=system.ruby.l1_cntrl3.sequencer.slave[0]
 
 [system.cpu4]
 type=MemTest
@@ -121,7 +122,7 @@ suppress_func_warnings=true
 sys=system
 trace_addr=0
 functional=system.funcbus.slave[4]
-test=system.l1_cntrl4.sequencer.slave[0]
+test=system.ruby.l1_cntrl4.sequencer.slave[0]
 
 [system.cpu5]
 type=MemTest
@@ -140,7 +141,7 @@ suppress_func_warnings=true
 sys=system
 trace_addr=0
 functional=system.funcbus.slave[5]
-test=system.l1_cntrl5.sequencer.slave[0]
+test=system.ruby.l1_cntrl5.sequencer.slave[0]
 
 [system.cpu6]
 type=MemTest
@@ -159,7 +160,7 @@ suppress_func_warnings=true
 sys=system
 trace_addr=0
 functional=system.funcbus.slave[6]
-test=system.l1_cntrl6.sequencer.slave[0]
+test=system.ruby.l1_cntrl6.sequencer.slave[0]
 
 [system.cpu7]
 type=MemTest
@@ -178,26 +179,73 @@ suppress_func_warnings=true
 sys=system
 trace_addr=0
 functional=system.funcbus.slave[7]
-test=system.l1_cntrl7.sequencer.slave[0]
+test=system.ruby.l1_cntrl7.sequencer.slave[0]
 
-[system.dir_cntrl0]
+[system.funcbus]
+type=NoncoherentBus
+block_size=64
+clock=1
+header_cycles=1
+use_default_range=false
+width=8
+master=system.funcmem.port
+slave=system.cpu0.functional system.cpu1.functional system.cpu2.functional system.cpu3.functional system.cpu4.functional system.cpu5.functional system.cpu6.functional system.cpu7.functional
+
+[system.funcmem]
+type=SimpleMemory
+bandwidth=0.000000
+clock=1
+conf_table_reported=false
+in_addr_map=false
+latency=30
+latency_var=0
+null=false
+range=0:134217727
+zero=false
+port=system.funcbus.master[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=dir_cntrl0 l1_cntrl0 l1_cntrl1 l1_cntrl2 l1_cntrl3 l1_cntrl4 l1_cntrl5 l1_cntrl6 l1_cntrl7 l2_cntrl0 network profiler
+block_size_bytes=64
+clock=1
+mem_size=268435456
+no_mem_vec=false
+random_seed=1234
+randomization=false
+stats_filename=ruby.stats
+
+[system.ruby.dir_cntrl0]
 type=Directory_Controller
 children=directory memBuffer
 buffer_size=0
+clock=1
 cntrl_id=9
-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=5
@@ -205,7 +253,7 @@ size=268435456
 use_map=false
 version=0
 
-[system.dir_cntrl0.memBuffer]
+[system.ruby.dir_cntrl0.memBuffer]
 type=RubyMemoryControl
 bank_bit_0=8
 bank_busy_time=11
@@ -227,36 +275,14 @@ ruby_system=system.ruby
 tFaw=0
 version=0
 
-[system.funcbus]
-type=NoncoherentBus
-block_size=64
-clock=1
-header_cycles=1
-use_default_range=false
-width=8
-master=system.funcmem.port
-slave=system.cpu0.functional system.cpu1.functional system.cpu2.functional system.cpu3.functional system.cpu4.functional system.cpu5.functional system.cpu6.functional system.cpu7.functional
-
-[system.funcmem]
-type=SimpleMemory
-bandwidth=0.000000
-clock=1
-conf_table_reported=false
-in_addr_map=false
-latency=30
-latency_var=0
-null=false
-range=0:134217727
-zero=false
-port=system.funcbus.master[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=9
 buffer_size=0
+clock=1
 cntrl_id=0
 dynamic_timeout_enabled=true
 fixed_timeout_latency=300
@@ -269,11 +295,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
@@ -287,7 +313,7 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.l1_cntrl0.L1IcacheMemory]
+[system.ruby.l1_cntrl0.L1IcacheMemory]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -301,13 +327,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=1000000
-icache=system.l1_cntrl0.L1IcacheMemory
+icache=system.ruby.l1_cntrl0.L1IcacheMemory
 max_outstanding_requests=16
 ruby_system=system.ruby
 support_data_reqs=true
@@ -318,13 +344,14 @@ using_ruby_tester=false
 version=0
 slave=system.cpu0.test
 
-[system.l1_cntrl1]
+[system.ruby.l1_cntrl1]
 type=L1Cache_Controller
 children=L1DcacheMemory L1IcacheMemory sequencer
-L1DcacheMemory=system.l1_cntrl1.L1DcacheMemory
-L1IcacheMemory=system.l1_cntrl1.L1IcacheMemory
+L1DcacheMemory=system.ruby.l1_cntrl1.L1DcacheMemory
+L1IcacheMemory=system.ruby.l1_cntrl1.L1IcacheMemory
 N_tokens=9
 buffer_size=0
+clock=1
 cntrl_id=1
 dynamic_timeout_enabled=true
 fixed_timeout_latency=300
@@ -337,11 +364,11 @@ recycle_latency=10
 retry_threshold=1
 ruby_system=system.ruby
 send_evictions=false
-sequencer=system.l1_cntrl1.sequencer
+sequencer=system.ruby.l1_cntrl1.sequencer
 transitions_per_cycle=32
 version=1
 
-[system.l1_cntrl1.L1DcacheMemory]
+[system.ruby.l1_cntrl1.L1DcacheMemory]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -355,7 +382,7 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.l1_cntrl1.L1IcacheMemory]
+[system.ruby.l1_cntrl1.L1IcacheMemory]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -369,13 +396,13 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.l1_cntrl1.sequencer]
+[system.ruby.l1_cntrl1.sequencer]
 type=RubySequencer
 access_phys_mem=false
 clock=1
-dcache=system.l1_cntrl1.L1DcacheMemory
+dcache=system.ruby.l1_cntrl1.L1DcacheMemory
 deadlock_threshold=1000000
-icache=system.l1_cntrl1.L1IcacheMemory
+icache=system.ruby.l1_cntrl1.L1IcacheMemory
 max_outstanding_requests=16
 ruby_system=system.ruby
 support_data_reqs=true
@@ -386,13 +413,14 @@ using_ruby_tester=false
 version=1
 slave=system.cpu1.test
 
-[system.l1_cntrl2]
+[system.ruby.l1_cntrl2]
 type=L1Cache_Controller
 children=L1DcacheMemory L1IcacheMemory sequencer
-L1DcacheMemory=system.l1_cntrl2.L1DcacheMemory
-L1IcacheMemory=system.l1_cntrl2.L1IcacheMemory
+L1DcacheMemory=system.ruby.l1_cntrl2.L1DcacheMemory
+L1IcacheMemory=system.ruby.l1_cntrl2.L1IcacheMemory
 N_tokens=9
 buffer_size=0
+clock=1
 cntrl_id=2
 dynamic_timeout_enabled=true
 fixed_timeout_latency=300
@@ -405,11 +433,11 @@ recycle_latency=10
 retry_threshold=1
 ruby_system=system.ruby
 send_evictions=false
-sequencer=system.l1_cntrl2.sequencer
+sequencer=system.ruby.l1_cntrl2.sequencer
 transitions_per_cycle=32
 version=2
 
-[system.l1_cntrl2.L1DcacheMemory]
+[system.ruby.l1_cntrl2.L1DcacheMemory]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -423,7 +451,7 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.l1_cntrl2.L1IcacheMemory]
+[system.ruby.l1_cntrl2.L1IcacheMemory]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -437,13 +465,13 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.l1_cntrl2.sequencer]
+[system.ruby.l1_cntrl2.sequencer]
 type=RubySequencer
 access_phys_mem=false
 clock=1
-dcache=system.l1_cntrl2.L1DcacheMemory
+dcache=system.ruby.l1_cntrl2.L1DcacheMemory
 deadlock_threshold=1000000
-icache=system.l1_cntrl2.L1IcacheMemory
+icache=system.ruby.l1_cntrl2.L1IcacheMemory
 max_outstanding_requests=16
 ruby_system=system.ruby
 support_data_reqs=true
@@ -454,13 +482,14 @@ using_ruby_tester=false
 version=2
 slave=system.cpu2.test
 
-[system.l1_cntrl3]
+[system.ruby.l1_cntrl3]
 type=L1Cache_Controller
 children=L1DcacheMemory L1IcacheMemory sequencer
-L1DcacheMemory=system.l1_cntrl3.L1DcacheMemory
-L1IcacheMemory=system.l1_cntrl3.L1IcacheMemory
+L1DcacheMemory=system.ruby.l1_cntrl3.L1DcacheMemory
+L1IcacheMemory=system.ruby.l1_cntrl3.L1IcacheMemory
 N_tokens=9
 buffer_size=0
+clock=1
 cntrl_id=3
 dynamic_timeout_enabled=true
 fixed_timeout_latency=300
@@ -473,11 +502,11 @@ recycle_latency=10
 retry_threshold=1
 ruby_system=system.ruby
 send_evictions=false
-sequencer=system.l1_cntrl3.sequencer
+sequencer=system.ruby.l1_cntrl3.sequencer
 transitions_per_cycle=32
 version=3
 
-[system.l1_cntrl3.L1DcacheMemory]
+[system.ruby.l1_cntrl3.L1DcacheMemory]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -491,7 +520,7 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.l1_cntrl3.L1IcacheMemory]
+[system.ruby.l1_cntrl3.L1IcacheMemory]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -505,13 +534,13 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.l1_cntrl3.sequencer]
+[system.ruby.l1_cntrl3.sequencer]
 type=RubySequencer
 access_phys_mem=false
 clock=1
-dcache=system.l1_cntrl3.L1DcacheMemory
+dcache=system.ruby.l1_cntrl3.L1DcacheMemory
 deadlock_threshold=1000000
-icache=system.l1_cntrl3.L1IcacheMemory
+icache=system.ruby.l1_cntrl3.L1IcacheMemory
 max_outstanding_requests=16
 ruby_system=system.ruby
 support_data_reqs=true
@@ -522,13 +551,14 @@ using_ruby_tester=false
 version=3
 slave=system.cpu3.test
 
-[system.l1_cntrl4]
+[system.ruby.l1_cntrl4]
 type=L1Cache_Controller
 children=L1DcacheMemory L1IcacheMemory sequencer
-L1DcacheMemory=system.l1_cntrl4.L1DcacheMemory
-L1IcacheMemory=system.l1_cntrl4.L1IcacheMemory
+L1DcacheMemory=system.ruby.l1_cntrl4.L1DcacheMemory
+L1IcacheMemory=system.ruby.l1_cntrl4.L1IcacheMemory
 N_tokens=9
 buffer_size=0
+clock=1
 cntrl_id=4
 dynamic_timeout_enabled=true
 fixed_timeout_latency=300
@@ -541,11 +571,11 @@ recycle_latency=10
 retry_threshold=1
 ruby_system=system.ruby
 send_evictions=false
-sequencer=system.l1_cntrl4.sequencer
+sequencer=system.ruby.l1_cntrl4.sequencer
 transitions_per_cycle=32
 version=4
 
-[system.l1_cntrl4.L1DcacheMemory]
+[system.ruby.l1_cntrl4.L1DcacheMemory]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -559,7 +589,7 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.l1_cntrl4.L1IcacheMemory]
+[system.ruby.l1_cntrl4.L1IcacheMemory]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -573,13 +603,13 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.l1_cntrl4.sequencer]
+[system.ruby.l1_cntrl4.sequencer]
 type=RubySequencer
 access_phys_mem=false
 clock=1
-dcache=system.l1_cntrl4.L1DcacheMemory
+dcache=system.ruby.l1_cntrl4.L1DcacheMemory
 deadlock_threshold=1000000
-icache=system.l1_cntrl4.L1IcacheMemory
+icache=system.ruby.l1_cntrl4.L1IcacheMemory
 max_outstanding_requests=16
 ruby_system=system.ruby
 support_data_reqs=true
@@ -590,13 +620,14 @@ using_ruby_tester=false
 version=4
 slave=system.cpu4.test
 
-[system.l1_cntrl5]
+[system.ruby.l1_cntrl5]
 type=L1Cache_Controller
 children=L1DcacheMemory L1IcacheMemory sequencer
-L1DcacheMemory=system.l1_cntrl5.L1DcacheMemory
-L1IcacheMemory=system.l1_cntrl5.L1IcacheMemory
+L1DcacheMemory=system.ruby.l1_cntrl5.L1DcacheMemory
+L1IcacheMemory=system.ruby.l1_cntrl5.L1IcacheMemory
 N_tokens=9
 buffer_size=0
+clock=1
 cntrl_id=5
 dynamic_timeout_enabled=true
 fixed_timeout_latency=300
@@ -609,11 +640,11 @@ recycle_latency=10
 retry_threshold=1
 ruby_system=system.ruby
 send_evictions=false
-sequencer=system.l1_cntrl5.sequencer
+sequencer=system.ruby.l1_cntrl5.sequencer
 transitions_per_cycle=32
 version=5
 
-[system.l1_cntrl5.L1DcacheMemory]
+[system.ruby.l1_cntrl5.L1DcacheMemory]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -627,7 +658,7 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.l1_cntrl5.L1IcacheMemory]
+[system.ruby.l1_cntrl5.L1IcacheMemory]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -641,13 +672,13 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.l1_cntrl5.sequencer]
+[system.ruby.l1_cntrl5.sequencer]
 type=RubySequencer
 access_phys_mem=false
 clock=1
-dcache=system.l1_cntrl5.L1DcacheMemory
+dcache=system.ruby.l1_cntrl5.L1DcacheMemory
 deadlock_threshold=1000000
-icache=system.l1_cntrl5.L1IcacheMemory
+icache=system.ruby.l1_cntrl5.L1IcacheMemory
 max_outstanding_requests=16
 ruby_system=system.ruby
 support_data_reqs=true
@@ -658,13 +689,14 @@ using_ruby_tester=false
 version=5
 slave=system.cpu5.test
 
-[system.l1_cntrl6]
+[system.ruby.l1_cntrl6]
 type=L1Cache_Controller
 children=L1DcacheMemory L1IcacheMemory sequencer
-L1DcacheMemory=system.l1_cntrl6.L1DcacheMemory
-L1IcacheMemory=system.l1_cntrl6.L1IcacheMemory
+L1DcacheMemory=system.ruby.l1_cntrl6.L1DcacheMemory
+L1IcacheMemory=system.ruby.l1_cntrl6.L1IcacheMemory
 N_tokens=9
 buffer_size=0
+clock=1
 cntrl_id=6
 dynamic_timeout_enabled=true
 fixed_timeout_latency=300
@@ -677,11 +709,11 @@ recycle_latency=10
 retry_threshold=1
 ruby_system=system.ruby
 send_evictions=false
-sequencer=system.l1_cntrl6.sequencer
+sequencer=system.ruby.l1_cntrl6.sequencer
 transitions_per_cycle=32
 version=6
 
-[system.l1_cntrl6.L1DcacheMemory]
+[system.ruby.l1_cntrl6.L1DcacheMemory]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -695,7 +727,7 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.l1_cntrl6.L1IcacheMemory]
+[system.ruby.l1_cntrl6.L1IcacheMemory]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -709,13 +741,13 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.l1_cntrl6.sequencer]
+[system.ruby.l1_cntrl6.sequencer]
 type=RubySequencer
 access_phys_mem=false
 clock=1
-dcache=system.l1_cntrl6.L1DcacheMemory
+dcache=system.ruby.l1_cntrl6.L1DcacheMemory
 deadlock_threshold=1000000
-icache=system.l1_cntrl6.L1IcacheMemory
+icache=system.ruby.l1_cntrl6.L1IcacheMemory
 max_outstanding_requests=16
 ruby_system=system.ruby
 support_data_reqs=true
@@ -726,13 +758,14 @@ using_ruby_tester=false
 version=6
 slave=system.cpu6.test
 
-[system.l1_cntrl7]
+[system.ruby.l1_cntrl7]
 type=L1Cache_Controller
 children=L1DcacheMemory L1IcacheMemory sequencer
-L1DcacheMemory=system.l1_cntrl7.L1DcacheMemory
-L1IcacheMemory=system.l1_cntrl7.L1IcacheMemory
+L1DcacheMemory=system.ruby.l1_cntrl7.L1DcacheMemory
+L1IcacheMemory=system.ruby.l1_cntrl7.L1IcacheMemory
 N_tokens=9
 buffer_size=0
+clock=1
 cntrl_id=7
 dynamic_timeout_enabled=true
 fixed_timeout_latency=300
@@ -745,11 +778,11 @@ recycle_latency=10
 retry_threshold=1
 ruby_system=system.ruby
 send_evictions=false
-sequencer=system.l1_cntrl7.sequencer
+sequencer=system.ruby.l1_cntrl7.sequencer
 transitions_per_cycle=32
 version=7
 
-[system.l1_cntrl7.L1DcacheMemory]
+[system.ruby.l1_cntrl7.L1DcacheMemory]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -763,7 +796,7 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.l1_cntrl7.L1IcacheMemory]
+[system.ruby.l1_cntrl7.L1IcacheMemory]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -777,13 +810,13 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.l1_cntrl7.sequencer]
+[system.ruby.l1_cntrl7.sequencer]
 type=RubySequencer
 access_phys_mem=false
 clock=1
-dcache=system.l1_cntrl7.L1DcacheMemory
+dcache=system.ruby.l1_cntrl7.L1DcacheMemory
 deadlock_threshold=1000000
-icache=system.l1_cntrl7.L1IcacheMemory
+icache=system.ruby.l1_cntrl7.L1IcacheMemory
 max_outstanding_requests=16
 ruby_system=system.ruby
 support_data_reqs=true
@@ -794,12 +827,13 @@ using_ruby_tester=false
 version=7
 slave=system.cpu7.test
 
-[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=9
 buffer_size=0
+clock=1
 cntrl_id=8
 filtering_enabled=true
 l2_request_latency=5
@@ -810,7 +844,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
@@ -824,34 +858,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=268435456
-no_mem_vec=false
-random_seed=1234
-randomization=false
-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
@@ -871,7 +883,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
@@ -879,6 +891,7 @@ weight=1
 
 [system.ruby.network.topology.ext_links0.int_node]
 type=Switch
+clock=1
 router_id=0
 virt_nets=10
 
@@ -886,7 +899,7 @@ virt_nets=10
 type=SimpleExtLink
 children=int_node
 bandwidth_factor=16
-ext_node=system.l1_cntrl1
+ext_node=system.ruby.l1_cntrl1
 int_node=system.ruby.network.topology.ext_links1.int_node
 latency=1
 link_id=1
@@ -894,6 +907,7 @@ weight=1
 
 [system.ruby.network.topology.ext_links1.int_node]
 type=Switch
+clock=1
 router_id=1
 virt_nets=10
 
@@ -901,7 +915,7 @@ virt_nets=10
 type=SimpleExtLink
 children=int_node
 bandwidth_factor=16
-ext_node=system.l1_cntrl2
+ext_node=system.ruby.l1_cntrl2
 int_node=system.ruby.network.topology.ext_links2.int_node
 latency=1
 link_id=2
@@ -909,6 +923,7 @@ weight=1
 
 [system.ruby.network.topology.ext_links2.int_node]
 type=Switch
+clock=1
 router_id=2
 virt_nets=10
 
@@ -916,7 +931,7 @@ virt_nets=10
 type=SimpleExtLink
 children=int_node
 bandwidth_factor=16
-ext_node=system.l1_cntrl3
+ext_node=system.ruby.l1_cntrl3
 int_node=system.ruby.network.topology.ext_links3.int_node
 latency=1
 link_id=3
@@ -924,6 +939,7 @@ weight=1
 
 [system.ruby.network.topology.ext_links3.int_node]
 type=Switch
+clock=1
 router_id=3
 virt_nets=10
 
@@ -931,7 +947,7 @@ virt_nets=10
 type=SimpleExtLink
 children=int_node
 bandwidth_factor=16
-ext_node=system.l1_cntrl4
+ext_node=system.ruby.l1_cntrl4
 int_node=system.ruby.network.topology.ext_links4.int_node
 latency=1
 link_id=4
@@ -939,6 +955,7 @@ weight=1
 
 [system.ruby.network.topology.ext_links4.int_node]
 type=Switch
+clock=1
 router_id=4
 virt_nets=10
 
@@ -946,7 +963,7 @@ virt_nets=10
 type=SimpleExtLink
 children=int_node
 bandwidth_factor=16
-ext_node=system.l1_cntrl5
+ext_node=system.ruby.l1_cntrl5
 int_node=system.ruby.network.topology.ext_links5.int_node
 latency=1
 link_id=5
@@ -954,6 +971,7 @@ weight=1
 
 [system.ruby.network.topology.ext_links5.int_node]
 type=Switch
+clock=1
 router_id=5
 virt_nets=10
 
@@ -961,7 +979,7 @@ virt_nets=10
 type=SimpleExtLink
 children=int_node
 bandwidth_factor=16
-ext_node=system.l1_cntrl6
+ext_node=system.ruby.l1_cntrl6
 int_node=system.ruby.network.topology.ext_links6.int_node
 latency=1
 link_id=6
@@ -969,6 +987,7 @@ weight=1
 
 [system.ruby.network.topology.ext_links6.int_node]
 type=Switch
+clock=1
 router_id=6
 virt_nets=10
 
@@ -976,7 +995,7 @@ virt_nets=10
 type=SimpleExtLink
 children=int_node
 bandwidth_factor=16
-ext_node=system.l1_cntrl7
+ext_node=system.ruby.l1_cntrl7
 int_node=system.ruby.network.topology.ext_links7.int_node
 latency=1
 link_id=7
@@ -984,6 +1003,7 @@ weight=1
 
 [system.ruby.network.topology.ext_links7.int_node]
 type=Switch
+clock=1
 router_id=7
 virt_nets=10
 
@@ -991,7 +1011,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_links8.int_node
 latency=1
 link_id=8
@@ -999,6 +1019,7 @@ weight=1
 
 [system.ruby.network.topology.ext_links8.int_node]
 type=Switch
+clock=1
 router_id=8
 virt_nets=10
 
@@ -1006,7 +1027,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_links9.int_node
 latency=1
 link_id=9
@@ -1014,6 +1035,7 @@ weight=1
 
 [system.ruby.network.topology.ext_links9.int_node]
 type=Switch
+clock=1
 router_id=9
 virt_nets=10
 
@@ -1029,6 +1051,7 @@ weight=1
 
 [system.ruby.network.topology.int_links0.node_b]
 type=Switch
+clock=1
 router_id=10
 virt_nets=10
 

diff --git a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_token/ruby.stats b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_token/ruby.stats
index 763dfbcebe0591b1459bfe05d2507ade22cf1cd6..96dab45652a349f64b3bbbd1b19eaf4201ba26c4 100644 (file)
--- a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_token/ruby.stats
+++ b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_token/ruby.stats
@@ -1,24 +1,24 @@
-Real time: Nov/10/2012 16:14:34
+Real time: Jan/14/2013 08:28:58
 
 Profiler Stats
 --------------
-Elapsed_time_in_seconds: 127
-Elapsed_time_in_minutes: 2.11667
-Elapsed_time_in_hours: 0.0352778
-Elapsed_time_in_days: 0.00146991
+Elapsed_time_in_seconds: 128
+Elapsed_time_in_minutes: 2.13333
+Elapsed_time_in_hours: 0.0355556
+Elapsed_time_in_days: 0.00148148
 
-Virtual_time_in_seconds: 126.79
-Virtual_time_in_minutes: 2.11317
-Virtual_time_in_hours:   0.0352194
-Virtual_time_in_days:    0.00146748
+Virtual_time_in_seconds: 127.36
+Virtual_time_in_minutes: 2.12267
+Virtual_time_in_hours:   0.0353778
+Virtual_time_in_days:    0.00147407
 
 Ruby_current_time: 6151475
 Ruby_start_time: 0
 Ruby_cycles: 6151475
 
-mbytes_resident: 70.8477
-mbytes_total: 409.41
-resident_ratio: 0.173058
+mbytes_resident: 73.6328
+mbytes_total: 416.027
+resident_ratio: 0.177028
 
 ruby_cycles_executed: [ 6151476 6151476 6151476 6151476 6151476 6151476 6151476 6151476 ]
 
@@ -89,13 +89,13 @@ Total_nonPF_delay_cycles: [binsize: 1 max: 0 count: 0 average: NaN |standard dev
 Resource Usage
 --------------
 page_size: 4096
-user_time: 126
+user_time: 127
 system_time: 0
-page_reclaims: 10005
-page_faults: 55
+page_reclaims: 10402
+page_faults: 0
 swaps: 0
-block_inputs: 6480
-block_outputs: 296
+block_inputs: 0
+block_outputs: 312
 
 Network Stats
 -------------
@@ -400,25 +400,25 @@ links_utilized_percent_switch_10: 17.6719
   outgoing_messages_switch_10_link_9_Writeback_Control: 377581 3020648 [ 0 0 0 0 377581 0 0 0 0 0 ] base_latency: 1
   outgoing_messages_switch_10_link_9_Persistent_Control: 259692 2077536 [ 0 0 0 259692 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: 77267
-  system.l1_cntrl0.L1DcacheMemory_total_demand_misses: 77267
-  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: 77267
+  system.ruby.l1_cntrl0.L1DcacheMemory_total_demand_misses: 77267
+  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:   65.1222%
-  system.l1_cntrl0.L1DcacheMemory_request_type_ST:   34.8778%
+  system.ruby.l1_cntrl0.L1DcacheMemory_request_type_LD:   65.1222%
+  system.ruby.l1_cntrl0.L1DcacheMemory_request_type_ST:   34.8778%
 
-  system.l1_cntrl0.L1DcacheMemory_access_mode_type_Supervisor:   77267    100%
+  system.ruby.l1_cntrl0.L1DcacheMemory_access_mode_type_Supervisor:   77267    100%
 
  --- L1Cache ---
  - Event Counts -
@@ -771,157 +771,157 @@ IS_L  Persistent_GETS [24 24 36 41 0 11 5 18 ] 159
 IS_L  Own_Lock_or_Unlock [235 219 224 238 204 226 218 212 ] 1776
 IS_L  Request_Timeout [341 233 222 251 277 242 190 265 ] 2021
 
-Cache Stats: system.l1_cntrl1.L1IcacheMemory
-  system.l1_cntrl1.L1IcacheMemory_total_misses: 0
-  system.l1_cntrl1.L1IcacheMemory_total_demand_misses: 0
-  system.l1_cntrl1.L1IcacheMemory_total_prefetches: 0
-  system.l1_cntrl1.L1IcacheMemory_total_sw_prefetches: 0
-  system.l1_cntrl1.L1IcacheMemory_total_hw_prefetches: 0
+Cache Stats: system.ruby.l1_cntrl1.L1IcacheMemory
+  system.ruby.l1_cntrl1.L1IcacheMemory_total_misses: 0
+  system.ruby.l1_cntrl1.L1IcacheMemory_total_demand_misses: 0
+  system.ruby.l1_cntrl1.L1IcacheMemory_total_prefetches: 0
+  system.ruby.l1_cntrl1.L1IcacheMemory_total_sw_prefetches: 0
+  system.ruby.l1_cntrl1.L1IcacheMemory_total_hw_prefetches: 0
 
 
-Cache Stats: system.l1_cntrl1.L1DcacheMemory
-  system.l1_cntrl1.L1DcacheMemory_total_misses: 77262
-  system.l1_cntrl1.L1DcacheMemory_total_demand_misses: 77262
-  system.l1_cntrl1.L1DcacheMemory_total_prefetches: 0
-  system.l1_cntrl1.L1DcacheMemory_total_sw_prefetches: 0
-  system.l1_cntrl1.L1DcacheMemory_total_hw_prefetches: 0
+Cache Stats: system.ruby.l1_cntrl1.L1DcacheMemory
+  system.ruby.l1_cntrl1.L1DcacheMemory_total_misses: 77262
+  system.ruby.l1_cntrl1.L1DcacheMemory_total_demand_misses: 77262
+  system.ruby.l1_cntrl1.L1DcacheMemory_total_prefetches: 0
+  system.ruby.l1_cntrl1.L1DcacheMemory_total_sw_prefetches: 0
+  system.ruby.l1_cntrl1.L1DcacheMemory_total_hw_prefetches: 0
 
-  system.l1_cntrl1.L1DcacheMemory_request_type_LD:   64.6566%
-  system.l1_cntrl1.L1DcacheMemory_request_type_ST:   35.3434%
+  system.ruby.l1_cntrl1.L1DcacheMemory_request_type_LD:   64.6566%
+  system.ruby.l1_cntrl1.L1DcacheMemory_request_type_ST:   35.3434%
 
-  system.l1_cntrl1.L1DcacheMemory_access_mode_type_Supervisor:   77262    100%
+  system.ruby.l1_cntrl1.L1DcacheMemory_access_mode_type_Supervisor:   77262    100%
 
-Cache Stats: system.l1_cntrl2.L1IcacheMemory
-  system.l1_cntrl2.L1IcacheMemory_total_misses: 0
-  system.l1_cntrl2.L1IcacheMemory_total_demand_misses: 0
-  system.l1_cntrl2.L1IcacheMemory_total_prefetches: 0
-  system.l1_cntrl2.L1IcacheMemory_total_sw_prefetches: 0
-  system.l1_cntrl2.L1IcacheMemory_total_hw_prefetches: 0
+Cache Stats: system.ruby.l1_cntrl2.L1IcacheMemory
+  system.ruby.l1_cntrl2.L1IcacheMemory_total_misses: 0
+  system.ruby.l1_cntrl2.L1IcacheMemory_total_demand_misses: 0
+  system.ruby.l1_cntrl2.L1IcacheMemory_total_prefetches: 0
+  system.ruby.l1_cntrl2.L1IcacheMemory_total_sw_prefetches: 0
+  system.ruby.l1_cntrl2.L1IcacheMemory_total_hw_prefetches: 0
 
 
-Cache Stats: system.l1_cntrl2.L1DcacheMemory
-  system.l1_cntrl2.L1DcacheMemory_total_misses: 77078
-  system.l1_cntrl2.L1DcacheMemory_total_demand_misses: 77078
-  system.l1_cntrl2.L1DcacheMemory_total_prefetches: 0
-  system.l1_cntrl2.L1DcacheMemory_total_sw_prefetches: 0
-  system.l1_cntrl2.L1DcacheMemory_total_hw_prefetches: 0
+Cache Stats: system.ruby.l1_cntrl2.L1DcacheMemory
+  system.ruby.l1_cntrl2.L1DcacheMemory_total_misses: 77078
+  system.ruby.l1_cntrl2.L1DcacheMemory_total_demand_misses: 77078
+  system.ruby.l1_cntrl2.L1DcacheMemory_total_prefetches: 0
+  system.ruby.l1_cntrl2.L1DcacheMemory_total_sw_prefetches: 0
+  system.ruby.l1_cntrl2.L1DcacheMemory_total_hw_prefetches: 0
 
-  system.l1_cntrl2.L1DcacheMemory_request_type_LD:   65.1846%
-  system.l1_cntrl2.L1DcacheMemory_request_type_ST:   34.8154%
+  system.ruby.l1_cntrl2.L1DcacheMemory_request_type_LD:   65.1846%
+  system.ruby.l1_cntrl2.L1DcacheMemory_request_type_ST:   34.8154%
 
-  system.l1_cntrl2.L1DcacheMemory_access_mode_type_Supervisor:   77078    100%
+  system.ruby.l1_cntrl2.L1DcacheMemory_access_mode_type_Supervisor:   77078    100%
 
-Cache Stats: system.l1_cntrl3.L1IcacheMemory
-  system.l1_cntrl3.L1IcacheMemory_total_misses: 0
-  system.l1_cntrl3.L1IcacheMemory_total_demand_misses: 0
-  system.l1_cntrl3.L1IcacheMemory_total_prefetches: 0
-  system.l1_cntrl3.L1IcacheMemory_total_sw_prefetches: 0
-  system.l1_cntrl3.L1IcacheMemory_total_hw_prefetches: 0
+Cache Stats: system.ruby.l1_cntrl3.L1IcacheMemory
+  system.ruby.l1_cntrl3.L1IcacheMemory_total_misses: 0
+  system.ruby.l1_cntrl3.L1IcacheMemory_total_demand_misses: 0
+  system.ruby.l1_cntrl3.L1IcacheMemory_total_prefetches: 0
+  system.ruby.l1_cntrl3.L1IcacheMemory_total_sw_prefetches: 0
+  system.ruby.l1_cntrl3.L1IcacheMemory_total_hw_prefetches: 0
 
 
-Cache Stats: system.l1_cntrl3.L1DcacheMemory
-  system.l1_cntrl3.L1DcacheMemory_total_misses: 76783
-  system.l1_cntrl3.L1DcacheMemory_total_demand_misses: 76783
-  system.l1_cntrl3.L1DcacheMemory_total_prefetches: 0
-  system.l1_cntrl3.L1DcacheMemory_total_sw_prefetches: 0
-  system.l1_cntrl3.L1DcacheMemory_total_hw_prefetches: 0
+Cache Stats: system.ruby.l1_cntrl3.L1DcacheMemory
+  system.ruby.l1_cntrl3.L1DcacheMemory_total_misses: 76783
+  system.ruby.l1_cntrl3.L1DcacheMemory_total_demand_misses: 76783
+  system.ruby.l1_cntrl3.L1DcacheMemory_total_prefetches: 0
+  system.ruby.l1_cntrl3.L1DcacheMemory_total_sw_prefetches: 0
+  system.ruby.l1_cntrl3.L1DcacheMemory_total_hw_prefetches: 0
 
-  system.l1_cntrl3.L1DcacheMemory_request_type_LD:   65.3348%
-  system.l1_cntrl3.L1DcacheMemory_request_type_ST:   34.6652%
+  system.ruby.l1_cntrl3.L1DcacheMemory_request_type_LD:   65.3348%
+  system.ruby.l1_cntrl3.L1DcacheMemory_request_type_ST:   34.6652%
 
-  system.l1_cntrl3.L1DcacheMemory_access_mode_type_Supervisor:   76783    100%
+  system.ruby.l1_cntrl3.L1DcacheMemory_access_mode_type_Supervisor:   76783    100%
 
-Cache Stats: system.l1_cntrl4.L1IcacheMemory
-  system.l1_cntrl4.L1IcacheMemory_total_misses: 0
-  system.l1_cntrl4.L1IcacheMemory_total_demand_misses: 0
-  system.l1_cntrl4.L1IcacheMemory_total_prefetches: 0
-  system.l1_cntrl4.L1IcacheMemory_total_sw_prefetches: 0
-  system.l1_cntrl4.L1IcacheMemory_total_hw_prefetches: 0
+Cache Stats: system.ruby.l1_cntrl4.L1IcacheMemory
+  system.ruby.l1_cntrl4.L1IcacheMemory_total_misses: 0
+  system.ruby.l1_cntrl4.L1IcacheMemory_total_demand_misses: 0
+  system.ruby.l1_cntrl4.L1IcacheMemory_total_prefetches: 0
+  system.ruby.l1_cntrl4.L1IcacheMemory_total_sw_prefetches: 0
+  system.ruby.l1_cntrl4.L1IcacheMemory_total_hw_prefetches: 0
 
 
-Cache Stats: system.l1_cntrl4.L1DcacheMemory
-  system.l1_cntrl4.L1DcacheMemory_total_misses: 76947
-  system.l1_cntrl4.L1DcacheMemory_total_demand_misses: 76947
-  system.l1_cntrl4.L1DcacheMemory_total_prefetches: 0
-  system.l1_cntrl4.L1DcacheMemory_total_sw_prefetches: 0
-  system.l1_cntrl4.L1DcacheMemory_total_hw_prefetches: 0
+Cache Stats: system.ruby.l1_cntrl4.L1DcacheMemory
+  system.ruby.l1_cntrl4.L1DcacheMemory_total_misses: 76947
+  system.ruby.l1_cntrl4.L1DcacheMemory_total_demand_misses: 76947
+  system.ruby.l1_cntrl4.L1DcacheMemory_total_prefetches: 0
+  system.ruby.l1_cntrl4.L1DcacheMemory_total_sw_prefetches: 0
+  system.ruby.l1_cntrl4.L1DcacheMemory_total_hw_prefetches: 0
 
-  system.l1_cntrl4.L1DcacheMemory_request_type_LD:   64.9837%
-  system.l1_cntrl4.L1DcacheMemory_request_type_ST:   35.0163%
+  system.ruby.l1_cntrl4.L1DcacheMemory_request_type_LD:   64.9837%
+  system.ruby.l1_cntrl4.L1DcacheMemory_request_type_ST:   35.0163%
 
-  system.l1_cntrl4.L1DcacheMemory_access_mode_type_Supervisor:   76947    100%
+  system.ruby.l1_cntrl4.L1DcacheMemory_access_mode_type_Supervisor:   76947    100%
 
-Cache Stats: system.l1_cntrl5.L1IcacheMemory
-  system.l1_cntrl5.L1IcacheMemory_total_misses: 0
-  system.l1_cntrl5.L1IcacheMemory_total_demand_misses: 0
-  system.l1_cntrl5.L1IcacheMemory_total_prefetches: 0
-  system.l1_cntrl5.L1IcacheMemory_total_sw_prefetches: 0
-  system.l1_cntrl5.L1IcacheMemory_total_hw_prefetches: 0
+Cache Stats: system.ruby.l1_cntrl5.L1IcacheMemory
+  system.ruby.l1_cntrl5.L1IcacheMemory_total_misses: 0
+  system.ruby.l1_cntrl5.L1IcacheMemory_total_demand_misses: 0
+  system.ruby.l1_cntrl5.L1IcacheMemory_total_prefetches: 0
+  system.ruby.l1_cntrl5.L1IcacheMemory_total_sw_prefetches: 0
+  system.ruby.l1_cntrl5.L1IcacheMemory_total_hw_prefetches: 0
 
 
-Cache Stats: system.l1_cntrl5.L1DcacheMemory
-  system.l1_cntrl5.L1DcacheMemory_total_misses: 77241
-  system.l1_cntrl5.L1DcacheMemory_total_demand_misses: 77241
-  system.l1_cntrl5.L1DcacheMemory_total_prefetches: 0
-  system.l1_cntrl5.L1DcacheMemory_total_sw_prefetches: 0
-  system.l1_cntrl5.L1DcacheMemory_total_hw_prefetches: 0
+Cache Stats: system.ruby.l1_cntrl5.L1DcacheMemory
+  system.ruby.l1_cntrl5.L1DcacheMemory_total_misses: 77241
+  system.ruby.l1_cntrl5.L1DcacheMemory_total_demand_misses: 77241
+  system.ruby.l1_cntrl5.L1DcacheMemory_total_prefetches: 0
+  system.ruby.l1_cntrl5.L1DcacheMemory_total_sw_prefetches: 0
+  system.ruby.l1_cntrl5.L1DcacheMemory_total_hw_prefetches: 0
 
-  system.l1_cntrl5.L1DcacheMemory_request_type_LD:   65.0496%
-  system.l1_cntrl5.L1DcacheMemory_request_type_ST:   34.9504%
+  system.ruby.l1_cntrl5.L1DcacheMemory_request_type_LD:   65.0496%
+  system.ruby.l1_cntrl5.L1DcacheMemory_request_type_ST:   34.9504%
 
-  system.l1_cntrl5.L1DcacheMemory_access_mode_type_Supervisor:   77241    100%
+  system.ruby.l1_cntrl5.L1DcacheMemory_access_mode_type_Supervisor:   77241    100%
 
-Cache Stats: system.l1_cntrl6.L1IcacheMemory
-  system.l1_cntrl6.L1IcacheMemory_total_misses: 0
-  system.l1_cntrl6.L1IcacheMemory_total_demand_misses: 0
-  system.l1_cntrl6.L1IcacheMemory_total_prefetches: 0
-  system.l1_cntrl6.L1IcacheMemory_total_sw_prefetches: 0
-  system.l1_cntrl6.L1IcacheMemory_total_hw_prefetches: 0
+Cache Stats: system.ruby.l1_cntrl6.L1IcacheMemory
+  system.ruby.l1_cntrl6.L1IcacheMemory_total_misses: 0
+  system.ruby.l1_cntrl6.L1IcacheMemory_total_demand_misses: 0
+  system.ruby.l1_cntrl6.L1IcacheMemory_total_prefetches: 0
+  system.ruby.l1_cntrl6.L1IcacheMemory_total_sw_prefetches: 0
+  system.ruby.l1_cntrl6.L1IcacheMemory_total_hw_prefetches: 0
 
 
-Cache Stats: system.l1_cntrl6.L1DcacheMemory
-  system.l1_cntrl6.L1DcacheMemory_total_misses: 77320
-  system.l1_cntrl6.L1DcacheMemory_total_demand_misses: 77320
-  system.l1_cntrl6.L1DcacheMemory_total_prefetches: 0
-  system.l1_cntrl6.L1DcacheMemory_total_sw_prefetches: 0
-  system.l1_cntrl6.L1DcacheMemory_total_hw_prefetches: 0
+Cache Stats: system.ruby.l1_cntrl6.L1DcacheMemory
+  system.ruby.l1_cntrl6.L1DcacheMemory_total_misses: 77320
+  system.ruby.l1_cntrl6.L1DcacheMemory_total_demand_misses: 77320
+  system.ruby.l1_cntrl6.L1DcacheMemory_total_prefetches: 0
+  system.ruby.l1_cntrl6.L1DcacheMemory_total_sw_prefetches: 0
+  system.ruby.l1_cntrl6.L1DcacheMemory_total_hw_prefetches: 0
 
-  system.l1_cntrl6.L1DcacheMemory_request_type_LD:   64.8228%
-  system.l1_cntrl6.L1DcacheMemory_request_type_ST:   35.1772%
+  system.ruby.l1_cntrl6.L1DcacheMemory_request_type_LD:   64.8228%
+  system.ruby.l1_cntrl6.L1DcacheMemory_request_type_ST:   35.1772%
 
-  system.l1_cntrl6.L1DcacheMemory_access_mode_type_Supervisor:   77320    100%
+  system.ruby.l1_cntrl6.L1DcacheMemory_access_mode_type_Supervisor:   77320    100%
 
-Cache Stats: system.l1_cntrl7.L1IcacheMemory
-  system.l1_cntrl7.L1IcacheMemory_total_misses: 0
-  system.l1_cntrl7.L1IcacheMemory_total_demand_misses: 0
-  system.l1_cntrl7.L1IcacheMemory_total_prefetches: 0
-  system.l1_cntrl7.L1IcacheMemory_total_sw_prefetches: 0
-  system.l1_cntrl7.L1IcacheMemory_total_hw_prefetches: 0
+Cache Stats: system.ruby.l1_cntrl7.L1IcacheMemory
+  system.ruby.l1_cntrl7.L1IcacheMemory_total_misses: 0
+  system.ruby.l1_cntrl7.L1IcacheMemory_total_demand_misses: 0
+  system.ruby.l1_cntrl7.L1IcacheMemory_total_prefetches: 0
+  system.ruby.l1_cntrl7.L1IcacheMemory_total_sw_prefetches: 0
+  system.ruby.l1_cntrl7.L1IcacheMemory_total_hw_prefetches: 0
 
 
-Cache Stats: system.l1_cntrl7.L1DcacheMemory
-  system.l1_cntrl7.L1DcacheMemory_total_misses: 76925
-  system.l1_cntrl7.L1DcacheMemory_total_demand_misses: 76925
-  system.l1_cntrl7.L1DcacheMemory_total_prefetches: 0
-  system.l1_cntrl7.L1DcacheMemory_total_sw_prefetches: 0
-  system.l1_cntrl7.L1DcacheMemory_total_hw_prefetches: 0
+Cache Stats: system.ruby.l1_cntrl7.L1DcacheMemory
+  system.ruby.l1_cntrl7.L1DcacheMemory_total_misses: 76925
+  system.ruby.l1_cntrl7.L1DcacheMemory_total_demand_misses: 76925
+  system.ruby.l1_cntrl7.L1DcacheMemory_total_prefetches: 0
+  system.ruby.l1_cntrl7.L1DcacheMemory_total_sw_prefetches: 0
+  system.ruby.l1_cntrl7.L1DcacheMemory_total_hw_prefetches: 0
 
-  system.l1_cntrl7.L1DcacheMemory_request_type_LD:   64.9984%
-  system.l1_cntrl7.L1DcacheMemory_request_type_ST:   35.0016%
+  system.ruby.l1_cntrl7.L1DcacheMemory_request_type_LD:   64.9984%
+  system.ruby.l1_cntrl7.L1DcacheMemory_request_type_ST:   35.0016%
 
-  system.l1_cntrl7.L1DcacheMemory_access_mode_type_Supervisor:   76925    100%
+  system.ruby.l1_cntrl7.L1DcacheMemory_access_mode_type_Supervisor:   76925    100%
 
-Cache Stats: system.l2_cntrl0.L2cacheMemory
-  system.l2_cntrl0.L2cacheMemory_total_misses: 615142
-  system.l2_cntrl0.L2cacheMemory_total_demand_misses: 615142
-  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: 615142
+  system.ruby.l2_cntrl0.L2cacheMemory_total_demand_misses: 615142
+  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:   65.0191%
-  system.l2_cntrl0.L2cacheMemory_request_type_GETX:   34.9809%
+  system.ruby.l2_cntrl0.L2cacheMemory_request_type_GETS:   65.0191%
+  system.ruby.l2_cntrl0.L2cacheMemory_request_type_GETX:   34.9809%
 
-  system.l2_cntrl0.L2cacheMemory_access_mode_type_Supervisor:   615142    100%
+  system.ruby.l2_cntrl0.L2cacheMemory_access_mode_type_Supervisor:   615142    100%
 
  --- L2Cache ---
  - Event Counts -
@@ -1078,7 +1078,7 @@ S_L  Persistent_GETS [0 ] 0
 S_L  Persistent_GETS_Last_Token [0 ] 0
 S_L  Own_Lock_or_Unlock [5 ] 5
 
-Memory controller: system.dir_cntrl0.memBuffer:
+Memory controller: system.ruby.dir_cntrl0.memBuffer:
   memory_total_requests: 844944
   memory_reads: 610587
   memory_writes: 234338

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 d838cf14716f1a496d998ab21cd4e1ea34f29f67..dd34a57f3bfe9ccb5acef1e5cbb81797c4b2cb0d 100644 (file)
--- 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,111 +4,111 @@ 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                                  48581                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 419240                       # Number of bytes of host memory used
-host_seconds                                   126.62                       # Real time elapsed on the host
-system.l1_cntrl4.L1DcacheMemory.num_data_array_reads            0                       # number of data array reads
-system.l1_cntrl4.L1DcacheMemory.num_data_array_writes            0                       # number of data array writes
-system.l1_cntrl4.L1DcacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.l1_cntrl4.L1DcacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.l1_cntrl4.L1DcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.l1_cntrl4.L1DcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-system.l1_cntrl4.L1IcacheMemory.num_data_array_reads            0                       # number of data array reads
-system.l1_cntrl4.L1IcacheMemory.num_data_array_writes            0                       # number of data array writes
-system.l1_cntrl4.L1IcacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.l1_cntrl4.L1IcacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.l1_cntrl4.L1IcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.l1_cntrl4.L1IcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-system.l1_cntrl5.L1DcacheMemory.num_data_array_reads            0                       # number of data array reads
-system.l1_cntrl5.L1DcacheMemory.num_data_array_writes            0                       # number of data array writes
-system.l1_cntrl5.L1DcacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.l1_cntrl5.L1DcacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.l1_cntrl5.L1DcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.l1_cntrl5.L1DcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-system.l1_cntrl5.L1IcacheMemory.num_data_array_reads            0                       # number of data array reads
-system.l1_cntrl5.L1IcacheMemory.num_data_array_writes            0                       # number of data array writes
-system.l1_cntrl5.L1IcacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.l1_cntrl5.L1IcacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.l1_cntrl5.L1IcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.l1_cntrl5.L1IcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-system.l1_cntrl6.L1DcacheMemory.num_data_array_reads            0                       # number of data array reads
-system.l1_cntrl6.L1DcacheMemory.num_data_array_writes            0                       # number of data array writes
-system.l1_cntrl6.L1DcacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.l1_cntrl6.L1DcacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.l1_cntrl6.L1DcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.l1_cntrl6.L1DcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-system.l1_cntrl6.L1IcacheMemory.num_data_array_reads            0                       # number of data array reads
-system.l1_cntrl6.L1IcacheMemory.num_data_array_writes            0                       # number of data array writes
-system.l1_cntrl6.L1IcacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.l1_cntrl6.L1IcacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.l1_cntrl6.L1IcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.l1_cntrl6.L1IcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-system.l1_cntrl7.L1DcacheMemory.num_data_array_reads            0                       # number of data array reads
-system.l1_cntrl7.L1DcacheMemory.num_data_array_writes            0                       # number of data array writes
-system.l1_cntrl7.L1DcacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.l1_cntrl7.L1DcacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.l1_cntrl7.L1DcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.l1_cntrl7.L1DcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-system.l1_cntrl7.L1IcacheMemory.num_data_array_reads            0                       # number of data array reads
-system.l1_cntrl7.L1IcacheMemory.num_data_array_writes            0                       # number of data array writes
-system.l1_cntrl7.L1IcacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.l1_cntrl7.L1IcacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.l1_cntrl7.L1IcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.l1_cntrl7.L1IcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-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_cntrl1.L1DcacheMemory.num_data_array_reads            0                       # number of data array reads
-system.l1_cntrl1.L1DcacheMemory.num_data_array_writes            0                       # number of data array writes
-system.l1_cntrl1.L1DcacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.l1_cntrl1.L1DcacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.l1_cntrl1.L1DcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.l1_cntrl1.L1DcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-system.l1_cntrl1.L1IcacheMemory.num_data_array_reads            0                       # number of data array reads
-system.l1_cntrl1.L1IcacheMemory.num_data_array_writes            0                       # number of data array writes
-system.l1_cntrl1.L1IcacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.l1_cntrl1.L1IcacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.l1_cntrl1.L1IcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.l1_cntrl1.L1IcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-system.l1_cntrl2.L1DcacheMemory.num_data_array_reads            0                       # number of data array reads
-system.l1_cntrl2.L1DcacheMemory.num_data_array_writes            0                       # number of data array writes
-system.l1_cntrl2.L1DcacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.l1_cntrl2.L1DcacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.l1_cntrl2.L1DcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.l1_cntrl2.L1DcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-system.l1_cntrl2.L1IcacheMemory.num_data_array_reads            0                       # number of data array reads
-system.l1_cntrl2.L1IcacheMemory.num_data_array_writes            0                       # number of data array writes
-system.l1_cntrl2.L1IcacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.l1_cntrl2.L1IcacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.l1_cntrl2.L1IcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.l1_cntrl2.L1IcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-system.l1_cntrl3.L1DcacheMemory.num_data_array_reads            0                       # number of data array reads
-system.l1_cntrl3.L1DcacheMemory.num_data_array_writes            0                       # number of data array writes
-system.l1_cntrl3.L1DcacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.l1_cntrl3.L1DcacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.l1_cntrl3.L1DcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.l1_cntrl3.L1DcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-system.l1_cntrl3.L1IcacheMemory.num_data_array_reads            0                       # number of data array reads
-system.l1_cntrl3.L1IcacheMemory.num_data_array_writes            0                       # number of data array writes
-system.l1_cntrl3.L1IcacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.l1_cntrl3.L1IcacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.l1_cntrl3.L1IcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.l1_cntrl3.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                                  48262                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 426016                       # Number of bytes of host memory used
+host_seconds                                   127.46                       # Real time elapsed on the host
+system.ruby.l1_cntrl4.L1DcacheMemory.num_data_array_reads            0                       # number of data array reads
+system.ruby.l1_cntrl4.L1DcacheMemory.num_data_array_writes            0                       # number of data array writes
+system.ruby.l1_cntrl4.L1DcacheMemory.num_tag_array_reads            0                       # number of tag array reads
+system.ruby.l1_cntrl4.L1DcacheMemory.num_tag_array_writes            0                       # number of tag array writes
+system.ruby.l1_cntrl4.L1DcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
+system.ruby.l1_cntrl4.L1DcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
+system.ruby.l1_cntrl4.L1IcacheMemory.num_data_array_reads            0                       # number of data array reads
+system.ruby.l1_cntrl4.L1IcacheMemory.num_data_array_writes            0                       # number of data array writes
+system.ruby.l1_cntrl4.L1IcacheMemory.num_tag_array_reads            0                       # number of tag array reads
+system.ruby.l1_cntrl4.L1IcacheMemory.num_tag_array_writes            0                       # number of tag array writes
+system.ruby.l1_cntrl4.L1IcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
+system.ruby.l1_cntrl4.L1IcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
+system.ruby.l1_cntrl5.L1DcacheMemory.num_data_array_reads            0                       # number of data array reads
+system.ruby.l1_cntrl5.L1DcacheMemory.num_data_array_writes            0                       # number of data array writes
+system.ruby.l1_cntrl5.L1DcacheMemory.num_tag_array_reads            0                       # number of tag array reads
+system.ruby.l1_cntrl5.L1DcacheMemory.num_tag_array_writes            0                       # number of tag array writes
+system.ruby.l1_cntrl5.L1DcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
+system.ruby.l1_cntrl5.L1DcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
+system.ruby.l1_cntrl5.L1IcacheMemory.num_data_array_reads            0                       # number of data array reads
+system.ruby.l1_cntrl5.L1IcacheMemory.num_data_array_writes            0                       # number of data array writes
+system.ruby.l1_cntrl5.L1IcacheMemory.num_tag_array_reads            0                       # number of tag array reads
+system.ruby.l1_cntrl5.L1IcacheMemory.num_tag_array_writes            0                       # number of tag array writes
+system.ruby.l1_cntrl5.L1IcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
+system.ruby.l1_cntrl5.L1IcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
+system.ruby.l1_cntrl6.L1DcacheMemory.num_data_array_reads            0                       # number of data array reads
+system.ruby.l1_cntrl6.L1DcacheMemory.num_data_array_writes            0                       # number of data array writes
+system.ruby.l1_cntrl6.L1DcacheMemory.num_tag_array_reads            0                       # number of tag array reads
+system.ruby.l1_cntrl6.L1DcacheMemory.num_tag_array_writes            0                       # number of tag array writes
+system.ruby.l1_cntrl6.L1DcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
+system.ruby.l1_cntrl6.L1DcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
+system.ruby.l1_cntrl6.L1IcacheMemory.num_data_array_reads            0                       # number of data array reads
+system.ruby.l1_cntrl6.L1IcacheMemory.num_data_array_writes            0                       # number of data array writes
+system.ruby.l1_cntrl6.L1IcacheMemory.num_tag_array_reads            0                       # number of tag array reads
+system.ruby.l1_cntrl6.L1IcacheMemory.num_tag_array_writes            0                       # number of tag array writes
+system.ruby.l1_cntrl6.L1IcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
+system.ruby.l1_cntrl6.L1IcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
+system.ruby.l1_cntrl7.L1DcacheMemory.num_data_array_reads            0                       # number of data array reads
+system.ruby.l1_cntrl7.L1DcacheMemory.num_data_array_writes            0                       # number of data array writes
+system.ruby.l1_cntrl7.L1DcacheMemory.num_tag_array_reads            0                       # number of tag array reads
+system.ruby.l1_cntrl7.L1DcacheMemory.num_tag_array_writes            0                       # number of tag array writes
+system.ruby.l1_cntrl7.L1DcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
+system.ruby.l1_cntrl7.L1DcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
+system.ruby.l1_cntrl7.L1IcacheMemory.num_data_array_reads            0                       # number of data array reads
+system.ruby.l1_cntrl7.L1IcacheMemory.num_data_array_writes            0                       # number of data array writes
+system.ruby.l1_cntrl7.L1IcacheMemory.num_tag_array_reads            0                       # number of tag array reads
+system.ruby.l1_cntrl7.L1IcacheMemory.num_tag_array_writes            0                       # number of tag array writes
+system.ruby.l1_cntrl7.L1IcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
+system.ruby.l1_cntrl7.L1IcacheMemory.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_cntrl1.L1DcacheMemory.num_data_array_reads            0                       # number of data array reads
+system.ruby.l1_cntrl1.L1DcacheMemory.num_data_array_writes            0                       # number of data array writes
+system.ruby.l1_cntrl1.L1DcacheMemory.num_tag_array_reads            0                       # number of tag array reads
+system.ruby.l1_cntrl1.L1DcacheMemory.num_tag_array_writes            0                       # number of tag array writes
+system.ruby.l1_cntrl1.L1DcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
+system.ruby.l1_cntrl1.L1DcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
+system.ruby.l1_cntrl1.L1IcacheMemory.num_data_array_reads            0                       # number of data array reads
+system.ruby.l1_cntrl1.L1IcacheMemory.num_data_array_writes            0                       # number of data array writes
+system.ruby.l1_cntrl1.L1IcacheMemory.num_tag_array_reads            0                       # number of tag array reads
+system.ruby.l1_cntrl1.L1IcacheMemory.num_tag_array_writes            0                       # number of tag array writes
+system.ruby.l1_cntrl1.L1IcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
+system.ruby.l1_cntrl1.L1IcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
+system.ruby.l1_cntrl2.L1DcacheMemory.num_data_array_reads            0                       # number of data array reads
+system.ruby.l1_cntrl2.L1DcacheMemory.num_data_array_writes            0                       # number of data array writes
+system.ruby.l1_cntrl2.L1DcacheMemory.num_tag_array_reads            0                       # number of tag array reads
+system.ruby.l1_cntrl2.L1DcacheMemory.num_tag_array_writes            0                       # number of tag array writes
+system.ruby.l1_cntrl2.L1DcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
+system.ruby.l1_cntrl2.L1DcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
+system.ruby.l1_cntrl2.L1IcacheMemory.num_data_array_reads            0                       # number of data array reads
+system.ruby.l1_cntrl2.L1IcacheMemory.num_data_array_writes            0                       # number of data array writes
+system.ruby.l1_cntrl2.L1IcacheMemory.num_tag_array_reads            0                       # number of tag array reads
+system.ruby.l1_cntrl2.L1IcacheMemory.num_tag_array_writes            0                       # number of tag array writes
+system.ruby.l1_cntrl2.L1IcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
+system.ruby.l1_cntrl2.L1IcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
+system.ruby.l1_cntrl3.L1DcacheMemory.num_data_array_reads            0                       # number of data array reads
+system.ruby.l1_cntrl3.L1DcacheMemory.num_data_array_writes            0                       # number of data array writes
+system.ruby.l1_cntrl3.L1DcacheMemory.num_tag_array_reads            0                       # number of tag array reads
+system.ruby.l1_cntrl3.L1DcacheMemory.num_tag_array_writes            0                       # number of tag array writes
+system.ruby.l1_cntrl3.L1DcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
+system.ruby.l1_cntrl3.L1DcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
+system.ruby.l1_cntrl3.L1IcacheMemory.num_data_array_reads            0                       # number of data array reads
+system.ruby.l1_cntrl3.L1IcacheMemory.num_data_array_writes            0                       # number of data array writes
+system.ruby.l1_cntrl3.L1IcacheMemory.num_tag_array_reads            0                       # number of tag array reads
+system.ruby.l1_cntrl3.L1IcacheMemory.num_tag_array_writes            0                       # number of tag array writes
+system.ruby.l1_cntrl3.L1IcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
+system.ruby.l1_cntrl3.L1IcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
+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.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 1678bc86953495ee5cd695a29f8eb566b7b8b143..f80cf2fbf180d9a5e4a78809e0eeb77bc119713f 100644 (file)
--- 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
@@ -8,14 +8,15 @@ time_sync_spin_threshold=100000
 
 [system]
 type=System
-children=cpu0 cpu1 cpu2 cpu3 cpu4 cpu5 cpu6 cpu7 dir_cntrl0 funcbus funcmem l1_cntrl0 l1_cntrl1 l1_cntrl2 l1_cntrl3 l1_cntrl4 l1_cntrl5 l1_cntrl6 l1_cntrl7 physmem ruby sys_port_proxy
+children=cpu0 cpu1 cpu2 cpu3 cpu4 cpu5 cpu6 cpu7 funcbus funcmem physmem ruby sys_port_proxy
 boot_osflags=a
 clock=1
 init_param=0
 kernel=
 load_addr_mask=1099511627775
 mem_mode=timing
-memories=system.physmem system.funcmem
+mem_ranges=
+memories=system.funcmem system.physmem
 num_work_ids=16
 readfile=
 symbolfile=
@@ -45,7 +46,7 @@ suppress_func_warnings=true
 sys=system
 trace_addr=0
 functional=system.funcbus.slave[0]
-test=system.l1_cntrl0.sequencer.slave[0]
+test=system.ruby.l1_cntrl0.sequencer.slave[0]
 
 [system.cpu1]
 type=MemTest
@@ -64,7 +65,7 @@ suppress_func_warnings=true
 sys=system
 trace_addr=0
 functional=system.funcbus.slave[1]
-test=system.l1_cntrl1.sequencer.slave[0]
+test=system.ruby.l1_cntrl1.sequencer.slave[0]
 
 [system.cpu2]
 type=MemTest
@@ -83,7 +84,7 @@ suppress_func_warnings=true
 sys=system
 trace_addr=0
 functional=system.funcbus.slave[2]
-test=system.l1_cntrl2.sequencer.slave[0]
+test=system.ruby.l1_cntrl2.sequencer.slave[0]
 
 [system.cpu3]
 type=MemTest
@@ -102,7 +103,7 @@ suppress_func_warnings=true
 sys=system
 trace_addr=0
 functional=system.funcbus.slave[3]
-test=system.l1_cntrl3.sequencer.slave[0]
+test=system.ruby.l1_cntrl3.sequencer.slave[0]
 
 [system.cpu4]
 type=MemTest
@@ -121,7 +122,7 @@ suppress_func_warnings=true
 sys=system
 trace_addr=0
 functional=system.funcbus.slave[4]
-test=system.l1_cntrl4.sequencer.slave[0]
+test=system.ruby.l1_cntrl4.sequencer.slave[0]
 
 [system.cpu5]
 type=MemTest
@@ -140,7 +141,7 @@ suppress_func_warnings=true
 sys=system
 trace_addr=0
 functional=system.funcbus.slave[5]
-test=system.l1_cntrl5.sequencer.slave[0]
+test=system.ruby.l1_cntrl5.sequencer.slave[0]
 
 [system.cpu6]
 type=MemTest
@@ -159,7 +160,7 @@ suppress_func_warnings=true
 sys=system
 trace_addr=0
 functional=system.funcbus.slave[6]
-test=system.l1_cntrl6.sequencer.slave[0]
+test=system.ruby.l1_cntrl6.sequencer.slave[0]
 
 [system.cpu7]
 type=MemTest
@@ -178,26 +179,73 @@ suppress_func_warnings=true
 sys=system
 trace_addr=0
 functional=system.funcbus.slave[7]
-test=system.l1_cntrl7.sequencer.slave[0]
+test=system.ruby.l1_cntrl7.sequencer.slave[0]
 
-[system.dir_cntrl0]
+[system.funcbus]
+type=NoncoherentBus
+block_size=64
+clock=1
+header_cycles=1
+use_default_range=false
+width=8
+master=system.funcmem.port
+slave=system.cpu0.functional system.cpu1.functional system.cpu2.functional system.cpu3.functional system.cpu4.functional system.cpu5.functional system.cpu6.functional system.cpu7.functional
+
+[system.funcmem]
+type=SimpleMemory
+bandwidth=0.000000
+clock=1
+conf_table_reported=false
+in_addr_map=false
+latency=30
+latency_var=0
+null=false
+range=0:134217727
+zero=false
+port=system.funcbus.master[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=dir_cntrl0 l1_cntrl0 l1_cntrl1 l1_cntrl2 l1_cntrl3 l1_cntrl4 l1_cntrl5 l1_cntrl6 l1_cntrl7 network profiler
+block_size_bytes=64
+clock=1
+mem_size=268435456
+no_mem_vec=false
+random_seed=1234
+randomization=false
+stats_filename=ruby.stats
+
+[system.ruby.dir_cntrl0]
 type=Directory_Controller
 children=directory memBuffer probeFilter
 buffer_size=0
+clock=1
 cntrl_id=8
-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=5
@@ -205,7 +253,7 @@ size=268435456
 use_map=false
 version=0
 
-[system.dir_cntrl0.memBuffer]
+[system.ruby.dir_cntrl0.memBuffer]
 type=RubyMemoryControl
 bank_bit_0=8
 bank_busy_time=11
@@ -227,7 +275,7 @@ ruby_system=system.ruby
 tFaw=0
 version=0
 
-[system.dir_cntrl0.probeFilter]
+[system.ruby.dir_cntrl0.probeFilter]
 type=RubyCache
 assoc=4
 dataAccessLatency=1
@@ -241,37 +289,15 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.funcbus]
-type=NoncoherentBus
-block_size=64
-clock=1
-header_cycles=1
-use_default_range=false
-width=8
-master=system.funcmem.port
-slave=system.cpu0.functional system.cpu1.functional system.cpu2.functional system.cpu3.functional system.cpu4.functional system.cpu5.functional system.cpu6.functional system.cpu7.functional
-
-[system.funcmem]
-type=SimpleMemory
-bandwidth=0.000000
-clock=1
-conf_table_reported=false
-in_addr_map=false
-latency=30
-latency_var=0
-null=false
-range=0:134217727
-zero=false
-port=system.funcbus.master[0]
-
-[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
@@ -280,11 +306,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
@@ -298,7 +324,7 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.l1_cntrl0.L1IcacheMemory]
+[system.ruby.l1_cntrl0.L1IcacheMemory]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -312,7 +338,7 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.l1_cntrl0.L2cacheMemory]
+[system.ruby.l1_cntrl0.L2cacheMemory]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -326,13 +352,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=1000000
-icache=system.l1_cntrl0.L1IcacheMemory
+icache=system.ruby.l1_cntrl0.L1IcacheMemory
 max_outstanding_requests=16
 ruby_system=system.ruby
 support_data_reqs=true
@@ -343,14 +369,15 @@ using_ruby_tester=false
 version=0
 slave=system.cpu0.test
 
-[system.l1_cntrl1]
+[system.ruby.l1_cntrl1]
 type=L1Cache_Controller
 children=L1DcacheMemory L1IcacheMemory L2cacheMemory sequencer
-L1DcacheMemory=system.l1_cntrl1.L1DcacheMemory
-L1IcacheMemory=system.l1_cntrl1.L1IcacheMemory
-L2cacheMemory=system.l1_cntrl1.L2cacheMemory
+L1DcacheMemory=system.ruby.l1_cntrl1.L1DcacheMemory
+L1IcacheMemory=system.ruby.l1_cntrl1.L1IcacheMemory
+L2cacheMemory=system.ruby.l1_cntrl1.L2cacheMemory
 buffer_size=0
 cache_response_latency=10
+clock=1
 cntrl_id=1
 issue_latency=2
 l2_cache_hit_latency=10
@@ -359,11 +386,11 @@ number_of_TBEs=256
 recycle_latency=10
 ruby_system=system.ruby
 send_evictions=false
-sequencer=system.l1_cntrl1.sequencer
+sequencer=system.ruby.l1_cntrl1.sequencer
 transitions_per_cycle=32
 version=1
 
-[system.l1_cntrl1.L1DcacheMemory]
+[system.ruby.l1_cntrl1.L1DcacheMemory]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -377,7 +404,7 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.l1_cntrl1.L1IcacheMemory]
+[system.ruby.l1_cntrl1.L1IcacheMemory]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -391,7 +418,7 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.l1_cntrl1.L2cacheMemory]
+[system.ruby.l1_cntrl1.L2cacheMemory]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -405,13 +432,13 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.l1_cntrl1.sequencer]
+[system.ruby.l1_cntrl1.sequencer]
 type=RubySequencer
 access_phys_mem=false
 clock=1
-dcache=system.l1_cntrl1.L1DcacheMemory
+dcache=system.ruby.l1_cntrl1.L1DcacheMemory
 deadlock_threshold=1000000
-icache=system.l1_cntrl1.L1IcacheMemory
+icache=system.ruby.l1_cntrl1.L1IcacheMemory
 max_outstanding_requests=16
 ruby_system=system.ruby
 support_data_reqs=true
@@ -422,14 +449,15 @@ using_ruby_tester=false
 version=1
 slave=system.cpu1.test
 
-[system.l1_cntrl2]
+[system.ruby.l1_cntrl2]
 type=L1Cache_Controller
 children=L1DcacheMemory L1IcacheMemory L2cacheMemory sequencer
-L1DcacheMemory=system.l1_cntrl2.L1DcacheMemory
-L1IcacheMemory=system.l1_cntrl2.L1IcacheMemory
-L2cacheMemory=system.l1_cntrl2.L2cacheMemory
+L1DcacheMemory=system.ruby.l1_cntrl2.L1DcacheMemory
+L1IcacheMemory=system.ruby.l1_cntrl2.L1IcacheMemory
+L2cacheMemory=system.ruby.l1_cntrl2.L2cacheMemory
 buffer_size=0
 cache_response_latency=10
+clock=1
 cntrl_id=2
 issue_latency=2
 l2_cache_hit_latency=10
@@ -438,11 +466,11 @@ number_of_TBEs=256
 recycle_latency=10
 ruby_system=system.ruby
 send_evictions=false
-sequencer=system.l1_cntrl2.sequencer
+sequencer=system.ruby.l1_cntrl2.sequencer
 transitions_per_cycle=32
 version=2
 
-[system.l1_cntrl2.L1DcacheMemory]
+[system.ruby.l1_cntrl2.L1DcacheMemory]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -456,7 +484,7 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.l1_cntrl2.L1IcacheMemory]
+[system.ruby.l1_cntrl2.L1IcacheMemory]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -470,7 +498,7 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.l1_cntrl2.L2cacheMemory]
+[system.ruby.l1_cntrl2.L2cacheMemory]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -484,13 +512,13 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.l1_cntrl2.sequencer]
+[system.ruby.l1_cntrl2.sequencer]
 type=RubySequencer
 access_phys_mem=false
 clock=1
-dcache=system.l1_cntrl2.L1DcacheMemory
+dcache=system.ruby.l1_cntrl2.L1DcacheMemory
 deadlock_threshold=1000000
-icache=system.l1_cntrl2.L1IcacheMemory
+icache=system.ruby.l1_cntrl2.L1IcacheMemory
 max_outstanding_requests=16
 ruby_system=system.ruby
 support_data_reqs=true
@@ -501,14 +529,15 @@ using_ruby_tester=false
 version=2
 slave=system.cpu2.test
 
-[system.l1_cntrl3]
+[system.ruby.l1_cntrl3]
 type=L1Cache_Controller
 children=L1DcacheMemory L1IcacheMemory L2cacheMemory sequencer
-L1DcacheMemory=system.l1_cntrl3.L1DcacheMemory
-L1IcacheMemory=system.l1_cntrl3.L1IcacheMemory
-L2cacheMemory=system.l1_cntrl3.L2cacheMemory
+L1DcacheMemory=system.ruby.l1_cntrl3.L1DcacheMemory
+L1IcacheMemory=system.ruby.l1_cntrl3.L1IcacheMemory
+L2cacheMemory=system.ruby.l1_cntrl3.L2cacheMemory
 buffer_size=0
 cache_response_latency=10
+clock=1
 cntrl_id=3
 issue_latency=2
 l2_cache_hit_latency=10
@@ -517,11 +546,11 @@ number_of_TBEs=256
 recycle_latency=10
 ruby_system=system.ruby
 send_evictions=false
-sequencer=system.l1_cntrl3.sequencer
+sequencer=system.ruby.l1_cntrl3.sequencer
 transitions_per_cycle=32
 version=3
 
-[system.l1_cntrl3.L1DcacheMemory]
+[system.ruby.l1_cntrl3.L1DcacheMemory]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -535,7 +564,7 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.l1_cntrl3.L1IcacheMemory]
+[system.ruby.l1_cntrl3.L1IcacheMemory]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -549,7 +578,7 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.l1_cntrl3.L2cacheMemory]
+[system.ruby.l1_cntrl3.L2cacheMemory]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -563,13 +592,13 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.l1_cntrl3.sequencer]
+[system.ruby.l1_cntrl3.sequencer]
 type=RubySequencer
 access_phys_mem=false
 clock=1
-dcache=system.l1_cntrl3.L1DcacheMemory
+dcache=system.ruby.l1_cntrl3.L1DcacheMemory
 deadlock_threshold=1000000
-icache=system.l1_cntrl3.L1IcacheMemory
+icache=system.ruby.l1_cntrl3.L1IcacheMemory
 max_outstanding_requests=16
 ruby_system=system.ruby
 support_data_reqs=true
@@ -580,14 +609,15 @@ using_ruby_tester=false
 version=3
 slave=system.cpu3.test
 
-[system.l1_cntrl4]
+[system.ruby.l1_cntrl4]
 type=L1Cache_Controller
 children=L1DcacheMemory L1IcacheMemory L2cacheMemory sequencer
-L1DcacheMemory=system.l1_cntrl4.L1DcacheMemory
-L1IcacheMemory=system.l1_cntrl4.L1IcacheMemory
-L2cacheMemory=system.l1_cntrl4.L2cacheMemory
+L1DcacheMemory=system.ruby.l1_cntrl4.L1DcacheMemory
+L1IcacheMemory=system.ruby.l1_cntrl4.L1IcacheMemory
+L2cacheMemory=system.ruby.l1_cntrl4.L2cacheMemory
 buffer_size=0
 cache_response_latency=10
+clock=1
 cntrl_id=4
 issue_latency=2
 l2_cache_hit_latency=10
@@ -596,11 +626,11 @@ number_of_TBEs=256
 recycle_latency=10
 ruby_system=system.ruby
 send_evictions=false
-sequencer=system.l1_cntrl4.sequencer
+sequencer=system.ruby.l1_cntrl4.sequencer
 transitions_per_cycle=32
 version=4
 
-[system.l1_cntrl4.L1DcacheMemory]
+[system.ruby.l1_cntrl4.L1DcacheMemory]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -614,7 +644,7 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.l1_cntrl4.L1IcacheMemory]
+[system.ruby.l1_cntrl4.L1IcacheMemory]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -628,7 +658,7 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.l1_cntrl4.L2cacheMemory]
+[system.ruby.l1_cntrl4.L2cacheMemory]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -642,13 +672,13 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.l1_cntrl4.sequencer]
+[system.ruby.l1_cntrl4.sequencer]
 type=RubySequencer
 access_phys_mem=false
 clock=1
-dcache=system.l1_cntrl4.L1DcacheMemory
+dcache=system.ruby.l1_cntrl4.L1DcacheMemory
 deadlock_threshold=1000000
-icache=system.l1_cntrl4.L1IcacheMemory
+icache=system.ruby.l1_cntrl4.L1IcacheMemory
 max_outstanding_requests=16
 ruby_system=system.ruby
 support_data_reqs=true
@@ -659,14 +689,15 @@ using_ruby_tester=false
 version=4
 slave=system.cpu4.test
 
-[system.l1_cntrl5]
+[system.ruby.l1_cntrl5]
 type=L1Cache_Controller
 children=L1DcacheMemory L1IcacheMemory L2cacheMemory sequencer
-L1DcacheMemory=system.l1_cntrl5.L1DcacheMemory
-L1IcacheMemory=system.l1_cntrl5.L1IcacheMemory
-L2cacheMemory=system.l1_cntrl5.L2cacheMemory
+L1DcacheMemory=system.ruby.l1_cntrl5.L1DcacheMemory
+L1IcacheMemory=system.ruby.l1_cntrl5.L1IcacheMemory
+L2cacheMemory=system.ruby.l1_cntrl5.L2cacheMemory
 buffer_size=0
 cache_response_latency=10
+clock=1
 cntrl_id=5
 issue_latency=2
 l2_cache_hit_latency=10
@@ -675,11 +706,11 @@ number_of_TBEs=256
 recycle_latency=10
 ruby_system=system.ruby
 send_evictions=false
-sequencer=system.l1_cntrl5.sequencer
+sequencer=system.ruby.l1_cntrl5.sequencer
 transitions_per_cycle=32
 version=5
 
-[system.l1_cntrl5.L1DcacheMemory]
+[system.ruby.l1_cntrl5.L1DcacheMemory]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -693,7 +724,7 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.l1_cntrl5.L1IcacheMemory]
+[system.ruby.l1_cntrl5.L1IcacheMemory]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -707,7 +738,7 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.l1_cntrl5.L2cacheMemory]
+[system.ruby.l1_cntrl5.L2cacheMemory]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -721,13 +752,13 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.l1_cntrl5.sequencer]
+[system.ruby.l1_cntrl5.sequencer]
 type=RubySequencer
 access_phys_mem=false
 clock=1
-dcache=system.l1_cntrl5.L1DcacheMemory
+dcache=system.ruby.l1_cntrl5.L1DcacheMemory
 deadlock_threshold=1000000
-icache=system.l1_cntrl5.L1IcacheMemory
+icache=system.ruby.l1_cntrl5.L1IcacheMemory
 max_outstanding_requests=16
 ruby_system=system.ruby
 support_data_reqs=true
@@ -738,14 +769,15 @@ using_ruby_tester=false
 version=5
 slave=system.cpu5.test
 
-[system.l1_cntrl6]
+[system.ruby.l1_cntrl6]
 type=L1Cache_Controller
 children=L1DcacheMemory L1IcacheMemory L2cacheMemory sequencer
-L1DcacheMemory=system.l1_cntrl6.L1DcacheMemory
-L1IcacheMemory=system.l1_cntrl6.L1IcacheMemory
-L2cacheMemory=system.l1_cntrl6.L2cacheMemory
+L1DcacheMemory=system.ruby.l1_cntrl6.L1DcacheMemory
+L1IcacheMemory=system.ruby.l1_cntrl6.L1IcacheMemory
+L2cacheMemory=system.ruby.l1_cntrl6.L2cacheMemory
 buffer_size=0
 cache_response_latency=10
+clock=1
 cntrl_id=6
 issue_latency=2
 l2_cache_hit_latency=10
@@ -754,11 +786,11 @@ number_of_TBEs=256
 recycle_latency=10
 ruby_system=system.ruby
 send_evictions=false
-sequencer=system.l1_cntrl6.sequencer
+sequencer=system.ruby.l1_cntrl6.sequencer
 transitions_per_cycle=32
 version=6
 
-[system.l1_cntrl6.L1DcacheMemory]
+[system.ruby.l1_cntrl6.L1DcacheMemory]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -772,7 +804,7 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.l1_cntrl6.L1IcacheMemory]
+[system.ruby.l1_cntrl6.L1IcacheMemory]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -786,7 +818,7 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.l1_cntrl6.L2cacheMemory]
+[system.ruby.l1_cntrl6.L2cacheMemory]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -800,13 +832,13 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.l1_cntrl6.sequencer]
+[system.ruby.l1_cntrl6.sequencer]
 type=RubySequencer
 access_phys_mem=false
 clock=1
-dcache=system.l1_cntrl6.L1DcacheMemory
+dcache=system.ruby.l1_cntrl6.L1DcacheMemory
 deadlock_threshold=1000000
-icache=system.l1_cntrl6.L1IcacheMemory
+icache=system.ruby.l1_cntrl6.L1IcacheMemory
 max_outstanding_requests=16
 ruby_system=system.ruby
 support_data_reqs=true
@@ -817,14 +849,15 @@ using_ruby_tester=false
 version=6
 slave=system.cpu6.test
 
-[system.l1_cntrl7]
+[system.ruby.l1_cntrl7]
 type=L1Cache_Controller
 children=L1DcacheMemory L1IcacheMemory L2cacheMemory sequencer
-L1DcacheMemory=system.l1_cntrl7.L1DcacheMemory
-L1IcacheMemory=system.l1_cntrl7.L1IcacheMemory
-L2cacheMemory=system.l1_cntrl7.L2cacheMemory
+L1DcacheMemory=system.ruby.l1_cntrl7.L1DcacheMemory
+L1IcacheMemory=system.ruby.l1_cntrl7.L1IcacheMemory
+L2cacheMemory=system.ruby.l1_cntrl7.L2cacheMemory
 buffer_size=0
 cache_response_latency=10
+clock=1
 cntrl_id=7
 issue_latency=2
 l2_cache_hit_latency=10
@@ -833,11 +866,11 @@ number_of_TBEs=256
 recycle_latency=10
 ruby_system=system.ruby
 send_evictions=false
-sequencer=system.l1_cntrl7.sequencer
+sequencer=system.ruby.l1_cntrl7.sequencer
 transitions_per_cycle=32
 version=7
 
-[system.l1_cntrl7.L1DcacheMemory]
+[system.ruby.l1_cntrl7.L1DcacheMemory]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -851,7 +884,7 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.l1_cntrl7.L1IcacheMemory]
+[system.ruby.l1_cntrl7.L1IcacheMemory]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -865,7 +898,7 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.l1_cntrl7.L2cacheMemory]
+[system.ruby.l1_cntrl7.L2cacheMemory]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -879,13 +912,13 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.l1_cntrl7.sequencer]
+[system.ruby.l1_cntrl7.sequencer]
 type=RubySequencer
 access_phys_mem=false
 clock=1
-dcache=system.l1_cntrl7.L1DcacheMemory
+dcache=system.ruby.l1_cntrl7.L1DcacheMemory
 deadlock_threshold=1000000
-icache=system.l1_cntrl7.L1IcacheMemory
+icache=system.ruby.l1_cntrl7.L1IcacheMemory
 max_outstanding_requests=16
 ruby_system=system.ruby
 support_data_reqs=true
@@ -896,34 +929,12 @@ using_ruby_tester=false
 version=7
 slave=system.cpu7.test
 
-[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=268435456
-no_mem_vec=false
-random_seed=1234
-randomization=false
-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
@@ -943,7 +954,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
@@ -951,6 +962,7 @@ weight=1
 
 [system.ruby.network.topology.ext_links0.int_node]
 type=Switch
+clock=1
 router_id=0
 virt_nets=10
 
@@ -958,7 +970,7 @@ virt_nets=10
 type=SimpleExtLink
 children=int_node
 bandwidth_factor=16
-ext_node=system.l1_cntrl1
+ext_node=system.ruby.l1_cntrl1
 int_node=system.ruby.network.topology.ext_links1.int_node
 latency=1
 link_id=1
@@ -966,6 +978,7 @@ weight=1
 
 [system.ruby.network.topology.ext_links1.int_node]
 type=Switch
+clock=1
 router_id=1
 virt_nets=10
 
@@ -973,7 +986,7 @@ virt_nets=10
 type=SimpleExtLink
 children=int_node
 bandwidth_factor=16
-ext_node=system.l1_cntrl2
+ext_node=system.ruby.l1_cntrl2
 int_node=system.ruby.network.topology.ext_links2.int_node
 latency=1
 link_id=2
@@ -981,6 +994,7 @@ weight=1
 
 [system.ruby.network.topology.ext_links2.int_node]
 type=Switch
+clock=1
 router_id=2
 virt_nets=10
 
@@ -988,7 +1002,7 @@ virt_nets=10
 type=SimpleExtLink
 children=int_node
 bandwidth_factor=16
-ext_node=system.l1_cntrl3
+ext_node=system.ruby.l1_cntrl3
 int_node=system.ruby.network.topology.ext_links3.int_node
 latency=1
 link_id=3
@@ -996,6 +1010,7 @@ weight=1
 
 [system.ruby.network.topology.ext_links3.int_node]
 type=Switch
+clock=1
 router_id=3
 virt_nets=10
 
@@ -1003,7 +1018,7 @@ virt_nets=10
 type=SimpleExtLink
 children=int_node
 bandwidth_factor=16
-ext_node=system.l1_cntrl4
+ext_node=system.ruby.l1_cntrl4
 int_node=system.ruby.network.topology.ext_links4.int_node
 latency=1
 link_id=4
@@ -1011,6 +1026,7 @@ weight=1
 
 [system.ruby.network.topology.ext_links4.int_node]
 type=Switch
+clock=1
 router_id=4
 virt_nets=10
 
@@ -1018,7 +1034,7 @@ virt_nets=10
 type=SimpleExtLink
 children=int_node
 bandwidth_factor=16
-ext_node=system.l1_cntrl5
+ext_node=system.ruby.l1_cntrl5
 int_node=system.ruby.network.topology.ext_links5.int_node
 latency=1
 link_id=5
@@ -1026,6 +1042,7 @@ weight=1
 
 [system.ruby.network.topology.ext_links5.int_node]
 type=Switch
+clock=1
 router_id=5
 virt_nets=10
 
@@ -1033,7 +1050,7 @@ virt_nets=10
 type=SimpleExtLink
 children=int_node
 bandwidth_factor=16
-ext_node=system.l1_cntrl6
+ext_node=system.ruby.l1_cntrl6
 int_node=system.ruby.network.topology.ext_links6.int_node
 latency=1
 link_id=6
@@ -1041,6 +1058,7 @@ weight=1
 
 [system.ruby.network.topology.ext_links6.int_node]
 type=Switch
+clock=1
 router_id=6
 virt_nets=10
 
@@ -1048,7 +1066,7 @@ virt_nets=10
 type=SimpleExtLink
 children=int_node
 bandwidth_factor=16
-ext_node=system.l1_cntrl7
+ext_node=system.ruby.l1_cntrl7
 int_node=system.ruby.network.topology.ext_links7.int_node
 latency=1
 link_id=7
@@ -1056,6 +1074,7 @@ weight=1
 
 [system.ruby.network.topology.ext_links7.int_node]
 type=Switch
+clock=1
 router_id=7
 virt_nets=10
 
@@ -1063,7 +1082,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_links8.int_node
 latency=1
 link_id=8
@@ -1071,6 +1090,7 @@ weight=1
 
 [system.ruby.network.topology.ext_links8.int_node]
 type=Switch
+clock=1
 router_id=8
 virt_nets=10
 
@@ -1086,6 +1106,7 @@ weight=1
 
 [system.ruby.network.topology.int_links0.node_b]
 type=Switch
+clock=1
 router_id=9
 virt_nets=10
 

diff --git a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/ruby.stats b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/ruby.stats
index ba9501899c0094109fb5f81e0a565dbc7f0fe04f..d676af3309eae5359a9c0ab2cfd9ce3ba878e16c 100644 (file)
--- a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/ruby.stats
+++ b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/ruby.stats
@@ -1,24 +1,24 @@
-Real time: Nov/10/2012 16:12:48
+Real time: Jan/14/2013 08:18:43
 
 Profiler Stats
 --------------
-Elapsed_time_in_seconds: 129
-Elapsed_time_in_minutes: 2.15
-Elapsed_time_in_hours: 0.0358333
-Elapsed_time_in_days: 0.00149306
+Elapsed_time_in_seconds: 126
+Elapsed_time_in_minutes: 2.1
+Elapsed_time_in_hours: 0.035
+Elapsed_time_in_days: 0.00145833
 
-Virtual_time_in_seconds: 129.5
-Virtual_time_in_minutes: 2.15833
-Virtual_time_in_hours:   0.0359722
-Virtual_time_in_days:    0.00149884
+Virtual_time_in_seconds: 125.84
+Virtual_time_in_minutes: 2.09733
+Virtual_time_in_hours:   0.0349556
+Virtual_time_in_days:    0.00145648
 
 Ruby_current_time: 5795833
 Ruby_start_time: 0
 Ruby_cycles: 5795833
 
-mbytes_resident: 70.6016
-mbytes_total: 409.332
-resident_ratio: 0.172489
+mbytes_resident: 71.4023
+mbytes_total: 416.008
+resident_ratio: 0.171665
 
 ruby_cycles_executed: [ 5795834 5795834 5795834 5795834 5795834 5795834 5795834 5795834 ]
 
@@ -88,13 +88,13 @@ Total_nonPF_delay_cycles: [binsize: 1 max: 0 count: 0 average: NaN |standard dev
 Resource Usage
 --------------
 page_size: 4096
-user_time: 129
+user_time: 125
 system_time: 0
-page_reclaims: 9986
-page_faults: 39
+page_reclaims: 10369
+page_faults: 0
 swaps: 0
-block_inputs: 4776
-block_outputs: 280
+block_inputs: 0
+block_outputs: 328
 
 Network Stats
 -------------
@@ -325,37 +325,37 @@ links_utilized_percent_switch_9: 18.0864
   outgoing_messages_switch_9_link_8_Writeback_Control: 950339 7602712 [ 0 0 582292 0 0 368047 0 0 0 0 ] base_latency: 1
   outgoing_messages_switch_9_link_8_Unblock_Control: 617596 4940768 [ 0 0 0 0 0 617596 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: 76966
-  system.l1_cntrl0.L1DcacheMemory_total_demand_misses: 76966
-  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: 76966
+  system.ruby.l1_cntrl0.L1DcacheMemory_total_demand_misses: 76966
+  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:   65.2548%
-  system.l1_cntrl0.L1DcacheMemory_request_type_ST:   34.7452%
+  system.ruby.l1_cntrl0.L1DcacheMemory_request_type_LD:   65.2548%
+  system.ruby.l1_cntrl0.L1DcacheMemory_request_type_ST:   34.7452%
 
-  system.l1_cntrl0.L1DcacheMemory_access_mode_type_Supervisor:   76966    100%
+  system.ruby.l1_cntrl0.L1DcacheMemory_access_mode_type_Supervisor:   76966    100%
 
-Cache Stats: system.l1_cntrl0.L2cacheMemory
-  system.l1_cntrl0.L2cacheMemory_total_misses: 76966
-  system.l1_cntrl0.L2cacheMemory_total_demand_misses: 76966
-  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: 76966
+  system.ruby.l1_cntrl0.L2cacheMemory_total_demand_misses: 76966
+  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:   65.2548%
-  system.l1_cntrl0.L2cacheMemory_request_type_ST:   34.7452%
+  system.ruby.l1_cntrl0.L2cacheMemory_request_type_LD:   65.2548%
+  system.ruby.l1_cntrl0.L2cacheMemory_request_type_ST:   34.7452%
 
-  system.l1_cntrl0.L2cacheMemory_access_mode_type_Supervisor:   76966    100%
+  system.ruby.l1_cntrl0.L2cacheMemory_access_mode_type_Supervisor:   76966    100%
 
  --- L1Cache ---
  - Event Counts -
@@ -754,239 +754,239 @@ MM_WF  Ack [0 0 0 0 0 0 0 0 ] 0
 MM_WF  All_acks_no_sharers [0 0 0 0 0 0 0 0 ] 0
 MM_WF  Flush_line [0 0 0 0 0 0 0 0 ] 0
 
-Cache Stats: system.l1_cntrl1.L1IcacheMemory
-  system.l1_cntrl1.L1IcacheMemory_total_misses: 0
-  system.l1_cntrl1.L1IcacheMemory_total_demand_misses: 0
-  system.l1_cntrl1.L1IcacheMemory_total_prefetches: 0
-  system.l1_cntrl1.L1IcacheMemory_total_sw_prefetches: 0
-  system.l1_cntrl1.L1IcacheMemory_total_hw_prefetches: 0
+Cache Stats: system.ruby.l1_cntrl1.L1IcacheMemory
+  system.ruby.l1_cntrl1.L1IcacheMemory_total_misses: 0
+  system.ruby.l1_cntrl1.L1IcacheMemory_total_demand_misses: 0
+  system.ruby.l1_cntrl1.L1IcacheMemory_total_prefetches: 0
+  system.ruby.l1_cntrl1.L1IcacheMemory_total_sw_prefetches: 0
+  system.ruby.l1_cntrl1.L1IcacheMemory_total_hw_prefetches: 0
 
 
-Cache Stats: system.l1_cntrl1.L1DcacheMemory
-  system.l1_cntrl1.L1DcacheMemory_total_misses: 77464
-  system.l1_cntrl1.L1DcacheMemory_total_demand_misses: 77464
-  system.l1_cntrl1.L1DcacheMemory_total_prefetches: 0
-  system.l1_cntrl1.L1DcacheMemory_total_sw_prefetches: 0
-  system.l1_cntrl1.L1DcacheMemory_total_hw_prefetches: 0
+Cache Stats: system.ruby.l1_cntrl1.L1DcacheMemory
+  system.ruby.l1_cntrl1.L1DcacheMemory_total_misses: 77464
+  system.ruby.l1_cntrl1.L1DcacheMemory_total_demand_misses: 77464
+  system.ruby.l1_cntrl1.L1DcacheMemory_total_prefetches: 0
+  system.ruby.l1_cntrl1.L1DcacheMemory_total_sw_prefetches: 0
+  system.ruby.l1_cntrl1.L1DcacheMemory_total_hw_prefetches: 0
 
-  system.l1_cntrl1.L1DcacheMemory_request_type_LD:   64.8972%
-  system.l1_cntrl1.L1DcacheMemory_request_type_ST:   35.1028%
+  system.ruby.l1_cntrl1.L1DcacheMemory_request_type_LD:   64.8972%
+  system.ruby.l1_cntrl1.L1DcacheMemory_request_type_ST:   35.1028%
 
-  system.l1_cntrl1.L1DcacheMemory_access_mode_type_Supervisor:   77464    100%
+  system.ruby.l1_cntrl1.L1DcacheMemory_access_mode_type_Supervisor:   77464    100%
 
-Cache Stats: system.l1_cntrl1.L2cacheMemory
-  system.l1_cntrl1.L2cacheMemory_total_misses: 77464
-  system.l1_cntrl1.L2cacheMemory_total_demand_misses: 77464
-  system.l1_cntrl1.L2cacheMemory_total_prefetches: 0
-  system.l1_cntrl1.L2cacheMemory_total_sw_prefetches: 0
-  system.l1_cntrl1.L2cacheMemory_total_hw_prefetches: 0
+Cache Stats: system.ruby.l1_cntrl1.L2cacheMemory
+  system.ruby.l1_cntrl1.L2cacheMemory_total_misses: 77464
+  system.ruby.l1_cntrl1.L2cacheMemory_total_demand_misses: 77464
+  system.ruby.l1_cntrl1.L2cacheMemory_total_prefetches: 0
+  system.ruby.l1_cntrl1.L2cacheMemory_total_sw_prefetches: 0
+  system.ruby.l1_cntrl1.L2cacheMemory_total_hw_prefetches: 0
 
-  system.l1_cntrl1.L2cacheMemory_request_type_LD:   64.8972%
-  system.l1_cntrl1.L2cacheMemory_request_type_ST:   35.1028%
+  system.ruby.l1_cntrl1.L2cacheMemory_request_type_LD:   64.8972%
+  system.ruby.l1_cntrl1.L2cacheMemory_request_type_ST:   35.1028%
 
-  system.l1_cntrl1.L2cacheMemory_access_mode_type_Supervisor:   77464    100%
+  system.ruby.l1_cntrl1.L2cacheMemory_access_mode_type_Supervisor:   77464    100%
 
-Cache Stats: system.l1_cntrl2.L1IcacheMemory
-  system.l1_cntrl2.L1IcacheMemory_total_misses: 0
-  system.l1_cntrl2.L1IcacheMemory_total_demand_misses: 0
-  system.l1_cntrl2.L1IcacheMemory_total_prefetches: 0
-  system.l1_cntrl2.L1IcacheMemory_total_sw_prefetches: 0
-  system.l1_cntrl2.L1IcacheMemory_total_hw_prefetches: 0
+Cache Stats: system.ruby.l1_cntrl2.L1IcacheMemory
+  system.ruby.l1_cntrl2.L1IcacheMemory_total_misses: 0
+  system.ruby.l1_cntrl2.L1IcacheMemory_total_demand_misses: 0
+  system.ruby.l1_cntrl2.L1IcacheMemory_total_prefetches: 0
+  system.ruby.l1_cntrl2.L1IcacheMemory_total_sw_prefetches: 0
+  system.ruby.l1_cntrl2.L1IcacheMemory_total_hw_prefetches: 0
 
 
-Cache Stats: system.l1_cntrl2.L1DcacheMemory
-  system.l1_cntrl2.L1DcacheMemory_total_misses: 77315
-  system.l1_cntrl2.L1DcacheMemory_total_demand_misses: 77315
-  system.l1_cntrl2.L1DcacheMemory_total_prefetches: 0
-  system.l1_cntrl2.L1DcacheMemory_total_sw_prefetches: 0
-  system.l1_cntrl2.L1DcacheMemory_total_hw_prefetches: 0
+Cache Stats: system.ruby.l1_cntrl2.L1DcacheMemory
+  system.ruby.l1_cntrl2.L1DcacheMemory_total_misses: 77315
+  system.ruby.l1_cntrl2.L1DcacheMemory_total_demand_misses: 77315
+  system.ruby.l1_cntrl2.L1DcacheMemory_total_prefetches: 0
+  system.ruby.l1_cntrl2.L1DcacheMemory_total_sw_prefetches: 0
+  system.ruby.l1_cntrl2.L1DcacheMemory_total_hw_prefetches: 0
 
-  system.l1_cntrl2.L1DcacheMemory_request_type_LD:   64.9667%
-  system.l1_cntrl2.L1DcacheMemory_request_type_ST:   35.0333%
+  system.ruby.l1_cntrl2.L1DcacheMemory_request_type_LD:   64.9667%
+  system.ruby.l1_cntrl2.L1DcacheMemory_request_type_ST:   35.0333%
 
-  system.l1_cntrl2.L1DcacheMemory_access_mode_type_Supervisor:   77315    100%
+  system.ruby.l1_cntrl2.L1DcacheMemory_access_mode_type_Supervisor:   77315    100%
 
-Cache Stats: system.l1_cntrl2.L2cacheMemory
-  system.l1_cntrl2.L2cacheMemory_total_misses: 77315
-  system.l1_cntrl2.L2cacheMemory_total_demand_misses: 77315
-  system.l1_cntrl2.L2cacheMemory_total_prefetches: 0
-  system.l1_cntrl2.L2cacheMemory_total_sw_prefetches: 0
-  system.l1_cntrl2.L2cacheMemory_total_hw_prefetches: 0
+Cache Stats: system.ruby.l1_cntrl2.L2cacheMemory
+  system.ruby.l1_cntrl2.L2cacheMemory_total_misses: 77315
+  system.ruby.l1_cntrl2.L2cacheMemory_total_demand_misses: 77315
+  system.ruby.l1_cntrl2.L2cacheMemory_total_prefetches: 0
+  system.ruby.l1_cntrl2.L2cacheMemory_total_sw_prefetches: 0
+  system.ruby.l1_cntrl2.L2cacheMemory_total_hw_prefetches: 0
 
-  system.l1_cntrl2.L2cacheMemory_request_type_LD:   64.9667%
-  system.l1_cntrl2.L2cacheMemory_request_type_ST:   35.0333%
+  system.ruby.l1_cntrl2.L2cacheMemory_request_type_LD:   64.9667%
+  system.ruby.l1_cntrl2.L2cacheMemory_request_type_ST:   35.0333%
 
-  system.l1_cntrl2.L2cacheMemory_access_mode_type_Supervisor:   77315    100%
+  system.ruby.l1_cntrl2.L2cacheMemory_access_mode_type_Supervisor:   77315    100%
 
-Cache Stats: system.l1_cntrl3.L1IcacheMemory
-  system.l1_cntrl3.L1IcacheMemory_total_misses: 0
-  system.l1_cntrl3.L1IcacheMemory_total_demand_misses: 0
-  system.l1_cntrl3.L1IcacheMemory_total_prefetches: 0
-  system.l1_cntrl3.L1IcacheMemory_total_sw_prefetches: 0
-  system.l1_cntrl3.L1IcacheMemory_total_hw_prefetches: 0
+Cache Stats: system.ruby.l1_cntrl3.L1IcacheMemory
+  system.ruby.l1_cntrl3.L1IcacheMemory_total_misses: 0
+  system.ruby.l1_cntrl3.L1IcacheMemory_total_demand_misses: 0
+  system.ruby.l1_cntrl3.L1IcacheMemory_total_prefetches: 0
+  system.ruby.l1_cntrl3.L1IcacheMemory_total_sw_prefetches: 0
+  system.ruby.l1_cntrl3.L1IcacheMemory_total_hw_prefetches: 0
 
 
-Cache Stats: system.l1_cntrl3.L1DcacheMemory
-  system.l1_cntrl3.L1DcacheMemory_total_misses: 77410
-  system.l1_cntrl3.L1DcacheMemory_total_demand_misses: 77410
-  system.l1_cntrl3.L1DcacheMemory_total_prefetches: 0
-  system.l1_cntrl3.L1DcacheMemory_total_sw_prefetches: 0
-  system.l1_cntrl3.L1DcacheMemory_total_hw_prefetches: 0
+Cache Stats: system.ruby.l1_cntrl3.L1DcacheMemory
+  system.ruby.l1_cntrl3.L1DcacheMemory_total_misses: 77410
+  system.ruby.l1_cntrl3.L1DcacheMemory_total_demand_misses: 77410
+  system.ruby.l1_cntrl3.L1DcacheMemory_total_prefetches: 0
+  system.ruby.l1_cntrl3.L1DcacheMemory_total_sw_prefetches: 0
+  system.ruby.l1_cntrl3.L1DcacheMemory_total_hw_prefetches: 0
 
-  system.l1_cntrl3.L1DcacheMemory_request_type_LD:   64.8069%
-  system.l1_cntrl3.L1DcacheMemory_request_type_ST:   35.1931%
+  system.ruby.l1_cntrl3.L1DcacheMemory_request_type_LD:   64.8069%
+  system.ruby.l1_cntrl3.L1DcacheMemory_request_type_ST:   35.1931%
 
-  system.l1_cntrl3.L1DcacheMemory_access_mode_type_Supervisor:   77410    100%
+  system.ruby.l1_cntrl3.L1DcacheMemory_access_mode_type_Supervisor:   77410    100%
 
-Cache Stats: system.l1_cntrl3.L2cacheMemory
-  system.l1_cntrl3.L2cacheMemory_total_misses: 77410
-  system.l1_cntrl3.L2cacheMemory_total_demand_misses: 77410
-  system.l1_cntrl3.L2cacheMemory_total_prefetches: 0
-  system.l1_cntrl3.L2cacheMemory_total_sw_prefetches: 0
-  system.l1_cntrl3.L2cacheMemory_total_hw_prefetches: 0
+Cache Stats: system.ruby.l1_cntrl3.L2cacheMemory
+  system.ruby.l1_cntrl3.L2cacheMemory_total_misses: 77410
+  system.ruby.l1_cntrl3.L2cacheMemory_total_demand_misses: 77410
+  system.ruby.l1_cntrl3.L2cacheMemory_total_prefetches: 0
+  system.ruby.l1_cntrl3.L2cacheMemory_total_sw_prefetches: 0
+  system.ruby.l1_cntrl3.L2cacheMemory_total_hw_prefetches: 0
 
-  system.l1_cntrl3.L2cacheMemory_request_type_LD:   64.8069%
-  system.l1_cntrl3.L2cacheMemory_request_type_ST:   35.1931%
+  system.ruby.l1_cntrl3.L2cacheMemory_request_type_LD:   64.8069%
+  system.ruby.l1_cntrl3.L2cacheMemory_request_type_ST:   35.1931%
 
-  system.l1_cntrl3.L2cacheMemory_access_mode_type_Supervisor:   77410    100%
+  system.ruby.l1_cntrl3.L2cacheMemory_access_mode_type_Supervisor:   77410    100%
 
-Cache Stats: system.l1_cntrl4.L1IcacheMemory
-  system.l1_cntrl4.L1IcacheMemory_total_misses: 0
-  system.l1_cntrl4.L1IcacheMemory_total_demand_misses: 0
-  system.l1_cntrl4.L1IcacheMemory_total_prefetches: 0
-  system.l1_cntrl4.L1IcacheMemory_total_sw_prefetches: 0
-  system.l1_cntrl4.L1IcacheMemory_total_hw_prefetches: 0
+Cache Stats: system.ruby.l1_cntrl4.L1IcacheMemory
+  system.ruby.l1_cntrl4.L1IcacheMemory_total_misses: 0
+  system.ruby.l1_cntrl4.L1IcacheMemory_total_demand_misses: 0
+  system.ruby.l1_cntrl4.L1IcacheMemory_total_prefetches: 0
+  system.ruby.l1_cntrl4.L1IcacheMemory_total_sw_prefetches: 0
+  system.ruby.l1_cntrl4.L1IcacheMemory_total_hw_prefetches: 0
 
 
-Cache Stats: system.l1_cntrl4.L1DcacheMemory
-  system.l1_cntrl4.L1DcacheMemory_total_misses: 77212
-  system.l1_cntrl4.L1DcacheMemory_total_demand_misses: 77212
-  system.l1_cntrl4.L1DcacheMemory_total_prefetches: 0
-  system.l1_cntrl4.L1DcacheMemory_total_sw_prefetches: 0
-  system.l1_cntrl4.L1DcacheMemory_total_hw_prefetches: 0
+Cache Stats: system.ruby.l1_cntrl4.L1DcacheMemory
+  system.ruby.l1_cntrl4.L1DcacheMemory_total_misses: 77212
+  system.ruby.l1_cntrl4.L1DcacheMemory_total_demand_misses: 77212
+  system.ruby.l1_cntrl4.L1DcacheMemory_total_prefetches: 0
+  system.ruby.l1_cntrl4.L1DcacheMemory_total_sw_prefetches: 0
+  system.ruby.l1_cntrl4.L1DcacheMemory_total_hw_prefetches: 0
 
-  system.l1_cntrl4.L1DcacheMemory_request_type_LD:   65.0508%
-  system.l1_cntrl4.L1DcacheMemory_request_type_ST:   34.9492%
+  system.ruby.l1_cntrl4.L1DcacheMemory_request_type_LD:   65.0508%
+  system.ruby.l1_cntrl4.L1DcacheMemory_request_type_ST:   34.9492%
 
-  system.l1_cntrl4.L1DcacheMemory_access_mode_type_Supervisor:   77212    100%
+  system.ruby.l1_cntrl4.L1DcacheMemory_access_mode_type_Supervisor:   77212    100%
 
-Cache Stats: system.l1_cntrl4.L2cacheMemory
-  system.l1_cntrl4.L2cacheMemory_total_misses: 77212
-  system.l1_cntrl4.L2cacheMemory_total_demand_misses: 77212
-  system.l1_cntrl4.L2cacheMemory_total_prefetches: 0
-  system.l1_cntrl4.L2cacheMemory_total_sw_prefetches: 0
-  system.l1_cntrl4.L2cacheMemory_total_hw_prefetches: 0
+Cache Stats: system.ruby.l1_cntrl4.L2cacheMemory
+  system.ruby.l1_cntrl4.L2cacheMemory_total_misses: 77212
+  system.ruby.l1_cntrl4.L2cacheMemory_total_demand_misses: 77212
+  system.ruby.l1_cntrl4.L2cacheMemory_total_prefetches: 0
+  system.ruby.l1_cntrl4.L2cacheMemory_total_sw_prefetches: 0
+  system.ruby.l1_cntrl4.L2cacheMemory_total_hw_prefetches: 0
 
-  system.l1_cntrl4.L2cacheMemory_request_type_LD:   65.0508%
-  system.l1_cntrl4.L2cacheMemory_request_type_ST:   34.9492%
+  system.ruby.l1_cntrl4.L2cacheMemory_request_type_LD:   65.0508%
+  system.ruby.l1_cntrl4.L2cacheMemory_request_type_ST:   34.9492%
 
-  system.l1_cntrl4.L2cacheMemory_access_mode_type_Supervisor:   77212    100%
+  system.ruby.l1_cntrl4.L2cacheMemory_access_mode_type_Supervisor:   77212    100%
 
-Cache Stats: system.l1_cntrl5.L1IcacheMemory
-  system.l1_cntrl5.L1IcacheMemory_total_misses: 0
-  system.l1_cntrl5.L1IcacheMemory_total_demand_misses: 0
-  system.l1_cntrl5.L1IcacheMemory_total_prefetches: 0
-  system.l1_cntrl5.L1IcacheMemory_total_sw_prefetches: 0
-  system.l1_cntrl5.L1IcacheMemory_total_hw_prefetches: 0
+Cache Stats: system.ruby.l1_cntrl5.L1IcacheMemory
+  system.ruby.l1_cntrl5.L1IcacheMemory_total_misses: 0
+  system.ruby.l1_cntrl5.L1IcacheMemory_total_demand_misses: 0
+  system.ruby.l1_cntrl5.L1IcacheMemory_total_prefetches: 0
+  system.ruby.l1_cntrl5.L1IcacheMemory_total_sw_prefetches: 0
+  system.ruby.l1_cntrl5.L1IcacheMemory_total_hw_prefetches: 0
 
 
-Cache Stats: system.l1_cntrl5.L1DcacheMemory
-  system.l1_cntrl5.L1DcacheMemory_total_misses: 77081
-  system.l1_cntrl5.L1DcacheMemory_total_demand_misses: 77081
-  system.l1_cntrl5.L1DcacheMemory_total_prefetches: 0
-  system.l1_cntrl5.L1DcacheMemory_total_sw_prefetches: 0
-  system.l1_cntrl5.L1DcacheMemory_total_hw_prefetches: 0
+Cache Stats: system.ruby.l1_cntrl5.L1DcacheMemory
+  system.ruby.l1_cntrl5.L1DcacheMemory_total_misses: 77081
+  system.ruby.l1_cntrl5.L1DcacheMemory_total_demand_misses: 77081
+  system.ruby.l1_cntrl5.L1DcacheMemory_total_prefetches: 0
+  system.ruby.l1_cntrl5.L1DcacheMemory_total_sw_prefetches: 0
+  system.ruby.l1_cntrl5.L1DcacheMemory_total_hw_prefetches: 0
 
-  system.l1_cntrl5.L1DcacheMemory_request_type_LD:   64.9032%
-  system.l1_cntrl5.L1DcacheMemory_request_type_ST:   35.0968%
+  system.ruby.l1_cntrl5.L1DcacheMemory_request_type_LD:   64.9032%
+  system.ruby.l1_cntrl5.L1DcacheMemory_request_type_ST:   35.0968%
 
-  system.l1_cntrl5.L1DcacheMemory_access_mode_type_Supervisor:   77081    100%
+  system.ruby.l1_cntrl5.L1DcacheMemory_access_mode_type_Supervisor:   77081    100%
 
-Cache Stats: system.l1_cntrl5.L2cacheMemory
-  system.l1_cntrl5.L2cacheMemory_total_misses: 77081
-  system.l1_cntrl5.L2cacheMemory_total_demand_misses: 77081
-  system.l1_cntrl5.L2cacheMemory_total_prefetches: 0
-  system.l1_cntrl5.L2cacheMemory_total_sw_prefetches: 0
-  system.l1_cntrl5.L2cacheMemory_total_hw_prefetches: 0
+Cache Stats: system.ruby.l1_cntrl5.L2cacheMemory
+  system.ruby.l1_cntrl5.L2cacheMemory_total_misses: 77081
+  system.ruby.l1_cntrl5.L2cacheMemory_total_demand_misses: 77081
+  system.ruby.l1_cntrl5.L2cacheMemory_total_prefetches: 0
+  system.ruby.l1_cntrl5.L2cacheMemory_total_sw_prefetches: 0
+  system.ruby.l1_cntrl5.L2cacheMemory_total_hw_prefetches: 0
 
-  system.l1_cntrl5.L2cacheMemory_request_type_LD:   64.9032%
-  system.l1_cntrl5.L2cacheMemory_request_type_ST:   35.0968%
+  system.ruby.l1_cntrl5.L2cacheMemory_request_type_LD:   64.9032%
+  system.ruby.l1_cntrl5.L2cacheMemory_request_type_ST:   35.0968%
 
-  system.l1_cntrl5.L2cacheMemory_access_mode_type_Supervisor:   77081    100%
+  system.ruby.l1_cntrl5.L2cacheMemory_access_mode_type_Supervisor:   77081    100%
 
-Cache Stats: system.l1_cntrl6.L1IcacheMemory
-  system.l1_cntrl6.L1IcacheMemory_total_misses: 0
-  system.l1_cntrl6.L1IcacheMemory_total_demand_misses: 0
-  system.l1_cntrl6.L1IcacheMemory_total_prefetches: 0
-  system.l1_cntrl6.L1IcacheMemory_total_sw_prefetches: 0
-  system.l1_cntrl6.L1IcacheMemory_total_hw_prefetches: 0
+Cache Stats: system.ruby.l1_cntrl6.L1IcacheMemory
+  system.ruby.l1_cntrl6.L1IcacheMemory_total_misses: 0
+  system.ruby.l1_cntrl6.L1IcacheMemory_total_demand_misses: 0
+  system.ruby.l1_cntrl6.L1IcacheMemory_total_prefetches: 0
+  system.ruby.l1_cntrl6.L1IcacheMemory_total_sw_prefetches: 0
+  system.ruby.l1_cntrl6.L1IcacheMemory_total_hw_prefetches: 0
 
 
-Cache Stats: system.l1_cntrl6.L1DcacheMemory
-  system.l1_cntrl6.L1DcacheMemory_total_misses: 77611
-  system.l1_cntrl6.L1DcacheMemory_total_demand_misses: 77611
-  system.l1_cntrl6.L1DcacheMemory_total_prefetches: 0
-  system.l1_cntrl6.L1DcacheMemory_total_sw_prefetches: 0
-  system.l1_cntrl6.L1DcacheMemory_total_hw_prefetches: 0
+Cache Stats: system.ruby.l1_cntrl6.L1DcacheMemory
+  system.ruby.l1_cntrl6.L1DcacheMemory_total_misses: 77611
+  system.ruby.l1_cntrl6.L1DcacheMemory_total_demand_misses: 77611
+  system.ruby.l1_cntrl6.L1DcacheMemory_total_prefetches: 0
+  system.ruby.l1_cntrl6.L1DcacheMemory_total_sw_prefetches: 0
+  system.ruby.l1_cntrl6.L1DcacheMemory_total_hw_prefetches: 0
 
-  system.l1_cntrl6.L1DcacheMemory_request_type_LD:   64.7692%
-  system.l1_cntrl6.L1DcacheMemory_request_type_ST:   35.2308%
+  system.ruby.l1_cntrl6.L1DcacheMemory_request_type_LD:   64.7692%
+  system.ruby.l1_cntrl6.L1DcacheMemory_request_type_ST:   35.2308%
 
-  system.l1_cntrl6.L1DcacheMemory_access_mode_type_Supervisor:   77611    100%
+  system.ruby.l1_cntrl6.L1DcacheMemory_access_mode_type_Supervisor:   77611    100%
 
-Cache Stats: system.l1_cntrl6.L2cacheMemory
-  system.l1_cntrl6.L2cacheMemory_total_misses: 77611
-  system.l1_cntrl6.L2cacheMemory_total_demand_misses: 77611
-  system.l1_cntrl6.L2cacheMemory_total_prefetches: 0
-  system.l1_cntrl6.L2cacheMemory_total_sw_prefetches: 0
-  system.l1_cntrl6.L2cacheMemory_total_hw_prefetches: 0
+Cache Stats: system.ruby.l1_cntrl6.L2cacheMemory
+  system.ruby.l1_cntrl6.L2cacheMemory_total_misses: 77611
+  system.ruby.l1_cntrl6.L2cacheMemory_total_demand_misses: 77611
+  system.ruby.l1_cntrl6.L2cacheMemory_total_prefetches: 0
+  system.ruby.l1_cntrl6.L2cacheMemory_total_sw_prefetches: 0
+  system.ruby.l1_cntrl6.L2cacheMemory_total_hw_prefetches: 0
 
-  system.l1_cntrl6.L2cacheMemory_request_type_LD:   64.7692%
-  system.l1_cntrl6.L2cacheMemory_request_type_ST:   35.2308%
+  system.ruby.l1_cntrl6.L2cacheMemory_request_type_LD:   64.7692%
+  system.ruby.l1_cntrl6.L2cacheMemory_request_type_ST:   35.2308%
 
-  system.l1_cntrl6.L2cacheMemory_access_mode_type_Supervisor:   77611    100%
+  system.ruby.l1_cntrl6.L2cacheMemory_access_mode_type_Supervisor:   77611    100%
 
-Cache Stats: system.l1_cntrl7.L1IcacheMemory
-  system.l1_cntrl7.L1IcacheMemory_total_misses: 0
-  system.l1_cntrl7.L1IcacheMemory_total_demand_misses: 0
-  system.l1_cntrl7.L1IcacheMemory_total_prefetches: 0
-  system.l1_cntrl7.L1IcacheMemory_total_sw_prefetches: 0
-  system.l1_cntrl7.L1IcacheMemory_total_hw_prefetches: 0
+Cache Stats: system.ruby.l1_cntrl7.L1IcacheMemory
+  system.ruby.l1_cntrl7.L1IcacheMemory_total_misses: 0
+  system.ruby.l1_cntrl7.L1IcacheMemory_total_demand_misses: 0
+  system.ruby.l1_cntrl7.L1IcacheMemory_total_prefetches: 0
+  system.ruby.l1_cntrl7.L1IcacheMemory_total_sw_prefetches: 0
+  system.ruby.l1_cntrl7.L1IcacheMemory_total_hw_prefetches: 0
 
 
-Cache Stats: system.l1_cntrl7.L1DcacheMemory
-  system.l1_cntrl7.L1DcacheMemory_total_misses: 76964
-  system.l1_cntrl7.L1DcacheMemory_total_demand_misses: 76964
-  system.l1_cntrl7.L1DcacheMemory_total_prefetches: 0
-  system.l1_cntrl7.L1DcacheMemory_total_sw_prefetches: 0
-  system.l1_cntrl7.L1DcacheMemory_total_hw_prefetches: 0
+Cache Stats: system.ruby.l1_cntrl7.L1DcacheMemory
+  system.ruby.l1_cntrl7.L1DcacheMemory_total_misses: 76964
+  system.ruby.l1_cntrl7.L1DcacheMemory_total_demand_misses: 76964
+  system.ruby.l1_cntrl7.L1DcacheMemory_total_prefetches: 0
+  system.ruby.l1_cntrl7.L1DcacheMemory_total_sw_prefetches: 0
+  system.ruby.l1_cntrl7.L1DcacheMemory_total_hw_prefetches: 0
 
-  system.l1_cntrl7.L1DcacheMemory_request_type_LD:   64.8654%
-  system.l1_cntrl7.L1DcacheMemory_request_type_ST:   35.1346%
+  system.ruby.l1_cntrl7.L1DcacheMemory_request_type_LD:   64.8654%
+  system.ruby.l1_cntrl7.L1DcacheMemory_request_type_ST:   35.1346%
 
-  system.l1_cntrl7.L1DcacheMemory_access_mode_type_Supervisor:   76964    100%
+  system.ruby.l1_cntrl7.L1DcacheMemory_access_mode_type_Supervisor:   76964    100%
 
-Cache Stats: system.l1_cntrl7.L2cacheMemory
-  system.l1_cntrl7.L2cacheMemory_total_misses: 76964
-  system.l1_cntrl7.L2cacheMemory_total_demand_misses: 76964
-  system.l1_cntrl7.L2cacheMemory_total_prefetches: 0
-  system.l1_cntrl7.L2cacheMemory_total_sw_prefetches: 0
-  system.l1_cntrl7.L2cacheMemory_total_hw_prefetches: 0
+Cache Stats: system.ruby.l1_cntrl7.L2cacheMemory
+  system.ruby.l1_cntrl7.L2cacheMemory_total_misses: 76964
+  system.ruby.l1_cntrl7.L2cacheMemory_total_demand_misses: 76964
+  system.ruby.l1_cntrl7.L2cacheMemory_total_prefetches: 0
+  system.ruby.l1_cntrl7.L2cacheMemory_total_sw_prefetches: 0
+  system.ruby.l1_cntrl7.L2cacheMemory_total_hw_prefetches: 0
 
-  system.l1_cntrl7.L2cacheMemory_request_type_LD:   64.8654%
-  system.l1_cntrl7.L2cacheMemory_request_type_ST:   35.1346%
+  system.ruby.l1_cntrl7.L2cacheMemory_request_type_LD:   64.8654%
+  system.ruby.l1_cntrl7.L2cacheMemory_request_type_ST:   35.1346%
 
-  system.l1_cntrl7.L2cacheMemory_access_mode_type_Supervisor:   76964    100%
+  system.ruby.l1_cntrl7.L2cacheMemory_access_mode_type_Supervisor:   76964    100%
 
-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: 811546
   memory_reads: 597507
   memory_writes: 214013

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 a78cf0d93c16c7b8fd1e236efa09ca872f9ba76e..6ab2ef6a1c4df57facc2630eed15681f66656ecb 100644 (file)
--- 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,159 +4,159 @@ 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                                  44806                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 419160                       # Number of bytes of host memory used
-host_seconds                                   129.36                       # Real time elapsed on the host
-system.l1_cntrl4.L1DcacheMemory.num_data_array_reads            0                       # number of data array reads
-system.l1_cntrl4.L1DcacheMemory.num_data_array_writes            0                       # number of data array writes
-system.l1_cntrl4.L1DcacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.l1_cntrl4.L1DcacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.l1_cntrl4.L1DcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.l1_cntrl4.L1DcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-system.l1_cntrl4.L1IcacheMemory.num_data_array_reads            0                       # number of data array reads
-system.l1_cntrl4.L1IcacheMemory.num_data_array_writes            0                       # number of data array writes
-system.l1_cntrl4.L1IcacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.l1_cntrl4.L1IcacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.l1_cntrl4.L1IcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.l1_cntrl4.L1IcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-system.l1_cntrl4.L2cacheMemory.num_data_array_reads            0                       # number of data array reads
-system.l1_cntrl4.L2cacheMemory.num_data_array_writes            0                       # number of data array writes
-system.l1_cntrl4.L2cacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.l1_cntrl4.L2cacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.l1_cntrl4.L2cacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.l1_cntrl4.L2cacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-system.l1_cntrl5.L1DcacheMemory.num_data_array_reads            0                       # number of data array reads
-system.l1_cntrl5.L1DcacheMemory.num_data_array_writes            0                       # number of data array writes
-system.l1_cntrl5.L1DcacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.l1_cntrl5.L1DcacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.l1_cntrl5.L1DcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.l1_cntrl5.L1DcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-system.l1_cntrl5.L1IcacheMemory.num_data_array_reads            0                       # number of data array reads
-system.l1_cntrl5.L1IcacheMemory.num_data_array_writes            0                       # number of data array writes
-system.l1_cntrl5.L1IcacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.l1_cntrl5.L1IcacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.l1_cntrl5.L1IcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.l1_cntrl5.L1IcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-system.l1_cntrl5.L2cacheMemory.num_data_array_reads            0                       # number of data array reads
-system.l1_cntrl5.L2cacheMemory.num_data_array_writes            0                       # number of data array writes
-system.l1_cntrl5.L2cacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.l1_cntrl5.L2cacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.l1_cntrl5.L2cacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.l1_cntrl5.L2cacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-system.l1_cntrl6.L1DcacheMemory.num_data_array_reads            0                       # number of data array reads
-system.l1_cntrl6.L1DcacheMemory.num_data_array_writes            0                       # number of data array writes
-system.l1_cntrl6.L1DcacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.l1_cntrl6.L1DcacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.l1_cntrl6.L1DcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.l1_cntrl6.L1DcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-system.l1_cntrl6.L1IcacheMemory.num_data_array_reads            0                       # number of data array reads
-system.l1_cntrl6.L1IcacheMemory.num_data_array_writes            0                       # number of data array writes
-system.l1_cntrl6.L1IcacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.l1_cntrl6.L1IcacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.l1_cntrl6.L1IcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.l1_cntrl6.L1IcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-system.l1_cntrl6.L2cacheMemory.num_data_array_reads            0                       # number of data array reads
-system.l1_cntrl6.L2cacheMemory.num_data_array_writes            0                       # number of data array writes
-system.l1_cntrl6.L2cacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.l1_cntrl6.L2cacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.l1_cntrl6.L2cacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.l1_cntrl6.L2cacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-system.l1_cntrl7.L1DcacheMemory.num_data_array_reads            0                       # number of data array reads
-system.l1_cntrl7.L1DcacheMemory.num_data_array_writes            0                       # number of data array writes
-system.l1_cntrl7.L1DcacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.l1_cntrl7.L1DcacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.l1_cntrl7.L1DcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.l1_cntrl7.L1DcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-system.l1_cntrl7.L1IcacheMemory.num_data_array_reads            0                       # number of data array reads
-system.l1_cntrl7.L1IcacheMemory.num_data_array_writes            0                       # number of data array writes
-system.l1_cntrl7.L1IcacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.l1_cntrl7.L1IcacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.l1_cntrl7.L1IcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.l1_cntrl7.L1IcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-system.l1_cntrl7.L2cacheMemory.num_data_array_reads            0                       # number of data array reads
-system.l1_cntrl7.L2cacheMemory.num_data_array_writes            0                       # number of data array writes
-system.l1_cntrl7.L2cacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.l1_cntrl7.L2cacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.l1_cntrl7.L2cacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.l1_cntrl7.L2cacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-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.l1_cntrl1.L1DcacheMemory.num_data_array_reads            0                       # number of data array reads
-system.l1_cntrl1.L1DcacheMemory.num_data_array_writes            0                       # number of data array writes
-system.l1_cntrl1.L1DcacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.l1_cntrl1.L1DcacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.l1_cntrl1.L1DcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.l1_cntrl1.L1DcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-system.l1_cntrl1.L1IcacheMemory.num_data_array_reads            0                       # number of data array reads
-system.l1_cntrl1.L1IcacheMemory.num_data_array_writes            0                       # number of data array writes
-system.l1_cntrl1.L1IcacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.l1_cntrl1.L1IcacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.l1_cntrl1.L1IcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.l1_cntrl1.L1IcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-system.l1_cntrl1.L2cacheMemory.num_data_array_reads            0                       # number of data array reads
-system.l1_cntrl1.L2cacheMemory.num_data_array_writes            0                       # number of data array writes
-system.l1_cntrl1.L2cacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.l1_cntrl1.L2cacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.l1_cntrl1.L2cacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.l1_cntrl1.L2cacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-system.l1_cntrl2.L1DcacheMemory.num_data_array_reads            0                       # number of data array reads
-system.l1_cntrl2.L1DcacheMemory.num_data_array_writes            0                       # number of data array writes
-system.l1_cntrl2.L1DcacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.l1_cntrl2.L1DcacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.l1_cntrl2.L1DcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.l1_cntrl2.L1DcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-system.l1_cntrl2.L1IcacheMemory.num_data_array_reads            0                       # number of data array reads
-system.l1_cntrl2.L1IcacheMemory.num_data_array_writes            0                       # number of data array writes
-system.l1_cntrl2.L1IcacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.l1_cntrl2.L1IcacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.l1_cntrl2.L1IcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.l1_cntrl2.L1IcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-system.l1_cntrl2.L2cacheMemory.num_data_array_reads            0                       # number of data array reads
-system.l1_cntrl2.L2cacheMemory.num_data_array_writes            0                       # number of data array writes
-system.l1_cntrl2.L2cacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.l1_cntrl2.L2cacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.l1_cntrl2.L2cacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.l1_cntrl2.L2cacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-system.l1_cntrl3.L1DcacheMemory.num_data_array_reads            0                       # number of data array reads
-system.l1_cntrl3.L1DcacheMemory.num_data_array_writes            0                       # number of data array writes
-system.l1_cntrl3.L1DcacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.l1_cntrl3.L1DcacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.l1_cntrl3.L1DcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.l1_cntrl3.L1DcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-system.l1_cntrl3.L1IcacheMemory.num_data_array_reads            0                       # number of data array reads
-system.l1_cntrl3.L1IcacheMemory.num_data_array_writes            0                       # number of data array writes
-system.l1_cntrl3.L1IcacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.l1_cntrl3.L1IcacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.l1_cntrl3.L1IcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.l1_cntrl3.L1IcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-system.l1_cntrl3.L2cacheMemory.num_data_array_reads            0                       # number of data array reads
-system.l1_cntrl3.L2cacheMemory.num_data_array_writes            0                       # number of data array writes
-system.l1_cntrl3.L2cacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.l1_cntrl3.L2cacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.l1_cntrl3.L2cacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.l1_cntrl3.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                                  46095                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 425996                       # Number of bytes of host memory used
+host_seconds                                   125.74                       # Real time elapsed on the host
+system.ruby.l1_cntrl4.L1DcacheMemory.num_data_array_reads            0                       # number of data array reads
+system.ruby.l1_cntrl4.L1DcacheMemory.num_data_array_writes            0                       # number of data array writes
+system.ruby.l1_cntrl4.L1DcacheMemory.num_tag_array_reads            0                       # number of tag array reads
+system.ruby.l1_cntrl4.L1DcacheMemory.num_tag_array_writes            0                       # number of tag array writes
+system.ruby.l1_cntrl4.L1DcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
+system.ruby.l1_cntrl4.L1DcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
+system.ruby.l1_cntrl4.L1IcacheMemory.num_data_array_reads            0                       # number of data array reads
+system.ruby.l1_cntrl4.L1IcacheMemory.num_data_array_writes            0                       # number of data array writes
+system.ruby.l1_cntrl4.L1IcacheMemory.num_tag_array_reads            0                       # number of tag array reads
+system.ruby.l1_cntrl4.L1IcacheMemory.num_tag_array_writes            0                       # number of tag array writes
+system.ruby.l1_cntrl4.L1IcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
+system.ruby.l1_cntrl4.L1IcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
+system.ruby.l1_cntrl4.L2cacheMemory.num_data_array_reads            0                       # number of data array reads
+system.ruby.l1_cntrl4.L2cacheMemory.num_data_array_writes            0                       # number of data array writes
+system.ruby.l1_cntrl4.L2cacheMemory.num_tag_array_reads            0                       # number of tag array reads
+system.ruby.l1_cntrl4.L2cacheMemory.num_tag_array_writes            0                       # number of tag array writes
+system.ruby.l1_cntrl4.L2cacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
+system.ruby.l1_cntrl4.L2cacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
+system.ruby.l1_cntrl5.L1DcacheMemory.num_data_array_reads            0                       # number of data array reads
+system.ruby.l1_cntrl5.L1DcacheMemory.num_data_array_writes            0                       # number of data array writes
+system.ruby.l1_cntrl5.L1DcacheMemory.num_tag_array_reads            0                       # number of tag array reads
+system.ruby.l1_cntrl5.L1DcacheMemory.num_tag_array_writes            0                       # number of tag array writes
+system.ruby.l1_cntrl5.L1DcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
+system.ruby.l1_cntrl5.L1DcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
+system.ruby.l1_cntrl5.L1IcacheMemory.num_data_array_reads            0                       # number of data array reads
+system.ruby.l1_cntrl5.L1IcacheMemory.num_data_array_writes            0                       # number of data array writes
+system.ruby.l1_cntrl5.L1IcacheMemory.num_tag_array_reads            0                       # number of tag array reads
+system.ruby.l1_cntrl5.L1IcacheMemory.num_tag_array_writes            0                       # number of tag array writes
+system.ruby.l1_cntrl5.L1IcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
+system.ruby.l1_cntrl5.L1IcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
+system.ruby.l1_cntrl5.L2cacheMemory.num_data_array_reads            0                       # number of data array reads
+system.ruby.l1_cntrl5.L2cacheMemory.num_data_array_writes            0                       # number of data array writes
+system.ruby.l1_cntrl5.L2cacheMemory.num_tag_array_reads            0                       # number of tag array reads
+system.ruby.l1_cntrl5.L2cacheMemory.num_tag_array_writes            0                       # number of tag array writes
+system.ruby.l1_cntrl5.L2cacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
+system.ruby.l1_cntrl5.L2cacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
+system.ruby.l1_cntrl6.L1DcacheMemory.num_data_array_reads            0                       # number of data array reads
+system.ruby.l1_cntrl6.L1DcacheMemory.num_data_array_writes            0                       # number of data array writes
+system.ruby.l1_cntrl6.L1DcacheMemory.num_tag_array_reads            0                       # number of tag array reads
+system.ruby.l1_cntrl6.L1DcacheMemory.num_tag_array_writes            0                       # number of tag array writes
+system.ruby.l1_cntrl6.L1DcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
+system.ruby.l1_cntrl6.L1DcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
+system.ruby.l1_cntrl6.L1IcacheMemory.num_data_array_reads            0                       # number of data array reads
+system.ruby.l1_cntrl6.L1IcacheMemory.num_data_array_writes            0                       # number of data array writes
+system.ruby.l1_cntrl6.L1IcacheMemory.num_tag_array_reads            0                       # number of tag array reads
+system.ruby.l1_cntrl6.L1IcacheMemory.num_tag_array_writes            0                       # number of tag array writes
+system.ruby.l1_cntrl6.L1IcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
+system.ruby.l1_cntrl6.L1IcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
+system.ruby.l1_cntrl6.L2cacheMemory.num_data_array_reads            0                       # number of data array reads
+system.ruby.l1_cntrl6.L2cacheMemory.num_data_array_writes            0                       # number of data array writes
+system.ruby.l1_cntrl6.L2cacheMemory.num_tag_array_reads            0                       # number of tag array reads
+system.ruby.l1_cntrl6.L2cacheMemory.num_tag_array_writes            0                       # number of tag array writes
+system.ruby.l1_cntrl6.L2cacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
+system.ruby.l1_cntrl6.L2cacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
+system.ruby.l1_cntrl7.L1DcacheMemory.num_data_array_reads            0                       # number of data array reads
+system.ruby.l1_cntrl7.L1DcacheMemory.num_data_array_writes            0                       # number of data array writes
+system.ruby.l1_cntrl7.L1DcacheMemory.num_tag_array_reads            0                       # number of tag array reads
+system.ruby.l1_cntrl7.L1DcacheMemory.num_tag_array_writes            0                       # number of tag array writes
+system.ruby.l1_cntrl7.L1DcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
+system.ruby.l1_cntrl7.L1DcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
+system.ruby.l1_cntrl7.L1IcacheMemory.num_data_array_reads            0                       # number of data array reads
+system.ruby.l1_cntrl7.L1IcacheMemory.num_data_array_writes            0                       # number of data array writes
+system.ruby.l1_cntrl7.L1IcacheMemory.num_tag_array_reads            0                       # number of tag array reads
+system.ruby.l1_cntrl7.L1IcacheMemory.num_tag_array_writes            0                       # number of tag array writes
+system.ruby.l1_cntrl7.L1IcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
+system.ruby.l1_cntrl7.L1IcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
+system.ruby.l1_cntrl7.L2cacheMemory.num_data_array_reads            0                       # number of data array reads
+system.ruby.l1_cntrl7.L2cacheMemory.num_data_array_writes            0                       # number of data array writes
+system.ruby.l1_cntrl7.L2cacheMemory.num_tag_array_reads            0                       # number of tag array reads
+system.ruby.l1_cntrl7.L2cacheMemory.num_tag_array_writes            0                       # number of tag array writes
+system.ruby.l1_cntrl7.L2cacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
+system.ruby.l1_cntrl7.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.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.l1_cntrl1.L1DcacheMemory.num_data_array_reads            0                       # number of data array reads
+system.ruby.l1_cntrl1.L1DcacheMemory.num_data_array_writes            0                       # number of data array writes
+system.ruby.l1_cntrl1.L1DcacheMemory.num_tag_array_reads            0                       # number of tag array reads
+system.ruby.l1_cntrl1.L1DcacheMemory.num_tag_array_writes            0                       # number of tag array writes
+system.ruby.l1_cntrl1.L1DcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
+system.ruby.l1_cntrl1.L1DcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
+system.ruby.l1_cntrl1.L1IcacheMemory.num_data_array_reads            0                       # number of data array reads
+system.ruby.l1_cntrl1.L1IcacheMemory.num_data_array_writes            0                       # number of data array writes
+system.ruby.l1_cntrl1.L1IcacheMemory.num_tag_array_reads            0                       # number of tag array reads
+system.ruby.l1_cntrl1.L1IcacheMemory.num_tag_array_writes            0                       # number of tag array writes
+system.ruby.l1_cntrl1.L1IcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
+system.ruby.l1_cntrl1.L1IcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
+system.ruby.l1_cntrl1.L2cacheMemory.num_data_array_reads            0                       # number of data array reads
+system.ruby.l1_cntrl1.L2cacheMemory.num_data_array_writes            0                       # number of data array writes
+system.ruby.l1_cntrl1.L2cacheMemory.num_tag_array_reads            0                       # number of tag array reads
+system.ruby.l1_cntrl1.L2cacheMemory.num_tag_array_writes            0                       # number of tag array writes
+system.ruby.l1_cntrl1.L2cacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
+system.ruby.l1_cntrl1.L2cacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
+system.ruby.l1_cntrl2.L1DcacheMemory.num_data_array_reads            0                       # number of data array reads
+system.ruby.l1_cntrl2.L1DcacheMemory.num_data_array_writes            0                       # number of data array writes
+system.ruby.l1_cntrl2.L1DcacheMemory.num_tag_array_reads            0                       # number of tag array reads
+system.ruby.l1_cntrl2.L1DcacheMemory.num_tag_array_writes            0                       # number of tag array writes
+system.ruby.l1_cntrl2.L1DcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
+system.ruby.l1_cntrl2.L1DcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
+system.ruby.l1_cntrl2.L1IcacheMemory.num_data_array_reads            0                       # number of data array reads
+system.ruby.l1_cntrl2.L1IcacheMemory.num_data_array_writes            0                       # number of data array writes
+system.ruby.l1_cntrl2.L1IcacheMemory.num_tag_array_reads            0                       # number of tag array reads
+system.ruby.l1_cntrl2.L1IcacheMemory.num_tag_array_writes            0                       # number of tag array writes
+system.ruby.l1_cntrl2.L1IcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
+system.ruby.l1_cntrl2.L1IcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
+system.ruby.l1_cntrl2.L2cacheMemory.num_data_array_reads            0                       # number of data array reads
+system.ruby.l1_cntrl2.L2cacheMemory.num_data_array_writes            0                       # number of data array writes
+system.ruby.l1_cntrl2.L2cacheMemory.num_tag_array_reads            0                       # number of tag array reads
+system.ruby.l1_cntrl2.L2cacheMemory.num_tag_array_writes            0                       # number of tag array writes
+system.ruby.l1_cntrl2.L2cacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
+system.ruby.l1_cntrl2.L2cacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
+system.ruby.l1_cntrl3.L1DcacheMemory.num_data_array_reads            0                       # number of data array reads
+system.ruby.l1_cntrl3.L1DcacheMemory.num_data_array_writes            0                       # number of data array writes
+system.ruby.l1_cntrl3.L1DcacheMemory.num_tag_array_reads            0                       # number of tag array reads
+system.ruby.l1_cntrl3.L1DcacheMemory.num_tag_array_writes            0                       # number of tag array writes
+system.ruby.l1_cntrl3.L1DcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
+system.ruby.l1_cntrl3.L1DcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
+system.ruby.l1_cntrl3.L1IcacheMemory.num_data_array_reads            0                       # number of data array reads
+system.ruby.l1_cntrl3.L1IcacheMemory.num_data_array_writes            0                       # number of data array writes
+system.ruby.l1_cntrl3.L1IcacheMemory.num_tag_array_reads            0                       # number of tag array reads
+system.ruby.l1_cntrl3.L1IcacheMemory.num_tag_array_writes            0                       # number of tag array writes
+system.ruby.l1_cntrl3.L1IcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
+system.ruby.l1_cntrl3.L1IcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
+system.ruby.l1_cntrl3.L2cacheMemory.num_data_array_reads            0                       # number of data array reads
+system.ruby.l1_cntrl3.L2cacheMemory.num_data_array_writes            0                       # number of data array writes
+system.ruby.l1_cntrl3.L2cacheMemory.num_tag_array_reads            0                       # number of tag array reads
+system.ruby.l1_cntrl3.L2cacheMemory.num_tag_array_writes            0                       # number of tag array writes
+system.ruby.l1_cntrl3.L2cacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
+system.ruby.l1_cntrl3.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
 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 5c4e71e11ca3d82aa922ede212c4c31f822a2b07..8fc3158b8a85289f38c54a11b52b3a9178852336 100644 (file)
--- 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
@@ -8,14 +8,15 @@ time_sync_spin_threshold=100000
 
 [system]
 type=System
-children=cpu0 cpu1 cpu2 cpu3 cpu4 cpu5 cpu6 cpu7 dir_cntrl0 funcbus funcmem l1_cntrl0 l1_cntrl1 l1_cntrl2 l1_cntrl3 l1_cntrl4 l1_cntrl5 l1_cntrl6 l1_cntrl7 physmem ruby sys_port_proxy
+children=cpu0 cpu1 cpu2 cpu3 cpu4 cpu5 cpu6 cpu7 funcbus funcmem physmem ruby sys_port_proxy
 boot_osflags=a
 clock=1
 init_param=0
 kernel=
 load_addr_mask=1099511627775
 mem_mode=timing
-memories=system.physmem system.funcmem
+mem_ranges=
+memories=system.funcmem system.physmem
 num_work_ids=16
 readfile=
 symbolfile=
@@ -45,7 +46,7 @@ suppress_func_warnings=true
 sys=system
 trace_addr=0
 functional=system.funcbus.slave[0]
-test=system.l1_cntrl0.sequencer.slave[0]
+test=system.ruby.l1_cntrl0.sequencer.slave[0]
 
 [system.cpu1]
 type=MemTest
@@ -64,7 +65,7 @@ suppress_func_warnings=true
 sys=system
 trace_addr=0
 functional=system.funcbus.slave[1]
-test=system.l1_cntrl1.sequencer.slave[0]
+test=system.ruby.l1_cntrl1.sequencer.slave[0]
 
 [system.cpu2]
 type=MemTest
@@ -83,7 +84,7 @@ suppress_func_warnings=true
 sys=system
 trace_addr=0
 functional=system.funcbus.slave[2]
-test=system.l1_cntrl2.sequencer.slave[0]
+test=system.ruby.l1_cntrl2.sequencer.slave[0]
 
 [system.cpu3]
 type=MemTest
@@ -102,7 +103,7 @@ suppress_func_warnings=true
 sys=system
 trace_addr=0
 functional=system.funcbus.slave[3]
-test=system.l1_cntrl3.sequencer.slave[0]
+test=system.ruby.l1_cntrl3.sequencer.slave[0]
 
 [system.cpu4]
 type=MemTest
@@ -121,7 +122,7 @@ suppress_func_warnings=true
 sys=system
 trace_addr=0
 functional=system.funcbus.slave[4]
-test=system.l1_cntrl4.sequencer.slave[0]
+test=system.ruby.l1_cntrl4.sequencer.slave[0]
 
 [system.cpu5]
 type=MemTest
@@ -140,7 +141,7 @@ suppress_func_warnings=true
 sys=system
 trace_addr=0
 functional=system.funcbus.slave[5]
-test=system.l1_cntrl5.sequencer.slave[0]
+test=system.ruby.l1_cntrl5.sequencer.slave[0]
 
 [system.cpu6]
 type=MemTest
@@ -159,7 +160,7 @@ suppress_func_warnings=true
 sys=system
 trace_addr=0
 functional=system.funcbus.slave[6]
-test=system.l1_cntrl6.sequencer.slave[0]
+test=system.ruby.l1_cntrl6.sequencer.slave[0]
 
 [system.cpu7]
 type=MemTest
@@ -178,23 +179,70 @@ suppress_func_warnings=true
 sys=system
 trace_addr=0
 functional=system.funcbus.slave[7]
-test=system.l1_cntrl7.sequencer.slave[0]
+test=system.ruby.l1_cntrl7.sequencer.slave[0]
 
-[system.dir_cntrl0]
+[system.funcbus]
+type=NoncoherentBus
+block_size=64
+clock=1
+header_cycles=1
+use_default_range=false
+width=8
+master=system.funcmem.port
+slave=system.cpu0.functional system.cpu1.functional system.cpu2.functional system.cpu3.functional system.cpu4.functional system.cpu5.functional system.cpu6.functional system.cpu7.functional
+
+[system.funcmem]
+type=SimpleMemory
+bandwidth=0.000000
+clock=1
+conf_table_reported=false
+in_addr_map=false
+latency=30
+latency_var=0
+null=false
+range=0:134217727
+zero=false
+port=system.funcbus.master[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=dir_cntrl0 l1_cntrl0 l1_cntrl1 l1_cntrl2 l1_cntrl3 l1_cntrl4 l1_cntrl5 l1_cntrl6 l1_cntrl7 network profiler
+block_size_bytes=64
+clock=1
+mem_size=268435456
+no_mem_vec=false
+random_seed=1234
+randomization=false
+stats_filename=ruby.stats
+
+[system.ruby.dir_cntrl0]
 type=Directory_Controller
 children=directory memBuffer
 buffer_size=0
+clock=1
 cntrl_id=8
-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=5
@@ -202,7 +250,7 @@ size=268435456
 use_map=false
 version=0
 
-[system.dir_cntrl0.memBuffer]
+[system.ruby.dir_cntrl0.memBuffer]
 type=RubyMemoryControl
 bank_bit_0=8
 bank_busy_time=11
@@ -224,46 +272,24 @@ ruby_system=system.ruby
 tFaw=0
 version=0
 
-[system.funcbus]
-type=NoncoherentBus
-block_size=64
-clock=1
-header_cycles=1
-use_default_range=false
-width=8
-master=system.funcmem.port
-slave=system.cpu0.functional system.cpu1.functional system.cpu2.functional system.cpu3.functional system.cpu4.functional system.cpu5.functional system.cpu6.functional system.cpu7.functional
-
-[system.funcmem]
-type=SimpleMemory
-bandwidth=0.000000
-clock=1
-conf_table_reported=false
-in_addr_map=false
-latency=30
-latency_var=0
-null=false
-range=0:134217727
-zero=false
-port=system.funcbus.master[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
@@ -277,13 +303,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=1000000
-icache=system.l1_cntrl0.cacheMemory
+icache=system.ruby.l1_cntrl0.cacheMemory
 max_outstanding_requests=16
 ruby_system=system.ruby
 support_data_reqs=true
@@ -294,23 +320,24 @@ using_ruby_tester=false
 version=0
 slave=system.cpu0.test
 
-[system.l1_cntrl1]
+[system.ruby.l1_cntrl1]
 type=L1Cache_Controller
 children=cacheMemory sequencer
 buffer_size=0
-cacheMemory=system.l1_cntrl1.cacheMemory
+cacheMemory=system.ruby.l1_cntrl1.cacheMemory
 cache_response_latency=12
+clock=1
 cntrl_id=1
 issue_latency=2
 number_of_TBEs=256
 recycle_latency=10
 ruby_system=system.ruby
 send_evictions=false
-sequencer=system.l1_cntrl1.sequencer
+sequencer=system.ruby.l1_cntrl1.sequencer
 transitions_per_cycle=32
 version=1
 
-[system.l1_cntrl1.cacheMemory]
+[system.ruby.l1_cntrl1.cacheMemory]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -324,13 +351,13 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.l1_cntrl1.sequencer]
+[system.ruby.l1_cntrl1.sequencer]
 type=RubySequencer
 access_phys_mem=false
 clock=1
-dcache=system.l1_cntrl1.cacheMemory
+dcache=system.ruby.l1_cntrl1.cacheMemory
 deadlock_threshold=1000000
-icache=system.l1_cntrl1.cacheMemory
+icache=system.ruby.l1_cntrl1.cacheMemory
 max_outstanding_requests=16
 ruby_system=system.ruby
 support_data_reqs=true
@@ -341,23 +368,24 @@ using_ruby_tester=false
 version=1
 slave=system.cpu1.test
 
-[system.l1_cntrl2]
+[system.ruby.l1_cntrl2]
 type=L1Cache_Controller
 children=cacheMemory sequencer
 buffer_size=0
-cacheMemory=system.l1_cntrl2.cacheMemory
+cacheMemory=system.ruby.l1_cntrl2.cacheMemory
 cache_response_latency=12
+clock=1
 cntrl_id=2
 issue_latency=2
 number_of_TBEs=256
 recycle_latency=10
 ruby_system=system.ruby
 send_evictions=false
-sequencer=system.l1_cntrl2.sequencer
+sequencer=system.ruby.l1_cntrl2.sequencer
 transitions_per_cycle=32
 version=2
 
-[system.l1_cntrl2.cacheMemory]
+[system.ruby.l1_cntrl2.cacheMemory]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -371,13 +399,13 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.l1_cntrl2.sequencer]
+[system.ruby.l1_cntrl2.sequencer]
 type=RubySequencer
 access_phys_mem=false
 clock=1
-dcache=system.l1_cntrl2.cacheMemory
+dcache=system.ruby.l1_cntrl2.cacheMemory
 deadlock_threshold=1000000
-icache=system.l1_cntrl2.cacheMemory
+icache=system.ruby.l1_cntrl2.cacheMemory
 max_outstanding_requests=16
 ruby_system=system.ruby
 support_data_reqs=true
@@ -388,23 +416,24 @@ using_ruby_tester=false
 version=2
 slave=system.cpu2.test
 
-[system.l1_cntrl3]
+[system.ruby.l1_cntrl3]
 type=L1Cache_Controller
 children=cacheMemory sequencer
 buffer_size=0
-cacheMemory=system.l1_cntrl3.cacheMemory
+cacheMemory=system.ruby.l1_cntrl3.cacheMemory
 cache_response_latency=12
+clock=1
 cntrl_id=3
 issue_latency=2
 number_of_TBEs=256
 recycle_latency=10
 ruby_system=system.ruby
 send_evictions=false
-sequencer=system.l1_cntrl3.sequencer
+sequencer=system.ruby.l1_cntrl3.sequencer
 transitions_per_cycle=32
 version=3
 
-[system.l1_cntrl3.cacheMemory]
+[system.ruby.l1_cntrl3.cacheMemory]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -418,13 +447,13 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.l1_cntrl3.sequencer]
+[system.ruby.l1_cntrl3.sequencer]
 type=RubySequencer
 access_phys_mem=false
 clock=1
-dcache=system.l1_cntrl3.cacheMemory
+dcache=system.ruby.l1_cntrl3.cacheMemory
 deadlock_threshold=1000000
-icache=system.l1_cntrl3.cacheMemory
+icache=system.ruby.l1_cntrl3.cacheMemory
 max_outstanding_requests=16
 ruby_system=system.ruby
 support_data_reqs=true
@@ -435,23 +464,24 @@ using_ruby_tester=false
 version=3
 slave=system.cpu3.test
 
-[system.l1_cntrl4]
+[system.ruby.l1_cntrl4]
 type=L1Cache_Controller
 children=cacheMemory sequencer
 buffer_size=0
-cacheMemory=system.l1_cntrl4.cacheMemory
+cacheMemory=system.ruby.l1_cntrl4.cacheMemory
 cache_response_latency=12
+clock=1
 cntrl_id=4
 issue_latency=2
 number_of_TBEs=256
 recycle_latency=10
 ruby_system=system.ruby
 send_evictions=false
-sequencer=system.l1_cntrl4.sequencer
+sequencer=system.ruby.l1_cntrl4.sequencer
 transitions_per_cycle=32
 version=4
 
-[system.l1_cntrl4.cacheMemory]
+[system.ruby.l1_cntrl4.cacheMemory]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -465,13 +495,13 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.l1_cntrl4.sequencer]
+[system.ruby.l1_cntrl4.sequencer]
 type=RubySequencer
 access_phys_mem=false
 clock=1
-dcache=system.l1_cntrl4.cacheMemory
+dcache=system.ruby.l1_cntrl4.cacheMemory
 deadlock_threshold=1000000
-icache=system.l1_cntrl4.cacheMemory
+icache=system.ruby.l1_cntrl4.cacheMemory
 max_outstanding_requests=16
 ruby_system=system.ruby
 support_data_reqs=true
@@ -482,23 +512,24 @@ using_ruby_tester=false
 version=4
 slave=system.cpu4.test
 
-[system.l1_cntrl5]
+[system.ruby.l1_cntrl5]
 type=L1Cache_Controller
 children=cacheMemory sequencer
 buffer_size=0
-cacheMemory=system.l1_cntrl5.cacheMemory
+cacheMemory=system.ruby.l1_cntrl5.cacheMemory
 cache_response_latency=12
+clock=1
 cntrl_id=5
 issue_latency=2
 number_of_TBEs=256
 recycle_latency=10
 ruby_system=system.ruby
 send_evictions=false
-sequencer=system.l1_cntrl5.sequencer
+sequencer=system.ruby.l1_cntrl5.sequencer
 transitions_per_cycle=32
 version=5
 
-[system.l1_cntrl5.cacheMemory]
+[system.ruby.l1_cntrl5.cacheMemory]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -512,13 +543,13 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.l1_cntrl5.sequencer]
+[system.ruby.l1_cntrl5.sequencer]
 type=RubySequencer
 access_phys_mem=false
 clock=1
-dcache=system.l1_cntrl5.cacheMemory
+dcache=system.ruby.l1_cntrl5.cacheMemory
 deadlock_threshold=1000000
-icache=system.l1_cntrl5.cacheMemory
+icache=system.ruby.l1_cntrl5.cacheMemory
 max_outstanding_requests=16
 ruby_system=system.ruby
 support_data_reqs=true
@@ -529,23 +560,24 @@ using_ruby_tester=false
 version=5
 slave=system.cpu5.test
 
-[system.l1_cntrl6]
+[system.ruby.l1_cntrl6]
 type=L1Cache_Controller
 children=cacheMemory sequencer
 buffer_size=0
-cacheMemory=system.l1_cntrl6.cacheMemory
+cacheMemory=system.ruby.l1_cntrl6.cacheMemory
 cache_response_latency=12
+clock=1
 cntrl_id=6
 issue_latency=2
 number_of_TBEs=256
 recycle_latency=10
 ruby_system=system.ruby
 send_evictions=false
-sequencer=system.l1_cntrl6.sequencer
+sequencer=system.ruby.l1_cntrl6.sequencer
 transitions_per_cycle=32
 version=6
 
-[system.l1_cntrl6.cacheMemory]
+[system.ruby.l1_cntrl6.cacheMemory]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -559,13 +591,13 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.l1_cntrl6.sequencer]
+[system.ruby.l1_cntrl6.sequencer]
 type=RubySequencer
 access_phys_mem=false
 clock=1
-dcache=system.l1_cntrl6.cacheMemory
+dcache=system.ruby.l1_cntrl6.cacheMemory
 deadlock_threshold=1000000
-icache=system.l1_cntrl6.cacheMemory
+icache=system.ruby.l1_cntrl6.cacheMemory
 max_outstanding_requests=16
 ruby_system=system.ruby
 support_data_reqs=true
@@ -576,23 +608,24 @@ using_ruby_tester=false
 version=6
 slave=system.cpu6.test
 
-[system.l1_cntrl7]
+[system.ruby.l1_cntrl7]
 type=L1Cache_Controller
 children=cacheMemory sequencer
 buffer_size=0
-cacheMemory=system.l1_cntrl7.cacheMemory
+cacheMemory=system.ruby.l1_cntrl7.cacheMemory
 cache_response_latency=12
+clock=1
 cntrl_id=7
 issue_latency=2
 number_of_TBEs=256
 recycle_latency=10
 ruby_system=system.ruby
 send_evictions=false
-sequencer=system.l1_cntrl7.sequencer
+sequencer=system.ruby.l1_cntrl7.sequencer
 transitions_per_cycle=32
 version=7
 
-[system.l1_cntrl7.cacheMemory]
+[system.ruby.l1_cntrl7.cacheMemory]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -606,13 +639,13 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.l1_cntrl7.sequencer]
+[system.ruby.l1_cntrl7.sequencer]
 type=RubySequencer
 access_phys_mem=false
 clock=1
-dcache=system.l1_cntrl7.cacheMemory
+dcache=system.ruby.l1_cntrl7.cacheMemory
 deadlock_threshold=1000000
-icache=system.l1_cntrl7.cacheMemory
+icache=system.ruby.l1_cntrl7.cacheMemory
 max_outstanding_requests=16
 ruby_system=system.ruby
 support_data_reqs=true
@@ -623,34 +656,12 @@ using_ruby_tester=false
 version=7
 slave=system.cpu7.test
 
-[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=268435456
-no_mem_vec=false
-random_seed=1234
-randomization=false
-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
@@ -670,7 +681,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
@@ -678,6 +689,7 @@ weight=1
 
 [system.ruby.network.topology.ext_links0.int_node]
 type=Switch
+clock=1
 router_id=0
 virt_nets=10
 
@@ -685,7 +697,7 @@ virt_nets=10
 type=SimpleExtLink
 children=int_node
 bandwidth_factor=16
-ext_node=system.l1_cntrl1
+ext_node=system.ruby.l1_cntrl1
 int_node=system.ruby.network.topology.ext_links1.int_node
 latency=1
 link_id=1
@@ -693,6 +705,7 @@ weight=1
 
 [system.ruby.network.topology.ext_links1.int_node]
 type=Switch
+clock=1
 router_id=1
 virt_nets=10
 
@@ -700,7 +713,7 @@ virt_nets=10
 type=SimpleExtLink
 children=int_node
 bandwidth_factor=16
-ext_node=system.l1_cntrl2
+ext_node=system.ruby.l1_cntrl2
 int_node=system.ruby.network.topology.ext_links2.int_node
 latency=1
 link_id=2
@@ -708,6 +721,7 @@ weight=1
 
 [system.ruby.network.topology.ext_links2.int_node]
 type=Switch
+clock=1
 router_id=2
 virt_nets=10
 
@@ -715,7 +729,7 @@ virt_nets=10
 type=SimpleExtLink
 children=int_node
 bandwidth_factor=16
-ext_node=system.l1_cntrl3
+ext_node=system.ruby.l1_cntrl3
 int_node=system.ruby.network.topology.ext_links3.int_node
 latency=1
 link_id=3
@@ -723,6 +737,7 @@ weight=1
 
 [system.ruby.network.topology.ext_links3.int_node]
 type=Switch
+clock=1
 router_id=3
 virt_nets=10
 
@@ -730,7 +745,7 @@ virt_nets=10
 type=SimpleExtLink
 children=int_node
 bandwidth_factor=16
-ext_node=system.l1_cntrl4
+ext_node=system.ruby.l1_cntrl4
 int_node=system.ruby.network.topology.ext_links4.int_node
 latency=1
 link_id=4
@@ -738,6 +753,7 @@ weight=1
 
 [system.ruby.network.topology.ext_links4.int_node]
 type=Switch
+clock=1
 router_id=4
 virt_nets=10
 
@@ -745,7 +761,7 @@ virt_nets=10
 type=SimpleExtLink
 children=int_node
 bandwidth_factor=16
-ext_node=system.l1_cntrl5
+ext_node=system.ruby.l1_cntrl5
 int_node=system.ruby.network.topology.ext_links5.int_node
 latency=1
 link_id=5
@@ -753,6 +769,7 @@ weight=1
 
 [system.ruby.network.topology.ext_links5.int_node]
 type=Switch
+clock=1
 router_id=5
 virt_nets=10
 
@@ -760,7 +777,7 @@ virt_nets=10
 type=SimpleExtLink
 children=int_node
 bandwidth_factor=16
-ext_node=system.l1_cntrl6
+ext_node=system.ruby.l1_cntrl6
 int_node=system.ruby.network.topology.ext_links6.int_node
 latency=1
 link_id=6
@@ -768,6 +785,7 @@ weight=1
 
 [system.ruby.network.topology.ext_links6.int_node]
 type=Switch
+clock=1
 router_id=6
 virt_nets=10
 
@@ -775,7 +793,7 @@ virt_nets=10
 type=SimpleExtLink
 children=int_node
 bandwidth_factor=16
-ext_node=system.l1_cntrl7
+ext_node=system.ruby.l1_cntrl7
 int_node=system.ruby.network.topology.ext_links7.int_node
 latency=1
 link_id=7
@@ -783,6 +801,7 @@ weight=1
 
 [system.ruby.network.topology.ext_links7.int_node]
 type=Switch
+clock=1
 router_id=7
 virt_nets=10
 
@@ -790,7 +809,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_links8.int_node
 latency=1
 link_id=8
@@ -798,6 +817,7 @@ weight=1
 
 [system.ruby.network.topology.ext_links8.int_node]
 type=Switch
+clock=1
 router_id=8
 virt_nets=10
 
@@ -813,6 +833,7 @@ weight=1
 
 [system.ruby.network.topology.int_links0.node_b]
 type=Switch
+clock=1
 router_id=9
 virt_nets=10
 

diff --git a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby/ruby.stats b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby/ruby.stats
index 60c6f8070b454ec087e1bb38a579cb2a9eecd307..1eaf6be73ada4704a65ad4f589a232e1cb02c5ad 100644 (file)
--- a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby/ruby.stats
+++ b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby/ruby.stats
@@ -1,24 +1,24 @@
-Real time: Nov/10/2012 16:33:28
+Real time: Jan/14/2013 08:13:32
 
 Profiler Stats
 --------------
-Elapsed_time_in_seconds: 47
-Elapsed_time_in_minutes: 0.783333
-Elapsed_time_in_hours: 0.0130556
-Elapsed_time_in_days: 0.000543981
+Elapsed_time_in_seconds: 46
+Elapsed_time_in_minutes: 0.766667
+Elapsed_time_in_hours: 0.0127778
+Elapsed_time_in_days: 0.000532407
 
-Virtual_time_in_seconds: 46.6
-Virtual_time_in_minutes: 0.776667
-Virtual_time_in_hours:   0.0129444
-Virtual_time_in_days:    0.000539352
+Virtual_time_in_seconds: 46.4
+Virtual_time_in_minutes: 0.773333
+Virtual_time_in_hours:   0.0128889
+Virtual_time_in_days:    0.000537037
 
 Ruby_current_time: 8664886
 Ruby_start_time: 0
 Ruby_cycles: 8664886
 
-mbytes_resident: 70.3164
-mbytes_total: 408.891
-resident_ratio: 0.171978
+mbytes_resident: 70.9336
+mbytes_total: 415.473
+resident_ratio: 0.170758
 
 ruby_cycles_executed: [ 8664887 8664887 8664887 8664887 8664887 8664887 8664887 8664887 ]
 
@@ -84,7 +84,7 @@ Resource Usage
 page_size: 4096
 user_time: 46
 system_time: 0
-page_reclaims: 9935
+page_reclaims: 10183
 page_faults: 0
 swaps: 0
 block_inputs: 0
@@ -238,17 +238,17 @@ links_utilized_percent_switch_9: 7.88828
   outgoing_messages_switch_9_link_8_Control: 617562 4940496 [ 0 0 617562 0 0 0 0 0 0 0 ] base_latency: 1
   outgoing_messages_switch_9_link_8_Data: 611948 44060256 [ 0 0 611948 0 0 0 0 0 0 0 ] base_latency: 1
 
-Cache Stats: system.l1_cntrl0.cacheMemory
-  system.l1_cntrl0.cacheMemory_total_misses: 77377
-  system.l1_cntrl0.cacheMemory_total_demand_misses: 77377
-  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: 77377
+  system.ruby.l1_cntrl0.cacheMemory_total_demand_misses: 77377
+  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:   65.0969%
-  system.l1_cntrl0.cacheMemory_request_type_ST:   34.9031%
+  system.ruby.l1_cntrl0.cacheMemory_request_type_LD:   65.0969%
+  system.ruby.l1_cntrl0.cacheMemory_request_type_ST:   34.9031%
 
-  system.l1_cntrl0.cacheMemory_access_mode_type_Supervisor:   77377    100%
+  system.ruby.l1_cntrl0.cacheMemory_access_mode_type_Supervisor:   77377    100%
 
  --- L1Cache ---
  - Event Counts -
@@ -289,91 +289,91 @@ IS  Data [50002 50301 50278 50576 50370 50258 50035 49669 ] 401489
 
 IM  Data [27327 27084 27074 26701 27005 26934 26786 27152 ] 216063
 
-Cache Stats: system.l1_cntrl1.cacheMemory
-  system.l1_cntrl1.cacheMemory_total_misses: 77193
-  system.l1_cntrl1.cacheMemory_total_demand_misses: 77193
-  system.l1_cntrl1.cacheMemory_total_prefetches: 0
-  system.l1_cntrl1.cacheMemory_total_sw_prefetches: 0
-  system.l1_cntrl1.cacheMemory_total_hw_prefetches: 0
+Cache Stats: system.ruby.l1_cntrl1.cacheMemory
+  system.ruby.l1_cntrl1.cacheMemory_total_misses: 77193
+  system.ruby.l1_cntrl1.cacheMemory_total_demand_misses: 77193
+  system.ruby.l1_cntrl1.cacheMemory_total_prefetches: 0
+  system.ruby.l1_cntrl1.cacheMemory_total_sw_prefetches: 0
+  system.ruby.l1_cntrl1.cacheMemory_total_hw_prefetches: 0
 
-  system.l1_cntrl1.cacheMemory_request_type_LD:   65.1069%
-  system.l1_cntrl1.cacheMemory_request_type_ST:   34.8931%
+  system.ruby.l1_cntrl1.cacheMemory_request_type_LD:   65.1069%
+  system.ruby.l1_cntrl1.cacheMemory_request_type_ST:   34.8931%
 
-  system.l1_cntrl1.cacheMemory_access_mode_type_Supervisor:   77193    100%
+  system.ruby.l1_cntrl1.cacheMemory_access_mode_type_Supervisor:   77193    100%
 
-Cache Stats: system.l1_cntrl2.cacheMemory
-  system.l1_cntrl2.cacheMemory_total_misses: 76824
-  system.l1_cntrl2.cacheMemory_total_demand_misses: 76824
-  system.l1_cntrl2.cacheMemory_total_prefetches: 0
-  system.l1_cntrl2.cacheMemory_total_sw_prefetches: 0
-  system.l1_cntrl2.cacheMemory_total_hw_prefetches: 0
+Cache Stats: system.ruby.l1_cntrl2.cacheMemory
+  system.ruby.l1_cntrl2.cacheMemory_total_misses: 76824
+  system.ruby.l1_cntrl2.cacheMemory_total_demand_misses: 76824
+  system.ruby.l1_cntrl2.cacheMemory_total_prefetches: 0
+  system.ruby.l1_cntrl2.cacheMemory_total_sw_prefetches: 0
+  system.ruby.l1_cntrl2.cacheMemory_total_hw_prefetches: 0
 
-  system.l1_cntrl2.cacheMemory_request_type_LD:   65.132%
-  system.l1_cntrl2.cacheMemory_request_type_ST:   34.868%
+  system.ruby.l1_cntrl2.cacheMemory_request_type_LD:   65.132%
+  system.ruby.l1_cntrl2.cacheMemory_request_type_ST:   34.868%
 
-  system.l1_cntrl2.cacheMemory_access_mode_type_Supervisor:   76824    100%
+  system.ruby.l1_cntrl2.cacheMemory_access_mode_type_Supervisor:   76824    100%
 
-Cache Stats: system.l1_cntrl3.cacheMemory
-  system.l1_cntrl3.cacheMemory_total_misses: 76825
-  system.l1_cntrl3.cacheMemory_total_demand_misses: 76825
-  system.l1_cntrl3.cacheMemory_total_prefetches: 0
-  system.l1_cntrl3.cacheMemory_total_sw_prefetches: 0
-  system.l1_cntrl3.cacheMemory_total_hw_prefetches: 0
+Cache Stats: system.ruby.l1_cntrl3.cacheMemory
+  system.ruby.l1_cntrl3.cacheMemory_total_misses: 76825
+  system.ruby.l1_cntrl3.cacheMemory_total_demand_misses: 76825
+  system.ruby.l1_cntrl3.cacheMemory_total_prefetches: 0
+  system.ruby.l1_cntrl3.cacheMemory_total_sw_prefetches: 0
+  system.ruby.l1_cntrl3.cacheMemory_total_hw_prefetches: 0
 
-  system.l1_cntrl3.cacheMemory_request_type_LD:   64.656%
-  system.l1_cntrl3.cacheMemory_request_type_ST:   35.344%
+  system.ruby.l1_cntrl3.cacheMemory_request_type_LD:   64.656%
+  system.ruby.l1_cntrl3.cacheMemory_request_type_ST:   35.344%
 
-  system.l1_cntrl3.cacheMemory_access_mode_type_Supervisor:   76825    100%
+  system.ruby.l1_cntrl3.cacheMemory_access_mode_type_Supervisor:   76825    100%
 
-Cache Stats: system.l1_cntrl4.cacheMemory
-  system.l1_cntrl4.cacheMemory_total_misses: 77331
-  system.l1_cntrl4.cacheMemory_total_demand_misses: 77331
-  system.l1_cntrl4.cacheMemory_total_prefetches: 0
-  system.l1_cntrl4.cacheMemory_total_sw_prefetches: 0
-  system.l1_cntrl4.cacheMemory_total_hw_prefetches: 0
+Cache Stats: system.ruby.l1_cntrl4.cacheMemory
+  system.ruby.l1_cntrl4.cacheMemory_total_misses: 77331
+  system.ruby.l1_cntrl4.cacheMemory_total_demand_misses: 77331
+  system.ruby.l1_cntrl4.cacheMemory_total_prefetches: 0
+  system.ruby.l1_cntrl4.cacheMemory_total_sw_prefetches: 0
+  system.ruby.l1_cntrl4.cacheMemory_total_hw_prefetches: 0
 
-  system.l1_cntrl4.cacheMemory_request_type_LD:   64.6623%
-  system.l1_cntrl4.cacheMemory_request_type_ST:   35.3377%
+  system.ruby.l1_cntrl4.cacheMemory_request_type_LD:   64.6623%
+  system.ruby.l1_cntrl4.cacheMemory_request_type_ST:   35.3377%
 
-  system.l1_cntrl4.cacheMemory_access_mode_type_Supervisor:   77331    100%
+  system.ruby.l1_cntrl4.cacheMemory_access_mode_type_Supervisor:   77331    100%
 
-Cache Stats: system.l1_cntrl5.cacheMemory
-  system.l1_cntrl5.cacheMemory_total_misses: 77389
-  system.l1_cntrl5.cacheMemory_total_demand_misses: 77389
-  system.l1_cntrl5.cacheMemory_total_prefetches: 0
-  system.l1_cntrl5.cacheMemory_total_sw_prefetches: 0
-  system.l1_cntrl5.cacheMemory_total_hw_prefetches: 0
+Cache Stats: system.ruby.l1_cntrl5.cacheMemory
+  system.ruby.l1_cntrl5.cacheMemory_total_misses: 77389
+  system.ruby.l1_cntrl5.cacheMemory_total_demand_misses: 77389
+  system.ruby.l1_cntrl5.cacheMemory_total_prefetches: 0
+  system.ruby.l1_cntrl5.cacheMemory_total_sw_prefetches: 0
+  system.ruby.l1_cntrl5.cacheMemory_total_hw_prefetches: 0
 
-  system.l1_cntrl5.cacheMemory_request_type_LD:   65.0028%
-  system.l1_cntrl5.cacheMemory_request_type_ST:   34.9972%
+  system.ruby.l1_cntrl5.cacheMemory_request_type_LD:   65.0028%
+  system.ruby.l1_cntrl5.cacheMemory_request_type_ST:   34.9972%
 
-  system.l1_cntrl5.cacheMemory_access_mode_type_Supervisor:   77389    100%
+  system.ruby.l1_cntrl5.cacheMemory_access_mode_type_Supervisor:   77389    100%
 
-Cache Stats: system.l1_cntrl6.cacheMemory
-  system.l1_cntrl6.cacheMemory_total_misses: 77354
-  system.l1_cntrl6.cacheMemory_total_demand_misses: 77354
-  system.l1_cntrl6.cacheMemory_total_prefetches: 0
-  system.l1_cntrl6.cacheMemory_total_sw_prefetches: 0
-  system.l1_cntrl6.cacheMemory_total_hw_prefetches: 0
+Cache Stats: system.ruby.l1_cntrl6.cacheMemory
+  system.ruby.l1_cntrl6.cacheMemory_total_misses: 77354
+  system.ruby.l1_cntrl6.cacheMemory_total_demand_misses: 77354
+  system.ruby.l1_cntrl6.cacheMemory_total_prefetches: 0
+  system.ruby.l1_cntrl6.cacheMemory_total_sw_prefetches: 0
+  system.ruby.l1_cntrl6.cacheMemory_total_hw_prefetches: 0
 
-  system.l1_cntrl6.cacheMemory_request_type_LD:   64.9986%
-  system.l1_cntrl6.cacheMemory_request_type_ST:   35.0014%
+  system.ruby.l1_cntrl6.cacheMemory_request_type_LD:   64.9986%
+  system.ruby.l1_cntrl6.cacheMemory_request_type_ST:   35.0014%
 
-  system.l1_cntrl6.cacheMemory_access_mode_type_Supervisor:   77354    100%
+  system.ruby.l1_cntrl6.cacheMemory_access_mode_type_Supervisor:   77354    100%
 
-Cache Stats: system.l1_cntrl7.cacheMemory
-  system.l1_cntrl7.cacheMemory_total_misses: 77281
-  system.l1_cntrl7.cacheMemory_total_demand_misses: 77281
-  system.l1_cntrl7.cacheMemory_total_prefetches: 0
-  system.l1_cntrl7.cacheMemory_total_sw_prefetches: 0
-  system.l1_cntrl7.cacheMemory_total_hw_prefetches: 0
+Cache Stats: system.ruby.l1_cntrl7.cacheMemory
+  system.ruby.l1_cntrl7.cacheMemory_total_misses: 77281
+  system.ruby.l1_cntrl7.cacheMemory_total_demand_misses: 77281
+  system.ruby.l1_cntrl7.cacheMemory_total_prefetches: 0
+  system.ruby.l1_cntrl7.cacheMemory_total_sw_prefetches: 0
+  system.ruby.l1_cntrl7.cacheMemory_total_hw_prefetches: 0
 
-  system.l1_cntrl7.cacheMemory_request_type_LD:   65.4469%
-  system.l1_cntrl7.cacheMemory_request_type_ST:   34.5531%
+  system.ruby.l1_cntrl7.cacheMemory_request_type_LD:   65.4469%
+  system.ruby.l1_cntrl7.cacheMemory_request_type_ST:   34.5531%
 
-  system.l1_cntrl7.cacheMemory_access_mode_type_Supervisor:   77281    100%
+  system.ruby.l1_cntrl7.cacheMemory_access_mode_type_Supervisor:   77281    100%
 
-Memory controller: system.dir_cntrl0.memBuffer:
+Memory controller: system.ruby.dir_cntrl0.memBuffer:
   memory_total_requests: 1218678
   memory_reads: 609346
   memory_writes: 609308

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 3a076df54a7decee1a39f94347f7cb5f2b1c18aa..18c37b3f894f14fe850f8ef7d75230a9285ce0f0 100644 (file)
--- 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,57 +4,57 @@ 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                                 186194                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 418708                       # Number of bytes of host memory used
-host_seconds                                    46.54                       # Real time elapsed on the host
-system.l1_cntrl4.cacheMemory.num_data_array_reads            0                       # number of data array reads
-system.l1_cntrl4.cacheMemory.num_data_array_writes            0                       # number of data array writes
-system.l1_cntrl4.cacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.l1_cntrl4.cacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.l1_cntrl4.cacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.l1_cntrl4.cacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-system.l1_cntrl5.cacheMemory.num_data_array_reads            0                       # number of data array reads
-system.l1_cntrl5.cacheMemory.num_data_array_writes            0                       # number of data array writes
-system.l1_cntrl5.cacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.l1_cntrl5.cacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.l1_cntrl5.cacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.l1_cntrl5.cacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-system.l1_cntrl6.cacheMemory.num_data_array_reads            0                       # number of data array reads
-system.l1_cntrl6.cacheMemory.num_data_array_writes            0                       # number of data array writes
-system.l1_cntrl6.cacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.l1_cntrl6.cacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.l1_cntrl6.cacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.l1_cntrl6.cacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-system.l1_cntrl7.cacheMemory.num_data_array_reads            0                       # number of data array reads
-system.l1_cntrl7.cacheMemory.num_data_array_writes            0                       # number of data array writes
-system.l1_cntrl7.cacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.l1_cntrl7.cacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.l1_cntrl7.cacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.l1_cntrl7.cacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-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
-system.l1_cntrl1.cacheMemory.num_data_array_reads            0                       # number of data array reads
-system.l1_cntrl1.cacheMemory.num_data_array_writes            0                       # number of data array writes
-system.l1_cntrl1.cacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.l1_cntrl1.cacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.l1_cntrl1.cacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.l1_cntrl1.cacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-system.l1_cntrl2.cacheMemory.num_data_array_reads            0                       # number of data array reads
-system.l1_cntrl2.cacheMemory.num_data_array_writes            0                       # number of data array writes
-system.l1_cntrl2.cacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.l1_cntrl2.cacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.l1_cntrl2.cacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.l1_cntrl2.cacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-system.l1_cntrl3.cacheMemory.num_data_array_reads            0                       # number of data array reads
-system.l1_cntrl3.cacheMemory.num_data_array_writes            0                       # number of data array writes
-system.l1_cntrl3.cacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.l1_cntrl3.cacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.l1_cntrl3.cacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.l1_cntrl3.cacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
+host_tick_rate                                 187879                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 425448                       # Number of bytes of host memory used
+host_seconds                                    46.12                       # Real time elapsed on the host
+system.ruby.l1_cntrl4.cacheMemory.num_data_array_reads            0                       # number of data array reads
+system.ruby.l1_cntrl4.cacheMemory.num_data_array_writes            0                       # number of data array writes
+system.ruby.l1_cntrl4.cacheMemory.num_tag_array_reads            0                       # number of tag array reads
+system.ruby.l1_cntrl4.cacheMemory.num_tag_array_writes            0                       # number of tag array writes
+system.ruby.l1_cntrl4.cacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
+system.ruby.l1_cntrl4.cacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
+system.ruby.l1_cntrl5.cacheMemory.num_data_array_reads            0                       # number of data array reads
+system.ruby.l1_cntrl5.cacheMemory.num_data_array_writes            0                       # number of data array writes
+system.ruby.l1_cntrl5.cacheMemory.num_tag_array_reads            0                       # number of tag array reads
+system.ruby.l1_cntrl5.cacheMemory.num_tag_array_writes            0                       # number of tag array writes
+system.ruby.l1_cntrl5.cacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
+system.ruby.l1_cntrl5.cacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
+system.ruby.l1_cntrl6.cacheMemory.num_data_array_reads            0                       # number of data array reads
+system.ruby.l1_cntrl6.cacheMemory.num_data_array_writes            0                       # number of data array writes
+system.ruby.l1_cntrl6.cacheMemory.num_tag_array_reads            0                       # number of tag array reads
+system.ruby.l1_cntrl6.cacheMemory.num_tag_array_writes            0                       # number of tag array writes
+system.ruby.l1_cntrl6.cacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
+system.ruby.l1_cntrl6.cacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
+system.ruby.l1_cntrl7.cacheMemory.num_data_array_reads            0                       # number of data array reads
+system.ruby.l1_cntrl7.cacheMemory.num_data_array_writes            0                       # number of data array writes
+system.ruby.l1_cntrl7.cacheMemory.num_tag_array_reads            0                       # number of tag array reads
+system.ruby.l1_cntrl7.cacheMemory.num_tag_array_writes            0                       # number of tag array writes
+system.ruby.l1_cntrl7.cacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
+system.ruby.l1_cntrl7.cacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
+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
+system.ruby.l1_cntrl1.cacheMemory.num_data_array_reads            0                       # number of data array reads
+system.ruby.l1_cntrl1.cacheMemory.num_data_array_writes            0                       # number of data array writes
+system.ruby.l1_cntrl1.cacheMemory.num_tag_array_reads            0                       # number of tag array reads
+system.ruby.l1_cntrl1.cacheMemory.num_tag_array_writes            0                       # number of tag array writes
+system.ruby.l1_cntrl1.cacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
+system.ruby.l1_cntrl1.cacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
+system.ruby.l1_cntrl2.cacheMemory.num_data_array_reads            0                       # number of data array reads
+system.ruby.l1_cntrl2.cacheMemory.num_data_array_writes            0                       # number of data array writes
+system.ruby.l1_cntrl2.cacheMemory.num_tag_array_reads            0                       # number of tag array reads
+system.ruby.l1_cntrl2.cacheMemory.num_tag_array_writes            0                       # number of tag array writes
+system.ruby.l1_cntrl2.cacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
+system.ruby.l1_cntrl2.cacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
+system.ruby.l1_cntrl3.cacheMemory.num_data_array_reads            0                       # number of data array reads
+system.ruby.l1_cntrl3.cacheMemory.num_data_array_writes            0                       # number of data array writes
+system.ruby.l1_cntrl3.cacheMemory.num_tag_array_reads            0                       # number of tag array reads
+system.ruby.l1_cntrl3.cacheMemory.num_tag_array_writes            0                       # number of tag array writes
+system.ruby.l1_cntrl3.cacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
+system.ruby.l1_cntrl3.cacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
 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/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 748354cc72bb55fee7c3b4f5de39041919ec8a88..cfaf3b4ccfb28691ab1bc4488d53c6eec9b1d2e4 100644 (file)
--- 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 708a70aaa47c09ffd635429a1b283790d4332183..aec2b1b3a55b3d969b1e925157919880b2fa9f9e 100644 (file)
--- 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 4ea61ad8408ab0b04e89c39c3c28ef21bc314032..6206d371a2a73c5543ad185e77122063de4415fd 100644 (file)
--- 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 8a3bceec2f88b803ab975afec54a6fc12f58696d..c6d6fc44ea599632ba77e3585ff3fc45a1ce1f21 100644 (file)
--- 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 19907d57891d9e5b1ddfaa6c68bebb53fdfbfc64..9d03fe01e6318bf80ee0b352a0bf2bc86c600419 100644 (file)
--- 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 150be1ab510d605e6343dedfcc0d65694019255a..fec1bbb41f1f2d237ddfbfd6687467104f75845b 100644 (file)
--- 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 3722c14cbd3acade84588eb92624a78878f08934..7fac9388bf3418254897744ac2d62d8e8e8b8855 100644 (file)
--- 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 48f057069c6dc3b417adc380c0adfed6fe39407b..1515df5d0011318f539bead8a1e0d0829618166e 100644 (file)
--- 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 6ab4e149a432ed800d27fb2874c9c7f28f05d7bf..f620f0e27091ade4623d0cd2b5278df3698bf7e2 100644 (file)
--- 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 77edef804da55ca3458b04bb4181f54745f5db88..17b6da2d7b2033c8c09a0b9138f136838cd2b6b1 100644 (file)
--- 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 31072bf7e60e4cf77abc9e641bff61d6fddd7593..fe7f5ca346a728a693c5150249fc3b54a72c5b47 100644 (file)
--- 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 9f304868ae2ef74a2039eedb75fae64b3868f77e..17783b0653e4f449e022f0d3e141d312dff2a5d4 100644 (file)
--- 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 2634ecc5eae8cf6e43d407073dd320a94398994d..e897d956630e5ffaf40eec764cba381302918f35 100644 (file)
--- 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 ec81e3ed4d078bb79e1dfa11b085fb4e0353299c..959a2542d0722d27ad623c70b955dce60e79c114 100644 (file)
--- 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 1afc580a0e6ea9757fc8789efbb1b81cf61c9707..12a80b1586c84a153248aaf43d848aa670572529 100644 (file)
--- 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   ----------