configs: set default cache params

It's confusing (especially to new users), when you are setting some standard
parameters (as defined in Options.py) and they aren't reflected in the simulations
so we might as well link the settings in CacheConfig.py to those in Options.py

diff --git a/configs/common/CacheConfig.py b/configs/common/CacheConfig.py
index 461551817e7cd197e1e7850e6d06eecb8e2d60d4..233f504bcfffe7aea466c3851abcf12225c44b91 100644 (file)
--- a/configs/common/CacheConfig.py
+++ b/configs/common/CacheConfig.py
@@ -35,7 +35,7 @@ from Caches import *
 
 def config_cache(options, system):
     if options.l2cache:
-        system.l2 = L2Cache(size='2MB')
+        system.l2 = L2Cache(size = options.l2_size, assoc = options.l2_assoc)
         system.tol2bus = Bus()
         system.l2.cpu_side = system.tol2bus.port
         system.l2.mem_side = system.membus.port
@@ -43,14 +43,14 @@ def config_cache(options, system):
 
     for i in xrange(options.num_cpus):
         if options.caches:
+            icache = L1Cache(size = options.l1i_size, assoc = options.l1i_assoc)
+            dcache = L1Cache(size = options.l1d_size, assoc = options.l1d_assoc)
             if buildEnv['TARGET_ISA'] == 'x86':
-                system.cpu[i].addPrivateSplitL1Caches(L1Cache(size = '32kB'),
-                                                      L1Cache(size = '64kB'),
+                system.cpu[i].addPrivateSplitL1Caches(icache, dcache,
                                                       PageTableWalkerCache(),
                                                       PageTableWalkerCache())
             else:
-                system.cpu[i].addPrivateSplitL1Caches(L1Cache(size = '32kB'),
-                                                      L1Cache(size = '64kB'))
+                system.cpu[i].addPrivateSplitL1Caches(icache, dcache)
         if options.l2cache:
             system.cpu[i].connectAllPorts(system.tol2bus, system.membus)
         else:

diff --git a/configs/common/Options.py b/configs/common/Options.py
index 7605c7d0de44dfe17e420f81cdac35fcca47f22f..e3f970676ab8b4edf4e4486d6db984c03e860c6d 100644 (file)
--- a/configs/common/Options.py
+++ b/configs/common/Options.py
@@ -38,13 +38,13 @@ parser.add_option("--clock", action="store", type="string", default='2GHz')
 parser.add_option("--num-dirs", type="int", default=1)
 parser.add_option("--num-l2caches", type="int", default=1)
 parser.add_option("--num-l3caches", type="int", default=1)
-parser.add_option("--l1d_size", type="string", default="32kB")
+parser.add_option("--l1d_size", type="string", default="64kB")
 parser.add_option("--l1i_size", type="string", default="32kB")
 parser.add_option("--l2_size", type="string", default="2MB")
 parser.add_option("--l3_size", type="string", default="16MB")
 parser.add_option("--l1d_assoc", type="int", default=2)
 parser.add_option("--l1i_assoc", type="int", default=2)
-parser.add_option("--l2_assoc", type="int", default=16)
+parser.add_option("--l2_assoc", type="int", default=8)
 parser.add_option("--l3_assoc", type="int", default=16)
 
 # Run duration options