summaryrefslogtreecommitdiff
path: root/tests/quick/se/00.hello/ref
diff options
context:
space:
mode:
Diffstat (limited to 'tests/quick/se/00.hello/ref')
-rw-r--r--tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_CMP_directory/config.ini113
-rw-r--r--tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_CMP_directory/ruby.stats74
-rw-r--r--tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_CMP_directory/stats.txt64
-rw-r--r--tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_directory/config.ini113
-rw-r--r--tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_directory/ruby.stats62
-rw-r--r--tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_directory/stats.txt46
-rw-r--r--tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_token/config.ini111
-rw-r--r--tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_token/ruby.stats74
-rw-r--r--tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_token/stats.txt46
-rw-r--r--tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_hammer/config.ini109
-rw-r--r--tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_hammer/ruby.stats92
-rw-r--r--tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_hammer/stats.txt58
-rw-r--r--tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby/config.ini97
-rw-r--r--tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby/ruby.stats42
-rw-r--r--tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby/stats.txt22
-rw-r--r--tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_CMP_directory/config.ini113
-rw-r--r--tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_CMP_directory/ruby.stats66
-rw-r--r--tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_CMP_directory/stats.txt64
-rw-r--r--tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_directory/config.ini113
-rw-r--r--tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_directory/ruby.stats58
-rw-r--r--tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_directory/stats.txt46
-rw-r--r--tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_token/config.ini111
-rw-r--r--tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_token/ruby.stats74
-rw-r--r--tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_token/stats.txt44
-rw-r--r--tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_hammer/config.ini109
-rw-r--r--tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_hammer/ruby.stats88
-rw-r--r--tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_hammer/stats.txt58
-rw-r--r--tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby/config.ini97
-rw-r--r--tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby/ruby.stats42
-rw-r--r--tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby/stats.txt22
-rw-r--r--tests/quick/se/00.hello/ref/mips/linux/simple-timing-ruby/config.ini99
-rw-r--r--tests/quick/se/00.hello/ref/mips/linux/simple-timing-ruby/stats.txt22
-rw-r--r--tests/quick/se/00.hello/ref/sparc/linux/simple-timing-ruby/config.ini97
-rw-r--r--tests/quick/se/00.hello/ref/sparc/linux/simple-timing-ruby/ruby.stats42
-rw-r--r--tests/quick/se/00.hello/ref/sparc/linux/simple-timing-ruby/stats.txt22
-rw-r--r--tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/config.ini105
-rw-r--r--tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/ruby.stats46
-rw-r--r--tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/stats.txt22
38 files changed, 1420 insertions, 1263 deletions
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 d3529005c..16b1abfc8 100644
--- 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 24e9d84c6..b369159aa 100644
--- 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 3a0effc08..f4ccf60c7 100644
--- 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 6be2ae196..a0df0ea5f 100644
--- 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 1e3f433da..b82041ded 100644
--- 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 05d596c9a..8b05bd2cd 100644
--- 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 1f7e18219..704324832 100644
--- 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 b8ccc1417..88b0d5ce8 100644
--- 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 96fed3546..3d4ce611d 100644
--- 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 0d406345b..716b7d322 100644
--- 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 6604bf6a9..ea8b6e778 100644
--- 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 c852b744d..2f2f26835 100644
--- 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 8ba053a74..9c198f1c4 100644
--- 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 12453125c..6e22a3518 100644
--- 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 c15797da9..2a07a4255 100644
--- 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 08d94aa42..918bf8974 100644
--- 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 e49c679fb..432697885 100644
--- 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 381866200..f2add4688 100644
--- 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 b8d188e49..e191f8fa1 100644
--- 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 9e474b916..c2a59d13f 100644
--- 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 b192d2700..464fdb699 100644
--- 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 a59221a59..be6b40146 100644
--- 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 0cd5b5b0f..b78176d20 100644
--- 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 1cfc617f8..cef9f9d78 100644
--- 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 b4847a744..0d61ec3c3 100644
--- 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 9e9602eaf..5c65ffbd7 100644
--- 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 c2b9c6eb8..637f1a7d6 100644
--- 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 c527a672b..f9f9df412 100644
--- 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 d2ee4991b..1f1d21982 100644
--- 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 082021b65..520abecf4 100644
--- 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 10ce5543f..59f6aa1fe 100644
--- 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 461dc447d..6c61d4a4f 100644
--- 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 ab18e451d..f73262840 100644
--- 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 b9367ba4b..c5c22fe69 100644
--- 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 0ee67c488..78e09ef17 100644
--- 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 33bd11300..f8bb08914 100644
--- 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 87c404fd6..48dddeab7 100644
--- 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 36958969e..538b5b79e 100644
--- 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