mem: remove acq/rel cmds from packet and add mem fence req

diff --git a/src/mem/packet.cc b/src/mem/packet.cc
index c79deb680b03eb995d292b186aa6a96ea4270583..78b32a25fecf20031e32cd4c4e7f098bcfc30c86 100644 (file)
--- a/src/mem/packet.cc
+++ b/src/mem/packet.cc
@@ -170,14 +170,10 @@ MemCmd::commandInfo[] =
         MessageResp, "MessageReq" },
     /* IntResp -- for interrupts */
     { SET2(IsWrite, IsResponse), InvalidCmd, "MessageResp" },
-    /* ReleaseReq -- for release synchronization */
-    { SET2(IsRequest, NeedsResponse), ReleaseResp, "ReleaseReq" },
-    /* ReleaseResp -- for release synchronization */
-    { SET1(IsResponse), InvalidCmd, "ReleaseResp" },
-    /* AcquireReq -- for release synchronization */
-    { SET2(IsRequest, NeedsResponse), AcquireResp, "AcquireReq" },
-    /* AcquireResp -- for release synchronization */
-    { SET2(IsResponse, NeedsResponse), InvalidCmd, "AcquireResp" },
+    /* MemFenceReq -- for synchronization requests */
+    {SET2(IsRequest, NeedsResponse), MemFenceResp, "MemFenceReq"},
+    /* MemFenceResp -- for synchronization responses */
+    {SET1(IsResponse), InvalidCmd, "MemFenceResp"},
     /* InvalidDestError  -- packet dest field invalid */
     { SET2(IsResponse, IsError), InvalidCmd, "InvalidDestError" },
     /* BadAddressError   -- memory address invalid */

diff --git a/src/mem/packet.hh b/src/mem/packet.hh
index d1c285f04afd245d6969acdcb5a42b56d4000049..12295555dcd7fc597afdee7e8cc400092352f429 100644 (file)
--- a/src/mem/packet.hh
+++ b/src/mem/packet.hh
@@ -111,10 +111,8 @@ class MemCmd
         SwapResp,
         MessageReq,
         MessageResp,
-        ReleaseReq,
-        ReleaseResp,
-        AcquireReq,
-        AcquireResp,
+        MemFenceReq,
+        MemFenceResp,
         // Error responses
         // @TODO these should be classified as responses rather than
         // requests; coding them as requests initially for backwards