Internal feature

Change-Id: I32d0b36ba1d3f6baf213c700df06a983db5ab43a

Author: trbauer

visa/Gen4_IR.cpp

@@ -370,16 +370,18 @@ static bool isFloatAtomicMessage(SFID funcID, uint16_t msgType)
 
 bool G4_SendMsgDescriptor::isAtomicMessage() const
 {
+
     auto funcID = getFuncId();
     if (!isHDC())
         return false; // guard getMessageType() on SFID without a message type
     uint16_t msgType = getHdcMessageType();
     return isIntAtomicMessage(funcID,msgType) ||
-      isFloatAtomicMessage(funcID,msgType);
+        isFloatAtomicMessage(funcID,msgType);
 }
 
-uint16_t G4_SendMsgDescriptor::getAtomicOp() const
+uint16_t G4_SendMsgDescriptor::getHdcAtomicOp() const
 {
+    MUST_BE_TRUE(isHDC(),"must be HDC message");
     MUST_BE_TRUE(isAtomicMessage(), "getting atomicOp from non-atomic message!");
     uint32_t funcCtrl = getFuncCtrl();
     if (isIntAtomicMessage(getFuncId(), getHdcMessageType()))
@@ -423,6 +425,33 @@ bool G4_SendMsgDescriptor::isSLMMessage() const
     return false;
 }
 
+bool G4_SendMsgDescriptor::isBarrierMsg() const
+{
+    auto funcID = getFuncId();
+    uint32_t funcCtrl = getFuncCtrl();
+    return funcID == SFID::GATEWAY && (funcCtrl & 0xFF) == 0x4;
+}
+
+bool G4_SendMsgDescriptor::isFence() const
+{
+
+    SFID sfid = getFuncId();
+    unsigned FC = getFuncCtrl();
+
+    // Memory Fence
+    if (sfid == SFID::DP_DC && ((FC >> 14) & 0x1F) == DC_MEMORY_FENCE)
+    {
+        return true;
+    }
+
+    // Sampler cache flush
+    if (sfid == SFID::SAMPLER && ((FC >> 12) & 0x1F) == 0x1F)
+    {
+        return true;
+    }
+
+    return false;
+}
 
 bool G4_SendMsgDescriptor::isHeaderPresent() const {
 

visa/Gen4_IR.hpp

@@ -396,16 +396,13 @@ class G4_SendMsgDescriptor
     }
 
     bool isAtomicMessage() const;
-    uint16_t getAtomicOp() const;
+    uint16_t getHdcAtomicOp() const;
 
     bool isSLMMessage() const;
 
-    bool isBarrierMsg() const
-    {
-        auto funcID = getFuncId();
-        uint32_t funcCtrl = getFuncCtrl();
-        return funcID == SFID::GATEWAY && (funcCtrl & 0xFF) == 0x4;
-    }
+    bool isBarrierMsg() const;
+    bool isFence() const;
+
     bool isSendBarrier() const {
         return isAtomicMessage() || isBarrierMsg();  // atomic write or explicit barrier
     }
@@ -1357,29 +1354,9 @@ class G4_InstSend : public G4_INST
         return canEOT;
     }
 
-    bool isFence() const
-    {
-        G4_SendMsgDescriptor *MD = getMsgDesc();
-        SFID sfid = MD->getFuncId();
-        unsigned FC = MD->getFuncCtrl();
-
-        // Memory Fence
-        if (sfid == SFID::DP_DC && ((FC >> 14) & 0x1F) == DC_MEMORY_FENCE)
-        {
-            return true;
-        }
+    bool isFence() const {return getMsgDesc()->isFence();}
 
-        // Sampler cache flush
-        if (sfid == SFID::SAMPLER && ((FC >> 12) & 0x1F) == 0x1F)
-        {
-            return true;
-        }
-
-        return false;
-    }
-
-    bool isEOT() const override
-    {
+    bool isEOT() const override {
         return msgDesc->isEOTInst();
     }
 

visa/SendFusion.cpp

@@ -247,7 +247,7 @@ bool SendFusion::isAtomicCandidate(G4_SendMsgDescriptor* msgDesc)
     }
 
     // Had right atomic type, now check AtomicOp
-    uint16_t atomicOp = msgDesc->getAtomicOp();
+    uint16_t atomicOp = msgDesc->getHdcAtomicOp();
     if (intAtomic)
     {
         switch (atomicOp)