O3: Remove hardcoded tgts_per_mshr in O3CPU.py.

There are two lines in O3CPU.py that set the dcache and icache
tgts_per_mshr to 20, ignoring any pre-configured value of tgts_per_mshr.
This patch removes these hardcoded lines from O3CPU.py and sets the default
L1 cache mshr targets to 20.

--HG--
extra : rebase_source : 6f92d950e90496a3102967442814e97dc84db08b

diff --git a/configs/common/Caches.py b/configs/common/Caches.py
index ffcd63c49696f6560663dca3714bc738aaad4ad3..0be8001d782a9735e6e6b60b009e20cc6878bc10 100644 (file)
--- a/configs/common/Caches.py
+++ b/configs/common/Caches.py
@@ -33,7 +33,7 @@ class L1Cache(BaseCache):
     block_size = 64
     latency = '1ns'
     mshrs = 10
-    tgts_per_mshr = 5
+    tgts_per_mshr = 20
     is_top_level = True
 
 class L2Cache(BaseCache):

diff --git a/src/cpu/o3/O3CPU.py b/src/cpu/o3/O3CPU.py
index 47b18a3ecdce4e2df0d3c8083d819879b52bab7d..2a5b6782fdc21d2a9739cbefd6e82a121f784f4b 100644 (file)
--- a/src/cpu/o3/O3CPU.py
+++ b/src/cpu/o3/O3CPU.py
@@ -146,7 +146,3 @@ class DerivO3CPU(BaseCPU):
     smtROBThreshold = Param.Int(100, "SMT ROB Threshold Sharing Parameter")
     smtCommitPolicy = Param.String('RoundRobin', "SMT Commit Policy")
 
-    def addPrivateSplitL1Caches(self, ic, dc, iwc = None, dwc = None):
-        BaseCPU.addPrivateSplitL1Caches(self, ic, dc, iwc, dwc)
-        self.icache.tgts_per_mshr = 20
-        self.dcache.tgts_per_mshr = 20

diff --git a/tests/configs/o3-timing-mp.py b/tests/configs/o3-timing-mp.py
index 35811282c47ad47beeea4d8edaf7ac556e2a4650..9f7c89c7b6209b07ab57c611fef393ef11ebc18f 100644 (file)
--- a/tests/configs/o3-timing-mp.py
+++ b/tests/configs/o3-timing-mp.py
@@ -38,7 +38,7 @@ class L1(BaseCache):
     latency = '1ns'
     block_size = 64
     mshrs = 4
-    tgts_per_mshr = 8
+    tgts_per_mshr = 20
     is_top_level = True
 
 # ----------------------

diff --git a/tests/configs/o3-timing.py b/tests/configs/o3-timing.py
index d4a69d94ae4b93f31744dd05e1c58906a9467bf5..fec21c177dff9278f11f4a18eee9c20c305d3e75 100644 (file)
--- a/tests/configs/o3-timing.py
+++ b/tests/configs/o3-timing.py
@@ -39,6 +39,7 @@ class MyCache(BaseCache):
 
 class MyL1Cache(MyCache):
     is_top_level = True
+    tgts_per_mshr = 20
 
 cpu = DerivO3CPU(cpu_id=0)
 cpu.addTwoLevelCacheHierarchy(MyL1Cache(size = '128kB'),

diff --git a/tests/configs/pc-o3-timing.py b/tests/configs/pc-o3-timing.py
index a4489f1924f42c7898fd7afed55e4ff88e6779a1..c697e97a9e0e56af0cce57d9b8aa3507f2f5a422 100644 (file)
--- a/tests/configs/pc-o3-timing.py
+++ b/tests/configs/pc-o3-timing.py
@@ -42,7 +42,7 @@ class L1(BaseCache):
     latency = '1ns'
     block_size = 64
     mshrs = 4
-    tgts_per_mshr = 8
+    tgts_per_mshr = 20
     is_top_level = True
 
 # ----------------------

diff --git a/tests/configs/realview-o3-dual.py b/tests/configs/realview-o3-dual.py
index 1718a76e8bdd055abdfea64df3508e763a6db01d..489b5c5b64fd25fdda73d8784c5ce947d0d7776d 100644 (file)
--- a/tests/configs/realview-o3-dual.py
+++ b/tests/configs/realview-o3-dual.py
@@ -40,7 +40,7 @@ class L1(BaseCache):
     latency = '1ns'
     block_size = 64
     mshrs = 4
-    tgts_per_mshr = 8
+    tgts_per_mshr = 20
     is_top_level = True
 
 # ----------------------

diff --git a/tests/configs/realview-o3.py b/tests/configs/realview-o3.py
index 89f320c04dc7ab157bc4a521dbfc5c6f6ada1b3f..61e7591e6261b6778097aaec4bf0ae0e06deabab 100644 (file)
--- a/tests/configs/realview-o3.py
+++ b/tests/configs/realview-o3.py
@@ -40,7 +40,7 @@ class L1(BaseCache):
     latency = '1ns'
     block_size = 64
     mshrs = 4
-    tgts_per_mshr = 8
+    tgts_per_mshr = 20
     is_top_level = True
 
 # ----------------------

diff --git a/tests/configs/tsunami-o3-dual.py b/tests/configs/tsunami-o3-dual.py
index 125e228a7191a37dc6a25c1615834fa181fd93be..786452a0905e6c2bcead967f17859c96aea1f0fd 100644 (file)
--- a/tests/configs/tsunami-o3-dual.py
+++ b/tests/configs/tsunami-o3-dual.py
@@ -40,7 +40,7 @@ class L1(BaseCache):
     latency = '1ns'
     block_size = 64
     mshrs = 4
-    tgts_per_mshr = 8
+    tgts_per_mshr = 20
     is_top_level = True
 
 # ----------------------

diff --git a/tests/configs/tsunami-o3.py b/tests/configs/tsunami-o3.py
index 13212d5d94b35ab97c5dbbd344907c24f3c83c76..8a003dad8787b9cd04ef4a0ccabe729f384e2952 100644 (file)
--- a/tests/configs/tsunami-o3.py
+++ b/tests/configs/tsunami-o3.py
@@ -40,7 +40,7 @@ class L1(BaseCache):
     latency = '1ns'
     block_size = 64
     mshrs = 4
-    tgts_per_mshr = 8
+    tgts_per_mshr = 20
     is_top_level = True
 
 # ----------------------