Remove unneeded calculations and rename functions

Author: Nicholas-Baron

llvm/lib/Target/AMDGPU/GCNSchedStrategy.cpp

@@ -1360,10 +1360,6 @@ void GCNSchedStage::checkScheduling() {
   unsigned MaxArchVGPRs = std::min(MaxVGPRs, ST.getAddressableNumArchVGPRs());
   unsigned MaxSGPRs = ST.getMaxNumSGPRs(MF);
 
-  unsigned MaxAGPRs = ST.getMaxNumAGPRs(MF, MaxArchVGPRs, WavesAfter);
-
-  assert(MaxAGPRs + MaxArchVGPRs == MaxVGPRs);
-
   if (PressureAfter.getVGPRNum(ST.hasGFX90AInsts()) > MaxVGPRs ||
       PressureAfter.getArchVGPRNum() > MaxArchVGPRs ||
       PressureAfter.getAGPRNum() > MaxArchVGPRs ||

llvm/lib/Target/AMDGPU/Utils/AMDGPUBaseInfo.cpp

@@ -1508,6 +1508,8 @@ unsigned getMaxNumAGPRs(const MCSubtargetInfo *STI, unsigned int WavesPerEU) {
   return std::min(MaxNumAGPRs, AddressableNumAGPRs);
 }
 
+unsigned getAddressableNumAGPRs(const MCSubtargetInfo *STI) { return 256; }
+
 unsigned getEncodedNumVGPRBlocks(const MCSubtargetInfo *STI, unsigned NumVGPRs,
                                  std::optional<bool> EnableWavefrontSize32) {
   return getGranulatedNumRegisterBlocks(

llvm/lib/Target/AMDGPU/Utils/AMDGPUBaseInfo.h

@@ -353,14 +353,13 @@ unsigned getNumWavesPerEUWithNumVGPRs(unsigned NumVGPRs, unsigned Granule,
                                       unsigned MaxWaves,
                                       unsigned TotalNumVGPRs);
 
-// TODO: Is this accurate for all subtargets?
-// Remove constexpr later
-constexpr unsigned getTotalNumAGPRs() { return 256; }
-
 /// \returns Maximum number of AGPRs that meets given number of waves per
 /// execution unit requirement for given subtarget \p STI.
 unsigned getMaxNumAGPRs(const MCSubtargetInfo *STI, unsigned WavesPerEU);
 
+/// \returns Addressable number of AGPRs for a given subtarget \p STI.
+unsigned getAddressableNumAGPRs(const MCSubtargetInfo *STI);
+
 /// \returns Occupancy for a given \p SGPRs usage, \p MaxWaves possible, and \p
 /// Gen.
 unsigned getOccupancyWithNumSGPRs(unsigned SGPRs, unsigned MaxWaves,