summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorBrad Beckmann <Brad.Beckmann@amd.com>2015-12-11 16:07:01 -0500
committerBrad Beckmann <Brad.Beckmann@amd.com>2015-12-11 16:07:01 -0500
commit634f34d3f2c68ea26350c81c32440971c98edefb (patch)
treee05490ae8ad1e8d71cf3d3eed59094ce8b49d6b5 /tests
parent173a7869219534de5053889a84e1006281ec7645 (diff)
downloadgem5-634f34d3f2c68ea26350c81c32440971c98edefb.tar.xz
regress: updates required for the compute-gpu patches
Diffstat (limited to 'tests')
-rw-r--r--tests/configs/rubytest-ruby.py15
1 files changed, 11 insertions, 4 deletions
diff --git a/tests/configs/rubytest-ruby.py b/tests/configs/rubytest-ruby.py
index 22334efb4..77c7b51a8 100644
--- a/tests/configs/rubytest-ruby.py
+++ b/tests/configs/rubytest-ruby.py
@@ -97,6 +97,8 @@ system.ruby.clk_domain = SrcClockDomain(clock = '1GHz',
assert(options.num_cpus == len(system.ruby._cpu_ports))
+tester.num_cpus = len(system.ruby._cpu_ports)
+
#
# The tester is most effective when randomization is turned on and
# artifical delay is randomly inserted on messages
@@ -107,10 +109,15 @@ for ruby_port in system.ruby._cpu_ports:
#
# Tie the ruby tester ports to the ruby cpu read and write ports
#
- if ruby_port.support_data_reqs:
- tester.cpuDataPort = ruby_port.slave
- if ruby_port.support_inst_reqs:
- tester.cpuInstPort = ruby_port.slave
+ if ruby_port.support_data_reqs and ruby_port.support_inst_reqs:
+ tester.cpuInstDataPort = ruby_port.slave
+ elif ruby_port.support_data_reqs:
+ tester.cpuDataPort = ruby_port.slave
+ elif ruby_port.support_inst_reqs:
+ tester.cpuInstPort = ruby_port.slave
+
+ # Do not automatically retry stalled Ruby requests
+ ruby_port.no_retry_on_stall = True
#
# Tell the sequencer this is the ruby tester so that it