de7337a32a
In order to fix several regression failures [1] the master/slave terminology in src/cpu/BaseCPU.py was reintroduced [2]. This patch is addressing the issue by providing 2 different ways of connecting cpu ports: *) connectBus: The method assumes an object with a bus interface is passed as an argument, therefore it tries to bind cpu ports to the bus.mem_side_ports and bus.cpu_side_ports *) connectAllPorts: No assumption on the port owning device is made. The method simply accepts ports as arguments which will be directly connected to the peer cpu ports This will be used for example by ruby Sequencers [1]: https://gem5.atlassian.net/browse/GEM5-775 [2]: https://gem5-review.googlesource.com/c/public/gem5/+/34495 Change-Id: I715ab8471621d6e5eb36731d7eaefbedf9663a71 Signed-off-by: Giacomo Travaglini <giacomo.travaglini@arm.com> Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/52584 Tested-by: kokoro <noreply+kokoro@google.com> Maintainer: Bobby R. Bruce <bbruce@ucdavis.edu> Reviewed-by: Jason Lowe-Power <power.jg@gmail.com>
97 lines
3.2 KiB
Python
97 lines
3.2 KiB
Python
# Copyright (c) 2006-2007 The Regents of The University of Michigan
|
|
# 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, argparse, sys
|
|
|
|
m5.util.addToPath('../configs/')
|
|
|
|
from common import Options
|
|
from ruby import Ruby
|
|
|
|
parser = argparse.ArgumentParser()
|
|
Options.addCommonOptions(parser)
|
|
|
|
# Add the ruby specific and protocol specific options
|
|
Ruby.define_options(parser)
|
|
|
|
args = parser.parse_args()
|
|
|
|
#
|
|
# Set the default cache size and associativity to be very small to encourage
|
|
# races between requests and writebacks.
|
|
#
|
|
args.l1d_size="256B"
|
|
args.l1i_size="256B"
|
|
args.l2_size="512B"
|
|
args.l3_size="1kB"
|
|
args.l1d_assoc=2
|
|
args.l1i_assoc=2
|
|
args.l2_assoc=2
|
|
args.l3_assoc=2
|
|
|
|
nb_cores = 4
|
|
cpus = [ TimingSimpleCPU(cpu_id=i) for i in range(nb_cores) ]
|
|
|
|
# overwrite the num_cpus to equal nb_cores
|
|
args.num_cpus = nb_cores
|
|
|
|
# system simulated
|
|
system = System(cpu = cpus, clk_domain = SrcClockDomain(clock = '1GHz'))
|
|
|
|
# Create a seperate clock domain for components that should run at
|
|
# CPUs frequency
|
|
system.cpu.clk_domain = SrcClockDomain(clock = '2GHz')
|
|
|
|
Ruby.create_system(args, False, system)
|
|
|
|
# Create a separate clock domain for Ruby
|
|
system.ruby.clk_domain = SrcClockDomain(clock = args.ruby_clock)
|
|
|
|
assert(args.num_cpus == len(system.ruby._cpu_ports))
|
|
|
|
for (i, cpu) in enumerate(system.cpu):
|
|
# create the interrupt controller
|
|
cpu.createInterruptController()
|
|
|
|
#
|
|
# Tie the cpu ports to the ruby cpu ports
|
|
#
|
|
cpu.connectAllPorts(
|
|
system.ruby._cpu_ports[i].in_ports,
|
|
system.ruby._cpu_ports[i].in_ports,
|
|
system.ruby._cpu_ports[i].interrupt_out_port)
|
|
|
|
# -----------------------
|
|
# run simulation
|
|
# -----------------------
|
|
|
|
root = Root( full_system=False, system = system )
|
|
root.system.mem_mode = 'timing'
|