[Autobackout][FuncReg]Revert of change: 79becf3

group instructions together for performance

Change-Id: I64363cee1803608d9060607779edd5184d557d7a

Author: bcheng0127

visa/Gen4_IR.cpp

@@ -8199,34 +8199,3 @@ G4_INST* G4_InstMath::cloneInst()
         src0, src1, getMathCtrl(), option, getLineNo(), getCISAOff(), getSrcFilename());
 }
 
-
-bool G4_INST::isRMWCombinCandidate(G4_INST *next)
-{
-    if (isSend() || next->isSend())
-    {
-        return false;
-    }
-
-    G4_Operand* dst = getDst();
-    G4_Operand* nextDst = next->getDst();
-    //The current instruction must has Integer macro dst as well
-    if (nextDst &&
-        nextDst->isGen12IntegerMacroDst() &&
-        dst->getType() == nextDst->getType())
-    {
-
-        unsigned short lastLB = (unsigned short)dst->getLinearizedStart();
-        unsigned short lastRB = (unsigned short)dst->getLinearizedEnd();
-        unsigned short nextLB = (unsigned short)nextDst->getLinearizedStart();
-        unsigned short nextRB = (unsigned short)nextDst->getLinearizedEnd();
-
-        if (lastLB / G4_GRF_REG_NBYTES == nextLB / G4_GRF_REG_NBYTES &&
-            lastRB / G4_GRF_REG_NBYTES == nextRB / G4_GRF_REG_NBYTES &&
-            dst->compareOperand(nextDst) == Rel_disjoint)
-        {
-            return true;
-        }
-    }
-
-    return false;
-}

visa/Gen4_IR.hpp

@@ -954,7 +954,6 @@ class G4_INST
     }
 
     bool mayExpandToAccMacro() const;
-    bool isRMWCombinCandidate(G4_INST* next);
 
     Gen4_Operand_Number getSrcOperandNum(int srcPos) const
     {
@@ -2324,25 +2323,6 @@ class G4_Operand
                 return type;
         }
     }
-    bool isGen12IntegerMacroDst()
-    {
-        if (isNullReg())
-        {
-            return false;
-        }
-
-        if (type == Type_UW ||
-            type == Type_W ||
-            type == Type_B ||
-            type == Type_UB ||
-            type == Type_D ||
-            type == Type_UD)
-        {
-            return true;
-        }
-
-        return false;
-    }
 };
 
 class G4_VarBase

visa/LocalScheduler/SWSB_G4IR.cpp

@@ -4451,6 +4451,7 @@ void G4_BB_SB::SBDDD(G4_BB* bb,
             getGRFBucketDescrs(node, liveBDvec, false);
         }
 
+
         // For ALU instructions without GRF usage
         if (distanceHonourInstruction(curInst))
         {

visa/LocalScheduler/SWSB_G4IR.h

@@ -136,23 +136,6 @@ namespace vISA
 
         void setOffset(unsigned short o) { offset = o; }
 
-        bool hasOverlap(SBFootprint* liveFootprint) const
-        {
-            SBFootprint* curFootprint2Ptr = liveFootprint;
-            while (curFootprint2Ptr)
-            {
-                // Negative of no overlap: !(LeftB > curFootprint2Ptr->RightB || RightB < curFootprint2Ptr->LeftB)
-                if (fType == curFootprint2Ptr->fType &&
-                    LeftB <= curFootprint2Ptr->RightB && RightB >= curFootprint2Ptr->LeftB)
-                {
-                    return true;
-                }
-                curFootprint2Ptr = curFootprint2Ptr->next;
-            }
-
-            return false;
-        }
-
         bool hasOverlap(SBFootprint *liveFootprint, unsigned short &internalOffset) const
         {
             SBFootprint *curFootprint2Ptr = liveFootprint;