REname call WA

jgu222 · igcbot · commit 0e966cf86b00 · 2022-01-27T07:00:53.000+01:00
Rename EUFusionWA to EUFusionCallWA to refect it is for call wa.
diff --git a/visa/GraphColor.cpp b/visa/GraphColor.cpp
@@ -6917,10 +6917,10 @@ unsigned GlobalRA::getRegionDisp(
     return rowOffset + columnOffset;
 }
 
-void GlobalRA::addEUFusionWAInsts(G4_INST* inst)
+void GlobalRA::addEUFusionCallWAInsts(G4_INST* inst)
 {
-    if(EUFusionWANeeded())
-        EUFusionWAInsts.insert(inst);
+    if(EUFusionCallWANeeded())
+        EUFusionCallWAInsts.insert(inst);
 }
 
 unsigned GlobalRA::getRegionByteSize(
@@ -7670,14 +7670,14 @@ void GlobalRA::stackCallProlog()
         auto iter = std::find_if(entryBB->begin(), entryBB->end(), [](G4_INST* inst) { return !inst->isLabel(); });
         entryBB->insertBefore(iter, store);
 
-        if (EUFusionWANeeded())
+        if (EUFusionCallWANeeded())
         {
             auto oldSaveInst = builder.getPartFDSaveInst();
             builder.setPartFDSaveInst(store);
             entryBB->remove(oldSaveInst);
         }
 
-        addEUFusionWAInsts(store);
+        addEUFusionCallWAInsts(store);
 
         return;
     }
@@ -8371,10 +8371,10 @@ void GlobalRA::addCalleeStackSetupCode()
             builder.kernel.getKernelDebugInfo()->setFrameSize(frameSize * 16);
         }
 
-        addEUFusionWAInsts(createBEFP);
-        addEUFusionWAInsts(addInst);
+        addEUFusionCallWAInsts(createBEFP);
+        addEUFusionCallWAInsts(addInst);
 
-        if (EUFusionWANeeded())
+        if (EUFusionCallWANeeded())
         {
             builder.kernel.getKernelDebugInfo()->setCallerBEFPSaveInst(createBEFP);
         }
@@ -8696,7 +8696,7 @@ void GlobalRA::addStoreRestoreToReturn()
     auto iter = std::prev(fretBB->end());
     assert((*iter)->isFReturn() && "fret BB must end with fret");
 
-    if (!EUFusionWANeeded())
+    if (!EUFusionCallWANeeded())
     {
         restoreBE_FPInst = builder.createMov(g4::SIMD4, FPdst, oldFPSrc, InstOpt_WriteEnable, false);
         fretBB->insertBefore(iter, restoreBE_FPInst);
@@ -8719,7 +8719,7 @@ void GlobalRA::addStoreRestoreToReturn()
             load = builder.createFill(dstData, G4_ExecSize(execSize), 1, 0, builder.getBEFP(), InstOpt_WriteEnable, false);
         }
         fretBB->insertBefore(iter, load);
-        addEUFusionWAInsts(load);
+        addEUFusionCallWAInsts(load);
         restoreBE_FPInst = load;
     }
 
@@ -8729,7 +8729,7 @@ void GlobalRA::addStoreRestoreToReturn()
     {
         builder.kernel.getKernelDebugInfo()->setCallerBEFPRestoreInst(restoreBE_FPInst);
         builder.kernel.getKernelDebugInfo()->setCallerSPRestoreInst(restoreBE_FPInst);
-        if(!EUFusionWANeeded())
+        if(!EUFusionCallWANeeded())
             builder.kernel.getKernelDebugInfo()->setCallerBEFPSaveInst(saveBE_FPInst);
     }
 
diff --git a/visa/GraphColor.h b/visa/GraphColor.h
@@ -690,13 +690,13 @@ namespace vISA
     class GlobalRA
     {
     private:
-        std::unordered_set<G4_INST*> EUFusionWAInsts;
-        bool m_EUFusionWANeeded;
+        std::unordered_set<G4_INST*> EUFusionCallWAInsts;
+        bool m_EUFusionCallWANeeded;
     public:
-        bool EUFusionWANeeded() const { return m_EUFusionWANeeded; }
-        void addEUFusionWAInsts(G4_INST* inst);
-        void removeEUFusionWAInst(G4_INST* inst) { EUFusionWAInsts.erase(inst); }
-        const std::unordered_set<G4_INST*>& getEUFusionWAInsts() { return EUFusionWAInsts; }
+        bool EUFusionCallWANeeded() const { return m_EUFusionCallWANeeded; }
+        void addEUFusionCallWAInsts(G4_INST* inst);
+        void removeEUFusionCallWAInst(G4_INST* inst) { EUFusionCallWAInsts.erase(inst); }
+        const std::unordered_set<G4_INST*>& getEUFusionCallWAInsts() { return EUFusionCallWAInsts; }
     public:
         std::unique_ptr<VerifyAugmentation> verifyAugmentation;
         std::unique_ptr<RegChartDump> regChart;
@@ -1204,7 +1204,7 @@ namespace vISA
             }
 
             // Need call WA for EU Fusion for non-entry function
-            m_EUFusionWANeeded = builder.hasFusedEU()
+            m_EUFusionCallWANeeded = builder.hasFusedEU()
                 && builder.getOption(vISA_fusedCallWA)
                 && (kernel.fg.getHasStackCalls() || kernel.hasIndirectCall())
                 && !builder.getIsKernel();
diff --git a/visa/RegAlloc.cpp b/visa/RegAlloc.cpp
@@ -3686,7 +3686,7 @@ int regAlloc(IR_Builder& builder, PhyRegPool& regPool, G4_Kernel& kernel)
     }
 
     // printf("EU Fusion WA insts for func: %s\n", kernel.getName());
-    for (auto inst : gra.getEUFusionWAInsts())
+    for (auto inst : gra.getEUFusionCallWAInsts())
     {
         kernel.setMaskOffset(inst, InstOpt_M16);
         // inst->dump();
diff --git a/visa/SpillManagerGMRF.cpp b/visa/SpillManagerGMRF.cpp
@@ -5135,11 +5135,11 @@ void GlobalRA::expandSpillLSC(G4_BB* bb, INST_LIST_ITER& instIt)
         spillOffset += numGRFToWrite * getGRFSize();
     }
 
-    if (getEUFusionWAInsts().count(inst) > 0)
+    if (getEUFusionCallWAInsts().count(inst) > 0)
     {
-        removeEUFusionWAInst(inst);
+        removeEUFusionCallWAInst(inst);
         for (auto inst : builder->instList)
-            addEUFusionWAInsts(inst);
+            addEUFusionCallWAInsts(inst);
     }
 
     splice(bb, instIt, builder->instList, inst->getCISAOff());
@@ -5218,11 +5218,11 @@ void GlobalRA::expandFillLSC(G4_BB* bb, INST_LIST_ITER& instIt)
         fillOffset += responseLength * getGRFSize();
     }
 
-    if (getEUFusionWAInsts().count(inst) > 0)
+    if (getEUFusionCallWAInsts().count(inst) > 0)
     {
-        removeEUFusionWAInst(inst);
+        removeEUFusionCallWAInst(inst);
         for (auto inst : builder->instList)
-            addEUFusionWAInsts(inst);
+            addEUFusionCallWAInsts(inst);
     }
 
     splice(bb, instIt, builder->instList, inst->getCISAOff());
@@ -5397,12 +5397,12 @@ void GlobalRA::expandSpillStackcall(
 
         bb->insertBefore(spillIt, spillSends);
 
-        if (getEUFusionWAInsts().count(inst) > 0)
+        if (getEUFusionCallWAInsts().count(inst) > 0)
         {
-            removeEUFusionWAInst(inst);
-            addEUFusionWAInsts(spillSends);
+            removeEUFusionCallWAInst(inst);
+            addEUFusionCallWAInsts(spillSends);
             if (hdrSetInst)
-                addEUFusionWAInsts(hdrSetInst);
+                addEUFusionCallWAInsts(hdrSetInst);
         }
 
         if (kernel.getOption(vISA_GenerateDebugInfo))
@@ -5630,12 +5630,12 @@ void GlobalRA::expandFillStackcall(uint32_t numRows, uint32_t offset, short rowO
 
         auto fillSends = createOwordFill(respSizeInOwords, fillDst);
 
-        if (getEUFusionWAInsts().count(inst) > 0)
+        if (getEUFusionCallWAInsts().count(inst) > 0)
         {
-            removeEUFusionWAInst(inst);
-            addEUFusionWAInsts(fillSends);
+            removeEUFusionCallWAInst(inst);
+            addEUFusionCallWAInsts(fillSends);
             if (hdrSetInst)
-                addEUFusionWAInsts(hdrSetInst);
+                addEUFusionCallWAInsts(hdrSetInst);
         }
 
         std::stringstream comments;

Original file line number	Diff line number	Diff line change
`@@ -6917,10 +6917,10 @@ unsigned GlobalRA::getRegionDisp(`
`6917`	`6917`	`return rowOffset + columnOffset;`
`6918`	`6918`	`}`
`6919`	`6919`
`6920`		`-void GlobalRA::addEUFusionWAInsts(G4_INST* inst)`
	`6920`	`+void GlobalRA::addEUFusionCallWAInsts(G4_INST* inst)`
`6921`	`6921`	`{`
`6922`		`- if(EUFusionWANeeded())`
`6923`		`- EUFusionWAInsts.insert(inst);`
	`6922`	`+ if(EUFusionCallWANeeded())`
	`6923`	`+ EUFusionCallWAInsts.insert(inst);`
`6924`	`6924`	`}`
`6925`	`6925`
`6926`	`6926`	`unsigned GlobalRA::getRegionByteSize(`
`@@ -7670,14 +7670,14 @@ void GlobalRA::stackCallProlog()`
`7670`	`7670`	`auto iter = std::find_if(entryBB->begin(), entryBB->end(), [](G4_INST* inst) { return !inst->isLabel(); });`
`7671`	`7671`	`entryBB->insertBefore(iter, store);`
`7672`	`7672`
`7673`		`- if (EUFusionWANeeded())`
	`7673`	`+ if (EUFusionCallWANeeded())`
`7674`	`7674`	`{`
`7675`	`7675`	`auto oldSaveInst = builder.getPartFDSaveInst();`
`7676`	`7676`	`builder.setPartFDSaveInst(store);`
`7677`	`7677`	`entryBB->remove(oldSaveInst);`
`7678`	`7678`	`}`
`7679`	`7679`
`7680`		`- addEUFusionWAInsts(store);`
	`7680`	`+ addEUFusionCallWAInsts(store);`
`7681`	`7681`
`7682`	`7682`	`return;`
`7683`	`7683`	`}`
`@@ -8371,10 +8371,10 @@ void GlobalRA::addCalleeStackSetupCode()`
`8371`	`8371`	`builder.kernel.getKernelDebugInfo()->setFrameSize(frameSize * 16);`
`8372`	`8372`	`}`
`8373`	`8373`
`8374`		`- addEUFusionWAInsts(createBEFP);`
`8375`		`- addEUFusionWAInsts(addInst);`
	`8374`	`+ addEUFusionCallWAInsts(createBEFP);`
	`8375`	`+ addEUFusionCallWAInsts(addInst);`
`8376`	`8376`
`8377`		`- if (EUFusionWANeeded())`
	`8377`	`+ if (EUFusionCallWANeeded())`
`8378`	`8378`	`{`
`8379`	`8379`	`builder.kernel.getKernelDebugInfo()->setCallerBEFPSaveInst(createBEFP);`
`8380`	`8380`	`}`
`@@ -8696,7 +8696,7 @@ void GlobalRA::addStoreRestoreToReturn()`
`8696`	`8696`	`auto iter = std::prev(fretBB->end());`
`8697`	`8697`	`assert((*iter)->isFReturn() && "fret BB must end with fret");`
`8698`	`8698`
`8699`		`- if (!EUFusionWANeeded())`
	`8699`	`+ if (!EUFusionCallWANeeded())`
`8700`	`8700`	`{`
`8701`	`8701`	`restoreBE_FPInst = builder.createMov(g4::SIMD4, FPdst, oldFPSrc, InstOpt_WriteEnable, false);`
`8702`	`8702`	`fretBB->insertBefore(iter, restoreBE_FPInst);`
`@@ -8719,7 +8719,7 @@ void GlobalRA::addStoreRestoreToReturn()`
`8719`	`8719`	`load = builder.createFill(dstData, G4_ExecSize(execSize), 1, 0, builder.getBEFP(), InstOpt_WriteEnable, false);`
`8720`	`8720`	`}`
`8721`	`8721`	`fretBB->insertBefore(iter, load);`
`8722`		`- addEUFusionWAInsts(load);`
	`8722`	`+ addEUFusionCallWAInsts(load);`
`8723`	`8723`	`restoreBE_FPInst = load;`
`8724`	`8724`	`}`
`8725`	`8725`
`@@ -8729,7 +8729,7 @@ void GlobalRA::addStoreRestoreToReturn()`
`8729`	`8729`	`{`
`8730`	`8730`	`builder.kernel.getKernelDebugInfo()->setCallerBEFPRestoreInst(restoreBE_FPInst);`
`8731`	`8731`	`builder.kernel.getKernelDebugInfo()->setCallerSPRestoreInst(restoreBE_FPInst);`
`8732`		`- if(!EUFusionWANeeded())`
	`8732`	`+ if(!EUFusionCallWANeeded())`
`8733`	`8733`	`builder.kernel.getKernelDebugInfo()->setCallerBEFPSaveInst(saveBE_FPInst);`
`8734`	`8734`	`}`
`8735`	`8735`
Original file line number	Diff line number	Diff line change
`@@ -3686,7 +3686,7 @@ int regAlloc(IR_Builder& builder, PhyRegPool& regPool, G4_Kernel& kernel)`
`3686`	`3686`	`}`
`3687`	`3687`
`3688`	`3688`	`// printf("EU Fusion WA insts for func: %s\n", kernel.getName());`
`3689`		`- for (auto inst : gra.getEUFusionWAInsts())`
	`3689`	`+ for (auto inst : gra.getEUFusionCallWAInsts())`
`3690`	`3690`	`{`
`3691`	`3691`	`kernel.setMaskOffset(inst, InstOpt_M16);`
`3692`	`3692`	`// inst->dump();`
Original file line number	Diff line number	Diff line change
`@@ -5135,11 +5135,11 @@ void GlobalRA::expandSpillLSC(G4_BB* bb, INST_LIST_ITER& instIt)`
`5135`	`5135`	`spillOffset += numGRFToWrite * getGRFSize();`
`5136`	`5136`	`}`
`5137`	`5137`
`5138`		`- if (getEUFusionWAInsts().count(inst) > 0)`
	`5138`	`+ if (getEUFusionCallWAInsts().count(inst) > 0)`
`5139`	`5139`	`{`
`5140`		`- removeEUFusionWAInst(inst);`
	`5140`	`+ removeEUFusionCallWAInst(inst);`
`5141`	`5141`	`for (auto inst : builder->instList)`
`5142`		`- addEUFusionWAInsts(inst);`
	`5142`	`+ addEUFusionCallWAInsts(inst);`
`5143`	`5143`	`}`
`5144`	`5144`
`5145`	`5145`	`splice(bb, instIt, builder->instList, inst->getCISAOff());`
`@@ -5218,11 +5218,11 @@ void GlobalRA::expandFillLSC(G4_BB* bb, INST_LIST_ITER& instIt)`
`5218`	`5218`	`fillOffset += responseLength * getGRFSize();`
`5219`	`5219`	`}`
`5220`	`5220`
`5221`		`- if (getEUFusionWAInsts().count(inst) > 0)`
	`5221`	`+ if (getEUFusionCallWAInsts().count(inst) > 0)`
`5222`	`5222`	`{`
`5223`		`- removeEUFusionWAInst(inst);`
	`5223`	`+ removeEUFusionCallWAInst(inst);`
`5224`	`5224`	`for (auto inst : builder->instList)`
`5225`		`- addEUFusionWAInsts(inst);`
	`5225`	`+ addEUFusionCallWAInsts(inst);`
`5226`	`5226`	`}`
`5227`	`5227`
`5228`	`5228`	`splice(bb, instIt, builder->instList, inst->getCISAOff());`
`@@ -5397,12 +5397,12 @@ void GlobalRA::expandSpillStackcall(`
`5397`	`5397`
`5398`	`5398`	`bb->insertBefore(spillIt, spillSends);`
`5399`	`5399`
`5400`		`- if (getEUFusionWAInsts().count(inst) > 0)`
	`5400`	`+ if (getEUFusionCallWAInsts().count(inst) > 0)`
`5401`	`5401`	`{`
`5402`		`- removeEUFusionWAInst(inst);`
`5403`		`- addEUFusionWAInsts(spillSends);`
	`5402`	`+ removeEUFusionCallWAInst(inst);`
	`5403`	`+ addEUFusionCallWAInsts(spillSends);`
`5404`	`5404`	`if (hdrSetInst)`
`5405`		`- addEUFusionWAInsts(hdrSetInst);`
	`5405`	`+ addEUFusionCallWAInsts(hdrSetInst);`
`5406`	`5406`	`}`
`5407`	`5407`
`5408`	`5408`	`if (kernel.getOption(vISA_GenerateDebugInfo))`
`@@ -5630,12 +5630,12 @@ void GlobalRA::expandFillStackcall(uint32_t numRows, uint32_t offset, short rowO`
`5630`	`5630`
`5631`	`5631`	`auto fillSends = createOwordFill(respSizeInOwords, fillDst);`
`5632`	`5632`
`5633`		`- if (getEUFusionWAInsts().count(inst) > 0)`
	`5633`	`+ if (getEUFusionCallWAInsts().count(inst) > 0)`
`5634`	`5634`	`{`
`5635`		`- removeEUFusionWAInst(inst);`
`5636`		`- addEUFusionWAInsts(fillSends);`
	`5635`	`+ removeEUFusionCallWAInst(inst);`
	`5636`	`+ addEUFusionCallWAInsts(fillSends);`
`5637`	`5637`	`if (hdrSetInst)`
`5638`		`- addEUFusionWAInsts(hdrSetInst);`
	`5638`	`+ addEUFusionCallWAInsts(hdrSetInst);`
`5639`	`5639`	`}`
`5640`	`5640`
`5641`	`5641`	`std::stringstream comments;`