Clean up message descriptor generation for raw send so that it explicitly sets the SFID.

Change-Id: I27082ddcc02bf70617e812a6629065e6098550f8

Author: weiyu-chen

visa/BuildIR.h

@@ -1264,8 +1264,7 @@ class IR_Builder {
         uint32_t extDesc,
         SendAccess access,
         G4_Operand* bti = nullptr,
-        G4_Operand* sti = nullptr,
-        bool isValidFuncCtrl = true);
+        G4_Operand* sti = nullptr);
 
     G4_SendMsgDescriptor* createReadMsgDesc(
         SFID sfid,

visa/BuildIRImpl.cpp

@@ -122,10 +122,9 @@ G4_SendMsgDescriptor* IR_Builder::createGeneralMsgDesc(
     uint32_t extDesc,
     SendAccess access,
     G4_Operand* bti,
-    G4_Operand* sti,
-    bool isValidFuncCtrl)
+    G4_Operand* sti)
 {
-    return new (mem) G4_SendMsgDescriptor(desc, extDesc, access, bti, sti, isValidFuncCtrl);
+    return new (mem) G4_SendMsgDescriptor(desc, extDesc, access, bti, sti);
 }
 
 G4_SendMsgDescriptor* IR_Builder::createSendMsgDesc(
@@ -200,7 +199,7 @@ G4_SendMsgDescriptor* IR_Builder::createSampleMsgDesc(
     {
         extDesc |= 1 << CPS_LOD_COMPENSATION_ENABLE;
     }
-    return new (mem) G4_SendMsgDescriptor(desc, extDesc, SendAccess::READ_ONLY, bti, sti, true);
+    return new (mem) G4_SendMsgDescriptor(desc, extDesc, SendAccess::READ_ONLY, bti, sti);
 }
 
 G4_Operand* IR_Builder::emitSampleIndexGE16(

visa/Gen4_IR.cpp

@@ -289,13 +289,11 @@ G4_SendMsgDescriptor::G4_SendMsgDescriptor(
     uint32_t descBits, uint32_t extDescBits,
     SendAccess access,
     G4_Operand *bti,
-    G4_Operand *sti,
-    bool isValidFuncCtrl)
-    : accessType(access), m_sti(sti), m_bti(bti), funcCtrlValid(isValidFuncCtrl)
+    G4_Operand *sti)
+    : accessType(access), m_sti(sti), m_bti(bti), funcCtrlValid(true)
 {
     desc.value = descBits;
     extDesc.value = extDescBits;
-// SEE the note above about clearing ExDesc[10:6]
     src1Len = (extDescBits >> 6) & 0x1F; // [10:6]
     eotAfterMessage = extDesc.layout.eot; // [5]
     sfid = intToSFID(extDescBits & 0xF); // [3:0]

visa/Gen4_IR.hpp

@@ -304,9 +304,7 @@ class G4_SendMsgDescriptor
     /// Construct a object with descriptor and extended descriptor values.
     /// 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);
+        G4_Operand* bti, G4_Operand* sti);
 
     /// Preferred constructor takes an explicit SFID and src1 length
     G4_SendMsgDescriptor(

visa/TranslationInterface.cpp

@@ -5987,8 +5987,9 @@ int IR_Builder::translateVISARawSendInst(G4_Predicate *predOpnd, Common_ISA_Exec
         desc = G4_SendMsgDescriptor::createDesc(0, false, numSrc, numDst);
         isValidFuncCtrl = false;
     }
-    G4_SendMsgDescriptor *sendMsgDesc = createGeneralMsgDesc(desc, exDesc, getSendAccessType(isRead, isWrite), 
-        nullptr, nullptr, isValidFuncCtrl);
+    // bit[0-3] of the exDesc (always imm) holds the SFID
+    G4_SendMsgDescriptor *sendMsgDesc = createSendMsgDesc(static_cast<SFID>(exDesc & 0xF), desc, exDesc, 0,
+        getSendAccessType(isRead, isWrite), nullptr, isValidFuncCtrl);
 
     // sanity check on srcLen/dstLen
     MUST_BE_TRUE(sendMsgDesc->MessageLength() <= numSrc, "message length mismatch for raw send");