Refactor the message access type (read/write/both) in SendMsgDescriptor

Change-Id: I17167a75eb4d2c5623f4aff73aeabc18147b0983

Author: weiyu-chen

visa/BuildIR.h

@@ -1257,8 +1257,7 @@ class IR_Builder {
     // so we can avoid having to explicitly create extDesc bits
     G4_SendMsgDescriptor* createGeneralMsgDesc(uint32_t desc,
         uint32_t extDesc,
-        bool isRead,
-        bool isWrite,
+        SendAccess access,
         G4_Operand* bti = nullptr,
         G4_Operand* sti = nullptr,
         bool isValidFuncCtrl = true);
@@ -1290,8 +1289,7 @@ class IR_Builder {
         uint32_t desc,
         uint32_t extDesc,
         int src1Len,
-        bool isRead,
-        bool isWrite,
+        SendAccess access,
         G4_Operand *bti,
         bool isValidFuncCtrl = true);
 
@@ -1303,8 +1301,7 @@ class IR_Builder {
         bool eot,
         unsigned extMsgLength,
         uint16_t extFuncCtrl,
-        bool isRead,
-        bool isWrite,
+        SendAccess access,
         G4_Operand *bti = nullptr,
         G4_Operand *sti = nullptr);
 
@@ -1784,8 +1781,7 @@ class IR_Builder {
                         SFID tf_id,
                         bool eot,
                         bool head_present,
-                        bool isRead,
-                        bool isWrite,
+                        SendAccess access,
                         G4_Operand *bti,
                         G4_Operand *sti,
                         unsigned int option,
@@ -1799,8 +1795,7 @@ class IR_Builder {
         unsigned fc, unsigned exFuncCtrl,
         SFID tf_id, bool eot,
         bool head_present,
-        bool isRead,
-        bool isWrite,
+        SendAccess access,
         G4_Operand *bti, G4_Operand *sti,
         unsigned option,
         bool is_sendc);

visa/BuildIRImpl.cpp

@@ -120,26 +120,24 @@ RegionDesc* RegionPool::createRegion(uint16_t vstride, uint16_t width, uint16_t
 G4_SendMsgDescriptor* IR_Builder::createGeneralMsgDesc(
     uint32_t desc,
     uint32_t extDesc,
-    bool isRead,
-    bool isWrite,
+    SendAccess access,
     G4_Operand* bti,
     G4_Operand* sti,
     bool isValidFuncCtrl)
 {
-    return new (mem) G4_SendMsgDescriptor(desc, extDesc, isRead, isWrite, bti, sti, isValidFuncCtrl);
+    return new (mem) G4_SendMsgDescriptor(desc, extDesc, access, bti, sti, isValidFuncCtrl);
 }
 
 G4_SendMsgDescriptor* IR_Builder::createSendMsgDesc(
     SFID sfid,
     uint32_t desc,
     uint32_t extDesc,
     int src1Len,
-    bool isRead,
-    bool isWrite,
+    SendAccess access,
     G4_Operand *bti,
     bool isValidFuncCtrl)
 {
-    return new (mem) G4_SendMsgDescriptor(sfid, desc, extDesc, src1Len, isRead, isWrite, bti, isValidFuncCtrl);
+    return new (mem) G4_SendMsgDescriptor(sfid, desc, extDesc, src1Len, access, bti, isValidFuncCtrl);
 }
 
 G4_SendMsgDescriptor* IR_Builder::createSendMsgDesc(
@@ -150,14 +148,13 @@ G4_SendMsgDescriptor* IR_Builder::createSendMsgDesc(
     bool eot,
     unsigned extMsgLength,
     uint16_t extFuncCtrl,
-    bool isRead,
-    bool isWrite,
+    SendAccess access,
     G4_Operand *bti,
     G4_Operand *sti)
 {
     G4_SendMsgDescriptor* msgDesc = new (mem) G4_SendMsgDescriptor(
         funcCtrl, regs2rcv, regs2snd, SFIDtoInt(funcID), eot, (uint16_t) extMsgLength,
-        extFuncCtrl, isRead, isWrite, bti, sti, *this);
+        extFuncCtrl, access, bti, sti, *this);
     return msgDesc;
 }
 
@@ -169,7 +166,7 @@ G4_SendMsgDescriptor* IR_Builder::createReadMsgDesc(SFID sfid,
 {
     //ToDo: move extDesc into SendMsgDesc ctor
     uint32_t extDesc = G4_SendMsgDescriptor::createExtDesc(sfid);
-    return new (mem) G4_SendMsgDescriptor(sfid, desc, extDesc, 0, true, false, bti, true);
+    return new (mem) G4_SendMsgDescriptor(sfid, desc, extDesc, 0, SendAccess::READ_ONLY, bti, true);
 }
 
 G4_SendMsgDescriptor* IR_Builder::createWriteMsgDesc(SFID sfid,
@@ -179,14 +176,14 @@ G4_SendMsgDescriptor* IR_Builder::createWriteMsgDesc(SFID sfid,
 {
     //ToDo: move extDesc into SendMsgDesc ctor
     uint32_t extDesc = G4_SendMsgDescriptor::createExtDesc(sfid, false, src1Len);
-    return new (mem) G4_SendMsgDescriptor(sfid, desc, extDesc, src1Len, false, true, bti, true);
+    return new (mem) G4_SendMsgDescriptor(sfid, desc, extDesc, src1Len, SendAccess::WRITE_ONLY, bti, true);
 }
 
 G4_SendMsgDescriptor* IR_Builder::createSyncMsgDesc(SFID sfid, uint32_t desc)
 {
     //ToDo: move extDesc into SendMsgDesc ctor
     uint32_t extDesc = G4_SendMsgDescriptor::createExtDesc(sfid);
-    return new (mem) G4_SendMsgDescriptor(sfid, desc, extDesc, 0, true, true, nullptr, true);
+    return new (mem) G4_SendMsgDescriptor(sfid, desc, extDesc, 0, SendAccess::READ_WRITE, nullptr, true);
 }
 
 G4_SendMsgDescriptor* IR_Builder::createSampleMsgDesc(
@@ -203,7 +200,7 @@ G4_SendMsgDescriptor* IR_Builder::createSampleMsgDesc(
     {
         extDesc |= 1 << CPS_LOD_COMPENSATION_ENABLE;
     }
-    return new (mem) G4_SendMsgDescriptor(desc, extDesc, true, false, bti, sti, true);
+    return new (mem) G4_SendMsgDescriptor(desc, extDesc, SendAccess::READ_ONLY, bti, sti, true);
 }
 
 G4_Operand* IR_Builder::emitSampleIndexGE16(
@@ -820,16 +817,15 @@ G4_InstSend* IR_Builder::Create_Send_Inst_For_CISA(
     SFID tf_id,
     bool eot,
     bool header_present,
-    bool isRead,
-    bool isWrite,
+    SendAccess access,
     G4_Operand* bti,
     G4_Operand* sti,
     unsigned int option,
     bool is_sendc)
 {
     G4_SendMsgDescriptor* msgDesc =
         createSendMsgDesc(fc, regs2rcv, regs2snd, tf_id,
-                          eot, 0, 0, isRead, isWrite, bti, sti);
+                          eot, 0, 0, access, bti, sti);
 
     msgDesc->setHeaderPresent(header_present);
 
@@ -990,16 +986,15 @@ G4_InstSend* IR_Builder::Create_SplitSend_Inst_For_CISA(
     SFID tf_id,
     bool eot,
     bool header_present,
-    bool isRead,
-    bool isWrite,
+    SendAccess access,
     G4_Operand* bti,
     G4_Operand* sti,
     unsigned int option,
     bool is_sendc)
 {
     G4_SendMsgDescriptor *msgDesc =
         createSendMsgDesc(fc, regs2rcv, regs2snd1, tf_id, eot, regs2snd2,
-                          (uint16_t)exFuncCtrl, isRead, isWrite, bti, sti);
+                          (uint16_t)exFuncCtrl, access, bti, sti);
 
     msgDesc->setHeaderPresent(header_present);
 

visa/FlowGraph.cpp

@@ -3851,7 +3851,7 @@ void G4_BB::addEOTSend(G4_INST* lastInst)
 
     G4_DstRegRegion *sendDst = builder->createNullDst(Type_UD);
 
-    auto msgDesc = builder->createGeneralMsgDesc(desc, exdesc, false, true);
+    auto msgDesc = builder->createGeneralMsgDesc(desc, exdesc, SendAccess::WRITE_ONLY);
     G4_INST* sendInst = builder->createSendInst(
         NULL,
         G4_send,

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 extFCtrl, bool isRead, bool isWrite,
+    uint32_t extFCtrl, SendAccess access,
     G4_Operand *bti, G4_Operand *sti,
     IR_Builder& builder)
 {
@@ -258,8 +258,7 @@ G4_SendMsgDescriptor::G4_SendMsgDescriptor(
     eotAfterMessage = isEot; // [5]
     sfid = intToSFID(fID);
 
-    readMsg = isRead;
-    writeMsg = isWrite;
+    accessType = access;
     funcCtrlValid = true;
 
 
@@ -287,12 +286,11 @@ G4_SendMsgDescriptor::G4_SendMsgDescriptor(
 
 G4_SendMsgDescriptor::G4_SendMsgDescriptor(
     uint32_t descBits, uint32_t extDescBits,
-    bool isRead,
-    bool isWrite,
+    SendAccess access,
     G4_Operand *bti,
     G4_Operand *sti,
     bool isValidFuncCtrl)
-    : readMsg(isRead), writeMsg(isWrite), m_sti(sti), m_bti(bti), funcCtrlValid(isValidFuncCtrl)
+    : accessType(access), m_sti(sti), m_bti(bti), funcCtrlValid(isValidFuncCtrl)
 {
     desc.value = descBits;
     extDesc.value = extDescBits;
@@ -316,11 +314,10 @@ G4_SendMsgDescriptor::G4_SendMsgDescriptor(
     uint32_t _desc,
     uint32_t _extDesc,
     int _src1Len,
-    bool isRead,
-    bool isWrite,
+    SendAccess access,
     G4_Operand *bti,
     bool isValidFuncCtrl)
-    : readMsg(isRead), writeMsg(isWrite), m_sti(nullptr), m_bti(bti), sfid(_sfid), funcCtrlValid(isValidFuncCtrl)
+    : accessType(access), m_sti(nullptr), m_bti(bti), sfid(_sfid), funcCtrlValid(isValidFuncCtrl)
 {
     desc.value = _desc;
     extDesc.value = _extDesc;

visa/Gen4_IR.hpp

@@ -229,6 +229,13 @@ typedef std::list<USE_DEF_NODE, USE_DEF_ALLOCATOR >::iterator DEF_EDGE_LIST_ITER
 
 namespace vISA
 {
+
+    enum class SendAccess
+    {
+        READ_ONLY,
+        WRITE_ONLY,
+        READ_WRITE
+    };
 class G4_SendMsgDescriptor
 {
 private:
@@ -275,11 +282,7 @@ class G4_SendMsgDescriptor
         ExtendedMsgDescLayout layout;
     } extDesc;
 
-    /// Whether is a dataport read message.
-    bool readMsg;
-
-    /// Whether is a dataport write message.
-    bool writeMsg;
+    SendAccess accessType;
 
     /// Whether funcCtrl is valid
     bool funcCtrlValid;
@@ -296,25 +299,22 @@ class G4_SendMsgDescriptor
 
     G4_SendMsgDescriptor(uint32_t fCtrl, uint32_t regs2rcv, uint32_t regs2snd,
         uint32_t fID, bool isEot, uint16_t extMsgLength, uint32_t extFCtrl,
-        bool isRead, bool isWrite, G4_Operand *bti, G4_Operand *sti, IR_Builder& builder);
+        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, bool isRead, bool isWrite)
-    G4_SendMsgDescriptor(uint32_t desc, uint32_t extDesc,
-                        bool isRead,
-                        bool isWrite,
-                        G4_Operand *bti,
-                        G4_Operand *sti,
-                        bool isValidFuncCtrl);
+    /// used in IR_Builder::createSendMsgDesc(uint32_t desc, uint32_t extDesc, SendAccess access)
+    G4_SendMsgDescriptor(uint32_t desc, uint32_t extDesc, SendAccess access,
+        G4_Operand* bti,
+        G4_Operand* sti,
+        bool isValidFuncCtrl);
 
     /// Preferred constructor takes an explicit SFID and src1 length
     G4_SendMsgDescriptor(
         SFID sfid,
         uint32_t desc,
         uint32_t extDesc,
         int src1Len,
-        bool isRead,
-        bool isWrite,
+        SendAccess access,
         G4_Operand *bti,
         bool isValidFuncCtrl);
 
@@ -383,8 +383,9 @@ class G4_SendMsgDescriptor
     uint16_t extMessageLength() const { return (uint16_t)src1Len; }
 
     bool isCPSEnabled() const {return extDesc.layout.cps != 0;}
-    bool isDataPortRead() const { return readMsg; }
-    bool isDataPortWrite() const { return writeMsg; }
+    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 isHDC() const

visa/Optimizer.cpp

@@ -7744,7 +7744,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, false, true);
+                msgDescImm, 0, 1, funcID, false, msgSize, extFuncCtrl, SendAccess::WRITE_ONLY);
             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);

visa/Rematerialization.cpp

@@ -933,7 +933,7 @@ namespace vISA
 
             auto dstMsgDesc = dstInst->getMsgDesc();
             auto newMsgDesc = kernel.fg.builder->createGeneralMsgDesc(dstMsgDesc->getDesc(), 
-                dstMsgDesc->getExtendedDesc(), dstMsgDesc->isDataPortRead(), dstMsgDesc->isDataPortWrite(), 
+                dstMsgDesc->getExtendedDesc(), dstMsgDesc->getAccess(), 
                 kernel.fg.builder->duplicateOperand(dstMsgDesc->getBti()),
                 kernel.fg.builder->duplicateOperand(dstMsgDesc->getSti()));
 

visa/SendFusion.cpp

@@ -574,8 +574,7 @@ void SendFusion::simplifyMsg(INST_LIST_ITER SendIter)
         descImm,
         desc->getExtendedDesc(),
         desc->extMessageLength(),
-        desc->isDataPortRead(),
-        desc->isDataPortWrite(),
+        desc->getAccess(),
         desc->getBti());
     Send->setMsgDesc(newDesc);
 
@@ -1475,8 +1474,7 @@ void SendFusion::doFusion(
             false,
             msgLen,
             desc->getExtFuncCtrl(),
-            desc->isDataPortRead(),
-            desc->isDataPortWrite(),
+            desc->getAccess(),
             bti);
 
         G4_SrcRegRegion* s0 = I0->getOperand(Opnd_src0)->asSrcRegRegion();
@@ -1526,8 +1524,7 @@ void SendFusion::doFusion(
         false,
         newExtMsgLen,
         desc->getExtFuncCtrl(),
-        desc->isDataPortRead(),
-        desc->isDataPortWrite(),
+        desc->getAccess(),
         bti);
 
     // First, create fused send.