Giacomo Travaglini has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/31218 )
Change subject: tests: Add realview64-kvm.py testing platform
......................................................................
tests: Add realview64-kvm.py testing platform
Change-Id: If9952563413b4c7462a3ddf46c40358023d5bc60
Signed-off-by: Giacomo Travaglini <[email protected]>
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/31218
Reviewed-by: Jason Lowe-Power <[email protected]>
Maintainer: Jason Lowe-Power <[email protected]>
Tested-by: kokoro <[email protected]>
---
M tests/gem5/configs/arm_generic.py
A tests/gem5/configs/realview64-kvm.py
2 files changed, 64 insertions(+), 1 deletion(-)
Approvals:
Jason Lowe-Power: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
diff --git a/tests/gem5/configs/arm_generic.py
b/tests/gem5/configs/arm_generic.py
index dc87e68..007b89b 100644
--- a/tests/gem5/configs/arm_generic.py
+++ b/tests/gem5/configs/arm_generic.py
@@ -84,10 +84,31 @@
self.use_ruby = kwargs.get('use_ruby', False)
self.aarch64_kernel = aarch64_kernel
+ def init_kvm(self, system):
+ """Do KVM-specific system initialization.
+
+ Arguments:
+ system -- System to work on.
+ """
+ system.kvm_vm = KvmVM()
+
+ # Arm KVM regressions will use a simulated GIC. This means that in
+ # order to work we need to remove the system interface of the
+ # generic timer from the DTB and we need to inform the MuxingKvmGic
+ # class to use the gem5 GIC instead of relying on the host one
+ GenericTimer.generateDeviceTree = SimObject.generateDeviceTree
+ system.realview.gic.simulate_gic = True
+
def create_system(self):
if self.aarch64_kernel:
gem5_kernel = "vmlinux.arm64"
- disk_image = "m5_exit.squashfs.arm64"
+ try:
+ if issubclass(self.cpu_class, ArmV8KvmCPU):
+ disk_image = "m5_exit_addr.squashfs.arm64"
+ else:
+ disk_image = "m5_exit.squashfs.arm64"
+ except:
+ disk_image = "m5_exit.squashfs.arm64"
else:
gem5_kernel = "vmlinux.arm"
disk_image = "m5_exit.squashfs.arm"
diff --git a/tests/gem5/configs/realview64-kvm.py
b/tests/gem5/configs/realview64-kvm.py
new file mode 100644
index 0000000..f69008d
--- /dev/null
+++ b/tests/gem5/configs/realview64-kvm.py
@@ -0,0 +1,42 @@
+# Copyright (c) 2020 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.
+
+from m5.objects import *
+from arm_generic import *
+
+root = LinuxArmFSSystemUniprocessor(mem_mode='atomic_noncaching',
+ machine_type='VExpress_GEM5_V1',
+ mem_class=SimpleMemory,
+ cpu_class=ArmV8KvmCPU).create_root()
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/31218
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: If9952563413b4c7462a3ddf46c40358023d5bc60
Gerrit-Change-Number: 31218
Gerrit-PatchSet: 10
Gerrit-Owner: Giacomo Travaglini <[email protected]>
Gerrit-Reviewer: Andreas Sandberg <[email protected]>
Gerrit-Reviewer: Bobby R. Bruce <[email protected]>
Gerrit-Reviewer: Giacomo Travaglini <[email protected]>
Gerrit-Reviewer: Jason Lowe-Power <[email protected]>
Gerrit-Reviewer: kokoro <[email protected]>
Gerrit-MessageType: merged
_______________________________________________
gem5-dev mailing list -- [email protected]
To unsubscribe send an email to [email protected]
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s
