ruby,gpu-compute: bugfix for GPU_VIPER* protocols

12db50c895 changed how directory mapping works, but it seems to have
broken the VIPER variants of the GPU protocols. The fix involves
declaring the function in the related '.sm' files.

Change-Id: I116980d42a4aa648369058b529c9f8d9693eb894
Reviewed-on: https://gem5-review.googlesource.com/8521
Reviewed-by: Anthony Gutierrez <anthony.gutierrez@amd.com>
Reviewed-by: Jason Lowe-Power <jason@lowepower.com>
Maintainer: Anthony Gutierrez <anthony.gutierrez@amd.com>

diff --git a/src/mem/protocol/GPU_VIPER-TCC.sm b/src/mem/protocol/GPU_VIPER-TCC.sm
index 45477d8d8541a6d9afabbc6aad072dcce2b4c548..f8da4abf1a8f4d5b7b52af8281676563f760cfee 100644 (file)
--- a/src/mem/protocol/GPU_VIPER-TCC.sm
+++ b/src/mem/protocol/GPU_VIPER-TCC.sm
@@ -126,6 +126,7 @@ machine(MachineType:TCC, "TCC Cache")
   void wakeUpAllBuffers();
   void wakeUpBuffers(Addr a);
 
+  MachineID mapAddressToMachine(Addr addr, MachineType mtype);
 
   // FUNCTION DEFINITIONS
   Tick clockEdge();

diff --git a/src/mem/protocol/GPU_VIPER_Region-TCC.sm b/src/mem/protocol/GPU_VIPER_Region-TCC.sm
index e3243b3e144c74bf643094bf1efa0aa990a6d7ae..04d7b7a6f49217b98f8d879e5e702dcdf94a6860 100644 (file)
--- a/src/mem/protocol/GPU_VIPER_Region-TCC.sm
+++ b/src/mem/protocol/GPU_VIPER_Region-TCC.sm
@@ -131,6 +131,7 @@ machine(MachineType:TCC, "TCC Cache")
   void wakeUpAllBuffers();
   void wakeUpBuffers(Addr a);
 
+  MachineID mapAddressToMachine(Addr addr, MachineType mtype);
 
   // FUNCTION DEFINITIONS
 

diff --git a/src/mem/protocol/MOESI_AMD_Base-Region-dir.sm b/src/mem/protocol/MOESI_AMD_Base-Region-dir.sm
index 02b21189270240c76f56d15971a7ac8cb9c0a31b..cc5ceb0b50b37cf101c3d6100aa862d2cb51cf43 100644 (file)
--- a/src/mem/protocol/MOESI_AMD_Base-Region-dir.sm
+++ b/src/mem/protocol/MOESI_AMD_Base-Region-dir.sm
@@ -210,6 +210,8 @@ machine(MachineType:Directory, "AMD_Base-like protocol")
   void wakeUpBuffers(Addr a);
   Cycles curCycle();
 
+  MachineID mapAddressToMachine(Addr addr, MachineType mtype);
+
   Entry getDirectoryEntry(Addr addr), return_by_pointer="yes" {
     Entry dir_entry := static_cast(Entry, "pointer", directory.lookup(addr));