G4_SendDesc encapsulation

More work move encoding details of send descriptors for various platforms
behind an abstrct G4_SendDesc with subclasses to handle various platform groups.

Author: trbauer

visa/FlowGraph.cpp

@@ -1152,7 +1152,7 @@ void FlowGraph::handleExit(G4_BB* firstSubroutineBB)
                 }
                 else
                 {
-                    //generate EOT send
+                    // generate EOT send
                     G4_INST* lastInst = bb->back();
                     bb->pop_back();
                     bool needsEOTSend = true;
@@ -1165,15 +1165,16 @@ void FlowGraph::handleExit(G4_BB* firstSubroutineBB)
                             !(secondToLastInst->getMsgDesc()->getSrc1LenRegs() > 2 &&
                                 VISA_WA_CHECK(builder->getPWaTable(), WaSendsSrc1SizeLimitWhenEOT)))
                         {
-                            G4_SendDescRaw *rawDesc = secondToLastInst->getMsgDescRaw();
-                            MUST_BE_TRUE(rawDesc, "expected raw descriptor");
-                            rawDesc->setEOT();
-                            if (secondToLastInst->isSplitSend())
+                            G4_SendDesc *desc = secondToLastInst->getMsgDesc();
+                            desc->setEOT();
+                            if (secondToLastInst->isSplitSend() && secondToLastInst->getMsgDescRaw())
                             {
-                                if (secondToLastInst->getSrc(3)->isImm())
+                                bool mustUpdateExDescOperand = true;
+                                if (mustUpdateExDescOperand && secondToLastInst->getSrc(3)->isImm())
                                 {
                                     secondToLastInst->setSrc(
-                                        builder->createImm(rawDesc->getExtendedDesc(), Type_UD), 3);
+                                        builder->createImm(
+                                          secondToLastInst->getMsgDescRaw()->getExtendedDesc(), Type_UD), 3);
                                 }
                             }
                             needsEOTSend = false;

visa/G4_IR.cpp

@@ -4001,14 +4001,10 @@ void G4_InstSend::emit_send(std::ostream& output, bool symbol_dst, bool *symbol_
         srcs[3]->emit(output, false);
         output << ' ';
     }
-    else
+    else if (!isSplitSend() && srcs[2])
     {
-        if (getMsgDescRaw()) {
-            std::ios::fmtflags outFlags(output.flags());
-            output << fmtHex(getMsgDescRaw()->getExtendedDesc());
-            output << ' ';
-            output.flags(outFlags);
-        }
+        srcs[2]->emit(output, false); // for old unary send
+        output << ' ';
     }
 
     // emit msgDesc (2 for sends and 1 for send). Last operand shown in asm.
@@ -4039,14 +4035,27 @@ void G4_InstSend::emit_send_desc(std::ostream& output)
     if (!desc.empty()) {
         output << msgDesc->getDescription();
     }
-    if (const auto *rawDesc = sendInst->getMsgDescRaw()) {
+
+    if (auto immOff = sendInst->getMsgDesc()->getOffset()) {
+        int signedOff = immOff->immOff;
+        if (immOff->is2d) {
+            output << "; ImmOff=(" <<
+                fmtHex(immOff->immOffX) << " elems," <<
+                fmtHex(immOff->immOffY) << " elems)";
+        } else {
+            if (signedOff > 0) {
+                output << "; ImmOff=+" << fmtHex(signedOff);
+            } else if (signedOff < 0) {
+                output << "; ImmOff=-" << fmtHex(-signedOff);
+            }
+        }
     }
 
-    output << ", resLen=" << msgDesc->getDstLenRegs();
-    output << ", msgLen=" << msgDesc->getSrc0LenRegs();
+    output << ", dstLen=" << msgDesc->getDstLenRegs();
+    output << ", src0Len=" << msgDesc->getSrc0LenRegs();
     if (isSplitSend())
     {
-        output << ", extMsgLen=" << msgDesc->getSrc1LenRegs();
+        output << ", src1Len=" << msgDesc->getSrc1LenRegs();
     }
 
     if (msgDesc->isBarrier())
@@ -8524,8 +8533,9 @@ G4_INST* G4_InstSend::cloneInst()
         auto src1 = nonConstBuilder->duplicateOperand(getSrc(1))->asSrcRegRegion();
         auto desc = nonConstBuilder->duplicateOperand(getSrc(2));
         auto extDesc = nonConstBuilder->duplicateOperand(getSrc(3));
-        newInst = nonConstBuilder->createInternalSplitSendInst(getExecSize(), dst, src0, src1, desc,
-            getOption(), getMsgDescRaw(), extDesc);
+        newInst = nonConstBuilder->createInternalSplitSendInst(
+            getExecSize(), dst, src0, src1, desc,
+            getOption(), getMsgDesc(), extDesc);
         if (prd)
         {
             newInst->setPredicate(prd);

visa/G4_IR.hpp

@@ -616,12 +616,6 @@ typedef struct _SWSBInfo
             return nullptr;
         return (G4_SendDescRaw *)msgDesc;
     }
-    const G4_SendDescLdSt * getMsgDescLdSt() const {
-        const auto *msgDesc = getMsgDesc();
-        if (msgDesc == nullptr || !getMsgDesc()->isRaw())
-            return nullptr;
-        return (const G4_SendDescLdSt *)msgDesc;
-    }
 
     virtual bool mayExceedTwoGRF() const
     {
@@ -1568,8 +1562,6 @@ class G4_InstSend : public G4_INST
     //    thread should also terminate with a send to TS.
     bool canBeEOT() const
     {
-        if (!msgDesc->isRaw())
-            return false;
         bool canEOT = getMsgDesc()->getDstLenRegs() == 0 &&
             (getMsgDesc()->getSFID() != SFID::NULL_SFID &&
                 getMsgDesc()->getSFID() != SFID::SAMPLER);