This is an archive of the discontinued LLVM Phabricator instance.

Differential D129661

[AMDGPU] Update LiveVariables after killing an immediate def
ClosedPublic

Authored by foad on Jul 13 2022, 9:40 AM.

Details

Reviewers
rampitec
arsenm
Group Reviewers
Restricted Project
Commits
rGe45aa230ad8e: [AMDGPU] Update LiveVariables after killing an immediate def
Summary

D114999 added code to kill an immediate def if it was folded into its
only use by convertToThreeAddress. This patch updates LiveVariables when
that happens in order to fix verification failures exposed by D129213.

Diff Detail

Event Timeline

foad created this revision.Jul 13 2022, 9:40 AM
Herald added a project: Restricted Project. · View Herald TranscriptJul 13 2022, 9:40 AM
Herald added subscribers: kosarev, jsilvanus, kerbowa and 9 others. · View Herald Transcript
foad requested review of this revision.Jul 13 2022, 9:40 AM
Herald added a project: Restricted Project. · View Herald TranscriptJul 13 2022, 9:40 AM
Herald added subscribers: llvm-commits, wdng. · View Herald Transcript
foad added a child revision: D129213: [MachineVerifier] Try harder to verify LiveVariables.Jul 13 2022, 9:41 AM
arsenm accepted this revision.Jul 13 2022, 9:51 AM
This revision is now accepted and ready to land.Jul 13 2022, 9:51 AM
rampitec accepted this revision.Jul 13 2022, 10:17 AM
Harbormaster completed remote builds in B175154: Diff 444312.Jul 13 2022, 11:11 AM
This revision was landed with ongoing or failed builds.Jul 14 2022, 2:52 AM
Closed by commit rGe45aa230ad8e: [AMDGPU] Update LiveVariables after killing an immediate def (authored by foad). · Explain Why
This revision was automatically updated to reflect the committed changes.
foad added a commit: rGe45aa230ad8e: [AMDGPU] Update LiveVariables after killing an immediate def.

Revision Contents

PathSize
llvm/
lib/
Target/
AMDGPU/
7 lines

Diff 444570

llvm/lib/Target/AMDGPU/SIInstrInfo.cpp

  • This file is larger than 256 KB, so syntax highlighting is disabled by default.
Show First 20 Lines • Show All 3,329 Lines • ▼ Show 20 LinesMachineInstr *SIInstrInfo::convertToThreeAddress(MachineInstr &MI,
const MachineOperand *Omod = getNamedOperand(MI, AMDGPU::OpName::omod); const MachineOperand *Omod = getNamedOperand(MI, AMDGPU::OpName::omod);
if (!Src0Mods && !Src1Mods && !Src2Mods && !Clamp && !Omod && !IsF64 && if (!Src0Mods && !Src1Mods && !Src2Mods && !Clamp && !Omod && !IsF64 &&
!IsLegacy && !IsLegacy &&
// If we have an SGPR input, we will violate the constant bus restriction. // If we have an SGPR input, we will violate the constant bus restriction.
(ST.getConstantBusLimit(Opc) > 1 || !Src0->isReg() || (ST.getConstantBusLimit(Opc) > 1 || !Src0->isReg() ||
!RI.isSGPRReg(MBB.getParent()->getRegInfo(), Src0->getReg()))) { !RI.isSGPRReg(MBB.getParent()->getRegInfo(), Src0->getReg()))) {
MachineInstr *DefMI; MachineInstr *DefMI;
const auto killDef = [&DefMI, &MBB, this]() -> void { const auto killDef = [&]() -> void {
const MachineRegisterInfo &MRI = MBB.getParent()->getRegInfo(); const MachineRegisterInfo &MRI = MBB.getParent()->getRegInfo();
// The only user is the instruction which will be killed. // The only user is the instruction which will be killed.
if (!MRI.hasOneNonDBGUse(DefMI->getOperand(0).getReg())) Register DefReg = DefMI->getOperand(0).getReg();
if (!MRI.hasOneNonDBGUse(DefReg))
return; return;
// We cannot just remove the DefMI here, calling pass will crash. // We cannot just remove the DefMI here, calling pass will crash.
DefMI->setDesc(get(AMDGPU::IMPLICIT_DEF)); DefMI->setDesc(get(AMDGPU::IMPLICIT_DEF));
for (unsigned I = DefMI->getNumOperands() - 1; I != 0; --I) for (unsigned I = DefMI->getNumOperands() - 1; I != 0; --I)
DefMI->removeOperand(I); DefMI->removeOperand(I);
if (LV)
LV->getVarInfo(DefReg).AliveBlocks.clear();
}; };
int64_t Imm; int64_t Imm;
if (!Src0Literal && getFoldableImm(Src2, Imm, &DefMI)) { if (!Src0Literal && getFoldableImm(Src2, Imm, &DefMI)) {
unsigned NewOpc = unsigned NewOpc =
IsFMA ? (IsF16 ? AMDGPU::V_FMAAK_F16 : AMDGPU::V_FMAAK_F32) IsFMA ? (IsF16 ? AMDGPU::V_FMAAK_F16 : AMDGPU::V_FMAAK_F32)
: (IsF16 ? AMDGPU::V_MADAK_F16 : AMDGPU::V_MADAK_F32); : (IsF16 ? AMDGPU::V_MADAK_F16 : AMDGPU::V_MADAK_F32);
if (pseudoToMCOpcode(NewOpc) != -1) { if (pseudoToMCOpcode(NewOpc) != -1) {
▲ Show 20 Lines • Show All 5,131 Lines • Show Last 20 Lines