Fix location attribution of join instructions in

VISA debug info. Also fixed a problem where spill/fill intrinsics were
not correctly mapped to debug info after lowering them to LSC.

Fix location attribution of join instructions in
VISA debug info. Join instructions should not be attributed to
instruction following them because that would make debugger stop at the
join where necessary SIMD lanes havent been enabled.

Also fixed a problem where spill/fill intrinsics were
not correctly mapped to debug info after lowering them to LSC.

Author: pratikashar

visa/FlowGraph.cpp

@@ -3068,7 +3068,7 @@ void FlowGraph::insertJoinToBB(G4_BB* bb, G4_ExecSize execSize, G4_Label* jip)
     {
         // insert join at the end
         G4_INST* jInst = builder->createInternalCFInst(NULL, G4_join, execSize, jip, NULL, InstOpt_NoOpt);
-        bb->push_back(jInst);
+        bb->push_back(jInst, false);
     }
     else
     {
@@ -3084,7 +3084,7 @@ void FlowGraph::insertJoinToBB(G4_BB* bb, G4_ExecSize execSize, G4_Label* jip)
         else
         {
             G4_INST* jInst = builder->createInternalCFInst(NULL, G4_join, execSize, jip, NULL, InstOpt_NoOpt);
-            bb->insertBefore(iter, jInst);
+            bb->insertBefore(iter, jInst, false);
         }
     }
 }

visa/G4_BB.hpp

@@ -119,18 +119,22 @@ class G4_BB
         return instList.insert(iter, first, last);
     }
 
-    INST_LIST_ITER insertBefore(INST_LIST::iterator iter, G4_INST* inst)
+    INST_LIST_ITER insertBefore(INST_LIST::iterator iter, G4_INST* inst,
+        bool inheritDI = true)
     {
-        if (iter != instList.end() && !inst->isCISAOffValid())
+        if (inheritDI &&
+            iter != instList.end() && !inst->isCISAOffValid())
             inst->inheritDIFrom(*iter);
         return instList.insert(iter, inst);
     }
 
-    INST_LIST_ITER insertAfter(INST_LIST::iterator iter, G4_INST* inst)
+    INST_LIST_ITER insertAfter(INST_LIST::iterator iter, G4_INST* inst,
+        bool inheritDI = true)
     {
         auto next = iter;
         ++next;
-        if (!inst->isCISAOffValid())
+        if (inheritDI &&
+            !inst->isCISAOffValid())
         {
             // Inheriting from iter seems more reasonable
             // since invoking invokeAfter on iter means
@@ -150,8 +154,8 @@ class G4_BB
     void clear() { instList.clear(); }
     void pop_back() { instList.pop_back(); }
     void pop_front() { instList.pop_front(); }
-    void push_back(G4_INST* inst) {insertBefore(instList.end(), inst);}
-    void push_front(G4_INST* inst) {insertBefore(instList.begin(), inst);}
+    void push_back(G4_INST* inst, bool inheritDI = true) {insertBefore(instList.end(), inst, inheritDI);}
+    void push_front(G4_INST* inst, bool inheritDI = true) {insertBefore(instList.begin(), inst, inheritDI);}
 
     size_t size() const { return instList.size(); }
     bool empty() const { return instList.empty(); }

visa/SpillManagerGMRF.cpp

@@ -5188,6 +5188,15 @@ void GlobalRA::expandSpillLSC(G4_BB* bb, INST_LIST_ITER& instIt)
         spillOffset += numGRFToWrite * getGRFSize();
     }
 
+    if (inst->getFP() &&
+        kernel.getOption(vISA_GenerateDebugInfo))
+    {
+        for (auto newInst : builder->instList)
+        {
+            kernel.getKernelDebugInfo()->updateExpandedIntrinsic(inst->asSpillIntrinsic(), newInst);
+        }
+    }
+
     // Call WA and NoMask WA are mutual exclusive.
     if (getEUFusionCallWAInsts().count(inst) > 0)
     {
@@ -5281,6 +5290,15 @@ void GlobalRA::expandFillLSC(G4_BB* bb, INST_LIST_ITER& instIt)
         fillOffset += responseLength * getGRFSize();
     }
 
+    if (inst->getFP() &&
+        kernel.getOption(vISA_GenerateDebugInfo))
+    {
+        for (auto newInst : builder->instList)
+        {
+            kernel.getKernelDebugInfo()->updateExpandedIntrinsic(inst->asFillIntrinsic(), newInst);
+        }
+    }
+
     // Call WA and NoMask WA are mutual exclusive.
     if (getEUFusionCallWAInsts().count(inst) > 0)
     {