From 90c7e56bf407a180fb4d9b4c7721066480836473 Mon Sep 17 00:00:00 2001 From: Andreas Sandberg Date: Mon, 26 Jun 2017 14:57:51 +0100 Subject: [PATCH] config: Make ex5_*.py independent of old configs The ex5_LITTLE and ex5_big configs currently depend on Caches.py and O3_ARM_v7a.py. These aren't actual dependencies since all of the params from the caches and the old O3 model are overridden. This changeset updates the ex5 models to derive from the base SimObjects instead. Change-Id: I999e73bb9cc21ad96865c1bc0dd5973faa48ab61 Signed-off-by: Andreas Sandberg Reviewed-by: Gabor Dozsa Reviewed-on: https://gem5-review.googlesource.com/3942 Reviewed-by: Jason Lowe-Power Maintainer: Jason Lowe-Power --- configs/common/ex5_LITTLE.py | 22 ++++++++----------- configs/common/ex5_big.py | 42 ++++++++++++++++-------------------- 2 files changed, 27 insertions(+), 37 deletions(-) diff --git a/configs/common/ex5_LITTLE.py b/configs/common/ex5_LITTLE.py index c9c419f45..a866b167b 100644 --- a/configs/common/ex5_LITTLE.py +++ b/configs/common/ex5_LITTLE.py @@ -30,8 +30,6 @@ # Louisa Bessad from m5.objects import * -from O3_ARM_v7a import * -from Caches import * #----------------------------------------------------------------------- # ex5 LITTLE core (based on the ARM Cortex-A7) @@ -97,32 +95,30 @@ class ex5_LITTLE_FUP(MinorFUPool): class ex5_LITTLE(MinorCPU): executeFuncUnits = ex5_LITTLE_FUP() -class L1I(L1Cache): +class L1Cache(Cache): tag_latency = 2 data_latency = 2 response_latency = 2 + tgts_per_mshr = 8 + # Consider the L2 a victim cache also for clean lines + writeback_clean = True + +class L1I(L1Cache): mshrs = 2 size = '32kB' assoc = 2 is_read_only = True - # Writeback clean lines as well - writeback_clean = True + tgts_per_mshr = 20 class L1D(L1Cache): - tag_latency = 2 - data_latency = 2 - response_latency = 2 mshrs = 4 - tgts_per_mshr = 8 size = '32kB' assoc = 4 write_buffers = 4 - # Consider the L2 a victim cache also for clean lines - writeback_clean = True # TLB Cache # Use a cache as a L2 TLB -class WalkCache(PageTableWalkerCache): +class WalkCache(Cache): tag_latency = 2 data_latency = 2 response_latency = 2 @@ -136,7 +132,7 @@ class WalkCache(PageTableWalkerCache): writeback_clean = True # L2 Cache -class L2(L2Cache): +class L2(Cache): tag_latency = 9 data_latency = 9 response_latency = 9 diff --git a/configs/common/ex5_big.py b/configs/common/ex5_big.py index 94b35ae0b..f4ca04740 100644 --- a/configs/common/ex5_big.py +++ b/configs/common/ex5_big.py @@ -30,27 +30,25 @@ # Louisa Bessad from m5.objects import * -from O3_ARM_v7a import * -from Caches import * #----------------------------------------------------------------------- # ex5 big core (based on the ARM Cortex-A15) #----------------------------------------------------------------------- # Simple ALU Instructions have a latency of 1 -class ex5_big_Simple_Int(O3_ARM_v7a_Simple_Int): +class ex5_big_Simple_Int(FUDesc): opList = [ OpDesc(opClass='IntAlu', opLat=1) ] count = 2 # Complex ALU instructions have a variable latencies -class ex5_big_Complex_Int(O3_ARM_v7a_Complex_Int): +class ex5_big_Complex_Int(FUDesc): opList = [ OpDesc(opClass='IntMult', opLat=4, pipelined=True), OpDesc(opClass='IntDiv', opLat=11, pipelined=False), OpDesc(opClass='IprAccess', opLat=3, pipelined=True) ] count = 1 # Floating point and SIMD instructions -class ex5_big_FP(O3_ARM_v7a_FP): +class ex5_big_FP(FUDesc): opList = [ OpDesc(opClass='SimdAdd', opLat=3), OpDesc(opClass='SimdAddAcc', opLat=4), OpDesc(opClass='SimdAlu', opLat=4), @@ -81,21 +79,21 @@ class ex5_big_FP(O3_ARM_v7a_FP): # Load/Store Units -class ex5_big_Load(O3_ARM_v7a_Load): +class ex5_big_Load(FUDesc): opList = [ OpDesc(opClass='MemRead',opLat=2) ] count = 1 -class ex5_big_Store(O3_ARM_v7a_Store): +class ex5_big_Store(FUDesc): opList = [OpDesc(opClass='MemWrite',opLat=2) ] count = 1 # Functional Units for this CPU -class ex5_big_FUP(O3_ARM_v7a_FUP): +class ex5_big_FUP(FUPool): FUList = [ex5_big_Simple_Int(), ex5_big_Complex_Int(), ex5_big_Load(), ex5_big_Store(), ex5_big_FP()] # Bi-Mode Branch Predictor -class ex5_big_BP(O3_ARM_v7a_BP): +class ex5_big_BP(BiModeBP): globalPredictorSize = 4096 globalCtrBits = 2 choicePredictorSize = 1024 @@ -105,7 +103,7 @@ class ex5_big_BP(O3_ARM_v7a_BP): RASSize = 48 instShiftAmt = 2 -class ex5_big(O3_ARM_v7a_3): +class ex5_big(DerivO3CPU): LQEntries = 16 SQEntries = 16 LSQDepCheckShift = 0 @@ -148,35 +146,31 @@ class ex5_big(O3_ARM_v7a_3): switched_out = False branchPred = ex5_big_BP() -# Instruction Cache -class L1I(O3_ARM_v7a_ICache): +class L1Cache(Cache): tag_latency = 2 data_latency = 2 response_latency = 2 - mshrs = 2 tgts_per_mshr = 8 + # Consider the L2 a victim cache also for clean lines + writeback_clean = True + +# Instruction Cache +class L1I(L1Cache): + mshrs = 2 size = '32kB' assoc = 2 is_read_only = True - # Writeback clean lines as well - writeback_clean = True # Data Cache -class L1D(O3_ARM_v7a_DCache): - tag_latency = 2 - data_latency = 2 - response_latency = 2 +class L1D(L1Cache): mshrs = 6 - tgts_per_mshr = 8 size = '32kB' assoc = 2 write_buffers = 16 - # Consider the L2 a victim cache also for clean lines - writeback_clean = True # TLB Cache # Use a cache as a L2 TLB -class WalkCache(O3_ARM_v7aWalkCache): +class WalkCache(Cache): tag_latency = 4 data_latency = 4 response_latency = 4 @@ -190,7 +184,7 @@ class WalkCache(O3_ARM_v7aWalkCache): writeback_clean = True # L2 Cache -class L2(O3_ARM_v7aL2): +class L2(Cache): tag_latency = 15 data_latency = 15 response_latency = 15 -- 2.30.2