changeset a48540069b8d in /z/repo/gem5
details: http://repo.gem5.org/gem5?cmd=changeset;node=a48540069b8d
description:
regress: ruby random tester and hammer stats updates
diffstat:
tests/configs/rubytest-ruby.py
| 9 +-
tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/config.ini
| 105 +-
tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/ruby.stats
| 1008 +++++-----
tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/simerr
| 146 +-
tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/simout
| 10 +-
tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/stats.txt
| 44 +-
tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_CMP_directory/config.ini
| 26 +-
tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_CMP_directory/ruby.stats
| 381 +-
tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_CMP_directory/simout
| 9 +-
tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_CMP_directory/stats.txt
| 12 +-
tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_directory/config.ini
| 35 +-
tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_directory/ruby.stats
| 370 +-
tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_directory/simout
| 11 +-
tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_directory/stats.txt
| 12 +-
tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_token/config.ini
| 35 +-
tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_token/ruby.stats
| 463 ++--
tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_token/simout
| 11 +-
tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_token/stats.txt
| 12 +-
tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_hammer/config.ini
| 37 +-
tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_hammer/ruby.stats
| 350 +-
tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_hammer/simout
| 11 +-
tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_hammer/stats.txt
| 12 +-
tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby/config.ini
| 35 +-
tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby/ruby.stats
| 213 +-
tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby/simout
| 11 +-
tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby/stats.txt
| 12 +-
26 files changed, 1739 insertions(+), 1641 deletions(-)
diffs (truncated from 6136 to 300 lines):
diff -r 4c84b2566d2f -r a48540069b8d tests/configs/rubytest-ruby.py
--- a/tests/configs/rubytest-ruby.py Fri Apr 06 13:47:08 2012 -0700
+++ b/tests/configs/rubytest-ruby.py Fri Apr 06 16:16:24 2012 -0700
@@ -74,7 +74,7 @@
# create the tester and system, including ruby
#
tester = RubyTester(check_flush = check_flush, checks_to_complete = 100,
- wakeup_frequency = 10)
+ wakeup_frequency = 10, num_cpus = options.num_cpus)
system = System(tester = tester, physmem = SimpleMemory())
@@ -90,9 +90,12 @@
for ruby_port in system.ruby._cpu_ruby_ports:
#
- # Tie the ruby tester ports to the ruby cpu ports
+ # Tie the ruby tester ports to the ruby cpu read and write ports
#
- tester.cpuPort = ruby_port.slave
+ if ruby_port.support_data_reqs:
+ tester.cpuDataPort = ruby_port.slave
+ if ruby_port.support_inst_reqs:
+ tester.cpuInstPort = ruby_port.slave
#
# Tell the sequencer this is the ruby tester so that it
diff -r 4c84b2566d2f -r a48540069b8d
tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/config.ini
---
a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/config.ini
Fri Apr 06 13:47:08 2012 -0700
+++
b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/config.ini
Fri Apr 06 16:16:24 2012 -0700
@@ -1,6 +1,7 @@
[root]
type=Root
children=system
+full_system=false
time_sync_enable=false
time_sync_period=100000000
time_sync_spin_threshold=100000
@@ -8,10 +9,16 @@
[system]
type=System
children=cpu0 cpu1 cpu2 cpu3 cpu4 cpu5 cpu6 cpu7 dir_cntrl0 funcmem l1_cntrl0
l1_cntrl1 l1_cntrl2 l1_cntrl3 l1_cntrl4 l1_cntrl5 l1_cntrl6 l1_cntrl7 physmem
ruby sys_port_proxy
+boot_osflags=a
+init_param=0
+kernel=
+load_addr_mask=1099511627775
mem_mode=timing
memories=system.physmem system.funcmem
num_work_ids=16
physmem=system.physmem
+readfile=
+symbolfile=
work_begin_ckpt_count=0
work_begin_cpu_id_exit=-1
work_begin_exit_count=0
@@ -19,7 +26,7 @@
work_end_ckpt_count=0
work_end_exit_count=0
work_item_id=-1
-system_port=system.sys_port_proxy.port[0]
+system_port=system.sys_port_proxy.slave[0]
[system.cpu0]
type=MemTest
@@ -34,9 +41,10 @@
percent_uncacheable=0
progress_interval=10000
suppress_func_warnings=true
+sys=system
trace_addr=0
functional=system.funcmem.port[0]
-test=system.l1_cntrl0.sequencer.port[0]
+test=system.l1_cntrl0.sequencer.slave[0]
[system.cpu1]
type=MemTest
@@ -51,9 +59,10 @@
percent_uncacheable=0
progress_interval=10000
suppress_func_warnings=true
+sys=system
trace_addr=0
functional=system.funcmem.port[1]
-test=system.l1_cntrl1.sequencer.port[0]
+test=system.l1_cntrl1.sequencer.slave[0]
[system.cpu2]
type=MemTest
@@ -68,9 +77,10 @@
percent_uncacheable=0
progress_interval=10000
suppress_func_warnings=true
+sys=system
trace_addr=0
functional=system.funcmem.port[2]
-test=system.l1_cntrl2.sequencer.port[0]
+test=system.l1_cntrl2.sequencer.slave[0]
[system.cpu3]
type=MemTest
@@ -85,9 +95,10 @@
percent_uncacheable=0
progress_interval=10000
suppress_func_warnings=true
+sys=system
trace_addr=0
functional=system.funcmem.port[3]
-test=system.l1_cntrl3.sequencer.port[0]
+test=system.l1_cntrl3.sequencer.slave[0]
[system.cpu4]
type=MemTest
@@ -102,9 +113,10 @@
percent_uncacheable=0
progress_interval=10000
suppress_func_warnings=true
+sys=system
trace_addr=0
functional=system.funcmem.port[4]
-test=system.l1_cntrl4.sequencer.port[0]
+test=system.l1_cntrl4.sequencer.slave[0]
[system.cpu5]
type=MemTest
@@ -119,9 +131,10 @@
percent_uncacheable=0
progress_interval=10000
suppress_func_warnings=true
+sys=system
trace_addr=0
functional=system.funcmem.port[5]
-test=system.l1_cntrl5.sequencer.port[0]
+test=system.l1_cntrl5.sequencer.slave[0]
[system.cpu6]
type=MemTest
@@ -136,9 +149,10 @@
percent_uncacheable=0
progress_interval=10000
suppress_func_warnings=true
+sys=system
trace_addr=0
functional=system.funcmem.port[6]
-test=system.l1_cntrl6.sequencer.port[0]
+test=system.l1_cntrl6.sequencer.slave[0]
[system.cpu7]
type=MemTest
@@ -153,9 +167,10 @@
percent_uncacheable=0
progress_interval=10000
suppress_func_warnings=true
+sys=system
trace_addr=0
functional=system.funcmem.port[7]
-test=system.l1_cntrl7.sequencer.port[0]
+test=system.l1_cntrl7.sequencer.slave[0]
[system.dir_cntrl0]
type=Directory_Controller
@@ -237,6 +252,7 @@
number_of_TBEs=256
recycle_latency=10
ruby_system=system.ruby
+send_evictions=false
sequencer=system.l1_cntrl0.sequencer
transitions_per_cycle=32
version=0
@@ -275,13 +291,14 @@
deadlock_threshold=1000000
icache=system.l1_cntrl0.L1IcacheMemory
max_outstanding_requests=16
-physmem=system.physmem
ruby_system=system.ruby
+support_data_reqs=true
+support_inst_reqs=true
+system=system
using_network_tester=false
using_ruby_tester=false
version=0
-physMemPort=system.physmem.port[0]
-port=system.cpu0.test
+slave=system.cpu0.test
[system.l1_cntrl1]
type=L1Cache_Controller
@@ -298,6 +315,7 @@
number_of_TBEs=256
recycle_latency=10
ruby_system=system.ruby
+send_evictions=false
sequencer=system.l1_cntrl1.sequencer
transitions_per_cycle=32
version=1
@@ -336,13 +354,14 @@
deadlock_threshold=1000000
icache=system.l1_cntrl1.L1IcacheMemory
max_outstanding_requests=16
-physmem=system.physmem
ruby_system=system.ruby
+support_data_reqs=true
+support_inst_reqs=true
+system=system
using_network_tester=false
using_ruby_tester=false
version=1
-physMemPort=system.physmem.port[1]
-port=system.cpu1.test
+slave=system.cpu1.test
[system.l1_cntrl2]
type=L1Cache_Controller
@@ -359,6 +378,7 @@
number_of_TBEs=256
recycle_latency=10
ruby_system=system.ruby
+send_evictions=false
sequencer=system.l1_cntrl2.sequencer
transitions_per_cycle=32
version=2
@@ -397,13 +417,14 @@
deadlock_threshold=1000000
icache=system.l1_cntrl2.L1IcacheMemory
max_outstanding_requests=16
-physmem=system.physmem
ruby_system=system.ruby
+support_data_reqs=true
+support_inst_reqs=true
+system=system
using_network_tester=false
using_ruby_tester=false
version=2
-physMemPort=system.physmem.port[2]
-port=system.cpu2.test
+slave=system.cpu2.test
[system.l1_cntrl3]
type=L1Cache_Controller
@@ -420,6 +441,7 @@
number_of_TBEs=256
recycle_latency=10
ruby_system=system.ruby
+send_evictions=false
sequencer=system.l1_cntrl3.sequencer
transitions_per_cycle=32
version=3
@@ -458,13 +480,14 @@
deadlock_threshold=1000000
icache=system.l1_cntrl3.L1IcacheMemory
max_outstanding_requests=16
-physmem=system.physmem
ruby_system=system.ruby
+support_data_reqs=true
+support_inst_reqs=true
+system=system
using_network_tester=false
using_ruby_tester=false
version=3
-physMemPort=system.physmem.port[3]
-port=system.cpu3.test
+slave=system.cpu3.test
[system.l1_cntrl4]
type=L1Cache_Controller
@@ -481,6 +504,7 @@
number_of_TBEs=256
recycle_latency=10
ruby_system=system.ruby
+send_evictions=false
sequencer=system.l1_cntrl4.sequencer
transitions_per_cycle=32
version=4
@@ -519,13 +543,14 @@
deadlock_threshold=1000000
icache=system.l1_cntrl4.L1IcacheMemory
max_outstanding_requests=16
-physmem=system.physmem
ruby_system=system.ruby
+support_data_reqs=true
+support_inst_reqs=true
+system=system
using_network_tester=false
using_ruby_tester=false
version=4
-physMemPort=system.physmem.port[4]
-port=system.cpu4.test
+slave=system.cpu4.test
[system.l1_cntrl5]
type=L1Cache_Controller
@@ -542,6 +567,7 @@
number_of_TBEs=256
recycle_latency=10
ruby_system=system.ruby
+send_evictions=false
sequencer=system.l1_cntrl5.sequencer
transitions_per_cycle=32
version=5
@@ -580,13 +606,14 @@
deadlock_threshold=1000000
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
