Jason Lowe-Power has uploaded this change for review. ( https://gem5-review.googlesource.com/c/public/gem5/+/58441 )

Change subject: mem-ruby,configs: Update AMD protos with new names
......................................................................

mem-ruby,configs: Update AMD protos with new names

Update the MOESI_AMD_Base and GPU_VIPER configuration files with the new
full protocol-specific names for the controllers instead of the
deprecated names.

Note: If you have any files which use the `CntrlBase` base, you will
likely need to update the class names that you are inheriting from.

Change-Id: I623fea7dd4cd151f7b15fe7cb43f8a4c45492d89
Signed-off-by: Jason Lowe-Power <ja...@lowepower.com>
---
M configs/ruby/GPU_VIPER.py
M configs/ruby/MOESI_AMD_Base.py
2 files changed, 25 insertions(+), 8 deletions(-)



diff --git a/configs/ruby/GPU_VIPER.py b/configs/ruby/GPU_VIPER.py
index c73995f..9f341c5 100644
--- a/configs/ruby/GPU_VIPER.py
+++ b/configs/ruby/GPU_VIPER.py
@@ -85,7 +85,7 @@
         self.assoc = assoc
         self.replacement_policy = TreePLRURP()

-class CPCntrl(CorePair_Controller, CntrlBase):
+class CPCntrl(GPU_VIPER_CorePair_Controller, CntrlBase):

     def create(self, options, ruby_system, system):
         self.version = self.versionCount()
@@ -134,7 +134,7 @@
         self.resourceStalls = options.no_tcc_resource_stalls
         self.replacement_policy = TreePLRURP()

-class TCPCntrl(TCP_Controller, CntrlBase):
+class TCPCntrl(GPU_VIPER_TCP_Controller, CntrlBase):

     def create(self, options, ruby_system, system):
         self.version = self.versionCount()
@@ -264,7 +264,7 @@
         self.replacement_policy = TreePLRURP()


-class TCCCntrl(TCC_Controller, CntrlBase):
+class TCCCntrl(GPU_VIPER_TCC_Controller, CntrlBase):
     def create(self, options, ruby_system, system):
         self.version = self.versionCount()
         self.L2cache = TCC()
@@ -293,7 +293,7 @@
         self.resourceStalls = False
         self.replacement_policy = TreePLRURP()

-class L3Cntrl(L3Cache_Controller, CntrlBase):
+class L3Cntrl(GPU_VIPER_L3Cache_Controller, CntrlBase):
     def create(self, options, ruby_system, system):
         self.version = self.versionCount()
         self.L3cache = L3Cache()
@@ -314,7 +314,7 @@
         self.probeToL3 = probe_to_l3
         self.respToL3 = resp_to_l3

-class DirCntrl(Directory_Controller, CntrlBase):
+class DirCntrl(GPU_VIPER_Directory_Controller, CntrlBase):
     def create(self, options, dir_ranges, ruby_system, system):
         self.version = self.versionCount()

diff --git a/configs/ruby/MOESI_AMD_Base.py b/configs/ruby/MOESI_AMD_Base.py
index 12b8771..0833915 100644
--- a/configs/ruby/MOESI_AMD_Base.py
+++ b/configs/ruby/MOESI_AMD_Base.py
@@ -83,7 +83,7 @@
         self.assoc = options.l2_assoc
         self.replacement_policy = TreePLRURP()

-class CPCntrl(CorePair_Controller, CntrlBase):
+class CPCntrl(MOESI_AMD_Base_CorePair_Controller, CntrlBase):

     def create(self, options, ruby_system, system):
         self.version = self.versionCount()
@@ -139,7 +139,7 @@
         self.resourceStalls = options.no_resource_stalls
         self.replacement_policy = TreePLRURP()

-class L3Cntrl(L3Cache_Controller, CntrlBase):
+class L3Cntrl(MOESI_AMD_Base_L3Cache_Controller, CntrlBase):
     def create(self, options, ruby_system, system):
         self.version = self.versionCount()
         self.L3cache = L3Cache()
@@ -161,7 +161,7 @@
         self.probeToL3 = probe_to_l3
         self.respToL3 = resp_to_l3

-class DirCntrl(Directory_Controller, CntrlBase):
+class DirCntrl(MOESI_AMD_Base_Directory_Controller, CntrlBase):
     def create(self, options, dir_ranges, ruby_system, system):
         self.version = self.versionCount()


--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/58441
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: I623fea7dd4cd151f7b15fe7cb43f8a4c45492d89
Gerrit-Change-Number: 58441
Gerrit-PatchSet: 1
Gerrit-Owner: Jason Lowe-Power <power...@gmail.com>
Gerrit-MessageType: newchange
_______________________________________________
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

Reply via email to