[Autobackout][FuncReg]Revert of change: af144e6

For the following code:
     mov (8|M0)   r80.0<1>:d    0:w
     send (1|M0)  r80:d    r4:uq   0xC            0x041401FF
     add (1|M0)   r80.1<1>:d    r54.0<0;1,0>:d    r80.1<0;1,0>:d
     add (1|M0)   r80.2<1>:d    r58.0<0;1,0>:d    r80.2<0;1,0>:d
     add (1|M0)   r80.3<1>:d    r62.0<0;1,0>:d    r80.3<0;1,0>:d
     add (1|M0)   r80.4<1>:d    r66.0<0;1,0>:d    r80.4<0;1,0>:d
     add (1|M0)   r80.5<1>:d    r70.0<0;1,0>:d    r80.5<0;1,0>:d
     add (1|M0)   r80.6<1>:d    r74.0<0;1,0>:d    r80.6<0;1,0>:d
     add (1|M0)   r80.7<1>:d    r78.0<0;1,0>:d    r80.7<0;1,0>:d

Previously, "send" kills r80 entirely, which is incorrect. This change makes
sure that "send (1)" only kills r80.0:d, thus the first "mov" instruction
is not dead.

Author: jgu222

visa/G4_IR.cpp

@@ -354,7 +354,6 @@ G4_InstSend::G4_InstSend(
     G4_INST(builder, prd, o, nullptr, g4::NOSAT, size, dst, payload, desc, opt),
     msgDesc(md)
 {
-    md->setExecSize(size);
 }
 
 G4_InstSend::G4_InstSend(
@@ -373,7 +372,6 @@ G4_InstSend::G4_InstSend(
     msgDesc(md)
 {
     setSrc(extDesc, 3);
-    md->setExecSize(size);
 }
 
 void G4_INST::setOpcode(G4_opcode opcd)

visa/G4_SendDescs.cpp

@@ -168,8 +168,9 @@ G4_SendDescLdSt::G4_SendDescLdSt(
     G4_Operand *surf,
     ImmOff _immOff,
     LdStAttrs _attrs)
-    : G4_SendDesc(G4_SendDesc::Kind::LDST, sfid, _execSize),
+    : G4_SendDesc(G4_SendDesc::Kind::LDST, sfid),
     op(_op),
+    execSize(_execSize),
     //
     addrType(at), addrBits(_addrBits), addrDims(_addrDims),
     //
@@ -184,7 +185,7 @@ G4_SendDescLdSt::G4_SendDescLdSt(
 static size_t toExecSlots(const G4_SendDescLdSt &d)
 {
     int minExecSize = 8;
-    int execSlots = std::max((int)d.getExecSize(), minExecSize);
+    int execSlots = std::max((int)d.execSize, minExecSize);
     return (size_t)execSlots;
 }
 
@@ -585,149 +586,6 @@ bool G4_SendDescRaw::is16BitReturn() const
     return desc.layout.returnFormat == 1;
 }
 
-bool G4_SendDescRaw::isByteScatterRW() const
-{
-    auto funcID = getSFID();
-    switch (funcID) {
-    case SFID::DP_DC0:
-        switch (getHdcMessageType()) {
-        case DC_BYTE_SCATTERED_READ:
-        case DC_BYTE_SCATTERED_WRITE:
-            return true;
-        default:
-            break;
-        }
-        break;
-    case SFID::DP_DC1:
-        switch (getHdcMessageType()) {
-        case DC1_A64_SCATTERED_READ:
-        case DC1_A64_SCATTERED_WRITE:
-            return (getBlockSize() == 1);
-        default:
-            break;
-        }
-        break;
-    case SFID::DP_DC2:
-        switch (getHdcMessageType()) {
-        case DC2_A64_SCATTERED_READ:
-        case DC2_A64_SCATTERED_WRITE:
-            return (getBlockSize() == 1);
-        case DC2_BYTE_SCATTERED_READ:
-        case DC2_BYTE_SCATTERED_WRITE:
-            return true;
-        default:
-            break;
-        }
-        break;
-    default:
-        break;
-    }
-    return false;
-}
-
-bool G4_SendDescRaw::isDWScatterRW() const
-{
-    auto funcID = getSFID();
-    switch (funcID) {
-    case SFID::DP_DC0:
-        switch (getHdcMessageType()) {
-        case DC_DWORD_SCATTERED_READ:
-        case DC_DWORD_SCATTERED_WRITE:
-            return true;
-        default:
-            break;
-        }
-        break;
-    case SFID::DP_DC1:
-        switch (getHdcMessageType()) {
-        case DC1_A64_SCATTERED_READ:
-        case DC1_A64_SCATTERED_WRITE:
-            return (getBlockSize() == 4);
-        default:
-            break;
-        }
-        break;
-    case SFID::DP_DC2:
-        switch (getHdcMessageType()) {
-        case DC2_A64_SCATTERED_READ:
-        case DC2_A64_SCATTERED_WRITE:
-            return (getBlockSize() == 4);
-        default:
-            break;
-        }
-        break;
-    default:
-        break;
-    }
-    return false;
-}
-
-bool G4_SendDescRaw::isQWScatterRW() const
-{
-    auto funcID = getSFID();
-    switch (funcID) {
-    case SFID::DP_DC0:
-        switch (getHdcMessageType()) {
-        default:
-            break;
-        }
-        break;
-    case SFID::DP_DC1:
-        switch (getHdcMessageType()) {
-        case DC1_A64_SCATTERED_READ:
-        case DC1_A64_SCATTERED_WRITE:
-            return (getBlockSize() == 8);
-        default:
-            break;
-        }
-        break;
-    case SFID::DP_DC2:
-        switch (getHdcMessageType()) {
-        case DC2_A64_SCATTERED_READ:
-        case DC2_A64_SCATTERED_WRITE:
-            return (getBlockSize() == 4);
-        default:
-            break;
-        }
-        break;
-    default:
-        break;
-    }
-    return false;
-}
-
-bool G4_SendDescRaw::isUntypedRW() const
-{
-    auto funcID = getSFID();
-    switch (funcID) {
-    case SFID::DP_DC1:
-        switch (getHdcMessageType()) {
-        case DC1_UNTYPED_SURFACE_READ:
-        case DC1_UNTYPED_SURFACE_WRITE:
-        case DC1_A64_UNTYPED_SURFACE_READ:
-        case DC1_A64_UNTYPED_SURFACE_WRITE:
-            return true;
-        default:
-            break;
-        }
-        break;
-    case SFID::DP_DC2:
-        switch (getHdcMessageType()) {
-        case DC2_UNTYPED_SURFACE_READ:
-        case DC2_UNTYPED_SURFACE_WRITE:
-        case DC2_A64_UNTYPED_SURFACE_READ:
-        case DC2_A64_UNTYPED_SURFACE_WRITE:
-            return true;
-        default:
-            break;
-        }
-        break;
-    default:
-        break;
-    }
-    return false;
-}
-
 bool G4_SendDescRaw::isA64Message() const
 {
     if (!isHDC()) {
@@ -1022,17 +880,6 @@ size_t G4_SendDescRaw::getDstLenBytes() const
         return 32 * getScratchRWSize(); // HWords
     } else if (isOwordLoad()) {
         return 16 * getOwordsAccessed(); // OWords
-    } else if (isByteScatterRW()) {
-        uint16_t nbytes = getBlockNum();
-        // assume 4 at least
-        nbytes = (nbytes >= 4 ? nbytes : 4);
-        return nbytes * getExecSize();
-    } else if (isDWScatterRW()) {
-        return 4 * getBlockNum() * getExecSize();
-    } else if (isQWScatterRW()) {
-        return 8 * getBlockNum() * getExecSize();
-    } else if (isUntypedRW()) {
-        return 4 * getEnabledChannelNum() * getExecSize();
     } else {
         // fallback to the raw GRF count
         return ResponseLength() * (size_t)getGRFSize();

visa/G4_SendDescs.hpp

@@ -179,38 +179,20 @@ static inline ElemsPerAddr::Chs operator|(
 
 class G4_Operand;
 
-// Base class for all send descriptors.
-// (Note that G4_SendDesc could be reused by more than one instruction.)
+// Base class for all send descriptors
 class G4_SendDesc
 {
-    friend class G4_InstSend;
-
-protected:
-    // The execution size for this message.
-    G4_ExecSize execSize;
-
-    // Limit access to G4_InstSend and any derived classes.
-    void setExecSize(G4_ExecSize v) { execSize = v; }
-
 public:
     enum class Kind {INVALID, RAW, LDST};
 
     Kind        kind;
 
     SFID        sfid;
 
-    G4_SendDesc(Kind k, SFID _sfid) : kind(k), sfid(_sfid), execSize(g4::SIMD_UNDEFINED) { }
-    G4_SendDesc(Kind k, SFID _sfid, G4_ExecSize _execSize)
-        : kind(k),
-          sfid(_sfid),
-          execSize(_execSize)
-    {}
+    G4_SendDesc(Kind k, SFID _sfid) : kind(k), sfid(_sfid) { }
 
     SFID getSFID() const {return sfid;}
 
-    // execSize: need to set it in the ctor
-    G4_ExecSize getExecSize() const { return execSize; }
-
     bool isRaw() const {return kind == Kind::RAW;}
     bool isLdSt() const {return kind == Kind::LDST;}
     //
@@ -292,6 +274,9 @@ struct G4_SendDescLdSt : G4_SendDesc {
     // The message op
     LdStOp op;
 
+    // The execution size for this message.
+    G4_ExecSize execSize;
+
     // E.g. flat, bti, ...
     AddrType addrType;
     //
@@ -624,10 +609,6 @@ class G4_SendDescRaw : public G4_SendDesc
         uint16_t bitV = ((getFuncCtrl() & 0x3000u) >> 12);
         return  0x1 << bitV;
     }
-    bool isByteScatterRW() const;
-    bool isDWScatterRW() const;
-    bool isQWScatterRW() const;
-    bool isUntypedRW() const;
 
     bool isA64Message() const;