Changes in code.

Author: sys-igc

visa/GraphColor.cpp

@@ -6103,129 +6103,8 @@ void GraphColor::computeDegreeForARF()
 
 void GraphColor::computeSpillCosts(bool useSplitLLRHeuristic)
 {
-    std::vector <LiveRange*> addressSensitiveVars;
+    std::vector <LiveRange *> addressSensitiveVars;
     float maxNormalCost = 0.0f;
-    VarReferences directRefs(kernel);
-    std::list<std::pair<G4_INST*, G4_BB*>> indirectRefs;
-
-    if (liveAnalysis.livenessClass(G4_GRF))
-    {
-        // gather all instructions with indirect operands
-        // for ref count computation once.
-        for (auto bb : kernel.fg.getBBList())
-        {
-            for (auto inst : bb->getInstList())
-            {
-                auto dst = inst->getDst();
-                if (dst && dst->isIndirect())
-                {
-                    indirectRefs.push_back(std::make_pair(inst, bb));
-                    continue;
-                }
-
-                for (unsigned int i = 0; i != inst->getNumSrc(); ++i)
-                {
-                    auto src = inst->getSrc(i);
-                    if (!src || !src->isSrcRegRegion() || !src->asSrcRegRegion()->isIndirect())
-                    {
-                        continue;
-                    }
-                    indirectRefs.push_back(std::make_pair(inst, bb));
-                    continue;
-                }
-            }
-        }
-    }
-
-    auto getWeightedRefCount = [&](G4_Declare* dcl, unsigned int useWt = 1, unsigned int defWt = 1)
-    {
-        auto defs = directRefs.getDefs(dcl);
-        auto uses = directRefs.getUses(dcl);
-        auto& loops = kernel.fg.getLoops();
-
-        unsigned int refCount = 0;
-        const unsigned int assumeLoopIter = 10;
-
-        if (defs)
-        {
-            for (auto def : *defs)
-            {
-                auto* bb = std::get<1>(def);
-                auto* innerMostLoop = loops.getInnerMostLoop(bb);
-                if (innerMostLoop)
-                {
-                    auto nestingLevel = innerMostLoop->getNestingLevel();
-                    refCount += (unsigned int)std::pow(assumeLoopIter, nestingLevel);
-                }
-                else
-                    refCount += defWt;
-            }
-        }
-
-        if (uses)
-        {
-            for (auto use : *uses)
-            {
-                auto* bb = std::get<1>(use);
-                auto* innerMostLoop = loops.getInnerMostLoop(bb);
-                if (innerMostLoop)
-                {
-                    auto nestingLevel = innerMostLoop->getNestingLevel();
-                    refCount += (unsigned int)std::pow(assumeLoopIter, nestingLevel);
-                }
-                else
-                    refCount += useWt;
-            }
-        }
-
-        if (dcl->getAddressed())
-        {
-            for (auto& item : indirectRefs)
-            {
-                auto inst = item.first;
-                auto bb = item.second;
-
-                auto dst = inst->getDst();
-                if (dst && dst->isIndirect())
-                {
-                    if (liveAnalysis.getPointsToAnalysis().isPresentInPointsTo(dst->getTopDcl()->getRegVar(), dcl->getRegVar()))
-                    {
-                        auto* innerMostLoop = loops.getInnerMostLoop(bb);
-                        if (innerMostLoop)
-                        {
-                            auto nestingLevel = innerMostLoop->getNestingLevel();
-                            refCount += (unsigned int)std::pow(assumeLoopIter, nestingLevel);
-                        }
-                        else
-                            refCount += useWt;
-                    }
-                }
-
-                for (unsigned int i = 0; i != inst->getNumSrc(); ++i)
-                {
-                    auto src = inst->getSrc(i);
-                    if (!src || !src->isSrcRegRegion() || !src->asSrcRegRegion()->isIndirect())
-                    {
-                        continue;
-                    }
-                    if (liveAnalysis.getPointsToAnalysis().isPresentInPointsTo(src->asSrcRegRegion()->getTopDcl()->getRegVar(), dcl->getRegVar()))
-                    {
-                        auto* innerMostLoop = loops.getInnerMostLoop(bb);
-                        if (innerMostLoop)
-                        {
-                            auto nestingLevel = innerMostLoop->getNestingLevel();
-                            refCount += (unsigned int)std::pow(assumeLoopIter, nestingLevel);
-                        }
-                        else
-                            refCount += useWt;
-                    }
-                }
-
-            }
-        }
-
-        return refCount == 0 ? 1 : refCount;
-    };
 
     auto incSpillCostCandidate = [&](LiveRange* lr)
     {
@@ -6237,7 +6116,7 @@ void GraphColor::computeSpillCosts(bool useSplitLLRHeuristic)
 
         // this condition is a safety measure and isnt expected to be true.
         auto it = revAddrTakenMap.find(lr->getDcl());
-        if (it == revAddrTakenMap.end())
+        if(it == revAddrTakenMap.end())
             return true;
 
         for (auto& addrVar : (*it).second)
@@ -6315,43 +6194,22 @@ void GraphColor::computeSpillCosts(bool useSplitLLRHeuristic)
             {
                 if (useSplitLLRHeuristic)
                 {
-                    spillCost = 1.0f * lrs[i]->getRefCount() / (lrs[i]->getDegree() + 1);
+                    spillCost = 1.0f*lrs[i]->getRefCount() / (lrs[i]->getDegree() + 1);
                 }
                 else
                 {
                     assert(lrs[i]->getDcl()->getTotalElems() > 0);
-                    if (!liveAnalysis.livenessClass(G4_GRF))
-                    {
-                        // address or flag variables
-                        unsigned short numRows = lrs[i]->getDcl()->getNumRows();
-                        spillCost = 1.0f * lrs[i]->getRefCount() * lrs[i]->getRefCount() * lrs[i]->getDcl()->getByteSize() *
-                            (float)sqrt(lrs[i]->getDcl()->getByteSize())
-                            / ((float)sqrt(lrs[i]->getDegree() + 1) * (float)(sqrt(sqrt(numRows))));
-                    }
-                    else
-                    {
-                        // GRF variables
-
-                        auto refCount = getWeightedRefCount(lrs[i]->getDcl());
-                        unsigned int degree = 0;
-                        {
-                            for (unsigned int j = 0; j != getIntf()->getSparseIntfForVar(i).size(); ++j)
-                            {
-                                if (lrs[j]->getDcl()->getByteSize() >= (unsigned int)getGRFSize() / 2)
-                                    degree += lrs[j]->getDcl()->getNumRows() + lrs[i]->getDcl()->getNumRows() - 1;
-                            }
-                        }
-
-                        spillCost = 1.0f * refCount * refCount * refCount
-                            / ((float)(degree + 1) * (float)(degree + 1));
-                    }
+                    unsigned short numRows = lrs[i]->getDcl()->getNumRows();
+                    spillCost = 1.0f * lrs[i]->getRefCount() * lrs[i]->getRefCount() * lrs[i]->getDcl()->getByteSize() *
+                        (float)sqrt(lrs[i]->getDcl()->getByteSize())
+                        / ((float)sqrt(lrs[i]->getDegree() + 1) * (float)(sqrt(sqrt(numRows))));
                 }
             }
             else
             {
                 spillCost =
                     liveAnalysis.livenessClass(G4_GRF) ?
-                    lrs[i]->getDegree() : 1.0f * lrs[i]->getRefCount() * lrs[i]->getRefCount() / (lrs[i]->getDegree() + 1);
+                    lrs[i]->getDegree() : 1.0f*lrs[i]->getRefCount()*lrs[i]->getRefCount() / (lrs[i]->getDegree() + 1);
             }
 
             lrs[i]->setSpillCost(spillCost);
@@ -6379,7 +6237,7 @@ void GraphColor::computeSpillCosts(bool useSplitLLRHeuristic)
     // normal live ranges, so that they get colored before all the normal
     // live ranges.
     //
-    for (LiveRange* lr : addressSensitiveVars)
+    for (LiveRange *lr : addressSensitiveVars)
     {
         if (lr->getSpillCost() != MAXSPILLCOST)
         {
@@ -6389,7 +6247,6 @@ void GraphColor::computeSpillCosts(bool useSplitLLRHeuristic)
 }
 
 
-
 //
 // subtract lr's neighbors that are still in work list
 //