Changes in code.

Author: Dimus77

visa/HWConformity.cpp

@@ -346,12 +346,6 @@ G4_SrcRegRegion* HWConformity::insertCopyAtBBEntry(G4_BB* bb, G4_ExecSize execSi
 G4_Operand* HWConformity::insertMovBefore(
     INST_LIST_ITER it, uint32_t srcNum, G4_Type type, G4_BB* bb,
     G4_SubReg_Align tmpAlign)
-{
-    return insertMovBefore(it, srcNum, type, bb, 0, tmpAlign);
-}
-
-G4_Operand* HWConformity::insertMovBefore(INST_LIST_ITER it, uint32_t srcNum, G4_Type type, G4_BB* bb,
-    uint16_t tmpStride, G4_SubReg_Align tmpAlign)
 {
     G4_INST* inst = *it;
     G4_SubReg_Align subAlign;
@@ -366,20 +360,13 @@ G4_Operand* HWConformity::insertMovBefore(INST_LIST_ITER it, uint32_t srcNum, G4
 
     if (newExecSize > 1)
     {
-        if (tmpStride)
+        if (scale == 1 && !IS_VTYPE(src->getType()))
         {
-            scale = tmpStride;
+            scale = (uint16_t)(getTypeSize(src->getType()) / getTypeSize(type));
         }
-        else
+        if (scale == 0)
         {
-            if (scale == 1 && !IS_VTYPE(src->getType()))
-            {
-                scale = (uint16_t)(getTypeSize(src->getType()) / getTypeSize(type));
-            }
-            if (scale == 0)
-            {
-                scale = 1;
-            }
+            scale = 1;
         }
         region = builder.createRegionDesc(scale, 1, 0);
     }
@@ -4015,24 +4002,7 @@ bool HWConformity::generateAlign1Mad(G4_BB* bb, INST_LIST_ITER iter)
             }
             else
             {
-                // Promote src2 from :b to :w to allow mad, for example:
-                //     pseudo_mad (16) V211(0,0)<1>:d V210(0,0)<1;0>:d V106(0,0)<0;0>:b V81(0,0)<1;0>:d
-                //  =>
-                //     mov (1) TV74(0,0)<1>:w V106(0,0)<0;1,0>:b {Q1, Align1, NoMask}
-                //     mad (16) V211(0,0)<1>:d V81(0,0)<1;0>:d V210(0,0)<1;0>:d TV74(0,0)<0;0>:w {H1, Align1}
-
-                bool isSrc2 = (k == 0);
-                if (builder.noSrc2Regioning() && isSrc2 && IS_BTYPE(src->getType()))
-                {
-                    G4_Type type = (src->getType() == Type_UB) ? Type_UW : Type_W;
-                    auto dstStrideInBytes = inst->getDst()->getHorzStride() * getTypeSize(inst->getDst()->getType());
-                    uint16_t stride = (uint16_t)(dstStrideInBytes / getTypeSize(type));
-                    inst->setSrc(insertMovBefore(iter, k, type, bb, stride, GRFALIGN), k);
-                }
-                else
-                {
-                    return false;
-                }
+                return false;
             }
         }
         else

visa/HWConformity.h

@@ -79,8 +79,6 @@ namespace vISA
         G4_DstRegRegion* insertMovAfter(INST_LIST_ITER& it, G4_DstRegRegion* dst, G4_Type type, G4_BB *bb, G4_SubReg_Align dstAlign = Any);
         G4_Operand* insertMovBefore(INST_LIST_ITER it, uint32_t srcNum, G4_Type type, G4_BB *bb,
             G4_SubReg_Align tmpAlign = Any);
-        G4_Operand* insertMovBefore(INST_LIST_ITER it, uint32_t srcNum, G4_Type type, G4_BB* bb,
-            uint16_t stride, G4_SubReg_Align tmpAlign = Any);
 
         // replace src <srcNum> for inst <*it> with a temp variable of type <type>
         // This is used to satisfy various HW restrictions on src type/alignment/region/modifier/etc.