Changes in code.

Author: Dimus77

visa/BuildIR.h

@@ -588,11 +588,11 @@ class IR_Builder
 
     //
     // Check if opnd is or can be made "alignByte"-byte aligned.
-    // It will change the underlying variable's alignment
-    // (e.g., make a scalar variable GRF-aligned) when possible to satisfy the alignment
+    // These functions will change the underlying variable's alignment
+    // (e.g., make a scalar variable GRF-aligned) when possible to satisfy
+    // the alignment
     bool isOpndAligned(G4_Operand* opnd, int alignByte) const;
-    // Use this version if you want to know the fixed subreg offset for the operand even if it's not aligned.
-    std::tuple<bool, uint16_t> isOpndAlignedTo(G4_Operand *opnd, int align_byte) const;
+    bool isOpndAligned(G4_Operand *opnd, unsigned short &offset, int align_byte) const;
 
     void setIsKernel(bool value) { isKernel = value; }
     bool getIsKernel() const { return isKernel; }

visa/BuildIRImpl.cpp

@@ -164,10 +164,10 @@ void IR_Builder::bindInputDecl(G4_Declare* dcl, int offset)
 }
 
 // check if an operand is aligned to <align_byte>
-std::tuple<bool, uint16_t> IR_Builder::isOpndAlignedTo(
-    G4_Operand *opnd, int align_byte) const
+bool IR_Builder::isOpndAligned(
+    G4_Operand *opnd, unsigned short &offset, int align_byte) const
 {
-    uint16_t offset = 0;
+    offset = 0;
     bool isAligned = true;
 
     switch (opnd->getKind())
@@ -209,7 +209,7 @@ std::tuple<bool, uint16_t> IR_Builder::isOpndAlignedTo(
         }
         if (!isAligned)
         {
-            return std::make_tuple(isAligned, offset);
+            return isAligned;
         }
 
         if (opnd->isDstRegRegion())
@@ -230,7 +230,7 @@ std::tuple<bool, uint16_t> IR_Builder::isOpndAlignedTo(
         }
         if (offset % align_byte != 0)
         {
-            return std::make_tuple(false, offset);
+            return false;
         }
         // Only alignment of the top dcl can be changed.
         if (dcl && dcl->getRegFile() == G4_GRF)
@@ -355,14 +355,14 @@ std::tuple<bool, uint16_t> IR_Builder::isOpndAlignedTo(
     default:
         break;
     }
-    return std::make_tuple(isAligned, offset);
+    return isAligned;
 }
 
 
 bool IR_Builder::isOpndAligned(G4_Operand* opnd, int alignByte) const
 {
-    auto [isAligned, offset] = isOpndAlignedTo(opnd, alignByte);
-    return isAligned;
+    uint16_t offset = 0; // ignored
+    return isOpndAligned(opnd, offset, alignByte);
 }
 
 

visa/HWConformity.cpp

@@ -1591,8 +1591,8 @@ bool HWConformity::fixDstAlignment(INST_LIST_ITER i, G4_BB* bb, G4_Type extype,
     bool dstHFMixModeInst = inst->getDst()->getType() == builder.getMixModeType() && extype == Type_F;
     bool dstNotAlignedToExecType = exec_size > 1 && (dst_elsize * h_stride) < extypesize &&
         !(builder.hasMixMode() && dstHFMixModeInst);
-
-    auto [isAligned, dst_byte_offset] = builder.isOpndAlignedTo(dst, extypesize);
+    unsigned short dst_byte_offset;
+    builder.isOpndAligned(dst, dst_byte_offset, extypesize);
     if (!((dst_byte_offset % extypesize == 0) ||
         (byteDst &&
         (dst_byte_offset % extypesize == 1))
@@ -4736,7 +4736,8 @@ void HWConformity::fixSendInst(G4_BB* bb)
             }
         }
 
-        if (!builder.isOpndAligned(inst->getDst(), numEltPerGRF(Type_UB)))
+        uint16_t offset = 0;
+        if (!builder.isOpndAligned(inst->getDst(), offset, numEltPerGRF(Type_UB)))
         {
             replaceDst(i, inst->getDst()->getType(), GRFALIGN);
         }

visa/ReduceExecSize.cpp

@@ -452,8 +452,10 @@ bool HWConformity::reduceExecSize(INST_LIST_ITER iter, G4_BB* bb)
                             if (dstRegionSize <= 16)
                             {
                                 // see if we can make the dst fit in one oword
+                                unsigned short dstOffset = 0;
+                                bool dstOwordAligned = false;
                                 int dstAlign = Round_Up_Pow2(dstRegionSize);
-                                auto [dstOwordAligned, dstOffset] = builder.isOpndAlignedTo(dst, dstAlign);
+                                dstOwordAligned = builder.isOpndAligned(dst, dstOffset, dstAlign);
                                 if (!dstOwordAligned)
                                 {
                                     // If we can align dst to its size, it must fit in one OWord
@@ -465,7 +467,7 @@ bool HWConformity::reduceExecSize(INST_LIST_ITER iter, G4_BB* bb)
                                         // technically if dst and src are both evenly split the instruction is
                                         // still ok, but this case should be rare so we ignore it
                                         G4_DstRegRegion* newDst = insertMovAfter(iter, dst, dst->getType(), bb);
-                                        bool alignTmpDst = builder.isOpndAligned(newDst, 16);
+                                        bool alignTmpDst = builder.isOpndAligned(newDst, dstOffset, 16);
                                         MUST_BE_TRUE(alignTmpDst, "must be able to oword align tmp dst");
                                         inst->setDest(newDst);
                                         return true;