Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions llvm/lib/Target/AMDGPU/GCNSchedStrategy.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,6 @@ void GCNSchedStrategy::initialize(ScheduleDAGMI *DAG) {
VGPRCriticalLimit -= std::min(VGPRLimitBias + ErrorMargin, VGPRCriticalLimit);
SGPRExcessLimit -= std::min(SGPRLimitBias + ErrorMargin, SGPRExcessLimit);
VGPRExcessLimit -= std::min(VGPRLimitBias + ErrorMargin, VGPRExcessLimit);

LLVM_DEBUG(dbgs() << "VGPRCriticalLimit = " << VGPRCriticalLimit
<< ", VGPRExcessLimit = " << VGPRExcessLimit
<< ", SGPRCriticalLimit = " << SGPRCriticalLimit
Expand Down Expand Up @@ -1163,6 +1162,8 @@ void GCNScheduleDAGMILive::runSchedStages() {

ScheduleDAGMILive::schedule();
Stage->finalizeGCNRegion();
Stage->advanceRegion();
exitRegion();
}

Stage->finalizeGCNSchedStage();
Expand Down Expand Up @@ -1473,9 +1474,6 @@ void GCNSchedStage::finalizeGCNRegion() {
if (DAG.RegionsWithIGLPInstrs[RegionIdx] &&
StageID != GCNSchedStageID::UnclusteredHighRPReschedule)
SavedMutations.swap(DAG.Mutations);

DAG.exitRegion();
advanceRegion();
}

void GCNSchedStage::checkScheduling() {
Expand Down
6 changes: 3 additions & 3 deletions llvm/lib/Target/AMDGPU/GCNSchedStrategy.h
Original file line number Diff line number Diff line change
Expand Up @@ -367,12 +367,12 @@ class GCNSchedStage {
// be skipped.
virtual bool initGCNRegion();

// Finalize state after scheduling a region.
virtual void finalizeGCNRegion();

// Track whether a new region is also a new MBB.
void setupNewBlock();

// Finalize state after scheudling a region.
void finalizeGCNRegion();

// Check result of scheduling.
void checkScheduling();

Expand Down
Loading