Remove some unnecessary divergent CF checks.

Change-Id: Iff355c519e7126e54d8785086535e8a2f97a3010

Author: weiyu-chen

visa/HWConformity.cpp

@@ -943,10 +943,8 @@ bool HWConformity::fixLine(INST_LIST_ITER it, G4_BB *bb)
             new_dst_opnd = builder.Create_Dst_Opnd_From_Dcl(src0_dcl, 1);
 
             G4_INST* newInst = builder.createMov(mov_size, new_dst_opnd, src0, InstOpt_NoOpt, false);
-            if (bb->isInSimdFlow())
-            {
-                newInst->setNoMask(true);
-            }
+            newInst->setNoMask(true);
+
             bb->insert(it, newInst);
             inst->setSrc(new_src0_opnd, 0);
             return true;
@@ -2320,10 +2318,7 @@ bool HWConformity::fixMULInst( INST_LIST_ITER &i, G4_BB *bb )
     inst->setDest(acc_dst_opnd);
     fixMulSrc1(i, bb);
 
-    if (bb->isInSimdFlow())
-    {
-        inst->setNoMask(true);
-    }
+    inst->setNoMask(true);
 
     if (pred != NULL) {
         // conditional modifier cannot be used
@@ -2661,10 +2656,8 @@ void HWConformity::fixMULHInst( INST_LIST_ITER &i, G4_BB *bb )
     iter--;
     fixMulSrc1(iter, bb);
 
-    if (bb->isInSimdFlow())
-    {
-        newMul->setNoMask(true);
-    }
+    newMul->setNoMask(true);
+
     inst->setOpcode( G4_mach );
 
     if (src1->isImm() && src0->getType() != src1->getType())

visa/ReduceExecSize.cpp

@@ -1584,10 +1584,6 @@ void HWConformity::moveSrcToGRF( INST_LIST_ITER it, uint32_t srcNum, uint16_t nu
     G4_INST* newInst = builder.createMov(
         execSize, dstRegion, src, (bb->isInSimdFlow() ? InstOpt_WriteEnable : InstOpt_NoOpt), false);
 
-    if( bb->isInSimdFlow() )
-    {
-        newInst->setOptionOn( InstOpt_WriteEnable );
-    }
     // insert instruction and maintain def-use chain
     bb->insert( it, newInst );
     inst->transferDef( newInst, Gen4_Operand_Number(srcNum + 1), Opnd_src0 );
@@ -1634,10 +1630,8 @@ void HWConformity::saveDst( INST_LIST_ITER& it, uint8_t stride, G4_BB *bb )
     unsigned int new_option = inst->getOption();
 
     G4_INST* newInst = builder.createMov(execSize, tmpDstOpnd, srcRegion, new_option, false);
-    if (bb->isInSimdFlow())
-    {
-        newInst->setNoMask(true);
-    }
+    newInst->setNoMask(true);
+
     bb->insert(it, newInst);
     inst->setDest(builder.duplicateOperand( tmpDstOpnd ) );
 }
@@ -1656,10 +1650,8 @@ void HWConformity::restoreDst( INST_LIST_ITER& it, G4_DstRegRegion *origDst, G4_
     unsigned int new_option = inst->getOption();
 
     G4_INST* newInst = builder.createMov(execSize, origDst, srcRegion, new_option, false);
-    if (bb->isInSimdFlow())
-    {
-        newInst->setNoMask(true);
-    }
+    newInst->setNoMask(true);
+
     INST_LIST_ITER iter = it;
     iter++;
     bb->insert( iter, newInst );
@@ -1730,25 +1722,24 @@ void  HWConformity::removeBadSrc( INST_LIST_ITER& iter, G4_BB *bb, bool crossGRF
     for (int i = 0; i < inst->getNumSrc(); i++)
     {
 
-        if( badTwoGRFSrc[i] )
+        if (badTwoGRFSrc[i])
         {
-            if( !crossGRFDst ||
-                ( dst && IS_DTYPE( dst->getType() ) && IS_WTYPE(inst->getSrc(i)->getType()) ) )
+            if (!crossGRFDst ||
+                (dst && IS_DTYPE(dst->getType()) && IS_WTYPE(inst->getSrc(i)->getType())))
             {
-                //moveSrcToGRF( iter, i, 1, bb, invDUTab );
-                inst->setSrc( insertMovBefore( iter, i, inst->getSrc(i)->getType(), bb ), i );
+                inst->setSrc(insertMovBefore(iter, i, inst->getSrc(i)->getType(), bb), i);
             }
             else
             {
-                moveSrcToGRF( iter, i, 2, bb );
+                moveSrcToGRF(iter, i, 2, bb);
             }
             badTwoGRFSrc[i] = false;
             INST_LIST_ITER tmpIter = iter;
             tmpIter--;
-            reduceExecSize( tmpIter, bb );
-            if( builder.getOption(vISA_OptReport) )
+            reduceExecSize(tmpIter, bb);
+            if (builder.getOption(vISA_OptReport))
             {
-                (*tmpIter)->emit( std::cout );
+                (*tmpIter)->emit(std::cout);
                 std::cout << std::endl;
             }
         }