This is an archive of the discontinued LLVM Phabricator instance.

Differential D47661

[AMDGPU] Small refactoring in the scheduler
ClosedPublic

Authored by rampitec on Jun 1 2018, 3:15 PM.

Details

Reviewers
vpykhtin
nhaehnle
Commits
rG838c07c53195: [AMDGPU] Small refactoring in the scheduler
rL333934: [AMDGPU] Small refactoring in the scheduler
Summary

After last changes some code can be simplified.

Diff Detail

Event Timeline

rampitec created this revision.Jun 1 2018, 3:15 PM
Herald added subscribers: t-tye, tpr, dstuttard and 5 others. · View Herald TranscriptJun 1 2018, 3:15 PM
nhaehnle accepted this revision.Jun 4 2018, 7:04 AM
This revision is now accepted and ready to land.Jun 4 2018, 7:04 AM
vpykhtin accepted this revision.Jun 4 2018, 7:07 AM
Closed by commit rL333934: [AMDGPU] Small refactoring in the scheduler (authored by rampitec). · Explain WhyJun 4 2018, 11:02 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
lib/
Target/
AMDGPU/
21 lines

Diff 149558

lib/Target/AMDGPU/GCNSchedStrategy.cpp

Show All 22 Lines
#define DEBUG_TYPE "machine-scheduler" #define DEBUG_TYPE "machine-scheduler"
using namespace llvm; using namespace llvm;
GCNMaxOccupancySchedStrategy::GCNMaxOccupancySchedStrategy( GCNMaxOccupancySchedStrategy::GCNMaxOccupancySchedStrategy(
const MachineSchedContext *C) : const MachineSchedContext *C) :
GenericScheduler(C), TargetOccupancy(0), MF(nullptr) { } GenericScheduler(C), TargetOccupancy(0), MF(nullptr) { }
static unsigned getMaxWaves(unsigned SGPRs, unsigned VGPRs,
const MachineFunction &MF) {
const SISubtarget &ST = MF.getSubtarget<SISubtarget>();
const SIMachineFunctionInfo *MFI = MF.getInfo<SIMachineFunctionInfo>();
unsigned MinRegOccupancy = std::min(ST.getOccupancyWithNumSGPRs(SGPRs),
ST.getOccupancyWithNumVGPRs(VGPRs));
return std::min(MinRegOccupancy,
ST.getOccupancyWithLocalMemSize(MFI->getLDSSize(),
MF.getFunction()));
}
void GCNMaxOccupancySchedStrategy::initialize(ScheduleDAGMI *DAG) { void GCNMaxOccupancySchedStrategy::initialize(ScheduleDAGMI *DAG) {
GenericScheduler::initialize(DAG); GenericScheduler::initialize(DAG);
const SIRegisterInfo *SRI = static_cast<const SIRegisterInfo*>(TRI); const SIRegisterInfo *SRI = static_cast<const SIRegisterInfo*>(TRI);
MF = &DAG->MF; MF = &DAG->MF;
const SISubtarget &ST = MF->getSubtarget<SISubtarget>(); const SISubtarget &ST = MF->getSubtarget<SISubtarget>();
▲ Show 20 Lines • Show All 302 Lines • ▼ Show 20 Lines LLVM_DEBUG(dbgs() << "Pressure after scheduling: ";
PressureAfter.print(dbgs())); PressureAfter.print(dbgs()));
if (PressureAfter.getSGPRNum() <= S.SGPRCriticalLimit && if (PressureAfter.getSGPRNum() <= S.SGPRCriticalLimit &&
PressureAfter.getVGPRNum() <= S.VGPRCriticalLimit) { PressureAfter.getVGPRNum() <= S.VGPRCriticalLimit) {
Pressure[RegionIdx] = PressureAfter; Pressure[RegionIdx] = PressureAfter;
LLVM_DEBUG(dbgs() << "Pressure in desired limits, done.\n"); LLVM_DEBUG(dbgs() << "Pressure in desired limits, done.\n");
return; return;
} }
unsigned WavesAfter = getMaxWaves(PressureAfter.getSGPRNum(), unsigned Occ = MFI.getOccupancy();
PressureAfter.getVGPRNum(), MF); unsigned WavesAfter = std::min(Occ, PressureAfter.getOccupancy(ST));
unsigned WavesBefore = getMaxWaves(PressureBefore.getSGPRNum(), unsigned WavesBefore = std::min(Occ, PressureBefore.getOccupancy(ST));
PressureBefore.getVGPRNum(), MF);
WavesAfter = std::min(WavesAfter, MFI.getMaxWavesPerEU());
WavesBefore = std::min(WavesBefore, MFI.getMaxWavesPerEU());
LLVM_DEBUG(dbgs() << "Occupancy before scheduling: " << WavesBefore LLVM_DEBUG(dbgs() << "Occupancy before scheduling: " << WavesBefore
<< ", after " << WavesAfter << ".\n"); << ", after " << WavesAfter << ".\n");
// We could not keep current target occupancy because of the just scheduled // We could not keep current target occupancy because of the just scheduled
// region. Record new occupancy for next scheduling cycle. // region. Record new occupancy for next scheduling cycle.
unsigned NewOccupancy = std::max(WavesAfter, WavesBefore); unsigned NewOccupancy = std::max(WavesAfter, WavesBefore);
// Allow memory bound functions to drop to 4 waves if not limited by an // Allow memory bound functions to drop to 4 waves if not limited by an
// attribute. // attribute.
▲ Show 20 Lines • Show All 188 Lines • Show Last 20 Lines