This patch is adding an extra parameter to the Ruby.create_system function. The idea is to remove any assumption about cpu configuration in the ruby scripts. At the moment the scripts are assuming a flat list of cpu assigned to the system object. Unfortunately this is not standardized, as some systems might empoloy a different layout of cpus, like grouping them in cluster objects. With this patch we are allowing client scripts to provide the cpu list as an extra argument This has the extra benefit of removing the indexing hack if len(system.cpu) == 1: which was present in most scripts Change-Id: Ibc06b920273cde4f7c394d61c0ca664a7143cd27 Signed-off-by: Giacomo Travaglini <giacomo.travaglini@arm.com> Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/43287 Maintainer: Bobby R. Bruce <bbruce@ucdavis.edu> Maintainer: Jason Lowe-Power <power.jg@gmail.com> Tested-by: kokoro <noreply+kokoro@google.com> Reviewed-by: Jason Lowe-Power <power.jg@gmail.com>
131 lines
4.5 KiB
Python
131 lines
4.5 KiB
Python
# Copyright (c) 2006-2007 The Regents of The University of Michigan
|
|
# Copyright (c) 2009 Advanced Micro Devices, Inc.
|
|
# All rights reserved.
|
|
#
|
|
# Redistribution and use in source and binary forms, with or without
|
|
# modification, are permitted provided that the following conditions are
|
|
# met: redistributions of source code must retain the above copyright
|
|
# notice, this list of conditions and the following disclaimer;
|
|
# redistributions in binary form must reproduce the above copyright
|
|
# notice, this list of conditions and the following disclaimer in the
|
|
# documentation and/or other materials provided with the distribution;
|
|
# neither the name of the copyright holders nor the names of its
|
|
# contributors may be used to endorse or promote products derived from
|
|
# this software without specific prior written permission.
|
|
#
|
|
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
|
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
|
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
|
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
|
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
|
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
|
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
|
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
|
|
import m5
|
|
from m5.objects import *
|
|
from m5.defines import buildEnv
|
|
from m5.util import addToPath
|
|
import os, optparse, sys
|
|
|
|
m5.util.addToPath('../configs/')
|
|
|
|
from ruby import Ruby
|
|
from common import Options
|
|
|
|
parser = optparse.OptionParser()
|
|
Options.addNoISAOptions(parser)
|
|
|
|
# Add the ruby specific and protocol specific options
|
|
Ruby.define_options(parser)
|
|
|
|
(options, args) = parser.parse_args()
|
|
|
|
#
|
|
# Set the default cache size and associativity to be very small to encourage
|
|
# races between requests and writebacks.
|
|
#
|
|
options.l1d_size="256B"
|
|
options.l1i_size="256B"
|
|
options.l2_size="512B"
|
|
options.l3_size="1kB"
|
|
options.l1d_assoc=2
|
|
options.l1i_assoc=2
|
|
options.l2_assoc=2
|
|
options.l3_assoc=2
|
|
options.ports=32
|
|
|
|
# Turn on flush check for the hammer protocol
|
|
check_flush = False
|
|
if buildEnv['PROTOCOL'] == 'MOESI_hammer':
|
|
check_flush = True
|
|
|
|
#
|
|
# create the tester and system, including ruby
|
|
#
|
|
tester = RubyTester(check_flush = check_flush, checks_to_complete = 100,
|
|
wakeup_frequency = 10, num_cpus = options.num_cpus)
|
|
|
|
# We set the testers as cpu for ruby to find the correct clock domains
|
|
# for the L1 Objects.
|
|
system = System(cpu = tester)
|
|
|
|
# Dummy voltage domain for all our clock domains
|
|
system.voltage_domain = VoltageDomain(voltage = options.sys_voltage)
|
|
system.clk_domain = SrcClockDomain(clock = '1GHz',
|
|
voltage_domain = system.voltage_domain)
|
|
|
|
system.mem_ranges = AddrRange('256MB')
|
|
|
|
# the ruby tester reuses num_cpus to specify the
|
|
# number of cpu ports connected to the tester object, which
|
|
# is stored in system.cpu. because there is only ever one
|
|
# tester object, num_cpus is not necessarily equal to the
|
|
# size of system.cpu
|
|
cpu_list = [ system.cpu ] * options.num_cpus
|
|
Ruby.create_system(options, False, system, cpus=cpu_list)
|
|
|
|
# Create a separate clock domain for Ruby
|
|
system.ruby.clk_domain = SrcClockDomain(clock = '1GHz',
|
|
voltage_domain = system.voltage_domain)
|
|
|
|
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
|
|
#
|
|
system.ruby.randomization = True
|
|
|
|
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 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
|
|
# copies the subblock back to the checker
|
|
#
|
|
ruby_port.using_ruby_tester = True
|
|
|
|
# -----------------------
|
|
# run simulation
|
|
# -----------------------
|
|
|
|
root = Root(full_system = False, system = system )
|
|
root.system.mem_mode = 'timing'
|