Skip to content

Commit 35dd8b7

Browse files
pccDanielCChen
authored andcommitted
Revert "[AMDGPU] Serialize WWM_REG vreg flag (llvm#110229)"
This reverts commit bec839d. Caused buildbot failures, e.g. https://lab.llvm.org/buildbot/#/builders/52/builds/2928
1 parent e18c940 commit 35dd8b7

File tree

4 files changed

+0
-44
lines changed

4 files changed

+0
-44
lines changed

llvm/lib/Target/AMDGPU/AMDGPUTargetMachine.cpp

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1718,17 +1718,6 @@ bool GCNTargetMachine::parseMachineFunctionInfo(
17181718
MFI->reserveWWMRegister(ParsedReg);
17191719
}
17201720

1721-
for (const auto &[_, Info] : PFS.VRegInfosNamed) {
1722-
for (uint8_t Flag : Info->Flags) {
1723-
MFI->setFlag(Info->VReg, Flag);
1724-
}
1725-
}
1726-
for (const auto &[_, Info] : PFS.VRegInfos) {
1727-
for (uint8_t Flag : Info->Flags) {
1728-
MFI->setFlag(Info->VReg, Flag);
1729-
}
1730-
}
1731-
17321721
auto parseAndCheckArgument = [&](const std::optional<yaml::SIArgument> &A,
17331722
const TargetRegisterClass &RC,
17341723
ArgDescriptor &Arg, unsigned UserSGPRs,

llvm/lib/Target/AMDGPU/SIRegisterInfo.cpp

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3851,13 +3851,3 @@ SIRegisterInfo::getSubRegAlignmentNumBits(const TargetRegisterClass *RC,
38513851
}
38523852
return 0;
38533853
}
3854-
3855-
SmallVector<StringLiteral>
3856-
SIRegisterInfo::getVRegFlagsOfReg(Register Reg,
3857-
const MachineFunction &MF) const {
3858-
SmallVector<StringLiteral> RegFlags;
3859-
const SIMachineFunctionInfo *FuncInfo = MF.getInfo<SIMachineFunctionInfo>();
3860-
if (FuncInfo->checkFlag(Reg, AMDGPU::VirtRegFlag::WWM_REG))
3861-
RegFlags.push_back("WWM_REG");
3862-
return RegFlags;
3863-
}

llvm/lib/Target/AMDGPU/SIRegisterInfo.h

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -457,14 +457,6 @@ class SIRegisterInfo final : public AMDGPUGenRegisterInfo {
457457
// No check if the subreg is supported by the current RC is made.
458458
unsigned getSubRegAlignmentNumBits(const TargetRegisterClass *RC,
459459
unsigned SubReg) const;
460-
461-
std::optional<uint8_t> getVRegFlagValue(StringRef Name) const override {
462-
return Name == "WWM_REG" ? AMDGPU::VirtRegFlag::WWM_REG
463-
: std::optional<uint8_t>{};
464-
}
465-
466-
SmallVector<StringLiteral>
467-
getVRegFlagsOfReg(Register Reg, const MachineFunction &MF) const override;
468460
};
469461

470462
namespace AMDGPU {

llvm/test/CodeGen/MIR/AMDGPU/machine-function-info-no-ir.mir

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -578,18 +578,3 @@ body: |
578578
SI_RETURN
579579
580580
...
581-
---
582-
name: vregs
583-
# FULL: registers:
584-
# FULL-NEXT: - { id: 0, class: vgpr_32, preferred-register: '$vgpr1', flags: [ WWM_REG ] }
585-
# FULL-NEXT: - { id: 1, class: sgpr_64, preferred-register: '$sgpr0_sgpr1', flags: [ ] }
586-
# FULL-NEXT: - { id: 2, class: sgpr_64, preferred-register: '', flags: [ ] }
587-
registers:
588-
- { id: 0, class: vgpr_32, preferred-register: $vgpr1, flags: [ WWM_REG ]}
589-
- { id: 1, class: sgpr_64, preferred-register: $sgpr0_sgpr1 }
590-
- { id: 2, class: sgpr_64, flags: [ ] }
591-
body: |
592-
bb.0:
593-
%2:sgpr_64 = COPY %1
594-
%1:sgpr_64 = COPY %0
595-
...

0 commit comments

Comments
 (0)