Fix packed immediate handling on platforms that don't have byte regioning.

Author: weiyu-chen

visa/HWConformity.cpp

@@ -442,40 +442,37 @@ G4_Operand* HWConformity::insertMovBefore(INST_LIST_ITER it, uint32_t srcNum, G4
         dcl->getElemType());
 }
 
-void HWConformity::fixPackedSource(INST_LIST_ITER it, G4_BB* bb, G4_Type extype)
+void HWConformity::fixPackedSource(INST_LIST_ITER it, G4_BB* bb)
 {
     G4_INST* inst = *it;
 
     bool nonTypeWFound = false, nonTypeFFound = false, incompatibleTypeFound = false;
 
     for (int i = 0; i < inst->getNumSrc(); i++)
     {
-        G4_Operand* src = inst->getSrc(i);
-        if (!src || !(IS_VTYPE(src->getType())))
+        auto src = inst->getSrc(i);
+        if (!src)
+        {
+            continue;
+        }
+        if (!IS_VTYPE(src->getType()))
         {
             // Make sure other src operands are of word type only as this is a HW requirement
-            if (src &&
-                (src->getType() != Type_W &&
-                    src->getType() != Type_UW))
+            if (src->getType() != Type_W && src->getType() != Type_UW)
             {
                 nonTypeWFound = true;
             }
-            if (src &&
-                (src->getType() != Type_F))
+            if (src->getType() != Type_F)
             {
                 nonTypeFFound = true;
             }
             continue;
         }
-        G4_Type target_type = Type_W;
-        if (src->getType() == Type_VF)
-        {
-            target_type = Type_F;
-        }
-
-        if (target_type == Type_W && nonTypeWFound == true)
+        G4_Type target_type = src->getType() == Type_VF ? Type_F : Type_W;
+        if (target_type == Type_W && (nonTypeWFound || !builder.hasByteALU()))
         {
             // non-word type src is not allowed to co-exist with :v src
+            // also if platform lacks byte regioning :v src may be incompatible with later legalization
             incompatibleTypeFound = true;
         }
         else if (target_type == Type_F && nonTypeFFound == true)
@@ -484,10 +481,8 @@ void HWConformity::fixPackedSource(INST_LIST_ITER it, G4_BB* bb, G4_Type extype)
             incompatibleTypeFound = true;
         }
 
-        // Insert a move only if immediate operand is not
-        // last src operand
-        if (i != inst->getNumSrc() - 1 ||
-            incompatibleTypeFound == true)
+        // Insert a move only if immediate operand is not last src operand
+        if (i != inst->getNumSrc() - 1 || incompatibleTypeFound == true)
         {
             inst->setSrc(insertMovBefore(it, i, target_type, bb), i);
         }

visa/HWConformity.h

@@ -106,7 +106,7 @@ namespace vISA
         G4_SubReg_Align getDclAlignment(int opndBytes, G4_INST *inst, bool isScalar);
 
         // HW conformity check functions
-        void fixPackedSource(INST_LIST_ITER it, G4_BB *bb, G4_Type extype);
+        void fixPackedSource(INST_LIST_ITER it, G4_BB *bb);
         bool fixMathInst(INST_LIST_ITER it, G4_BB *bb);
         bool fixMULInst(INST_LIST_ITER &it, G4_BB *bb);
         void fixMULHInst(INST_LIST_ITER &i, G4_BB *bb);

visa/ReduceExecSize.cpp

@@ -162,7 +162,7 @@ bool HWConformity::fixInstOpndTypeAlign(INST_LIST_ITER i, G4_BB* bb)
 
     if (extypesize == numEltPerGRF<Type_UB>()/2 && inst->opcode() != G4_mov)
     {
-        fixPackedSource(i, bb, extype);
+        fixPackedSource(i, bb);
         extype = inst->getOpExecType(extypesize);
     }
 

visa/VisaToG4/TranslateSend3D.cpp

@@ -122,11 +122,10 @@ int IR_Builder::translateVISASampleInfoInst(
     else
     {
         useHeader = false;
-        msg = createTempVar(8, Type_UD, Any);
+        msg = createTempVar(getNativeExecSize(), Type_UD, GRFALIGN);
         G4_DstRegRegion *dst = createDst(msg->getRegVar(), 0, 0, 1, Type_UD);
         G4_Imm* src0Imm = createImm(0, Type_UD);
-        auto temp = createMov(g4::SIMD8, dst, src0Imm, InstOpt_NoOpt, true);
-        temp->setOptionOn(InstOpt_WriteEnable);
+        (void) createMov(getNativeExecSize(), dst, src0Imm, InstOpt_WriteEnable, true);
         m0 = createSrc(msg->getRegVar(), 0, 0, getRegionStride1(), Type_UD);
     }
     // Now create message descriptor