Jason Lowe-Power has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/49430 )
Change subject: configs: Fix component classic cache prefetchers
......................................................................
configs: Fix component classic cache prefetchers
The prefetchers were instatiated as class variables instead of
instance variables. This change fixes the problem
Change-Id: I7263c9e7ddb138d2f9ad10024ea7f0e7d860dda9
Signed-off-by: Jason Lowe-Power <ja...@lowepower.com>
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/49430
Reviewed-by: Bobby R. Bruce <bbr...@ucdavis.edu>
Maintainer: Bobby R. Bruce <bbr...@ucdavis.edu>
Tested-by: kokoro <noreply+kok...@google.com>
---
M components_library/cachehierarchies/classic/caches/l1dcache.py
M components_library/cachehierarchies/classic/caches/l1icache.py
M components_library/cachehierarchies/classic/caches/l2cache.py
3 files changed, 9 insertions(+), 9 deletions(-)
Approvals:
Bobby R. Bruce: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
diff --git a/components_library/cachehierarchies/classic/caches/l1dcache.py
b/components_library/cachehierarchies/classic/caches/l1dcache.py
index 207692f..2f83905 100644
--- a/components_library/cachehierarchies/classic/caches/l1dcache.py
+++ b/components_library/cachehierarchies/classic/caches/l1dcache.py
@@ -28,7 +28,7 @@
from m5.objects import Cache, BasePrefetcher, StridePrefetcher
-from typing import Optional
+from typing import Optional, Type
class L1DCache(Cache):
@@ -46,7 +46,7 @@
mshrs: Optional[int] = 16,
tgts_per_mshr: Optional[int] = 20,
writeback_clean: Optional[bool] = True,
- prefetcher: BasePrefetcher = StridePrefetcher(),
+ PrefetcherCls: Type[BasePrefetcher] = StridePrefetcher,
):
super(L1DCache, self).__init__()
self.size = size
@@ -57,4 +57,4 @@
self.mshrs = mshrs
self.tgts_per_mshr = tgts_per_mshr
self.writeback_clean = writeback_clean
- self.prefetcher = prefetcher
+ self.prefetcher = PrefetcherCls()
diff --git a/components_library/cachehierarchies/classic/caches/l1icache.py
b/components_library/cachehierarchies/classic/caches/l1icache.py
index 960b6dc..214de41 100644
--- a/components_library/cachehierarchies/classic/caches/l1icache.py
+++ b/components_library/cachehierarchies/classic/caches/l1icache.py
@@ -24,7 +24,7 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-from typing import Optional
+from typing import Optional, Type
from m5.objects import Cache, BasePrefetcher, StridePrefetcher
@@ -46,7 +46,7 @@
mshrs: Optional[int] = 16,
tgts_per_mshr: Optional[int] = 20,
writeback_clean: Optional[bool] = True,
- prefetcher: BasePrefetcher = StridePrefetcher(),
+ PrefetcherCls: Type[BasePrefetcher] = StridePrefetcher,
):
super(L1ICache, self).__init__()
self.size = size
@@ -57,4 +57,4 @@
self.mshrs = mshrs
self.tgts_per_mshr = tgts_per_mshr
self.writeback_clean = writeback_clean
- self.prefetcher = prefetcher
+ self.prefetcher = PrefetcherCls()
diff --git a/components_library/cachehierarchies/classic/caches/l2cache.py
b/components_library/cachehierarchies/classic/caches/l2cache.py
index 2437088..bd48919 100644
--- a/components_library/cachehierarchies/classic/caches/l2cache.py
+++ b/components_library/cachehierarchies/classic/caches/l2cache.py
@@ -28,7 +28,7 @@
from m5.objects import Cache, BasePrefetcher, StridePrefetcher
-from typing import Optional
+from typing import Optional, Type
class L2Cache(Cache):
@@ -46,7 +46,7 @@
mshrs: Optional[int] = 20,
tgts_per_mshr: Optional[int] = 12,
writeback_clean: Optional[bool] = True,
- prefetcher: BasePrefetcher = StridePrefetcher(),
+ PrefetcherCls: Type[BasePrefetcher] = StridePrefetcher,
):
super(L2Cache, self).__init__()
self.size = size
@@ -57,4 +57,4 @@
self.mshrs = mshrs
self.tgts_per_mshr = tgts_per_mshr
self.writeback_clean = writeback_clean
- self.prefetcher = prefetcher
+ self.prefetcher = PrefetcherCls()
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/49430
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: I7263c9e7ddb138d2f9ad10024ea7f0e7d860dda9
Gerrit-Change-Number: 49430
Gerrit-PatchSet: 2
Gerrit-Owner: Jason Lowe-Power <power...@gmail.com>
Gerrit-Reviewer: Bobby R. Bruce <bbr...@ucdavis.edu>
Gerrit-Reviewer: Jason Lowe-Power <ja...@lowepower.com>
Gerrit-Reviewer: Jason Lowe-Power <power...@gmail.com>
Gerrit-Reviewer: kokoro <noreply+kok...@google.com>
Gerrit-MessageType: merged
_______________________________________________
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
