[Autobackout][FuncReg]Revert of change: 1236f59

High-Level Load/Store G4IR support.
The goal is to move us away from twiddling bits in descriptors every time we need to examine or modify send messages.
* All send descriptors (formerly G4_SendMsgDescriptor) are subclasses of G4_SendDesc
* The old raw descriptor is G4_SendDescRaw and there is a new G4_SendDescLdSt which is unused at the moment.
* Anywhere possible, we now use the generic methods of the superclass G4_SendDesc.
* In cases where the old code fiddles with bits directly and requires the raw descriptor, we add a type check and convert to G4_SendDescRaw (assert on fail / return false on pattern match if safe to do so (e.g. SendFusion::canFuse(..))).
* Do not let the old raw descriptor gunk pollute the generic interface of the parent.
* Push #5

Author: trbauer

visa/BinaryEncoding.cpp

@@ -285,8 +285,7 @@ inline void BinaryEncoding::EncodeSendMsgDesc29_30(G4_INST* inst)
     MUST_BE_TRUE(inst->isSend(), "must be a send inst");
 
     BinInst *mybin = inst->getBinInst();
-    G4_SendDescRaw* msgDesc = inst->getMsgDescRaw();
-    MUST_BE_TRUE(msgDesc, "expected raw descriptor");
+    G4_SendMsgDescriptor* msgDesc = inst->getMsgDesc();
     G4_Operand* descOpnd = inst->isSplitSend() ? inst->getSrc(2) : inst->getSrc(1);
     if (!descOpnd->isImm())
     {
@@ -2613,9 +2612,10 @@ inline
 BinaryEncoding::Status BinaryEncoding::EncodeExtMsgDescr(G4_INST* inst)
 {
     BinInst *mybin = inst->getBinInst();
-    MUST_BE_TRUE(inst->getMsgDescRaw(), "expected raw descriptor");
-    uint32_t msgDesc = inst->getMsgDescRaw()->getExtendedDesc();
-    SetExtMsgDescr(inst, mybin, msgDesc);
+    {
+        uint32_t msgDesc = inst->getMsgDesc()->getExtendedDesc();
+        SetExtMsgDescr(inst, mybin, msgDesc);
+    }
     return SUCCESS;
 }
 

visa/BinaryEncodingCNL.cpp

@@ -915,8 +915,7 @@ inline void BinaryEncodingCNL::EncodeTwoSrcInst(G4_INST* inst, G9HDL::EU_INSTRUC
 ///
 void PatchSend(G4_INST* inst, G9HDL::EU_INSTRUCTION_BASIC_TWO_SRC* twoSrc)
 {
-    MUST_BE_TRUE(inst->getMsgDescRaw(), "expected raw descriptor");
-    uint32_t msgDesc = inst->getMsgDescRaw()->getExtendedDesc();
+    uint32_t msgDesc = inst->getMsgDesc()->getExtendedDesc();
     EncExtMsgDescriptor emd;
     emd.ulData = msgDesc;
 
@@ -1922,8 +1921,7 @@ BinaryEncodingCNL::Status BinaryEncodingCNL::EncodeSplitSend(G4_INST* inst, G9HD
 
     //Patch SFID and EOT
     {
-        MUST_BE_TRUE(inst->getMsgDescRaw(), "expected raw descriptor");
-        uint32_t msgDesc = inst->getMsgDescRaw()->getExtendedDesc();
+        uint32_t msgDesc = inst->getMsgDesc()->getExtendedDesc();
         EncExtMsgDescriptor emd;
         emd.ulData = msgDesc;
 

visa/BinaryEncodingIGA.cpp

@@ -391,8 +391,8 @@ iga::SFID BinaryEncodingIGA::getSFID(const G4_INST *inst)
 {
     ASSERT_USER(inst->isSend(), "Only send has SFID");
 
-    G4_SendDesc *msgDesc = inst->getMsgDesc();
-    auto funcID = msgDesc->getSFID();
+    G4_SendMsgDescriptor *msgDesc = inst->getMsgDesc();
+    auto funcID = msgDesc->getFuncId();
 
     iga::SFID sfid = iga::SFID::INVALID;
     switch (funcID)
@@ -406,7 +406,7 @@ iga::SFID BinaryEncodingIGA::getSFID(const G4_INST *inst)
     case vISA::SFID::SPAWNER:   sfid = iga::SFID::TS; break;
     case vISA::SFID::VME:       sfid = iga::SFID::VME; break;
     case vISA::SFID::DP_CC:     sfid = iga::SFID::DCRO; break;
-    case vISA::SFID::DP_DC0:    sfid = iga::SFID::DC0; break;
+    case vISA::SFID::DP_DC:     sfid = iga::SFID::DC0; break;
     case vISA::SFID::DP_PI:     sfid = iga::SFID::PIXI; break;
     case vISA::SFID::DP_DC1:    sfid = iga::SFID::DC1; break;
     case vISA::SFID::CRE:       sfid = iga::SFID::CRE; break;
@@ -1004,8 +1004,7 @@ void BinaryEncodingIGA::translateInstructionDst(
     // not all bits are copied from immediate descriptor
     if (g4inst->isSend() && platform >= GENX_SKL && platform < GENX_ICLLP)
     {
-        const G4_SendDescRaw* msgDesc = g4inst->getMsgDescRaw();
-        assert(msgDesc && "expected raw descriptor");
+        G4_SendMsgDescriptor* msgDesc = g4inst->getMsgDesc();
         G4_Operand* descOpnd = g4inst->isSplitSend() ?
             g4inst->getSrc(2) : g4inst->getSrc(1);
         if (!descOpnd->isImm() && msgDesc->is16BitReturn())
@@ -1149,8 +1148,7 @@ void BinaryEncodingIGA::translateInstructionSrcs(
             {
                 // work around for SKL bug
                 // not all bits are copied from immediate descriptor
-                G4_SendDescRaw* msgDesc = inst->getMsgDescRaw();
-                assert(msgDesc && "expected raw descriptor");
+                G4_SendMsgDescriptor* msgDesc = inst->getMsgDesc();
                 G4_Operand* descOpnd = inst->isSplitSend() ?
                     inst->getSrc(2) : inst->getSrc(1);
                 if (!descOpnd->isImm() && msgDesc->is16BitInput())
@@ -1250,8 +1248,8 @@ static SendDesc encodeExDescSendUnary(
 
     // old unary packed send
     // exDesc is stored in SendMsgDesc and must be IMM
-    G4_SendDescRaw* descG4 = sendInst->getMsgDescRaw();
-    assert(descG4 != nullptr && "expected raw send");
+    G4_SendMsgDescriptor* descG4 = sendInst->getMsgDesc();
+    assert(descG4 != nullptr && "null msg desc");
 
     exDescIga.type = SendDesc::Kind::IMM;
     uint32_t tVal = descG4->getExtendedDesc();
@@ -1282,8 +1280,8 @@ SendDesc BinaryEncodingIGA::encodeExDescImm(
     SendDesc exDescIga;
 
     G4_Operand* exDescG4 = sendInst->getSrc(3);
-    G4_SendDescRaw* descG4 = sendInst->getMsgDescRaw();
-    assert(descG4 != nullptr && "expected raw descriptor");
+    G4_SendMsgDescriptor* descG4 = sendInst->getMsgDesc();
+    assert(descG4 != nullptr && "null msg desc");
 
     xlen = (int)descG4->extMessageLength();
     //
@@ -1318,8 +1316,8 @@ iga::SendDesc BinaryEncodingIGA::encodeExDescRegA0(
     SendDesc exDescIga;
 
     G4_Operand* exDescG4 = sendInst->getSrc(3);
-    const G4_SendDescRaw* descG4 = sendInst->getMsgDescRaw();
-    assert(descG4 != nullptr && "expected raw descriptor");
+    const G4_SendMsgDescriptor* descG4 = sendInst->getMsgDesc();
+    assert(descG4 != nullptr && "null msg desc");
 
     exDescIga.type = SendDesc::Kind::REG32A;
     exDescIga.reg.regNum = 0; // must be a0

visa/BuildIR.h

@@ -850,29 +850,29 @@ class IR_Builder
 
     // ToDo: get rid of this version and use the message type specific ones below instead,
     // so we can avoid having to explicitly create extDesc bits
-    G4_SendDescRaw * createGeneralMsgDesc(
+    G4_SendMsgDescriptor* createGeneralMsgDesc(
         uint32_t desc,
         uint32_t extDesc,
         SendAccess access,
         G4_Operand* bti = nullptr,
         G4_Operand* sti = nullptr);
 
-    G4_SendDescRaw * createReadMsgDesc(
+    G4_SendMsgDescriptor* createReadMsgDesc(
         SFID sfid,
         uint32_t desc,
         G4_Operand* bti = nullptr);
 
-    G4_SendDescRaw * createWriteMsgDesc(
+    G4_SendMsgDescriptor* createWriteMsgDesc(
         SFID sfid,
         uint32_t desc,
         int src1Len,
         G4_Operand* bti = nullptr);
 
-    G4_SendDescRaw * createSyncMsgDesc(
+    G4_SendMsgDescriptor* createSyncMsgDesc(
         SFID sfid,
         uint32_t desc);
 
-    G4_SendDescRaw * createSampleMsgDesc(
+    G4_SendMsgDescriptor* createSampleMsgDesc(
         uint32_t desc,
         bool cps,
         int src1Len,
@@ -887,7 +887,7 @@ class IR_Builder
         return isRead ? SendAccess::READ_ONLY : SendAccess::WRITE_ONLY;
     }
 
-    G4_SendDescRaw * createSendMsgDesc(
+    G4_SendMsgDescriptor* createSendMsgDesc(
         SFID sfid,
         uint32_t desc,
         uint32_t extDesc,
@@ -896,7 +896,7 @@ class IR_Builder
         G4_Operand *bti,
         bool isValidFuncCtrl = true);
 
-    G4_SendDescRaw * createSendMsgDesc(
+    G4_SendMsgDescriptor* createSendMsgDesc(
         unsigned funcCtrl,
         unsigned regs2rcv,
         unsigned regs2snd,
@@ -1204,22 +1204,22 @@ class IR_Builder
         G4_DstRegRegion* postDst, G4_SrcRegRegion* payload,
         G4_Operand* msg,
         G4_InstOpts options, // FIXME: re-order options to follow all operands
-        G4_SendDesc *msgDesc,
+        G4_SendMsgDescriptor *msgDesc,
         bool addToInstList);
     G4_InstSend* createInternalSendInst(
         G4_Predicate* prd, G4_opcode op,
         G4_ExecSize execSize,
         G4_DstRegRegion* postDst, G4_SrcRegRegion* payload,
         G4_Operand* msg,
         G4_InstOpts options, // FIXME: re-order options to follow all operands
-        G4_SendDesc *msgDescs);
+        G4_SendMsgDescriptor *msgDescs);
 
     G4_InstSend* createSplitSendInst(
         G4_Predicate* prd, G4_opcode op,
         G4_ExecSize execSize,
         G4_DstRegRegion* dst, G4_SrcRegRegion* src1, G4_SrcRegRegion* src2,
         G4_Operand* msg, G4_InstOpts options,
-        G4_SendDesc* msgDesc,
+        G4_SendMsgDescriptor *msgDesc,
         G4_Operand* src3,
         bool addToInstList);
 
@@ -1228,7 +1228,7 @@ class IR_Builder
         G4_DstRegRegion* dst, G4_SrcRegRegion* src1, G4_SrcRegRegion* src2,
         // TODO: reorder parameters to put options last
         G4_Operand* msg, G4_InstOpts options,
-        G4_SendDesc*msgDesc,
+        G4_SendMsgDescriptor *msgDesc,
         G4_Operand* src3);
 
     G4_INST* createMathInst(
@@ -1321,15 +1321,15 @@ class IR_Builder
         G4_Predicate *pred,
         G4_DstRegRegion *postDst, G4_SrcRegRegion *payload,
         G4_ExecSize execSize,
-        G4_SendDescRaw *msgDesc,
+        G4_SendMsgDescriptor *msgDesc,
         G4_InstOpts options,
         bool is_sendc);
 
     G4_InstSend *Create_SplitSend_Inst(
         G4_Predicate *pred,
         G4_DstRegRegion *dst, G4_SrcRegRegion *src1, G4_SrcRegRegion *src2,
         G4_ExecSize execSize,
-        G4_SendDescRaw *msgDesc,
+        G4_SendMsgDescriptor *msgDesc,
         G4_InstOpts options,
         bool is_sendc);
 
@@ -1341,7 +1341,7 @@ class IR_Builder
         G4_SrcRegRegion *src2,
         G4_SrcRegRegion *extDesc,
         G4_ExecSize execSize,
-        G4_SendDescRaw *msgDesc,
+        G4_SendMsgDescriptor *msgDesc,
         G4_InstOpts option);
 
     G4_InstSend* Create_Send_Inst_For_CISA(
@@ -1978,7 +1978,7 @@ class IR_Builder
         G4_SrcRegRegion *src1,
         G4_DstRegRegion *dst);
 
-    void applySideBandOffset(G4_Operand* sideBand, const G4_SendDescRaw * sendMsgDesc);
+    void applySideBandOffset(G4_Operand* sideBand, G4_SendMsgDescriptor* sendMsgDesc);
 
     int translateVISAGather4ScaledInst(
         G4_Predicate *pred,