diff options
Diffstat (limited to 'configs/example/arm')
| -rw-r--r-- | configs/example/arm/devices.py | 10 | ||||
| -rw-r--r-- | configs/example/arm/fs_bigLITTLE.py | 19 |
2 files changed, 16 insertions, 13 deletions
diff --git a/configs/example/arm/devices.py b/configs/example/arm/devices.py index ff7a2a136..4d746edef 100644 --- a/configs/example/arm/devices.py +++ b/configs/example/arm/devices.py @@ -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): diff --git a/configs/example/arm/fs_bigLITTLE.py b/configs/example/arm/fs_bigLITTLE.py index dcc2a5dce..a1ad2ce73 100644 --- a/configs/example/arm/fs_bigLITTLE.py +++ b/configs/example/arm/fs_bigLITTLE.py @@ -53,7 +53,7 @@ from m5.objects import * m5.util.addToPath("../../") from common import SysPaths -from common import CpuConfig +from common import ObjectList from common import PlatformConfig from common.cores.arm import ex5_big, ex5_LITTLE @@ -85,32 +85,33 @@ def _using_pdes(root): class BigCluster(devices.CpuCluster): def __init__(self, system, num_cpus, cpu_clock, cpu_voltage="1.0V"): - cpu_config = [ CpuConfig.get("O3_ARM_v7a_3"), devices.L1I, devices.L1D, - devices.WalkCache, devices.L2 ] + cpu_config = [ ObjectList.cpu_list.get("O3_ARM_v7a_3"), + devices.L1I, devices.L1D, devices.WalkCache, devices.L2 ] super(BigCluster, self).__init__(system, num_cpus, cpu_clock, cpu_voltage, *cpu_config) class LittleCluster(devices.CpuCluster): def __init__(self, system, num_cpus, cpu_clock, cpu_voltage="1.0V"): - cpu_config = [ CpuConfig.get("MinorCPU"), devices.L1I, devices.L1D, - devices.WalkCache, devices.L2 ] + cpu_config = [ ObjectList.cpu_list.get("MinorCPU"), devices.L1I, + devices.L1D, devices.WalkCache, devices.L2 ] super(LittleCluster, self).__init__(system, num_cpus, cpu_clock, cpu_voltage, *cpu_config) class Ex5BigCluster(devices.CpuCluster): def __init__(self, system, num_cpus, cpu_clock, cpu_voltage="1.0V"): - cpu_config = [ CpuConfig.get("ex5_big"), ex5_big.L1I, ex5_big.L1D, - ex5_big.WalkCache, ex5_big.L2 ] + cpu_config = [ ObjectList.cpu_list.get("ex5_big"), ex5_big.L1I, + ex5_big.L1D, ex5_big.WalkCache, ex5_big.L2 ] super(Ex5BigCluster, self).__init__(system, num_cpus, cpu_clock, cpu_voltage, *cpu_config) class Ex5LittleCluster(devices.CpuCluster): def __init__(self, system, num_cpus, cpu_clock, cpu_voltage="1.0V"): - cpu_config = [ CpuConfig.get("ex5_LITTLE"), ex5_LITTLE.L1I, - ex5_LITTLE.L1D, ex5_LITTLE.WalkCache, ex5_LITTLE.L2 ] + cpu_config = [ ObjectList.cpu_list.get("ex5_LITTLE"), + ex5_LITTLE.L1I, ex5_LITTLE.L1D, ex5_LITTLE.WalkCache, + ex5_LITTLE.L2 ] super(Ex5LittleCluster, self).__init__(system, num_cpus, cpu_clock, cpu_voltage, *cpu_config) |