All ISAs except SPARC can now take multiple disk images by passing the --disk-image option multiple times. Before this patch, several ISAs automatically mounted a secondary disk called "linux-bigswap2.img", which had to be in M5_PATH even if the end user did not want more than one disk. This was the case for for example for X86 but not ARM. This change was done to: * allow ARM to have a second disk image in fs.py, which was not possible, and allow other ISAs like X86 and ARM to take any number of disk images * provide a simpler, more intuitive CLI interface that does not require magic disk images to be present in M5_PATH to work for ISAs such as X86. Linux does not need that secondary image to boot correctly, so it is more friendly to support a minimal setup that requires the least amount of binaries to boot, and let supply the second image manually only if they need it. * make fs.py --disk-image work more similarly across all ISAs SPARC was left with a single disk only because its setup was a bit more complex and would require further testing. Change-Id: I8b6e08ae6daf0a5b6cd1d57d285a9677f01eb7ad Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/23671 Reviewed-by: Jason Lowe-Power <jason@lowepower.com> Maintainer: Giacomo Travaglini <giacomo.travaglini@arm.com> Tested-by: kokoro <noreply+kokoro@google.com>
172 lines
6.9 KiB
Python
172 lines
6.9 KiB
Python
# Copyright (c) 2012, 2017, 2019 ARM Limited
|
|
# All rights reserved.
|
|
#
|
|
# The license below extends only to copyright in the software and shall
|
|
# not be construed as granting a license to any other intellectual
|
|
# property including but not limited to intellectual property relating
|
|
# to a hardware implementation of the functionality of the software
|
|
# licensed hereunder. You may use the software subject to the license
|
|
# terms below provided that you ensure that this notice is replicated
|
|
# unmodified and in its entirety in all distributions of the software,
|
|
# modified or unmodified, in source code or in binary form.
|
|
#
|
|
# 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.
|
|
#
|
|
# Authors: Andreas Sandberg
|
|
|
|
from abc import ABCMeta, abstractmethod
|
|
import m5
|
|
from m5.objects import *
|
|
from m5.proxy import *
|
|
m5.util.addToPath('../configs/')
|
|
from common import FSConfig
|
|
from common.Caches import *
|
|
from base_config import *
|
|
from common.cores.arm.O3_ARM_v7a import *
|
|
from common.Benchmarks import SysConfig
|
|
|
|
from common import SysPaths
|
|
|
|
class ArmSESystemUniprocessor(BaseSESystemUniprocessor):
|
|
"""Syscall-emulation builder for ARM uniprocessor systems.
|
|
|
|
A small tweak of the syscall-emulation builder to use more
|
|
representative cache configurations.
|
|
"""
|
|
|
|
def __init__(self, **kwargs):
|
|
super(ArmSESystemUniprocessor, self).__init__(**kwargs)
|
|
|
|
def create_caches_private(self, cpu):
|
|
# The atomic SE configurations do not use caches
|
|
if self.mem_mode == "timing":
|
|
# Use the more representative cache configuration
|
|
cpu.addTwoLevelCacheHierarchy(O3_ARM_v7a_ICache(),
|
|
O3_ARM_v7a_DCache(),
|
|
O3_ARM_v7aL2())
|
|
|
|
class LinuxArmSystemBuilder(object):
|
|
"""Mix-in that implements create_system.
|
|
|
|
This mix-in is intended as a convenient way of adding an
|
|
ARM-specific create_system method to a class deriving from one of
|
|
the generic base systems.
|
|
"""
|
|
def __init__(self, machine_type, aarch64_kernel, **kwargs):
|
|
"""
|
|
Arguments:
|
|
machine_type -- String describing the platform to simulate
|
|
num_cpus -- integer number of CPUs in the system
|
|
use_ruby -- True if ruby is used instead of the classic memory system
|
|
"""
|
|
self.machine_type = machine_type
|
|
self.num_cpus = kwargs.get('num_cpus', 1)
|
|
self.mem_size = kwargs.get('mem_size', '256MB')
|
|
self.use_ruby = kwargs.get('use_ruby', False)
|
|
self.aarch64_kernel = aarch64_kernel
|
|
|
|
def create_system(self):
|
|
if self.aarch64_kernel:
|
|
gem5_kernel = "vmlinux.arm64"
|
|
disk_image = "m5_exit.squashfs.arm64"
|
|
else:
|
|
gem5_kernel = "vmlinux.arm"
|
|
disk_image = "m5_exit.squashfs.arm"
|
|
|
|
default_kernels = {
|
|
"VExpress_GEM5_V1": gem5_kernel,
|
|
}
|
|
|
|
sc = SysConfig(None, self.mem_size, [disk_image], "/dev/sda")
|
|
system = FSConfig.makeArmSystem(self.mem_mode,
|
|
self.machine_type, self.num_cpus,
|
|
sc, False, ruby=self.use_ruby)
|
|
|
|
# We typically want the simulator to panic if the kernel
|
|
# panics or oopses. This prevents the simulator from running
|
|
# an obviously failed test case until the end of time.
|
|
system.panic_on_panic = True
|
|
system.panic_on_oops = True
|
|
|
|
system.kernel = SysPaths.binary(default_kernels[self.machine_type])
|
|
|
|
self.init_system(system)
|
|
|
|
system.generateDtb(m5.options.outdir, 'system.dtb')
|
|
return system
|
|
|
|
class LinuxArmFSSystem(LinuxArmSystemBuilder,
|
|
BaseFSSystem):
|
|
"""Basic ARM full system builder."""
|
|
|
|
def __init__(self,
|
|
machine_type='VExpress_GEM5_V1',
|
|
aarch64_kernel=True,
|
|
**kwargs):
|
|
"""Initialize an ARM system that supports full system simulation.
|
|
|
|
Note: Keyword arguments that are not listed below will be
|
|
passed to the BaseFSSystem.
|
|
|
|
Keyword Arguments:
|
|
machine_type -- String describing the platform to simulate
|
|
"""
|
|
BaseFSSystem.__init__(self, **kwargs)
|
|
LinuxArmSystemBuilder.__init__(
|
|
self, machine_type, aarch64_kernel, **kwargs)
|
|
|
|
def create_caches_private(self, cpu):
|
|
# Use the more representative cache configuration
|
|
cpu.addTwoLevelCacheHierarchy(O3_ARM_v7a_ICache(),
|
|
O3_ARM_v7a_DCache(),
|
|
O3_ARM_v7aL2())
|
|
|
|
class LinuxArmFSSystemUniprocessor(LinuxArmSystemBuilder,
|
|
BaseFSSystemUniprocessor):
|
|
"""Basic ARM full system builder for uniprocessor systems.
|
|
|
|
Note: This class is a specialization of the ArmFSSystem and is
|
|
only really needed to provide backwards compatibility for existing
|
|
test cases.
|
|
"""
|
|
|
|
def __init__(self,
|
|
machine_type='VExpress_GEM5_V1',
|
|
aarch64_kernel=True,
|
|
**kwargs):
|
|
BaseFSSystemUniprocessor.__init__(self, **kwargs)
|
|
LinuxArmSystemBuilder.__init__(
|
|
self, machine_type, aarch64_kernel, **kwargs)
|
|
|
|
class LinuxArmFSSwitcheroo(LinuxArmSystemBuilder, BaseFSSwitcheroo):
|
|
"""Uniprocessor ARM system prepared for CPU switching"""
|
|
|
|
def __init__(self,
|
|
machine_type='VExpress_GEM5_V1',
|
|
aarch64_kernel=True,
|
|
**kwargs):
|
|
BaseFSSwitcheroo.__init__(self, **kwargs)
|
|
LinuxArmSystemBuilder.__init__(
|
|
self, machine_type, aarch64_kernel, **kwargs)
|