Refactor SendMsgDescriptor related code.

Change-Id: I3469094b0d27924851166d2245f00219a6e21f18

Author: weiyu-chen

visa/BuildIR.h

@@ -1323,12 +1323,11 @@ class IR_Builder {
         unsigned regs2rcv,
         unsigned regs2snd,
         SFID funcID,
-        bool eot,
         unsigned extMsgLength,
         uint16_t extFuncCtrl,
         SendAccess access,
-        G4_Operand *bti = nullptr,
-        G4_Operand *sti = nullptr);
+        G4_Operand* bti = nullptr,
+        G4_Operand* sti = nullptr);
 
     G4_Operand* emitSampleIndexGE16(
         G4_Operand* sampler, G4_Declare* headerDecl);
@@ -1862,32 +1861,31 @@ class IR_Builder {
         unsigned option);
 
     G4_InstSend* Create_Send_Inst_For_CISA(
-                        G4_Predicate* pred,
-                        G4_DstRegRegion *postDst,
-                        G4_SrcRegRegion *payload,
-                        unsigned regs2snd,
-                        unsigned regs2rcv,
-                        unsigned execsize,
-                        unsigned fc,
-                        SFID tf_id,
-                        bool eot,
-                        bool head_present,
-                        SendAccess access,
-                        G4_Operand *bti,
-                        G4_Operand *sti,
-                        unsigned int option,
-                        bool is_sendc);
-
-    G4_InstSend* Create_SplitSend_Inst_For_CISA(G4_Predicate* pred, G4_DstRegRegion *dst,
-        G4_SrcRegRegion *src1, unsigned regs2snd1,
-        G4_SrcRegRegion *src2, unsigned regs2snd2,
+        G4_Predicate* pred,
+        G4_DstRegRegion* postDst,
+        G4_SrcRegRegion* payload,
+        unsigned regs2snd,
+        unsigned regs2rcv,
+        unsigned execsize,
+        unsigned fc,
+        SFID tf_id,
+        bool head_present,
+        SendAccess access,
+        G4_Operand* bti,
+        G4_Operand* sti,
+        unsigned int option,
+        bool is_sendc);
+
+    G4_InstSend* Create_SplitSend_Inst_For_CISA(G4_Predicate* pred, G4_DstRegRegion* dst,
+        G4_SrcRegRegion* src1, unsigned regs2snd1,
+        G4_SrcRegRegion* src2, unsigned regs2snd2,
         unsigned regs2rcv,
         unsigned execsize,
-        unsigned fc, unsigned exFuncCtrl,
-        SFID tf_id, bool eot,
+        unsigned fc,
+        SFID tf_id,
         bool head_present,
         SendAccess access,
-        G4_Operand *bti, G4_Operand *sti,
+        G4_Operand* bti, G4_Operand* sti,
         unsigned option,
         bool is_sendc);
 

visa/BuildIRImpl.cpp

@@ -145,15 +145,14 @@ G4_SendMsgDescriptor* IR_Builder::createSendMsgDesc(
     unsigned regs2rcv,
     unsigned regs2snd,
     SFID funcID,
-    bool eot,
     unsigned extMsgLength,
     uint16_t extFuncCtrl,
     SendAccess access,
     G4_Operand *bti,
     G4_Operand *sti)
 {
     G4_SendMsgDescriptor* msgDesc = new (mem) G4_SendMsgDescriptor(
-        funcCtrl, regs2rcv, regs2snd, SFIDtoInt(funcID), eot, (uint16_t) extMsgLength,
+        funcCtrl, regs2rcv, regs2snd, funcID, (uint16_t) extMsgLength,
         extFuncCtrl, access, bti, sti, *this);
     return msgDesc;
 }
@@ -842,7 +841,6 @@ G4_InstSend* IR_Builder::Create_Send_Inst_For_CISA(
     unsigned execsize,
     unsigned fc,
     SFID tf_id,
-    bool eot,
     bool header_present,
     SendAccess access,
     G4_Operand* bti,
@@ -852,7 +850,7 @@ G4_InstSend* IR_Builder::Create_Send_Inst_For_CISA(
 {
     G4_SendMsgDescriptor* msgDesc =
         createSendMsgDesc(fc, regs2rcv, regs2snd, tf_id,
-                          eot, 0, 0, access, bti, sti);
+                          0, 0, access, bti, sti);
 
     msgDesc->setHeaderPresent(header_present);
 
@@ -997,9 +995,7 @@ G4_InstSend* IR_Builder::Create_SplitSend_Inst_For_CISA(
     unsigned regs2rcv,
     unsigned execsize,
     unsigned fc,
-    unsigned exFuncCtrl,
     SFID tf_id,
-    bool eot,
     bool header_present,
     SendAccess access,
     G4_Operand* bti,
@@ -1008,8 +1004,8 @@ G4_InstSend* IR_Builder::Create_SplitSend_Inst_For_CISA(
     bool is_sendc)
 {
     G4_SendMsgDescriptor *msgDesc =
-        createSendMsgDesc(fc, regs2rcv, regs2snd1, tf_id, eot, regs2snd2,
-                          (uint16_t)exFuncCtrl, access, bti, sti);
+        createSendMsgDesc(fc, regs2rcv, regs2snd1, tf_id, regs2snd2,
+                          0, access, bti, sti);
 
     msgDesc->setHeaderPresent(header_present);
 

visa/Gen4_IR.cpp

@@ -236,7 +236,7 @@ short Operand_Type_Rank( G4_Type type )
 
 G4_SendMsgDescriptor::G4_SendMsgDescriptor(
     uint32_t fCtrl, uint32_t regs2rcv,
-    uint32_t regs2snd, uint32_t fID, bool isEot, uint16_t extMsgLen,
+    uint32_t regs2snd, SFID fID, uint16_t extMsgLen,
     uint32_t extFCtrl, SendAccess access,
     G4_Operand *bti, G4_Operand *sti,
     IR_Builder& builder)
@@ -250,14 +250,13 @@ G4_SendMsgDescriptor::G4_SendMsgDescriptor(
     desc.layout.msgLength = regs2snd;
 
     extDesc.value = 0;
-    extDesc.layout.funcID = fID;
-    extDesc.layout.eot = isEot;
+    extDesc.layout.funcID = SFIDtoInt(fID);
     extDesc.layout.extMsgLength = extMsgLen;
     extDesc.layout.extFuncCtrl = extFCtrl;
 
     src1Len = extMsgLen; // [10:6]
-    eotAfterMessage = isEot; // [5]
-    sfid = intToSFID(fID);
+    eotAfterMessage = false; // [5]
+    sfid = fID;
 
     accessType = access;
     funcCtrlValid = true;
@@ -277,11 +276,6 @@ G4_SendMsgDescriptor::G4_SendMsgDescriptor(
     uint32_t totalMaxLength = builder.getMaxSendMessageLength();
     MUST_BE_TRUE(extDesc.layout.extMsgLength + desc.layout.msgLength < totalMaxLength,
         "combined message length may not exceed the maximum");
-
-    if (extDesc.layout.extMsgLength + desc.layout.msgLength >= 16)
-    {
-        MUST_BE_TRUE(!isEot, "cm_sends can't set eot if message length is greater than 16");
-    }
 }
 
 G4_SendMsgDescriptor::G4_SendMsgDescriptor(
@@ -625,55 +619,6 @@ bool G4_SendMsgDescriptor::isHdcTypedSurfaceWrite() const
         getHdcMessageType() == DC1_TYPED_SURFACE_WRITE;
 }
 
-bool G4_SendMsgDescriptor::isReadOnlyMessage(uint32_t msgDesc,
-                                             uint32_t extDesc)
-{
-    SFID funcID = intToSFID(extDesc & 0xF);
-    unsigned subFuncID = (msgDesc >> 14) & 0x1F;
-
-    switch (funcID) {
-    default:
-        break;
-    case SFID::DP_DC:
-        switch (subFuncID) {
-        case DC_OWORD_BLOCK_READ:
-        case DC_ALIGNED_OWORD_BLOCK_READ:
-        case DC_DWORD_SCATTERED_READ:
-        case DC_BYTE_SCATTERED_READ:
-            return true;
-        default:
-            return false;
-        }
-    case SFID::DP_DC1:
-        switch (subFuncID) {
-        case DC1_UNTYPED_SURFACE_READ:
-        case DC1_MEDIA_BLOCK_READ:
-        case DC1_TYPED_SURFACE_READ:
-        case DC1_A64_SCATTERED_READ:
-        case DC1_A64_UNTYPED_SURFACE_READ:
-        case DC1_A64_BLOCK_READ:
-            return true;
-        default:
-            return false;
-        }
-    case SFID::DP_DC2:
-        switch (subFuncID) {
-        case DC2_UNTYPED_SURFACE_READ:
-        case DC2_A64_SCATTERED_READ:
-        case DC2_A64_UNTYPED_SURFACE_READ:
-        case DC2_BYTE_SCATTERED_READ:
-            return true;
-        default:
-            return false;
-        }
-    case SFID::SAMPLER:
-        return true;
-    }
-
-    // Unknown.
-    return false;
-}
-
 const char* G4_SendMsgDescriptor::getDescType() const
 {
     // Return plain text string of type of msg, ie "oword read", "oword write",

visa/Gen4_IR.hpp

@@ -300,8 +300,8 @@ class G4_SendMsgDescriptor
     static const int SLMIndex = 0xFE;
 
     G4_SendMsgDescriptor(uint32_t fCtrl, uint32_t regs2rcv, uint32_t regs2snd,
-        uint32_t fID, bool isEot, uint16_t extMsgLength, uint32_t extFCtrl,
-        SendAccess access, G4_Operand *bti, G4_Operand *sti, IR_Builder& builder);
+        SFID fID, uint16_t extMsgLength, uint32_t extFCtrl,
+        SendAccess access, G4_Operand* bti, G4_Operand* sti, IR_Builder& builder);
 
     /// Construct a object with descriptor and extended descriptor values.
     /// used in IR_Builder::createSendMsgDesc(uint32_t desc, uint32_t extDesc, SendAccess access)
@@ -378,16 +378,18 @@ class G4_SendMsgDescriptor
     }
 
     /* Info methods */
+    // common for all sends
     uint16_t ResponseLength() const { return desc.layout.rspLength; }
     uint16_t MessageLength() const { return desc.layout.msgLength; }
     uint16_t extMessageLength() const { return (uint16_t)src1Len; }
-
-    bool isCPSEnabled() const {return extDesc.layout.cps != 0;}
     bool isDataPortRead() const { return accessType != SendAccess::WRITE_ONLY; }
     bool isDataPortWrite() const { return accessType != SendAccess::READ_ONLY; }
     SendAccess getAccess() const { return accessType; }
-    bool isValidFuncCtrl() const { return funcCtrlValid;  }
-    bool isSampler() const {return getFuncId() == SFID::SAMPLER;}
+    bool isValidFuncCtrl() const { return funcCtrlValid; }
+    bool isHeaderPresent() const;
+    void setHeaderPresent(bool val);
+
+    // for HDC messages only (DC0/DC1/DC2)
     bool isHDC() const
     {
         auto funcID = getFuncId();
@@ -397,88 +399,66 @@ class G4_SendMsgDescriptor
             funcID == SFID::DP_DC2 ||
             funcID == SFID::DP_CC;
     }
-    // isHDC() must be true
-    uint32_t getHdcMessageType() const;
-
-    bool isThreadMessage() const {
-        return getFuncId() == SFID::GATEWAY || getFuncId() == SFID::SPAWNER;
-    }
 
+    uint32_t getHdcMessageType() const;
     bool isAtomicMessage() const;
     uint16_t getHdcAtomicOp() const;
 
     bool isSLMMessage() const;
 
-    bool isBarrierMsg() const;
-    bool isFence() const;
-
-    bool isSendBarrier() const {
-        return isAtomicMessage() || isBarrierMsg();  // atomic write or explicit barrier
-    }
-
-    /////////////////////////////////////////////////////////
-    // the following may only be called on HDC messages
     unsigned int getEnabledChannelNum() const;
     unsigned int getBlockNum() const;
     unsigned int getBlockSize() const;
-    // true if the message is either oword read or unaligned oword read
     bool isOwordLoad() const;
 
-    // introduced to replace direct access to desc bits
     bool isHdcTypedSurfaceWrite() const;
 
-    // TODO: this should be eliminated; it only supports a subset of messages
-    // and can produce a false negative on newer messages; it also doesn't
-    // support the SFID separate from the descriptor
-    //
-    // read-only implies that it doesn't write (e.g. an atomic)
-    static bool isReadOnlyMessage(uint32_t msgDesc, uint32_t exDesc);
-
-
     // return offset in unit of GRF
     uint16_t getScratchRWOffset() const
     {
         MUST_BE_TRUE(isScratchRW(), "Message is not scratch space R/W.");
         return (getFuncCtrl() & 0xFFFu);
     }
 
-    // number of GRFs to read/write
-    //
-    // Block Size indicates the number of simd-8 registers to be read|written.
-    //  11: 8 registers
-    //  10: 4 registers
-    //  01: 2 registers
-    //  00: 1 register
-    uint16_t getScratchRWSize() const
-    {
-        MUST_BE_TRUE(isScratchRW(), "Message is not scratch space R/W.");
-        uint16_t bitV = ((getFuncCtrl() & 0x3000u) >> 12);
-        return  0x1 << bitV;
-    }
     bool isScratchRW() const
     {
         // scratch msg: DC0, bit 18 = 1
         return getFuncId() == SFID::DP_DC && ((getFuncCtrl() & 0x40000u) != 0);
     }
     bool isScratchRead() const
     {
-        if( !isScratchRW() )
-            return false;
-        return ((getFuncCtrl() & 0x20000u) == 0);
+        return isScratchRW() && (getFuncCtrl() & 0x20000u) == 0;
     }
     bool isScratchWrite() const
     {
-        if( !isScratchRW() )
-            return false;
-        return ((getFuncCtrl ()& 0x20000u) != 0);
+        return isScratchRW() && (getFuncCtrl() & 0x20000u) != 0;
+    }
+    uint16_t getScratchRWSize() const
+    {
+        MUST_BE_TRUE(isScratchRW(), "Message is not scratch space R/W.");
+        uint16_t bitV = ((getFuncCtrl() & 0x3000u) >> 12);
+        return  0x1 << bitV;
     }
 
-    bool isHeaderPresent() const;
-    void setHeaderPresent(bool val);
+    bool isA64Message() const;
 
+    // for sampler mesasges only
+    bool isSampler() const { return getFuncId() == SFID::SAMPLER; }
+    bool isCPSEnabled() const { return extDesc.layout.cps != 0; }
     bool is16BitInput() const;
     bool is16BitReturn() const;
-    bool isA64Message() const;
+
+    bool isThreadMessage() const
+    {
+        return getFuncId() == SFID::GATEWAY || getFuncId() == SFID::SPAWNER;
+    }
+
+    bool isBarrierMsg() const;
+    bool isFence() const;
+
+    bool isSendBarrier() const {
+        return isAtomicMessage() || isBarrierMsg();  // atomic write or explicit barrier
+    }
 
     const G4_Operand *getBti() const {return m_bti;}
           G4_Operand *getBti()       {return m_bti;}

visa/GraphColor.cpp

@@ -9381,12 +9381,7 @@ int GlobalRA::coloringRegAlloc()
                 }
 
                 scratchOffset = std::max(scratchOffset, spillGRF.getNextScratchOffset());
-#ifdef FIX_SCRATCH_SPILL_MESSAGE
-                if (scratchOffset >= SCRATCH_MSG_LIMIT && useScratchMsgForSpill)
-                {
-                    spillGRF.fixSpillFillCode(&kernel);
-                }
-#endif
+
                 bool disableSpillCoalecse = builder.getOption(vISA_DisableSpillCoalescing) ||
                     builder.getOption(vISA_FastSpill) || builder.getOption(vISA_Debug) ||
                     !useScratchMsgForSpill;

visa/Optimizer.cpp

@@ -7791,7 +7791,7 @@ void genBucket(G4_INST *send, Bucket *bucket, RW rwType) {
             msgDescImm |= i;
 
             G4_SendMsgDescriptor* desc = kernel.fg.builder->createSendMsgDesc(
-                msgDescImm, 0, 1, funcID, false, msgSize, extFuncCtrl, SendAccess::WRITE_ONLY);
+                msgDescImm, 0, 1, funcID, msgSize, extFuncCtrl, SendAccess::WRITE_ONLY);
             const RegionDesc* region = kernel.fg.builder->getRegionStride1();
             G4_SrcRegRegion* headerOpnd = kernel.fg.builder->Create_Src_Opnd_From_Dcl(kernel.fg.builder->getBuiltinR0(), region);
             G4_Declare* tempDcl = builder.createHardwiredDeclare(msgSize * 8, Type_UD, i, 0);