summaryrefslogtreecommitdiff
path: root/tests/quick/se/00.hello/ref/alpha
diff options
context:
space:
mode:
authorAli Saidi <saidi@eecs.umich.edu>2012-07-27 16:08:05 -0400
committerAli Saidi <saidi@eecs.umich.edu>2012-07-27 16:08:05 -0400
commitb1a58933e07d7af0eb5f43942f8ad9bc93f28039 (patch)
tree21f36b849ba0aed06ec18ed45aef46feeacd7532 /tests/quick/se/00.hello/ref/alpha
parent630068be6f7b6dc5c612867c764c37e41fd90a4a (diff)
downloadgem5-b1a58933e07d7af0eb5f43942f8ad9bc93f28039.tar.xz
stats: update stats for icache change not allowing dirty data
Diffstat (limited to 'tests/quick/se/00.hello/ref/alpha')
-rw-r--r--tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_CMP_directory/config.ini75
-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
-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
-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
-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/tru64/simple-timing-ruby-MESI_CMP_directory/config.ini75
-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
-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
-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
-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
24 files changed, 274 insertions, 590 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 47099262f..3be58b836 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=/proj/aatl_perfmod_arch/m5_system_files/regression/test-progs/hello/bin/alpha/linux/hello
+executable=/dist/m5/regression/test-progs/hello/bin/alpha/linux/hello
gid=100
input=cin
max_stack_size=67108864
@@ -155,30 +155,20 @@ 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
@@ -214,16 +204,11 @@ 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
@@ -260,76 +245,56 @@ topology=system.ruby.network.topology
[system.ruby.network.topology]
type=Topology
-children=ext_links0 ext_links1 ext_links2 int_links0 int_links1 int_links2
+children=ext_links0 ext_links1 ext_links2 int_links0 int_links1 int_links2 routers0 routers1 routers2 routers3
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.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
+routers=system.ruby.network.topology.routers0 system.ruby.network.topology.routers1 system.ruby.network.topology.routers2 system.ruby.network.topology.routers3
[system.ruby.network.topology.ext_links0]
type=SimpleExtLink
-children=int_node
bandwidth_factor=16
ext_node=system.l1_cntrl0
-int_node=system.ruby.network.topology.ext_links0.int_node
+int_node=system.ruby.network.topology.routers0
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.ext_links1.int_node
+int_node=system.ruby.network.topology.routers1
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.ext_links2.int_node
+int_node=system.ruby.network.topology.routers2
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.ext_links0.int_node
-node_b=system.ruby.network.topology.int_links0.node_b
+node_a=system.ruby.network.topology.routers0
+node_b=system.ruby.network.topology.routers3
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.ext_links1.int_node
-node_b=system.ruby.network.topology.int_links0.node_b
+node_a=system.ruby.network.topology.routers1
+node_b=system.ruby.network.topology.routers3
weight=1
[system.ruby.network.topology.int_links2]
@@ -337,10 +302,26 @@ type=SimpleIntLink
bandwidth_factor=16
latency=1
link_id=5
-node_a=system.ruby.network.topology.ext_links2.int_node
-node_b=system.ruby.network.topology.int_links0.node_b
+node_a=system.ruby.network.topology.routers2
+node_b=system.ruby.network.topology.routers3
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/simout b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_CMP_directory/simout
index 1832a62b7..0c7f2991f 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 Jul 10 2012 17:30:17
-gem5 started Jul 10 2012 17:30:49
-gem5 executing on sc2b0605
+gem5 compiled Jun 4 2012 11:53:20
+gem5 started Jun 4 2012 13:42:35
+gem5 executing on zizzer
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 dc174d88f..bae589857 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 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
+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
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,24 +33,6 @@ 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 81f78cde4..f0fb5fcd1 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=/proj/aatl_perfmod_arch/m5_system_files/regression/test-progs/hello/bin/alpha/linux/hello
+executable=/dist/m5/regression/test-progs/hello/bin/alpha/linux/hello
gid=100
input=cin
max_stack_size=67108864
@@ -152,30 +152,20 @@ 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
@@ -210,16 +200,11 @@ 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
@@ -256,76 +241,56 @@ topology=system.ruby.network.topology
[system.ruby.network.topology]
type=Topology
-children=ext_links0 ext_links1 ext_links2 int_links0 int_links1 int_links2
+children=ext_links0 ext_links1 ext_links2 int_links0 int_links1 int_links2 routers0 routers1 routers2 routers3
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.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
+routers=system.ruby.network.topology.routers0 system.ruby.network.topology.routers1 system.ruby.network.topology.routers2 system.ruby.network.topology.routers3
[system.ruby.network.topology.ext_links0]
type=SimpleExtLink
-children=int_node
bandwidth_factor=16
ext_node=system.l1_cntrl0
-int_node=system.ruby.network.topology.ext_links0.int_node
+int_node=system.ruby.network.topology.routers0
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.ext_links1.int_node
+int_node=system.ruby.network.topology.routers1
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.ext_links2.int_node
+int_node=system.ruby.network.topology.routers2
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.ext_links0.int_node
-node_b=system.ruby.network.topology.int_links0.node_b
+node_a=system.ruby.network.topology.routers0
+node_b=system.ruby.network.topology.routers3
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.ext_links1.int_node
-node_b=system.ruby.network.topology.int_links0.node_b
+node_a=system.ruby.network.topology.routers1
+node_b=system.ruby.network.topology.routers3
weight=1
[system.ruby.network.topology.int_links2]
@@ -333,10 +298,26 @@ type=SimpleIntLink
bandwidth_factor=16
latency=1
link_id=5
-node_a=system.ruby.network.topology.ext_links2.int_node
-node_b=system.ruby.network.topology.int_links0.node_b
+node_a=system.ruby.network.topology.routers2
+node_b=system.ruby.network.topology.routers3
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/simout b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_directory/simout
index aac08e2fa..691f6347c 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 Jul 10 2012 17:36:02
-gem5 started Jul 10 2012 17:36:36
-gem5 executing on sc2b0605
+gem5 compiled Jun 4 2012 11:54:55
+gem5 started Jun 4 2012 14:41:04
+gem5 executing on zizzer
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 91d67e04f..ddb3e7d12 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 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
+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
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,24 +33,6 @@ 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 4e5ea8bc4..260fc7a89 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=/proj/aatl_perfmod_arch/m5_system_files/regression/test-progs/hello/bin/alpha/linux/hello
+executable=/dist/m5/regression/test-progs/hello/bin/alpha/linux/hello
gid=100
input=cin
max_stack_size=67108864
@@ -161,30 +161,20 @@ 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
@@ -221,16 +211,11 @@ 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
@@ -267,76 +252,56 @@ topology=system.ruby.network.topology
[system.ruby.network.topology]
type=Topology
-children=ext_links0 ext_links1 ext_links2 int_links0 int_links1 int_links2
+children=ext_links0 ext_links1 ext_links2 int_links0 int_links1 int_links2 routers0 routers1 routers2 routers3
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.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
+routers=system.ruby.network.topology.routers0 system.ruby.network.topology.routers1 system.ruby.network.topology.routers2 system.ruby.network.topology.routers3
[system.ruby.network.topology.ext_links0]
type=SimpleExtLink
-children=int_node
bandwidth_factor=16
ext_node=system.l1_cntrl0
-int_node=system.ruby.network.topology.ext_links0.int_node
+int_node=system.ruby.network.topology.routers0
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.ext_links1.int_node
+int_node=system.ruby.network.topology.routers1
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.ext_links2.int_node
+int_node=system.ruby.network.topology.routers2
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.ext_links0.int_node
-node_b=system.ruby.network.topology.int_links0.node_b
+node_a=system.ruby.network.topology.routers0
+node_b=system.ruby.network.topology.routers3
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.ext_links1.int_node
-node_b=system.ruby.network.topology.int_links0.node_b
+node_a=system.ruby.network.topology.routers1
+node_b=system.ruby.network.topology.routers3
weight=1
[system.ruby.network.topology.int_links2]
@@ -344,10 +309,26 @@ type=SimpleIntLink
bandwidth_factor=16
latency=1
link_id=5
-node_a=system.ruby.network.topology.ext_links2.int_node
-node_b=system.ruby.network.topology.int_links0.node_b
+node_a=system.ruby.network.topology.routers2
+node_b=system.ruby.network.topology.routers3
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/simout b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_token/simout
index e3a769a26..63d892f7f 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 Jul 10 2012 15:34:13
-gem5 started Jul 10 2012 17:45:14
-gem5 executing on sc2b0605
+gem5 compiled Jun 4 2012 11:56:32
+gem5 started Jun 4 2012 14:42:12
+gem5 executing on zizzer
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 7722b3fbe..9ad88fcd3 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 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
+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
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,24 +33,6 @@ 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 9fd0a4ee1..c7cccc96e 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=/proj/aatl_perfmod_arch/m5_system_files/regression/test-progs/hello/bin/alpha/linux/hello
+executable=/dist/m5/regression/test-progs/hello/bin/alpha/linux/hello
gid=100
input=cin
max_stack_size=67108864
@@ -138,16 +138,11 @@ 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
@@ -172,44 +167,29 @@ 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
@@ -262,64 +242,61 @@ topology=system.ruby.network.topology
[system.ruby.network.topology]
type=Topology
-children=ext_links0 ext_links1 int_links0 int_links1
+children=ext_links0 ext_links1 int_links0 int_links1 routers0 routers1 routers2
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.ext_links0.int_node system.ruby.network.topology.ext_links1.int_node system.ruby.network.topology.int_links0.node_b
+routers=system.ruby.network.topology.routers0 system.ruby.network.topology.routers1 system.ruby.network.topology.routers2
[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.ext_links0.int_node
+int_node=system.ruby.network.topology.routers0
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.ext_links1.int_node
+int_node=system.ruby.network.topology.routers1
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.ext_links0.int_node
-node_b=system.ruby.network.topology.int_links0.node_b
+node_a=system.ruby.network.topology.routers0
+node_b=system.ruby.network.topology.routers2
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.ext_links1.int_node
-node_b=system.ruby.network.topology.int_links0.node_b
+node_a=system.ruby.network.topology.routers1
+node_b=system.ruby.network.topology.routers2
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/simout b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_hammer/simout
index 8fc46fbe9..f1ba4ed84 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 Jul 10 2012 15:16:15
-gem5 started Jul 10 2012 17:50:25
-gem5 executing on sc2b0605
+gem5 compiled Jun 4 2012 11:51:44
+gem5 started Jun 4 2012 13:41:27
+gem5 executing on zizzer
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 a0796133c..842792d27 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 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
+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
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,30 +33,6 @@ 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/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 bc15d1f8b..317cc6a7e 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=/proj/aatl_perfmod_arch/m5_system_files/regression/test-progs/hello/bin/alpha/tru64/hello
+executable=/dist/m5/regression/test-progs/hello/bin/alpha/tru64/hello
gid=100
input=cin
max_stack_size=67108864
@@ -155,30 +155,20 @@ 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
@@ -214,16 +204,11 @@ 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
@@ -260,76 +245,56 @@ topology=system.ruby.network.topology
[system.ruby.network.topology]
type=Topology
-children=ext_links0 ext_links1 ext_links2 int_links0 int_links1 int_links2
+children=ext_links0 ext_links1 ext_links2 int_links0 int_links1 int_links2 routers0 routers1 routers2 routers3
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.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
+routers=system.ruby.network.topology.routers0 system.ruby.network.topology.routers1 system.ruby.network.topology.routers2 system.ruby.network.topology.routers3
[system.ruby.network.topology.ext_links0]
type=SimpleExtLink
-children=int_node
bandwidth_factor=16
ext_node=system.l1_cntrl0
-int_node=system.ruby.network.topology.ext_links0.int_node
+int_node=system.ruby.network.topology.routers0
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.ext_links1.int_node
+int_node=system.ruby.network.topology.routers1
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.ext_links2.int_node
+int_node=system.ruby.network.topology.routers2
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.ext_links0.int_node
-node_b=system.ruby.network.topology.int_links0.node_b
+node_a=system.ruby.network.topology.routers0
+node_b=system.ruby.network.topology.routers3
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.ext_links1.int_node
-node_b=system.ruby.network.topology.int_links0.node_b
+node_a=system.ruby.network.topology.routers1
+node_b=system.ruby.network.topology.routers3
weight=1
[system.ruby.network.topology.int_links2]
@@ -337,10 +302,26 @@ type=SimpleIntLink
bandwidth_factor=16
latency=1
link_id=5
-node_a=system.ruby.network.topology.ext_links2.int_node
-node_b=system.ruby.network.topology.int_links0.node_b
+node_a=system.ruby.network.topology.routers2
+node_b=system.ruby.network.topology.routers3
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/simout b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_CMP_directory/simout
index d29f3759f..d8d70a93e 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 Jul 10 2012 17:30:17
-gem5 started Jul 10 2012 17:31:25
-gem5 executing on sc2b0605
+gem5 compiled Jun 4 2012 11:53:20
+gem5 started Jun 4 2012 13:42:35
+gem5 executing on zizzer
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 20b3bd153..748d8a973 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 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
+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
sim_insts 2577 # Number of instructions simulated
sim_ops 2577 # Number of ops (including micro ops) simulated
system.physmem.bytes_read::cpu.inst 10340 # Number of bytes read from this memory
@@ -33,24 +33,6 @@ 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 5b6cac45b..34c479e22 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=/proj/aatl_perfmod_arch/m5_system_files/regression/test-progs/hello/bin/alpha/tru64/hello
+executable=/dist/m5/regression/test-progs/hello/bin/alpha/tru64/hello
gid=100
input=cin
max_stack_size=67108864
@@ -152,30 +152,20 @@ 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
@@ -210,16 +200,11 @@ 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
@@ -256,76 +241,56 @@ topology=system.ruby.network.topology
[system.ruby.network.topology]
type=Topology
-children=ext_links0 ext_links1 ext_links2 int_links0 int_links1 int_links2
+children=ext_links0 ext_links1 ext_links2 int_links0 int_links1 int_links2 routers0 routers1 routers2 routers3
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.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
+routers=system.ruby.network.topology.routers0 system.ruby.network.topology.routers1 system.ruby.network.topology.routers2 system.ruby.network.topology.routers3
[system.ruby.network.topology.ext_links0]
type=SimpleExtLink
-children=int_node
bandwidth_factor=16
ext_node=system.l1_cntrl0
-int_node=system.ruby.network.topology.ext_links0.int_node
+int_node=system.ruby.network.topology.routers0
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.ext_links1.int_node
+int_node=system.ruby.network.topology.routers1
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.ext_links2.int_node
+int_node=system.ruby.network.topology.routers2
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.ext_links0.int_node
-node_b=system.ruby.network.topology.int_links0.node_b
+node_a=system.ruby.network.topology.routers0
+node_b=system.ruby.network.topology.routers3
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.ext_links1.int_node
-node_b=system.ruby.network.topology.int_links0.node_b
+node_a=system.ruby.network.topology.routers1
+node_b=system.ruby.network.topology.routers3
weight=1
[system.ruby.network.topology.int_links2]
@@ -333,10 +298,26 @@ type=SimpleIntLink
bandwidth_factor=16
latency=1
link_id=5
-node_a=system.ruby.network.topology.ext_links2.int_node
-node_b=system.ruby.network.topology.int_links0.node_b
+node_a=system.ruby.network.topology.routers2
+node_b=system.ruby.network.topology.routers3
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/simout b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_directory/simout
index 4b0921627..dc8b54148 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 Jul 10 2012 17:36:02
-gem5 started Jul 10 2012 17:37:10
-gem5 executing on sc2b0605
+gem5 compiled Jun 4 2012 11:54:55
+gem5 started Jun 4 2012 14:41:15
+gem5 executing on zizzer
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 6d74d1d8c..07e9173f4 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 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
+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
sim_insts 2577 # Number of instructions simulated
sim_ops 2577 # Number of ops (including micro ops) simulated
system.physmem.bytes_read::cpu.inst 10340 # Number of bytes read from this memory
@@ -33,24 +33,6 @@ 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 2b2f5fcb6..ea15696c3 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=/proj/aatl_perfmod_arch/m5_system_files/regression/test-progs/hello/bin/alpha/tru64/hello
+executable=/dist/m5/regression/test-progs/hello/bin/alpha/tru64/hello
gid=100
input=cin
max_stack_size=67108864
@@ -161,30 +161,20 @@ 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
@@ -221,16 +211,11 @@ 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
@@ -267,76 +252,56 @@ topology=system.ruby.network.topology
[system.ruby.network.topology]
type=Topology
-children=ext_links0 ext_links1 ext_links2 int_links0 int_links1 int_links2
+children=ext_links0 ext_links1 ext_links2 int_links0 int_links1 int_links2 routers0 routers1 routers2 routers3
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.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
+routers=system.ruby.network.topology.routers0 system.ruby.network.topology.routers1 system.ruby.network.topology.routers2 system.ruby.network.topology.routers3
[system.ruby.network.topology.ext_links0]
type=SimpleExtLink
-children=int_node
bandwidth_factor=16
ext_node=system.l1_cntrl0
-int_node=system.ruby.network.topology.ext_links0.int_node
+int_node=system.ruby.network.topology.routers0
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.ext_links1.int_node
+int_node=system.ruby.network.topology.routers1
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.ext_links2.int_node
+int_node=system.ruby.network.topology.routers2
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.ext_links0.int_node
-node_b=system.ruby.network.topology.int_links0.node_b
+node_a=system.ruby.network.topology.routers0
+node_b=system.ruby.network.topology.routers3
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.ext_links1.int_node
-node_b=system.ruby.network.topology.int_links0.node_b
+node_a=system.ruby.network.topology.routers1
+node_b=system.ruby.network.topology.routers3
weight=1
[system.ruby.network.topology.int_links2]
@@ -344,10 +309,26 @@ type=SimpleIntLink
bandwidth_factor=16
latency=1
link_id=5
-node_a=system.ruby.network.topology.ext_links2.int_node
-node_b=system.ruby.network.topology.int_links0.node_b
+node_a=system.ruby.network.topology.routers2
+node_b=system.ruby.network.topology.routers3
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/simout b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_token/simout
index 851a68508..3e1c7a0df 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 Jul 10 2012 15:34:13
-gem5 started Jul 10 2012 17:45:47
-gem5 executing on sc2b0605
+gem5 compiled Jun 4 2012 11:56:32
+gem5 started Jun 4 2012 14:42:22
+gem5 executing on zizzer
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 0bb4f7ab2..0b4d202c9 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 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
+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
sim_insts 2577 # Number of instructions simulated
sim_ops 2577 # Number of ops (including micro ops) simulated
system.physmem.bytes_read::cpu.inst 10340 # Number of bytes read from this memory
@@ -33,24 +33,6 @@ 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 d24ccea68..5531e80ff 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=/proj/aatl_perfmod_arch/m5_system_files/regression/test-progs/hello/bin/alpha/tru64/hello
+executable=/dist/m5/regression/test-progs/hello/bin/alpha/tru64/hello
gid=100
input=cin
max_stack_size=67108864
@@ -138,16 +138,11 @@ 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
@@ -172,44 +167,29 @@ 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
@@ -262,64 +242,61 @@ topology=system.ruby.network.topology
[system.ruby.network.topology]
type=Topology
-children=ext_links0 ext_links1 int_links0 int_links1
+children=ext_links0 ext_links1 int_links0 int_links1 routers0 routers1 routers2
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.ext_links0.int_node system.ruby.network.topology.ext_links1.int_node system.ruby.network.topology.int_links0.node_b
+routers=system.ruby.network.topology.routers0 system.ruby.network.topology.routers1 system.ruby.network.topology.routers2
[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.ext_links0.int_node
+int_node=system.ruby.network.topology.routers0
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.ext_links1.int_node
+int_node=system.ruby.network.topology.routers1
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.ext_links0.int_node
-node_b=system.ruby.network.topology.int_links0.node_b
+node_a=system.ruby.network.topology.routers0
+node_b=system.ruby.network.topology.routers2
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.ext_links1.int_node
-node_b=system.ruby.network.topology.int_links0.node_b
+node_a=system.ruby.network.topology.routers1
+node_b=system.ruby.network.topology.routers2
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/simout b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_hammer/simout
index 2612c0b40..423daf7c7 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 Jul 10 2012 15:16:15
-gem5 started Jul 10 2012 17:50:59
-gem5 executing on sc2b0605
+gem5 compiled Jun 4 2012 11:51:44
+gem5 started Jun 4 2012 13:42:34
+gem5 executing on zizzer
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 17ceaae11..002b923d5 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 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
+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
sim_insts 2577 # Number of instructions simulated
sim_ops 2577 # Number of ops (including micro ops) simulated
system.physmem.bytes_read::cpu.inst 10340 # Number of bytes read from this memory
@@ -33,30 +33,6 @@ 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