changeset 2481b3ef5385 in /z/repo/gem5
details: http://repo.gem5.org/gem5?cmd=changeset;node=2481b3ef5385
description:
stats: fix some miss-committed changes from the icache change
diffstat:
tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_CMP_directory/config.ini
| 73 +-
tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_CMP_directory/simout
| 4 +-
tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_CMP_directory/stats.txt
| 28 +-
tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_directory/config.ini
| 73 +-
tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_directory/simout
| 4 +-
tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_directory/stats.txt
| 28 +-
tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_token/config.ini
| 73 +-
tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_token/simout
| 4 +-
tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_token/stats.txt
| 28 +-
tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_hammer/config.ini
| 63 +-
tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_hammer/simout
| 4 +-
tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_hammer/stats.txt
| 34 +-
tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_CMP_directory/config.ini
| 73 +-
tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_CMP_directory/simout
| 4 +-
tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_CMP_directory/stats.txt
| 28 +-
tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_directory/config.ini
| 73 +-
tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_directory/simout
| 4 +-
tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_directory/stats.txt
| 28 +-
tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_token/config.ini
| 73 +-
tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_token/simout
| 4 +-
tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_token/stats.txt
| 26 +-
tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_hammer/config.ini
| 63 +-
tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_hammer/simout
| 4 +-
tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_hammer/stats.txt
| 34 +-
tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_CMP_directory/config.ini
| 278 ++++++--
tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_CMP_directory/simout
| 4 +-
tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_CMP_directory/stats.txt
| 108 +++-
tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_directory/config.ini
| 278 ++++++--
tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_directory/simout
| 4 +-
tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_directory/stats.txt
| 108 +++-
tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_token/config.ini
| 278 ++++++--
tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_token/simout
| 4 +-
tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_token/stats.txt
| 108 +++-
tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/config.ini
| 303 +++++++--
tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/simout
| 4 +-
tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/stats.txt
| 156 +++++-
tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_CMP_directory/config.ini
| 73 +-
tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_CMP_directory/simout
| 4 +-
tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_CMP_directory/stats.txt
| 24 +-
tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_directory/config.ini
| 73 +-
tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_directory/simout
| 4 +-
tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_directory/stats.txt
| 24 +-
tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_token/config.ini
| 73 +-
tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_token/simout
| 4 +-
tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_token/stats.txt
| 24 +-
tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_hammer/config.ini
| 63 +-
tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_hammer/simout
| 4 +-
tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_hammer/stats.txt
| 28 +-
48 files changed, 2127 insertions(+), 734 deletions(-)
diffs (truncated from 6070 to 300 lines):
diff -r 64d4c9d8a384 -r 2481b3ef5385
tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_CMP_directory/config.ini
---
a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_CMP_directory/config.ini
Fri Jul 27 16:08:05 2012 -0400
+++
b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_CMP_directory/config.ini
Sat Jul 28 13:48:04 2012 -0400
@@ -155,20 +155,30 @@
[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 @@
[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 @@
[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 @@
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 -r 64d4c9d8a384 -r 2481b3ef5385
tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_CMP_directory/simout
---
a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_CMP_directory/simout
Fri Jul 27 16:08:05 2012 -0400
+++
b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_CMP_directory/simout
Sat Jul 28 13:48:04 2012 -0400
@@ -1,8 +1,8 @@
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 compiled Jul 28 2012 11:30:15
+gem5 started Jul 28 2012 11:35:39
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
diff -r 64d4c9d8a384 -r 2481b3ef5385
tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_CMP_directory/stats.txt
---
a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_CMP_directory/stats.txt
Fri Jul 27 16:08:05 2012 -0400
+++
b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_CMP_directory/stats.txt
Sat Jul 28 13:48:04 2012 -0400
@@ -4,11 +4,11 @@
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 24063 #
Simulator instruction rate (inst/s)
+host_op_rate 24061 #
Simulator op (including micro ops) rate (op/s)
+host_tick_rate 1049533 #
Simulator tick rate (ticks/s)
+host_mem_usage 233960 #
Number of bytes of host memory used
+host_seconds 0.27 #
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_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 -r 64d4c9d8a384 -r 2481b3ef5385
tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_directory/config.ini
---
a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_directory/config.ini
Fri Jul 27 16:08:05 2012 -0400
+++
b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_directory/config.ini
Sat Jul 28 13:48:04 2012 -0400
@@ -152,20 +152,30 @@
[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 @@
[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 @@
[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
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
