From 9cbe1cb653428a2298644579ddf82c46272683d4 Mon Sep 17 00:00:00 2001 From: Andreas Hansson Date: Tue, 30 Oct 2012 07:44:08 -0400 Subject: config: Unify caches used in regressions and adjust L2 MSHRs This patch unified the L1 and L2 caches used throughout the regressions instead of declaring different, but very similar, configurations in the different scripts. The patch also changes the default L2 configuration to match what it used to be for the fs and se scripts (until the last patch that updated the regressions to also make use of the cache config). The MSHRs and targets per MSHR are now set to a more realistic default of 20 and 12, respectively. As a result of both the aforementioned changes, many of the regression stats are changed. A follow-on patch will bump the stats. --- tests/configs/o3-timing.py | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) (limited to 'tests/configs/o3-timing.py') diff --git a/tests/configs/o3-timing.py b/tests/configs/o3-timing.py index b9bc40bc2..30c2f413e 100644 --- a/tests/configs/o3-timing.py +++ b/tests/configs/o3-timing.py @@ -29,23 +29,12 @@ import m5 from m5.objects import * m5.util.addToPath('../configs/common') - -class MyCache(BaseCache): - assoc = 2 - block_size = 64 - hit_latency = 2 - response_latency = 2 - mshrs = 10 - tgts_per_mshr = 5 - -class MyL1Cache(MyCache): - is_top_level = True - tgts_per_mshr = 20 +from Caches import * cpu = DerivO3CPU(cpu_id=0) -cpu.addTwoLevelCacheHierarchy(MyL1Cache(size = '128kB'), - MyL1Cache(size = '256kB'), - MyCache(size = '2MB')) +cpu.addTwoLevelCacheHierarchy(L1Cache(size = '128kB'), + L1Cache(size = '256kB'), + L2Cache(size = '2MB')) # @todo Note that the L2 latency here is unmodified and 2 cycles, # should set hit latency and response latency to 20 cycles as for # other scripts -- cgit v1.2.3