summaryrefslogtreecommitdiff
path: root/tests/quick/se/00.hello/ref
diff options
context:
space:
mode:
authorBrad Beckmann <Brad.Beckmann@amd.com>2012-07-10 22:51:55 -0700
committerBrad Beckmann <Brad.Beckmann@amd.com>2012-07-10 22:51:55 -0700
commitb00fe08cc9338cb96a151a8cd3c3d1498c716989 (patch)
treee6fdf2b84d5c80ff492a9ff9522e860a7ccc1c7e /tests/quick/se/00.hello/ref
parent387f843d513dd80554cb6361da36ba805dfbcea2 (diff)
downloadgem5-b00fe08cc9338cb96a151a8cd3c3d1498c716989.tar.xz
regress: ruby stat additions and config changes
Diffstat (limited to 'tests/quick/se/00.hello/ref')
-rw-r--r--tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_CMP_directory/config.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
51 files changed, 949 insertions, 563 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