derek/gem5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

configs: root, platform options in fs bigLITTLE

Browse Source 
(1) Two new options are added to fs_bigLITTLE.py:
    - "root": disk/partition containing the rootfs (def. "/dev/vda1")
    - "machine-type": hardware platform class (def. "VExpress_GEM5_V1")
        + Accepts platform classes from PlatformConfig
(2) Default kernel is not available in public uploads, force the user
    to provide its own kernel instead of crashing.

Change-Id: I88283ae12cd7289e15b9277ea2cc382e9136f11c
Reviewed-by: Ciro Santilli <ciro.santilli@arm.com>
Reviewed-by: Andreas Sandberg <andreas.sandberg@arm.com>
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/20148
Maintainer: Andreas Sandberg <andreas.sandberg@arm.com>
Tested-by: kokoro <noreply+kokoro@google.com>
This commit is contained in:
Adrian Herrera
2019-08-13 13:31:17 +01:00
committed by Ciro Santilli
parent d3a87a87b4
commit 441fa07f8c
2 changed files with 23 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
configs/example/arm/devices.py
View File

@@ -1,4 +1,4 @@
# Copyright (c) 2016-2017 ARM Limited
# Copyright (c) 2016-2017, 2019 ARM Limited
# All rights reserved.
#
# The license below extends only to copyright in the software and shall
@@ -187,14 +187,17 @@ class KvmCluster(CpuCluster):
class SimpleSystem(LinuxArmSystem):
cache_line_size = 64
def __init__(self, caches, mem_size, **kwargs):
def __init__(self, caches, mem_size, platform=None, **kwargs):
super(SimpleSystem, self).__init__(**kwargs)
self.voltage_domain = VoltageDomain(voltage="1.0V")
self.clk_domain = SrcClockDomain(clock="1GHz",
voltage_domain=Parent.voltage_domain)
self.realview = VExpress_GEM5_V1()
if platform is None:
self.realview = VExpress_GEM5_V1()
else:
self.realview = platform
if hasattr(self.realview.gic, 'cpu_addr'):
self.gic_cpu_addr = self.realview.gic.cpu_addr

23
configs/example/arm/fs_bigLITTLE.py
View File

@@ -1,4 +1,4 @@
# Copyright (c) 2016-2017 ARM Limited
# Copyright (c) 2016-2017, 2019 ARM Limited
# All rights reserved.
#
# The license below extends only to copyright in the software and shall
@@ -54,13 +54,13 @@ m5.util.addToPath("../../")
from common import SysPaths
from common import CpuConfig
from common import PlatformConfig
from common.cores.arm import ex5_big, ex5_LITTLE
import devices
from devices import AtomicCluster, KvmCluster
default_kernel = 'vmlinux4.3.aarch64'
default_disk = 'aarch64-ubuntu-trusty-headless.img'
default_rcs = 'bootscript.rcS'
@@ -114,8 +114,12 @@ class Ex5LittleCluster(devices.CpuCluster):
super(Ex5LittleCluster, self).__init__(system, num_cpus, cpu_clock,
cpu_voltage, *cpu_config)
def createSystem(caches, kernel, bootscript, disks=[]):
sys = devices.SimpleSystem(caches, default_mem_size,
def createSystem(caches, kernel, bootscript,
machine_type="VExpress_GEM5", disks=[]):
platform = PlatformConfig.get(machine_type)
m5.util.inform("Simulated platform: %s", platform.__name__)
sys = devices.SimpleSystem(caches, default_mem_size, platform(),
kernel=SysPaths.binary(kernel),
readfile=bootscript)
@@ -157,8 +161,14 @@ def addOptions(parser):
help="Restore from checkpoint")
parser.add_argument("--dtb", type=str, default=None,
help="DTB file to load")
parser.add_argument("--kernel", type=str, default=default_kernel,
parser.add_argument("--kernel", type=str, required=True,
help="Linux kernel")
parser.add_argument("--root", type=str, default="/dev/vda1",
help="Specify the kernel CLI root= argument")
parser.add_argument("--machine-type", type=str,
choices=PlatformConfig.platform_names(),
default="VExpress_GEM5",
help="Hardware platform class")
parser.add_argument("--disk", action="append", type=str, default=[],
help="Disks to instantiate")
parser.add_argument("--bootscript", type=str, default=default_rcs,
@@ -203,7 +213,7 @@ def build(options):
"norandmaps",
"loglevel=8",
"mem=%s" % default_mem_size,
"root=/dev/vda1",
"root=%s" % options.root,
"rw",
"init=%s" % options.kernel_init,
"vmalloc=768MB",
@@ -215,6 +225,7 @@ def build(options):
system = createSystem(options.caches,
options.kernel,
options.bootscript,
options.machine_type,
disks=disks)
root.system = system