summaryrefslogtreecommitdiff
path: root/tests/quick/se/60.rubytest/ref/alpha
diff options
context:
space:
mode:
Diffstat (limited to 'tests/quick/se/60.rubytest/ref/alpha')
-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
20 files changed, 380 insertions, 208 deletions
diff --git a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_CMP_directory/config.ini b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_CMP_directory/config.ini
index 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 ----------