Rename 'execSize' to 'numElts'

As 'execSize' in PayloadSource actually is the number of elements of
a MSG payload for that given payload source operand, change the name
to reflect that to avoid misunderstanding.

Author: jgu222

visa/BuildIR.h

@@ -1856,7 +1856,7 @@ class IR_Builder
 
     struct PayloadSource {
         G4_SrcRegRegion  *opnd;
-        G4_ExecSize       execSize;
+        uint32_t          numElts;  // 'opnd's size in msg payload
         G4_InstOpts       instOpt;
     };
 

visa/VisaToG4/TranslateMisc.cpp

@@ -134,17 +134,17 @@ static void CopySrcToMsgPayload(
 }
 
 static void Copy_Source_To_Payload(
-    IR_Builder *IRB, G4_ExecSize batchExSize,
-    G4_Declare *msg, unsigned &regOff,
-    G4_SrcRegRegion *source, G4_ExecSize execSize,
+    IR_Builder* IRB, G4_ExecSize batchExSize,
+    G4_Declare* msg, unsigned& regOff,
+    G4_SrcRegRegion* source, uint32_t numElts,
     uint32_t eMask)
 {
     ASSERT_USER(batchExSize == 1 || batchExSize == 2 || batchExSize == 4 ||
         batchExSize == 8 || batchExSize == 16 || batchExSize == 32,
         "Invalid execution size for message payload copy!");
 
     unsigned srcRegOff = 0;
-    G4_ExecSize batchSize = std::min(batchExSize, execSize);
+    G4_ExecSize batchSize { std::min((uint32_t)batchExSize, numElts) };
     uint32_t numSrcRegs = (source->getElemSize() * batchSize) / IRB->getGRFSize();
     if (numSrcRegs == 0)
     {
@@ -165,13 +165,13 @@ static void Copy_Source_To_Payload(
                 msg, regOff, source, srcRegOff);
         }
         // regOff : need to advance to the next payload grf
-        //          This payload takes this size: execSize * source->getElemSize()
-        uint32_t numPayloadRegs = (source->getElemSize() * execSize) / IRB->getGRFSize();
+        //          This payload takes this size: numElts * source->getElemSize()
+        uint32_t numPayloadRegs = (source->getElemSize() * numElts) / IRB->getGRFSize();
         regOff += (numPayloadRegs == 0 ? 1 : numPayloadRegs);
         return;
     }
 
-    for (unsigned i = 0; i < execSize; i += batchSize) {
+    for (unsigned i = 0; i < numElts; i += batchSize) {
         if (!source->isNullReg()) {
             CopySrcToMsgPayload(IRB, batchSize, eMask,
                 msg, regOff, source, srcRegOff);
@@ -210,7 +210,7 @@ void IR_Builder::preparePayload(
 
         // this is the size of message payload that holds srcReg.
         // (Thus, this size >= srcReg's size!)
-        unsigned regionSize = srcs[i].execSize * srcReg->getTypeSize();
+        unsigned regionSize = srcs[i].numElts * srcReg->getTypeSize();
 
         if (regionSize < getGRFSize()) {
             // FIXME: Need a better solution to decouple the value type from
@@ -286,7 +286,7 @@ void IR_Builder::preparePayload(
     // Count remaining message size.
     for (; i != len; ++i) {
         G4_SrcRegRegion *srcReg = srcs[i].opnd;
-        unsigned regionSize = srcs[i].execSize * srcReg->getTypeSize();
+        unsigned regionSize = srcs[i].numElts * srcReg->getTypeSize();
         if (regionSize < getGRFSize()) {
             // FIXME: Need a better solution to decouple the value type from
             // the container type to generate better COPY if required.
@@ -305,7 +305,7 @@ void IR_Builder::preparePayload(
     for (i = splitPos; i != len; ++i)
     {
         Copy_Source_To_Payload(this, batchExSize, msg, regOff, srcs[i].opnd,
-            srcs[i].execSize, srcs[i].instOpt);
+            srcs[i].numElts, srcs[i].instOpt);
     }
 
     i = 0;

visa/VisaToG4/TranslateSend3D.cpp

@@ -1911,7 +1911,7 @@ int IR_Builder::translateVISASampler3DInst(
     // Collect header if present.
     if (header) {
         sources[i].opnd = header;
-        sources[i].execSize = g4::SIMD8;
+        sources[i].numElts = g4::SIMD8;
         sources[i].instOpt = InstOpt_WriteEnable | dbgOpt;
         ++i;
     }
@@ -1920,7 +1920,7 @@ int IR_Builder::translateVISASampler3DInst(
     unsigned uPos = needNoMask ? getUPosition(actualop) : ~0u;
     for (unsigned j = 0; j != numParms; ++j) {
         sources[i].opnd = params[j];
-        sources[i].execSize = execSize;
+        sources[i].numElts = execSize;
         sources[i].instOpt = (needNoMask && (uPos <= j && j < (uPos + 3))) ?
             InstOpt_WriteEnable | dbgOpt : instOpt | dbgOpt;
         ++i;
@@ -2036,7 +2036,7 @@ int IR_Builder::translateVISALoad3DInst(
     // Collect header if present.
     if (header) {
         sources[i].opnd = header;
-        sources[i].execSize = g4::SIMD8;
+        sources[i].numElts = g4::SIMD8;
         sources[i].instOpt = InstOpt_WriteEnable;
         ++i;
     }
@@ -2045,7 +2045,7 @@ int IR_Builder::translateVISALoad3DInst(
     unsigned uPos = needNoMask ? getUPosition(actualop) : ~0u;
     for (unsigned j = 0; j != numParms; ++j) {
         sources[i].opnd = opndArray[j];
-        sources[i].execSize = execSize;
+        sources[i].numElts = execSize;
         sources[i].instOpt = (needNoMask && (uPos <= j && j < (uPos + 3))) ?
             InstOpt_WriteEnable : instOpt;
         ++i;
@@ -2165,7 +2165,7 @@ int IR_Builder::translateVISAGather3dInst(
     // Collect header if present.
     if (header) {
         sources[i].opnd = header;
-        sources[i].execSize = g4::SIMD8;
+        sources[i].numElts = g4::SIMD8;
         sources[i].instOpt = InstOpt_WriteEnable;
         ++i;
     }
@@ -2174,7 +2174,7 @@ int IR_Builder::translateVISAGather3dInst(
     unsigned uPos = needNoMask ? getUPosition(actualop) : ~0u;
     for (unsigned j = 0; j != numOpnds; ++j) {
         sources[i].opnd = opndArray[j];
-        sources[i].execSize = execSize;
+        sources[i].numElts = execSize;
         sources[i].instOpt = (needNoMask && (uPos <= j && j < (uPos + 3))) ?
             InstOpt_WriteEnable : instOpt;
         ++i;