This is an archive of the discontinued LLVM Phabricator instance.

AMDGPU/SI: Fix SGPR usage count in SI scheduler
ClosedPublic

Authored by axeldavy on Feb 18 2017, 1:28 PM.

Reviewers

arsenm
tstellar

Commits

Summary

The max number of SGPRs used was incorrectly
computed.

LGTM

This revision is now accepted and ready to land.Feb 21 2017, 3:35 PM

This revision was automatically updated to reflect the committed changes.

Path

Size

llvm/

trunk/

lib/

Target/

AMDGPU/

4 lines

Show First 20 Lines • Show All 1,459 Lines • ▼ Show 20 Lines	SIScheduleBlock *SIScheduleBlockScheduler::pickBlock() {
SIScheduleBlock *Block;		SIScheduleBlock *Block;
if (ReadyBlocks.empty())		if (ReadyBlocks.empty())
return nullptr;		return nullptr;

DAG->fillVgprSgprCost(LiveRegs.begin(), LiveRegs.end(),		DAG->fillVgprSgprCost(LiveRegs.begin(), LiveRegs.end(),
VregCurrentUsage, SregCurrentUsage);		VregCurrentUsage, SregCurrentUsage);
if (VregCurrentUsage > maxVregUsage)		if (VregCurrentUsage > maxVregUsage)
maxVregUsage = VregCurrentUsage;		maxVregUsage = VregCurrentUsage;
if (VregCurrentUsage > maxSregUsage)		if (SregCurrentUsage > maxSregUsage)
maxSregUsage = VregCurrentUsage;		maxSregUsage = SregCurrentUsage;
DEBUG(		DEBUG(
dbgs() << "Picking New Blocks\n";		dbgs() << "Picking New Blocks\n";
dbgs() << "Available: ";		dbgs() << "Available: ";
for (SIScheduleBlock* Block : ReadyBlocks)		for (SIScheduleBlock* Block : ReadyBlocks)
dbgs() << Block->getID() << ' ';		dbgs() << Block->getID() << ' ';
dbgs() << "\nCurrent Live:\n";		dbgs() << "\nCurrent Live:\n";
for (unsigned Reg : LiveRegs)		for (unsigned Reg : LiveRegs)
dbgs() << PrintVRegOrUnit(Reg, DAG->getTRI()) << ' ';		dbgs() << PrintVRegOrUnit(Reg, DAG->getTRI()) << ' ';
▲ Show 20 Lines • Show All 426 Lines • Show Last 20 Lines