changeset 9a72589ce4fd in /z/repo/gem5
details: http://repo.gem5.org/gem5?cmd=changeset;node=9a72589ce4fd
description:
regress: ruby stat additions and config changes
diffstat:
tests/configs/memtest-ruby.py
| 1 +
tests/configs/o3-timing-mp-ruby.py
| 1 +
tests/configs/o3-timing-ruby.py
| 1 +
tests/configs/pc-simple-timing-ruby.py
| 1 +
tests/configs/rubytest-ruby.py
| 1 +
tests/configs/simple-atomic-mp-ruby.py
| 1 +
tests/configs/simple-timing-mp-ruby.py
| 1 +
tests/configs/simple-timing-ruby.py
| 1 +
tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_CMP_directory/config.ini
| 75 +-
tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_CMP_directory/ruby.stats
| 24 +-
tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_CMP_directory/simout
| 6 +-
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
| 75 +-
tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_directory/ruby.stats
| 32 +-
tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_directory/simout
| 6 +-
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
| 75 +-
tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_token/ruby.stats
| 24 +-
tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_token/simout
| 6 +-
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
| 65 +-
tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_hammer/ruby.stats
| 24 +-
tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_hammer/simout
| 6 +-
tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_hammer/stats.txt
| 34 +-
tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby/config.ini
| 50 +-
tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby/ruby.stats
| 20 +-
tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby/simout
| 6 +-
tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby/stats.txt
| 16 +-
tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_CMP_directory/config.ini
| 75 +-
tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_CMP_directory/ruby.stats
| 32 +-
tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_CMP_directory/simout
| 6 +-
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
| 75 +-
tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_directory/ruby.stats
| 20 +-
tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_directory/simout
| 6 +-
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
| 75 +-
tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_token/ruby.stats
| 20 +-
tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_token/simout
| 6 +-
tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_token/stats.txt
| 28 +-
tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_hammer/config.ini
| 65 +-
tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_hammer/ruby.stats
| 24 +-
tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_hammer/simout
| 6 +-
tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_hammer/stats.txt
| 34 +-
tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby/config.ini
| 50 +-
tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby/ruby.stats
| 28 +-
tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby/simout
| 6 +-
tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby/stats.txt
| 16 +-
tests/quick/se/00.hello/ref/mips/linux/simple-timing-ruby/config.ini
| 50 +-
tests/quick/se/00.hello/ref/mips/linux/simple-timing-ruby/simout
| 6 +-
tests/quick/se/00.hello/ref/mips/linux/simple-timing-ruby/stats.txt
| 16 +-
tests/quick/se/00.hello/ref/sparc/linux/simple-timing-ruby/config.ini
| 50 +-
tests/quick/se/00.hello/ref/sparc/linux/simple-timing-ruby/ruby.stats
| 20 +-
tests/quick/se/00.hello/ref/sparc/linux/simple-timing-ruby/simout
| 6 +-
tests/quick/se/00.hello/ref/sparc/linux/simple-timing-ruby/stats.txt
| 16 +-
tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/config.ini
| 50 +-
tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/ruby.stats
| 20 +-
tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/simout
| 6 +-
tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/stats.txt
| 16 +-
tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_CMP_directory/config.ini
| 250 ++++++--
tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_CMP_directory/ruby.stats
| 30 +-
tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_CMP_directory/simout
| 6 +-
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
| 248 ++++++--
tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_directory/ruby.stats
| 30 +-
tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_directory/simout
| 6 +-
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
| 248 ++++++--
tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_token/ruby.stats
| 30 +-
tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_token/simout
| 6 +-
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
| 273 +++++++--
tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/ruby.stats
| 30 +-
tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/simout
| 6 +-
tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/stats.txt
| 156 +++++-
tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby/config.ini
| 190 ++++--
tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby/ruby.stats
| 34 +-
tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby/simout
| 6 +-
tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby/stats.txt
| 54 +-
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/ruby.stats
| 20 +-
tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_CMP_directory/simout
| 6 +-
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/ruby.stats
| 30 +-
tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_directory/simout
| 6 +-
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/ruby.stats
| 20 +-
tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_token/simout
| 6 +-
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/ruby.stats
| 20 +-
tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_hammer/simout
| 6 +-
tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_hammer/stats.txt
| 30 +-
tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby/config.ini
| 48 +-
tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby/ruby.stats
| 24 +-
tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby/simout
| 6 +-
tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby/stats.txt
| 12 +-
99 files changed, 2789 insertions(+), 1246 deletions(-)
diffs (truncated from 8556 to 300 lines):
diff -r 6e854ea87bab -r 9a72589ce4fd tests/configs/memtest-ruby.py
--- a/tests/configs/memtest-ruby.py Tue Jul 10 22:51:54 2012 -0700
+++ b/tests/configs/memtest-ruby.py Tue Jul 10 22:51:55 2012 -0700
@@ -39,6 +39,7 @@
m5_root = os.path.dirname(config_root)
addToPath(config_root+'/configs/common')
addToPath(config_root+'/configs/ruby')
+addToPath(config_root+'/configs/topologies')
import Ruby
import Options
diff -r 6e854ea87bab -r 9a72589ce4fd tests/configs/o3-timing-mp-ruby.py
--- a/tests/configs/o3-timing-mp-ruby.py Tue Jul 10 22:51:54 2012 -0700
+++ b/tests/configs/o3-timing-mp-ruby.py Tue Jul 10 22:51:55 2012 -0700
@@ -29,6 +29,7 @@
import m5
from m5.objects import *
m5.util.addToPath('../configs/common')
+m5.util.addToPath('../configs/topologies')
nb_cores = 4
cpus = [ DerivO3CPU(cpu_id=i) for i in xrange(nb_cores) ]
diff -r 6e854ea87bab -r 9a72589ce4fd tests/configs/o3-timing-ruby.py
--- a/tests/configs/o3-timing-ruby.py Tue Jul 10 22:51:54 2012 -0700
+++ b/tests/configs/o3-timing-ruby.py Tue Jul 10 22:51:55 2012 -0700
@@ -29,6 +29,7 @@
import m5
from m5.objects import *
m5.util.addToPath('../configs/common')
+m5.util.addToPath('../configs/topologies')
import ruby_config
diff -r 6e854ea87bab -r 9a72589ce4fd tests/configs/pc-simple-timing-ruby.py
--- a/tests/configs/pc-simple-timing-ruby.py Tue Jul 10 22:51:54 2012 -0700
+++ b/tests/configs/pc-simple-timing-ruby.py Tue Jul 10 22:51:55 2012 -0700
@@ -33,6 +33,7 @@
import FSConfig
m5.util.addToPath('../configs/ruby')
+m5.util.addToPath('../configs/topology')
import Ruby
import Options
diff -r 6e854ea87bab -r 9a72589ce4fd tests/configs/rubytest-ruby.py
--- a/tests/configs/rubytest-ruby.py Tue Jul 10 22:51:54 2012 -0700
+++ b/tests/configs/rubytest-ruby.py Tue Jul 10 22:51:55 2012 -0700
@@ -40,6 +40,7 @@
m5_root = os.path.dirname(config_root)
addToPath(config_root+'/configs/common')
addToPath(config_root+'/configs/ruby')
+addToPath(config_root+'/configs/topologies')
import Ruby
import Options
diff -r 6e854ea87bab -r 9a72589ce4fd tests/configs/simple-atomic-mp-ruby.py
--- a/tests/configs/simple-atomic-mp-ruby.py Tue Jul 10 22:51:54 2012 -0700
+++ b/tests/configs/simple-atomic-mp-ruby.py Tue Jul 10 22:51:55 2012 -0700
@@ -28,6 +28,7 @@
import m5
from m5.objects import *
+m5.util.addToPath('../configs/topologies')
nb_cores = 4
diff -r 6e854ea87bab -r 9a72589ce4fd tests/configs/simple-timing-mp-ruby.py
--- a/tests/configs/simple-timing-mp-ruby.py Tue Jul 10 22:51:54 2012 -0700
+++ b/tests/configs/simple-timing-mp-ruby.py Tue Jul 10 22:51:55 2012 -0700
@@ -38,6 +38,7 @@
m5_root = os.path.dirname(config_root)
addToPath(config_root+'/configs/common')
addToPath(config_root+'/configs/ruby')
+addToPath(config_root+'/configs/topologies')
import Options
import Ruby
diff -r 6e854ea87bab -r 9a72589ce4fd tests/configs/simple-timing-ruby.py
--- a/tests/configs/simple-timing-ruby.py Tue Jul 10 22:51:54 2012 -0700
+++ b/tests/configs/simple-timing-ruby.py Tue Jul 10 22:51:55 2012 -0700
@@ -37,6 +37,7 @@
config_root = os.path.dirname(config_path)
addToPath(config_root+'/configs/common')
addToPath(config_root+'/configs/ruby')
+addToPath(config_root+'/configs/topologies')
import Ruby
import Options
diff -r 6e854ea87bab -r 9a72589ce4fd
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
Tue Jul 10 22:51:54 2012 -0700
+++
b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_CMP_directory/config.ini
Tue Jul 10 22:51:55 2012 -0700
@@ -78,7 +78,7 @@
env=
errout=cerr
euid=100
-executable=/dist/m5/regression/test-progs/hello/bin/alpha/linux/hello
+executable=/proj/aatl_perfmod_arch/m5_system_files/regression/test-progs/hello/bin/alpha/linux/hello
gid=100
input=cin
max_stack_size=67108864
@@ -155,20 +155,30 @@
[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 6e854ea87bab -r 9a72589ce4fd
tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_CMP_directory/ruby.stats
---
a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_CMP_directory/ruby.stats
Tue Jul 10 22:51:54 2012 -0700
+++
b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_CMP_directory/ruby.stats
Tue Jul 10 22:51:55 2012 -0700
@@ -34,7 +34,7 @@
================ End RubySystem Configuration Print ================
-Real time: Jun/04/2012 13:42:36
+Real time: Jul/10/2012 17:30:50
Profiler Stats
--------------
@@ -43,18 +43,18 @@
Elapsed_time_in_hours: 0.000277778
Elapsed_time_in_days: 1.15741e-05
-Virtual_time_in_seconds: 0.43
-Virtual_time_in_minutes: 0.00716667
-Virtual_time_in_hours: 0.000119444
-Virtual_time_in_days: 4.97685e-06
+Virtual_time_in_seconds: 0.62
+Virtual_time_in_minutes: 0.0103333
+Virtual_time_in_hours: 0.000172222
+Virtual_time_in_days: 7.17593e-06
Ruby_current_time: 279353
Ruby_start_time: 0
Ruby_cycles: 279353
-mbytes_resident: 49.4727
-mbytes_total: 221.031
-resident_ratio: 0.223827
+mbytes_resident: 47.9336
+mbytes_total: 230.535
+resident_ratio: 0.20794
ruby_cycles_executed: [ 279354 ]
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
