small cleanup of accumulator related code

Change-Id: I11dbdc8d9289e3dafba93f8584a2780a8b3fea2c

Author: weiyu-chen

visa/BinaryEncodingIGA.cpp

@@ -70,6 +70,58 @@ mem(m), kernel(k), fileName(fname), m_kernelBuffer(nullptr), m_kernelBufferSize(
     IGAKernel = new iga::Kernel(*platformModel);
 }
 
+iga::InstOptSet BinaryEncodingIGA::getIGAInstOptSet(G4_INST* inst) const
+{
+    iga::InstOptSet options;
+
+    if (inst->isAccWrCtrlInst() && kernel.fg.builder->encodeAccWrEn())
+    {
+        options.add(iga::InstOpt::ACCWREN);
+    }
+    if (inst->isAtomicInst())
+    {
+        options.add(iga::InstOpt::ATOMIC);
+    }
+    if (inst->isBreakPointInst())
+    {
+        options.add(iga::InstOpt::BREAKPOINT);
+    }
+    if (inst->isNoDDChkInst())
+    {
+        options.add(iga::InstOpt::NODDCHK);
+    }
+    if (inst->isNoDDClrInst())
+    {
+        options.add(iga::InstOpt::NODDCLR);
+    }
+    if (inst->isNoPreemptInst())
+    {
+        options.add(iga::InstOpt::NOPREEMPT);
+    }
+    if (inst->isYieldInst())
+    {
+        options.add(iga::InstOpt::SWITCH);
+    }
+    if (inst->isSend())
+    {
+        if (inst->isEOT())
+        {
+            options.add(iga::InstOpt::EOT);
+        }
+        if (inst->isNoSrcDepSet())
+        {
+            options.add(iga::InstOpt::NOSRCDEPSET);
+        }
+    }
+    if (inst->isNoCompactedInst())
+    {
+        options.add(iga::InstOpt::NOCOMPACT);
+    }
+
+    return options;
+}
+
+
 void BinaryEncodingIGA::FixInst()
 {
     for (auto bb : kernel.fg.BBs)

visa/BinaryEncodingIGA.h

@@ -331,56 +331,7 @@ class BinaryEncodingIGA
             return iga::ImmVal::UNDEF;
         }
     }
-    iga::InstOptSet getIGAInstOptSet(G4_INST* inst) const
-    {
-        iga::InstOptSet options;
-
-        if (inst->isAccWrCtrlInst())
-        {
-            options.add(iga::InstOpt::ACCWREN);
-        }
-        if (inst->isAtomicInst())
-        {
-            options.add(iga::InstOpt::ATOMIC);
-        }
-        if (inst->isBreakPointInst())
-        {
-            options.add(iga::InstOpt::BREAKPOINT);
-        }
-        if (inst->isNoDDChkInst())
-        {
-            options.add(iga::InstOpt::NODDCHK);
-        }
-        if (inst->isNoDDClrInst())
-        {
-            options.add(iga::InstOpt::NODDCLR);
-        }
-        if (inst->isNoPreemptInst())
-        {
-            options.add(iga::InstOpt::NOPREEMPT);
-        }
-        if (inst->isYieldInst())
-        {
-            options.add(iga::InstOpt::SWITCH);
-        }
-        if (inst->isSend())
-        {
-            if (inst->isEOT())
-            {
-                options.add(iga::InstOpt::EOT);
-            }
-            if (inst->isNoSrcDepSet())
-            {
-                options.add(iga::InstOpt::NOSRCDEPSET);
-            }
-        }
-        if (inst->isNoCompactedInst())
-        {
-            options.add(iga::InstOpt::NOCOMPACT);
-        }
-
-        return options;
-    }
+    iga::InstOptSet getIGAInstOptSet(G4_INST* inst) const;
 
     iga::SendDescArg getIGASendDescArg(G4_INST* sendInst) const;
     iga::SendDescArg getIGASendExDescArg(G4_INST* sendInst) const;

visa/Gen4_IR.cpp

@@ -3464,11 +3464,6 @@ G4_INST::emit_options(std::ostream& output)
         tmpOption |= InstOpt_EOT;
     }
 
-    // must set AccWrCtrl explicitly in GT+
-    if( isAccWrCtrlInst() || (isFlowControl() && asCFInst()->isBackward()) ) {
-        tmpOption |= InstOpt_AccWrCtrl;
-    }
-
     //emit mask option
     output << "{";
     switch (getMaskOffset())
@@ -4409,9 +4404,9 @@ void G4_DstRegRegion::computeLeftBound()
     else if ( base != NULL && base->isAccReg())
     {
         left_bound = subRegOff * G4_Type_Table[type].byteSize;
-        if( base->asAreg()->getArchRegType() == AREG_ACC1 || regOff == 1 )
+        if (base->asAreg()->getArchRegType() == AREG_ACC1 || regOff == 1)
         {
-            left_bound += 32;  // TODO: size of ACC is assumed to be 32 BYTEs.
+            left_bound += getGRFSize();
         }
         byteOffset = left_bound;
     } else if( top_dcl ){

visa/HWCapsOpen.inc

@@ -473,4 +473,10 @@
         return 4;
     }
 
+    bool encodeAccWrEn() const
+    {
+        return true;
+    }
+
+
     // end HW capabilities

visa/HWConformity.cpp

@@ -5406,12 +5406,10 @@ void HWConformity::fixSADA2Inst( BB_LIST_ITER it )
 
             // make sure there are no instructions between the sada2's new location
             // and the src2-defining instruction that updates acc
-            for( INST_LIST_ITER iter = newSada2Iter; *iter != src2Dst; --iter )
+            for (auto iter = newSada2Iter; *iter != src2Dst; --iter)
             {
                 G4_INST* aInst = *iter;
-                if( aInst->isAccDstInst() || aInst->isAccWrCtrlInst() ||
-                    ( aInst->opcode() == G4_mulh &&
-                    IS_DTYPE(aInst->getSrc(0)->getType()) && IS_DTYPE(aInst->getSrc(1)->getType()) ) )
+                if (aInst->hasACCOpnd())
                 {
                     canDoSada2 = false;
                     break;