diff --git a/configs/example/arm/ruby_fs.py b/configs/example/arm/ruby_fs.py index c2fc226fd9..ecca22b048 100644 --- a/configs/example/arm/ruby_fs.py +++ b/configs/example/arm/ruby_fs.py @@ -46,7 +46,7 @@ from common import MemConfig from common import ObjectList from common import Options from common import SysPaths -from common.cores.arm import HPI +from common.cores.arm import O3_ARM_v7a, HPI from ruby import Ruby import devices @@ -62,6 +62,7 @@ cpu_types = { "noncaching" : NonCachingSimpleCPU, "minor" : MinorCPU, "hpi" : HPI.HPI, + "o3" : O3_ARM_v7a.O3_ARM_v7a_3, } def create_cow_image(name): diff --git a/configs/example/arm/starter_fs.py b/configs/example/arm/starter_fs.py index a5a013f1af..140f102a83 100644 --- a/configs/example/arm/starter_fs.py +++ b/configs/example/arm/starter_fs.py @@ -1,4 +1,4 @@ -# Copyright (c) 2016-2017, 2020 ARM Limited +# Copyright (c) 2016-2017, 2020, 2022 Arm Limited # All rights reserved. # # The license below extends only to copyright in the software and shall @@ -50,7 +50,7 @@ m5.util.addToPath('../..') from common import SysPaths from common import ObjectList from common import MemConfig -from common.cores.arm import HPI +from common.cores.arm import O3_ARM_v7a, HPI import devices @@ -61,17 +61,19 @@ default_root_device = '/dev/vda1' # Pre-defined CPU configurations. Each tuple must be ordered as : (cpu_class, -# l1_icache_class, l1_dcache_class, walk_cache_class, l2_Cache_class). Any of +# l1_icache_class, l1_dcache_class, l2_Cache_class). Any of # the cache class may be 'None' if the particular cache is not present. cpu_types = { - - "atomic" : ( AtomicSimpleCPU, None, None, None), + "atomic" : (AtomicSimpleCPU, None, None, None), "minor" : (MinorCPU, devices.L1I, devices.L1D, devices.L2), - "hpi" : ( HPI.HPI, - HPI.HPI_ICache, HPI.HPI_DCache, - HPI.HPI_L2) + "hpi" : (HPI.HPI, + HPI.HPI_ICache, HPI.HPI_DCache, + HPI.HPI_L2), + "o3" : (O3_ARM_v7a.O3_ARM_v7a_3, + O3_ARM_v7a.O3_ARM_v7a_ICache, O3_ARM_v7a.O3_ARM_v7a_DCache, + O3_ARM_v7a.O3_ARM_v7aL2), } def create_cow_image(name):