Davide Basilio Bartolini has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/36897 )
Change subject: configs: Do not require default options for caches
......................................................................
configs: Do not require default options for caches
This change is useful when using custom simulation scripts that do not
rely on configs/common/Options.py.
Without this change, the custom script always needed to provide some
value for cache sizes and HW prefetchers configuration; with this change
it is possible to provide no value and use what is defined in the core
configuration as default.
Change-Id: I21051be91daf29e3c1878385b9cbcd6c71386038
---
M configs/common/CacheConfig.py
1 file changed, 27 insertions(+), 32 deletions(-)
diff --git a/configs/common/CacheConfig.py b/configs/common/CacheConfig.py
index 05c38e0..bd80c1a 100644
--- a/configs/common/CacheConfig.py
+++ b/configs/common/CacheConfig.py
@@ -48,6 +48,30 @@
from common.Caches import *
from common import ObjectList
+def _get_hwp(hwp_option):
+ if hwp_option == None:
+ return NULL
+
+ hwpClass = ObjectList.hwp_list.get(hwp_option)
+ return hwpClass()
+
+def _get_cache_opts(level, options):
+ opts = {}
+
+ size_attr = '{}_size'.format(level)
+ if hasattr(options, size_attr):
+ opts['size'] = getattr(options, size_attr)
+
+ assoc_attr = '{}_assoc'.format(level)
+ if hasattr(options, assoc_attr):
+ opts['assoc'] = getattr(options, assoc_attr)
+
+ prefetcher_attr = '{}_hwp_type'.format(level)
+ if hasattr(options, prefetcher_attr):
+ opts['prefetcher'] = _get_hwp(getattr(options, prefetcher_attr))
+
+ return opts
+
def config_cache(options, system):
if options.external_memory_system and (options.caches or
options.l2cache):
print("External caches and internal caches are exclusive
options.\n")
@@ -98,30 +122,19 @@
# are not connected using addTwoLevelCacheHierarchy. Use the
# same clock as the CPUs.
system.l2 = l2_cache_class(clk_domain=system.cpu_clk_domain,
- size=options.l2_size,
- assoc=options.l2_assoc)
+ **_get_cache_opts('l2', options))
system.tol2bus = L2XBar(clk_domain = system.cpu_clk_domain)
system.l2.cpu_side = system.tol2bus.master
system.l2.mem_side = system.membus.slave
- if options.l2_hwp_type:
- hwpClass = ObjectList.hwp_list.get(options.l2_hwp_type)
- if system.l2.prefetcher != "Null":
- print("Warning: l2-hwp-type is set (", hwpClass, "), but",
- "the current l2 has a default Hardware Prefetcher",
- "of type", type(system.l2.prefetcher), ", using the",
- "specified by the flag option.")
- system.l2.prefetcher = hwpClass()
if options.memchecker:
system.memchecker = MemChecker()
for i in range(options.num_cpus):
if options.caches:
- icache = icache_class(size=options.l1i_size,
- assoc=options.l1i_assoc)
- dcache = dcache_class(size=options.l1d_size,
- assoc=options.l1d_assoc)
+ icache = icache_class(**_get_cache_opts('l1i', options))
+ dcache = dcache_class(**_get_cache_opts('l1d', options))
# If we have a walker cache specified, instantiate two
# instances here
@@ -147,24 +160,6 @@
# Let CPU connect to monitors
dcache = dcache_mon
- if options.l1d_hwp_type:
- hwpClass = ObjectList.hwp_list.get(options.l1d_hwp_type)
- if dcache.prefetcher != m5.params.NULL:
- print("Warning: l1d-hwp-type is set (", hwpClass, "),
but",
- "the current l1d has a default Hardware
Prefetcher",
- "of type", type(dcache.prefetcher), ", using
the",
- "specified by the flag option.")
- dcache.prefetcher = hwpClass()
-
- if options.l1i_hwp_type:
- hwpClass = ObjectList.hwp_list.get(options.l1i_hwp_type)
- if icache.prefetcher != m5.params.NULL:
- print("Warning: l1i-hwp-type is set (", hwpClass, "),
but",
- "the current l1i has a default Hardware
Prefetcher",
- "of type", type(icache.prefetcher), ", using
the",
- "specified by the flag option.")
- icache.prefetcher = hwpClass()
-
# When connecting the caches, the clock is also inherited
# from the CPU in question
system.cpu[i].addPrivateSplitL1Caches(icache, dcache,
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/36897
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: I21051be91daf29e3c1878385b9cbcd6c71386038
Gerrit-Change-Number: 36897
Gerrit-PatchSet: 1
Gerrit-Owner: Davide Basilio Bartolini <davide.basilio.bartol...@huawei.com>
Gerrit-MessageType: newchange
_______________________________________________
gem5-dev mailing list -- gem5-dev@gem5.org
To unsubscribe send an email to gem5-dev-le...@gem5.org
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s
