Revert Fixed preparePayload for more sends

revert the previous change:
    This is to continue what "OS Summary: Incorrect payload preparation for some send" does, to
    fix more sends.

Author: jgu222

visa/VisaToG4/TranslateSendLdStLegacy.cpp

@@ -109,11 +109,7 @@ int IR_Builder::translateVISAQWScatterInst(
 
     G4_SrcRegRegion *msgs[2] {0, 0};
     unsigned sizes[2] {0, 0};
-    // For send that has smaller execsize than exSize, like
-    //     "send (4)  ..."
-    // Make sure to use send's execsize (4) as batchsize, not 8/16/32.
-    // Thus, batchsize is min(exSize, instExSize).
-    preparePayload(msgs, sizes, std::min(exSize, instExSize), useSplitSend, sources, len);
+    preparePayload(msgs, sizes, exSize, useSplitSend, sources, len);
 
     uint32_t desc = buildDescForScatter(DC_QWORD_SCATTERED_WRITE, numBlocks,
         execSize == EXEC_SIZE_8 ? MDC_SM2_SIMD8 : MDC_SM2_SIMD16);
@@ -1514,7 +1510,7 @@ int IR_Builder::translateVISADwordAtomicInst(
 
     G4_SrcRegRegion *msgs[2] = {0, 0};
     unsigned sizes[2] = {0, 0};
-    preparePayload(msgs, sizes, std::min(exSize, instExSize), useSplitSend, sources, len);
+    preparePayload(msgs, sizes, exSize, useSplitSend, sources, len);
 
     SFID sfid = SFID::DP_DC1;
     unsigned MD = 0;
@@ -1881,7 +1877,7 @@ int IR_Builder::translateVISATypedAtomicInst(
 
     G4_SrcRegRegion *msgs[2] = {0, 0};
     unsigned sizes[2] = {0, 0};
-    preparePayload(msgs, sizes, std::min(exSize, instExSize), useSplitSend, sources, len);
+    preparePayload(msgs, sizes, exSize, useSplitSend, sources, len);
 
     unsigned dstLength = dst->isNullReg() ? 0 : 1;
 
@@ -2097,7 +2093,7 @@ int IR_Builder::translateGather4Inst(
 
     G4_SrcRegRegion *msgs[2] = {0, 0};
     unsigned sizes[2] = {0, 0};
-    preparePayload(msgs, sizes, std::min(exSize, instExSize), useSplitSend, sources, len);
+    preparePayload(msgs, sizes, exSize, useSplitSend, sources, len);
 
     SFID sfid = SFID::DP_DC1;
 
@@ -2203,7 +2199,7 @@ int IR_Builder::translateScatter4Inst(
 
     G4_SrcRegRegion *msgs[2] = {0, 0};
     unsigned sizes[2] = {0, 0};
-    preparePayload(msgs, sizes, std::min(exSize, instExSize), useSplitSend, sources, len);
+    preparePayload(msgs, sizes, exSize, useSplitSend, sources, len);
 
     SFID sfid = SFID::DP_DC1;
 
@@ -2389,7 +2385,7 @@ int IR_Builder::translateByteGatherInst(
 
     G4_SrcRegRegion *msgs[2] = {0, 0};
     unsigned sizes[2] = {0, 0};
-    preparePayload(msgs, sizes, std::min(exSize, instExSize), useSplitSend, sources, len);
+    preparePayload(msgs, sizes, exSize, useSplitSend, sources, len);
 
     SFID sfid = SFID::DP_DC0;
 
@@ -2503,7 +2499,7 @@ int IR_Builder::translateByteScatterInst(
 
     G4_SrcRegRegion *msgs[2] = {0, 0};
     unsigned sizes[2] = {0, 0};
-    preparePayload(msgs, sizes, std::min(exSize, instExSize), useSplitSend, sources, len);
+    preparePayload(msgs, sizes, exSize, useSplitSend, sources, len);
 
     SFID sfid = SFID::DP_DC0;
 
@@ -2864,7 +2860,7 @@ int IR_Builder::translateVISASVMScatterWriteInst(
         (TypeSize(srcType) != 4))
         src->setType(*this, Type_UD);
 
-    preparePayload(msgs, sizes, std::min(exSize, instExSize), useSplitSend, sources, len);
+    preparePayload(msgs, sizes, exSize, useSplitSend, sources, len);
 
     // set the type back in case we changed it for preparePayload
     src->setType(*this, srcType);