configs: Port CPUConfig to use the common object list
Factor out ObjectList functionality from CPUConfig. Change-Id: I34ca55142e14559e584d38b6cca3aa5c20923521 Signed-off-by: Daniel R. Carvalho <odanrc@yahoo.com.br> Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/20589 Tested-by: kokoro <noreply+kokoro@google.com> Reviewed-by: Andreas Sandberg <andreas.sandberg@arm.com> Maintainer: Andreas Sandberg <andreas.sandberg@arm.com>
This commit is contained in:
committed by
Daniel Carvalho
parent
3fee716f56
commit
c957d00dfe
@@ -45,9 +45,9 @@ import m5
|
||||
from m5.objects import *
|
||||
m5.util.addToPath('../../')
|
||||
from common.Caches import *
|
||||
from common import CpuConfig
|
||||
from common import ObjectList
|
||||
|
||||
have_kvm = "ArmV8KvmCPU" in CpuConfig.cpu_names()
|
||||
have_kvm = "ArmV8KvmCPU" in ObjectList.cpu_list.get_names()
|
||||
|
||||
class L1I(L1_ICache):
|
||||
tag_latency = 1
|
||||
@@ -169,7 +169,8 @@ class CpuCluster(SubSystem):
|
||||
|
||||
class AtomicCluster(CpuCluster):
|
||||
def __init__(self, system, num_cpus, cpu_clock, cpu_voltage="1.0V"):
|
||||
cpu_config = [ CpuConfig.get("AtomicSimpleCPU"), None, None, None, None ]
|
||||
cpu_config = [ ObjectList.cpu_list.get("AtomicSimpleCPU"), None,
|
||||
None, None, None ]
|
||||
super(AtomicCluster, self).__init__(system, num_cpus, cpu_clock,
|
||||
cpu_voltage, *cpu_config)
|
||||
def addL1(self):
|
||||
@@ -177,7 +178,8 @@ class AtomicCluster(CpuCluster):
|
||||
|
||||
class KvmCluster(CpuCluster):
|
||||
def __init__(self, system, num_cpus, cpu_clock, cpu_voltage="1.0V"):
|
||||
cpu_config = [ CpuConfig.get("ArmV8KvmCPU"), None, None, None, None ]
|
||||
cpu_config = [ ObjectList.cpu_list.get("ArmV8KvmCPU"), None, None,
|
||||
None, None ]
|
||||
super(KvmCluster, self).__init__(system, num_cpus, cpu_clock,
|
||||
cpu_voltage, *cpu_config)
|
||||
def addL1(self):
|
||||
|
||||
Reference in New Issue
Block a user