Ciro Santilli has submitted this change and it was merged. (
https://gem5-review.googlesource.com/c/public/gem5/+/15957 )
Change subject: tests: fix arm regression due to kernel not found
......................................................................
tests: fix arm regression due to kernel not found
At Ia49298304f658701ea0800bd79e08db404a655c3 we removed the default
kernel and DTB filenames from FSConfig.py.
However, the regression tests rely on that to find those blobs.
This commit restores those default filenames just for the config of the
regression tests.
Change-Id: I9d7d869b0087ee8a3b63088693f753a703ead5d6
Reviewed-by: Andreas Sandberg <[email protected]>
Reviewed-on: https://gem5-review.googlesource.com/c/15957
Maintainer: Andreas Sandberg <[email protected]>
---
M tests/configs/arm_generic.py
1 file changed, 17 insertions(+), 1 deletion(-)
Approvals:
Andreas Sandberg: Looks good to me, approved; Looks good to me, approved
diff --git a/tests/configs/arm_generic.py b/tests/configs/arm_generic.py
index 722749c..7ffa141 100644
--- a/tests/configs/arm_generic.py
+++ b/tests/configs/arm_generic.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2012, 2017 ARM Limited
+# Copyright (c) 2012, 2017, 2019 ARM Limited
# All rights reserved.
#
# The license below extends only to copyright in the software and shall
@@ -46,6 +46,8 @@
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.
@@ -95,6 +97,20 @@
system.panic_on_panic = True
system.panic_on_oops = True
+ default_kernels = {
+ "RealViewPBX": "vmlinux.arm.smp.fb.2.6.38.8",
+ "VExpress_EMM": "vmlinux.aarch32.ll_20131205.0-gem5",
+ "VExpress_EMM64": "vmlinux.aarch64.20140821",
+ }
+ system.kernel = SysPaths.binary(default_kernels[self.machine_type])
+ default_dtbs = {
+ "RealViewPBX": None,
+ "VExpress_EMM": "vexpress.aarch32.ll_20131205.0-gem5.{}cpu.dtb"
\
+ .format(self.num_cpus),
+ "VExpress_EMM64": "vexpress.aarch64.20140821.dtb",
+ }
+ system.dtb_filename =
SysPaths.binary(default_dtbs[self.machine_type])
+
self.init_system(system)
return system
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/15957
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: master
Gerrit-Change-Id: I9d7d869b0087ee8a3b63088693f753a703ead5d6
Gerrit-Change-Number: 15957
Gerrit-PatchSet: 3
Gerrit-Owner: Ciro Santilli <[email protected]>
Gerrit-Reviewer: Andreas Sandberg <[email protected]>
Gerrit-Reviewer: Ciro Santilli <[email protected]>
Gerrit-Reviewer: Ciro Santilli <[email protected]>
Gerrit-Reviewer: Giacomo Travaglini <[email protected]>
Gerrit-MessageType: merged
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
