99a100,101
> tester.num_cpus = len(system.ruby._cpu_ports)
>
110,113c112,117
< 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
114a119,121
> # Do not automatically retry stalled Ruby requests
> ruby_port.no_retry_on_stall = True
>