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 <andreas.sandberg@arm.com>
Reviewed-by: Nikos Nikoleris <nikos.nikoleris@arm.com>
Reviewed-on: https://gem5-review.googlesource.com/4360
Reviewed-by: Jason Lowe-Power <jason@lowepower.com>

diff --git a/configs/example/arm/devices.py b/configs/example/arm/devices.py
index 467d2b919aed6c625c337c09b0977f0d39c1eb75..15492cb9bc62962714c7fc8dbef5cc2fff82c92e 100644 (file)
--- a/configs/example/arm/devices.py
+++ b/configs/example/arm/devices.py
@@ -44,7 +44,7 @@ m5.util.addToPath('../../')
 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 CpuCluster(SubSystem):
 
 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 AtomicCluster(CpuCluster):
 
 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):