Andreas Sandberg has submitted this change and it was merged. (
https://gem5-review.googlesource.com/4360 )
Change subject: arm, config: Fix CPU names in ARM example configs
......................................................................
arm, config: Fix CPU names in ARM example configs
The ARM example configs used to rely on CPU aliases for the
AtomicSimpleCPU and KVM when configuring clusters. This broken when
support for CPU aliases was removed ('config: Remove support for CPU
aliases.'). This change updates the config scripts to use the full
class names instead.
Change-Id: If36c46207f39ca1897ecf77d9588f1c059819e63
Signed-off-by: Andreas Sandberg <[email protected]>
Reviewed-by: Nikos Nikoleris <[email protected]>
Reviewed-on: https://gem5-review.googlesource.com/4360
Reviewed-by: Jason Lowe-Power <[email protected]>
---
M configs/example/arm/devices.py
1 file changed, 3 insertions(+), 3 deletions(-)
Approvals:
Jason Lowe-Power: Looks good to me, approved
Andreas Sandberg: Looks good to me, approved
diff --git a/configs/example/arm/devices.py b/configs/example/arm/devices.py
index 467d2b9..15492cb 100644
--- a/configs/example/arm/devices.py
+++ b/configs/example/arm/devices.py
@@ -44,7 +44,7 @@
from common.Caches import *
from common import CpuConfig
-have_kvm = "kvm" in CpuConfig.cpu_names()
+have_kvm = "ArmV8KvmCPU" in CpuConfig.cpu_names()
class L1I(L1_ICache):
tag_latency = 1
@@ -166,7 +166,7 @@
class AtomicCluster(CpuCluster):
def __init__(self, system, num_cpus, cpu_clock, cpu_voltage="1.0V"):
- cpu_config = [ CpuConfig.get("atomic"), None, None, None, None ]
+ cpu_config = [ CpuConfig.get("AtomicSimpleCPU"), None, None, None,
None ]
super(AtomicCluster, self).__init__(system, num_cpus, cpu_clock,
cpu_voltage, *cpu_config)
def addL1(self):
@@ -174,7 +174,7 @@
class KvmCluster(CpuCluster):
def __init__(self, system, num_cpus, cpu_clock, cpu_voltage="1.0V"):
- cpu_config = [ CpuConfig.get("kvm"), None, None, None, None ]
+ cpu_config = [ CpuConfig.get("ArmV8KvmCPU"), None, None, None,
None ]
super(KvmCluster, self).__init__(system, num_cpus, cpu_clock,
cpu_voltage, *cpu_config)
def addL1(self):
--
To view, visit https://gem5-review.googlesource.com/4360
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: If36c46207f39ca1897ecf77d9588f1c059819e63
Gerrit-Change-Number: 4360
Gerrit-PatchSet: 2
Gerrit-Owner: Andreas Sandberg <[email protected]>
Gerrit-Reviewer: Andreas Sandberg <[email protected]>
Gerrit-Reviewer: Curtis Dunham <[email protected]>
Gerrit-Reviewer: Jason Lowe-Power <[email protected]>
Gerrit-Reviewer: Nikos Nikoleris <[email protected]>
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
