Skip to content

Commit bc7e099

Browse files
authored
Revert "[AMDGPU][MIR] Serialize NumPhysicalVGPRSpillLanes" (llvm#115353)
Reverts llvm#115291 Reverting due to test failures on many bots including https://lab.llvm.org/buildbot/#/builders/174/builds/8049
1 parent 5f4e3a3 commit bc7e099

File tree

3 files changed

+4
-27
lines changed

3 files changed

+4
-27
lines changed

llvm/lib/Target/AMDGPU/SIMachineFunctionInfo.cpp

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -694,22 +694,22 @@ yaml::SIMachineFunctionInfo::SIMachineFunctionInfo(
694694
const llvm::MachineFunction &MF)
695695
: ExplicitKernArgSize(MFI.getExplicitKernArgSize()),
696696
MaxKernArgAlign(MFI.getMaxKernArgAlign()), LDSSize(MFI.getLDSSize()),
697-
GDSSize(MFI.getGDSSize()), DynLDSAlign(MFI.getDynLDSAlign()),
698-
IsEntryFunction(MFI.isEntryFunction()),
697+
GDSSize(MFI.getGDSSize()),
698+
DynLDSAlign(MFI.getDynLDSAlign()), IsEntryFunction(MFI.isEntryFunction()),
699699
NoSignedZerosFPMath(MFI.hasNoSignedZerosFPMath()),
700700
MemoryBound(MFI.isMemoryBound()), WaveLimiter(MFI.needsWaveLimiter()),
701701
HasSpilledSGPRs(MFI.hasSpilledSGPRs()),
702702
HasSpilledVGPRs(MFI.hasSpilledVGPRs()),
703703
HighBitsOf32BitAddress(MFI.get32BitAddressHighBits()),
704704
Occupancy(MFI.getOccupancy()),
705-
NumPhysicalVGPRSpillLanes(MFI.getNumPhysicalVGPRSpillLanes()),
706705
ScratchRSrcReg(regToString(MFI.getScratchRSrcReg(), TRI)),
707706
FrameOffsetReg(regToString(MFI.getFrameOffsetReg(), TRI)),
708707
StackPtrOffsetReg(regToString(MFI.getStackPtrOffsetReg(), TRI)),
709708
BytesInStackArgArea(MFI.getBytesInStackArgArea()),
710709
ReturnsVoid(MFI.returnsVoid()),
711710
ArgInfo(convertArgumentInfo(MFI.getArgInfo(), TRI)),
712-
PSInputAddr(MFI.getPSInputAddr()), PSInputEnable(MFI.getPSInputEnable()),
711+
PSInputAddr(MFI.getPSInputAddr()),
712+
PSInputEnable(MFI.getPSInputEnable()),
713713
Mode(MFI.getMode()) {
714714
for (Register Reg : MFI.getSGPRSpillPhysVGPRs())
715715
SpillPhysVGPRS.push_back(regToString(Reg, TRI));
@@ -754,7 +754,6 @@ bool SIMachineFunctionInfo::initializeBaseYamlFields(
754754
HasSpilledVGPRs = YamlMFI.HasSpilledVGPRs;
755755
BytesInStackArgArea = YamlMFI.BytesInStackArgArea;
756756
ReturnsVoid = YamlMFI.ReturnsVoid;
757-
NumPhysicalVGPRSpillLanes = YamlMFI.NumPhysicalVGPRSpillLanes;
758757

759758
if (YamlMFI.ScavengeFI) {
760759
auto FIOrErr = YamlMFI.ScavengeFI->getFI(MF.getFrameInfo());

llvm/lib/Target/AMDGPU/SIMachineFunctionInfo.h

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,6 @@ struct SIMachineFunctionInfo final : public yaml::MachineFunctionInfo {
275275
// TODO: 10 may be a better default since it's the maximum.
276276
unsigned Occupancy = 0;
277277

278-
unsigned NumPhysicalVGPRSpillLanes = 0;
279278
SmallVector<StringValue, 2> SpillPhysVGPRS;
280279
SmallVector<StringValue> WWMReservedRegs;
281280

@@ -338,8 +337,6 @@ template <> struct MappingTraits<SIMachineFunctionInfo> {
338337
YamlIO.mapOptional("highBitsOf32BitAddress",
339338
MFI.HighBitsOf32BitAddress, 0u);
340339
YamlIO.mapOptional("occupancy", MFI.Occupancy, 0);
341-
YamlIO.mapOptional("numPhysicalVGPRSpillLanes",
342-
MFI.NumPhysicalVGPRSpillLanes);
343340
YamlIO.mapOptional("spillPhysVGPRs", MFI.SpillPhysVGPRS);
344341
YamlIO.mapOptional("wwmReservedRegs", MFI.WWMReservedRegs);
345342
YamlIO.mapOptional("scavengeFI", MFI.ScavengeFI);
@@ -617,10 +614,6 @@ class SIMachineFunctionInfo final : public AMDGPUMachineFunction,
617614
ArrayRef<Register> getSGPRSpillVGPRs() const { return SpillVGPRs; }
618615
ArrayRef<Register> getSGPRSpillPhysVGPRs() const { return SpillPhysVGPRs; }
619616

620-
unsigned getNumPhysicalVGPRSpillLanes() const {
621-
return NumPhysicalVGPRSpillLanes;
622-
}
623-
624617
const WWMSpillsMap &getWWMSpills() const { return WWMSpills; }
625618
const ReservedRegSet &getWWMReservedRegs() const { return WWMReservedRegs; }
626619

llvm/test/CodeGen/MIR/AMDGPU/num-phys-vgpr-spill-lanes.ll

Lines changed: 0 additions & 15 deletions
This file was deleted.

0 commit comments

Comments
 (0)