Skip to content

Commit 8234eab

Browse files
committed
[Autobackout][FuncReg]Revert of change: 18295b8
Improve support for spill/fill intrinsincs in presence of stack call Change-Id: Ic1349acb81774e68da67fc50116817be25494439
1 parent 33bf3d0 commit 8234eab

File tree

5 files changed

+249
-421
lines changed

5 files changed

+249
-421
lines changed

visa/GraphColor.cpp

+1-2
Original file line numberDiff line numberDiff line change
@@ -8968,8 +8968,7 @@ int GlobalRA::coloringRegAlloc()
89688968
}
89698969
#endif
89708970
bool disableSpillCoalecse = builder.getOption(vISA_DisableSpillCoalescing) ||
8971-
builder.getOption(vISA_FastSpill) || builder.getOption(vISA_Debug) ||
8972-
!useScratchMsgForSpill;
8971+
builder.getOption(vISA_FastSpill) || builder.getOption(vISA_Debug);
89738972
if (!reserveSpillReg && !disableSpillCoalecse && builder.useSends())
89748973
{
89758974
CoalesceSpillFills c(kernel, liveAnalysis, coloring, spillGRF, iterationNo, rpe, *this);

visa/GraphColor.h

-5
Original file line numberDiff line numberDiff line change
@@ -742,11 +742,6 @@ namespace vISA
742742
// new temps for each reference of spilled address/flag decls
743743
std::unordered_set<G4_Declare*> addrFlagSpillDcls;
744744

745-
void expandFillNonStackcall(uint32_t& numRows, uint32_t& offset, short& rowOffset, G4_SrcRegRegion* header, G4_DstRegRegion* resultRgn, G4_BB* bb, INST_LIST_ITER& instIt);
746-
void expandSpillNonStackcall(uint32_t& numRows, uint32_t& offset, short& rowOffset, G4_SrcRegRegion* header, G4_SrcRegRegion* payload, G4_BB* bb, INST_LIST_ITER& instIt);
747-
void expandFillStackcall(uint32_t& numRows, uint32_t& offset, short& rowOffset, G4_SrcRegRegion* header, G4_DstRegRegion* resultRgn, G4_BB* bb, INST_LIST_ITER& instIt);
748-
void expandSpillStackcall(uint32_t& numRows, uint32_t& offset, short& rowOffset, G4_SrcRegRegion* payload, G4_BB* bb, INST_LIST_ITER& instIt);
749-
750745
public:
751746
G4_Kernel& kernel;
752747
IR_Builder& builder;

visa/RegAlloc.cpp

-3
Original file line numberDiff line numberDiff line change
@@ -1797,9 +1797,6 @@ bool LivenessAnalysis::writeWholeRegion(G4_BB* bb,
17971797
return false;
17981798
}
17991799

1800-
if (inst->isFCall())
1801-
return true;
1802-
18031800
// Flags may be partially written when used as the destination
18041801
// e.g., setp (M5_NM, 16) P11 V97(8,0)<0;1,0>
18051802
// It can be only considered as a complete kill

0 commit comments

Comments
 (0)