summaryrefslogtreecommitdiff
path: root/tests/quick/se
diff options
context:
space:
mode:
Diffstat (limited to 'tests/quick/se')
-rw-r--r--tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_CMP_directory/config.ini75
-rw-r--r--tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_CMP_directory/ruby.stats24
-rwxr-xr-xtests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_CMP_directory/simout6
-rw-r--r--tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_CMP_directory/stats.txt28
-rw-r--r--tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_directory/config.ini75
-rw-r--r--tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_directory/ruby.stats32
-rwxr-xr-xtests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_directory/simout6
-rw-r--r--tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_directory/stats.txt28
-rw-r--r--tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_token/config.ini75
-rw-r--r--tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_token/ruby.stats24
-rwxr-xr-xtests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_token/simout6
-rw-r--r--tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_token/stats.txt28
-rw-r--r--tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_hammer/config.ini65
-rw-r--r--tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_hammer/ruby.stats24
-rwxr-xr-xtests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_hammer/simout6
-rw-r--r--tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_hammer/stats.txt34
-rw-r--r--tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby/config.ini50
-rw-r--r--tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby/ruby.stats20
-rwxr-xr-xtests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby/simout6
-rw-r--r--tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby/stats.txt16
-rw-r--r--tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_CMP_directory/config.ini75
-rw-r--r--tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_CMP_directory/ruby.stats32
-rwxr-xr-xtests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_CMP_directory/simout6
-rw-r--r--tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_CMP_directory/stats.txt28
-rw-r--r--tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_directory/config.ini75
-rw-r--r--tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_directory/ruby.stats20
-rwxr-xr-xtests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_directory/simout6
-rw-r--r--tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_directory/stats.txt28
-rw-r--r--tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_token/config.ini75
-rw-r--r--tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_token/ruby.stats20
-rwxr-xr-xtests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_token/simout6
-rw-r--r--tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_token/stats.txt28
-rw-r--r--tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_hammer/config.ini65
-rw-r--r--tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_hammer/ruby.stats24
-rwxr-xr-xtests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_hammer/simout6
-rw-r--r--tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_hammer/stats.txt34
-rw-r--r--tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby/config.ini50
-rw-r--r--tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby/ruby.stats28
-rwxr-xr-xtests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby/simout6
-rw-r--r--tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby/stats.txt16
-rw-r--r--tests/quick/se/00.hello/ref/mips/linux/simple-timing-ruby/config.ini50
-rwxr-xr-xtests/quick/se/00.hello/ref/mips/linux/simple-timing-ruby/simout6
-rw-r--r--tests/quick/se/00.hello/ref/mips/linux/simple-timing-ruby/stats.txt16
-rw-r--r--tests/quick/se/00.hello/ref/sparc/linux/simple-timing-ruby/config.ini50
-rw-r--r--tests/quick/se/00.hello/ref/sparc/linux/simple-timing-ruby/ruby.stats20
-rwxr-xr-xtests/quick/se/00.hello/ref/sparc/linux/simple-timing-ruby/simout6
-rw-r--r--tests/quick/se/00.hello/ref/sparc/linux/simple-timing-ruby/stats.txt16
-rw-r--r--tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/config.ini50
-rw-r--r--tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/ruby.stats20
-rwxr-xr-xtests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/simout6
-rw-r--r--tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/stats.txt16
-rw-r--r--tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_CMP_directory/config.ini250
-rw-r--r--tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_CMP_directory/ruby.stats30
-rwxr-xr-xtests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_CMP_directory/simout6
-rw-r--r--tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_CMP_directory/stats.txt108
-rw-r--r--tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_directory/config.ini248
-rw-r--r--tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_directory/ruby.stats30
-rwxr-xr-xtests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_directory/simout6
-rw-r--r--tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_directory/stats.txt108
-rw-r--r--tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_token/config.ini248
-rw-r--r--tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_token/ruby.stats30
-rwxr-xr-xtests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_token/simout6
-rw-r--r--tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_token/stats.txt108
-rw-r--r--tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/config.ini273
-rw-r--r--tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/ruby.stats30
-rwxr-xr-xtests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/simout6
-rw-r--r--tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/stats.txt156
-rw-r--r--tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby/config.ini190
-rw-r--r--tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby/ruby.stats34
-rwxr-xr-xtests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby/simout6
-rw-r--r--tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby/stats.txt54
-rw-r--r--tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_CMP_directory/config.ini73
-rw-r--r--tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_CMP_directory/ruby.stats20
-rwxr-xr-xtests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_CMP_directory/simout6
-rw-r--r--tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_CMP_directory/stats.txt24
-rw-r--r--tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_directory/config.ini73
-rw-r--r--tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_directory/ruby.stats30
-rwxr-xr-xtests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_directory/simout6
-rw-r--r--tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_directory/stats.txt24
-rw-r--r--tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_token/config.ini73
-rw-r--r--tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_token/ruby.stats20
-rwxr-xr-xtests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_token/simout6
-rw-r--r--tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_token/stats.txt24
-rw-r--r--tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_hammer/config.ini63
-rw-r--r--tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_hammer/ruby.stats20
-rwxr-xr-xtests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_hammer/simout6
-rw-r--r--tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_hammer/stats.txt30
-rw-r--r--tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby/config.ini48
-rw-r--r--tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby/ruby.stats24
-rwxr-xr-xtests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby/simout6
-rw-r--r--tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby/stats.txt12
91 files changed, 2781 insertions, 1246 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 3be58b836..47099262f 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
@@ -78,7 +78,7 @@ egid=100
env=
errout=cerr
euid=100
-executable=/dist/m5/regression/test-progs/hello/bin/alpha/linux/hello
+executable=/proj/aatl_perfmod_arch/m5_system_files/regression/test-progs/hello/bin/alpha/linux/hello
gid=100
input=cin
max_stack_size=67108864
@@ -155,20 +155,30 @@ version=0
[system.l1_cntrl0.L1DcacheMemory]
type=RubyCache
assoc=2
+dataAccessLatency=1
+dataArrayBanks=1
is_icache=false
latency=3
replacement_policy=PSEUDO_LRU
+resourceStalls=false
size=256
start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
[system.l1_cntrl0.L1IcacheMemory]
type=RubyCache
assoc=2
+dataAccessLatency=1
+dataArrayBanks=1
is_icache=false
latency=3
replacement_policy=PSEUDO_LRU
+resourceStalls=false
size=256
start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
[system.l1_cntrl0.sequencer]
type=RubySequencer
@@ -204,11 +214,16 @@ version=0
[system.l2_cntrl0.L2cacheMemory]
type=RubyCache
assoc=2
+dataAccessLatency=1
+dataArrayBanks=1
is_icache=false
latency=15
replacement_policy=PSEUDO_LRU
+resourceStalls=false
size=512
start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
[system.physmem]
type=SimpleMemory
@@ -245,56 +260,76 @@ topology=system.ruby.network.topology
[system.ruby.network.topology]
type=Topology
-children=ext_links0 ext_links1 ext_links2 int_links0 int_links1 int_links2 routers0 routers1 routers2 routers3
+children=ext_links0 ext_links1 ext_links2 int_links0 int_links1 int_links2
description=Crossbar
ext_links=system.ruby.network.topology.ext_links0 system.ruby.network.topology.ext_links1 system.ruby.network.topology.ext_links2
int_links=system.ruby.network.topology.int_links0 system.ruby.network.topology.int_links1 system.ruby.network.topology.int_links2
print_config=false
-routers=system.ruby.network.topology.routers0 system.ruby.network.topology.routers1 system.ruby.network.topology.routers2 system.ruby.network.topology.routers3
+routers=system.ruby.network.topology.ext_links0.int_node system.ruby.network.topology.ext_links1.int_node system.ruby.network.topology.ext_links2.int_node system.ruby.network.topology.int_links0.node_b
[system.ruby.network.topology.ext_links0]
type=SimpleExtLink
+children=int_node
bandwidth_factor=16
ext_node=system.l1_cntrl0
-int_node=system.ruby.network.topology.routers0
+int_node=system.ruby.network.topology.ext_links0.int_node
latency=1
link_id=0
weight=1
+[system.ruby.network.topology.ext_links0.int_node]
+type=BasicRouter
+router_id=0
+
[system.ruby.network.topology.ext_links1]
type=SimpleExtLink
+children=int_node
bandwidth_factor=16
ext_node=system.l2_cntrl0
-int_node=system.ruby.network.topology.routers1
+int_node=system.ruby.network.topology.ext_links1.int_node
latency=1
link_id=1
weight=1
+[system.ruby.network.topology.ext_links1.int_node]
+type=BasicRouter
+router_id=1
+
[system.ruby.network.topology.ext_links2]
type=SimpleExtLink
+children=int_node
bandwidth_factor=16
ext_node=system.dir_cntrl0
-int_node=system.ruby.network.topology.routers2
+int_node=system.ruby.network.topology.ext_links2.int_node
latency=1
link_id=2
weight=1
+[system.ruby.network.topology.ext_links2.int_node]
+type=BasicRouter
+router_id=2
+
[system.ruby.network.topology.int_links0]
type=SimpleIntLink
+children=node_b
bandwidth_factor=16
latency=1
link_id=3
-node_a=system.ruby.network.topology.routers0
-node_b=system.ruby.network.topology.routers3
+node_a=system.ruby.network.topology.ext_links0.int_node
+node_b=system.ruby.network.topology.int_links0.node_b
weight=1
+[system.ruby.network.topology.int_links0.node_b]
+type=BasicRouter
+router_id=3
+
[system.ruby.network.topology.int_links1]
type=SimpleIntLink
bandwidth_factor=16
latency=1
link_id=4
-node_a=system.ruby.network.topology.routers1
-node_b=system.ruby.network.topology.routers3
+node_a=system.ruby.network.topology.ext_links1.int_node
+node_b=system.ruby.network.topology.int_links0.node_b
weight=1
[system.ruby.network.topology.int_links2]
@@ -302,26 +337,10 @@ type=SimpleIntLink
bandwidth_factor=16
latency=1
link_id=5
-node_a=system.ruby.network.topology.routers2
-node_b=system.ruby.network.topology.routers3
+node_a=system.ruby.network.topology.ext_links2.int_node
+node_b=system.ruby.network.topology.int_links0.node_b
weight=1
-[system.ruby.network.topology.routers0]
-type=BasicRouter
-router_id=0
-
-[system.ruby.network.topology.routers1]
-type=BasicRouter
-router_id=1
-
-[system.ruby.network.topology.routers2]
-type=BasicRouter
-router_id=2
-
-[system.ruby.network.topology.routers3]
-type=BasicRouter
-router_id=3
-
[system.ruby.profiler]
type=RubyProfiler
all_instructions=false
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 a36a875c9..174b17a3f 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
@@ -34,7 +34,7 @@ periodic_stats_period: 1000000
================ End RubySystem Configuration Print ================
-Real time: Jun/04/2012 13:42:36
+Real time: Jul/10/2012 17:30:50
Profiler Stats
--------------
@@ -43,18 +43,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.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.62
+Virtual_time_in_minutes: 0.0103333
+Virtual_time_in_hours: 0.000172222
+Virtual_time_in_days: 7.17593e-06
Ruby_current_time: 279353
Ruby_start_time: 0
Ruby_cycles: 279353
-mbytes_resident: 49.4727
-mbytes_total: 221.031
-resident_ratio: 0.223827
+mbytes_resident: 47.9336
+mbytes_total: 230.535
+resident_ratio: 0.20794
ruby_cycles_executed: [ 279354 ]
@@ -119,11 +119,11 @@ Resource Usage
page_size: 4096
user_time: 0
system_time: 0
-page_reclaims: 13079
-page_faults: 9
+page_reclaims: 13465
+page_faults: 0
swaps: 0
-block_inputs: 1264
-block_outputs: 96
+block_inputs: 0
+block_outputs: 0
Network Stats
-------------
diff --git a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_CMP_directory/simout b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_CMP_directory/simout
index 0c7f2991f..1832a62b7 100755
--- a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_CMP_directory/simout
+++ b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_CMP_directory/simout
@@ -1,9 +1,9 @@
gem5 Simulator System. http://gem5.org
gem5 is copyrighted software; use the --copyright option for details.
-gem5 compiled Jun 4 2012 11:53:20
-gem5 started Jun 4 2012 13:42:35
-gem5 executing on zizzer
+gem5 compiled Jul 10 2012 17:30:17
+gem5 started Jul 10 2012 17:30:49
+gem5 executing on sc2b0605
command line: build/ALPHA_MESI_CMP_directory/gem5.opt -d build/ALPHA_MESI_CMP_directory/tests/opt/quick/se/00.hello/alpha/linux/simple-timing-ruby-MESI_CMP_directory -re tests/run.py build/ALPHA_MESI_CMP_directory/tests/opt/quick/se/00.hello/alpha/linux/simple-timing-ruby-MESI_CMP_directory
Global frequency set at 1000000000 ticks per second
info: Entering event queue @ 0. Starting simulation...
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 bae589857..dc174d88f 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.000279 # Nu
sim_ticks 279353 # Number of ticks simulated
final_tick 279353 # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
sim_freq 1000000000 # Frequency of simulated ticks
-host_inst_rate 12119 # Simulator instruction rate (inst/s)
-host_op_rate 12118 # Simulator op (including micro ops) rate (op/s)
-host_tick_rate 528605 # Simulator tick rate (ticks/s)
-host_mem_usage 226340 # Number of bytes of host memory used
-host_seconds 0.53 # Real time elapsed on the host
+host_inst_rate 24575 # Simulator instruction rate (inst/s)
+host_op_rate 24573 # Simulator op (including micro ops) rate (op/s)
+host_tick_rate 1071866 # Simulator tick rate (ticks/s)
+host_mem_usage 236072 # Number of bytes of host memory used
+host_seconds 0.26 # Real time elapsed on the host
sim_insts 6404 # Number of instructions simulated
sim_ops 6404 # Number of ops (including micro ops) simulated
system.physmem.bytes_read::cpu.inst 25656 # Number of bytes read from this memory
@@ -33,6 +33,24 @@ system.physmem.bw_write::total 23969673 # Wr
system.physmem.bw_total::cpu.inst 91840789 # Total bandwidth to/from this memory (bytes/s)
system.physmem.bw_total::cpu.data 55485354 # Total bandwidth to/from this memory (bytes/s)
system.physmem.bw_total::total 147326143 # 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.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 f0fb5fcd1..81f78cde4 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
@@ -78,7 +78,7 @@ egid=100
env=
errout=cerr
euid=100
-executable=/dist/m5/regression/test-progs/hello/bin/alpha/linux/hello
+executable=/proj/aatl_perfmod_arch/m5_system_files/regression/test-progs/hello/bin/alpha/linux/hello
gid=100
input=cin
max_stack_size=67108864
@@ -152,20 +152,30 @@ version=0
[system.l1_cntrl0.L1DcacheMemory]
type=RubyCache
assoc=2
+dataAccessLatency=1
+dataArrayBanks=1
is_icache=false
latency=3
replacement_policy=PSEUDO_LRU
+resourceStalls=false
size=256
start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
[system.l1_cntrl0.L1IcacheMemory]
type=RubyCache
assoc=2
+dataAccessLatency=1
+dataArrayBanks=1
is_icache=false
latency=3
replacement_policy=PSEUDO_LRU
+resourceStalls=false
size=256
start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
[system.l1_cntrl0.sequencer]
type=RubySequencer
@@ -200,11 +210,16 @@ version=0
[system.l2_cntrl0.L2cacheMemory]
type=RubyCache
assoc=2
+dataAccessLatency=1
+dataArrayBanks=1
is_icache=false
latency=15
replacement_policy=PSEUDO_LRU
+resourceStalls=false
size=512
start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
[system.physmem]
type=SimpleMemory
@@ -241,56 +256,76 @@ topology=system.ruby.network.topology
[system.ruby.network.topology]
type=Topology
-children=ext_links0 ext_links1 ext_links2 int_links0 int_links1 int_links2 routers0 routers1 routers2 routers3
+children=ext_links0 ext_links1 ext_links2 int_links0 int_links1 int_links2
description=Crossbar
ext_links=system.ruby.network.topology.ext_links0 system.ruby.network.topology.ext_links1 system.ruby.network.topology.ext_links2
int_links=system.ruby.network.topology.int_links0 system.ruby.network.topology.int_links1 system.ruby.network.topology.int_links2
print_config=false
-routers=system.ruby.network.topology.routers0 system.ruby.network.topology.routers1 system.ruby.network.topology.routers2 system.ruby.network.topology.routers3
+routers=system.ruby.network.topology.ext_links0.int_node system.ruby.network.topology.ext_links1.int_node system.ruby.network.topology.ext_links2.int_node system.ruby.network.topology.int_links0.node_b
[system.ruby.network.topology.ext_links0]
type=SimpleExtLink
+children=int_node
bandwidth_factor=16
ext_node=system.l1_cntrl0
-int_node=system.ruby.network.topology.routers0
+int_node=system.ruby.network.topology.ext_links0.int_node
latency=1
link_id=0
weight=1
+[system.ruby.network.topology.ext_links0.int_node]
+type=BasicRouter
+router_id=0
+
[system.ruby.network.topology.ext_links1]
type=SimpleExtLink
+children=int_node
bandwidth_factor=16
ext_node=system.l2_cntrl0
-int_node=system.ruby.network.topology.routers1
+int_node=system.ruby.network.topology.ext_links1.int_node
latency=1
link_id=1
weight=1
+[system.ruby.network.topology.ext_links1.int_node]
+type=BasicRouter
+router_id=1
+
[system.ruby.network.topology.ext_links2]
type=SimpleExtLink
+children=int_node
bandwidth_factor=16
ext_node=system.dir_cntrl0
-int_node=system.ruby.network.topology.routers2
+int_node=system.ruby.network.topology.ext_links2.int_node
latency=1
link_id=2
weight=1
+[system.ruby.network.topology.ext_links2.int_node]
+type=BasicRouter
+router_id=2
+
[system.ruby.network.topology.int_links0]
type=SimpleIntLink
+children=node_b
bandwidth_factor=16
latency=1
link_id=3
-node_a=system.ruby.network.topology.routers0
-node_b=system.ruby.network.topology.routers3
+node_a=system.ruby.network.topology.ext_links0.int_node
+node_b=system.ruby.network.topology.int_links0.node_b
weight=1
+[system.ruby.network.topology.int_links0.node_b]
+type=BasicRouter
+router_id=3
+
[system.ruby.network.topology.int_links1]
type=SimpleIntLink
bandwidth_factor=16
latency=1
link_id=4
-node_a=system.ruby.network.topology.routers1
-node_b=system.ruby.network.topology.routers3
+node_a=system.ruby.network.topology.ext_links1.int_node
+node_b=system.ruby.network.topology.int_links0.node_b
weight=1
[system.ruby.network.topology.int_links2]
@@ -298,26 +333,10 @@ type=SimpleIntLink
bandwidth_factor=16
latency=1
link_id=5
-node_a=system.ruby.network.topology.routers2
-node_b=system.ruby.network.topology.routers3
+node_a=system.ruby.network.topology.ext_links2.int_node
+node_b=system.ruby.network.topology.int_links0.node_b
weight=1
-[system.ruby.network.topology.routers0]
-type=BasicRouter
-router_id=0
-
-[system.ruby.network.topology.routers1]
-type=BasicRouter
-router_id=1
-
-[system.ruby.network.topology.routers2]
-type=BasicRouter
-router_id=2
-
-[system.ruby.network.topology.routers3]
-type=BasicRouter
-router_id=3
-
[system.ruby.profiler]
type=RubyProfiler
all_instructions=false
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 cc70c5701..3b2fe02d7 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
@@ -34,27 +34,27 @@ periodic_stats_period: 1000000
================ End RubySystem Configuration Print ================
-Real time: Jun/04/2012 14:41:05
+Real time: Jul/10/2012 17:36:36
Profiler Stats
--------------
-Elapsed_time_in_seconds: 1
-Elapsed_time_in_minutes: 0.0166667
-Elapsed_time_in_hours: 0.000277778
-Elapsed_time_in_days: 1.15741e-05
+Elapsed_time_in_seconds: 0
+Elapsed_time_in_minutes: 0
+Elapsed_time_in_hours: 0
+Elapsed_time_in_days: 0
-Virtual_time_in_seconds: 0.44
-Virtual_time_in_minutes: 0.00733333
-Virtual_time_in_hours: 0.000122222
-Virtual_time_in_days: 5.09259e-06
+Virtual_time_in_seconds: 0.67
+Virtual_time_in_minutes: 0.0111667
+Virtual_time_in_hours: 0.000186111
+Virtual_time_in_days: 7.75463e-06
Ruby_current_time: 223694
Ruby_start_time: 0
Ruby_cycles: 223694
-mbytes_resident: 49.4922
-mbytes_total: 221.148
-resident_ratio: 0.223796
+mbytes_resident: 48.0078
+mbytes_total: 230.77
+resident_ratio: 0.208051
ruby_cycles_executed: [ 223695 ]
@@ -119,11 +119,11 @@ Resource Usage
page_size: 4096
user_time: 0
system_time: 0
-page_reclaims: 13086
-page_faults: 12
+page_reclaims: 13444
+page_faults: 0
swaps: 0
-block_inputs: 1728
-block_outputs: 96
+block_inputs: 0
+block_outputs: 0
Network Stats
-------------
diff --git a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_directory/simout b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_directory/simout
index 691f6347c..aac08e2fa 100755
--- a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_directory/simout
+++ b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_directory/simout
@@ -1,9 +1,9 @@
gem5 Simulator System. http://gem5.org
gem5 is copyrighted software; use the --copyright option for details.
-gem5 compiled Jun 4 2012 11:54:55
-gem5 started Jun 4 2012 14:41:04
-gem5 executing on zizzer
+gem5 compiled Jul 10 2012 17:36:02
+gem5 started Jul 10 2012 17:36:36
+gem5 executing on sc2b0605
command line: build/ALPHA_MOESI_CMP_directory/gem5.opt -d build/ALPHA_MOESI_CMP_directory/tests/opt/quick/se/00.hello/alpha/linux/simple-timing-ruby-MOESI_CMP_directory -re tests/run.py build/ALPHA_MOESI_CMP_directory/tests/opt/quick/se/00.hello/alpha/linux/simple-timing-ruby-MOESI_CMP_directory
Global frequency set at 1000000000 ticks per second
info: Entering event queue @ 0. Starting simulation...
diff --git a/tests/quick/se/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 ddb3e7d12..91d67e04f 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.000224 # Nu
sim_ticks 223694 # Number of ticks simulated
final_tick 223694 # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
sim_freq 1000000000 # Frequency of simulated ticks
-host_inst_rate 30014 # Simulator instruction rate (inst/s)
-host_op_rate 30012 # Simulator op (including micro ops) rate (op/s)
-host_tick_rate 1048235 # Simulator tick rate (ticks/s)
-host_mem_usage 226460 # Number of bytes of host memory used
-host_seconds 0.21 # Real time elapsed on the host
+host_inst_rate 21381 # Simulator instruction rate (inst/s)
+host_op_rate 21380 # Simulator op (including micro ops) rate (op/s)
+host_tick_rate 746759 # Simulator tick rate (ticks/s)
+host_mem_usage 236312 # Number of bytes of host memory used
+host_seconds 0.30 # Real time elapsed on the host
sim_insts 6404 # Number of instructions simulated
sim_ops 6404 # Number of ops (including micro ops) simulated
system.physmem.bytes_read::cpu.inst 25656 # Number of bytes read from this memory
@@ -33,6 +33,24 @@ system.physmem.bw_write::total 29933749 # Wr
system.physmem.bw_total::cpu.inst 114692392 # Total bandwidth to/from this memory (bytes/s)
system.physmem.bw_total::cpu.data 69291085 # Total bandwidth to/from this memory (bytes/s)
system.physmem.bw_total::total 183983477 # 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.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 260fc7a89..4e5ea8bc4 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
@@ -78,7 +78,7 @@ egid=100
env=
errout=cerr
euid=100
-executable=/dist/m5/regression/test-progs/hello/bin/alpha/linux/hello
+executable=/proj/aatl_perfmod_arch/m5_system_files/regression/test-progs/hello/bin/alpha/linux/hello
gid=100
input=cin
max_stack_size=67108864
@@ -161,20 +161,30 @@ version=0
[system.l1_cntrl0.L1DcacheMemory]
type=RubyCache
assoc=2
+dataAccessLatency=1
+dataArrayBanks=1
is_icache=false
latency=2
replacement_policy=PSEUDO_LRU
+resourceStalls=false
size=256
start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
[system.l1_cntrl0.L1IcacheMemory]
type=RubyCache
assoc=2
+dataAccessLatency=1
+dataArrayBanks=1
is_icache=false
latency=2
replacement_policy=PSEUDO_LRU
+resourceStalls=false
size=256
start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
[system.l1_cntrl0.sequencer]
type=RubySequencer
@@ -211,11 +221,16 @@ version=0
[system.l2_cntrl0.L2cacheMemory]
type=RubyCache
assoc=2
+dataAccessLatency=1
+dataArrayBanks=1
is_icache=false
latency=10
replacement_policy=PSEUDO_LRU
+resourceStalls=false
size=512
start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
[system.physmem]
type=SimpleMemory
@@ -252,56 +267,76 @@ topology=system.ruby.network.topology
[system.ruby.network.topology]
type=Topology
-children=ext_links0 ext_links1 ext_links2 int_links0 int_links1 int_links2 routers0 routers1 routers2 routers3
+children=ext_links0 ext_links1 ext_links2 int_links0 int_links1 int_links2
description=Crossbar
ext_links=system.ruby.network.topology.ext_links0 system.ruby.network.topology.ext_links1 system.ruby.network.topology.ext_links2
int_links=system.ruby.network.topology.int_links0 system.ruby.network.topology.int_links1 system.ruby.network.topology.int_links2
print_config=false
-routers=system.ruby.network.topology.routers0 system.ruby.network.topology.routers1 system.ruby.network.topology.routers2 system.ruby.network.topology.routers3
+routers=system.ruby.network.topology.ext_links0.int_node system.ruby.network.topology.ext_links1.int_node system.ruby.network.topology.ext_links2.int_node system.ruby.network.topology.int_links0.node_b
[system.ruby.network.topology.ext_links0]
type=SimpleExtLink
+children=int_node
bandwidth_factor=16
ext_node=system.l1_cntrl0
-int_node=system.ruby.network.topology.routers0
+int_node=system.ruby.network.topology.ext_links0.int_node
latency=1
link_id=0
weight=1
+[system.ruby.network.topology.ext_links0.int_node]
+type=BasicRouter
+router_id=0
+
[system.ruby.network.topology.ext_links1]
type=SimpleExtLink
+children=int_node
bandwidth_factor=16
ext_node=system.l2_cntrl0
-int_node=system.ruby.network.topology.routers1
+int_node=system.ruby.network.topology.ext_links1.int_node
latency=1
link_id=1
weight=1
+[system.ruby.network.topology.ext_links1.int_node]
+type=BasicRouter
+router_id=1
+
[system.ruby.network.topology.ext_links2]
type=SimpleExtLink
+children=int_node
bandwidth_factor=16
ext_node=system.dir_cntrl0
-int_node=system.ruby.network.topology.routers2
+int_node=system.ruby.network.topology.ext_links2.int_node
latency=1
link_id=2
weight=1
+[system.ruby.network.topology.ext_links2.int_node]
+type=BasicRouter
+router_id=2
+
[system.ruby.network.topology.int_links0]
type=SimpleIntLink
+children=node_b
bandwidth_factor=16
latency=1
link_id=3
-node_a=system.ruby.network.topology.routers0
-node_b=system.ruby.network.topology.routers3
+node_a=system.ruby.network.topology.ext_links0.int_node
+node_b=system.ruby.network.topology.int_links0.node_b
weight=1
+[system.ruby.network.topology.int_links0.node_b]
+type=BasicRouter
+router_id=3
+
[system.ruby.network.topology.int_links1]
type=SimpleIntLink
bandwidth_factor=16
latency=1
link_id=4
-node_a=system.ruby.network.topology.routers1
-node_b=system.ruby.network.topology.routers3
+node_a=system.ruby.network.topology.ext_links1.int_node
+node_b=system.ruby.network.topology.int_links0.node_b
weight=1
[system.ruby.network.topology.int_links2]
@@ -309,26 +344,10 @@ type=SimpleIntLink
bandwidth_factor=16
latency=1
link_id=5
-node_a=system.ruby.network.topology.routers2
-node_b=system.ruby.network.topology.routers3
+node_a=system.ruby.network.topology.ext_links2.int_node
+node_b=system.ruby.network.topology.int_links0.node_b
weight=1
-[system.ruby.network.topology.routers0]
-type=BasicRouter
-router_id=0
-
-[system.ruby.network.topology.routers1]
-type=BasicRouter
-router_id=1
-
-[system.ruby.network.topology.routers2]
-type=BasicRouter
-router_id=2
-
-[system.ruby.network.topology.routers3]
-type=BasicRouter
-router_id=3
-
[system.ruby.profiler]
type=RubyProfiler
all_instructions=false
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 7f8f438c6..dcc9af50c 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
@@ -34,7 +34,7 @@ periodic_stats_period: 1000000
================ End RubySystem Configuration Print ================
-Real time: Jun/04/2012 14:42:12
+Real time: Jul/10/2012 17:45:14
Profiler Stats
--------------
@@ -43,18 +43,18 @@ Elapsed_time_in_minutes: 0
Elapsed_time_in_hours: 0
Elapsed_time_in_days: 0
-Virtual_time_in_seconds: 0.35
-Virtual_time_in_minutes: 0.00583333
-Virtual_time_in_hours: 9.72222e-05
-Virtual_time_in_days: 4.05093e-06
+Virtual_time_in_seconds: 0.54
+Virtual_time_in_minutes: 0.009
+Virtual_time_in_hours: 0.00015
+Virtual_time_in_days: 6.25e-06
Ruby_current_time: 231701
Ruby_start_time: 0
Ruby_cycles: 231701
-mbytes_resident: 47.9062
-mbytes_total: 219.422
-resident_ratio: 0.218329
+mbytes_resident: 46.2734
+mbytes_total: 228.938
+resident_ratio: 0.20214
ruby_cycles_executed: [ 231702 ]
@@ -127,11 +127,11 @@ Resource Usage
page_size: 4096
user_time: 0
system_time: 0
-page_reclaims: 12630
-page_faults: 12
+page_reclaims: 12976
+page_faults: 0
swaps: 0
-block_inputs: 1736
-block_outputs: 96
+block_inputs: 0
+block_outputs: 0
Network Stats
-------------
diff --git a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_token/simout b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_token/simout
index 63d892f7f..e3a769a26 100755
--- a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_token/simout
+++ b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_token/simout
@@ -1,9 +1,9 @@
gem5 Simulator System. http://gem5.org
gem5 is copyrighted software; use the --copyright option for details.
-gem5 compiled Jun 4 2012 11:56:32
-gem5 started Jun 4 2012 14:42:12
-gem5 executing on zizzer
+gem5 compiled Jul 10 2012 15:34:13
+gem5 started Jul 10 2012 17:45:14
+gem5 executing on sc2b0605
command line: build/ALPHA_MOESI_CMP_token/gem5.opt -d build/ALPHA_MOESI_CMP_token/tests/opt/quick/se/00.hello/alpha/linux/simple-timing-ruby-MOESI_CMP_token -re tests/run.py build/ALPHA_MOESI_CMP_token/tests/opt/quick/se/00.hello/alpha/linux/simple-timing-ruby-MOESI_CMP_token
Global frequency set at 1000000000 ticks per second
info: Entering event queue @ 0. Starting simulation...
diff --git a/tests/quick/se/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 9ad88fcd3..7722b3fbe 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.000232 # Nu
sim_ticks 231701 # Number of ticks simulated
final_tick 231701 # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
sim_freq 1000000000 # Frequency of simulated ticks
-host_inst_rate 50012 # Simulator instruction rate (inst/s)
-host_op_rate 50005 # Simulator op (including micro ops) rate (op/s)
-host_tick_rate 1808952 # Simulator tick rate (ticks/s)
-host_mem_usage 224692 # Number of bytes of host memory used
-host_seconds 0.13 # Real time elapsed on the host
+host_inst_rate 36777 # Simulator instruction rate (inst/s)
+host_op_rate 36773 # Simulator op (including micro ops) rate (op/s)
+host_tick_rate 1330353 # Simulator tick rate (ticks/s)
+host_mem_usage 234436 # Number of bytes of host memory used
+host_seconds 0.17 # Real time elapsed on the host
sim_insts 6404 # Number of instructions simulated
sim_ops 6404 # Number of ops (including micro ops) simulated
system.physmem.bytes_read::cpu.inst 25656 # Number of bytes read from this memory
@@ -33,6 +33,24 @@ system.physmem.bw_write::total 28899314 # Wr
system.physmem.bw_total::cpu.inst 110728914 # Total bandwidth to/from this memory (bytes/s)
system.physmem.bw_total::cpu.data 66896561 # Total bandwidth to/from this memory (bytes/s)
system.physmem.bw_total::total 177625474 # 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.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 c7cccc96e..9fd0a4ee1 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
@@ -78,7 +78,7 @@ egid=100
env=
errout=cerr
euid=100
-executable=/dist/m5/regression/test-progs/hello/bin/alpha/linux/hello
+executable=/proj/aatl_perfmod_arch/m5_system_files/regression/test-progs/hello/bin/alpha/linux/hello
gid=100
input=cin
max_stack_size=67108864
@@ -138,11 +138,16 @@ version=0
[system.dir_cntrl0.probeFilter]
type=RubyCache
assoc=4
+dataAccessLatency=1
+dataArrayBanks=1
is_icache=false
latency=1
replacement_policy=PSEUDO_LRU
+resourceStalls=false
size=1024
start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
[system.l1_cntrl0]
type=L1Cache_Controller
@@ -167,29 +172,44 @@ version=0
[system.l1_cntrl0.L1DcacheMemory]
type=RubyCache
assoc=2
+dataAccessLatency=1
+dataArrayBanks=1
is_icache=false
latency=2
replacement_policy=PSEUDO_LRU
+resourceStalls=false
size=256
start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
[system.l1_cntrl0.L1IcacheMemory]
type=RubyCache
assoc=2
+dataAccessLatency=1
+dataArrayBanks=1
is_icache=true
latency=2
replacement_policy=PSEUDO_LRU
+resourceStalls=false
size=256
start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
[system.l1_cntrl0.L2cacheMemory]
type=RubyCache
assoc=2
+dataAccessLatency=1
+dataArrayBanks=1
is_icache=false
latency=10
replacement_policy=PSEUDO_LRU
+resourceStalls=false
size=512
start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
[system.l1_cntrl0.sequencer]
type=RubySequencer
@@ -242,61 +262,64 @@ topology=system.ruby.network.topology
[system.ruby.network.topology]
type=Topology
-children=ext_links0 ext_links1 int_links0 int_links1 routers0 routers1 routers2
+children=ext_links0 ext_links1 int_links0 int_links1
description=Crossbar
ext_links=system.ruby.network.topology.ext_links0 system.ruby.network.topology.ext_links1
int_links=system.ruby.network.topology.int_links0 system.ruby.network.topology.int_links1
print_config=false
-routers=system.ruby.network.topology.routers0 system.ruby.network.topology.routers1 system.ruby.network.topology.routers2
+routers=system.ruby.network.topology.ext_links0.int_node system.ruby.network.topology.ext_links1.int_node system.ruby.network.topology.int_links0.node_b
[system.ruby.network.topology.ext_links0]
type=SimpleExtLink
+children=int_node
bandwidth_factor=16
ext_node=system.l1_cntrl0
-int_node=system.ruby.network.topology.routers0
+int_node=system.ruby.network.topology.ext_links0.int_node
latency=1
link_id=0
weight=1
+[system.ruby.network.topology.ext_links0.int_node]
+type=BasicRouter
+router_id=0
+
[system.ruby.network.topology.ext_links1]
type=SimpleExtLink
+children=int_node
bandwidth_factor=16
ext_node=system.dir_cntrl0
-int_node=system.ruby.network.topology.routers1
+int_node=system.ruby.network.topology.ext_links1.int_node
latency=1
link_id=1
weight=1
+[system.ruby.network.topology.ext_links1.int_node]
+type=BasicRouter
+router_id=1
+
[system.ruby.network.topology.int_links0]
type=SimpleIntLink
+children=node_b
bandwidth_factor=16
latency=1
link_id=2
-node_a=system.ruby.network.topology.routers0
-node_b=system.ruby.network.topology.routers2
+node_a=system.ruby.network.topology.ext_links0.int_node
+node_b=system.ruby.network.topology.int_links0.node_b
weight=1
+[system.ruby.network.topology.int_links0.node_b]
+type=BasicRouter
+router_id=2
+
[system.ruby.network.topology.int_links1]
type=SimpleIntLink
bandwidth_factor=16
latency=1
link_id=3
-node_a=system.ruby.network.topology.routers1
-node_b=system.ruby.network.topology.routers2
+node_a=system.ruby.network.topology.ext_links1.int_node
+node_b=system.ruby.network.topology.int_links0.node_b
weight=1
-[system.ruby.network.topology.routers0]
-type=BasicRouter
-router_id=0
-
-[system.ruby.network.topology.routers1]
-type=BasicRouter
-router_id=1
-
-[system.ruby.network.topology.routers2]
-type=BasicRouter
-router_id=2
-
[system.ruby.profiler]
type=RubyProfiler
all_instructions=false
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 68ec07392..35c7c85d6 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
@@ -34,7 +34,7 @@ periodic_stats_period: 1000000
================ End RubySystem Configuration Print ================
-Real time: Jun/04/2012 13:41:27
+Real time: Jul/10/2012 17:50:25
Profiler Stats
--------------
@@ -43,18 +43,18 @@ Elapsed_time_in_minutes: 0
Elapsed_time_in_hours: 0
Elapsed_time_in_days: 0
-Virtual_time_in_seconds: 0.34
-Virtual_time_in_minutes: 0.00566667
-Virtual_time_in_hours: 9.44444e-05
-Virtual_time_in_days: 3.93519e-06
+Virtual_time_in_seconds: 0.53
+Virtual_time_in_minutes: 0.00883333
+Virtual_time_in_hours: 0.000147222
+Virtual_time_in_days: 6.13426e-06
Ruby_current_time: 208400
Ruby_start_time: 0
Ruby_cycles: 208400
-mbytes_resident: 47.2969
-mbytes_total: 218.926
-resident_ratio: 0.216041
+mbytes_resident: 45.6484
+mbytes_total: 228.203
+resident_ratio: 0.200068
ruby_cycles_executed: [ 208401 ]
@@ -126,11 +126,11 @@ Resource Usage
page_size: 4096
user_time: 0
system_time: 0
-page_reclaims: 12505
-page_faults: 5
+page_reclaims: 12815
+page_faults: 0
swaps: 0
-block_inputs: 1000
-block_outputs: 96
+block_inputs: 0
+block_outputs: 0
Network Stats
-------------
diff --git a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_hammer/simout b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_hammer/simout
index f1ba4ed84..8fc46fbe9 100755
--- a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_hammer/simout
+++ b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_hammer/simout
@@ -1,9 +1,9 @@
gem5 Simulator System. http://gem5.org
gem5 is copyrighted software; use the --copyright option for details.
-gem5 compiled Jun 4 2012 11:51:44
-gem5 started Jun 4 2012 13:41:27
-gem5 executing on zizzer
+gem5 compiled Jul 10 2012 15:16:15
+gem5 started Jul 10 2012 17:50:25
+gem5 executing on sc2b0605
command line: build/ALPHA_MOESI_hammer/gem5.opt -d build/ALPHA_MOESI_hammer/tests/opt/quick/se/00.hello/alpha/linux/simple-timing-ruby-MOESI_hammer -re tests/run.py build/ALPHA_MOESI_hammer/tests/opt/quick/se/00.hello/alpha/linux/simple-timing-ruby-MOESI_hammer
Global frequency set at 1000000000 ticks per second
info: Entering event queue @ 0. Starting simulation...
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 842792d27..a0796133c 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.000208 # Nu
sim_ticks 208400 # Number of ticks simulated
final_tick 208400 # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
sim_freq 1000000000 # Frequency of simulated ticks
-host_inst_rate 52133 # Simulator instruction rate (inst/s)
-host_op_rate 52125 # Simulator op (including micro ops) rate (op/s)
-host_tick_rate 1696034 # Simulator tick rate (ticks/s)
-host_mem_usage 224184 # Number of bytes of host memory used
-host_seconds 0.12 # Real time elapsed on the host
+host_inst_rate 40149 # Simulator instruction rate (inst/s)
+host_op_rate 40144 # Simulator op (including micro ops) rate (op/s)
+host_tick_rate 1306231 # Simulator tick rate (ticks/s)
+host_mem_usage 233684 # Number of bytes of host memory used
+host_seconds 0.16 # Real time elapsed on the host
sim_insts 6404 # Number of instructions simulated
sim_ops 6404 # Number of ops (including micro ops) simulated
system.physmem.bytes_read::cpu.inst 25656 # Number of bytes read from this memory
@@ -33,6 +33,30 @@ system.physmem.bw_write::total 32130518 # Wr
system.physmem.bw_total::cpu.inst 123109405 # Total bandwidth to/from this memory (bytes/s)
system.physmem.bw_total::cpu.data 74376200 # Total bandwidth to/from this memory (bytes/s)
system.physmem.bw_total::total 197485605 # 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.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 3fab4efa4..831de2347 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
@@ -78,7 +78,7 @@ egid=100
env=
errout=cerr
euid=100
-executable=/dist/m5/regression/test-progs/hello/bin/alpha/linux/hello
+executable=/proj/aatl_perfmod_arch/m5_system_files/regression/test-progs/hello/bin/alpha/linux/hello
gid=100
input=cin
max_stack_size=67108864
@@ -151,11 +151,16 @@ version=0
[system.l1_cntrl0.cacheMemory]
type=RubyCache
assoc=2
+dataAccessLatency=1
+dataArrayBanks=1
is_icache=false
latency=3
replacement_policy=PSEUDO_LRU
+resourceStalls=false
size=256
start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
[system.l1_cntrl0.sequencer]
type=RubySequencer
@@ -208,61 +213,64 @@ topology=system.ruby.network.topology
[system.ruby.network.topology]
type=Topology
-children=ext_links0 ext_links1 int_links0 int_links1 routers0 routers1 routers2
+children=ext_links0 ext_links1 int_links0 int_links1
description=Crossbar
ext_links=system.ruby.network.topology.ext_links0 system.ruby.network.topology.ext_links1
int_links=system.ruby.network.topology.int_links0 system.ruby.network.topology.int_links1
print_config=false
-routers=system.ruby.network.topology.routers0 system.ruby.network.topology.routers1 system.ruby.network.topology.routers2
+routers=system.ruby.network.topology.ext_links0.int_node system.ruby.network.topology.ext_links1.int_node system.ruby.network.topology.int_links0.node_b
[system.ruby.network.topology.ext_links0]
type=SimpleExtLink
+children=int_node
bandwidth_factor=16
ext_node=system.l1_cntrl0
-int_node=system.ruby.network.topology.routers0
+int_node=system.ruby.network.topology.ext_links0.int_node
latency=1
link_id=0
weight=1
+[system.ruby.network.topology.ext_links0.int_node]
+type=BasicRouter
+router_id=0
+
[system.ruby.network.topology.ext_links1]
type=SimpleExtLink
+children=int_node
bandwidth_factor=16
ext_node=system.dir_cntrl0
-int_node=system.ruby.network.topology.routers1
+int_node=system.ruby.network.topology.ext_links1.int_node
latency=1
link_id=1
weight=1
+[system.ruby.network.topology.ext_links1.int_node]
+type=BasicRouter
+router_id=1
+
[system.ruby.network.topology.int_links0]
type=SimpleIntLink
+children=node_b
bandwidth_factor=16
latency=1
link_id=2
-node_a=system.ruby.network.topology.routers0
-node_b=system.ruby.network.topology.routers2
+node_a=system.ruby.network.topology.ext_links0.int_node
+node_b=system.ruby.network.topology.int_links0.node_b
weight=1
+[system.ruby.network.topology.int_links0.node_b]
+type=BasicRouter
+router_id=2
+
[system.ruby.network.topology.int_links1]
type=SimpleIntLink
bandwidth_factor=16
latency=1
link_id=3
-node_a=system.ruby.network.topology.routers1
-node_b=system.ruby.network.topology.routers2
+node_a=system.ruby.network.topology.ext_links1.int_node
+node_b=system.ruby.network.topology.int_links0.node_b
weight=1
-[system.ruby.network.topology.routers0]
-type=BasicRouter
-router_id=0
-
-[system.ruby.network.topology.routers1]
-type=BasicRouter
-router_id=1
-
-[system.ruby.network.topology.routers2]
-type=BasicRouter
-router_id=2
-
[system.ruby.profiler]
type=RubyProfiler
all_instructions=false
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 dd0f48010..807a98642 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
@@ -34,7 +34,7 @@ periodic_stats_period: 1000000
================ End RubySystem Configuration Print ================
-Real time: Jun/04/2012 13:42:47
+Real time: Jul/10/2012 17:16:10
Profiler Stats
--------------
@@ -43,18 +43,18 @@ Elapsed_time_in_minutes: 0
Elapsed_time_in_hours: 0
Elapsed_time_in_days: 0
-Virtual_time_in_seconds: 0.35
-Virtual_time_in_minutes: 0.00583333
-Virtual_time_in_hours: 9.72222e-05
-Virtual_time_in_days: 4.05093e-06
+Virtual_time_in_seconds: 0.53
+Virtual_time_in_minutes: 0.00883333
+Virtual_time_in_hours: 0.000147222
+Virtual_time_in_days: 6.13426e-06
Ruby_current_time: 342698
Ruby_start_time: 0
Ruby_cycles: 342698
-mbytes_resident: 48.4648
-mbytes_total: 219.84
-resident_ratio: 0.220455
+mbytes_resident: 46.8906
+mbytes_total: 229.363
+resident_ratio: 0.204455
ruby_cycles_executed: [ 342699 ]
@@ -122,11 +122,11 @@ Resource Usage
page_size: 4096
user_time: 0
system_time: 0
-page_reclaims: 12835
+page_reclaims: 13155
page_faults: 0
swaps: 0
block_inputs: 0
-block_outputs: 88
+block_outputs: 0
Network Stats
-------------
diff --git a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby/simout b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby/simout
index 0b4993316..4bad01d5a 100755
--- a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby/simout
+++ b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby/simout
@@ -1,9 +1,9 @@
gem5 Simulator System. http://gem5.org
gem5 is copyrighted software; use the --copyright option for details.
-gem5 compiled Jun 4 2012 11:50:11
-gem5 started Jun 4 2012 13:42:46
-gem5 executing on zizzer
+gem5 compiled Jul 10 2012 16:32:12
+gem5 started Jul 10 2012 17:16:10
+gem5 executing on sc2b0605
command line: build/ALPHA/gem5.opt -d build/ALPHA/tests/opt/quick/se/00.hello/alpha/linux/simple-timing-ruby -re tests/run.py build/ALPHA/tests/opt/quick/se/00.hello/alpha/linux/simple-timing-ruby
Global frequency set at 1000000000 ticks per second
info: Entering event queue @ 0. Starting simulation...
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 a6b69bd54..43810423d 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.000343 # Nu
sim_ticks 342698 # Number of ticks simulated
final_tick 342698 # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
sim_freq 1000000000 # Frequency of simulated ticks
-host_inst_rate 17946 # Simulator instruction rate (inst/s)
-host_op_rate 17945 # Simulator op (including micro ops) rate (op/s)
-host_tick_rate 960252 # Simulator tick rate (ticks/s)
-host_mem_usage 225120 # Number of bytes of host memory used
-host_seconds 0.36 # Real time elapsed on the host
+host_inst_rate 38554 # Simulator instruction rate (inst/s)
+host_op_rate 38550 # Simulator op (including micro ops) rate (op/s)
+host_tick_rate 2062706 # Simulator tick rate (ticks/s)
+host_mem_usage 234872 # Number of bytes of host memory used
+host_seconds 0.17 # Real time elapsed on the host
sim_insts 6404 # Number of instructions simulated
sim_ops 6404 # Number of ops (including micro ops) simulated
system.physmem.bytes_read::cpu.inst 25656 # Number of bytes read from this memory
@@ -33,6 +33,12 @@ system.physmem.bw_write::total 19539069 # Wr
system.physmem.bw_total::cpu.inst 74864750 # Total bandwidth to/from this memory (bytes/s)
system.physmem.bw_total::cpu.data 45229327 # Total bandwidth to/from this memory (bytes/s)
system.physmem.bw_total::total 120094077 # 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.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 317cc6a7e..bc15d1f8b 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
@@ -78,7 +78,7 @@ egid=100
env=
errout=cerr
euid=100
-executable=/dist/m5/regression/test-progs/hello/bin/alpha/tru64/hello
+executable=/proj/aatl_perfmod_arch/m5_system_files/regression/test-progs/hello/bin/alpha/tru64/hello
gid=100
input=cin
max_stack_size=67108864
@@ -155,20 +155,30 @@ version=0
[system.l1_cntrl0.L1DcacheMemory]
type=RubyCache
assoc=2
+dataAccessLatency=1
+dataArrayBanks=1
is_icache=false
latency=3
replacement_policy=PSEUDO_LRU
+resourceStalls=false
size=256
start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
[system.l1_cntrl0.L1IcacheMemory]
type=RubyCache
assoc=2
+dataAccessLatency=1
+dataArrayBanks=1
is_icache=false
latency=3
replacement_policy=PSEUDO_LRU
+resourceStalls=false
size=256
start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
[system.l1_cntrl0.sequencer]
type=RubySequencer
@@ -204,11 +214,16 @@ version=0
[system.l2_cntrl0.L2cacheMemory]
type=RubyCache
assoc=2
+dataAccessLatency=1
+dataArrayBanks=1
is_icache=false
latency=15
replacement_policy=PSEUDO_LRU
+resourceStalls=false
size=512
start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
[system.physmem]
type=SimpleMemory
@@ -245,56 +260,76 @@ topology=system.ruby.network.topology
[system.ruby.network.topology]
type=Topology
-children=ext_links0 ext_links1 ext_links2 int_links0 int_links1 int_links2 routers0 routers1 routers2 routers3
+children=ext_links0 ext_links1 ext_links2 int_links0 int_links1 int_links2
description=Crossbar
ext_links=system.ruby.network.topology.ext_links0 system.ruby.network.topology.ext_links1 system.ruby.network.topology.ext_links2
int_links=system.ruby.network.topology.int_links0 system.ruby.network.topology.int_links1 system.ruby.network.topology.int_links2
print_config=false
-routers=system.ruby.network.topology.routers0 system.ruby.network.topology.routers1 system.ruby.network.topology.routers2 system.ruby.network.topology.routers3
+routers=system.ruby.network.topology.ext_links0.int_node system.ruby.network.topology.ext_links1.int_node system.ruby.network.topology.ext_links2.int_node system.ruby.network.topology.int_links0.node_b
[system.ruby.network.topology.ext_links0]
type=SimpleExtLink
+children=int_node
bandwidth_factor=16
ext_node=system.l1_cntrl0
-int_node=system.ruby.network.topology.routers0
+int_node=system.ruby.network.topology.ext_links0.int_node
latency=1
link_id=0
weight=1
+[system.ruby.network.topology.ext_links0.int_node]
+type=BasicRouter
+router_id=0
+
[system.ruby.network.topology.ext_links1]
type=SimpleExtLink
+children=int_node
bandwidth_factor=16
ext_node=system.l2_cntrl0
-int_node=system.ruby.network.topology.routers1
+int_node=system.ruby.network.topology.ext_links1.int_node
latency=1
link_id=1
weight=1
+[system.ruby.network.topology.ext_links1.int_node]
+type=BasicRouter
+router_id=1
+
[system.ruby.network.topology.ext_links2]
type=SimpleExtLink
+children=int_node
bandwidth_factor=16
ext_node=system.dir_cntrl0
-int_node=system.ruby.network.topology.routers2
+int_node=system.ruby.network.topology.ext_links2.int_node
latency=1
link_id=2
weight=1
+[system.ruby.network.topology.ext_links2.int_node]
+type=BasicRouter
+router_id=2
+
[system.ruby.network.topology.int_links0]
type=SimpleIntLink
+children=node_b
bandwidth_factor=16
latency=1
link_id=3
-node_a=system.ruby.network.topology.routers0
-node_b=system.ruby.network.topology.routers3
+node_a=system.ruby.network.topology.ext_links0.int_node
+node_b=system.ruby.network.topology.int_links0.node_b
weight=1
+[system.ruby.network.topology.int_links0.node_b]
+type=BasicRouter
+router_id=3
+
[system.ruby.network.topology.int_links1]
type=SimpleIntLink
bandwidth_factor=16
latency=1
link_id=4
-node_a=system.ruby.network.topology.routers1
-node_b=system.ruby.network.topology.routers3
+node_a=system.ruby.network.topology.ext_links1.int_node
+node_b=system.ruby.network.topology.int_links0.node_b
weight=1
[system.ruby.network.topology.int_links2]
@@ -302,26 +337,10 @@ type=SimpleIntLink
bandwidth_factor=16
latency=1
link_id=5
-node_a=system.ruby.network.topology.routers2
-node_b=system.ruby.network.topology.routers3
+node_a=system.ruby.network.topology.ext_links2.int_node
+node_b=system.ruby.network.topology.int_links0.node_b
weight=1
-[system.ruby.network.topology.routers0]
-type=BasicRouter
-router_id=0
-
-[system.ruby.network.topology.routers1]
-type=BasicRouter
-router_id=1
-
-[system.ruby.network.topology.routers2]
-type=BasicRouter
-router_id=2
-
-[system.ruby.network.topology.routers3]
-type=BasicRouter
-router_id=3
-
[system.ruby.profiler]
type=RubyProfiler
all_instructions=false
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 5ef992e40..7c64e26d8 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
@@ -34,27 +34,27 @@ periodic_stats_period: 1000000
================ End RubySystem Configuration Print ================
-Real time: Jun/04/2012 13:42:36
+Real time: Jul/10/2012 17:31:25
Profiler Stats
--------------
-Elapsed_time_in_seconds: 1
-Elapsed_time_in_minutes: 0.0166667
-Elapsed_time_in_hours: 0.000277778
-Elapsed_time_in_days: 1.15741e-05
+Elapsed_time_in_seconds: 0
+Elapsed_time_in_minutes: 0
+Elapsed_time_in_hours: 0
+Elapsed_time_in_days: 0
-Virtual_time_in_seconds: 0.31
-Virtual_time_in_minutes: 0.00516667
-Virtual_time_in_hours: 8.61111e-05
-Virtual_time_in_days: 3.58796e-06
+Virtual_time_in_seconds: 0.47
+Virtual_time_in_minutes: 0.00783333
+Virtual_time_in_hours: 0.000130556
+Virtual_time_in_days: 5.43981e-06
Ruby_current_time: 104867
Ruby_start_time: 0
Ruby_cycles: 104867
-mbytes_resident: 46.8984
-mbytes_total: 218.785
-resident_ratio: 0.214358
+mbytes_resident: 45.3203
+mbytes_total: 228.348
+resident_ratio: 0.198488
ruby_cycles_executed: [ 104868 ]
@@ -119,11 +119,11 @@ Resource Usage
page_size: 4096
user_time: 0
system_time: 0
-page_reclaims: 12410
-page_faults: 4
+page_reclaims: 12765
+page_faults: 0
swaps: 0
-block_inputs: 480
-block_outputs: 96
+block_inputs: 0
+block_outputs: 0
Network Stats
-------------
diff --git a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_CMP_directory/simout b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_CMP_directory/simout
index d8d70a93e..d29f3759f 100755
--- a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_CMP_directory/simout
+++ b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_CMP_directory/simout
@@ -1,9 +1,9 @@
gem5 Simulator System. http://gem5.org
gem5 is copyrighted software; use the --copyright option for details.
-gem5 compiled Jun 4 2012 11:53:20
-gem5 started Jun 4 2012 13:42:35
-gem5 executing on zizzer
+gem5 compiled Jul 10 2012 17:30:17
+gem5 started Jul 10 2012 17:31:25
+gem5 executing on sc2b0605
command line: build/ALPHA_MESI_CMP_directory/gem5.opt -d build/ALPHA_MESI_CMP_directory/tests/opt/quick/se/00.hello/alpha/tru64/simple-timing-ruby-MESI_CMP_directory -re tests/run.py build/ALPHA_MESI_CMP_directory/tests/opt/quick/se/00.hello/alpha/tru64/simple-timing-ruby-MESI_CMP_directory
Global frequency set at 1000000000 ticks per second
info: Entering event queue @ 0. Starting simulation...
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 748d8a973..20b3bd153 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.000105 # Nu
sim_ticks 104867 # Number of ticks simulated
final_tick 104867 # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
sim_freq 1000000000 # Frequency of simulated ticks
-host_inst_rate 4864 # Simulator instruction rate (inst/s)
-host_op_rate 4864 # Simulator op (including micro ops) rate (op/s)
-host_tick_rate 197908 # Simulator tick rate (ticks/s)
-host_mem_usage 224040 # Number of bytes of host memory used
-host_seconds 0.53 # Real time elapsed on the host
+host_inst_rate 25231 # Simulator instruction rate (inst/s)
+host_op_rate 25226 # Simulator op (including micro ops) rate (op/s)
+host_tick_rate 1026377 # Simulator tick rate (ticks/s)
+host_mem_usage 233832 # 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,6 +33,24 @@ system.physmem.bw_write::total 19624858 # Wr
system.physmem.bw_total::cpu.inst 98601085 # Total bandwidth to/from this memory (bytes/s)
system.physmem.bw_total::cpu.data 48385097 # Total bandwidth to/from this memory (bytes/s)
system.physmem.bw_total::total 146986182 # 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.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 34c479e22..5b6cac45b 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
@@ -78,7 +78,7 @@ egid=100
env=
errout=cerr
euid=100
-executable=/dist/m5/regression/test-progs/hello/bin/alpha/tru64/hello
+executable=/proj/aatl_perfmod_arch/m5_system_files/regression/test-progs/hello/bin/alpha/tru64/hello
gid=100
input=cin
max_stack_size=67108864
@@ -152,20 +152,30 @@ version=0
[system.l1_cntrl0.L1DcacheMemory]
type=RubyCache
assoc=2
+dataAccessLatency=1
+dataArrayBanks=1
is_icache=false
latency=3
replacement_policy=PSEUDO_LRU
+resourceStalls=false
size=256
start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
[system.l1_cntrl0.L1IcacheMemory]
type=RubyCache
assoc=2
+dataAccessLatency=1
+dataArrayBanks=1
is_icache=false
latency=3
replacement_policy=PSEUDO_LRU
+resourceStalls=false
size=256
start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
[system.l1_cntrl0.sequencer]
type=RubySequencer
@@ -200,11 +210,16 @@ version=0
[system.l2_cntrl0.L2cacheMemory]
type=RubyCache
assoc=2
+dataAccessLatency=1
+dataArrayBanks=1
is_icache=false
latency=15
replacement_policy=PSEUDO_LRU
+resourceStalls=false
size=512
start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
[system.physmem]
type=SimpleMemory
@@ -241,56 +256,76 @@ topology=system.ruby.network.topology
[system.ruby.network.topology]
type=Topology
-children=ext_links0 ext_links1 ext_links2 int_links0 int_links1 int_links2 routers0 routers1 routers2 routers3
+children=ext_links0 ext_links1 ext_links2 int_links0 int_links1 int_links2
description=Crossbar
ext_links=system.ruby.network.topology.ext_links0 system.ruby.network.topology.ext_links1 system.ruby.network.topology.ext_links2
int_links=system.ruby.network.topology.int_links0 system.ruby.network.topology.int_links1 system.ruby.network.topology.int_links2
print_config=false
-routers=system.ruby.network.topology.routers0 system.ruby.network.topology.routers1 system.ruby.network.topology.routers2 system.ruby.network.topology.routers3
+routers=system.ruby.network.topology.ext_links0.int_node system.ruby.network.topology.ext_links1.int_node system.ruby.network.topology.ext_links2.int_node system.ruby.network.topology.int_links0.node_b
[system.ruby.network.topology.ext_links0]
type=SimpleExtLink
+children=int_node
bandwidth_factor=16
ext_node=system.l1_cntrl0
-int_node=system.ruby.network.topology.routers0
+int_node=system.ruby.network.topology.ext_links0.int_node
latency=1
link_id=0
weight=1
+[system.ruby.network.topology.ext_links0.int_node]
+type=BasicRouter
+router_id=0
+
[system.ruby.network.topology.ext_links1]
type=SimpleExtLink
+children=int_node
bandwidth_factor=16
ext_node=system.l2_cntrl0
-int_node=system.ruby.network.topology.routers1
+int_node=system.ruby.network.topology.ext_links1.int_node
latency=1
link_id=1
weight=1
+[system.ruby.network.topology.ext_links1.int_node]
+type=BasicRouter
+router_id=1
+
[system.ruby.network.topology.ext_links2]
type=SimpleExtLink
+children=int_node
bandwidth_factor=16
ext_node=system.dir_cntrl0
-int_node=system.ruby.network.topology.routers2
+int_node=system.ruby.network.topology.ext_links2.int_node
latency=1
link_id=2
weight=1
+[system.ruby.network.topology.ext_links2.int_node]
+type=BasicRouter
+router_id=2
+
[system.ruby.network.topology.int_links0]
type=SimpleIntLink
+children=node_b
bandwidth_factor=16
latency=1
link_id=3
-node_a=system.ruby.network.topology.routers0
-node_b=system.ruby.network.topology.routers3
+node_a=system.ruby.network.topology.ext_links0.int_node
+node_b=system.ruby.network.topology.int_links0.node_b
weight=1
+[system.ruby.network.topology.int_links0.node_b]
+type=BasicRouter
+router_id=3
+
[system.ruby.network.topology.int_links1]
type=SimpleIntLink
bandwidth_factor=16
latency=1
link_id=4
-node_a=system.ruby.network.topology.routers1
-node_b=system.ruby.network.topology.routers3
+node_a=system.ruby.network.topology.ext_links1.int_node
+node_b=system.ruby.network.topology.int_links0.node_b
weight=1
[system.ruby.network.topology.int_links2]
@@ -298,26 +333,10 @@ type=SimpleIntLink
bandwidth_factor=16
latency=1
link_id=5
-node_a=system.ruby.network.topology.routers2
-node_b=system.ruby.network.topology.routers3
+node_a=system.ruby.network.topology.ext_links2.int_node
+node_b=system.ruby.network.topology.int_links0.node_b
weight=1
-[system.ruby.network.topology.routers0]
-type=BasicRouter
-router_id=0
-
-[system.ruby.network.topology.routers1]
-type=BasicRouter
-router_id=1
-
-[system.ruby.network.topology.routers2]
-type=BasicRouter
-router_id=2
-
-[system.ruby.network.topology.routers3]
-type=BasicRouter
-router_id=3
-
[system.ruby.profiler]
type=RubyProfiler
all_instructions=false
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 0769bb48a..0ffb2e208 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
@@ -34,7 +34,7 @@ periodic_stats_period: 1000000
================ End RubySystem Configuration Print ================
-Real time: Jun/04/2012 14:41:15
+Real time: Jul/10/2012 17:37:10
Profiler Stats
--------------
@@ -43,18 +43,18 @@ Elapsed_time_in_minutes: 0
Elapsed_time_in_hours: 0
Elapsed_time_in_days: 0
-Virtual_time_in_seconds: 0.3
-Virtual_time_in_minutes: 0.005
-Virtual_time_in_hours: 8.33333e-05
-Virtual_time_in_days: 3.47222e-06
+Virtual_time_in_seconds: 0.48
+Virtual_time_in_minutes: 0.008
+Virtual_time_in_hours: 0.000133333
+Virtual_time_in_days: 5.55556e-06
Ruby_current_time: 85418
Ruby_start_time: 0
Ruby_cycles: 85418
-mbytes_resident: 46.9141
-mbytes_total: 218.969
-resident_ratio: 0.21425
+mbytes_resident: 45.4062
+mbytes_total: 228.586
+resident_ratio: 0.198657
ruby_cycles_executed: [ 85419 ]
@@ -119,11 +119,11 @@ Resource Usage
page_size: 4096
user_time: 0
system_time: 0
-page_reclaims: 12428
+page_reclaims: 12740
page_faults: 0
swaps: 0
block_inputs: 0
-block_outputs: 88
+block_outputs: 0
Network Stats
-------------
diff --git a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_directory/simout b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_directory/simout
index dc8b54148..4b0921627 100755
--- a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_directory/simout
+++ b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_directory/simout
@@ -1,9 +1,9 @@
gem5 Simulator System. http://gem5.org
gem5 is copyrighted software; use the --copyright option for details.
-gem5 compiled Jun 4 2012 11:54:55
-gem5 started Jun 4 2012 14:41:15
-gem5 executing on zizzer
+gem5 compiled Jul 10 2012 17:36:02
+gem5 started Jul 10 2012 17:37:10
+gem5 executing on sc2b0605
command line: build/ALPHA_MOESI_CMP_directory/gem5.opt -d build/ALPHA_MOESI_CMP_directory/tests/opt/quick/se/00.hello/alpha/tru64/simple-timing-ruby-MOESI_CMP_directory -re tests/run.py build/ALPHA_MOESI_CMP_directory/tests/opt/quick/se/00.hello/alpha/tru64/simple-timing-ruby-MOESI_CMP_directory
Global frequency set at 1000000000 ticks per second
info: Entering event queue @ 0. Starting simulation...
diff --git a/tests/quick/se/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 07e9173f4..6d74d1d8c 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.000085 # Nu
sim_ticks 85418 # Number of ticks simulated
final_tick 85418 # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
sim_freq 1000000000 # Frequency of simulated ticks
-host_inst_rate 30509 # Simulator instruction rate (inst/s)
-host_op_rate 30502 # Simulator op (including micro ops) rate (op/s)
-host_tick_rate 1010829 # Simulator tick rate (ticks/s)
-host_mem_usage 224228 # Number of bytes of host memory used
-host_seconds 0.08 # Real time elapsed on the host
+host_inst_rate 21617 # Simulator instruction rate (inst/s)
+host_op_rate 21614 # Simulator op (including micro ops) rate (op/s)
+host_tick_rate 716318 # Simulator tick rate (ticks/s)
+host_mem_usage 234076 # 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,6 +33,24 @@ system.physmem.bw_write::total 24093282 # Wr
system.physmem.bw_total::cpu.inst 121051769 # Total bandwidth to/from this memory (bytes/s)
system.physmem.bw_total::cpu.data 59402000 # Total bandwidth to/from this memory (bytes/s)
system.physmem.bw_total::total 180453769 # 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.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 ea15696c3..2b2f5fcb6 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
@@ -78,7 +78,7 @@ egid=100
env=
errout=cerr
euid=100
-executable=/dist/m5/regression/test-progs/hello/bin/alpha/tru64/hello
+executable=/proj/aatl_perfmod_arch/m5_system_files/regression/test-progs/hello/bin/alpha/tru64/hello
gid=100
input=cin
max_stack_size=67108864
@@ -161,20 +161,30 @@ version=0
[system.l1_cntrl0.L1DcacheMemory]
type=RubyCache
assoc=2
+dataAccessLatency=1
+dataArrayBanks=1
is_icache=false
latency=2
replacement_policy=PSEUDO_LRU
+resourceStalls=false
size=256
start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
[system.l1_cntrl0.L1IcacheMemory]
type=RubyCache
assoc=2
+dataAccessLatency=1
+dataArrayBanks=1
is_icache=false
latency=2
replacement_policy=PSEUDO_LRU
+resourceStalls=false
size=256
start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
[system.l1_cntrl0.sequencer]
type=RubySequencer
@@ -211,11 +221,16 @@ version=0
[system.l2_cntrl0.L2cacheMemory]
type=RubyCache
assoc=2
+dataAccessLatency=1
+dataArrayBanks=1
is_icache=false
latency=10
replacement_policy=PSEUDO_LRU
+resourceStalls=false
size=512
start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
[system.physmem]
type=SimpleMemory
@@ -252,56 +267,76 @@ topology=system.ruby.network.topology
[system.ruby.network.topology]
type=Topology
-children=ext_links0 ext_links1 ext_links2 int_links0 int_links1 int_links2 routers0 routers1 routers2 routers3
+children=ext_links0 ext_links1 ext_links2 int_links0 int_links1 int_links2
description=Crossbar
ext_links=system.ruby.network.topology.ext_links0 system.ruby.network.topology.ext_links1 system.ruby.network.topology.ext_links2
int_links=system.ruby.network.topology.int_links0 system.ruby.network.topology.int_links1 system.ruby.network.topology.int_links2
print_config=false
-routers=system.ruby.network.topology.routers0 system.ruby.network.topology.routers1 system.ruby.network.topology.routers2 system.ruby.network.topology.routers3
+routers=system.ruby.network.topology.ext_links0.int_node system.ruby.network.topology.ext_links1.int_node system.ruby.network.topology.ext_links2.int_node system.ruby.network.topology.int_links0.node_b
[system.ruby.network.topology.ext_links0]
type=SimpleExtLink
+children=int_node
bandwidth_factor=16
ext_node=system.l1_cntrl0
-int_node=system.ruby.network.topology.routers0
+int_node=system.ruby.network.topology.ext_links0.int_node
latency=1
link_id=0
weight=1
+[system.ruby.network.topology.ext_links0.int_node]
+type=BasicRouter
+router_id=0
+
[system.ruby.network.topology.ext_links1]
type=SimpleExtLink
+children=int_node
bandwidth_factor=16
ext_node=system.l2_cntrl0
-int_node=system.ruby.network.topology.routers1
+int_node=system.ruby.network.topology.ext_links1.int_node
latency=1
link_id=1
weight=1
+[system.ruby.network.topology.ext_links1.int_node]
+type=BasicRouter
+router_id=1
+
[system.ruby.network.topology.ext_links2]
type=SimpleExtLink
+children=int_node
bandwidth_factor=16
ext_node=system.dir_cntrl0
-int_node=system.ruby.network.topology.routers2
+int_node=system.ruby.network.topology.ext_links2.int_node
latency=1
link_id=2
weight=1
+[system.ruby.network.topology.ext_links2.int_node]
+type=BasicRouter
+router_id=2
+
[system.ruby.network.topology.int_links0]
type=SimpleIntLink
+children=node_b
bandwidth_factor=16
latency=1
link_id=3
-node_a=system.ruby.network.topology.routers0
-node_b=system.ruby.network.topology.routers3
+node_a=system.ruby.network.topology.ext_links0.int_node
+node_b=system.ruby.network.topology.int_links0.node_b
weight=1
+[system.ruby.network.topology.int_links0.node_b]
+type=BasicRouter
+router_id=3
+
[system.ruby.network.topology.int_links1]
type=SimpleIntLink
bandwidth_factor=16
latency=1
link_id=4
-node_a=system.ruby.network.topology.routers1
-node_b=system.ruby.network.topology.routers3
+node_a=system.ruby.network.topology.ext_links1.int_node
+node_b=system.ruby.network.topology.int_links0.node_b
weight=1
[system.ruby.network.topology.int_links2]
@@ -309,26 +344,10 @@ type=SimpleIntLink
bandwidth_factor=16
latency=1
link_id=5
-node_a=system.ruby.network.topology.routers2
-node_b=system.ruby.network.topology.routers3
+node_a=system.ruby.network.topology.ext_links2.int_node
+node_b=system.ruby.network.topology.int_links0.node_b
weight=1
-[system.ruby.network.topology.routers0]
-type=BasicRouter
-router_id=0
-
-[system.ruby.network.topology.routers1]
-type=BasicRouter
-router_id=1
-
-[system.ruby.network.topology.routers2]
-type=BasicRouter
-router_id=2
-
-[system.ruby.network.topology.routers3]
-type=BasicRouter
-router_id=3
-
[system.ruby.profiler]
type=RubyProfiler
all_instructions=false
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 1584bb895..08e1cbfae 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
@@ -34,7 +34,7 @@ periodic_stats_period: 1000000
================ End RubySystem Configuration Print ================
-Real time: Jun/04/2012 14:42:22
+Real time: Jul/10/2012 17:45:47
Profiler Stats
--------------
@@ -43,18 +43,18 @@ Elapsed_time_in_minutes: 0
Elapsed_time_in_hours: 0
Elapsed_time_in_days: 0
-Virtual_time_in_seconds: 0.27
-Virtual_time_in_minutes: 0.0045
-Virtual_time_in_hours: 7.5e-05
-Virtual_time_in_days: 3.125e-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: 87899
Ruby_start_time: 0
Ruby_cycles: 87899
-mbytes_resident: 46.1055
-mbytes_total: 217.996
-resident_ratio: 0.211497
+mbytes_resident: 44.4727
+mbytes_total: 227.578
+resident_ratio: 0.195434
ruby_cycles_executed: [ 87900 ]
@@ -127,11 +127,11 @@ Resource Usage
page_size: 4096
user_time: 0
system_time: 0
-page_reclaims: 12179
+page_reclaims: 12519
page_faults: 0
swaps: 0
block_inputs: 0
-block_outputs: 96
+block_outputs: 0
Network Stats
-------------
diff --git a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_token/simout b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_token/simout
index 3e1c7a0df..851a68508 100755
--- a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_token/simout
+++ b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_token/simout
@@ -1,9 +1,9 @@
gem5 Simulator System. http://gem5.org
gem5 is copyrighted software; use the --copyright option for details.
-gem5 compiled Jun 4 2012 11:56:32
-gem5 started Jun 4 2012 14:42:22
-gem5 executing on zizzer
+gem5 compiled Jul 10 2012 15:34:13
+gem5 started Jul 10 2012 17:45:47
+gem5 executing on sc2b0605
command line: build/ALPHA_MOESI_CMP_token/gem5.opt -d build/ALPHA_MOESI_CMP_token/tests/opt/quick/se/00.hello/alpha/tru64/simple-timing-ruby-MOESI_CMP_token -re tests/run.py build/ALPHA_MOESI_CMP_token/tests/opt/quick/se/00.hello/alpha/tru64/simple-timing-ruby-MOESI_CMP_token
Global frequency set at 1000000000 ticks per second
info: Entering event queue @ 0. Starting simulation...
diff --git a/tests/quick/se/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 0b4d202c9..0bb4f7ab2 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,11 +4,11 @@ sim_seconds 0.000088 # Nu
sim_ticks 87899 # Number of ticks simulated
final_tick 87899 # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
sim_freq 1000000000 # Frequency of simulated ticks
-host_inst_rate 49141 # Simulator instruction rate (inst/s)
-host_op_rate 49125 # Simulator op (including micro ops) rate (op/s)
-host_tick_rate 1675041 # Simulator tick rate (ticks/s)
-host_mem_usage 223232 # Number of bytes of host memory used
-host_seconds 0.05 # Real time elapsed on the host
+host_inst_rate 36684 # Simulator instruction rate (inst/s)
+host_op_rate 36675 # Simulator op (including micro ops) rate (op/s)
+host_tick_rate 1250644 # Simulator tick rate (ticks/s)
+host_mem_usage 233044 # Number of bytes of host memory used
+host_seconds 0.07 # 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,6 +33,24 @@ system.physmem.bw_write::total 23413236 # Wr
system.physmem.bw_total::cpu.inst 117635013 # Total bandwidth to/from this memory (bytes/s)
system.physmem.bw_total::cpu.data 57725344 # Total bandwidth to/from this memory (bytes/s)
system.physmem.bw_total::total 175360357 # 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.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 5531e80ff..d24ccea68 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
@@ -78,7 +78,7 @@ egid=100
env=
errout=cerr
euid=100
-executable=/dist/m5/regression/test-progs/hello/bin/alpha/tru64/hello
+executable=/proj/aatl_perfmod_arch/m5_system_files/regression/test-progs/hello/bin/alpha/tru64/hello
gid=100
input=cin
max_stack_size=67108864
@@ -138,11 +138,16 @@ version=0
[system.dir_cntrl0.probeFilter]
type=RubyCache
assoc=4
+dataAccessLatency=1
+dataArrayBanks=1
is_icache=false
latency=1
replacement_policy=PSEUDO_LRU
+resourceStalls=false
size=1024
start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
[system.l1_cntrl0]
type=L1Cache_Controller
@@ -167,29 +172,44 @@ version=0
[system.l1_cntrl0.L1DcacheMemory]
type=RubyCache
assoc=2
+dataAccessLatency=1
+dataArrayBanks=1
is_icache=false
latency=2
replacement_policy=PSEUDO_LRU
+resourceStalls=false
size=256
start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
[system.l1_cntrl0.L1IcacheMemory]
type=RubyCache
assoc=2
+dataAccessLatency=1
+dataArrayBanks=1
is_icache=true
latency=2
replacement_policy=PSEUDO_LRU
+resourceStalls=false
size=256
start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
[system.l1_cntrl0.L2cacheMemory]
type=RubyCache
assoc=2
+dataAccessLatency=1
+dataArrayBanks=1
is_icache=false
latency=10
replacement_policy=PSEUDO_LRU
+resourceStalls=false
size=512
start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
[system.l1_cntrl0.sequencer]
type=RubySequencer
@@ -242,61 +262,64 @@ topology=system.ruby.network.topology
[system.ruby.network.topology]
type=Topology
-children=ext_links0 ext_links1 int_links0 int_links1 routers0 routers1 routers2
+children=ext_links0 ext_links1 int_links0 int_links1
description=Crossbar
ext_links=system.ruby.network.topology.ext_links0 system.ruby.network.topology.ext_links1
int_links=system.ruby.network.topology.int_links0 system.ruby.network.topology.int_links1
print_config=false
-routers=system.ruby.network.topology.routers0 system.ruby.network.topology.routers1 system.ruby.network.topology.routers2
+routers=system.ruby.network.topology.ext_links0.int_node system.ruby.network.topology.ext_links1.int_node system.ruby.network.topology.int_links0.node_b
[system.ruby.network.topology.ext_links0]
type=SimpleExtLink
+children=int_node
bandwidth_factor=16
ext_node=system.l1_cntrl0
-int_node=system.ruby.network.topology.routers0
+int_node=system.ruby.network.topology.ext_links0.int_node
latency=1
link_id=0
weight=1
+[system.ruby.network.topology.ext_links0.int_node]
+type=BasicRouter
+router_id=0
+
[system.ruby.network.topology.ext_links1]
type=SimpleExtLink
+children=int_node
bandwidth_factor=16
ext_node=system.dir_cntrl0
-int_node=system.ruby.network.topology.routers1
+int_node=system.ruby.network.topology.ext_links1.int_node
latency=1
link_id=1
weight=1
+[system.ruby.network.topology.ext_links1.int_node]
+type=BasicRouter
+router_id=1
+
[system.ruby.network.topology.int_links0]
type=SimpleIntLink
+children=node_b
bandwidth_factor=16
latency=1
link_id=2
-node_a=system.ruby.network.topology.routers0
-node_b=system.ruby.network.topology.routers2
+node_a=system.ruby.network.topology.ext_links0.int_node
+node_b=system.ruby.network.topology.int_links0.node_b
weight=1
+[system.ruby.network.topology.int_links0.node_b]
+type=BasicRouter
+router_id=2
+
[system.ruby.network.topology.int_links1]
type=SimpleIntLink
bandwidth_factor=16
latency=1
link_id=3
-node_a=system.ruby.network.topology.routers1
-node_b=system.ruby.network.topology.routers2
+node_a=system.ruby.network.topology.ext_links1.int_node
+node_b=system.ruby.network.topology.int_links0.node_b
weight=1
-[system.ruby.network.topology.routers0]
-type=BasicRouter
-router_id=0
-
-[system.ruby.network.topology.routers1]
-type=BasicRouter
-router_id=1
-
-[system.ruby.network.topology.routers2]
-type=BasicRouter
-router_id=2
-
[system.ruby.profiler]
type=RubyProfiler
all_instructions=false
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 f062dbc78..7236f2a09 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
@@ -34,7 +34,7 @@ periodic_stats_period: 1000000
================ End RubySystem Configuration Print ================
-Real time: Jun/04/2012 13:42:34
+Real time: Jul/10/2012 17:50:59
Profiler Stats
--------------
@@ -43,18 +43,18 @@ Elapsed_time_in_minutes: 0
Elapsed_time_in_hours: 0
Elapsed_time_in_days: 0
-Virtual_time_in_seconds: 0.34
-Virtual_time_in_minutes: 0.00566667
-Virtual_time_in_hours: 9.44444e-05
-Virtual_time_in_days: 3.93519e-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: 78448
Ruby_start_time: 0
Ruby_cycles: 78448
-mbytes_resident: 45.7539
-mbytes_total: 217.664
-resident_ratio: 0.210204
+mbytes_resident: 44.0312
+mbytes_total: 227.02
+resident_ratio: 0.193988
ruby_cycles_executed: [ 78449 ]
@@ -126,11 +126,11 @@ Resource Usage
page_size: 4096
user_time: 0
system_time: 0
-page_reclaims: 12072
-page_faults: 20
+page_reclaims: 12375
+page_faults: 0
swaps: 0
-block_inputs: 2944
-block_outputs: 96
+block_inputs: 0
+block_outputs: 0
Network Stats
-------------
diff --git a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_hammer/simout b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_hammer/simout
index 423daf7c7..2612c0b40 100755
--- a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_hammer/simout
+++ b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_hammer/simout
@@ -1,9 +1,9 @@
gem5 Simulator System. http://gem5.org
gem5 is copyrighted software; use the --copyright option for details.
-gem5 compiled Jun 4 2012 11:51:44
-gem5 started Jun 4 2012 13:42:34
-gem5 executing on zizzer
+gem5 compiled Jul 10 2012 15:16:15
+gem5 started Jul 10 2012 17:50:59
+gem5 executing on sc2b0605
command line: build/ALPHA_MOESI_hammer/gem5.opt -d build/ALPHA_MOESI_hammer/tests/opt/quick/se/00.hello/alpha/tru64/simple-timing-ruby-MOESI_hammer -re tests/run.py build/ALPHA_MOESI_hammer/tests/opt/quick/se/00.hello/alpha/tru64/simple-timing-ruby-MOESI_hammer
Global frequency set at 1000000000 ticks per second
info: Entering event queue @ 0. Starting simulation...
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 002b923d5..17ceaae11 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.000078 # Nu
sim_ticks 78448 # Number of ticks simulated
final_tick 78448 # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
sim_freq 1000000000 # Frequency of simulated ticks
-host_inst_rate 9618 # Simulator instruction rate (inst/s)
-host_op_rate 9618 # Simulator op (including micro ops) rate (op/s)
-host_tick_rate 292754 # Simulator tick rate (ticks/s)
-host_mem_usage 222892 # Number of bytes of host memory used
-host_seconds 0.27 # Real time elapsed on the host
+host_inst_rate 40059 # Simulator instruction rate (inst/s)
+host_op_rate 40048 # Simulator op (including micro ops) rate (op/s)
+host_tick_rate 1218818 # Simulator tick rate (ticks/s)
+host_mem_usage 232472 # Number of bytes of host memory used
+host_seconds 0.06 # 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,6 +33,30 @@ system.physmem.bw_write::total 26233938 # Wr
system.physmem.bw_total::cpu.inst 131807057 # Total bandwidth to/from this memory (bytes/s)
system.physmem.bw_total::cpu.data 64679788 # Total bandwidth to/from this memory (bytes/s)
system.physmem.bw_total::total 196486845 # 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.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 a2207b6c0..8a1b6c5da 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
@@ -78,7 +78,7 @@ egid=100
env=
errout=cerr
euid=100
-executable=/dist/m5/regression/test-progs/hello/bin/alpha/tru64/hello
+executable=/proj/aatl_perfmod_arch/m5_system_files/regression/test-progs/hello/bin/alpha/tru64/hello
gid=100
input=cin
max_stack_size=67108864
@@ -151,11 +151,16 @@ version=0
[system.l1_cntrl0.cacheMemory]
type=RubyCache
assoc=2
+dataAccessLatency=1
+dataArrayBanks=1
is_icache=false
latency=3
replacement_policy=PSEUDO_LRU
+resourceStalls=false
size=256
start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
[system.l1_cntrl0.sequencer]
type=RubySequencer
@@ -208,61 +213,64 @@ topology=system.ruby.network.topology
[system.ruby.network.topology]
type=Topology
-children=ext_links0 ext_links1 int_links0 int_links1 routers0 routers1 routers2
+children=ext_links0 ext_links1 int_links0 int_links1
description=Crossbar
ext_links=system.ruby.network.topology.ext_links0 system.ruby.network.topology.ext_links1
int_links=system.ruby.network.topology.int_links0 system.ruby.network.topology.int_links1
print_config=false
-routers=system.ruby.network.topology.routers0 system.ruby.network.topology.routers1 system.ruby.network.topology.routers2
+routers=system.ruby.network.topology.ext_links0.int_node system.ruby.network.topology.ext_links1.int_node system.ruby.network.topology.int_links0.node_b
[system.ruby.network.topology.ext_links0]
type=SimpleExtLink
+children=int_node
bandwidth_factor=16
ext_node=system.l1_cntrl0
-int_node=system.ruby.network.topology.routers0
+int_node=system.ruby.network.topology.ext_links0.int_node
latency=1
link_id=0
weight=1
+[system.ruby.network.topology.ext_links0.int_node]
+type=BasicRouter
+router_id=0
+
[system.ruby.network.topology.ext_links1]
type=SimpleExtLink
+children=int_node
bandwidth_factor=16
ext_node=system.dir_cntrl0
-int_node=system.ruby.network.topology.routers1
+int_node=system.ruby.network.topology.ext_links1.int_node
latency=1
link_id=1
weight=1
+[system.ruby.network.topology.ext_links1.int_node]
+type=BasicRouter
+router_id=1
+
[system.ruby.network.topology.int_links0]
type=SimpleIntLink
+children=node_b
bandwidth_factor=16
latency=1
link_id=2
-node_a=system.ruby.network.topology.routers0
-node_b=system.ruby.network.topology.routers2
+node_a=system.ruby.network.topology.ext_links0.int_node
+node_b=system.ruby.network.topology.int_links0.node_b
weight=1
+[system.ruby.network.topology.int_links0.node_b]
+type=BasicRouter
+router_id=2
+
[system.ruby.network.topology.int_links1]
type=SimpleIntLink
bandwidth_factor=16
latency=1
link_id=3
-node_a=system.ruby.network.topology.routers1
-node_b=system.ruby.network.topology.routers2
+node_a=system.ruby.network.topology.ext_links1.int_node
+node_b=system.ruby.network.topology.int_links0.node_b
weight=1
-[system.ruby.network.topology.routers0]
-type=BasicRouter
-router_id=0
-
-[system.ruby.network.topology.routers1]
-type=BasicRouter
-router_id=1
-
-[system.ruby.network.topology.routers2]
-type=BasicRouter
-router_id=2
-
[system.ruby.profiler]
type=RubyProfiler
all_instructions=false
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 0115257b7..c1dc95dd7 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
@@ -34,27 +34,27 @@ periodic_stats_period: 1000000
================ End RubySystem Configuration Print ================
-Real time: Jun/04/2012 14:06:25
+Real time: Jul/10/2012 17:25:18
Profiler Stats
--------------
-Elapsed_time_in_seconds: 1
-Elapsed_time_in_minutes: 0.0166667
-Elapsed_time_in_hours: 0.000277778
-Elapsed_time_in_days: 1.15741e-05
+Elapsed_time_in_seconds: 0
+Elapsed_time_in_minutes: 0
+Elapsed_time_in_hours: 0
+Elapsed_time_in_days: 0
-Virtual_time_in_seconds: 0.26
-Virtual_time_in_minutes: 0.00433333
-Virtual_time_in_hours: 7.22222e-05
-Virtual_time_in_days: 3.00926e-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: 123378
Ruby_start_time: 0
Ruby_cycles: 123378
-mbytes_resident: 46.1406
-mbytes_total: 217.871
-resident_ratio: 0.211779
+mbytes_resident: 44.5195
+mbytes_total: 227.34
+resident_ratio: 0.195845
ruby_cycles_executed: [ 123379 ]
@@ -122,11 +122,11 @@ Resource Usage
page_size: 4096
user_time: 0
system_time: 0
-page_reclaims: 12216
+page_reclaims: 12524
page_faults: 0
swaps: 0
block_inputs: 0
-block_outputs: 88
+block_outputs: 0
Network Stats
-------------
diff --git a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby/simout b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby/simout
index ef2e2d974..da5889aa4 100755
--- a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby/simout
+++ b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby/simout
@@ -1,9 +1,9 @@
gem5 Simulator System. http://gem5.org
gem5 is copyrighted software; use the --copyright option for details.
-gem5 compiled Jun 4 2012 11:50:11
-gem5 started Jun 4 2012 14:06:24
-gem5 executing on zizzer
+gem5 compiled Jul 10 2012 16:32:12
+gem5 started Jul 10 2012 17:25:18
+gem5 executing on sc2b0605
command line: build/ALPHA/gem5.opt -d build/ALPHA/tests/opt/quick/se/00.hello/alpha/tru64/simple-timing-ruby -re tests/run.py build/ALPHA/tests/opt/quick/se/00.hello/alpha/tru64/simple-timing-ruby
Global frequency set at 1000000000 ticks per second
info: Entering event queue @ 0. Starting simulation...
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 d4f9035ad..2f3ee9812 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.000123 # Nu
sim_ticks 123378 # Number of ticks simulated
final_tick 123378 # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
sim_freq 1000000000 # Frequency of simulated ticks
-host_inst_rate 56001 # Simulator instruction rate (inst/s)
-host_op_rate 55979 # Simulator op (including micro ops) rate (op/s)
-host_tick_rate 2679090 # Simulator tick rate (ticks/s)
-host_mem_usage 223104 # Number of bytes of host memory used
-host_seconds 0.05 # Real time elapsed on the host
+host_inst_rate 40842 # Simulator instruction rate (inst/s)
+host_op_rate 40830 # Simulator op (including micro ops) rate (op/s)
+host_tick_rate 1954255 # Simulator tick rate (ticks/s)
+host_mem_usage 232800 # Number of bytes of host memory used
+host_seconds 0.06 # 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,6 +33,12 @@ system.physmem.bw_write::total 16680445 # Wr
system.physmem.bw_total::cpu.inst 83807486 # Total bandwidth to/from this memory (bytes/s)
system.physmem.bw_total::cpu.data 41125646 # Total bandwidth to/from this memory (bytes/s)
system.physmem.bw_total::total 124933132 # 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.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 c2b4be60f..5e5dbf165 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
@@ -78,7 +78,7 @@ egid=100
env=
errout=cerr
euid=100
-executable=/dist/m5/regression/test-progs/hello/bin/mips/linux/hello
+executable=/proj/aatl_perfmod_arch/m5_system_files/regression/test-progs/hello/bin/mips/linux/hello
gid=100
input=cin
max_stack_size=67108864
@@ -151,11 +151,16 @@ version=0
[system.l1_cntrl0.cacheMemory]
type=RubyCache
assoc=2
+dataAccessLatency=1
+dataArrayBanks=1
is_icache=false
latency=3
replacement_policy=PSEUDO_LRU
+resourceStalls=false
size=256
start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
[system.l1_cntrl0.sequencer]
type=RubySequencer
@@ -208,61 +213,64 @@ topology=system.ruby.network.topology
[system.ruby.network.topology]
type=Topology
-children=ext_links0 ext_links1 int_links0 int_links1 routers0 routers1 routers2
+children=ext_links0 ext_links1 int_links0 int_links1
description=Crossbar
ext_links=system.ruby.network.topology.ext_links0 system.ruby.network.topology.ext_links1
int_links=system.ruby.network.topology.int_links0 system.ruby.network.topology.int_links1
print_config=false
-routers=system.ruby.network.topology.routers0 system.ruby.network.topology.routers1 system.ruby.network.topology.routers2
+routers=system.ruby.network.topology.ext_links0.int_node system.ruby.network.topology.ext_links1.int_node system.ruby.network.topology.int_links0.node_b
[system.ruby.network.topology.ext_links0]
type=SimpleExtLink
+children=int_node
bandwidth_factor=16
ext_node=system.l1_cntrl0
-int_node=system.ruby.network.topology.routers0
+int_node=system.ruby.network.topology.ext_links0.int_node
latency=1
link_id=0
weight=1
+[system.ruby.network.topology.ext_links0.int_node]
+type=BasicRouter
+router_id=0
+
[system.ruby.network.topology.ext_links1]
type=SimpleExtLink
+children=int_node
bandwidth_factor=16
ext_node=system.dir_cntrl0
-int_node=system.ruby.network.topology.routers1
+int_node=system.ruby.network.topology.ext_links1.int_node
latency=1
link_id=1
weight=1
+[system.ruby.network.topology.ext_links1.int_node]
+type=BasicRouter
+router_id=1
+
[system.ruby.network.topology.int_links0]
type=SimpleIntLink
+children=node_b
bandwidth_factor=16
latency=1
link_id=2
-node_a=system.ruby.network.topology.routers0
-node_b=system.ruby.network.topology.routers2
+node_a=system.ruby.network.topology.ext_links0.int_node
+node_b=system.ruby.network.topology.int_links0.node_b
weight=1
+[system.ruby.network.topology.int_links0.node_b]
+type=BasicRouter
+router_id=2
+
[system.ruby.network.topology.int_links1]
type=SimpleIntLink
bandwidth_factor=16
latency=1
link_id=3
-node_a=system.ruby.network.topology.routers1
-node_b=system.ruby.network.topology.routers2
+node_a=system.ruby.network.topology.ext_links1.int_node
+node_b=system.ruby.network.topology.int_links0.node_b
weight=1
-[system.ruby.network.topology.routers0]
-type=BasicRouter
-router_id=0
-
-[system.ruby.network.topology.routers1]
-type=BasicRouter
-router_id=1
-
-[system.ruby.network.topology.routers2]
-type=BasicRouter
-router_id=2
-
[system.ruby.profiler]
type=RubyProfiler
all_instructions=false
diff --git a/tests/quick/se/00.hello/ref/mips/linux/simple-timing-ruby/simout b/tests/quick/se/00.hello/ref/mips/linux/simple-timing-ruby/simout
index 9ce456b52..f843b6bdc 100755
--- a/tests/quick/se/00.hello/ref/mips/linux/simple-timing-ruby/simout
+++ b/tests/quick/se/00.hello/ref/mips/linux/simple-timing-ruby/simout
@@ -1,9 +1,9 @@
gem5 Simulator System. http://gem5.org
gem5 is copyrighted software; use the --copyright option for details.
-gem5 compiled Jun 4 2012 11:58:11
-gem5 started Jun 4 2012 14:43:59
-gem5 executing on zizzer
+gem5 compiled Jul 10 2012 17:55:32
+gem5 started Jul 10 2012 17:56:04
+gem5 executing on sc2b0605
command line: build/MIPS/gem5.opt -d build/MIPS/tests/opt/quick/se/00.hello/mips/linux/simple-timing-ruby -re tests/run.py build/MIPS/tests/opt/quick/se/00.hello/mips/linux/simple-timing-ruby
Global frequency set at 1000000000 ticks per second
info: Entering event queue @ 0. Starting simulation...
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 1e3413864..656b52217 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.000293 # Nu
sim_ticks 292960 # Number of ticks simulated
final_tick 292960 # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
sim_freq 1000000000 # Frequency of simulated ticks
-host_inst_rate 55490 # Simulator instruction rate (inst/s)
-host_op_rate 55480 # Simulator op (including micro ops) rate (op/s)
-host_tick_rate 2788890 # Simulator tick rate (ticks/s)
-host_mem_usage 226736 # Number of bytes of host memory used
-host_seconds 0.11 # Real time elapsed on the host
+host_inst_rate 39535 # Simulator instruction rate (inst/s)
+host_op_rate 39530 # Simulator op (including micro ops) rate (op/s)
+host_tick_rate 1987220 # Simulator tick rate (ticks/s)
+host_mem_usage 236468 # Number of bytes of host memory used
+host_seconds 0.15 # Real time elapsed on the host
sim_insts 5827 # Number of instructions simulated
sim_ops 5827 # Number of ops (including micro ops) simulated
system.physmem.bytes_read::cpu.inst 23312 # Number of bytes read from this memory
@@ -33,6 +33,12 @@ system.physmem.bw_write::total 12486346 # Wr
system.physmem.bw_total::cpu.inst 79574003 # Total bandwidth to/from this memory (bytes/s)
system.physmem.bw_total::cpu.data 27420126 # Total bandwidth to/from this memory (bytes/s)
system.physmem.bw_total::total 106994129 # 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.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 7c9c9a36b..671f90296 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
@@ -78,7 +78,7 @@ egid=100
env=
errout=cerr
euid=100
-executable=/dist/m5/regression/test-progs/hello/bin/sparc/linux/hello
+executable=/proj/aatl_perfmod_arch/m5_system_files/regression/test-progs/hello/bin/sparc/linux/hello
gid=100
input=cin
max_stack_size=67108864
@@ -151,11 +151,16 @@ version=0
[system.l1_cntrl0.cacheMemory]
type=RubyCache
assoc=2
+dataAccessLatency=1
+dataArrayBanks=1
is_icache=false
latency=3
replacement_policy=PSEUDO_LRU
+resourceStalls=false
size=256
start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
[system.l1_cntrl0.sequencer]
type=RubySequencer
@@ -208,61 +213,64 @@ topology=system.ruby.network.topology
[system.ruby.network.topology]
type=Topology
-children=ext_links0 ext_links1 int_links0 int_links1 routers0 routers1 routers2
+children=ext_links0 ext_links1 int_links0 int_links1
description=Crossbar
ext_links=system.ruby.network.topology.ext_links0 system.ruby.network.topology.ext_links1
int_links=system.ruby.network.topology.int_links0 system.ruby.network.topology.int_links1
print_config=false
-routers=system.ruby.network.topology.routers0 system.ruby.network.topology.routers1 system.ruby.network.topology.routers2
+routers=system.ruby.network.topology.ext_links0.int_node system.ruby.network.topology.ext_links1.int_node system.ruby.network.topology.int_links0.node_b
[system.ruby.network.topology.ext_links0]
type=SimpleExtLink
+children=int_node
bandwidth_factor=16
ext_node=system.l1_cntrl0
-int_node=system.ruby.network.topology.routers0
+int_node=system.ruby.network.topology.ext_links0.int_node
latency=1
link_id=0
weight=1
+[system.ruby.network.topology.ext_links0.int_node]
+type=BasicRouter
+router_id=0
+
[system.ruby.network.topology.ext_links1]
type=SimpleExtLink
+children=int_node
bandwidth_factor=16
ext_node=system.dir_cntrl0
-int_node=system.ruby.network.topology.routers1
+int_node=system.ruby.network.topology.ext_links1.int_node
latency=1
link_id=1
weight=1
+[system.ruby.network.topology.ext_links1.int_node]
+type=BasicRouter
+router_id=1
+
[system.ruby.network.topology.int_links0]
type=SimpleIntLink
+children=node_b
bandwidth_factor=16
latency=1
link_id=2
-node_a=system.ruby.network.topology.routers0
-node_b=system.ruby.network.topology.routers2
+node_a=system.ruby.network.topology.ext_links0.int_node
+node_b=system.ruby.network.topology.int_links0.node_b
weight=1
+[system.ruby.network.topology.int_links0.node_b]
+type=BasicRouter
+router_id=2
+
[system.ruby.network.topology.int_links1]
type=SimpleIntLink
bandwidth_factor=16
latency=1
link_id=3
-node_a=system.ruby.network.topology.routers1
-node_b=system.ruby.network.topology.routers2
+node_a=system.ruby.network.topology.ext_links1.int_node
+node_b=system.ruby.network.topology.int_links0.node_b
weight=1
-[system.ruby.network.topology.routers0]
-type=BasicRouter
-router_id=0
-
-[system.ruby.network.topology.routers1]
-type=BasicRouter
-router_id=1
-
-[system.ruby.network.topology.routers2]
-type=BasicRouter
-router_id=2
-
[system.ruby.profiler]
type=RubyProfiler
all_instructions=false
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 095eef676..66ca2ebf3 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
@@ -34,7 +34,7 @@ periodic_stats_period: 1000000
================ End RubySystem Configuration Print ================
-Real time: Jun/04/2012 14:44:51
+Real time: Jul/10/2012 17:57:35
Profiler Stats
--------------
@@ -43,18 +43,18 @@ Elapsed_time_in_minutes: 0
Elapsed_time_in_hours: 0
Elapsed_time_in_days: 0
-Virtual_time_in_seconds: 0.31
-Virtual_time_in_minutes: 0.00516667
-Virtual_time_in_hours: 8.61111e-05
-Virtual_time_in_days: 3.58796e-06
+Virtual_time_in_seconds: 0.48
+Virtual_time_in_minutes: 0.008
+Virtual_time_in_hours: 0.000133333
+Virtual_time_in_days: 5.55556e-06
Ruby_current_time: 253364
Ruby_start_time: 0
Ruby_cycles: 253364
-mbytes_resident: 49.3359
-mbytes_total: 227.086
-resident_ratio: 0.217257
+mbytes_resident: 47.7148
+mbytes_total: 237.852
+resident_ratio: 0.200624
ruby_cycles_executed: [ 253365 ]
@@ -122,11 +122,11 @@ Resource Usage
page_size: 4096
user_time: 0
system_time: 0
-page_reclaims: 13015
+page_reclaims: 13315
page_faults: 0
swaps: 0
block_inputs: 0
-block_outputs: 88
+block_outputs: 0
Network Stats
-------------
diff --git a/tests/quick/se/00.hello/ref/sparc/linux/simple-timing-ruby/simout b/tests/quick/se/00.hello/ref/sparc/linux/simple-timing-ruby/simout
index e4a7b2f0d..f8d1a8b44 100755
--- a/tests/quick/se/00.hello/ref/sparc/linux/simple-timing-ruby/simout
+++ b/tests/quick/se/00.hello/ref/sparc/linux/simple-timing-ruby/simout
@@ -1,9 +1,9 @@
gem5 Simulator System. http://gem5.org
gem5 is copyrighted software; use the --copyright option for details.
-gem5 compiled Jun 4 2012 12:01:47
-gem5 started Jun 4 2012 14:44:51
-gem5 executing on zizzer
+gem5 compiled Jul 10 2012 17:56:55
+gem5 started Jul 10 2012 17:57:35
+gem5 executing on sc2b0605
command line: build/SPARC/gem5.opt -d build/SPARC/tests/opt/quick/se/00.hello/sparc/linux/simple-timing-ruby -re tests/run.py build/SPARC/tests/opt/quick/se/00.hello/sparc/linux/simple-timing-ruby
Global frequency set at 1000000000 ticks per second
info: Entering event queue @ 0. Starting simulation...
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 2f30e2be2..4bb30bdf1 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.000253 # Nu
sim_ticks 253364 # Number of ticks simulated
final_tick 253364 # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
sim_freq 1000000000 # Frequency of simulated ticks
-host_inst_rate 57491 # Simulator instruction rate (inst/s)
-host_op_rate 57480 # Simulator op (including micro ops) rate (op/s)
-host_tick_rate 2726732 # Simulator tick rate (ticks/s)
-host_mem_usage 232540 # Number of bytes of host memory used
-host_seconds 0.09 # Real time elapsed on the host
+host_inst_rate 42932 # Simulator instruction rate (inst/s)
+host_op_rate 42926 # Simulator op (including micro ops) rate (op/s)
+host_tick_rate 2036393 # Simulator tick rate (ticks/s)
+host_mem_usage 243564 # Number of bytes of host memory used
+host_seconds 0.12 # Real time elapsed on the host
sim_insts 5340 # Number of instructions simulated
sim_ops 5340 # Number of ops (including micro ops) simulated
system.physmem.bytes_read::cpu.inst 21532 # Number of bytes read from this memory
@@ -33,6 +33,12 @@ system.physmem.bw_write::total 19991001 # Wr
system.physmem.bw_total::cpu.inst 84984449 # Total bandwidth to/from this memory (bytes/s)
system.physmem.bw_total::cpu.data 38158539 # Total bandwidth to/from this memory (bytes/s)
system.physmem.bw_total::total 123142988 # 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.cpu.workload.num_syscalls 11 # Number of system calls
system.cpu.numCycles 253364 # 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 e879347ff..59420f599 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
@@ -99,7 +99,7 @@ egid=100
env=
errout=cerr
euid=100
-executable=/dist/m5/regression/test-progs/hello/bin/x86/linux/hello
+executable=/proj/aatl_perfmod_arch/m5_system_files/regression/test-progs/hello/bin/x86/linux/hello
gid=100
input=cin
max_stack_size=67108864
@@ -172,11 +172,16 @@ version=0
[system.l1_cntrl0.cacheMemory]
type=RubyCache
assoc=2
+dataAccessLatency=1
+dataArrayBanks=1
is_icache=false
latency=3
replacement_policy=PSEUDO_LRU
+resourceStalls=false
size=256
start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
[system.l1_cntrl0.sequencer]
type=RubySequencer
@@ -230,61 +235,64 @@ topology=system.ruby.network.topology
[system.ruby.network.topology]
type=Topology
-children=ext_links0 ext_links1 int_links0 int_links1 routers0 routers1 routers2
+children=ext_links0 ext_links1 int_links0 int_links1
description=Crossbar
ext_links=system.ruby.network.topology.ext_links0 system.ruby.network.topology.ext_links1
int_links=system.ruby.network.topology.int_links0 system.ruby.network.topology.int_links1
print_config=false
-routers=system.ruby.network.topology.routers0 system.ruby.network.topology.routers1 system.ruby.network.topology.routers2
+routers=system.ruby.network.topology.ext_links0.int_node system.ruby.network.topology.ext_links1.int_node system.ruby.network.topology.int_links0.node_b
[system.ruby.network.topology.ext_links0]
type=SimpleExtLink
+children=int_node
bandwidth_factor=16
ext_node=system.l1_cntrl0
-int_node=system.ruby.network.topology.routers0
+int_node=system.ruby.network.topology.ext_links0.int_node
latency=1
link_id=0
weight=1
+[system.ruby.network.topology.ext_links0.int_node]
+type=BasicRouter
+router_id=0
+
[system.ruby.network.topology.ext_links1]
type=SimpleExtLink
+children=int_node
bandwidth_factor=16
ext_node=system.dir_cntrl0
-int_node=system.ruby.network.topology.routers1
+int_node=system.ruby.network.topology.ext_links1.int_node
latency=1
link_id=1
weight=1
+[system.ruby.network.topology.ext_links1.int_node]
+type=BasicRouter
+router_id=1
+
[system.ruby.network.topology.int_links0]
type=SimpleIntLink
+children=node_b
bandwidth_factor=16
latency=1
link_id=2
-node_a=system.ruby.network.topology.routers0
-node_b=system.ruby.network.topology.routers2
+node_a=system.ruby.network.topology.ext_links0.int_node
+node_b=system.ruby.network.topology.int_links0.node_b
weight=1
+[system.ruby.network.topology.int_links0.node_b]
+type=BasicRouter
+router_id=2
+
[system.ruby.network.topology.int_links1]
type=SimpleIntLink
bandwidth_factor=16
latency=1
link_id=3
-node_a=system.ruby.network.topology.routers1
-node_b=system.ruby.network.topology.routers2
+node_a=system.ruby.network.topology.ext_links1.int_node
+node_b=system.ruby.network.topology.int_links0.node_b
weight=1
-[system.ruby.network.topology.routers0]
-type=BasicRouter
-router_id=0
-
-[system.ruby.network.topology.routers1]
-type=BasicRouter
-router_id=1
-
-[system.ruby.network.topology.routers2]
-type=BasicRouter
-router_id=2
-
[system.ruby.profiler]
type=RubyProfiler
all_instructions=false
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 400138927..0c25ca352 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
@@ -34,7 +34,7 @@ periodic_stats_period: 1000000
================ End RubySystem Configuration Print ================
-Real time: Jun/04/2012 15:04:30
+Real time: Jul/10/2012 17:59:21
Profiler Stats
--------------
@@ -43,18 +43,18 @@ Elapsed_time_in_minutes: 0
Elapsed_time_in_hours: 0
Elapsed_time_in_days: 0
-Virtual_time_in_seconds: 0.36
-Virtual_time_in_minutes: 0.006
-Virtual_time_in_hours: 0.0001
-Virtual_time_in_days: 4.16667e-06
+Virtual_time_in_seconds: 0.54
+Virtual_time_in_minutes: 0.009
+Virtual_time_in_hours: 0.00015
+Virtual_time_in_days: 6.25e-06
Ruby_current_time: 276484
Ruby_start_time: 0
Ruby_cycles: 276484
-mbytes_resident: 52.9648
-mbytes_total: 228.941
-resident_ratio: 0.232473
+mbytes_resident: 51.5117
+mbytes_total: 239.223
+resident_ratio: 0.215346
ruby_cycles_executed: [ 276485 ]
@@ -125,11 +125,11 @@ Resource Usage
page_size: 4096
user_time: 0
system_time: 0
-page_reclaims: 14034
+page_reclaims: 14592
page_faults: 0
swaps: 0
block_inputs: 0
-block_outputs: 96
+block_outputs: 0
Network Stats
-------------
diff --git a/tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/simout b/tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/simout
index 781f2a777..64f5cd1a7 100755
--- a/tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/simout
+++ b/tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/simout
@@ -1,9 +1,9 @@
gem5 Simulator System. http://gem5.org
gem5 is copyrighted software; use the --copyright option for details.
-gem5 compiled Jun 4 2012 13:44:28
-gem5 started Jun 4 2012 15:04:30
-gem5 executing on zizzer
+gem5 compiled Jul 10 2012 17:58:36
+gem5 started Jul 10 2012 17:59:21
+gem5 executing on sc2b0605
command line: build/X86/gem5.opt -d build/X86/tests/opt/quick/se/00.hello/x86/linux/simple-timing-ruby -re tests/run.py build/X86/tests/opt/quick/se/00.hello/x86/linux/simple-timing-ruby
Global frequency set at 1000000000 ticks per second
info: Entering event queue @ 0. Starting simulation...
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 37cc5b98f..e50c5939b 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.000276 # Nu
sim_ticks 276484 # Number of ticks simulated
final_tick 276484 # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
sim_freq 1000000000 # Frequency of simulated ticks
-host_inst_rate 48659 # Simulator instruction rate (inst/s)
-host_op_rate 88106 # Simulator op (including micro ops) rate (op/s)
-host_tick_rate 2482786 # Simulator tick rate (ticks/s)
-host_mem_usage 234440 # Number of bytes of host memory used
-host_seconds 0.11 # Real time elapsed on the host
+host_inst_rate 37105 # Simulator instruction rate (inst/s)
+host_op_rate 67187 # Simulator op (including micro ops) rate (op/s)
+host_tick_rate 1893389 # Simulator tick rate (ticks/s)
+host_mem_usage 244968 # Number of bytes of host memory used
+host_seconds 0.15 # Real time elapsed on the host
sim_insts 5417 # Number of instructions simulated
sim_ops 9810 # Number of ops (including micro ops) simulated
system.physmem.bytes_read::cpu.inst 55280 # Number of bytes read from this memory
@@ -33,6 +33,12 @@ system.physmem.bw_write::total 25715774 # Wr
system.physmem.bw_total::cpu.inst 199939237 # Total bandwidth to/from this memory (bytes/s)
system.physmem.bw_total::cpu.data 51279640 # Total bandwidth to/from this memory (bytes/s)
system.physmem.bw_total::total 251218877 # 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.cpu.workload.num_syscalls 11 # Number of system calls
system.cpu.numCycles 276484 # number of cpu cycles simulated
system.cpu.numWorkItemsStarted 0 # number of work items this cpu started
diff --git a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_CMP_directory/config.ini b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_CMP_directory/config.ini
index 35cfc3441..5b264ec2e 100644
--- a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_CMP_directory/config.ini
+++ b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_CMP_directory/config.ini
@@ -14,7 +14,7 @@ init_param=0
kernel=
load_addr_mask=1099511627775
mem_mode=timing
-memories=system.funcmem system.physmem
+memories=system.physmem system.funcmem
num_work_ids=16
readfile=
symbolfile=
@@ -249,20 +249,30 @@ version=0
[system.l1_cntrl0.L1DcacheMemory]
type=RubyCache
assoc=2
+dataAccessLatency=1
+dataArrayBanks=1
is_icache=false
latency=3
replacement_policy=PSEUDO_LRU
+resourceStalls=false
size=256
start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
[system.l1_cntrl0.L1IcacheMemory]
type=RubyCache
assoc=2
+dataAccessLatency=1
+dataArrayBanks=1
is_icache=false
latency=3
replacement_policy=PSEUDO_LRU
+resourceStalls=false
size=256
start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
[system.l1_cntrl0.sequencer]
type=RubySequencer
@@ -302,20 +312,30 @@ version=1
[system.l1_cntrl1.L1DcacheMemory]
type=RubyCache
assoc=2
+dataAccessLatency=1
+dataArrayBanks=1
is_icache=false
latency=3
replacement_policy=PSEUDO_LRU
+resourceStalls=false
size=256
start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
[system.l1_cntrl1.L1IcacheMemory]
type=RubyCache
assoc=2
+dataAccessLatency=1
+dataArrayBanks=1
is_icache=false
latency=3
replacement_policy=PSEUDO_LRU
+resourceStalls=false
size=256
start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
[system.l1_cntrl1.sequencer]
type=RubySequencer
@@ -355,20 +375,30 @@ version=2
[system.l1_cntrl2.L1DcacheMemory]
type=RubyCache
assoc=2
+dataAccessLatency=1
+dataArrayBanks=1
is_icache=false
latency=3
replacement_policy=PSEUDO_LRU
+resourceStalls=false
size=256
start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
[system.l1_cntrl2.L1IcacheMemory]
type=RubyCache
assoc=2
+dataAccessLatency=1
+dataArrayBanks=1
is_icache=false
latency=3
replacement_policy=PSEUDO_LRU
+resourceStalls=false
size=256
start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
[system.l1_cntrl2.sequencer]
type=RubySequencer
@@ -408,20 +438,30 @@ version=3
[system.l1_cntrl3.L1DcacheMemory]
type=RubyCache
assoc=2
+dataAccessLatency=1
+dataArrayBanks=1
is_icache=false
latency=3
replacement_policy=PSEUDO_LRU
+resourceStalls=false
size=256
start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
[system.l1_cntrl3.L1IcacheMemory]
type=RubyCache
assoc=2
+dataAccessLatency=1
+dataArrayBanks=1
is_icache=false
latency=3
replacement_policy=PSEUDO_LRU
+resourceStalls=false
size=256
start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
[system.l1_cntrl3.sequencer]
type=RubySequencer
@@ -461,20 +501,30 @@ version=4
[system.l1_cntrl4.L1DcacheMemory]
type=RubyCache
assoc=2
+dataAccessLatency=1
+dataArrayBanks=1
is_icache=false
latency=3
replacement_policy=PSEUDO_LRU
+resourceStalls=false
size=256
start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
[system.l1_cntrl4.L1IcacheMemory]
type=RubyCache
assoc=2
+dataAccessLatency=1
+dataArrayBanks=1
is_icache=false
latency=3
replacement_policy=PSEUDO_LRU
+resourceStalls=false
size=256
start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
[system.l1_cntrl4.sequencer]
type=RubySequencer
@@ -514,20 +564,30 @@ version=5
[system.l1_cntrl5.L1DcacheMemory]
type=RubyCache
assoc=2
+dataAccessLatency=1
+dataArrayBanks=1
is_icache=false
latency=3
replacement_policy=PSEUDO_LRU
+resourceStalls=false
size=256
start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
[system.l1_cntrl5.L1IcacheMemory]
type=RubyCache
assoc=2
+dataAccessLatency=1
+dataArrayBanks=1
is_icache=false
latency=3
replacement_policy=PSEUDO_LRU
+resourceStalls=false
size=256
start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
[system.l1_cntrl5.sequencer]
type=RubySequencer
@@ -567,20 +627,30 @@ version=6
[system.l1_cntrl6.L1DcacheMemory]
type=RubyCache
assoc=2
+dataAccessLatency=1
+dataArrayBanks=1
is_icache=false
latency=3
replacement_policy=PSEUDO_LRU
+resourceStalls=false
size=256
start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
[system.l1_cntrl6.L1IcacheMemory]
type=RubyCache
assoc=2
+dataAccessLatency=1
+dataArrayBanks=1
is_icache=false
latency=3
replacement_policy=PSEUDO_LRU
+resourceStalls=false
size=256
start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
[system.l1_cntrl6.sequencer]
type=RubySequencer
@@ -620,20 +690,30 @@ version=7
[system.l1_cntrl7.L1DcacheMemory]
type=RubyCache
assoc=2
+dataAccessLatency=1
+dataArrayBanks=1
is_icache=false
latency=3
replacement_policy=PSEUDO_LRU
+resourceStalls=false
size=256
start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
[system.l1_cntrl7.L1IcacheMemory]
type=RubyCache
assoc=2
+dataAccessLatency=1
+dataArrayBanks=1
is_icache=false
latency=3
replacement_policy=PSEUDO_LRU
+resourceStalls=false
size=256
start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
[system.l1_cntrl7.sequencer]
type=RubySequencer
@@ -669,11 +749,16 @@ version=0
[system.l2_cntrl0.L2cacheMemory]
type=RubyCache
assoc=2
+dataAccessLatency=1
+dataArrayBanks=1
is_icache=false
latency=15
replacement_policy=PSEUDO_LRU
+resourceStalls=false
size=512
start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
[system.physmem]
type=SimpleMemory
@@ -710,119 +795,174 @@ topology=system.ruby.network.topology
[system.ruby.network.topology]
type=Topology
-children=ext_links0 ext_links1 ext_links2 ext_links3 ext_links4 ext_links5 ext_links6 ext_links7 ext_links8 ext_links9 int_links0 int_links1 int_links2 int_links3 int_links4 int_links5 int_links6 int_links7 int_links8 int_links9 routers00 routers01 routers02 routers03 routers04 routers05 routers06 routers07 routers08 routers09 routers10
+children=ext_links0 ext_links1 ext_links2 ext_links3 ext_links4 ext_links5 ext_links6 ext_links7 ext_links8 ext_links9 int_links0 int_links1 int_links2 int_links3 int_links4 int_links5 int_links6 int_links7 int_links8 int_links9
description=Crossbar
ext_links=system.ruby.network.topology.ext_links0 system.ruby.network.topology.ext_links1 system.ruby.network.topology.ext_links2 system.ruby.network.topology.ext_links3 system.ruby.network.topology.ext_links4 system.ruby.network.topology.ext_links5 system.ruby.network.topology.ext_links6 system.ruby.network.topology.ext_links7 system.ruby.network.topology.ext_links8 system.ruby.network.topology.ext_links9
int_links=system.ruby.network.topology.int_links0 system.ruby.network.topology.int_links1 system.ruby.network.topology.int_links2 system.ruby.network.topology.int_links3 system.ruby.network.topology.int_links4 system.ruby.network.topology.int_links5 system.ruby.network.topology.int_links6 system.ruby.network.topology.int_links7 system.ruby.network.topology.int_links8 system.ruby.network.topology.int_links9
print_config=false
-routers=system.ruby.network.topology.routers00 system.ruby.network.topology.routers01 system.ruby.network.topology.routers02 system.ruby.network.topology.routers03 system.ruby.network.topology.routers04 system.ruby.network.topology.routers05 system.ruby.network.topology.routers06 system.ruby.network.topology.routers07 system.ruby.network.topology.routers08 system.ruby.network.topology.routers09 system.ruby.network.topology.routers10
+routers=system.ruby.network.topology.ext_links0.int_node system.ruby.network.topology.ext_links1.int_node system.ruby.network.topology.ext_links2.int_node system.ruby.network.topology.ext_links3.int_node system.ruby.network.topology.ext_links4.int_node system.ruby.network.topology.ext_links5.int_node system.ruby.network.topology.ext_links6.int_node system.ruby.network.topology.ext_links7.int_node system.ruby.network.topology.ext_links8.int_node system.ruby.network.topology.ext_links9.int_node system.ruby.network.topology.int_links0.node_b
[system.ruby.network.topology.ext_links0]
type=SimpleExtLink
+children=int_node
bandwidth_factor=16
ext_node=system.l1_cntrl0
-int_node=system.ruby.network.topology.routers00
+int_node=system.ruby.network.topology.ext_links0.int_node
latency=1
link_id=0
weight=1
+[system.ruby.network.topology.ext_links0.int_node]
+type=BasicRouter
+router_id=0
+
[system.ruby.network.topology.ext_links1]
type=SimpleExtLink
+children=int_node
bandwidth_factor=16
ext_node=system.l1_cntrl1
-int_node=system.ruby.network.topology.routers01
+int_node=system.ruby.network.topology.ext_links1.int_node
latency=1
link_id=1
weight=1
+[system.ruby.network.topology.ext_links1.int_node]
+type=BasicRouter
+router_id=1
+
[system.ruby.network.topology.ext_links2]
type=SimpleExtLink
+children=int_node
bandwidth_factor=16
ext_node=system.l1_cntrl2
-int_node=system.ruby.network.topology.routers02
+int_node=system.ruby.network.topology.ext_links2.int_node
latency=1
link_id=2
weight=1
+[system.ruby.network.topology.ext_links2.int_node]
+type=BasicRouter
+router_id=2
+
[system.ruby.network.topology.ext_links3]
type=SimpleExtLink
+children=int_node
bandwidth_factor=16
ext_node=system.l1_cntrl3
-int_node=system.ruby.network.topology.routers03
+int_node=system.ruby.network.topology.ext_links3.int_node
latency=1
link_id=3
weight=1
+[system.ruby.network.topology.ext_links3.int_node]
+type=BasicRouter
+router_id=3
+
[system.ruby.network.topology.ext_links4]
type=SimpleExtLink
+children=int_node
bandwidth_factor=16
ext_node=system.l1_cntrl4
-int_node=system.ruby.network.topology.routers04
+int_node=system.ruby.network.topology.ext_links4.int_node
latency=1
link_id=4
weight=1
+[system.ruby.network.topology.ext_links4.int_node]
+type=BasicRouter
+router_id=4
+
[system.ruby.network.topology.ext_links5]
type=SimpleExtLink
+children=int_node
bandwidth_factor=16
ext_node=system.l1_cntrl5
-int_node=system.ruby.network.topology.routers05
+int_node=system.ruby.network.topology.ext_links5.int_node
latency=1
link_id=5
weight=1
+[system.ruby.network.topology.ext_links5.int_node]
+type=BasicRouter
+router_id=5
+
[system.ruby.network.topology.ext_links6]
type=SimpleExtLink
+children=int_node
bandwidth_factor=16
ext_node=system.l1_cntrl6
-int_node=system.ruby.network.topology.routers06
+int_node=system.ruby.network.topology.ext_links6.int_node
latency=1
link_id=6
weight=1
+[system.ruby.network.topology.ext_links6.int_node]
+type=BasicRouter
+router_id=6
+
[system.ruby.network.topology.ext_links7]
type=SimpleExtLink
+children=int_node
bandwidth_factor=16
ext_node=system.l1_cntrl7
-int_node=system.ruby.network.topology.routers07
+int_node=system.ruby.network.topology.ext_links7.int_node
latency=1
link_id=7
weight=1
+[system.ruby.network.topology.ext_links7.int_node]
+type=BasicRouter
+router_id=7
+
[system.ruby.network.topology.ext_links8]
type=SimpleExtLink
+children=int_node
bandwidth_factor=16
ext_node=system.l2_cntrl0
-int_node=system.ruby.network.topology.routers08
+int_node=system.ruby.network.topology.ext_links8.int_node
latency=1
link_id=8
weight=1
+[system.ruby.network.topology.ext_links8.int_node]
+type=BasicRouter
+router_id=8
+
[system.ruby.network.topology.ext_links9]
type=SimpleExtLink
+children=int_node
bandwidth_factor=16
ext_node=system.dir_cntrl0
-int_node=system.ruby.network.topology.routers09
+int_node=system.ruby.network.topology.ext_links9.int_node
latency=1
link_id=9
weight=1
+[system.ruby.network.topology.ext_links9.int_node]
+type=BasicRouter
+router_id=9
+
[system.ruby.network.topology.int_links0]
type=SimpleIntLink
+children=node_b
bandwidth_factor=16
latency=1
link_id=10
-node_a=system.ruby.network.topology.routers00
-node_b=system.ruby.network.topology.routers10
+node_a=system.ruby.network.topology.ext_links0.int_node
+node_b=system.ruby.network.topology.int_links0.node_b
weight=1
+[system.ruby.network.topology.int_links0.node_b]
+type=BasicRouter
+router_id=10
+
[system.ruby.network.topology.int_links1]
type=SimpleIntLink
bandwidth_factor=16
latency=1
link_id=11
-node_a=system.ruby.network.topology.routers01
-node_b=system.ruby.network.topology.routers10
+node_a=system.ruby.network.topology.ext_links1.int_node
+node_b=system.ruby.network.topology.int_links0.node_b
weight=1
[system.ruby.network.topology.int_links2]
@@ -830,8 +970,8 @@ type=SimpleIntLink
bandwidth_factor=16
latency=1
link_id=12
-node_a=system.ruby.network.topology.routers02
-node_b=system.ruby.network.topology.routers10
+node_a=system.ruby.network.topology.ext_links2.int_node
+node_b=system.ruby.network.topology.int_links0.node_b
weight=1
[system.ruby.network.topology.int_links3]
@@ -839,8 +979,8 @@ type=SimpleIntLink
bandwidth_factor=16
latency=1
link_id=13
-node_a=system.ruby.network.topology.routers03
-node_b=system.ruby.network.topology.routers10
+node_a=system.ruby.network.topology.ext_links3.int_node
+node_b=system.ruby.network.topology.int_links0.node_b
weight=1
[system.ruby.network.topology.int_links4]
@@ -848,8 +988,8 @@ type=SimpleIntLink
bandwidth_factor=16
latency=1
link_id=14
-node_a=system.ruby.network.topology.routers04
-node_b=system.ruby.network.topology.routers10
+node_a=system.ruby.network.topology.ext_links4.int_node
+node_b=system.ruby.network.topology.int_links0.node_b
weight=1
[system.ruby.network.topology.int_links5]
@@ -857,8 +997,8 @@ type=SimpleIntLink
bandwidth_factor=16
latency=1
link_id=15
-node_a=system.ruby.network.topology.routers05
-node_b=system.ruby.network.topology.routers10
+node_a=system.ruby.network.topology.ext_links5.int_node
+node_b=system.ruby.network.topology.int_links0.node_b
weight=1
[system.ruby.network.topology.int_links6]
@@ -866,8 +1006,8 @@ type=SimpleIntLink
bandwidth_factor=16
latency=1
link_id=16
-node_a=system.ruby.network.topology.routers06
-node_b=system.ruby.network.topology.routers10
+node_a=system.ruby.network.topology.ext_links6.int_node
+node_b=system.ruby.network.topology.int_links0.node_b
weight=1
[system.ruby.network.topology.int_links7]
@@ -875,8 +1015,8 @@ type=SimpleIntLink
bandwidth_factor=16
latency=1
link_id=17
-node_a=system.ruby.network.topology.routers07
-node_b=system.ruby.network.topology.routers10
+node_a=system.ruby.network.topology.ext_links7.int_node
+node_b=system.ruby.network.topology.int_links0.node_b
weight=1
[system.ruby.network.topology.int_links8]
@@ -884,8 +1024,8 @@ type=SimpleIntLink
bandwidth_factor=16
latency=1
link_id=18
-node_a=system.ruby.network.topology.routers08
-node_b=system.ruby.network.topology.routers10
+node_a=system.ruby.network.topology.ext_links8.int_node
+node_b=system.ruby.network.topology.int_links0.node_b
weight=1
[system.ruby.network.topology.int_links9]
@@ -893,54 +1033,10 @@ type=SimpleIntLink
bandwidth_factor=16
latency=1
link_id=19
-node_a=system.ruby.network.topology.routers09
-node_b=system.ruby.network.topology.routers10
+node_a=system.ruby.network.topology.ext_links9.int_node
+node_b=system.ruby.network.topology.int_links0.node_b
weight=1
-[system.ruby.network.topology.routers00]
-type=BasicRouter
-router_id=0
-
-[system.ruby.network.topology.routers01]
-type=BasicRouter
-router_id=1
-
-[system.ruby.network.topology.routers02]
-type=BasicRouter
-router_id=2
-
-[system.ruby.network.topology.routers03]
-type=BasicRouter
-router_id=3
-
-[system.ruby.network.topology.routers04]
-type=BasicRouter
-router_id=4
-
-[system.ruby.network.topology.routers05]
-type=BasicRouter
-router_id=5
-
-[system.ruby.network.topology.routers06]
-type=BasicRouter
-router_id=6
-
-[system.ruby.network.topology.routers07]
-type=BasicRouter
-router_id=7
-
-[system.ruby.network.topology.routers08]
-type=BasicRouter
-router_id=8
-
-[system.ruby.network.topology.routers09]
-type=BasicRouter
-router_id=9
-
-[system.ruby.network.topology.routers10]
-type=BasicRouter
-router_id=10
-
[system.ruby.profiler]
type=RubyProfiler
all_instructions=false
diff --git a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_CMP_directory/ruby.stats b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_CMP_directory/ruby.stats
index 1cbda9483..f029d597d 100644
--- a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_CMP_directory/ruby.stats
+++ b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_CMP_directory/ruby.stats
@@ -34,27 +34,27 @@ periodic_stats_period: 1000000
================ End RubySystem Configuration Print ================
-Real time: Jun/04/2012 14:41:50
+Real time: Jul/10/2012 17:34:09
Profiler Stats
--------------
-Elapsed_time_in_seconds: 88
-Elapsed_time_in_minutes: 1.46667
-Elapsed_time_in_hours: 0.0244444
-Elapsed_time_in_days: 0.00101852
+Elapsed_time_in_seconds: 132
+Elapsed_time_in_minutes: 2.2
+Elapsed_time_in_hours: 0.0366667
+Elapsed_time_in_days: 0.00152778
-Virtual_time_in_seconds: 87.84
-Virtual_time_in_minutes: 1.464
-Virtual_time_in_hours: 0.0244
-Virtual_time_in_days: 0.00101667
+Virtual_time_in_seconds: 132.01
+Virtual_time_in_minutes: 2.20017
+Virtual_time_in_hours: 0.0366694
+Virtual_time_in_days: 0.00152789
Ruby_current_time: 22495354
Ruby_start_time: 0
Ruby_cycles: 22495354
-mbytes_resident: 61.2852
-mbytes_total: 361.766
-resident_ratio: 0.169406
+mbytes_resident: 59.8242
+mbytes_total: 371.453
+resident_ratio: 0.161065
ruby_cycles_executed: [ 22495355 22495355 22495355 22495355 22495355 22495355 22495355 22495355 ]
@@ -116,13 +116,13 @@ Total_nonPF_delay_cycles: [binsize: 1 max: 18 count: 3280807 average: 0.508064 |
Resource Usage
--------------
page_size: 4096
-user_time: 87
+user_time: 131
system_time: 0
-page_reclaims: 16135
+page_reclaims: 16523
page_faults: 0
swaps: 0
block_inputs: 0
-block_outputs: 216
+block_outputs: 0
Network Stats
-------------
diff --git a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_CMP_directory/simout b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_CMP_directory/simout
index 4c179bc95..bc0d86d72 100755
--- a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_CMP_directory/simout
+++ b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_CMP_directory/simout
@@ -1,9 +1,9 @@
gem5 Simulator System. http://gem5.org
gem5 is copyrighted software; use the --copyright option for details.
-gem5 compiled Jun 4 2012 11:53:20
-gem5 started Jun 4 2012 14:40:22
-gem5 executing on zizzer
+gem5 compiled Jul 10 2012 17:30:17
+gem5 started Jul 10 2012 17:31:57
+gem5 executing on sc2b0605
command line: build/ALPHA_MESI_CMP_directory/gem5.opt -d build/ALPHA_MESI_CMP_directory/tests/opt/quick/se/50.memtest/alpha/linux/memtest-ruby-MESI_CMP_directory -re tests/run.py build/ALPHA_MESI_CMP_directory/tests/opt/quick/se/50.memtest/alpha/linux/memtest-ruby-MESI_CMP_directory
Global frequency set at 1000000000 ticks per second
info: Entering event queue @ 0. Starting simulation...
diff --git a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_CMP_directory/stats.txt b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_CMP_directory/stats.txt
index c7afc7b3a..3b11b4fe0 100644
--- a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_CMP_directory/stats.txt
+++ b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_CMP_directory/stats.txt
@@ -4,9 +4,111 @@ sim_seconds 0.022495 # Nu
sim_ticks 22495354 # Number of ticks simulated
final_tick 22495354 # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
sim_freq 1000000000 # Frequency of simulated ticks
-host_tick_rate 256726 # Simulator tick rate (ticks/s)
-host_mem_usage 370452 # Number of bytes of host memory used
-host_seconds 87.62 # Real time elapsed on the host
+host_tick_rate 170886 # Simulator tick rate (ticks/s)
+host_mem_usage 380372 # Number of bytes of host memory used
+host_seconds 131.64 # Real time elapsed on the host
+system.l1_cntrl4.L1DcacheMemory.num_data_array_reads 0 # number of data array reads
+system.l1_cntrl4.L1DcacheMemory.num_data_array_writes 0 # number of data array writes
+system.l1_cntrl4.L1DcacheMemory.num_tag_array_reads 0 # number of tag array reads
+system.l1_cntrl4.L1DcacheMemory.num_tag_array_writes 0 # number of tag array writes
+system.l1_cntrl4.L1DcacheMemory.num_tag_array_stalls 0 # number of stalls caused by tag array
+system.l1_cntrl4.L1DcacheMemory.num_data_array_stalls 0 # number of stalls caused by data array
+system.l1_cntrl4.L1IcacheMemory.num_data_array_reads 0 # number of data array reads
+system.l1_cntrl4.L1IcacheMemory.num_data_array_writes 0 # number of data array writes
+system.l1_cntrl4.L1IcacheMemory.num_tag_array_reads 0 # number of tag array reads
+system.l1_cntrl4.L1IcacheMemory.num_tag_array_writes 0 # number of tag array writes
+system.l1_cntrl4.L1IcacheMemory.num_tag_array_stalls 0 # number of stalls caused by tag array
+system.l1_cntrl4.L1IcacheMemory.num_data_array_stalls 0 # number of stalls caused by data array
+system.l1_cntrl5.L1DcacheMemory.num_data_array_reads 0 # number of data array reads
+system.l1_cntrl5.L1DcacheMemory.num_data_array_writes 0 # number of data array writes
+system.l1_cntrl5.L1DcacheMemory.num_tag_array_reads 0 # number of tag array reads
+system.l1_cntrl5.L1DcacheMemory.num_tag_array_writes 0 # number of tag array writes
+system.l1_cntrl5.L1DcacheMemory.num_tag_array_stalls 0 # number of stalls caused by tag array
+system.l1_cntrl5.L1DcacheMemory.num_data_array_stalls 0 # number of stalls caused by data array
+system.l1_cntrl5.L1IcacheMemory.num_data_array_reads 0 # number of data array reads
+system.l1_cntrl5.L1IcacheMemory.num_data_array_writes 0 # number of data array writes
+system.l1_cntrl5.L1IcacheMemory.num_tag_array_reads 0 # number of tag array reads
+system.l1_cntrl5.L1IcacheMemory.num_tag_array_writes 0 # number of tag array writes
+system.l1_cntrl5.L1IcacheMemory.num_tag_array_stalls 0 # number of stalls caused by tag array
+system.l1_cntrl5.L1IcacheMemory.num_data_array_stalls 0 # number of stalls caused by data array
+system.l1_cntrl6.L1DcacheMemory.num_data_array_reads 0 # number of data array reads
+system.l1_cntrl6.L1DcacheMemory.num_data_array_writes 0 # number of data array writes
+system.l1_cntrl6.L1DcacheMemory.num_tag_array_reads 0 # number of tag array reads
+system.l1_cntrl6.L1DcacheMemory.num_tag_array_writes 0 # number of tag array writes
+system.l1_cntrl6.L1DcacheMemory.num_tag_array_stalls 0 # number of stalls caused by tag array
+system.l1_cntrl6.L1DcacheMemory.num_data_array_stalls 0 # number of stalls caused by data array
+system.l1_cntrl6.L1IcacheMemory.num_data_array_reads 0 # number of data array reads
+system.l1_cntrl6.L1IcacheMemory.num_data_array_writes 0 # number of data array writes
+system.l1_cntrl6.L1IcacheMemory.num_tag_array_reads 0 # number of tag array reads
+system.l1_cntrl6.L1IcacheMemory.num_tag_array_writes 0 # number of tag array writes
+system.l1_cntrl6.L1IcacheMemory.num_tag_array_stalls 0 # number of stalls caused by tag array
+system.l1_cntrl6.L1IcacheMemory.num_data_array_stalls 0 # number of stalls caused by data array
+system.l1_cntrl7.L1DcacheMemory.num_data_array_reads 0 # number of data array reads
+system.l1_cntrl7.L1DcacheMemory.num_data_array_writes 0 # number of data array writes
+system.l1_cntrl7.L1DcacheMemory.num_tag_array_reads 0 # number of tag array reads
+system.l1_cntrl7.L1DcacheMemory.num_tag_array_writes 0 # number of tag array writes
+system.l1_cntrl7.L1DcacheMemory.num_tag_array_stalls 0 # number of stalls caused by tag array
+system.l1_cntrl7.L1DcacheMemory.num_data_array_stalls 0 # number of stalls caused by data array
+system.l1_cntrl7.L1IcacheMemory.num_data_array_reads 0 # number of data array reads
+system.l1_cntrl7.L1IcacheMemory.num_data_array_writes 0 # number of data array writes
+system.l1_cntrl7.L1IcacheMemory.num_tag_array_reads 0 # number of tag array reads
+system.l1_cntrl7.L1IcacheMemory.num_tag_array_writes 0 # number of tag array writes
+system.l1_cntrl7.L1IcacheMemory.num_tag_array_stalls 0 # number of stalls caused by tag array
+system.l1_cntrl7.L1IcacheMemory.num_data_array_stalls 0 # number of stalls caused by data array
+system.l1_cntrl0.L1DcacheMemory.num_data_array_reads 0 # number of data array reads
+system.l1_cntrl0.L1DcacheMemory.num_data_array_writes 0 # number of data array writes
+system.l1_cntrl0.L1DcacheMemory.num_tag_array_reads 0 # number of tag array reads
+system.l1_cntrl0.L1DcacheMemory.num_tag_array_writes 0 # number of tag array writes
+system.l1_cntrl0.L1DcacheMemory.num_tag_array_stalls 0 # number of stalls caused by tag array
+system.l1_cntrl0.L1DcacheMemory.num_data_array_stalls 0 # number of stalls caused by data array
+system.l1_cntrl0.L1IcacheMemory.num_data_array_reads 0 # number of data array reads
+system.l1_cntrl0.L1IcacheMemory.num_data_array_writes 0 # number of data array writes
+system.l1_cntrl0.L1IcacheMemory.num_tag_array_reads 0 # number of tag array reads
+system.l1_cntrl0.L1IcacheMemory.num_tag_array_writes 0 # number of tag array writes
+system.l1_cntrl0.L1IcacheMemory.num_tag_array_stalls 0 # number of stalls caused by tag array
+system.l1_cntrl0.L1IcacheMemory.num_data_array_stalls 0 # number of stalls caused by data array
+system.l1_cntrl1.L1DcacheMemory.num_data_array_reads 0 # number of data array reads
+system.l1_cntrl1.L1DcacheMemory.num_data_array_writes 0 # number of data array writes
+system.l1_cntrl1.L1DcacheMemory.num_tag_array_reads 0 # number of tag array reads
+system.l1_cntrl1.L1DcacheMemory.num_tag_array_writes 0 # number of tag array writes
+system.l1_cntrl1.L1DcacheMemory.num_tag_array_stalls 0 # number of stalls caused by tag array
+system.l1_cntrl1.L1DcacheMemory.num_data_array_stalls 0 # number of stalls caused by data array
+system.l1_cntrl1.L1IcacheMemory.num_data_array_reads 0 # number of data array reads
+system.l1_cntrl1.L1IcacheMemory.num_data_array_writes 0 # number of data array writes
+system.l1_cntrl1.L1IcacheMemory.num_tag_array_reads 0 # number of tag array reads
+system.l1_cntrl1.L1IcacheMemory.num_tag_array_writes 0 # number of tag array writes
+system.l1_cntrl1.L1IcacheMemory.num_tag_array_stalls 0 # number of stalls caused by tag array
+system.l1_cntrl1.L1IcacheMemory.num_data_array_stalls 0 # number of stalls caused by data array
+system.l1_cntrl2.L1DcacheMemory.num_data_array_reads 0 # number of data array reads
+system.l1_cntrl2.L1DcacheMemory.num_data_array_writes 0 # number of data array writes
+system.l1_cntrl2.L1DcacheMemory.num_tag_array_reads 0 # number of tag array reads
+system.l1_cntrl2.L1DcacheMemory.num_tag_array_writes 0 # number of tag array writes
+system.l1_cntrl2.L1DcacheMemory.num_tag_array_stalls 0 # number of stalls caused by tag array
+system.l1_cntrl2.L1DcacheMemory.num_data_array_stalls 0 # number of stalls caused by data array
+system.l1_cntrl2.L1IcacheMemory.num_data_array_reads 0 # number of data array reads
+system.l1_cntrl2.L1IcacheMemory.num_data_array_writes 0 # number of data array writes
+system.l1_cntrl2.L1IcacheMemory.num_tag_array_reads 0 # number of tag array reads
+system.l1_cntrl2.L1IcacheMemory.num_tag_array_writes 0 # number of tag array writes
+system.l1_cntrl2.L1IcacheMemory.num_tag_array_stalls 0 # number of stalls caused by tag array
+system.l1_cntrl2.L1IcacheMemory.num_data_array_stalls 0 # number of stalls caused by data array
+system.l1_cntrl3.L1DcacheMemory.num_data_array_reads 0 # number of data array reads
+system.l1_cntrl3.L1DcacheMemory.num_data_array_writes 0 # number of data array writes
+system.l1_cntrl3.L1DcacheMemory.num_tag_array_reads 0 # number of tag array reads
+system.l1_cntrl3.L1DcacheMemory.num_tag_array_writes 0 # number of tag array writes
+system.l1_cntrl3.L1DcacheMemory.num_tag_array_stalls 0 # number of stalls caused by tag array
+system.l1_cntrl3.L1DcacheMemory.num_data_array_stalls 0 # number of stalls caused by data array
+system.l1_cntrl3.L1IcacheMemory.num_data_array_reads 0 # number of data array reads
+system.l1_cntrl3.L1IcacheMemory.num_data_array_writes 0 # number of data array writes
+system.l1_cntrl3.L1IcacheMemory.num_tag_array_reads 0 # number of tag array reads
+system.l1_cntrl3.L1IcacheMemory.num_tag_array_writes 0 # number of tag array writes
+system.l1_cntrl3.L1IcacheMemory.num_tag_array_stalls 0 # number of stalls caused by tag array
+system.l1_cntrl3.L1IcacheMemory.num_data_array_stalls 0 # number of stalls caused by data array
+system.l2_cntrl0.L2cacheMemory.num_data_array_reads 0 # number of data array reads
+system.l2_cntrl0.L2cacheMemory.num_data_array_writes 0 # number of data array writes
+system.l2_cntrl0.L2cacheMemory.num_tag_array_reads 0 # number of tag array reads
+system.l2_cntrl0.L2cacheMemory.num_tag_array_writes 0 # number of tag array writes
+system.l2_cntrl0.L2cacheMemory.num_tag_array_stalls 0 # number of stalls caused by tag array
+system.l2_cntrl0.L2cacheMemory.num_data_array_stalls 0 # number of stalls caused by data array
system.cpu0.num_reads 99326 # number of read accesses completed
system.cpu0.num_writes 53132 # number of write accesses completed
system.cpu0.num_copies 0 # number of copy accesses completed
diff --git a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_directory/config.ini b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_directory/config.ini
index e3b9d4def..ff00bba8d 100644
--- a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_directory/config.ini
+++ b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_directory/config.ini
@@ -246,20 +246,30 @@ version=0
[system.l1_cntrl0.L1DcacheMemory]
type=RubyCache
assoc=2
+dataAccessLatency=1
+dataArrayBanks=1
is_icache=false
latency=3
replacement_policy=PSEUDO_LRU
+resourceStalls=false
size=256
start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
[system.l1_cntrl0.L1IcacheMemory]
type=RubyCache
assoc=2
+dataAccessLatency=1
+dataArrayBanks=1
is_icache=false
latency=3
replacement_policy=PSEUDO_LRU
+resourceStalls=false
size=256
start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
[system.l1_cntrl0.sequencer]
type=RubySequencer
@@ -297,20 +307,30 @@ version=1
[system.l1_cntrl1.L1DcacheMemory]
type=RubyCache
assoc=2
+dataAccessLatency=1
+dataArrayBanks=1
is_icache=false
latency=3
replacement_policy=PSEUDO_LRU
+resourceStalls=false
size=256
start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
[system.l1_cntrl1.L1IcacheMemory]
type=RubyCache
assoc=2
+dataAccessLatency=1
+dataArrayBanks=1
is_icache=false
latency=3
replacement_policy=PSEUDO_LRU
+resourceStalls=false
size=256
start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
[system.l1_cntrl1.sequencer]
type=RubySequencer
@@ -348,20 +368,30 @@ version=2
[system.l1_cntrl2.L1DcacheMemory]
type=RubyCache
assoc=2
+dataAccessLatency=1
+dataArrayBanks=1
is_icache=false
latency=3
replacement_policy=PSEUDO_LRU
+resourceStalls=false
size=256
start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
[system.l1_cntrl2.L1IcacheMemory]
type=RubyCache
assoc=2
+dataAccessLatency=1
+dataArrayBanks=1
is_icache=false
latency=3
replacement_policy=PSEUDO_LRU
+resourceStalls=false
size=256
start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
[system.l1_cntrl2.sequencer]
type=RubySequencer
@@ -399,20 +429,30 @@ version=3
[system.l1_cntrl3.L1DcacheMemory]
type=RubyCache
assoc=2
+dataAccessLatency=1
+dataArrayBanks=1
is_icache=false
latency=3
replacement_policy=PSEUDO_LRU
+resourceStalls=false
size=256
start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
[system.l1_cntrl3.L1IcacheMemory]
type=RubyCache
assoc=2
+dataAccessLatency=1
+dataArrayBanks=1
is_icache=false
latency=3
replacement_policy=PSEUDO_LRU
+resourceStalls=false
size=256
start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
[system.l1_cntrl3.sequencer]
type=RubySequencer
@@ -450,20 +490,30 @@ version=4
[system.l1_cntrl4.L1DcacheMemory]
type=RubyCache
assoc=2
+dataAccessLatency=1
+dataArrayBanks=1
is_icache=false
latency=3
replacement_policy=PSEUDO_LRU
+resourceStalls=false
size=256
start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
[system.l1_cntrl4.L1IcacheMemory]
type=RubyCache
assoc=2
+dataAccessLatency=1
+dataArrayBanks=1
is_icache=false
latency=3
replacement_policy=PSEUDO_LRU
+resourceStalls=false
size=256
start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
[system.l1_cntrl4.sequencer]
type=RubySequencer
@@ -501,20 +551,30 @@ version=5
[system.l1_cntrl5.L1DcacheMemory]
type=RubyCache
assoc=2
+dataAccessLatency=1
+dataArrayBanks=1
is_icache=false
latency=3
replacement_policy=PSEUDO_LRU
+resourceStalls=false
size=256
start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
[system.l1_cntrl5.L1IcacheMemory]
type=RubyCache
assoc=2
+dataAccessLatency=1
+dataArrayBanks=1
is_icache=false
latency=3
replacement_policy=PSEUDO_LRU
+resourceStalls=false
size=256
start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
[system.l1_cntrl5.sequencer]
type=RubySequencer
@@ -552,20 +612,30 @@ version=6
[system.l1_cntrl6.L1DcacheMemory]
type=RubyCache
assoc=2
+dataAccessLatency=1
+dataArrayBanks=1
is_icache=false
latency=3
replacement_policy=PSEUDO_LRU
+resourceStalls=false
size=256
start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
[system.l1_cntrl6.L1IcacheMemory]
type=RubyCache
assoc=2
+dataAccessLatency=1
+dataArrayBanks=1
is_icache=false
latency=3
replacement_policy=PSEUDO_LRU
+resourceStalls=false
size=256
start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
[system.l1_cntrl6.sequencer]
type=RubySequencer
@@ -603,20 +673,30 @@ version=7
[system.l1_cntrl7.L1DcacheMemory]
type=RubyCache
assoc=2
+dataAccessLatency=1
+dataArrayBanks=1
is_icache=false
latency=3
replacement_policy=PSEUDO_LRU
+resourceStalls=false
size=256
start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
[system.l1_cntrl7.L1IcacheMemory]
type=RubyCache
assoc=2
+dataAccessLatency=1
+dataArrayBanks=1
is_icache=false
latency=3
replacement_policy=PSEUDO_LRU
+resourceStalls=false
size=256
start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
[system.l1_cntrl7.sequencer]
type=RubySequencer
@@ -651,11 +731,16 @@ version=0
[system.l2_cntrl0.L2cacheMemory]
type=RubyCache
assoc=2
+dataAccessLatency=1
+dataArrayBanks=1
is_icache=false
latency=15
replacement_policy=PSEUDO_LRU
+resourceStalls=false
size=512
start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
[system.physmem]
type=SimpleMemory
@@ -692,119 +777,174 @@ topology=system.ruby.network.topology
[system.ruby.network.topology]
type=Topology
-children=ext_links0 ext_links1 ext_links2 ext_links3 ext_links4 ext_links5 ext_links6 ext_links7 ext_links8 ext_links9 int_links0 int_links1 int_links2 int_links3 int_links4 int_links5 int_links6 int_links7 int_links8 int_links9 routers00 routers01 routers02 routers03 routers04 routers05 routers06 routers07 routers08 routers09 routers10
+children=ext_links0 ext_links1 ext_links2 ext_links3 ext_links4 ext_links5 ext_links6 ext_links7 ext_links8 ext_links9 int_links0 int_links1 int_links2 int_links3 int_links4 int_links5 int_links6 int_links7 int_links8 int_links9
description=Crossbar
ext_links=system.ruby.network.topology.ext_links0 system.ruby.network.topology.ext_links1 system.ruby.network.topology.ext_links2 system.ruby.network.topology.ext_links3 system.ruby.network.topology.ext_links4 system.ruby.network.topology.ext_links5 system.ruby.network.topology.ext_links6 system.ruby.network.topology.ext_links7 system.ruby.network.topology.ext_links8 system.ruby.network.topology.ext_links9
int_links=system.ruby.network.topology.int_links0 system.ruby.network.topology.int_links1 system.ruby.network.topology.int_links2 system.ruby.network.topology.int_links3 system.ruby.network.topology.int_links4 system.ruby.network.topology.int_links5 system.ruby.network.topology.int_links6 system.ruby.network.topology.int_links7 system.ruby.network.topology.int_links8 system.ruby.network.topology.int_links9
print_config=false
-routers=system.ruby.network.topology.routers00 system.ruby.network.topology.routers01 system.ruby.network.topology.routers02 system.ruby.network.topology.routers03 system.ruby.network.topology.routers04 system.ruby.network.topology.routers05 system.ruby.network.topology.routers06 system.ruby.network.topology.routers07 system.ruby.network.topology.routers08 system.ruby.network.topology.routers09 system.ruby.network.topology.routers10
+routers=system.ruby.network.topology.ext_links0.int_node system.ruby.network.topology.ext_links1.int_node system.ruby.network.topology.ext_links2.int_node system.ruby.network.topology.ext_links3.int_node system.ruby.network.topology.ext_links4.int_node system.ruby.network.topology.ext_links5.int_node system.ruby.network.topology.ext_links6.int_node system.ruby.network.topology.ext_links7.int_node system.ruby.network.topology.ext_links8.int_node system.ruby.network.topology.ext_links9.int_node system.ruby.network.topology.int_links0.node_b
[system.ruby.network.topology.ext_links0]
type=SimpleExtLink
+children=int_node
bandwidth_factor=16
ext_node=system.l1_cntrl0
-int_node=system.ruby.network.topology.routers00
+int_node=system.ruby.network.topology.ext_links0.int_node
latency=1
link_id=0
weight=1
+[system.ruby.network.topology.ext_links0.int_node]
+type=BasicRouter
+router_id=0
+
[system.ruby.network.topology.ext_links1]
type=SimpleExtLink
+children=int_node
bandwidth_factor=16
ext_node=system.l1_cntrl1
-int_node=system.ruby.network.topology.routers01
+int_node=system.ruby.network.topology.ext_links1.int_node
latency=1
link_id=1
weight=1
+[system.ruby.network.topology.ext_links1.int_node]
+type=BasicRouter
+router_id=1
+
[system.ruby.network.topology.ext_links2]
type=SimpleExtLink
+children=int_node
bandwidth_factor=16
ext_node=system.l1_cntrl2
-int_node=system.ruby.network.topology.routers02
+int_node=system.ruby.network.topology.ext_links2.int_node
latency=1
link_id=2
weight=1
+[system.ruby.network.topology.ext_links2.int_node]
+type=BasicRouter
+router_id=2
+
[system.ruby.network.topology.ext_links3]
type=SimpleExtLink
+children=int_node
bandwidth_factor=16
ext_node=system.l1_cntrl3
-int_node=system.ruby.network.topology.routers03
+int_node=system.ruby.network.topology.ext_links3.int_node
latency=1
link_id=3
weight=1
+[system.ruby.network.topology.ext_links3.int_node]
+type=BasicRouter
+router_id=3
+
[system.ruby.network.topology.ext_links4]
type=SimpleExtLink
+children=int_node
bandwidth_factor=16
ext_node=system.l1_cntrl4
-int_node=system.ruby.network.topology.routers04
+int_node=system.ruby.network.topology.ext_links4.int_node
latency=1
link_id=4
weight=1
+[system.ruby.network.topology.ext_links4.int_node]
+type=BasicRouter
+router_id=4
+
[system.ruby.network.topology.ext_links5]
type=SimpleExtLink
+children=int_node
bandwidth_factor=16
ext_node=system.l1_cntrl5
-int_node=system.ruby.network.topology.routers05
+int_node=system.ruby.network.topology.ext_links5.int_node
latency=1
link_id=5
weight=1
+[system.ruby.network.topology.ext_links5.int_node]
+type=BasicRouter
+router_id=5
+
[system.ruby.network.topology.ext_links6]
type=SimpleExtLink
+children=int_node
bandwidth_factor=16
ext_node=system.l1_cntrl6
-int_node=system.ruby.network.topology.routers06
+int_node=system.ruby.network.topology.ext_links6.int_node
latency=1
link_id=6
weight=1
+[system.ruby.network.topology.ext_links6.int_node]
+type=BasicRouter
+router_id=6
+
[system.ruby.network.topology.ext_links7]
type=SimpleExtLink
+children=int_node
bandwidth_factor=16
ext_node=system.l1_cntrl7
-int_node=system.ruby.network.topology.routers07
+int_node=system.ruby.network.topology.ext_links7.int_node
latency=1
link_id=7
weight=1
+[system.ruby.network.topology.ext_links7.int_node]
+type=BasicRouter
+router_id=7
+
[system.ruby.network.topology.ext_links8]
type=SimpleExtLink
+children=int_node
bandwidth_factor=16
ext_node=system.l2_cntrl0
-int_node=system.ruby.network.topology.routers08
+int_node=system.ruby.network.topology.ext_links8.int_node
latency=1
link_id=8
weight=1
+[system.ruby.network.topology.ext_links8.int_node]
+type=BasicRouter
+router_id=8
+
[system.ruby.network.topology.ext_links9]
type=SimpleExtLink
+children=int_node
bandwidth_factor=16
ext_node=system.dir_cntrl0
-int_node=system.ruby.network.topology.routers09
+int_node=system.ruby.network.topology.ext_links9.int_node
latency=1
link_id=9
weight=1
+[system.ruby.network.topology.ext_links9.int_node]
+type=BasicRouter
+router_id=9
+
[system.ruby.network.topology.int_links0]
type=SimpleIntLink
+children=node_b
bandwidth_factor=16
latency=1
link_id=10
-node_a=system.ruby.network.topology.routers00
-node_b=system.ruby.network.topology.routers10
+node_a=system.ruby.network.topology.ext_links0.int_node
+node_b=system.ruby.network.topology.int_links0.node_b
weight=1
+[system.ruby.network.topology.int_links0.node_b]
+type=BasicRouter
+router_id=10
+
[system.ruby.network.topology.int_links1]
type=SimpleIntLink
bandwidth_factor=16
latency=1
link_id=11
-node_a=system.ruby.network.topology.routers01
-node_b=system.ruby.network.topology.routers10
+node_a=system.ruby.network.topology.ext_links1.int_node
+node_b=system.ruby.network.topology.int_links0.node_b
weight=1
[system.ruby.network.topology.int_links2]
@@ -812,8 +952,8 @@ type=SimpleIntLink
bandwidth_factor=16
latency=1
link_id=12
-node_a=system.ruby.network.topology.routers02
-node_b=system.ruby.network.topology.routers10
+node_a=system.ruby.network.topology.ext_links2.int_node
+node_b=system.ruby.network.topology.int_links0.node_b
weight=1
[system.ruby.network.topology.int_links3]
@@ -821,8 +961,8 @@ type=SimpleIntLink
bandwidth_factor=16
latency=1
link_id=13
-node_a=system.ruby.network.topology.routers03
-node_b=system.ruby.network.topology.routers10
+node_a=system.ruby.network.topology.ext_links3.int_node
+node_b=system.ruby.network.topology.int_links0.node_b
weight=1
[system.ruby.network.topology.int_links4]
@@ -830,8 +970,8 @@ type=SimpleIntLink
bandwidth_factor=16
latency=1
link_id=14
-node_a=system.ruby.network.topology.routers04
-node_b=system.ruby.network.topology.routers10
+node_a=system.ruby.network.topology.ext_links4.int_node
+node_b=system.ruby.network.topology.int_links0.node_b
weight=1
[system.ruby.network.topology.int_links5]
@@ -839,8 +979,8 @@ type=SimpleIntLink
bandwidth_factor=16
latency=1
link_id=15
-node_a=system.ruby.network.topology.routers05
-node_b=system.ruby.network.topology.routers10
+node_a=system.ruby.network.topology.ext_links5.int_node
+node_b=system.ruby.network.topology.int_links0.node_b
weight=1
[system.ruby.network.topology.int_links6]
@@ -848,8 +988,8 @@ type=SimpleIntLink
bandwidth_factor=16
latency=1
link_id=16
-node_a=system.ruby.network.topology.routers06
-node_b=system.ruby.network.topology.routers10
+node_a=system.ruby.network.topology.ext_links6.int_node
+node_b=system.ruby.network.topology.int_links0.node_b
weight=1
[system.ruby.network.topology.int_links7]
@@ -857,8 +997,8 @@ type=SimpleIntLink
bandwidth_factor=16
latency=1
link_id=17
-node_a=system.ruby.network.topology.routers07
-node_b=system.ruby.network.topology.routers10
+node_a=system.ruby.network.topology.ext_links7.int_node
+node_b=system.ruby.network.topology.int_links0.node_b
weight=1
[system.ruby.network.topology.int_links8]
@@ -866,8 +1006,8 @@ type=SimpleIntLink
bandwidth_factor=16
latency=1
link_id=18
-node_a=system.ruby.network.topology.routers08
-node_b=system.ruby.network.topology.routers10
+node_a=system.ruby.network.topology.ext_links8.int_node
+node_b=system.ruby.network.topology.int_links0.node_b
weight=1
[system.ruby.network.topology.int_links9]
@@ -875,54 +1015,10 @@ type=SimpleIntLink
bandwidth_factor=16
latency=1
link_id=19
-node_a=system.ruby.network.topology.routers09
-node_b=system.ruby.network.topology.routers10
+node_a=system.ruby.network.topology.ext_links9.int_node
+node_b=system.ruby.network.topology.int_links0.node_b
weight=1
-[system.ruby.network.topology.routers00]
-type=BasicRouter
-router_id=0
-
-[system.ruby.network.topology.routers01]
-type=BasicRouter
-router_id=1
-
-[system.ruby.network.topology.routers02]
-type=BasicRouter
-router_id=2
-
-[system.ruby.network.topology.routers03]
-type=BasicRouter
-router_id=3
-
-[system.ruby.network.topology.routers04]
-type=BasicRouter
-router_id=4
-
-[system.ruby.network.topology.routers05]
-type=BasicRouter
-router_id=5
-
-[system.ruby.network.topology.routers06]
-type=BasicRouter
-router_id=6
-
-[system.ruby.network.topology.routers07]
-type=BasicRouter
-router_id=7
-
-[system.ruby.network.topology.routers08]
-type=BasicRouter
-router_id=8
-
-[system.ruby.network.topology.routers09]
-type=BasicRouter
-router_id=9
-
-[system.ruby.network.topology.routers10]
-type=BasicRouter
-router_id=10
-
[system.ruby.profiler]
type=RubyProfiler
all_instructions=false
diff --git a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_directory/ruby.stats b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_directory/ruby.stats
index c5ae1c27c..024f8bba1 100644
--- a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_directory/ruby.stats
+++ b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_directory/ruby.stats
@@ -34,27 +34,27 @@ periodic_stats_period: 1000000
================ End RubySystem Configuration Print ================
-Real time: Jun/04/2012 14:45:30
+Real time: Jul/10/2012 17:44:07
Profiler Stats
--------------
-Elapsed_time_in_seconds: 244
-Elapsed_time_in_minutes: 4.06667
-Elapsed_time_in_hours: 0.0677778
-Elapsed_time_in_days: 0.00282407
+Elapsed_time_in_seconds: 384
+Elapsed_time_in_minutes: 6.4
+Elapsed_time_in_hours: 0.106667
+Elapsed_time_in_days: 0.00444444
-Virtual_time_in_seconds: 244.12
-Virtual_time_in_minutes: 4.06867
-Virtual_time_in_hours: 0.0678111
-Virtual_time_in_days: 0.00282546
+Virtual_time_in_seconds: 384.6
+Virtual_time_in_minutes: 6.41
+Virtual_time_in_hours: 0.106833
+Virtual_time_in_days: 0.00445139
Ruby_current_time: 19400856
Ruby_start_time: 0
Ruby_cycles: 19400856
-mbytes_resident: 61.3008
-mbytes_total: 361.941
-resident_ratio: 0.169367
+mbytes_resident: 59.9727
+mbytes_total: 371.66
+resident_ratio: 0.161375
ruby_cycles_executed: [ 19400857 19400857 19400857 19400857 19400857 19400857 19400857 19400857 ]
@@ -116,13 +116,13 @@ Total_nonPF_delay_cycles: [binsize: 1 max: 0 count: 0 average: NaN |standard dev
Resource Usage
--------------
page_size: 4096
-user_time: 244
+user_time: 384
system_time: 0
-page_reclaims: 16161
+page_reclaims: 16520
page_faults: 0
swaps: 0
block_inputs: 0
-block_outputs: 216
+block_outputs: 0
Network Stats
-------------
diff --git a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_directory/simout b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_directory/simout
index ca77e3fc7..3dcad7574 100755
--- a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_directory/simout
+++ b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_directory/simout
@@ -1,9 +1,9 @@
gem5 Simulator System. http://gem5.org
gem5 is copyrighted software; use the --copyright option for details.
-gem5 compiled Jun 4 2012 11:54:55
-gem5 started Jun 4 2012 14:41:26
-gem5 executing on zizzer
+gem5 compiled Jul 10 2012 17:36:02
+gem5 started Jul 10 2012 17:37:43
+gem5 executing on sc2b0605
command line: build/ALPHA_MOESI_CMP_directory/gem5.opt -d build/ALPHA_MOESI_CMP_directory/tests/opt/quick/se/50.memtest/alpha/linux/memtest-ruby-MOESI_CMP_directory -re tests/run.py build/ALPHA_MOESI_CMP_directory/tests/opt/quick/se/50.memtest/alpha/linux/memtest-ruby-MOESI_CMP_directory
Global frequency set at 1000000000 ticks per second
info: Entering event queue @ 0. Starting simulation...
diff --git a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_directory/stats.txt b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_directory/stats.txt
index fcc191198..c85767a76 100644
--- a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_directory/stats.txt
+++ b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_directory/stats.txt
@@ -4,9 +4,111 @@ sim_seconds 0.019401 # Nu
sim_ticks 19400856 # Number of ticks simulated
final_tick 19400856 # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
sim_freq 1000000000 # Frequency of simulated ticks
-host_tick_rate 79524 # Simulator tick rate (ticks/s)
-host_mem_usage 370632 # Number of bytes of host memory used
-host_seconds 243.96 # Real time elapsed on the host
+host_tick_rate 50488 # Simulator tick rate (ticks/s)
+host_mem_usage 380584 # Number of bytes of host memory used
+host_seconds 384.27 # Real time elapsed on the host
+system.l1_cntrl4.L1DcacheMemory.num_data_array_reads 0 # number of data array reads
+system.l1_cntrl4.L1DcacheMemory.num_data_array_writes 0 # number of data array writes
+system.l1_cntrl4.L1DcacheMemory.num_tag_array_reads 0 # number of tag array reads
+system.l1_cntrl4.L1DcacheMemory.num_tag_array_writes 0 # number of tag array writes
+system.l1_cntrl4.L1DcacheMemory.num_tag_array_stalls 0 # number of stalls caused by tag array
+system.l1_cntrl4.L1DcacheMemory.num_data_array_stalls 0 # number of stalls caused by data array
+system.l1_cntrl4.L1IcacheMemory.num_data_array_reads 0 # number of data array reads
+system.l1_cntrl4.L1IcacheMemory.num_data_array_writes 0 # number of data array writes
+system.l1_cntrl4.L1IcacheMemory.num_tag_array_reads 0 # number of tag array reads
+system.l1_cntrl4.L1IcacheMemory.num_tag_array_writes 0 # number of tag array writes
+system.l1_cntrl4.L1IcacheMemory.num_tag_array_stalls 0 # number of stalls caused by tag array
+system.l1_cntrl4.L1IcacheMemory.num_data_array_stalls 0 # number of stalls caused by data array
+system.l1_cntrl5.L1DcacheMemory.num_data_array_reads 0 # number of data array reads
+system.l1_cntrl5.L1DcacheMemory.num_data_array_writes 0 # number of data array writes
+system.l1_cntrl5.L1DcacheMemory.num_tag_array_reads 0 # number of tag array reads
+system.l1_cntrl5.L1DcacheMemory.num_tag_array_writes 0 # number of tag array writes
+system.l1_cntrl5.L1DcacheMemory.num_tag_array_stalls 0 # number of stalls caused by tag array
+system.l1_cntrl5.L1DcacheMemory.num_data_array_stalls 0 # number of stalls caused by data array
+system.l1_cntrl5.L1IcacheMemory.num_data_array_reads 0 # number of data array reads
+system.l1_cntrl5.L1IcacheMemory.num_data_array_writes 0 # number of data array writes
+system.l1_cntrl5.L1IcacheMemory.num_tag_array_reads 0 # number of tag array reads
+system.l1_cntrl5.L1IcacheMemory.num_tag_array_writes 0 # number of tag array writes
+system.l1_cntrl5.L1IcacheMemory.num_tag_array_stalls 0 # number of stalls caused by tag array
+system.l1_cntrl5.L1IcacheMemory.num_data_array_stalls 0 # number of stalls caused by data array
+system.l1_cntrl6.L1DcacheMemory.num_data_array_reads 0 # number of data array reads
+system.l1_cntrl6.L1DcacheMemory.num_data_array_writes 0 # number of data array writes
+system.l1_cntrl6.L1DcacheMemory.num_tag_array_reads 0 # number of tag array reads
+system.l1_cntrl6.L1DcacheMemory.num_tag_array_writes 0 # number of tag array writes
+system.l1_cntrl6.L1DcacheMemory.num_tag_array_stalls 0 # number of stalls caused by tag array
+system.l1_cntrl6.L1DcacheMemory.num_data_array_stalls 0 # number of stalls caused by data array
+system.l1_cntrl6.L1IcacheMemory.num_data_array_reads 0 # number of data array reads
+system.l1_cntrl6.L1IcacheMemory.num_data_array_writes 0 # number of data array writes
+system.l1_cntrl6.L1IcacheMemory.num_tag_array_reads 0 # number of tag array reads
+system.l1_cntrl6.L1IcacheMemory.num_tag_array_writes 0 # number of tag array writes
+system.l1_cntrl6.L1IcacheMemory.num_tag_array_stalls 0 # number of stalls caused by tag array
+system.l1_cntrl6.L1IcacheMemory.num_data_array_stalls 0 # number of stalls caused by data array
+system.l1_cntrl7.L1DcacheMemory.num_data_array_reads 0 # number of data array reads
+system.l1_cntrl7.L1DcacheMemory.num_data_array_writes 0 # number of data array writes
+system.l1_cntrl7.L1DcacheMemory.num_tag_array_reads 0 # number of tag array reads
+system.l1_cntrl7.L1DcacheMemory.num_tag_array_writes 0 # number of tag array writes
+system.l1_cntrl7.L1DcacheMemory.num_tag_array_stalls 0 # number of stalls caused by tag array
+system.l1_cntrl7.L1DcacheMemory.num_data_array_stalls 0 # number of stalls caused by data array
+system.l1_cntrl7.L1IcacheMemory.num_data_array_reads 0 # number of data array reads
+system.l1_cntrl7.L1IcacheMemory.num_data_array_writes 0 # number of data array writes
+system.l1_cntrl7.L1IcacheMemory.num_tag_array_reads 0 # number of tag array reads
+system.l1_cntrl7.L1IcacheMemory.num_tag_array_writes 0 # number of tag array writes
+system.l1_cntrl7.L1IcacheMemory.num_tag_array_stalls 0 # number of stalls caused by tag array
+system.l1_cntrl7.L1IcacheMemory.num_data_array_stalls 0 # number of stalls caused by data array
+system.l1_cntrl0.L1DcacheMemory.num_data_array_reads 0 # number of data array reads
+system.l1_cntrl0.L1DcacheMemory.num_data_array_writes 0 # number of data array writes
+system.l1_cntrl0.L1DcacheMemory.num_tag_array_reads 0 # number of tag array reads
+system.l1_cntrl0.L1DcacheMemory.num_tag_array_writes 0 # number of tag array writes
+system.l1_cntrl0.L1DcacheMemory.num_tag_array_stalls 0 # number of stalls caused by tag array
+system.l1_cntrl0.L1DcacheMemory.num_data_array_stalls 0 # number of stalls caused by data array
+system.l1_cntrl0.L1IcacheMemory.num_data_array_reads 0 # number of data array reads
+system.l1_cntrl0.L1IcacheMemory.num_data_array_writes 0 # number of data array writes
+system.l1_cntrl0.L1IcacheMemory.num_tag_array_reads 0 # number of tag array reads
+system.l1_cntrl0.L1IcacheMemory.num_tag_array_writes 0 # number of tag array writes
+system.l1_cntrl0.L1IcacheMemory.num_tag_array_stalls 0 # number of stalls caused by tag array
+system.l1_cntrl0.L1IcacheMemory.num_data_array_stalls 0 # number of stalls caused by data array
+system.l1_cntrl1.L1DcacheMemory.num_data_array_reads 0 # number of data array reads
+system.l1_cntrl1.L1DcacheMemory.num_data_array_writes 0 # number of data array writes
+system.l1_cntrl1.L1DcacheMemory.num_tag_array_reads 0 # number of tag array reads
+system.l1_cntrl1.L1DcacheMemory.num_tag_array_writes 0 # number of tag array writes
+system.l1_cntrl1.L1DcacheMemory.num_tag_array_stalls 0 # number of stalls caused by tag array
+system.l1_cntrl1.L1DcacheMemory.num_data_array_stalls 0 # number of stalls caused by data array
+system.l1_cntrl1.L1IcacheMemory.num_data_array_reads 0 # number of data array reads
+system.l1_cntrl1.L1IcacheMemory.num_data_array_writes 0 # number of data array writes
+system.l1_cntrl1.L1IcacheMemory.num_tag_array_reads 0 # number of tag array reads
+system.l1_cntrl1.L1IcacheMemory.num_tag_array_writes 0 # number of tag array writes
+system.l1_cntrl1.L1IcacheMemory.num_tag_array_stalls 0 # number of stalls caused by tag array
+system.l1_cntrl1.L1IcacheMemory.num_data_array_stalls 0 # number of stalls caused by data array
+system.l1_cntrl2.L1DcacheMemory.num_data_array_reads 0 # number of data array reads
+system.l1_cntrl2.L1DcacheMemory.num_data_array_writes 0 # number of data array writes
+system.l1_cntrl2.L1DcacheMemory.num_tag_array_reads 0 # number of tag array reads
+system.l1_cntrl2.L1DcacheMemory.num_tag_array_writes 0 # number of tag array writes
+system.l1_cntrl2.L1DcacheMemory.num_tag_array_stalls 0 # number of stalls caused by tag array
+system.l1_cntrl2.L1DcacheMemory.num_data_array_stalls 0 # number of stalls caused by data array
+system.l1_cntrl2.L1IcacheMemory.num_data_array_reads 0 # number of data array reads
+system.l1_cntrl2.L1IcacheMemory.num_data_array_writes 0 # number of data array writes
+system.l1_cntrl2.L1IcacheMemory.num_tag_array_reads 0 # number of tag array reads
+system.l1_cntrl2.L1IcacheMemory.num_tag_array_writes 0 # number of tag array writes
+system.l1_cntrl2.L1IcacheMemory.num_tag_array_stalls 0 # number of stalls caused by tag array
+system.l1_cntrl2.L1IcacheMemory.num_data_array_stalls 0 # number of stalls caused by data array
+system.l1_cntrl3.L1DcacheMemory.num_data_array_reads 0 # number of data array reads
+system.l1_cntrl3.L1DcacheMemory.num_data_array_writes 0 # number of data array writes
+system.l1_cntrl3.L1DcacheMemory.num_tag_array_reads 0 # number of tag array reads
+system.l1_cntrl3.L1DcacheMemory.num_tag_array_writes 0 # number of tag array writes
+system.l1_cntrl3.L1DcacheMemory.num_tag_array_stalls 0 # number of stalls caused by tag array
+system.l1_cntrl3.L1DcacheMemory.num_data_array_stalls 0 # number of stalls caused by data array
+system.l1_cntrl3.L1IcacheMemory.num_data_array_reads 0 # number of data array reads
+system.l1_cntrl3.L1IcacheMemory.num_data_array_writes 0 # number of data array writes
+system.l1_cntrl3.L1IcacheMemory.num_tag_array_reads 0 # number of tag array reads
+system.l1_cntrl3.L1IcacheMemory.num_tag_array_writes 0 # number of tag array writes
+system.l1_cntrl3.L1IcacheMemory.num_tag_array_stalls 0 # number of stalls caused by tag array
+system.l1_cntrl3.L1IcacheMemory.num_data_array_stalls 0 # number of stalls caused by data array
+system.l2_cntrl0.L2cacheMemory.num_data_array_reads 0 # number of data array reads
+system.l2_cntrl0.L2cacheMemory.num_data_array_writes 0 # number of data array writes
+system.l2_cntrl0.L2cacheMemory.num_tag_array_reads 0 # number of tag array reads
+system.l2_cntrl0.L2cacheMemory.num_tag_array_writes 0 # number of tag array writes
+system.l2_cntrl0.L2cacheMemory.num_tag_array_stalls 0 # number of stalls caused by tag array
+system.l2_cntrl0.L2cacheMemory.num_data_array_stalls 0 # number of stalls caused by data array
system.cpu0.num_reads 98844 # number of read accesses completed
system.cpu0.num_writes 53478 # number of write accesses completed
system.cpu0.num_copies 0 # number of copy accesses completed
diff --git a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_token/config.ini b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_token/config.ini
index 4af9d9478..93f57099a 100644
--- a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_token/config.ini
+++ b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_token/config.ini
@@ -255,20 +255,30 @@ version=0
[system.l1_cntrl0.L1DcacheMemory]
type=RubyCache
assoc=2
+dataAccessLatency=1
+dataArrayBanks=1
is_icache=false
latency=2
replacement_policy=PSEUDO_LRU
+resourceStalls=false
size=256
start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
[system.l1_cntrl0.L1IcacheMemory]
type=RubyCache
assoc=2
+dataAccessLatency=1
+dataArrayBanks=1
is_icache=false
latency=2
replacement_policy=PSEUDO_LRU
+resourceStalls=false
size=256
start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
[system.l1_cntrl0.sequencer]
type=RubySequencer
@@ -312,20 +322,30 @@ version=1
[system.l1_cntrl1.L1DcacheMemory]
type=RubyCache
assoc=2
+dataAccessLatency=1
+dataArrayBanks=1
is_icache=false
latency=2
replacement_policy=PSEUDO_LRU
+resourceStalls=false
size=256
start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
[system.l1_cntrl1.L1IcacheMemory]
type=RubyCache
assoc=2
+dataAccessLatency=1
+dataArrayBanks=1
is_icache=false
latency=2
replacement_policy=PSEUDO_LRU
+resourceStalls=false
size=256
start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
[system.l1_cntrl1.sequencer]
type=RubySequencer
@@ -369,20 +389,30 @@ version=2
[system.l1_cntrl2.L1DcacheMemory]
type=RubyCache
assoc=2
+dataAccessLatency=1
+dataArrayBanks=1
is_icache=false
latency=2
replacement_policy=PSEUDO_LRU
+resourceStalls=false
size=256
start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
[system.l1_cntrl2.L1IcacheMemory]
type=RubyCache
assoc=2
+dataAccessLatency=1
+dataArrayBanks=1
is_icache=false
latency=2
replacement_policy=PSEUDO_LRU
+resourceStalls=false
size=256
start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
[system.l1_cntrl2.sequencer]
type=RubySequencer
@@ -426,20 +456,30 @@ version=3
[system.l1_cntrl3.L1DcacheMemory]
type=RubyCache
assoc=2
+dataAccessLatency=1
+dataArrayBanks=1
is_icache=false
latency=2
replacement_policy=PSEUDO_LRU
+resourceStalls=false
size=256
start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
[system.l1_cntrl3.L1IcacheMemory]
type=RubyCache
assoc=2
+dataAccessLatency=1
+dataArrayBanks=1
is_icache=false
latency=2
replacement_policy=PSEUDO_LRU
+resourceStalls=false
size=256
start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
[system.l1_cntrl3.sequencer]
type=RubySequencer
@@ -483,20 +523,30 @@ version=4
[system.l1_cntrl4.L1DcacheMemory]
type=RubyCache
assoc=2
+dataAccessLatency=1
+dataArrayBanks=1
is_icache=false
latency=2
replacement_policy=PSEUDO_LRU
+resourceStalls=false
size=256
start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
[system.l1_cntrl4.L1IcacheMemory]
type=RubyCache
assoc=2
+dataAccessLatency=1
+dataArrayBanks=1
is_icache=false
latency=2
replacement_policy=PSEUDO_LRU
+resourceStalls=false
size=256
start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
[system.l1_cntrl4.sequencer]
type=RubySequencer
@@ -540,20 +590,30 @@ version=5
[system.l1_cntrl5.L1DcacheMemory]
type=RubyCache
assoc=2
+dataAccessLatency=1
+dataArrayBanks=1
is_icache=false
latency=2
replacement_policy=PSEUDO_LRU
+resourceStalls=false
size=256
start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
[system.l1_cntrl5.L1IcacheMemory]
type=RubyCache
assoc=2
+dataAccessLatency=1
+dataArrayBanks=1
is_icache=false
latency=2
replacement_policy=PSEUDO_LRU
+resourceStalls=false
size=256
start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
[system.l1_cntrl5.sequencer]
type=RubySequencer
@@ -597,20 +657,30 @@ version=6
[system.l1_cntrl6.L1DcacheMemory]
type=RubyCache
assoc=2
+dataAccessLatency=1
+dataArrayBanks=1
is_icache=false
latency=2
replacement_policy=PSEUDO_LRU
+resourceStalls=false
size=256
start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
[system.l1_cntrl6.L1IcacheMemory]
type=RubyCache
assoc=2
+dataAccessLatency=1
+dataArrayBanks=1
is_icache=false
latency=2
replacement_policy=PSEUDO_LRU
+resourceStalls=false
size=256
start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
[system.l1_cntrl6.sequencer]
type=RubySequencer
@@ -654,20 +724,30 @@ version=7
[system.l1_cntrl7.L1DcacheMemory]
type=RubyCache
assoc=2
+dataAccessLatency=1
+dataArrayBanks=1
is_icache=false
latency=2
replacement_policy=PSEUDO_LRU
+resourceStalls=false
size=256
start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
[system.l1_cntrl7.L1IcacheMemory]
type=RubyCache
assoc=2
+dataAccessLatency=1
+dataArrayBanks=1
is_icache=false
latency=2
replacement_policy=PSEUDO_LRU
+resourceStalls=false
size=256
start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
[system.l1_cntrl7.sequencer]
type=RubySequencer
@@ -704,11 +784,16 @@ version=0
[system.l2_cntrl0.L2cacheMemory]
type=RubyCache
assoc=2
+dataAccessLatency=1
+dataArrayBanks=1
is_icache=false
latency=10
replacement_policy=PSEUDO_LRU
+resourceStalls=false
size=512
start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
[system.physmem]
type=SimpleMemory
@@ -745,119 +830,174 @@ topology=system.ruby.network.topology
[system.ruby.network.topology]
type=Topology
-children=ext_links0 ext_links1 ext_links2 ext_links3 ext_links4 ext_links5 ext_links6 ext_links7 ext_links8 ext_links9 int_links0 int_links1 int_links2 int_links3 int_links4 int_links5 int_links6 int_links7 int_links8 int_links9 routers00 routers01 routers02 routers03 routers04 routers05 routers06 routers07 routers08 routers09 routers10
+children=ext_links0 ext_links1 ext_links2 ext_links3 ext_links4 ext_links5 ext_links6 ext_links7 ext_links8 ext_links9 int_links0 int_links1 int_links2 int_links3 int_links4 int_links5 int_links6 int_links7 int_links8 int_links9
description=Crossbar
ext_links=system.ruby.network.topology.ext_links0 system.ruby.network.topology.ext_links1 system.ruby.network.topology.ext_links2 system.ruby.network.topology.ext_links3 system.ruby.network.topology.ext_links4 system.ruby.network.topology.ext_links5 system.ruby.network.topology.ext_links6 system.ruby.network.topology.ext_links7 system.ruby.network.topology.ext_links8 system.ruby.network.topology.ext_links9
int_links=system.ruby.network.topology.int_links0 system.ruby.network.topology.int_links1 system.ruby.network.topology.int_links2 system.ruby.network.topology.int_links3 system.ruby.network.topology.int_links4 system.ruby.network.topology.int_links5 system.ruby.network.topology.int_links6 system.ruby.network.topology.int_links7 system.ruby.network.topology.int_links8 system.ruby.network.topology.int_links9
print_config=false
-routers=system.ruby.network.topology.routers00 system.ruby.network.topology.routers01 system.ruby.network.topology.routers02 system.ruby.network.topology.routers03 system.ruby.network.topology.routers04 system.ruby.network.topology.routers05 system.ruby.network.topology.routers06 system.ruby.network.topology.routers07 system.ruby.network.topology.routers08 system.ruby.network.topology.routers09 system.ruby.network.topology.routers10
+routers=system.ruby.network.topology.ext_links0.int_node system.ruby.network.topology.ext_links1.int_node system.ruby.network.topology.ext_links2.int_node system.ruby.network.topology.ext_links3.int_node system.ruby.network.topology.ext_links4.int_node system.ruby.network.topology.ext_links5.int_node system.ruby.network.topology.ext_links6.int_node system.ruby.network.topology.ext_links7.int_node system.ruby.network.topology.ext_links8.int_node system.ruby.network.topology.ext_links9.int_node system.ruby.network.topology.int_links0.node_b
[system.ruby.network.topology.ext_links0]
type=SimpleExtLink
+children=int_node
bandwidth_factor=16
ext_node=system.l1_cntrl0
-int_node=system.ruby.network.topology.routers00
+int_node=system.ruby.network.topology.ext_links0.int_node
latency=1
link_id=0
weight=1
+[system.ruby.network.topology.ext_links0.int_node]
+type=BasicRouter
+router_id=0
+
[system.ruby.network.topology.ext_links1]
type=SimpleExtLink
+children=int_node
bandwidth_factor=16
ext_node=system.l1_cntrl1
-int_node=system.ruby.network.topology.routers01
+int_node=system.ruby.network.topology.ext_links1.int_node
latency=1
link_id=1
weight=1
+[system.ruby.network.topology.ext_links1.int_node]
+type=BasicRouter
+router_id=1
+
[system.ruby.network.topology.ext_links2]
type=SimpleExtLink
+children=int_node
bandwidth_factor=16
ext_node=system.l1_cntrl2
-int_node=system.ruby.network.topology.routers02
+int_node=system.ruby.network.topology.ext_links2.int_node
latency=1
link_id=2
weight=1
+[system.ruby.network.topology.ext_links2.int_node]
+type=BasicRouter
+router_id=2
+
[system.ruby.network.topology.ext_links3]
type=SimpleExtLink
+children=int_node
bandwidth_factor=16
ext_node=system.l1_cntrl3
-int_node=system.ruby.network.topology.routers03
+int_node=system.ruby.network.topology.ext_links3.int_node
latency=1
link_id=3
weight=1
+[system.ruby.network.topology.ext_links3.int_node]
+type=BasicRouter
+router_id=3
+
[system.ruby.network.topology.ext_links4]
type=SimpleExtLink
+children=int_node
bandwidth_factor=16
ext_node=system.l1_cntrl4
-int_node=system.ruby.network.topology.routers04
+int_node=system.ruby.network.topology.ext_links4.int_node
latency=1
link_id=4
weight=1
+[system.ruby.network.topology.ext_links4.int_node]
+type=BasicRouter
+router_id=4
+
[system.ruby.network.topology.ext_links5]
type=SimpleExtLink
+children=int_node
bandwidth_factor=16
ext_node=system.l1_cntrl5
-int_node=system.ruby.network.topology.routers05
+int_node=system.ruby.network.topology.ext_links5.int_node
latency=1
link_id=5
weight=1
+[system.ruby.network.topology.ext_links5.int_node]
+type=BasicRouter
+router_id=5
+
[system.ruby.network.topology.ext_links6]
type=SimpleExtLink
+children=int_node
bandwidth_factor=16
ext_node=system.l1_cntrl6
-int_node=system.ruby.network.topology.routers06
+int_node=system.ruby.network.topology.ext_links6.int_node
latency=1
link_id=6
weight=1
+[system.ruby.network.topology.ext_links6.int_node]
+type=BasicRouter
+router_id=6
+
[system.ruby.network.topology.ext_links7]
type=SimpleExtLink
+children=int_node
bandwidth_factor=16
ext_node=system.l1_cntrl7
-int_node=system.ruby.network.topology.routers07
+int_node=system.ruby.network.topology.ext_links7.int_node
latency=1
link_id=7
weight=1
+[system.ruby.network.topology.ext_links7.int_node]
+type=BasicRouter
+router_id=7
+
[system.ruby.network.topology.ext_links8]
type=SimpleExtLink
+children=int_node
bandwidth_factor=16
ext_node=system.l2_cntrl0
-int_node=system.ruby.network.topology.routers08
+int_node=system.ruby.network.topology.ext_links8.int_node
latency=1
link_id=8
weight=1
+[system.ruby.network.topology.ext_links8.int_node]
+type=BasicRouter
+router_id=8
+
[system.ruby.network.topology.ext_links9]
type=SimpleExtLink
+children=int_node
bandwidth_factor=16
ext_node=system.dir_cntrl0
-int_node=system.ruby.network.topology.routers09
+int_node=system.ruby.network.topology.ext_links9.int_node
latency=1
link_id=9
weight=1
+[system.ruby.network.topology.ext_links9.int_node]
+type=BasicRouter
+router_id=9
+
[system.ruby.network.topology.int_links0]
type=SimpleIntLink
+children=node_b
bandwidth_factor=16
latency=1
link_id=10
-node_a=system.ruby.network.topology.routers00
-node_b=system.ruby.network.topology.routers10
+node_a=system.ruby.network.topology.ext_links0.int_node
+node_b=system.ruby.network.topology.int_links0.node_b
weight=1
+[system.ruby.network.topology.int_links0.node_b]
+type=BasicRouter
+router_id=10
+
[system.ruby.network.topology.int_links1]
type=SimpleIntLink
bandwidth_factor=16
latency=1
link_id=11
-node_a=system.ruby.network.topology.routers01
-node_b=system.ruby.network.topology.routers10
+node_a=system.ruby.network.topology.ext_links1.int_node
+node_b=system.ruby.network.topology.int_links0.node_b
weight=1
[system.ruby.network.topology.int_links2]
@@ -865,8 +1005,8 @@ type=SimpleIntLink
bandwidth_factor=16
latency=1
link_id=12
-node_a=system.ruby.network.topology.routers02
-node_b=system.ruby.network.topology.routers10
+node_a=system.ruby.network.topology.ext_links2.int_node
+node_b=system.ruby.network.topology.int_links0.node_b
weight=1
[system.ruby.network.topology.int_links3]
@@ -874,8 +1014,8 @@ type=SimpleIntLink
bandwidth_factor=16
latency=1
link_id=13
-node_a=system.ruby.network.topology.routers03
-node_b=system.ruby.network.topology.routers10
+node_a=system.ruby.network.topology.ext_links3.int_node
+node_b=system.ruby.network.topology.int_links0.node_b
weight=1
[system.ruby.network.topology.int_links4]
@@ -883,8 +1023,8 @@ type=SimpleIntLink
bandwidth_factor=16
latency=1
link_id=14
-node_a=system.ruby.network.topology.routers04
-node_b=system.ruby.network.topology.routers10
+node_a=system.ruby.network.topology.ext_links4.int_node
+node_b=system.ruby.network.topology.int_links0.node_b
weight=1
[system.ruby.network.topology.int_links5]
@@ -892,8 +1032,8 @@ type=SimpleIntLink
bandwidth_factor=16
latency=1
link_id=15
-node_a=system.ruby.network.topology.routers05
-node_b=system.ruby.network.topology.routers10
+node_a=system.ruby.network.topology.ext_links5.int_node
+node_b=system.ruby.network.topology.int_links0.node_b
weight=1
[system.ruby.network.topology.int_links6]
@@ -901,8 +1041,8 @@ type=SimpleIntLink
bandwidth_factor=16
latency=1
link_id=16
-node_a=system.ruby.network.topology.routers06
-node_b=system.ruby.network.topology.routers10
+node_a=system.ruby.network.topology.ext_links6.int_node
+node_b=system.ruby.network.topology.int_links0.node_b
weight=1
[system.ruby.network.topology.int_links7]
@@ -910,8 +1050,8 @@ type=SimpleIntLink
bandwidth_factor=16
latency=1
link_id=17
-node_a=system.ruby.network.topology.routers07
-node_b=system.ruby.network.topology.routers10
+node_a=system.ruby.network.topology.ext_links7.int_node
+node_b=system.ruby.network.topology.int_links0.node_b
weight=1
[system.ruby.network.topology.int_links8]
@@ -919,8 +1059,8 @@ type=SimpleIntLink
bandwidth_factor=16
latency=1
link_id=18
-node_a=system.ruby.network.topology.routers08
-node_b=system.ruby.network.topology.routers10
+node_a=system.ruby.network.topology.ext_links8.int_node
+node_b=system.ruby.network.topology.int_links0.node_b
weight=1
[system.ruby.network.topology.int_links9]
@@ -928,54 +1068,10 @@ type=SimpleIntLink
bandwidth_factor=16
latency=1
link_id=19
-node_a=system.ruby.network.topology.routers09
-node_b=system.ruby.network.topology.routers10
+node_a=system.ruby.network.topology.ext_links9.int_node
+node_b=system.ruby.network.topology.int_links0.node_b
weight=1
-[system.ruby.network.topology.routers00]
-type=BasicRouter
-router_id=0
-
-[system.ruby.network.topology.routers01]
-type=BasicRouter
-router_id=1
-
-[system.ruby.network.topology.routers02]
-type=BasicRouter
-router_id=2
-
-[system.ruby.network.topology.routers03]
-type=BasicRouter
-router_id=3
-
-[system.ruby.network.topology.routers04]
-type=BasicRouter
-router_id=4
-
-[system.ruby.network.topology.routers05]
-type=BasicRouter
-router_id=5
-
-[system.ruby.network.topology.routers06]
-type=BasicRouter
-router_id=6
-
-[system.ruby.network.topology.routers07]
-type=BasicRouter
-router_id=7
-
-[system.ruby.network.topology.routers08]
-type=BasicRouter
-router_id=8
-
-[system.ruby.network.topology.routers09]
-type=BasicRouter
-router_id=9
-
-[system.ruby.network.topology.routers10]
-type=BasicRouter
-router_id=10
-
[system.ruby.profiler]
type=RubyProfiler
all_instructions=false
diff --git a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_token/ruby.stats b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_token/ruby.stats
index fe9a9f183..d39d854c4 100644
--- a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_token/ruby.stats
+++ b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_token/ruby.stats
@@ -34,27 +34,27 @@ periodic_stats_period: 1000000
================ End RubySystem Configuration Print ================
-Real time: Jun/04/2012 14:44:30
+Real time: Jul/10/2012 17:49:16
Profiler Stats
--------------
-Elapsed_time_in_seconds: 117
-Elapsed_time_in_minutes: 1.95
-Elapsed_time_in_hours: 0.0325
-Elapsed_time_in_days: 0.00135417
+Elapsed_time_in_seconds: 176
+Elapsed_time_in_minutes: 2.93333
+Elapsed_time_in_hours: 0.0488889
+Elapsed_time_in_days: 0.00203704
-Virtual_time_in_seconds: 117.17
-Virtual_time_in_minutes: 1.95283
-Virtual_time_in_hours: 0.0325472
-Virtual_time_in_days: 0.00135613
+Virtual_time_in_seconds: 176.38
+Virtual_time_in_minutes: 2.93967
+Virtual_time_in_hours: 0.0489944
+Virtual_time_in_days: 0.00204144
Ruby_current_time: 19665440
Ruby_start_time: 0
Ruby_cycles: 19665440
-mbytes_resident: 61.0625
-mbytes_total: 361.484
-resident_ratio: 0.168922
+mbytes_resident: 59.5039
+mbytes_total: 371.051
+resident_ratio: 0.160376
ruby_cycles_executed: [ 19665441 19665441 19665441 19665441 19665441 19665441 19665441 19665441 ]
@@ -125,13 +125,13 @@ Total_nonPF_delay_cycles: [binsize: 1 max: 0 count: 0 average: NaN |standard dev
Resource Usage
--------------
page_size: 4096
-user_time: 117
+user_time: 176
system_time: 0
-page_reclaims: 16038
+page_reclaims: 16412
page_faults: 0
swaps: 0
block_inputs: 0
-block_outputs: 232
+block_outputs: 0
Network Stats
-------------
diff --git a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_token/simout b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_token/simout
index 4dc86aa94..096fa6972 100755
--- a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_token/simout
+++ b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_token/simout
@@ -1,9 +1,9 @@
gem5 Simulator System. http://gem5.org
gem5 is copyrighted software; use the --copyright option for details.
-gem5 compiled Jun 4 2012 11:56:32
-gem5 started Jun 4 2012 14:42:33
-gem5 executing on zizzer
+gem5 compiled Jul 10 2012 15:34:13
+gem5 started Jul 10 2012 17:46:20
+gem5 executing on sc2b0605
command line: build/ALPHA_MOESI_CMP_token/gem5.opt -d build/ALPHA_MOESI_CMP_token/tests/opt/quick/se/50.memtest/alpha/linux/memtest-ruby-MOESI_CMP_token -re tests/run.py build/ALPHA_MOESI_CMP_token/tests/opt/quick/se/50.memtest/alpha/linux/memtest-ruby-MOESI_CMP_token
Global frequency set at 1000000000 ticks per second
info: Entering event queue @ 0. Starting simulation...
diff --git a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_token/stats.txt b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_token/stats.txt
index 284e6ab5c..2de7fc80b 100644
--- a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_token/stats.txt
+++ b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_token/stats.txt
@@ -4,9 +4,111 @@ sim_seconds 0.019665 # Nu
sim_ticks 19665440 # Number of ticks simulated
final_tick 19665440 # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
sim_freq 1000000000 # Frequency of simulated ticks
-host_tick_rate 168119 # Simulator tick rate (ticks/s)
-host_mem_usage 370164 # Number of bytes of host memory used
-host_seconds 116.97 # Real time elapsed on the host
+host_tick_rate 111694 # Simulator tick rate (ticks/s)
+host_mem_usage 379960 # Number of bytes of host memory used
+host_seconds 176.06 # Real time elapsed on the host
+system.l1_cntrl4.L1DcacheMemory.num_data_array_reads 0 # number of data array reads
+system.l1_cntrl4.L1DcacheMemory.num_data_array_writes 0 # number of data array writes
+system.l1_cntrl4.L1DcacheMemory.num_tag_array_reads 0 # number of tag array reads
+system.l1_cntrl4.L1DcacheMemory.num_tag_array_writes 0 # number of tag array writes
+system.l1_cntrl4.L1DcacheMemory.num_tag_array_stalls 0 # number of stalls caused by tag array
+system.l1_cntrl4.L1DcacheMemory.num_data_array_stalls 0 # number of stalls caused by data array
+system.l1_cntrl4.L1IcacheMemory.num_data_array_reads 0 # number of data array reads
+system.l1_cntrl4.L1IcacheMemory.num_data_array_writes 0 # number of data array writes
+system.l1_cntrl4.L1IcacheMemory.num_tag_array_reads 0 # number of tag array reads
+system.l1_cntrl4.L1IcacheMemory.num_tag_array_writes 0 # number of tag array writes
+system.l1_cntrl4.L1IcacheMemory.num_tag_array_stalls 0 # number of stalls caused by tag array
+system.l1_cntrl4.L1IcacheMemory.num_data_array_stalls 0 # number of stalls caused by data array
+system.l1_cntrl5.L1DcacheMemory.num_data_array_reads 0 # number of data array reads
+system.l1_cntrl5.L1DcacheMemory.num_data_array_writes 0 # number of data array writes
+system.l1_cntrl5.L1DcacheMemory.num_tag_array_reads 0 # number of tag array reads
+system.l1_cntrl5.L1DcacheMemory.num_tag_array_writes 0 # number of tag array writes
+system.l1_cntrl5.L1DcacheMemory.num_tag_array_stalls 0 # number of stalls caused by tag array
+system.l1_cntrl5.L1DcacheMemory.num_data_array_stalls 0 # number of stalls caused by data array
+system.l1_cntrl5.L1IcacheMemory.num_data_array_reads 0 # number of data array reads
+system.l1_cntrl5.L1IcacheMemory.num_data_array_writes 0 # number of data array writes
+system.l1_cntrl5.L1IcacheMemory.num_tag_array_reads 0 # number of tag array reads
+system.l1_cntrl5.L1IcacheMemory.num_tag_array_writes 0 # number of tag array writes
+system.l1_cntrl5.L1IcacheMemory.num_tag_array_stalls 0 # number of stalls caused by tag array
+system.l1_cntrl5.L1IcacheMemory.num_data_array_stalls 0 # number of stalls caused by data array
+system.l1_cntrl6.L1DcacheMemory.num_data_array_reads 0 # number of data array reads
+system.l1_cntrl6.L1DcacheMemory.num_data_array_writes 0 # number of data array writes
+system.l1_cntrl6.L1DcacheMemory.num_tag_array_reads 0 # number of tag array reads
+system.l1_cntrl6.L1DcacheMemory.num_tag_array_writes 0 # number of tag array writes
+system.l1_cntrl6.L1DcacheMemory.num_tag_array_stalls 0 # number of stalls caused by tag array
+system.l1_cntrl6.L1DcacheMemory.num_data_array_stalls 0 # number of stalls caused by data array
+system.l1_cntrl6.L1IcacheMemory.num_data_array_reads 0 # number of data array reads
+system.l1_cntrl6.L1IcacheMemory.num_data_array_writes 0 # number of data array writes
+system.l1_cntrl6.L1IcacheMemory.num_tag_array_reads 0 # number of tag array reads
+system.l1_cntrl6.L1IcacheMemory.num_tag_array_writes 0 # number of tag array writes
+system.l1_cntrl6.L1IcacheMemory.num_tag_array_stalls 0 # number of stalls caused by tag array
+system.l1_cntrl6.L1IcacheMemory.num_data_array_stalls 0 # number of stalls caused by data array
+system.l1_cntrl7.L1DcacheMemory.num_data_array_reads 0 # number of data array reads
+system.l1_cntrl7.L1DcacheMemory.num_data_array_writes 0 # number of data array writes
+system.l1_cntrl7.L1DcacheMemory.num_tag_array_reads 0 # number of tag array reads
+system.l1_cntrl7.L1DcacheMemory.num_tag_array_writes 0 # number of tag array writes
+system.l1_cntrl7.L1DcacheMemory.num_tag_array_stalls 0 # number of stalls caused by tag array
+system.l1_cntrl7.L1DcacheMemory.num_data_array_stalls 0 # number of stalls caused by data array
+system.l1_cntrl7.L1IcacheMemory.num_data_array_reads 0 # number of data array reads
+system.l1_cntrl7.L1IcacheMemory.num_data_array_writes 0 # number of data array writes
+system.l1_cntrl7.L1IcacheMemory.num_tag_array_reads 0 # number of tag array reads
+system.l1_cntrl7.L1IcacheMemory.num_tag_array_writes 0 # number of tag array writes
+system.l1_cntrl7.L1IcacheMemory.num_tag_array_stalls 0 # number of stalls caused by tag array
+system.l1_cntrl7.L1IcacheMemory.num_data_array_stalls 0 # number of stalls caused by data array
+system.l1_cntrl0.L1DcacheMemory.num_data_array_reads 0 # number of data array reads
+system.l1_cntrl0.L1DcacheMemory.num_data_array_writes 0 # number of data array writes
+system.l1_cntrl0.L1DcacheMemory.num_tag_array_reads 0 # number of tag array reads
+system.l1_cntrl0.L1DcacheMemory.num_tag_array_writes 0 # number of tag array writes
+system.l1_cntrl0.L1DcacheMemory.num_tag_array_stalls 0 # number of stalls caused by tag array
+system.l1_cntrl0.L1DcacheMemory.num_data_array_stalls 0 # number of stalls caused by data array
+system.l1_cntrl0.L1IcacheMemory.num_data_array_reads 0 # number of data array reads
+system.l1_cntrl0.L1IcacheMemory.num_data_array_writes 0 # number of data array writes
+system.l1_cntrl0.L1IcacheMemory.num_tag_array_reads 0 # number of tag array reads
+system.l1_cntrl0.L1IcacheMemory.num_tag_array_writes 0 # number of tag array writes
+system.l1_cntrl0.L1IcacheMemory.num_tag_array_stalls 0 # number of stalls caused by tag array
+system.l1_cntrl0.L1IcacheMemory.num_data_array_stalls 0 # number of stalls caused by data array
+system.l1_cntrl1.L1DcacheMemory.num_data_array_reads 0 # number of data array reads
+system.l1_cntrl1.L1DcacheMemory.num_data_array_writes 0 # number of data array writes
+system.l1_cntrl1.L1DcacheMemory.num_tag_array_reads 0 # number of tag array reads
+system.l1_cntrl1.L1DcacheMemory.num_tag_array_writes 0 # number of tag array writes
+system.l1_cntrl1.L1DcacheMemory.num_tag_array_stalls 0 # number of stalls caused by tag array
+system.l1_cntrl1.L1DcacheMemory.num_data_array_stalls 0 # number of stalls caused by data array
+system.l1_cntrl1.L1IcacheMemory.num_data_array_reads 0 # number of data array reads
+system.l1_cntrl1.L1IcacheMemory.num_data_array_writes 0 # number of data array writes
+system.l1_cntrl1.L1IcacheMemory.num_tag_array_reads 0 # number of tag array reads
+system.l1_cntrl1.L1IcacheMemory.num_tag_array_writes 0 # number of tag array writes
+system.l1_cntrl1.L1IcacheMemory.num_tag_array_stalls 0 # number of stalls caused by tag array
+system.l1_cntrl1.L1IcacheMemory.num_data_array_stalls 0 # number of stalls caused by data array
+system.l1_cntrl2.L1DcacheMemory.num_data_array_reads 0 # number of data array reads
+system.l1_cntrl2.L1DcacheMemory.num_data_array_writes 0 # number of data array writes
+system.l1_cntrl2.L1DcacheMemory.num_tag_array_reads 0 # number of tag array reads
+system.l1_cntrl2.L1DcacheMemory.num_tag_array_writes 0 # number of tag array writes
+system.l1_cntrl2.L1DcacheMemory.num_tag_array_stalls 0 # number of stalls caused by tag array
+system.l1_cntrl2.L1DcacheMemory.num_data_array_stalls 0 # number of stalls caused by data array
+system.l1_cntrl2.L1IcacheMemory.num_data_array_reads 0 # number of data array reads
+system.l1_cntrl2.L1IcacheMemory.num_data_array_writes 0 # number of data array writes
+system.l1_cntrl2.L1IcacheMemory.num_tag_array_reads 0 # number of tag array reads
+system.l1_cntrl2.L1IcacheMemory.num_tag_array_writes 0 # number of tag array writes
+system.l1_cntrl2.L1IcacheMemory.num_tag_array_stalls 0 # number of stalls caused by tag array
+system.l1_cntrl2.L1IcacheMemory.num_data_array_stalls 0 # number of stalls caused by data array
+system.l1_cntrl3.L1DcacheMemory.num_data_array_reads 0 # number of data array reads
+system.l1_cntrl3.L1DcacheMemory.num_data_array_writes 0 # number of data array writes
+system.l1_cntrl3.L1DcacheMemory.num_tag_array_reads 0 # number of tag array reads
+system.l1_cntrl3.L1DcacheMemory.num_tag_array_writes 0 # number of tag array writes
+system.l1_cntrl3.L1DcacheMemory.num_tag_array_stalls 0 # number of stalls caused by tag array
+system.l1_cntrl3.L1DcacheMemory.num_data_array_stalls 0 # number of stalls caused by data array
+system.l1_cntrl3.L1IcacheMemory.num_data_array_reads 0 # number of data array reads
+system.l1_cntrl3.L1IcacheMemory.num_data_array_writes 0 # number of data array writes
+system.l1_cntrl3.L1IcacheMemory.num_tag_array_reads 0 # number of tag array reads
+system.l1_cntrl3.L1IcacheMemory.num_tag_array_writes 0 # number of tag array writes
+system.l1_cntrl3.L1IcacheMemory.num_tag_array_stalls 0 # number of stalls caused by tag array
+system.l1_cntrl3.L1IcacheMemory.num_data_array_stalls 0 # number of stalls caused by data array
+system.l2_cntrl0.L2cacheMemory.num_data_array_reads 0 # number of data array reads
+system.l2_cntrl0.L2cacheMemory.num_data_array_writes 0 # number of data array writes
+system.l2_cntrl0.L2cacheMemory.num_tag_array_reads 0 # number of tag array reads
+system.l2_cntrl0.L2cacheMemory.num_tag_array_writes 0 # number of tag array writes
+system.l2_cntrl0.L2cacheMemory.num_tag_array_stalls 0 # number of stalls caused by tag array
+system.l2_cntrl0.L2cacheMemory.num_data_array_stalls 0 # number of stalls caused by data array
system.cpu0.num_reads 99534 # number of read accesses completed
system.cpu0.num_writes 53920 # number of write accesses completed
system.cpu0.num_copies 0 # number of copy accesses completed
diff --git a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/config.ini b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/config.ini
index 34695a208..9e9ce8534 100644
--- a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/config.ini
+++ b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/config.ini
@@ -220,11 +220,16 @@ version=0
[system.dir_cntrl0.probeFilter]
type=RubyCache
assoc=4
+dataAccessLatency=1
+dataArrayBanks=1
is_icache=false
latency=1
replacement_policy=PSEUDO_LRU
+resourceStalls=false
size=1024
start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
[system.funcmem]
type=SimpleMemory
@@ -261,29 +266,44 @@ version=0
[system.l1_cntrl0.L1DcacheMemory]
type=RubyCache
assoc=2
+dataAccessLatency=1
+dataArrayBanks=1
is_icache=false
latency=2
replacement_policy=PSEUDO_LRU
+resourceStalls=false
size=256
start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
[system.l1_cntrl0.L1IcacheMemory]
type=RubyCache
assoc=2
+dataAccessLatency=1
+dataArrayBanks=1
is_icache=true
latency=2
replacement_policy=PSEUDO_LRU
+resourceStalls=false
size=256
start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
[system.l1_cntrl0.L2cacheMemory]
type=RubyCache
assoc=2
+dataAccessLatency=1
+dataArrayBanks=1
is_icache=false
latency=10
replacement_policy=PSEUDO_LRU
+resourceStalls=false
size=512
start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
[system.l1_cntrl0.sequencer]
type=RubySequencer
@@ -324,29 +344,44 @@ version=1
[system.l1_cntrl1.L1DcacheMemory]
type=RubyCache
assoc=2
+dataAccessLatency=1
+dataArrayBanks=1
is_icache=false
latency=2
replacement_policy=PSEUDO_LRU
+resourceStalls=false
size=256
start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
[system.l1_cntrl1.L1IcacheMemory]
type=RubyCache
assoc=2
+dataAccessLatency=1
+dataArrayBanks=1
is_icache=true
latency=2
replacement_policy=PSEUDO_LRU
+resourceStalls=false
size=256
start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
[system.l1_cntrl1.L2cacheMemory]
type=RubyCache
assoc=2
+dataAccessLatency=1
+dataArrayBanks=1
is_icache=false
latency=10
replacement_policy=PSEUDO_LRU
+resourceStalls=false
size=512
start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
[system.l1_cntrl1.sequencer]
type=RubySequencer
@@ -387,29 +422,44 @@ version=2
[system.l1_cntrl2.L1DcacheMemory]
type=RubyCache
assoc=2
+dataAccessLatency=1
+dataArrayBanks=1
is_icache=false
latency=2
replacement_policy=PSEUDO_LRU
+resourceStalls=false
size=256
start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
[system.l1_cntrl2.L1IcacheMemory]
type=RubyCache
assoc=2
+dataAccessLatency=1
+dataArrayBanks=1
is_icache=true
latency=2
replacement_policy=PSEUDO_LRU
+resourceStalls=false
size=256
start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
[system.l1_cntrl2.L2cacheMemory]
type=RubyCache
assoc=2
+dataAccessLatency=1
+dataArrayBanks=1
is_icache=false
latency=10
replacement_policy=PSEUDO_LRU
+resourceStalls=false
size=512
start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
[system.l1_cntrl2.sequencer]
type=RubySequencer
@@ -450,29 +500,44 @@ version=3
[system.l1_cntrl3.L1DcacheMemory]
type=RubyCache
assoc=2
+dataAccessLatency=1
+dataArrayBanks=1
is_icache=false
latency=2
replacement_policy=PSEUDO_LRU
+resourceStalls=false
size=256
start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
[system.l1_cntrl3.L1IcacheMemory]
type=RubyCache
assoc=2
+dataAccessLatency=1
+dataArrayBanks=1
is_icache=true
latency=2
replacement_policy=PSEUDO_LRU
+resourceStalls=false
size=256
start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
[system.l1_cntrl3.L2cacheMemory]
type=RubyCache
assoc=2
+dataAccessLatency=1
+dataArrayBanks=1
is_icache=false
latency=10
replacement_policy=PSEUDO_LRU
+resourceStalls=false
size=512
start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
[system.l1_cntrl3.sequencer]
type=RubySequencer
@@ -513,29 +578,44 @@ version=4
[system.l1_cntrl4.L1DcacheMemory]
type=RubyCache
assoc=2
+dataAccessLatency=1
+dataArrayBanks=1
is_icache=false
latency=2
replacement_policy=PSEUDO_LRU
+resourceStalls=false
size=256
start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
[system.l1_cntrl4.L1IcacheMemory]
type=RubyCache
assoc=2
+dataAccessLatency=1
+dataArrayBanks=1
is_icache=true
latency=2
replacement_policy=PSEUDO_LRU
+resourceStalls=false
size=256
start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
[system.l1_cntrl4.L2cacheMemory]
type=RubyCache
assoc=2
+dataAccessLatency=1
+dataArrayBanks=1
is_icache=false
latency=10
replacement_policy=PSEUDO_LRU
+resourceStalls=false
size=512
start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
[system.l1_cntrl4.sequencer]
type=RubySequencer
@@ -576,29 +656,44 @@ version=5
[system.l1_cntrl5.L1DcacheMemory]
type=RubyCache
assoc=2
+dataAccessLatency=1
+dataArrayBanks=1
is_icache=false
latency=2
replacement_policy=PSEUDO_LRU
+resourceStalls=false
size=256
start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
[system.l1_cntrl5.L1IcacheMemory]
type=RubyCache
assoc=2
+dataAccessLatency=1
+dataArrayBanks=1
is_icache=true
latency=2
replacement_policy=PSEUDO_LRU
+resourceStalls=false
size=256
start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
[system.l1_cntrl5.L2cacheMemory]
type=RubyCache
assoc=2
+dataAccessLatency=1
+dataArrayBanks=1
is_icache=false
latency=10
replacement_policy=PSEUDO_LRU
+resourceStalls=false
size=512
start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
[system.l1_cntrl5.sequencer]
type=RubySequencer
@@ -639,29 +734,44 @@ version=6
[system.l1_cntrl6.L1DcacheMemory]
type=RubyCache
assoc=2
+dataAccessLatency=1
+dataArrayBanks=1
is_icache=false
latency=2
replacement_policy=PSEUDO_LRU
+resourceStalls=false
size=256
start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
[system.l1_cntrl6.L1IcacheMemory]
type=RubyCache
assoc=2
+dataAccessLatency=1
+dataArrayBanks=1
is_icache=true
latency=2
replacement_policy=PSEUDO_LRU
+resourceStalls=false
size=256
start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
[system.l1_cntrl6.L2cacheMemory]
type=RubyCache
assoc=2
+dataAccessLatency=1
+dataArrayBanks=1
is_icache=false
latency=10
replacement_policy=PSEUDO_LRU
+resourceStalls=false
size=512
start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
[system.l1_cntrl6.sequencer]
type=RubySequencer
@@ -702,29 +812,44 @@ version=7
[system.l1_cntrl7.L1DcacheMemory]
type=RubyCache
assoc=2
+dataAccessLatency=1
+dataArrayBanks=1
is_icache=false
latency=2
replacement_policy=PSEUDO_LRU
+resourceStalls=false
size=256
start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
[system.l1_cntrl7.L1IcacheMemory]
type=RubyCache
assoc=2
+dataAccessLatency=1
+dataArrayBanks=1
is_icache=true
latency=2
replacement_policy=PSEUDO_LRU
+resourceStalls=false
size=256
start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
[system.l1_cntrl7.L2cacheMemory]
type=RubyCache
assoc=2
+dataAccessLatency=1
+dataArrayBanks=1
is_icache=false
latency=10
replacement_policy=PSEUDO_LRU
+resourceStalls=false
size=512
start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
[system.l1_cntrl7.sequencer]
type=RubySequencer
@@ -777,110 +902,160 @@ topology=system.ruby.network.topology
[system.ruby.network.topology]
type=Topology
-children=ext_links0 ext_links1 ext_links2 ext_links3 ext_links4 ext_links5 ext_links6 ext_links7 ext_links8 int_links0 int_links1 int_links2 int_links3 int_links4 int_links5 int_links6 int_links7 int_links8 routers0 routers1 routers2 routers3 routers4 routers5 routers6 routers7 routers8 routers9
+children=ext_links0 ext_links1 ext_links2 ext_links3 ext_links4 ext_links5 ext_links6 ext_links7 ext_links8 int_links0 int_links1 int_links2 int_links3 int_links4 int_links5 int_links6 int_links7 int_links8
description=Crossbar
ext_links=system.ruby.network.topology.ext_links0 system.ruby.network.topology.ext_links1 system.ruby.network.topology.ext_links2 system.ruby.network.topology.ext_links3 system.ruby.network.topology.ext_links4 system.ruby.network.topology.ext_links5 system.ruby.network.topology.ext_links6 system.ruby.network.topology.ext_links7 system.ruby.network.topology.ext_links8
int_links=system.ruby.network.topology.int_links0 system.ruby.network.topology.int_links1 system.ruby.network.topology.int_links2 system.ruby.network.topology.int_links3 system.ruby.network.topology.int_links4 system.ruby.network.topology.int_links5 system.ruby.network.topology.int_links6 system.ruby.network.topology.int_links7 system.ruby.network.topology.int_links8
print_config=false
-routers=system.ruby.network.topology.routers0 system.ruby.network.topology.routers1 system.ruby.network.topology.routers2 system.ruby.network.topology.routers3 system.ruby.network.topology.routers4 system.ruby.network.topology.routers5 system.ruby.network.topology.routers6 system.ruby.network.topology.routers7 system.ruby.network.topology.routers8 system.ruby.network.topology.routers9
+routers=system.ruby.network.topology.ext_links0.int_node system.ruby.network.topology.ext_links1.int_node system.ruby.network.topology.ext_links2.int_node system.ruby.network.topology.ext_links3.int_node system.ruby.network.topology.ext_links4.int_node system.ruby.network.topology.ext_links5.int_node system.ruby.network.topology.ext_links6.int_node system.ruby.network.topology.ext_links7.int_node system.ruby.network.topology.ext_links8.int_node system.ruby.network.topology.int_links0.node_b
[system.ruby.network.topology.ext_links0]
type=SimpleExtLink
+children=int_node
bandwidth_factor=16
ext_node=system.l1_cntrl0
-int_node=system.ruby.network.topology.routers0
+int_node=system.ruby.network.topology.ext_links0.int_node
latency=1
link_id=0
weight=1
+[system.ruby.network.topology.ext_links0.int_node]
+type=BasicRouter
+router_id=0
+
[system.ruby.network.topology.ext_links1]
type=SimpleExtLink
+children=int_node
bandwidth_factor=16
ext_node=system.l1_cntrl1
-int_node=system.ruby.network.topology.routers1
+int_node=system.ruby.network.topology.ext_links1.int_node
latency=1
link_id=1
weight=1
+[system.ruby.network.topology.ext_links1.int_node]
+type=BasicRouter
+router_id=1
+
[system.ruby.network.topology.ext_links2]
type=SimpleExtLink
+children=int_node
bandwidth_factor=16
ext_node=system.l1_cntrl2
-int_node=system.ruby.network.topology.routers2
+int_node=system.ruby.network.topology.ext_links2.int_node
latency=1
link_id=2
weight=1
+[system.ruby.network.topology.ext_links2.int_node]
+type=BasicRouter
+router_id=2
+
[system.ruby.network.topology.ext_links3]
type=SimpleExtLink
+children=int_node
bandwidth_factor=16
ext_node=system.l1_cntrl3
-int_node=system.ruby.network.topology.routers3
+int_node=system.ruby.network.topology.ext_links3.int_node
latency=1
link_id=3
weight=1
+[system.ruby.network.topology.ext_links3.int_node]
+type=BasicRouter
+router_id=3
+
[system.ruby.network.topology.ext_links4]
type=SimpleExtLink
+children=int_node
bandwidth_factor=16
ext_node=system.l1_cntrl4
-int_node=system.ruby.network.topology.routers4
+int_node=system.ruby.network.topology.ext_links4.int_node
latency=1
link_id=4
weight=1
+[system.ruby.network.topology.ext_links4.int_node]
+type=BasicRouter
+router_id=4
+
[system.ruby.network.topology.ext_links5]
type=SimpleExtLink
+children=int_node
bandwidth_factor=16
ext_node=system.l1_cntrl5
-int_node=system.ruby.network.topology.routers5
+int_node=system.ruby.network.topology.ext_links5.int_node
latency=1
link_id=5
weight=1
+[system.ruby.network.topology.ext_links5.int_node]
+type=BasicRouter
+router_id=5
+
[system.ruby.network.topology.ext_links6]
type=SimpleExtLink
+children=int_node
bandwidth_factor=16
ext_node=system.l1_cntrl6
-int_node=system.ruby.network.topology.routers6
+int_node=system.ruby.network.topology.ext_links6.int_node
latency=1
link_id=6
weight=1
+[system.ruby.network.topology.ext_links6.int_node]
+type=BasicRouter
+router_id=6
+
[system.ruby.network.topology.ext_links7]
type=SimpleExtLink
+children=int_node
bandwidth_factor=16
ext_node=system.l1_cntrl7
-int_node=system.ruby.network.topology.routers7
+int_node=system.ruby.network.topology.ext_links7.int_node
latency=1
link_id=7
weight=1
+[system.ruby.network.topology.ext_links7.int_node]
+type=BasicRouter
+router_id=7
+
[system.ruby.network.topology.ext_links8]
type=SimpleExtLink
+children=int_node
bandwidth_factor=16
ext_node=system.dir_cntrl0
-int_node=system.ruby.network.topology.routers8
+int_node=system.ruby.network.topology.ext_links8.int_node
latency=1
link_id=8
weight=1
+[system.ruby.network.topology.ext_links8.int_node]
+type=BasicRouter
+router_id=8
+
[system.ruby.network.topology.int_links0]
type=SimpleIntLink
+children=node_b
bandwidth_factor=16
latency=1
link_id=9
-node_a=system.ruby.network.topology.routers0
-node_b=system.ruby.network.topology.routers9
+node_a=system.ruby.network.topology.ext_links0.int_node
+node_b=system.ruby.network.topology.int_links0.node_b
weight=1
+[system.ruby.network.topology.int_links0.node_b]
+type=BasicRouter
+router_id=9
+
[system.ruby.network.topology.int_links1]
type=SimpleIntLink
bandwidth_factor=16
latency=1
link_id=10
-node_a=system.ruby.network.topology.routers1
-node_b=system.ruby.network.topology.routers9
+node_a=system.ruby.network.topology.ext_links1.int_node
+node_b=system.ruby.network.topology.int_links0.node_b
weight=1
[system.ruby.network.topology.int_links2]
@@ -888,8 +1063,8 @@ type=SimpleIntLink
bandwidth_factor=16
latency=1
link_id=11
-node_a=system.ruby.network.topology.routers2
-node_b=system.ruby.network.topology.routers9
+node_a=system.ruby.network.topology.ext_links2.int_node
+node_b=system.ruby.network.topology.int_links0.node_b
weight=1
[system.ruby.network.topology.int_links3]
@@ -897,8 +1072,8 @@ type=SimpleIntLink
bandwidth_factor=16
latency=1
link_id=12
-node_a=system.ruby.network.topology.routers3
-node_b=system.ruby.network.topology.routers9
+node_a=system.ruby.network.topology.ext_links3.int_node
+node_b=system.ruby.network.topology.int_links0.node_b
weight=1
[system.ruby.network.topology.int_links4]
@@ -906,8 +1081,8 @@ type=SimpleIntLink
bandwidth_factor=16
latency=1
link_id=13
-node_a=system.ruby.network.topology.routers4
-node_b=system.ruby.network.topology.routers9
+node_a=system.ruby.network.topology.ext_links4.int_node
+node_b=system.ruby.network.topology.int_links0.node_b
weight=1
[system.ruby.network.topology.int_links5]
@@ -915,8 +1090,8 @@ type=SimpleIntLink
bandwidth_factor=16
latency=1
link_id=14
-node_a=system.ruby.network.topology.routers5
-node_b=system.ruby.network.topology.routers9
+node_a=system.ruby.network.topology.ext_links5.int_node
+node_b=system.ruby.network.topology.int_links0.node_b
weight=1
[system.ruby.network.topology.int_links6]
@@ -924,8 +1099,8 @@ type=SimpleIntLink
bandwidth_factor=16
latency=1
link_id=15
-node_a=system.ruby.network.topology.routers6
-node_b=system.ruby.network.topology.routers9
+node_a=system.ruby.network.topology.ext_links6.int_node
+node_b=system.ruby.network.topology.int_links0.node_b
weight=1
[system.ruby.network.topology.int_links7]
@@ -933,8 +1108,8 @@ type=SimpleIntLink
bandwidth_factor=16
latency=1
link_id=16
-node_a=system.ruby.network.topology.routers7
-node_b=system.ruby.network.topology.routers9
+node_a=system.ruby.network.topology.ext_links7.int_node
+node_b=system.ruby.network.topology.int_links0.node_b
weight=1
[system.ruby.network.topology.int_links8]
@@ -942,50 +1117,10 @@ type=SimpleIntLink
bandwidth_factor=16
latency=1
link_id=17
-node_a=system.ruby.network.topology.routers8
-node_b=system.ruby.network.topology.routers9
+node_a=system.ruby.network.topology.ext_links8.int_node
+node_b=system.ruby.network.topology.int_links0.node_b
weight=1
-[system.ruby.network.topology.routers0]
-type=BasicRouter
-router_id=0
-
-[system.ruby.network.topology.routers1]
-type=BasicRouter
-router_id=1
-
-[system.ruby.network.topology.routers2]
-type=BasicRouter
-router_id=2
-
-[system.ruby.network.topology.routers3]
-type=BasicRouter
-router_id=3
-
-[system.ruby.network.topology.routers4]
-type=BasicRouter
-router_id=4
-
-[system.ruby.network.topology.routers5]
-type=BasicRouter
-router_id=5
-
-[system.ruby.network.topology.routers6]
-type=BasicRouter
-router_id=6
-
-[system.ruby.network.topology.routers7]
-type=BasicRouter
-router_id=7
-
-[system.ruby.network.topology.routers8]
-type=BasicRouter
-router_id=8
-
-[system.ruby.network.topology.routers9]
-type=BasicRouter
-router_id=9
-
[system.ruby.profiler]
type=RubyProfiler
all_instructions=false
diff --git a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/ruby.stats b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/ruby.stats
index f9a059734..c35aa003a 100644
--- a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/ruby.stats
+++ b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/ruby.stats
@@ -34,27 +34,27 @@ periodic_stats_period: 1000000
================ End RubySystem Configuration Print ================
-Real time: Jun/04/2012 13:44:25
+Real time: Jul/10/2012 17:54:10
Profiler Stats
--------------
-Elapsed_time_in_seconds: 111
-Elapsed_time_in_minutes: 1.85
-Elapsed_time_in_hours: 0.0308333
-Elapsed_time_in_days: 0.00128472
+Elapsed_time_in_seconds: 159
+Elapsed_time_in_minutes: 2.65
+Elapsed_time_in_hours: 0.0441667
+Elapsed_time_in_days: 0.00184028
-Virtual_time_in_seconds: 111.55
-Virtual_time_in_minutes: 1.85917
-Virtual_time_in_hours: 0.0309861
-Virtual_time_in_days: 0.00129109
+Virtual_time_in_seconds: 158.89
+Virtual_time_in_minutes: 2.64817
+Virtual_time_in_hours: 0.0441361
+Virtual_time_in_days: 0.001839
Ruby_current_time: 19129199
Ruby_start_time: 0
Ruby_cycles: 19129199
-mbytes_resident: 60.7188
-mbytes_total: 361.293
-resident_ratio: 0.16806
+mbytes_resident: 59.2852
+mbytes_total: 371.031
+resident_ratio: 0.159795
ruby_cycles_executed: [ 19129200 19129200 19129200 19129200 19129200 19129200 19129200 19129200 ]
@@ -124,13 +124,13 @@ Total_nonPF_delay_cycles: [binsize: 1 max: 0 count: 0 average: NaN |standard dev
Resource Usage
--------------
page_size: 4096
-user_time: 111
+user_time: 158
system_time: 0
-page_reclaims: 15994
+page_reclaims: 16310
page_faults: 0
swaps: 0
block_inputs: 0
-block_outputs: 224
+block_outputs: 0
Network Stats
-------------
diff --git a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/simout b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/simout
index bc60d72d3..cc01f71f1 100755
--- a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/simout
+++ b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/simout
@@ -1,9 +1,9 @@
gem5 Simulator System. http://gem5.org
gem5 is copyrighted software; use the --copyright option for details.
-gem5 compiled Jun 4 2012 11:51:44
-gem5 started Jun 4 2012 13:42:34
-gem5 executing on zizzer
+gem5 compiled Jul 10 2012 15:16:15
+gem5 started Jul 10 2012 17:51:31
+gem5 executing on sc2b0605
command line: build/ALPHA_MOESI_hammer/gem5.opt -d build/ALPHA_MOESI_hammer/tests/opt/quick/se/50.memtest/alpha/linux/memtest-ruby-MOESI_hammer -re tests/run.py build/ALPHA_MOESI_hammer/tests/opt/quick/se/50.memtest/alpha/linux/memtest-ruby-MOESI_hammer
Global frequency set at 1000000000 ticks per second
info: Entering event queue @ 0. Starting simulation...
diff --git a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/stats.txt b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/stats.txt
index 7c588684e..75db37f25 100644
--- a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/stats.txt
+++ b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/stats.txt
@@ -4,9 +4,159 @@ sim_seconds 0.019129 # Nu
sim_ticks 19129199 # Number of ticks simulated
final_tick 19129199 # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
sim_freq 1000000000 # Frequency of simulated ticks
-host_tick_rate 171697 # Simulator tick rate (ticks/s)
-host_mem_usage 369968 # Number of bytes of host memory used
-host_seconds 111.41 # Real time elapsed on the host
+host_tick_rate 120686 # Simulator tick rate (ticks/s)
+host_mem_usage 379940 # Number of bytes of host memory used
+host_seconds 158.50 # Real time elapsed on the host
+system.l1_cntrl4.L1DcacheMemory.num_data_array_reads 0 # number of data array reads
+system.l1_cntrl4.L1DcacheMemory.num_data_array_writes 0 # number of data array writes
+system.l1_cntrl4.L1DcacheMemory.num_tag_array_reads 0 # number of tag array reads
+system.l1_cntrl4.L1DcacheMemory.num_tag_array_writes 0 # number of tag array writes
+system.l1_cntrl4.L1DcacheMemory.num_tag_array_stalls 0 # number of stalls caused by tag array
+system.l1_cntrl4.L1DcacheMemory.num_data_array_stalls 0 # number of stalls caused by data array
+system.l1_cntrl4.L1IcacheMemory.num_data_array_reads 0 # number of data array reads
+system.l1_cntrl4.L1IcacheMemory.num_data_array_writes 0 # number of data array writes
+system.l1_cntrl4.L1IcacheMemory.num_tag_array_reads 0 # number of tag array reads
+system.l1_cntrl4.L1IcacheMemory.num_tag_array_writes 0 # number of tag array writes
+system.l1_cntrl4.L1IcacheMemory.num_tag_array_stalls 0 # number of stalls caused by tag array
+system.l1_cntrl4.L1IcacheMemory.num_data_array_stalls 0 # number of stalls caused by data array
+system.l1_cntrl4.L2cacheMemory.num_data_array_reads 0 # number of data array reads
+system.l1_cntrl4.L2cacheMemory.num_data_array_writes 0 # number of data array writes
+system.l1_cntrl4.L2cacheMemory.num_tag_array_reads 0 # number of tag array reads
+system.l1_cntrl4.L2cacheMemory.num_tag_array_writes 0 # number of tag array writes
+system.l1_cntrl4.L2cacheMemory.num_tag_array_stalls 0 # number of stalls caused by tag array
+system.l1_cntrl4.L2cacheMemory.num_data_array_stalls 0 # number of stalls caused by data array
+system.l1_cntrl5.L1DcacheMemory.num_data_array_reads 0 # number of data array reads
+system.l1_cntrl5.L1DcacheMemory.num_data_array_writes 0 # number of data array writes
+system.l1_cntrl5.L1DcacheMemory.num_tag_array_reads 0 # number of tag array reads
+system.l1_cntrl5.L1DcacheMemory.num_tag_array_writes 0 # number of tag array writes
+system.l1_cntrl5.L1DcacheMemory.num_tag_array_stalls 0 # number of stalls caused by tag array
+system.l1_cntrl5.L1DcacheMemory.num_data_array_stalls 0 # number of stalls caused by data array
+system.l1_cntrl5.L1IcacheMemory.num_data_array_reads 0 # number of data array reads
+system.l1_cntrl5.L1IcacheMemory.num_data_array_writes 0 # number of data array writes
+system.l1_cntrl5.L1IcacheMemory.num_tag_array_reads 0 # number of tag array reads
+system.l1_cntrl5.L1IcacheMemory.num_tag_array_writes 0 # number of tag array writes
+system.l1_cntrl5.L1IcacheMemory.num_tag_array_stalls 0 # number of stalls caused by tag array
+system.l1_cntrl5.L1IcacheMemory.num_data_array_stalls 0 # number of stalls caused by data array
+system.l1_cntrl5.L2cacheMemory.num_data_array_reads 0 # number of data array reads
+system.l1_cntrl5.L2cacheMemory.num_data_array_writes 0 # number of data array writes
+system.l1_cntrl5.L2cacheMemory.num_tag_array_reads 0 # number of tag array reads
+system.l1_cntrl5.L2cacheMemory.num_tag_array_writes 0 # number of tag array writes
+system.l1_cntrl5.L2cacheMemory.num_tag_array_stalls 0 # number of stalls caused by tag array
+system.l1_cntrl5.L2cacheMemory.num_data_array_stalls 0 # number of stalls caused by data array
+system.l1_cntrl6.L1DcacheMemory.num_data_array_reads 0 # number of data array reads
+system.l1_cntrl6.L1DcacheMemory.num_data_array_writes 0 # number of data array writes
+system.l1_cntrl6.L1DcacheMemory.num_tag_array_reads 0 # number of tag array reads
+system.l1_cntrl6.L1DcacheMemory.num_tag_array_writes 0 # number of tag array writes
+system.l1_cntrl6.L1DcacheMemory.num_tag_array_stalls 0 # number of stalls caused by tag array
+system.l1_cntrl6.L1DcacheMemory.num_data_array_stalls 0 # number of stalls caused by data array
+system.l1_cntrl6.L1IcacheMemory.num_data_array_reads 0 # number of data array reads
+system.l1_cntrl6.L1IcacheMemory.num_data_array_writes 0 # number of data array writes
+system.l1_cntrl6.L1IcacheMemory.num_tag_array_reads 0 # number of tag array reads
+system.l1_cntrl6.L1IcacheMemory.num_tag_array_writes 0 # number of tag array writes
+system.l1_cntrl6.L1IcacheMemory.num_tag_array_stalls 0 # number of stalls caused by tag array
+system.l1_cntrl6.L1IcacheMemory.num_data_array_stalls 0 # number of stalls caused by data array
+system.l1_cntrl6.L2cacheMemory.num_data_array_reads 0 # number of data array reads
+system.l1_cntrl6.L2cacheMemory.num_data_array_writes 0 # number of data array writes
+system.l1_cntrl6.L2cacheMemory.num_tag_array_reads 0 # number of tag array reads
+system.l1_cntrl6.L2cacheMemory.num_tag_array_writes 0 # number of tag array writes
+system.l1_cntrl6.L2cacheMemory.num_tag_array_stalls 0 # number of stalls caused by tag array
+system.l1_cntrl6.L2cacheMemory.num_data_array_stalls 0 # number of stalls caused by data array
+system.l1_cntrl7.L1DcacheMemory.num_data_array_reads 0 # number of data array reads
+system.l1_cntrl7.L1DcacheMemory.num_data_array_writes 0 # number of data array writes
+system.l1_cntrl7.L1DcacheMemory.num_tag_array_reads 0 # number of tag array reads
+system.l1_cntrl7.L1DcacheMemory.num_tag_array_writes 0 # number of tag array writes
+system.l1_cntrl7.L1DcacheMemory.num_tag_array_stalls 0 # number of stalls caused by tag array
+system.l1_cntrl7.L1DcacheMemory.num_data_array_stalls 0 # number of stalls caused by data array
+system.l1_cntrl7.L1IcacheMemory.num_data_array_reads 0 # number of data array reads
+system.l1_cntrl7.L1IcacheMemory.num_data_array_writes 0 # number of data array writes
+system.l1_cntrl7.L1IcacheMemory.num_tag_array_reads 0 # number of tag array reads
+system.l1_cntrl7.L1IcacheMemory.num_tag_array_writes 0 # number of tag array writes
+system.l1_cntrl7.L1IcacheMemory.num_tag_array_stalls 0 # number of stalls caused by tag array
+system.l1_cntrl7.L1IcacheMemory.num_data_array_stalls 0 # number of stalls caused by data array
+system.l1_cntrl7.L2cacheMemory.num_data_array_reads 0 # number of data array reads
+system.l1_cntrl7.L2cacheMemory.num_data_array_writes 0 # number of data array writes
+system.l1_cntrl7.L2cacheMemory.num_tag_array_reads 0 # number of tag array reads
+system.l1_cntrl7.L2cacheMemory.num_tag_array_writes 0 # number of tag array writes
+system.l1_cntrl7.L2cacheMemory.num_tag_array_stalls 0 # number of stalls caused by tag array
+system.l1_cntrl7.L2cacheMemory.num_data_array_stalls 0 # number of stalls caused by data array
+system.l1_cntrl0.L1DcacheMemory.num_data_array_reads 0 # number of data array reads
+system.l1_cntrl0.L1DcacheMemory.num_data_array_writes 0 # number of data array writes
+system.l1_cntrl0.L1DcacheMemory.num_tag_array_reads 0 # number of tag array reads
+system.l1_cntrl0.L1DcacheMemory.num_tag_array_writes 0 # number of tag array writes
+system.l1_cntrl0.L1DcacheMemory.num_tag_array_stalls 0 # number of stalls caused by tag array
+system.l1_cntrl0.L1DcacheMemory.num_data_array_stalls 0 # number of stalls caused by data array
+system.l1_cntrl0.L1IcacheMemory.num_data_array_reads 0 # number of data array reads
+system.l1_cntrl0.L1IcacheMemory.num_data_array_writes 0 # number of data array writes
+system.l1_cntrl0.L1IcacheMemory.num_tag_array_reads 0 # number of tag array reads
+system.l1_cntrl0.L1IcacheMemory.num_tag_array_writes 0 # number of tag array writes
+system.l1_cntrl0.L1IcacheMemory.num_tag_array_stalls 0 # number of stalls caused by tag array
+system.l1_cntrl0.L1IcacheMemory.num_data_array_stalls 0 # number of stalls caused by data array
+system.l1_cntrl0.L2cacheMemory.num_data_array_reads 0 # number of data array reads
+system.l1_cntrl0.L2cacheMemory.num_data_array_writes 0 # number of data array writes
+system.l1_cntrl0.L2cacheMemory.num_tag_array_reads 0 # number of tag array reads
+system.l1_cntrl0.L2cacheMemory.num_tag_array_writes 0 # number of tag array writes
+system.l1_cntrl0.L2cacheMemory.num_tag_array_stalls 0 # number of stalls caused by tag array
+system.l1_cntrl0.L2cacheMemory.num_data_array_stalls 0 # number of stalls caused by data array
+system.l1_cntrl1.L1DcacheMemory.num_data_array_reads 0 # number of data array reads
+system.l1_cntrl1.L1DcacheMemory.num_data_array_writes 0 # number of data array writes
+system.l1_cntrl1.L1DcacheMemory.num_tag_array_reads 0 # number of tag array reads
+system.l1_cntrl1.L1DcacheMemory.num_tag_array_writes 0 # number of tag array writes
+system.l1_cntrl1.L1DcacheMemory.num_tag_array_stalls 0 # number of stalls caused by tag array
+system.l1_cntrl1.L1DcacheMemory.num_data_array_stalls 0 # number of stalls caused by data array
+system.l1_cntrl1.L1IcacheMemory.num_data_array_reads 0 # number of data array reads
+system.l1_cntrl1.L1IcacheMemory.num_data_array_writes 0 # number of data array writes
+system.l1_cntrl1.L1IcacheMemory.num_tag_array_reads 0 # number of tag array reads
+system.l1_cntrl1.L1IcacheMemory.num_tag_array_writes 0 # number of tag array writes
+system.l1_cntrl1.L1IcacheMemory.num_tag_array_stalls 0 # number of stalls caused by tag array
+system.l1_cntrl1.L1IcacheMemory.num_data_array_stalls 0 # number of stalls caused by data array
+system.l1_cntrl1.L2cacheMemory.num_data_array_reads 0 # number of data array reads
+system.l1_cntrl1.L2cacheMemory.num_data_array_writes 0 # number of data array writes
+system.l1_cntrl1.L2cacheMemory.num_tag_array_reads 0 # number of tag array reads
+system.l1_cntrl1.L2cacheMemory.num_tag_array_writes 0 # number of tag array writes
+system.l1_cntrl1.L2cacheMemory.num_tag_array_stalls 0 # number of stalls caused by tag array
+system.l1_cntrl1.L2cacheMemory.num_data_array_stalls 0 # number of stalls caused by data array
+system.l1_cntrl2.L1DcacheMemory.num_data_array_reads 0 # number of data array reads
+system.l1_cntrl2.L1DcacheMemory.num_data_array_writes 0 # number of data array writes
+system.l1_cntrl2.L1DcacheMemory.num_tag_array_reads 0 # number of tag array reads
+system.l1_cntrl2.L1DcacheMemory.num_tag_array_writes 0 # number of tag array writes
+system.l1_cntrl2.L1DcacheMemory.num_tag_array_stalls 0 # number of stalls caused by tag array
+system.l1_cntrl2.L1DcacheMemory.num_data_array_stalls 0 # number of stalls caused by data array
+system.l1_cntrl2.L1IcacheMemory.num_data_array_reads 0 # number of data array reads
+system.l1_cntrl2.L1IcacheMemory.num_data_array_writes 0 # number of data array writes
+system.l1_cntrl2.L1IcacheMemory.num_tag_array_reads 0 # number of tag array reads
+system.l1_cntrl2.L1IcacheMemory.num_tag_array_writes 0 # number of tag array writes
+system.l1_cntrl2.L1IcacheMemory.num_tag_array_stalls 0 # number of stalls caused by tag array
+system.l1_cntrl2.L1IcacheMemory.num_data_array_stalls 0 # number of stalls caused by data array
+system.l1_cntrl2.L2cacheMemory.num_data_array_reads 0 # number of data array reads
+system.l1_cntrl2.L2cacheMemory.num_data_array_writes 0 # number of data array writes
+system.l1_cntrl2.L2cacheMemory.num_tag_array_reads 0 # number of tag array reads
+system.l1_cntrl2.L2cacheMemory.num_tag_array_writes 0 # number of tag array writes
+system.l1_cntrl2.L2cacheMemory.num_tag_array_stalls 0 # number of stalls caused by tag array
+system.l1_cntrl2.L2cacheMemory.num_data_array_stalls 0 # number of stalls caused by data array
+system.l1_cntrl3.L1DcacheMemory.num_data_array_reads 0 # number of data array reads
+system.l1_cntrl3.L1DcacheMemory.num_data_array_writes 0 # number of data array writes
+system.l1_cntrl3.L1DcacheMemory.num_tag_array_reads 0 # number of tag array reads
+system.l1_cntrl3.L1DcacheMemory.num_tag_array_writes 0 # number of tag array writes
+system.l1_cntrl3.L1DcacheMemory.num_tag_array_stalls 0 # number of stalls caused by tag array
+system.l1_cntrl3.L1DcacheMemory.num_data_array_stalls 0 # number of stalls caused by data array
+system.l1_cntrl3.L1IcacheMemory.num_data_array_reads 0 # number of data array reads
+system.l1_cntrl3.L1IcacheMemory.num_data_array_writes 0 # number of data array writes
+system.l1_cntrl3.L1IcacheMemory.num_tag_array_reads 0 # number of tag array reads
+system.l1_cntrl3.L1IcacheMemory.num_tag_array_writes 0 # number of tag array writes
+system.l1_cntrl3.L1IcacheMemory.num_tag_array_stalls 0 # number of stalls caused by tag array
+system.l1_cntrl3.L1IcacheMemory.num_data_array_stalls 0 # number of stalls caused by data array
+system.l1_cntrl3.L2cacheMemory.num_data_array_reads 0 # number of data array reads
+system.l1_cntrl3.L2cacheMemory.num_data_array_writes 0 # number of data array writes
+system.l1_cntrl3.L2cacheMemory.num_tag_array_reads 0 # number of tag array reads
+system.l1_cntrl3.L2cacheMemory.num_tag_array_writes 0 # number of tag array writes
+system.l1_cntrl3.L2cacheMemory.num_tag_array_stalls 0 # number of stalls caused by tag array
+system.l1_cntrl3.L2cacheMemory.num_data_array_stalls 0 # number of stalls caused by data array
+system.dir_cntrl0.probeFilter.num_data_array_reads 0 # number of data array reads
+system.dir_cntrl0.probeFilter.num_data_array_writes 0 # number of data array writes
+system.dir_cntrl0.probeFilter.num_tag_array_reads 0 # number of tag array reads
+system.dir_cntrl0.probeFilter.num_tag_array_writes 0 # number of tag array writes
+system.dir_cntrl0.probeFilter.num_tag_array_stalls 0 # number of stalls caused by tag array
+system.dir_cntrl0.probeFilter.num_data_array_stalls 0 # number of stalls caused by data array
system.cpu0.num_reads 100000 # number of read accesses completed
system.cpu0.num_writes 53893 # number of write accesses completed
system.cpu0.num_copies 0 # number of copy accesses completed
diff --git a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby/config.ini b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby/config.ini
index 744f07dc5..2ff985fc2 100644
--- a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby/config.ini
+++ b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby/config.ini
@@ -14,7 +14,7 @@ init_param=0
kernel=
load_addr_mask=1099511627775
mem_mode=timing
-memories=system.funcmem system.physmem
+memories=system.physmem system.funcmem
num_work_ids=16
readfile=
symbolfile=
@@ -245,11 +245,16 @@ version=0
[system.l1_cntrl0.cacheMemory]
type=RubyCache
assoc=2
+dataAccessLatency=1
+dataArrayBanks=1
is_icache=false
latency=3
replacement_policy=PSEUDO_LRU
+resourceStalls=false
size=256
start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
[system.l1_cntrl0.sequencer]
type=RubySequencer
@@ -286,11 +291,16 @@ version=1
[system.l1_cntrl1.cacheMemory]
type=RubyCache
assoc=2
+dataAccessLatency=1
+dataArrayBanks=1
is_icache=false
latency=3
replacement_policy=PSEUDO_LRU
+resourceStalls=false
size=256
start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
[system.l1_cntrl1.sequencer]
type=RubySequencer
@@ -327,11 +337,16 @@ version=2
[system.l1_cntrl2.cacheMemory]
type=RubyCache
assoc=2
+dataAccessLatency=1
+dataArrayBanks=1
is_icache=false
latency=3
replacement_policy=PSEUDO_LRU
+resourceStalls=false
size=256
start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
[system.l1_cntrl2.sequencer]
type=RubySequencer
@@ -368,11 +383,16 @@ version=3
[system.l1_cntrl3.cacheMemory]
type=RubyCache
assoc=2
+dataAccessLatency=1
+dataArrayBanks=1
is_icache=false
latency=3
replacement_policy=PSEUDO_LRU
+resourceStalls=false
size=256
start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
[system.l1_cntrl3.sequencer]
type=RubySequencer
@@ -409,11 +429,16 @@ version=4
[system.l1_cntrl4.cacheMemory]
type=RubyCache
assoc=2
+dataAccessLatency=1
+dataArrayBanks=1
is_icache=false
latency=3
replacement_policy=PSEUDO_LRU
+resourceStalls=false
size=256
start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
[system.l1_cntrl4.sequencer]
type=RubySequencer
@@ -450,11 +475,16 @@ version=5
[system.l1_cntrl5.cacheMemory]
type=RubyCache
assoc=2
+dataAccessLatency=1
+dataArrayBanks=1
is_icache=false
latency=3
replacement_policy=PSEUDO_LRU
+resourceStalls=false
size=256
start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
[system.l1_cntrl5.sequencer]
type=RubySequencer
@@ -491,11 +521,16 @@ version=6
[system.l1_cntrl6.cacheMemory]
type=RubyCache
assoc=2
+dataAccessLatency=1
+dataArrayBanks=1
is_icache=false
latency=3
replacement_policy=PSEUDO_LRU
+resourceStalls=false
size=256
start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
[system.l1_cntrl6.sequencer]
type=RubySequencer
@@ -532,11 +567,16 @@ version=7
[system.l1_cntrl7.cacheMemory]
type=RubyCache
assoc=2
+dataAccessLatency=1
+dataArrayBanks=1
is_icache=false
latency=3
replacement_policy=PSEUDO_LRU
+resourceStalls=false
size=256
start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
[system.l1_cntrl7.sequencer]
type=RubySequencer
@@ -589,110 +629,160 @@ topology=system.ruby.network.topology
[system.ruby.network.topology]
type=Topology
-children=ext_links0 ext_links1 ext_links2 ext_links3 ext_links4 ext_links5 ext_links6 ext_links7 ext_links8 int_links0 int_links1 int_links2 int_links3 int_links4 int_links5 int_links6 int_links7 int_links8 routers0 routers1 routers2 routers3 routers4 routers5 routers6 routers7 routers8 routers9
+children=ext_links0 ext_links1 ext_links2 ext_links3 ext_links4 ext_links5 ext_links6 ext_links7 ext_links8 int_links0 int_links1 int_links2 int_links3 int_links4 int_links5 int_links6 int_links7 int_links8
description=Crossbar
ext_links=system.ruby.network.topology.ext_links0 system.ruby.network.topology.ext_links1 system.ruby.network.topology.ext_links2 system.ruby.network.topology.ext_links3 system.ruby.network.topology.ext_links4 system.ruby.network.topology.ext_links5 system.ruby.network.topology.ext_links6 system.ruby.network.topology.ext_links7 system.ruby.network.topology.ext_links8
int_links=system.ruby.network.topology.int_links0 system.ruby.network.topology.int_links1 system.ruby.network.topology.int_links2 system.ruby.network.topology.int_links3 system.ruby.network.topology.int_links4 system.ruby.network.topology.int_links5 system.ruby.network.topology.int_links6 system.ruby.network.topology.int_links7 system.ruby.network.topology.int_links8
print_config=false
-routers=system.ruby.network.topology.routers0 system.ruby.network.topology.routers1 system.ruby.network.topology.routers2 system.ruby.network.topology.routers3 system.ruby.network.topology.routers4 system.ruby.network.topology.routers5 system.ruby.network.topology.routers6 system.ruby.network.topology.routers7 system.ruby.network.topology.routers8 system.ruby.network.topology.routers9
+routers=system.ruby.network.topology.ext_links0.int_node system.ruby.network.topology.ext_links1.int_node system.ruby.network.topology.ext_links2.int_node system.ruby.network.topology.ext_links3.int_node system.ruby.network.topology.ext_links4.int_node system.ruby.network.topology.ext_links5.int_node system.ruby.network.topology.ext_links6.int_node system.ruby.network.topology.ext_links7.int_node system.ruby.network.topology.ext_links8.int_node system.ruby.network.topology.int_links0.node_b
[system.ruby.network.topology.ext_links0]
type=SimpleExtLink
+children=int_node
bandwidth_factor=16
ext_node=system.l1_cntrl0
-int_node=system.ruby.network.topology.routers0
+int_node=system.ruby.network.topology.ext_links0.int_node
latency=1
link_id=0
weight=1
+[system.ruby.network.topology.ext_links0.int_node]
+type=BasicRouter
+router_id=0
+
[system.ruby.network.topology.ext_links1]
type=SimpleExtLink
+children=int_node
bandwidth_factor=16
ext_node=system.l1_cntrl1
-int_node=system.ruby.network.topology.routers1
+int_node=system.ruby.network.topology.ext_links1.int_node
latency=1
link_id=1
weight=1
+[system.ruby.network.topology.ext_links1.int_node]
+type=BasicRouter
+router_id=1
+
[system.ruby.network.topology.ext_links2]
type=SimpleExtLink
+children=int_node
bandwidth_factor=16
ext_node=system.l1_cntrl2
-int_node=system.ruby.network.topology.routers2
+int_node=system.ruby.network.topology.ext_links2.int_node
latency=1
link_id=2
weight=1
+[system.ruby.network.topology.ext_links2.int_node]
+type=BasicRouter
+router_id=2
+
[system.ruby.network.topology.ext_links3]
type=SimpleExtLink
+children=int_node
bandwidth_factor=16
ext_node=system.l1_cntrl3
-int_node=system.ruby.network.topology.routers3
+int_node=system.ruby.network.topology.ext_links3.int_node
latency=1
link_id=3
weight=1
+[system.ruby.network.topology.ext_links3.int_node]
+type=BasicRouter
+router_id=3
+
[system.ruby.network.topology.ext_links4]
type=SimpleExtLink
+children=int_node
bandwidth_factor=16
ext_node=system.l1_cntrl4
-int_node=system.ruby.network.topology.routers4
+int_node=system.ruby.network.topology.ext_links4.int_node
latency=1
link_id=4
weight=1
+[system.ruby.network.topology.ext_links4.int_node]
+type=BasicRouter
+router_id=4
+
[system.ruby.network.topology.ext_links5]
type=SimpleExtLink
+children=int_node
bandwidth_factor=16
ext_node=system.l1_cntrl5
-int_node=system.ruby.network.topology.routers5
+int_node=system.ruby.network.topology.ext_links5.int_node
latency=1
link_id=5
weight=1
+[system.ruby.network.topology.ext_links5.int_node]
+type=BasicRouter
+router_id=5
+
[system.ruby.network.topology.ext_links6]
type=SimpleExtLink
+children=int_node
bandwidth_factor=16
ext_node=system.l1_cntrl6
-int_node=system.ruby.network.topology.routers6
+int_node=system.ruby.network.topology.ext_links6.int_node
latency=1
link_id=6
weight=1
+[system.ruby.network.topology.ext_links6.int_node]
+type=BasicRouter
+router_id=6
+
[system.ruby.network.topology.ext_links7]
type=SimpleExtLink
+children=int_node
bandwidth_factor=16
ext_node=system.l1_cntrl7
-int_node=system.ruby.network.topology.routers7
+int_node=system.ruby.network.topology.ext_links7.int_node
latency=1
link_id=7
weight=1
+[system.ruby.network.topology.ext_links7.int_node]
+type=BasicRouter
+router_id=7
+
[system.ruby.network.topology.ext_links8]
type=SimpleExtLink
+children=int_node
bandwidth_factor=16
ext_node=system.dir_cntrl0
-int_node=system.ruby.network.topology.routers8
+int_node=system.ruby.network.topology.ext_links8.int_node
latency=1
link_id=8
weight=1
+[system.ruby.network.topology.ext_links8.int_node]
+type=BasicRouter
+router_id=8
+
[system.ruby.network.topology.int_links0]
type=SimpleIntLink
+children=node_b
bandwidth_factor=16
latency=1
link_id=9
-node_a=system.ruby.network.topology.routers0
-node_b=system.ruby.network.topology.routers9
+node_a=system.ruby.network.topology.ext_links0.int_node
+node_b=system.ruby.network.topology.int_links0.node_b
weight=1
+[system.ruby.network.topology.int_links0.node_b]
+type=BasicRouter
+router_id=9
+
[system.ruby.network.topology.int_links1]
type=SimpleIntLink
bandwidth_factor=16
latency=1
link_id=10
-node_a=system.ruby.network.topology.routers1
-node_b=system.ruby.network.topology.routers9
+node_a=system.ruby.network.topology.ext_links1.int_node
+node_b=system.ruby.network.topology.int_links0.node_b
weight=1
[system.ruby.network.topology.int_links2]
@@ -700,8 +790,8 @@ type=SimpleIntLink
bandwidth_factor=16
latency=1
link_id=11
-node_a=system.ruby.network.topology.routers2
-node_b=system.ruby.network.topology.routers9
+node_a=system.ruby.network.topology.ext_links2.int_node
+node_b=system.ruby.network.topology.int_links0.node_b
weight=1
[system.ruby.network.topology.int_links3]
@@ -709,8 +799,8 @@ type=SimpleIntLink
bandwidth_factor=16
latency=1
link_id=12
-node_a=system.ruby.network.topology.routers3
-node_b=system.ruby.network.topology.routers9
+node_a=system.ruby.network.topology.ext_links3.int_node
+node_b=system.ruby.network.topology.int_links0.node_b
weight=1
[system.ruby.network.topology.int_links4]
@@ -718,8 +808,8 @@ type=SimpleIntLink
bandwidth_factor=16
latency=1
link_id=13
-node_a=system.ruby.network.topology.routers4
-node_b=system.ruby.network.topology.routers9
+node_a=system.ruby.network.topology.ext_links4.int_node
+node_b=system.ruby.network.topology.int_links0.node_b
weight=1
[system.ruby.network.topology.int_links5]
@@ -727,8 +817,8 @@ type=SimpleIntLink
bandwidth_factor=16
latency=1
link_id=14
-node_a=system.ruby.network.topology.routers5
-node_b=system.ruby.network.topology.routers9
+node_a=system.ruby.network.topology.ext_links5.int_node
+node_b=system.ruby.network.topology.int_links0.node_b
weight=1
[system.ruby.network.topology.int_links6]
@@ -736,8 +826,8 @@ type=SimpleIntLink
bandwidth_factor=16
latency=1
link_id=15
-node_a=system.ruby.network.topology.routers6
-node_b=system.ruby.network.topology.routers9
+node_a=system.ruby.network.topology.ext_links6.int_node
+node_b=system.ruby.network.topology.int_links0.node_b
weight=1
[system.ruby.network.topology.int_links7]
@@ -745,8 +835,8 @@ type=SimpleIntLink
bandwidth_factor=16
latency=1
link_id=16
-node_a=system.ruby.network.topology.routers7
-node_b=system.ruby.network.topology.routers9
+node_a=system.ruby.network.topology.ext_links7.int_node
+node_b=system.ruby.network.topology.int_links0.node_b
weight=1
[system.ruby.network.topology.int_links8]
@@ -754,50 +844,10 @@ type=SimpleIntLink
bandwidth_factor=16
latency=1
link_id=17
-node_a=system.ruby.network.topology.routers8
-node_b=system.ruby.network.topology.routers9
+node_a=system.ruby.network.topology.ext_links8.int_node
+node_b=system.ruby.network.topology.int_links0.node_b
weight=1
-[system.ruby.network.topology.routers0]
-type=BasicRouter
-router_id=0
-
-[system.ruby.network.topology.routers1]
-type=BasicRouter
-router_id=1
-
-[system.ruby.network.topology.routers2]
-type=BasicRouter
-router_id=2
-
-[system.ruby.network.topology.routers3]
-type=BasicRouter
-router_id=3
-
-[system.ruby.network.topology.routers4]
-type=BasicRouter
-router_id=4
-
-[system.ruby.network.topology.routers5]
-type=BasicRouter
-router_id=5
-
-[system.ruby.network.topology.routers6]
-type=BasicRouter
-router_id=6
-
-[system.ruby.network.topology.routers7]
-type=BasicRouter
-router_id=7
-
-[system.ruby.network.topology.routers8]
-type=BasicRouter
-router_id=8
-
-[system.ruby.network.topology.routers9]
-type=BasicRouter
-router_id=9
-
[system.ruby.profiler]
type=RubyProfiler
all_instructions=false
diff --git a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby/ruby.stats b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby/ruby.stats
index ceb7b2a64..13fc7416c 100644
--- a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby/ruby.stats
+++ b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby/ruby.stats
@@ -34,27 +34,27 @@ periodic_stats_period: 1000000
================ End RubySystem Configuration Print ================
-Real time: Jun/04/2012 14:22:53
+Real time: Jul/10/2012 17:28:36
Profiler Stats
--------------
-Elapsed_time_in_seconds: 41
-Elapsed_time_in_minutes: 0.683333
-Elapsed_time_in_hours: 0.0113889
-Elapsed_time_in_days: 0.000474537
+Elapsed_time_in_seconds: 61
+Elapsed_time_in_minutes: 1.01667
+Elapsed_time_in_hours: 0.0169444
+Elapsed_time_in_days: 0.000706019
-Virtual_time_in_seconds: 41.24
-Virtual_time_in_minutes: 0.687333
-Virtual_time_in_hours: 0.0114556
-Virtual_time_in_days: 0.000477315
+Virtual_time_in_seconds: 60.59
+Virtual_time_in_minutes: 1.00983
+Virtual_time_in_hours: 0.0168306
+Virtual_time_in_days: 0.000701273
Ruby_current_time: 28725020
Ruby_start_time: 0
Ruby_cycles: 28725020
-mbytes_resident: 60.7461
-mbytes_total: 361.262
-resident_ratio: 0.16815
+mbytes_resident: 59.0156
+mbytes_total: 370.527
+resident_ratio: 0.159285
ruby_cycles_executed: [ 28725021 28725021 28725021 28725021 28725021 28725021 28725021 28725021 ]
@@ -118,13 +118,13 @@ Total_nonPF_delay_cycles: [binsize: 1 max: 22 count: 1233888 average: 0.00745367
Resource Usage
--------------
page_size: 4096
-user_time: 41
+user_time: 60
system_time: 0
-page_reclaims: 15955
-page_faults: 2
+page_reclaims: 16275
+page_faults: 0
swaps: 0
-block_inputs: 128
-block_outputs: 184
+block_inputs: 0
+block_outputs: 0
Network Stats
-------------
diff --git a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby/simout b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby/simout
index 19534930d..cc90915b5 100755
--- a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby/simout
+++ b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby/simout
@@ -1,9 +1,9 @@
gem5 Simulator System. http://gem5.org
gem5 is copyrighted software; use the --copyright option for details.
-gem5 compiled Jun 4 2012 11:50:11
-gem5 started Jun 4 2012 14:22:12
-gem5 executing on zizzer
+gem5 compiled Jul 10 2012 16:32:12
+gem5 started Jul 10 2012 17:27:35
+gem5 executing on sc2b0605
command line: build/ALPHA/gem5.opt -d build/ALPHA/tests/opt/quick/se/50.memtest/alpha/linux/memtest-ruby -re tests/run.py build/ALPHA/tests/opt/quick/se/50.memtest/alpha/linux/memtest-ruby
Global frequency set at 1000000000 ticks per second
info: Entering event queue @ 0. Starting simulation...
diff --git a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby/stats.txt b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby/stats.txt
index fbf03980e..321ca5f77 100644
--- a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby/stats.txt
+++ b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby/stats.txt
@@ -4,9 +4,57 @@ sim_seconds 0.028725 # Nu
sim_ticks 28725020 # Number of ticks simulated
final_tick 28725020 # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
sim_freq 1000000000 # Frequency of simulated ticks
-host_tick_rate 699351 # Simulator tick rate (ticks/s)
-host_mem_usage 369936 # Number of bytes of host memory used
-host_seconds 41.07 # Real time elapsed on the host
+host_tick_rate 477176 # Simulator tick rate (ticks/s)
+host_mem_usage 379424 # Number of bytes of host memory used
+host_seconds 60.20 # Real time elapsed on the host
+system.l1_cntrl4.cacheMemory.num_data_array_reads 0 # number of data array reads
+system.l1_cntrl4.cacheMemory.num_data_array_writes 0 # number of data array writes
+system.l1_cntrl4.cacheMemory.num_tag_array_reads 0 # number of tag array reads
+system.l1_cntrl4.cacheMemory.num_tag_array_writes 0 # number of tag array writes
+system.l1_cntrl4.cacheMemory.num_tag_array_stalls 0 # number of stalls caused by tag array
+system.l1_cntrl4.cacheMemory.num_data_array_stalls 0 # number of stalls caused by data array
+system.l1_cntrl5.cacheMemory.num_data_array_reads 0 # number of data array reads
+system.l1_cntrl5.cacheMemory.num_data_array_writes 0 # number of data array writes
+system.l1_cntrl5.cacheMemory.num_tag_array_reads 0 # number of tag array reads
+system.l1_cntrl5.cacheMemory.num_tag_array_writes 0 # number of tag array writes
+system.l1_cntrl5.cacheMemory.num_tag_array_stalls 0 # number of stalls caused by tag array
+system.l1_cntrl5.cacheMemory.num_data_array_stalls 0 # number of stalls caused by data array
+system.l1_cntrl6.cacheMemory.num_data_array_reads 0 # number of data array reads
+system.l1_cntrl6.cacheMemory.num_data_array_writes 0 # number of data array writes
+system.l1_cntrl6.cacheMemory.num_tag_array_reads 0 # number of tag array reads
+system.l1_cntrl6.cacheMemory.num_tag_array_writes 0 # number of tag array writes
+system.l1_cntrl6.cacheMemory.num_tag_array_stalls 0 # number of stalls caused by tag array
+system.l1_cntrl6.cacheMemory.num_data_array_stalls 0 # number of stalls caused by data array
+system.l1_cntrl7.cacheMemory.num_data_array_reads 0 # number of data array reads
+system.l1_cntrl7.cacheMemory.num_data_array_writes 0 # number of data array writes
+system.l1_cntrl7.cacheMemory.num_tag_array_reads 0 # number of tag array reads
+system.l1_cntrl7.cacheMemory.num_tag_array_writes 0 # number of tag array writes
+system.l1_cntrl7.cacheMemory.num_tag_array_stalls 0 # number of stalls caused by tag array
+system.l1_cntrl7.cacheMemory.num_data_array_stalls 0 # number of stalls caused by data array
+system.l1_cntrl0.cacheMemory.num_data_array_reads 0 # number of data array reads
+system.l1_cntrl0.cacheMemory.num_data_array_writes 0 # number of data array writes
+system.l1_cntrl0.cacheMemory.num_tag_array_reads 0 # number of tag array reads
+system.l1_cntrl0.cacheMemory.num_tag_array_writes 0 # number of tag array writes
+system.l1_cntrl0.cacheMemory.num_tag_array_stalls 0 # number of stalls caused by tag array
+system.l1_cntrl0.cacheMemory.num_data_array_stalls 0 # number of stalls caused by data array
+system.l1_cntrl1.cacheMemory.num_data_array_reads 0 # number of data array reads
+system.l1_cntrl1.cacheMemory.num_data_array_writes 0 # number of data array writes
+system.l1_cntrl1.cacheMemory.num_tag_array_reads 0 # number of tag array reads
+system.l1_cntrl1.cacheMemory.num_tag_array_writes 0 # number of tag array writes
+system.l1_cntrl1.cacheMemory.num_tag_array_stalls 0 # number of stalls caused by tag array
+system.l1_cntrl1.cacheMemory.num_data_array_stalls 0 # number of stalls caused by data array
+system.l1_cntrl2.cacheMemory.num_data_array_reads 0 # number of data array reads
+system.l1_cntrl2.cacheMemory.num_data_array_writes 0 # number of data array writes
+system.l1_cntrl2.cacheMemory.num_tag_array_reads 0 # number of tag array reads
+system.l1_cntrl2.cacheMemory.num_tag_array_writes 0 # number of tag array writes
+system.l1_cntrl2.cacheMemory.num_tag_array_stalls 0 # number of stalls caused by tag array
+system.l1_cntrl2.cacheMemory.num_data_array_stalls 0 # number of stalls caused by data array
+system.l1_cntrl3.cacheMemory.num_data_array_reads 0 # number of data array reads
+system.l1_cntrl3.cacheMemory.num_data_array_writes 0 # number of data array writes
+system.l1_cntrl3.cacheMemory.num_tag_array_reads 0 # number of tag array reads
+system.l1_cntrl3.cacheMemory.num_tag_array_writes 0 # number of tag array writes
+system.l1_cntrl3.cacheMemory.num_tag_array_stalls 0 # number of stalls caused by tag array
+system.l1_cntrl3.cacheMemory.num_data_array_stalls 0 # number of stalls caused by data array
system.cpu0.num_reads 100000 # number of read accesses completed
system.cpu0.num_writes 53147 # number of write accesses completed
system.cpu0.num_copies 0 # number of copy accesses completed
diff --git a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_CMP_directory/config.ini b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_CMP_directory/config.ini
index 993287fd9..f8c719b99 100644
--- a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_CMP_directory/config.ini
+++ b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_CMP_directory/config.ini
@@ -93,20 +93,30 @@ version=0
[system.l1_cntrl0.L1DcacheMemory]
type=RubyCache
assoc=2
+dataAccessLatency=1
+dataArrayBanks=1
is_icache=false
latency=3
replacement_policy=PSEUDO_LRU
+resourceStalls=false
size=256
start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
[system.l1_cntrl0.L1IcacheMemory]
type=RubyCache
assoc=2
+dataAccessLatency=1
+dataArrayBanks=1
is_icache=false
latency=3
replacement_policy=PSEUDO_LRU
+resourceStalls=false
size=256
start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
[system.l1_cntrl0.sequencer]
type=RubySequencer
@@ -142,11 +152,16 @@ version=0
[system.l2_cntrl0.L2cacheMemory]
type=RubyCache
assoc=2
+dataAccessLatency=1
+dataArrayBanks=1
is_icache=false
latency=15
replacement_policy=PSEUDO_LRU
+resourceStalls=false
size=512
start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
[system.physmem]
type=SimpleMemory
@@ -183,56 +198,76 @@ topology=system.ruby.network.topology
[system.ruby.network.topology]
type=Topology
-children=ext_links0 ext_links1 ext_links2 int_links0 int_links1 int_links2 routers0 routers1 routers2 routers3
+children=ext_links0 ext_links1 ext_links2 int_links0 int_links1 int_links2
description=Crossbar
ext_links=system.ruby.network.topology.ext_links0 system.ruby.network.topology.ext_links1 system.ruby.network.topology.ext_links2
int_links=system.ruby.network.topology.int_links0 system.ruby.network.topology.int_links1 system.ruby.network.topology.int_links2
print_config=false
-routers=system.ruby.network.topology.routers0 system.ruby.network.topology.routers1 system.ruby.network.topology.routers2 system.ruby.network.topology.routers3
+routers=system.ruby.network.topology.ext_links0.int_node system.ruby.network.topology.ext_links1.int_node system.ruby.network.topology.ext_links2.int_node system.ruby.network.topology.int_links0.node_b
[system.ruby.network.topology.ext_links0]
type=SimpleExtLink
+children=int_node
bandwidth_factor=16
ext_node=system.l1_cntrl0
-int_node=system.ruby.network.topology.routers0
+int_node=system.ruby.network.topology.ext_links0.int_node
latency=1
link_id=0
weight=1
+[system.ruby.network.topology.ext_links0.int_node]
+type=BasicRouter
+router_id=0
+
[system.ruby.network.topology.ext_links1]
type=SimpleExtLink
+children=int_node
bandwidth_factor=16
ext_node=system.l2_cntrl0
-int_node=system.ruby.network.topology.routers1
+int_node=system.ruby.network.topology.ext_links1.int_node
latency=1
link_id=1
weight=1
+[system.ruby.network.topology.ext_links1.int_node]
+type=BasicRouter
+router_id=1
+
[system.ruby.network.topology.ext_links2]
type=SimpleExtLink
+children=int_node
bandwidth_factor=16
ext_node=system.dir_cntrl0
-int_node=system.ruby.network.topology.routers2
+int_node=system.ruby.network.topology.ext_links2.int_node
latency=1
link_id=2
weight=1
+[system.ruby.network.topology.ext_links2.int_node]
+type=BasicRouter
+router_id=2
+
[system.ruby.network.topology.int_links0]
type=SimpleIntLink
+children=node_b
bandwidth_factor=16
latency=1
link_id=3
-node_a=system.ruby.network.topology.routers0
-node_b=system.ruby.network.topology.routers3
+node_a=system.ruby.network.topology.ext_links0.int_node
+node_b=system.ruby.network.topology.int_links0.node_b
weight=1
+[system.ruby.network.topology.int_links0.node_b]
+type=BasicRouter
+router_id=3
+
[system.ruby.network.topology.int_links1]
type=SimpleIntLink
bandwidth_factor=16
latency=1
link_id=4
-node_a=system.ruby.network.topology.routers1
-node_b=system.ruby.network.topology.routers3
+node_a=system.ruby.network.topology.ext_links1.int_node
+node_b=system.ruby.network.topology.int_links0.node_b
weight=1
[system.ruby.network.topology.int_links2]
@@ -240,26 +275,10 @@ type=SimpleIntLink
bandwidth_factor=16
latency=1
link_id=5
-node_a=system.ruby.network.topology.routers2
-node_b=system.ruby.network.topology.routers3
+node_a=system.ruby.network.topology.ext_links2.int_node
+node_b=system.ruby.network.topology.int_links0.node_b
weight=1
-[system.ruby.network.topology.routers0]
-type=BasicRouter
-router_id=0
-
-[system.ruby.network.topology.routers1]
-type=BasicRouter
-router_id=1
-
-[system.ruby.network.topology.routers2]
-type=BasicRouter
-router_id=2
-
-[system.ruby.network.topology.routers3]
-type=BasicRouter
-router_id=3
-
[system.ruby.profiler]
type=RubyProfiler
all_instructions=false
diff --git a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_CMP_directory/ruby.stats b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_CMP_directory/ruby.stats
index 7b092c66b..09de1cfea 100644
--- a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_CMP_directory/ruby.stats
+++ b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_CMP_directory/ruby.stats
@@ -34,7 +34,7 @@ periodic_stats_period: 1000000
================ End RubySystem Configuration Print ================
-Real time: Jun/04/2012 14:40:53
+Real time: Jul/10/2012 17:34:42
Profiler Stats
--------------
@@ -43,18 +43,18 @@ Elapsed_time_in_minutes: 0
Elapsed_time_in_hours: 0
Elapsed_time_in_days: 0
-Virtual_time_in_seconds: 0.36
-Virtual_time_in_minutes: 0.006
-Virtual_time_in_hours: 0.0001
-Virtual_time_in_days: 4.16667e-06
+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
Ruby_current_time: 349711
Ruby_start_time: 0
Ruby_cycles: 349711
-mbytes_resident: 43.2695
-mbytes_total: 216.074
-resident_ratio: 0.200253
+mbytes_resident: 41.8008
+mbytes_total: 225.551
+resident_ratio: 0.185362
ruby_cycles_executed: [ 349712 ]
@@ -119,11 +119,11 @@ Resource Usage
page_size: 4096
user_time: 0
system_time: 0
-page_reclaims: 11518
+page_reclaims: 11853
page_faults: 0
swaps: 0
block_inputs: 0
-block_outputs: 88
+block_outputs: 0
Network Stats
-------------
diff --git a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_CMP_directory/simout b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_CMP_directory/simout
index bfa4f7e73..a5b5eb0e5 100755
--- a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_CMP_directory/simout
+++ b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_CMP_directory/simout
@@ -1,9 +1,9 @@
gem5 Simulator System. http://gem5.org
gem5 is copyrighted software; use the --copyright option for details.
-gem5 compiled Jun 4 2012 11:53:20
-gem5 started Jun 4 2012 14:40:53
-gem5 executing on zizzer
+gem5 compiled Jul 10 2012 17:30:17
+gem5 started Jul 10 2012 17:34:42
+gem5 executing on sc2b0605
command line: build/ALPHA_MESI_CMP_directory/gem5.opt -d build/ALPHA_MESI_CMP_directory/tests/opt/quick/se/60.rubytest/alpha/linux/rubytest-ruby-MESI_CMP_directory -re tests/run.py build/ALPHA_MESI_CMP_directory/tests/opt/quick/se/60.rubytest/alpha/linux/rubytest-ruby-MESI_CMP_directory
Global frequency set at 1000000000 ticks per second
info: Entering event queue @ 0. Starting simulation...
diff --git a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_CMP_directory/stats.txt b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_CMP_directory/stats.txt
index f6f4e6847..3aa96ab1f 100644
--- a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_CMP_directory/stats.txt
+++ b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_CMP_directory/stats.txt
@@ -4,8 +4,26 @@ sim_seconds 0.000350 # Nu
sim_ticks 349711 # Number of ticks simulated
final_tick 349711 # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
sim_freq 1000000000 # Frequency of simulated ticks
-host_tick_rate 2288501 # Simulator tick rate (ticks/s)
-host_mem_usage 221264 # Number of bytes of host memory used
-host_seconds 0.15 # Real time elapsed on the host
+host_tick_rate 1546655 # Simulator tick rate (ticks/s)
+host_mem_usage 230968 # Number of bytes of host memory used
+host_seconds 0.23 # Real time elapsed on the host
+system.l1_cntrl0.L1DcacheMemory.num_data_array_reads 0 # number of data array reads
+system.l1_cntrl0.L1DcacheMemory.num_data_array_writes 0 # number of data array writes
+system.l1_cntrl0.L1DcacheMemory.num_tag_array_reads 0 # number of tag array reads
+system.l1_cntrl0.L1DcacheMemory.num_tag_array_writes 0 # number of tag array writes
+system.l1_cntrl0.L1DcacheMemory.num_tag_array_stalls 0 # number of stalls caused by tag array
+system.l1_cntrl0.L1DcacheMemory.num_data_array_stalls 0 # number of stalls caused by data array
+system.l1_cntrl0.L1IcacheMemory.num_data_array_reads 0 # number of data array reads
+system.l1_cntrl0.L1IcacheMemory.num_data_array_writes 0 # number of data array writes
+system.l1_cntrl0.L1IcacheMemory.num_tag_array_reads 0 # number of tag array reads
+system.l1_cntrl0.L1IcacheMemory.num_tag_array_writes 0 # number of tag array writes
+system.l1_cntrl0.L1IcacheMemory.num_tag_array_stalls 0 # number of stalls caused by tag array
+system.l1_cntrl0.L1IcacheMemory.num_data_array_stalls 0 # number of stalls caused by data array
+system.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
---------- End Simulation Statistics ----------
diff --git a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_directory/config.ini b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_directory/config.ini
index a92426643..dc2ecd66a 100644
--- a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_directory/config.ini
+++ b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_directory/config.ini
@@ -90,20 +90,30 @@ version=0
[system.l1_cntrl0.L1DcacheMemory]
type=RubyCache
assoc=2
+dataAccessLatency=1
+dataArrayBanks=1
is_icache=false
latency=3
replacement_policy=PSEUDO_LRU
+resourceStalls=false
size=256
start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
[system.l1_cntrl0.L1IcacheMemory]
type=RubyCache
assoc=2
+dataAccessLatency=1
+dataArrayBanks=1
is_icache=false
latency=3
replacement_policy=PSEUDO_LRU
+resourceStalls=false
size=256
start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
[system.l1_cntrl0.sequencer]
type=RubySequencer
@@ -138,11 +148,16 @@ version=0
[system.l2_cntrl0.L2cacheMemory]
type=RubyCache
assoc=2
+dataAccessLatency=1
+dataArrayBanks=1
is_icache=false
latency=15
replacement_policy=PSEUDO_LRU
+resourceStalls=false
size=512
start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
[system.physmem]
type=SimpleMemory
@@ -179,56 +194,76 @@ topology=system.ruby.network.topology
[system.ruby.network.topology]
type=Topology
-children=ext_links0 ext_links1 ext_links2 int_links0 int_links1 int_links2 routers0 routers1 routers2 routers3
+children=ext_links0 ext_links1 ext_links2 int_links0 int_links1 int_links2
description=Crossbar
ext_links=system.ruby.network.topology.ext_links0 system.ruby.network.topology.ext_links1 system.ruby.network.topology.ext_links2
int_links=system.ruby.network.topology.int_links0 system.ruby.network.topology.int_links1 system.ruby.network.topology.int_links2
print_config=false
-routers=system.ruby.network.topology.routers0 system.ruby.network.topology.routers1 system.ruby.network.topology.routers2 system.ruby.network.topology.routers3
+routers=system.ruby.network.topology.ext_links0.int_node system.ruby.network.topology.ext_links1.int_node system.ruby.network.topology.ext_links2.int_node system.ruby.network.topology.int_links0.node_b
[system.ruby.network.topology.ext_links0]
type=SimpleExtLink
+children=int_node
bandwidth_factor=16
ext_node=system.l1_cntrl0
-int_node=system.ruby.network.topology.routers0
+int_node=system.ruby.network.topology.ext_links0.int_node
latency=1
link_id=0
weight=1
+[system.ruby.network.topology.ext_links0.int_node]
+type=BasicRouter
+router_id=0
+
[system.ruby.network.topology.ext_links1]
type=SimpleExtLink
+children=int_node
bandwidth_factor=16
ext_node=system.l2_cntrl0
-int_node=system.ruby.network.topology.routers1
+int_node=system.ruby.network.topology.ext_links1.int_node
latency=1
link_id=1
weight=1
+[system.ruby.network.topology.ext_links1.int_node]
+type=BasicRouter
+router_id=1
+
[system.ruby.network.topology.ext_links2]
type=SimpleExtLink
+children=int_node
bandwidth_factor=16
ext_node=system.dir_cntrl0
-int_node=system.ruby.network.topology.routers2
+int_node=system.ruby.network.topology.ext_links2.int_node
latency=1
link_id=2
weight=1
+[system.ruby.network.topology.ext_links2.int_node]
+type=BasicRouter
+router_id=2
+
[system.ruby.network.topology.int_links0]
type=SimpleIntLink
+children=node_b
bandwidth_factor=16
latency=1
link_id=3
-node_a=system.ruby.network.topology.routers0
-node_b=system.ruby.network.topology.routers3
+node_a=system.ruby.network.topology.ext_links0.int_node
+node_b=system.ruby.network.topology.int_links0.node_b
weight=1
+[system.ruby.network.topology.int_links0.node_b]
+type=BasicRouter
+router_id=3
+
[system.ruby.network.topology.int_links1]
type=SimpleIntLink
bandwidth_factor=16
latency=1
link_id=4
-node_a=system.ruby.network.topology.routers1
-node_b=system.ruby.network.topology.routers3
+node_a=system.ruby.network.topology.ext_links1.int_node
+node_b=system.ruby.network.topology.int_links0.node_b
weight=1
[system.ruby.network.topology.int_links2]
@@ -236,26 +271,10 @@ type=SimpleIntLink
bandwidth_factor=16
latency=1
link_id=5
-node_a=system.ruby.network.topology.routers2
-node_b=system.ruby.network.topology.routers3
+node_a=system.ruby.network.topology.ext_links2.int_node
+node_b=system.ruby.network.topology.int_links0.node_b
weight=1
-[system.ruby.network.topology.routers0]
-type=BasicRouter
-router_id=0
-
-[system.ruby.network.topology.routers1]
-type=BasicRouter
-router_id=1
-
-[system.ruby.network.topology.routers2]
-type=BasicRouter
-router_id=2
-
-[system.ruby.network.topology.routers3]
-type=BasicRouter
-router_id=3
-
[system.ruby.profiler]
type=RubyProfiler
all_instructions=false
diff --git a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_directory/ruby.stats b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_directory/ruby.stats
index ebeb573bc..9eb4b41fc 100644
--- a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_directory/ruby.stats
+++ b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_directory/ruby.stats
@@ -34,27 +34,27 @@ periodic_stats_period: 1000000
================ End RubySystem Configuration Print ================
-Real time: Jun/04/2012 14:42:01
+Real time: Jul/10/2012 17:44:41
Profiler Stats
--------------
-Elapsed_time_in_seconds: 1
-Elapsed_time_in_minutes: 0.0166667
-Elapsed_time_in_hours: 0.000277778
-Elapsed_time_in_days: 1.15741e-05
+Elapsed_time_in_seconds: 0
+Elapsed_time_in_minutes: 0
+Elapsed_time_in_hours: 0
+Elapsed_time_in_days: 0
-Virtual_time_in_seconds: 0.66
-Virtual_time_in_minutes: 0.011
-Virtual_time_in_hours: 0.000183333
-Virtual_time_in_days: 7.63889e-06
+Virtual_time_in_seconds: 1.08
+Virtual_time_in_minutes: 0.018
+Virtual_time_in_hours: 0.0003
+Virtual_time_in_days: 1.25e-05
Ruby_current_time: 357561
Ruby_start_time: 0
Ruby_cycles: 357561
-mbytes_resident: 43.5312
-mbytes_total: 216.246
-resident_ratio: 0.201304
+mbytes_resident: 41.8789
+mbytes_total: 225.645
+resident_ratio: 0.185631
ruby_cycles_executed: [ 357562 ]
@@ -117,13 +117,13 @@ Total_nonPF_delay_cycles: [binsize: 1 max: 0 count: 0 average: NaN |standard dev
Resource Usage
--------------
page_size: 4096
-user_time: 0
+user_time: 1
system_time: 0
-page_reclaims: 11528
+page_reclaims: 11882
page_faults: 0
swaps: 0
block_inputs: 0
-block_outputs: 80
+block_outputs: 0
Network Stats
-------------
diff --git a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_directory/simout b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_directory/simout
index 473ebc3b9..3eb17b7ab 100755
--- a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_directory/simout
+++ b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_directory/simout
@@ -1,9 +1,9 @@
gem5 Simulator System. http://gem5.org
gem5 is copyrighted software; use the --copyright option for details.
-gem5 compiled Jun 4 2012 11:54:55
-gem5 started Jun 4 2012 14:42:00
-gem5 executing on zizzer
+gem5 compiled Jul 10 2012 17:36:02
+gem5 started Jul 10 2012 17:44:41
+gem5 executing on sc2b0605
command line: build/ALPHA_MOESI_CMP_directory/gem5.opt -d build/ALPHA_MOESI_CMP_directory/tests/opt/quick/se/60.rubytest/alpha/linux/rubytest-ruby-MOESI_CMP_directory -re tests/run.py build/ALPHA_MOESI_CMP_directory/tests/opt/quick/se/60.rubytest/alpha/linux/rubytest-ruby-MOESI_CMP_directory
Global frequency set at 1000000000 ticks per second
info: Entering event queue @ 0. Starting simulation...
diff --git a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_directory/stats.txt b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_directory/stats.txt
index 22e36183d..da0ebfcc7 100644
--- a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_directory/stats.txt
+++ b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_directory/stats.txt
@@ -4,8 +4,26 @@ sim_seconds 0.000358 # Nu
sim_ticks 357561 # Number of ticks simulated
final_tick 357561 # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
sim_freq 1000000000 # Frequency of simulated ticks
-host_tick_rate 776030 # Simulator tick rate (ticks/s)
-host_mem_usage 221440 # Number of bytes of host memory used
-host_seconds 0.46 # Real time elapsed on the host
+host_tick_rate 486616 # Simulator tick rate (ticks/s)
+host_mem_usage 231064 # Number of bytes of host memory used
+host_seconds 0.73 # Real time elapsed on the host
+system.l1_cntrl0.L1DcacheMemory.num_data_array_reads 0 # number of data array reads
+system.l1_cntrl0.L1DcacheMemory.num_data_array_writes 0 # number of data array writes
+system.l1_cntrl0.L1DcacheMemory.num_tag_array_reads 0 # number of tag array reads
+system.l1_cntrl0.L1DcacheMemory.num_tag_array_writes 0 # number of tag array writes
+system.l1_cntrl0.L1DcacheMemory.num_tag_array_stalls 0 # number of stalls caused by tag array
+system.l1_cntrl0.L1DcacheMemory.num_data_array_stalls 0 # number of stalls caused by data array
+system.l1_cntrl0.L1IcacheMemory.num_data_array_reads 0 # number of data array reads
+system.l1_cntrl0.L1IcacheMemory.num_data_array_writes 0 # number of data array writes
+system.l1_cntrl0.L1IcacheMemory.num_tag_array_reads 0 # number of tag array reads
+system.l1_cntrl0.L1IcacheMemory.num_tag_array_writes 0 # number of tag array writes
+system.l1_cntrl0.L1IcacheMemory.num_tag_array_stalls 0 # number of stalls caused by tag array
+system.l1_cntrl0.L1IcacheMemory.num_data_array_stalls 0 # number of stalls caused by data array
+system.l2_cntrl0.L2cacheMemory.num_data_array_reads 0 # number of data array reads
+system.l2_cntrl0.L2cacheMemory.num_data_array_writes 0 # number of data array writes
+system.l2_cntrl0.L2cacheMemory.num_tag_array_reads 0 # number of tag array reads
+system.l2_cntrl0.L2cacheMemory.num_tag_array_writes 0 # number of tag array writes
+system.l2_cntrl0.L2cacheMemory.num_tag_array_stalls 0 # number of stalls caused by tag array
+system.l2_cntrl0.L2cacheMemory.num_data_array_stalls 0 # number of stalls caused by data array
---------- End Simulation Statistics ----------
diff --git a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_token/config.ini b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_token/config.ini
index 529933d46..ee2d6f075 100644
--- a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_token/config.ini
+++ b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_token/config.ini
@@ -99,20 +99,30 @@ version=0
[system.l1_cntrl0.L1DcacheMemory]
type=RubyCache
assoc=2
+dataAccessLatency=1
+dataArrayBanks=1
is_icache=false
latency=2
replacement_policy=PSEUDO_LRU
+resourceStalls=false
size=256
start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
[system.l1_cntrl0.L1IcacheMemory]
type=RubyCache
assoc=2
+dataAccessLatency=1
+dataArrayBanks=1
is_icache=false
latency=2
replacement_policy=PSEUDO_LRU
+resourceStalls=false
size=256
start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
[system.l1_cntrl0.sequencer]
type=RubySequencer
@@ -149,11 +159,16 @@ version=0
[system.l2_cntrl0.L2cacheMemory]
type=RubyCache
assoc=2
+dataAccessLatency=1
+dataArrayBanks=1
is_icache=false
latency=10
replacement_policy=PSEUDO_LRU
+resourceStalls=false
size=512
start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
[system.physmem]
type=SimpleMemory
@@ -190,56 +205,76 @@ topology=system.ruby.network.topology
[system.ruby.network.topology]
type=Topology
-children=ext_links0 ext_links1 ext_links2 int_links0 int_links1 int_links2 routers0 routers1 routers2 routers3
+children=ext_links0 ext_links1 ext_links2 int_links0 int_links1 int_links2
description=Crossbar
ext_links=system.ruby.network.topology.ext_links0 system.ruby.network.topology.ext_links1 system.ruby.network.topology.ext_links2
int_links=system.ruby.network.topology.int_links0 system.ruby.network.topology.int_links1 system.ruby.network.topology.int_links2
print_config=false
-routers=system.ruby.network.topology.routers0 system.ruby.network.topology.routers1 system.ruby.network.topology.routers2 system.ruby.network.topology.routers3
+routers=system.ruby.network.topology.ext_links0.int_node system.ruby.network.topology.ext_links1.int_node system.ruby.network.topology.ext_links2.int_node system.ruby.network.topology.int_links0.node_b
[system.ruby.network.topology.ext_links0]
type=SimpleExtLink
+children=int_node
bandwidth_factor=16
ext_node=system.l1_cntrl0
-int_node=system.ruby.network.topology.routers0
+int_node=system.ruby.network.topology.ext_links0.int_node
latency=1
link_id=0
weight=1
+[system.ruby.network.topology.ext_links0.int_node]
+type=BasicRouter
+router_id=0
+
[system.ruby.network.topology.ext_links1]
type=SimpleExtLink
+children=int_node
bandwidth_factor=16
ext_node=system.l2_cntrl0
-int_node=system.ruby.network.topology.routers1
+int_node=system.ruby.network.topology.ext_links1.int_node
latency=1
link_id=1
weight=1
+[system.ruby.network.topology.ext_links1.int_node]
+type=BasicRouter
+router_id=1
+
[system.ruby.network.topology.ext_links2]
type=SimpleExtLink
+children=int_node
bandwidth_factor=16
ext_node=system.dir_cntrl0
-int_node=system.ruby.network.topology.routers2
+int_node=system.ruby.network.topology.ext_links2.int_node
latency=1
link_id=2
weight=1
+[system.ruby.network.topology.ext_links2.int_node]
+type=BasicRouter
+router_id=2
+
[system.ruby.network.topology.int_links0]
type=SimpleIntLink
+children=node_b
bandwidth_factor=16
latency=1
link_id=3
-node_a=system.ruby.network.topology.routers0
-node_b=system.ruby.network.topology.routers3
+node_a=system.ruby.network.topology.ext_links0.int_node
+node_b=system.ruby.network.topology.int_links0.node_b
weight=1
+[system.ruby.network.topology.int_links0.node_b]
+type=BasicRouter
+router_id=3
+
[system.ruby.network.topology.int_links1]
type=SimpleIntLink
bandwidth_factor=16
latency=1
link_id=4
-node_a=system.ruby.network.topology.routers1
-node_b=system.ruby.network.topology.routers3
+node_a=system.ruby.network.topology.ext_links1.int_node
+node_b=system.ruby.network.topology.int_links0.node_b
weight=1
[system.ruby.network.topology.int_links2]
@@ -247,26 +282,10 @@ type=SimpleIntLink
bandwidth_factor=16
latency=1
link_id=5
-node_a=system.ruby.network.topology.routers2
-node_b=system.ruby.network.topology.routers3
+node_a=system.ruby.network.topology.ext_links2.int_node
+node_b=system.ruby.network.topology.int_links0.node_b
weight=1
-[system.ruby.network.topology.routers0]
-type=BasicRouter
-router_id=0
-
-[system.ruby.network.topology.routers1]
-type=BasicRouter
-router_id=1
-
-[system.ruby.network.topology.routers2]
-type=BasicRouter
-router_id=2
-
-[system.ruby.network.topology.routers3]
-type=BasicRouter
-router_id=3
-
[system.ruby.profiler]
type=RubyProfiler
all_instructions=false
diff --git a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_token/ruby.stats b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_token/ruby.stats
index c55e7feb6..bb1926c7a 100644
--- a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_token/ruby.stats
+++ b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_token/ruby.stats
@@ -34,7 +34,7 @@ periodic_stats_period: 1000000
================ End RubySystem Configuration Print ================
-Real time: Jun/04/2012 14:43:05
+Real time: Jul/10/2012 17:49:52
Profiler Stats
--------------
@@ -43,18 +43,18 @@ Elapsed_time_in_minutes: 0
Elapsed_time_in_hours: 0
Elapsed_time_in_days: 0
-Virtual_time_in_seconds: 0.34
-Virtual_time_in_minutes: 0.00566667
-Virtual_time_in_hours: 9.44444e-05
-Virtual_time_in_days: 3.93519e-06
+Virtual_time_in_seconds: 0.53
+Virtual_time_in_minutes: 0.00883333
+Virtual_time_in_hours: 0.000147222
+Virtual_time_in_days: 6.13426e-06
Ruby_current_time: 259241
Ruby_start_time: 0
Ruby_cycles: 259241
-mbytes_resident: 43.2578
-mbytes_total: 216.168
-resident_ratio: 0.200112
+mbytes_resident: 41.8477
+mbytes_total: 225.406
+resident_ratio: 0.185689
ruby_cycles_executed: [ 259242 ]
@@ -126,11 +126,11 @@ Resource Usage
page_size: 4096
user_time: 0
system_time: 0
-page_reclaims: 11509
+page_reclaims: 11869
page_faults: 0
swaps: 0
block_inputs: 0
-block_outputs: 88
+block_outputs: 0
Network Stats
-------------
diff --git a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_token/simout b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_token/simout
index a79f03bf6..f70cf8f6c 100755
--- a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_token/simout
+++ b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_token/simout
@@ -1,9 +1,9 @@
gem5 Simulator System. http://gem5.org
gem5 is copyrighted software; use the --copyright option for details.
-gem5 compiled Jun 4 2012 11:56:32
-gem5 started Jun 4 2012 14:43:05
-gem5 executing on zizzer
+gem5 compiled Jul 10 2012 15:34:13
+gem5 started Jul 10 2012 17:49:52
+gem5 executing on sc2b0605
command line: build/ALPHA_MOESI_CMP_token/gem5.opt -d build/ALPHA_MOESI_CMP_token/tests/opt/quick/se/60.rubytest/alpha/linux/rubytest-ruby-MOESI_CMP_token -re tests/run.py build/ALPHA_MOESI_CMP_token/tests/opt/quick/se/60.rubytest/alpha/linux/rubytest-ruby-MOESI_CMP_token
Global frequency set at 1000000000 ticks per second
info: Entering event queue @ 0. Starting simulation...
diff --git a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_token/stats.txt b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_token/stats.txt
index b667f4459..de9b59632 100644
--- a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_token/stats.txt
+++ b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_token/stats.txt
@@ -4,8 +4,26 @@ sim_seconds 0.000259 # Nu
sim_ticks 259241 # Number of ticks simulated
final_tick 259241 # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
sim_freq 1000000000 # Frequency of simulated ticks
-host_tick_rate 2053459 # Simulator tick rate (ticks/s)
-host_mem_usage 221360 # Number of bytes of host memory used
-host_seconds 0.13 # Real time elapsed on the host
+host_tick_rate 1392990 # Simulator tick rate (ticks/s)
+host_mem_usage 230820 # Number of bytes of host memory used
+host_seconds 0.19 # Real time elapsed on the host
+system.l1_cntrl0.L1DcacheMemory.num_data_array_reads 0 # number of data array reads
+system.l1_cntrl0.L1DcacheMemory.num_data_array_writes 0 # number of data array writes
+system.l1_cntrl0.L1DcacheMemory.num_tag_array_reads 0 # number of tag array reads
+system.l1_cntrl0.L1DcacheMemory.num_tag_array_writes 0 # number of tag array writes
+system.l1_cntrl0.L1DcacheMemory.num_tag_array_stalls 0 # number of stalls caused by tag array
+system.l1_cntrl0.L1DcacheMemory.num_data_array_stalls 0 # number of stalls caused by data array
+system.l1_cntrl0.L1IcacheMemory.num_data_array_reads 0 # number of data array reads
+system.l1_cntrl0.L1IcacheMemory.num_data_array_writes 0 # number of data array writes
+system.l1_cntrl0.L1IcacheMemory.num_tag_array_reads 0 # number of tag array reads
+system.l1_cntrl0.L1IcacheMemory.num_tag_array_writes 0 # number of tag array writes
+system.l1_cntrl0.L1IcacheMemory.num_tag_array_stalls 0 # number of stalls caused by tag array
+system.l1_cntrl0.L1IcacheMemory.num_data_array_stalls 0 # number of stalls caused by data array
+system.l2_cntrl0.L2cacheMemory.num_data_array_reads 0 # number of data array reads
+system.l2_cntrl0.L2cacheMemory.num_data_array_writes 0 # number of data array writes
+system.l2_cntrl0.L2cacheMemory.num_tag_array_reads 0 # number of tag array reads
+system.l2_cntrl0.L2cacheMemory.num_tag_array_writes 0 # number of tag array writes
+system.l2_cntrl0.L2cacheMemory.num_tag_array_stalls 0 # number of stalls caused by tag array
+system.l2_cntrl0.L2cacheMemory.num_data_array_stalls 0 # number of stalls caused by data array
---------- End Simulation Statistics ----------
diff --git a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_hammer/config.ini b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_hammer/config.ini
index c79554200..22a3e7356 100644
--- a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_hammer/config.ini
+++ b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_hammer/config.ini
@@ -76,11 +76,16 @@ version=0
[system.dir_cntrl0.probeFilter]
type=RubyCache
assoc=4
+dataAccessLatency=1
+dataArrayBanks=1
is_icache=false
latency=1
replacement_policy=PSEUDO_LRU
+resourceStalls=false
size=1024
start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
[system.l1_cntrl0]
type=L1Cache_Controller
@@ -105,29 +110,44 @@ version=0
[system.l1_cntrl0.L1DcacheMemory]
type=RubyCache
assoc=2
+dataAccessLatency=1
+dataArrayBanks=1
is_icache=false
latency=2
replacement_policy=PSEUDO_LRU
+resourceStalls=false
size=256
start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
[system.l1_cntrl0.L1IcacheMemory]
type=RubyCache
assoc=2
+dataAccessLatency=1
+dataArrayBanks=1
is_icache=true
latency=2
replacement_policy=PSEUDO_LRU
+resourceStalls=false
size=256
start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
[system.l1_cntrl0.L2cacheMemory]
type=RubyCache
assoc=2
+dataAccessLatency=1
+dataArrayBanks=1
is_icache=false
latency=10
replacement_policy=PSEUDO_LRU
+resourceStalls=false
size=512
start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
[system.l1_cntrl0.sequencer]
type=RubySequencer
@@ -180,61 +200,64 @@ topology=system.ruby.network.topology
[system.ruby.network.topology]
type=Topology
-children=ext_links0 ext_links1 int_links0 int_links1 routers0 routers1 routers2
+children=ext_links0 ext_links1 int_links0 int_links1
description=Crossbar
ext_links=system.ruby.network.topology.ext_links0 system.ruby.network.topology.ext_links1
int_links=system.ruby.network.topology.int_links0 system.ruby.network.topology.int_links1
print_config=false
-routers=system.ruby.network.topology.routers0 system.ruby.network.topology.routers1 system.ruby.network.topology.routers2
+routers=system.ruby.network.topology.ext_links0.int_node system.ruby.network.topology.ext_links1.int_node system.ruby.network.topology.int_links0.node_b
[system.ruby.network.topology.ext_links0]
type=SimpleExtLink
+children=int_node
bandwidth_factor=16
ext_node=system.l1_cntrl0
-int_node=system.ruby.network.topology.routers0
+int_node=system.ruby.network.topology.ext_links0.int_node
latency=1
link_id=0
weight=1
+[system.ruby.network.topology.ext_links0.int_node]
+type=BasicRouter
+router_id=0
+
[system.ruby.network.topology.ext_links1]
type=SimpleExtLink
+children=int_node
bandwidth_factor=16
ext_node=system.dir_cntrl0
-int_node=system.ruby.network.topology.routers1
+int_node=system.ruby.network.topology.ext_links1.int_node
latency=1
link_id=1
weight=1
+[system.ruby.network.topology.ext_links1.int_node]
+type=BasicRouter
+router_id=1
+
[system.ruby.network.topology.int_links0]
type=SimpleIntLink
+children=node_b
bandwidth_factor=16
latency=1
link_id=2
-node_a=system.ruby.network.topology.routers0
-node_b=system.ruby.network.topology.routers2
+node_a=system.ruby.network.topology.ext_links0.int_node
+node_b=system.ruby.network.topology.int_links0.node_b
weight=1
+[system.ruby.network.topology.int_links0.node_b]
+type=BasicRouter
+router_id=2
+
[system.ruby.network.topology.int_links1]
type=SimpleIntLink
bandwidth_factor=16
latency=1
link_id=3
-node_a=system.ruby.network.topology.routers1
-node_b=system.ruby.network.topology.routers2
+node_a=system.ruby.network.topology.ext_links1.int_node
+node_b=system.ruby.network.topology.int_links0.node_b
weight=1
-[system.ruby.network.topology.routers0]
-type=BasicRouter
-router_id=0
-
-[system.ruby.network.topology.routers1]
-type=BasicRouter
-router_id=1
-
-[system.ruby.network.topology.routers2]
-type=BasicRouter
-router_id=2
-
[system.ruby.profiler]
type=RubyProfiler
all_instructions=false
diff --git a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_hammer/ruby.stats b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_hammer/ruby.stats
index 8e58b5f4d..e08b6ba17 100644
--- a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_hammer/ruby.stats
+++ b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_hammer/ruby.stats
@@ -34,7 +34,7 @@ periodic_stats_period: 1000000
================ End RubySystem Configuration Print ================
-Real time: Jun/04/2012 13:42:34
+Real time: Jul/10/2012 17:54:42
Profiler Stats
--------------
@@ -43,18 +43,18 @@ Elapsed_time_in_minutes: 0
Elapsed_time_in_hours: 0
Elapsed_time_in_days: 0
-Virtual_time_in_seconds: 0.32
-Virtual_time_in_minutes: 0.00533333
-Virtual_time_in_hours: 8.88889e-05
-Virtual_time_in_days: 3.7037e-06
+Virtual_time_in_seconds: 0.48
+Virtual_time_in_minutes: 0.008
+Virtual_time_in_hours: 0.000133333
+Virtual_time_in_days: 5.55556e-06
Ruby_current_time: 205611
Ruby_start_time: 0
Ruby_cycles: 205611
-mbytes_resident: 43.1602
-mbytes_total: 215.941
-resident_ratio: 0.19987
+mbytes_resident: 41.625
+mbytes_total: 225.387
+resident_ratio: 0.184717
ruby_cycles_executed: [ 205612 ]
@@ -127,11 +127,11 @@ Resource Usage
page_size: 4096
user_time: 0
system_time: 0
-page_reclaims: 11479
+page_reclaims: 11775
page_faults: 0
swaps: 0
block_inputs: 0
-block_outputs: 80
+block_outputs: 0
Network Stats
-------------
diff --git a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_hammer/simout b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_hammer/simout
index 4f76e711e..4942a327e 100755
--- a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_hammer/simout
+++ b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_hammer/simout
@@ -1,9 +1,9 @@
gem5 Simulator System. http://gem5.org
gem5 is copyrighted software; use the --copyright option for details.
-gem5 compiled Jun 4 2012 11:51:44
-gem5 started Jun 4 2012 13:42:34
-gem5 executing on zizzer
+gem5 compiled Jul 10 2012 15:16:15
+gem5 started Jul 10 2012 17:54:42
+gem5 executing on sc2b0605
command line: build/ALPHA_MOESI_hammer/gem5.opt -d build/ALPHA_MOESI_hammer/tests/opt/quick/se/60.rubytest/alpha/linux/rubytest-ruby-MOESI_hammer -re tests/run.py build/ALPHA_MOESI_hammer/tests/opt/quick/se/60.rubytest/alpha/linux/rubytest-ruby-MOESI_hammer
Global frequency set at 1000000000 ticks per second
info: Entering event queue @ 0. Starting simulation...
diff --git a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_hammer/stats.txt b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_hammer/stats.txt
index 863fa07d3..e6a46ea4d 100644
--- a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_hammer/stats.txt
+++ b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_hammer/stats.txt
@@ -4,8 +4,32 @@ sim_seconds 0.000206 # Nu
sim_ticks 205611 # Number of ticks simulated
final_tick 205611 # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
sim_freq 1000000000 # Frequency of simulated ticks
-host_tick_rate 2093129 # Simulator tick rate (ticks/s)
-host_mem_usage 221128 # Number of bytes of host memory used
-host_seconds 0.10 # Real time elapsed on the host
+host_tick_rate 1499366 # Simulator tick rate (ticks/s)
+host_mem_usage 230800 # Number of bytes of host memory used
+host_seconds 0.14 # Real time elapsed on the host
+system.l1_cntrl0.L1DcacheMemory.num_data_array_reads 0 # number of data array reads
+system.l1_cntrl0.L1DcacheMemory.num_data_array_writes 0 # number of data array writes
+system.l1_cntrl0.L1DcacheMemory.num_tag_array_reads 0 # number of tag array reads
+system.l1_cntrl0.L1DcacheMemory.num_tag_array_writes 0 # number of tag array writes
+system.l1_cntrl0.L1DcacheMemory.num_tag_array_stalls 0 # number of stalls caused by tag array
+system.l1_cntrl0.L1DcacheMemory.num_data_array_stalls 0 # number of stalls caused by data array
+system.l1_cntrl0.L1IcacheMemory.num_data_array_reads 0 # number of data array reads
+system.l1_cntrl0.L1IcacheMemory.num_data_array_writes 0 # number of data array writes
+system.l1_cntrl0.L1IcacheMemory.num_tag_array_reads 0 # number of tag array reads
+system.l1_cntrl0.L1IcacheMemory.num_tag_array_writes 0 # number of tag array writes
+system.l1_cntrl0.L1IcacheMemory.num_tag_array_stalls 0 # number of stalls caused by tag array
+system.l1_cntrl0.L1IcacheMemory.num_data_array_stalls 0 # number of stalls caused by data array
+system.l1_cntrl0.L2cacheMemory.num_data_array_reads 0 # number of data array reads
+system.l1_cntrl0.L2cacheMemory.num_data_array_writes 0 # number of data array writes
+system.l1_cntrl0.L2cacheMemory.num_tag_array_reads 0 # number of tag array reads
+system.l1_cntrl0.L2cacheMemory.num_tag_array_writes 0 # number of tag array writes
+system.l1_cntrl0.L2cacheMemory.num_tag_array_stalls 0 # number of stalls caused by tag array
+system.l1_cntrl0.L2cacheMemory.num_data_array_stalls 0 # number of stalls caused by data array
+system.dir_cntrl0.probeFilter.num_data_array_reads 0 # number of data array reads
+system.dir_cntrl0.probeFilter.num_data_array_writes 0 # number of data array writes
+system.dir_cntrl0.probeFilter.num_tag_array_reads 0 # number of tag array reads
+system.dir_cntrl0.probeFilter.num_tag_array_writes 0 # number of tag array writes
+system.dir_cntrl0.probeFilter.num_tag_array_stalls 0 # number of stalls caused by tag array
+system.dir_cntrl0.probeFilter.num_data_array_stalls 0 # number of stalls caused by data array
---------- End Simulation Statistics ----------
diff --git a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby/config.ini b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby/config.ini
index 9dd09a673..1875c19df 100644
--- a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby/config.ini
+++ b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby/config.ini
@@ -89,11 +89,16 @@ version=0
[system.l1_cntrl0.cacheMemory]
type=RubyCache
assoc=2
+dataAccessLatency=1
+dataArrayBanks=1
is_icache=false
latency=3
replacement_policy=PSEUDO_LRU
+resourceStalls=false
size=256
start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
[system.l1_cntrl0.sequencer]
type=RubySequencer
@@ -146,61 +151,64 @@ topology=system.ruby.network.topology
[system.ruby.network.topology]
type=Topology
-children=ext_links0 ext_links1 int_links0 int_links1 routers0 routers1 routers2
+children=ext_links0 ext_links1 int_links0 int_links1
description=Crossbar
ext_links=system.ruby.network.topology.ext_links0 system.ruby.network.topology.ext_links1
int_links=system.ruby.network.topology.int_links0 system.ruby.network.topology.int_links1
print_config=false
-routers=system.ruby.network.topology.routers0 system.ruby.network.topology.routers1 system.ruby.network.topology.routers2
+routers=system.ruby.network.topology.ext_links0.int_node system.ruby.network.topology.ext_links1.int_node system.ruby.network.topology.int_links0.node_b
[system.ruby.network.topology.ext_links0]
type=SimpleExtLink
+children=int_node
bandwidth_factor=16
ext_node=system.l1_cntrl0
-int_node=system.ruby.network.topology.routers0
+int_node=system.ruby.network.topology.ext_links0.int_node
latency=1
link_id=0
weight=1
+[system.ruby.network.topology.ext_links0.int_node]
+type=BasicRouter
+router_id=0
+
[system.ruby.network.topology.ext_links1]
type=SimpleExtLink
+children=int_node
bandwidth_factor=16
ext_node=system.dir_cntrl0
-int_node=system.ruby.network.topology.routers1
+int_node=system.ruby.network.topology.ext_links1.int_node
latency=1
link_id=1
weight=1
+[system.ruby.network.topology.ext_links1.int_node]
+type=BasicRouter
+router_id=1
+
[system.ruby.network.topology.int_links0]
type=SimpleIntLink
+children=node_b
bandwidth_factor=16
latency=1
link_id=2
-node_a=system.ruby.network.topology.routers0
-node_b=system.ruby.network.topology.routers2
+node_a=system.ruby.network.topology.ext_links0.int_node
+node_b=system.ruby.network.topology.int_links0.node_b
weight=1
+[system.ruby.network.topology.int_links0.node_b]
+type=BasicRouter
+router_id=2
+
[system.ruby.network.topology.int_links1]
type=SimpleIntLink
bandwidth_factor=16
latency=1
link_id=3
-node_a=system.ruby.network.topology.routers1
-node_b=system.ruby.network.topology.routers2
+node_a=system.ruby.network.topology.ext_links1.int_node
+node_b=system.ruby.network.topology.int_links0.node_b
weight=1
-[system.ruby.network.topology.routers0]
-type=BasicRouter
-router_id=0
-
-[system.ruby.network.topology.routers1]
-type=BasicRouter
-router_id=1
-
-[system.ruby.network.topology.routers2]
-type=BasicRouter
-router_id=2
-
[system.ruby.profiler]
type=RubyProfiler
all_instructions=false
diff --git a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby/ruby.stats b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby/ruby.stats
index 1f17ccfc3..88eecfcb5 100644
--- a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby/ruby.stats
+++ b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby/ruby.stats
@@ -34,7 +34,7 @@ periodic_stats_period: 1000000
================ End RubySystem Configuration Print ================
-Real time: Jun/04/2012 13:52:42
+Real time: Jul/10/2012 17:29:08
Profiler Stats
--------------
@@ -43,18 +43,18 @@ Elapsed_time_in_minutes: 0
Elapsed_time_in_hours: 0
Elapsed_time_in_days: 0
-Virtual_time_in_seconds: 0.28
-Virtual_time_in_minutes: 0.00466667
-Virtual_time_in_hours: 7.77778e-05
-Virtual_time_in_days: 3.24074e-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: 280571
Ruby_start_time: 0
Ruby_cycles: 280571
-mbytes_resident: 43.0117
-mbytes_total: 215.34
-resident_ratio: 0.199739
+mbytes_resident: 41.2305
+mbytes_total: 224.867
+resident_ratio: 0.18339
ruby_cycles_executed: [ 280572 ]
@@ -121,11 +121,11 @@ Resource Usage
page_size: 4096
user_time: 0
system_time: 0
-page_reclaims: 11376
-page_faults: 5
+page_reclaims: 11714
+page_faults: 0
swaps: 0
-block_inputs: 432
-block_outputs: 80
+block_inputs: 0
+block_outputs: 0
Network Stats
-------------
diff --git a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby/simout b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby/simout
index d291e3597..61f11453b 100755
--- a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby/simout
+++ b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby/simout
@@ -1,9 +1,9 @@
gem5 Simulator System. http://gem5.org
gem5 is copyrighted software; use the --copyright option for details.
-gem5 compiled Jun 4 2012 11:50:11
-gem5 started Jun 4 2012 13:52:42
-gem5 executing on zizzer
+gem5 compiled Jul 10 2012 16:32:12
+gem5 started Jul 10 2012 17:29:08
+gem5 executing on sc2b0605
command line: build/ALPHA/gem5.opt -d build/ALPHA/tests/opt/quick/se/60.rubytest/alpha/linux/rubytest-ruby -re tests/run.py build/ALPHA/tests/opt/quick/se/60.rubytest/alpha/linux/rubytest-ruby
Global frequency set at 1000000000 ticks per second
info: Entering event queue @ 0. Starting simulation...
diff --git a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby/stats.txt b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby/stats.txt
index b210abac4..4325e7de4 100644
--- a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby/stats.txt
+++ b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby/stats.txt
@@ -4,8 +4,14 @@ sim_seconds 0.000281 # Nu
sim_ticks 280571 # Number of ticks simulated
final_tick 280571 # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
sim_freq 1000000000 # Frequency of simulated ticks
-host_tick_rate 3251259 # Simulator tick rate (ticks/s)
-host_mem_usage 220512 # Number of bytes of host memory used
-host_seconds 0.09 # Real time elapsed on the host
+host_tick_rate 2647246 # Simulator tick rate (ticks/s)
+host_mem_usage 230268 # Number of bytes of host memory used
+host_seconds 0.11 # Real time elapsed on the host
+system.l1_cntrl0.cacheMemory.num_data_array_reads 0 # number of data array reads
+system.l1_cntrl0.cacheMemory.num_data_array_writes 0 # number of data array writes
+system.l1_cntrl0.cacheMemory.num_tag_array_reads 0 # number of tag array reads
+system.l1_cntrl0.cacheMemory.num_tag_array_writes 0 # number of tag array writes
+system.l1_cntrl0.cacheMemory.num_tag_array_stalls 0 # number of stalls caused by tag array
+system.l1_cntrl0.cacheMemory.num_data_array_stalls 0 # number of stalls caused by data array
---------- End Simulation Statistics ----------