commit 06a8a473222c870ac9313d6e1eae807ba338e8d7
author Tiago Mück <tiago.muck@arm.com> Thu Jun 17 15:06:43 2021 -0500
committer Tiago Muck <tiago.muck@arm.com> Wed Sep 28 18:56:04 2022 +0000
tree 3fcf5b6ae860b4081b89831c6ff08a5b11b51be5
parent ba3aa067a31f4802e43b024d3c07b32b4dde8fd8

configs: fix CHI mem buffers

Disabling randomization for the memory request and response buffers.
CHI requires that memory responses for the same address arrive in
the same order the request was sent.

Change-Id: Ia4236188679beaf2969978675414a870ccd9f94a
Signed-off-by: Tiago Mück <tiago.muck@arm.com>
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/63673
Tested-by: kokoro <noreply+kokoro@google.com>
Maintainer: Bobby Bruce <bbruce@ucdavis.edu>
Reviewed-by: Jason Lowe-Power <power.jg@gmail.com>

configs/ruby/CHI_config.py

diff --git a/configs/ruby/CHI_config.py b/configs/ruby/CHI_config.py
index a95efec..25d4f05 100644
--- a/configs/ruby/CHI_config.py
+++ b/configs/ruby/CHI_config.py
@@ -183,6 +183,16 @@
     ordered = True
 
 
+class MemCtrlMessageBuffer(MessageBuffer):
+    """
+    MessageBuffer exchanging messages with the memory
+    These buffers should also not be affected by the Ruby tester randomization.
+    """
+
+    randomization = "disabled"
+    ordered = True
+
+
 class CHI_Cache_Controller(Cache_Controller):
     """
     Default parameters for a Cache controller
@@ -667,8 +677,8 @@
             version=Versions.getVersion(Memory_Controller),
             ruby_system=ruby_system,
             triggerQueue=TriggerMessageBuffer(),
-            responseFromMemory=MessageBuffer(),
-            requestToMemory=MessageBuffer(ordered=True),
+            responseFromMemory=MemCtrlMessageBuffer(),
+            requestToMemory=MemCtrlMessageBuffer(),
             reqRdy=TriggerMessageBuffer(),
             transitions_per_cycle=1024,
         )

src/python/gem5/components/cachehierarchies/chi/nodes/memory_controller.py

diff --git a/src/python/gem5/components/cachehierarchies/chi/nodes/memory_controller.py b/src/python/gem5/components/cachehierarchies/chi/nodes/memory_controller.py
index 4d05894..bee5e88 100644
--- a/src/python/gem5/components/cachehierarchies/chi/nodes/memory_controller.py
+++ b/src/python/gem5/components/cachehierarchies/chi/nodes/memory_controller.py
@@ -37,6 +37,16 @@
 from .abstract_node import TriggerMessageBuffer
 
 
+class MemCtrlMessageBuffer(MessageBuffer):
+    """
+    MessageBuffer exchanging messages with the memory
+    These buffers should also not be affected by the Ruby tester randomization.
+    """
+
+    randomization = "disabled"
+    ordered = True
+
+
 class MemoryController(Memory_Controller):
     """A controller that connects to memory"""
 
@@ -62,8 +72,8 @@
 
     def connectQueues(self, network):
         self.triggerQueue = TriggerMessageBuffer()
-        self.responseFromMemory = MessageBuffer()
-        self.requestToMemory = MessageBuffer(ordered=True)
+        self.responseFromMemory = MemCtrlMessageBuffer()
+        self.requestToMemory = MemCtrlMessageBuffer()
         self.reqRdy = TriggerMessageBuffer()
 
         self.reqOut = MessageBuffer()