Fix the merge

rampitec · rampitec · commit 25aed86a1602 · 2024-10-16T15:34:53.000-07:00
diff --git a/llvm/lib/Target/AMDGPU/SIRegisterInfo.cpp b/llvm/lib/Target/AMDGPU/SIRegisterInfo.cpp
@@ -3852,16 +3852,6 @@ SIRegisterInfo::getSubRegAlignmentNumBits(const TargetRegisterClass *RC,
   return 0;
 }
 
-SmallVector<StringLiteral>
-SIRegisterInfo::getVRegFlagsOfReg(Register Reg,
-                                  const MachineFunction &MF) const {
-  SmallVector<StringLiteral> RegFlags;
-  const SIMachineFunctionInfo *FuncInfo = MF.getInfo<SIMachineFunctionInfo>();
-  if (FuncInfo->checkFlag(Reg, AMDGPU::VirtRegFlag::WWM_REG))
-    RegFlags.push_back("WWM_REG");
-  return RegFlags;
-}
-
 unsigned
 SIRegisterInfo::getNumUsedPhysRegs(const MachineRegisterInfo &MRI,
                                    const TargetRegisterClass &RC) const {
diff --git a/llvm/lib/Target/AMDGPU/SIRegisterInfo.h b/llvm/lib/Target/AMDGPU/SIRegisterInfo.h
@@ -463,9 +463,6 @@ class SIRegisterInfo final : public AMDGPUGenRegisterInfo {
                              : std::optional<uint8_t>{};
   }
 
-  SmallVector<StringLiteral>
-  getVRegFlagsOfReg(Register Reg, const MachineFunction &MF) const override;
-
   // \returns a number of registers of a given \p RC used in a function.
   // Does not go inside function calls.
   unsigned getNumUsedPhysRegs(const MachineRegisterInfo &MRI,

Original file line number	Diff line number	Diff line change
`@@ -463,9 +463,6 @@ class SIRegisterInfo final : public AMDGPUGenRegisterInfo {`
`463`	`463`	`: std::optional<uint8_t>{};`
`464`	`464`	`}`
`465`	`465`
`466`		`- SmallVector<StringLiteral>`
`467`		`- getVRegFlagsOfReg(Register Reg, const MachineFunction &MF) const override;`
`468`		`-`
`469`	`466`	`// \returns a number of registers of a given \p RC used in a function.`
`470`	`467`	`// Does not go inside function calls.`
`471`	`468`	`unsigned getNumUsedPhysRegs(const MachineRegisterInfo &MRI,`