review comments

Author: vikramRH

llvm/lib/Target/AMDGPU/AMDGPUAsmPrinter.cpp

@@ -643,7 +643,8 @@ bool AMDGPUAsmPrinter::runOnMachineFunction(MachineFunction &MF) {
   if (!IsTargetStreamerInitialized)
     initTargetStreamer(*MF.getFunction().getParent());
 
-  ResourceUsage = &getAnalysis<AMDGPUResourceUsageAnalysisWrapperPass>();
+  ResourceUsage =
+      &getAnalysis<AMDGPUResourceUsageAnalysisWrapperPass>().getResourceInfo();
   CurrentProgramInfo.reset(MF);
 
   const AMDGPUMachineFunction *MFI = MF.getInfo<AMDGPUMachineFunction>();
@@ -665,9 +666,7 @@ bool AMDGPUAsmPrinter::runOnMachineFunction(MachineFunction &MF) {
     OutStreamer->switchSection(ConfigSection);
   }
 
-  const AMDGPUResourceUsageAnalysisImpl::SIFunctionResourceInfo &Info =
-      ResourceUsage->getResourceInfo();
-  RI.gatherResourceInfo(MF, Info, OutContext);
+  RI.gatherResourceInfo(MF, *ResourceUsage, OutContext);
 
   if (MFI->isModuleEntryFunction()) {
     getSIProgramInfo(CurrentProgramInfo, MF);

llvm/lib/Target/AMDGPU/AMDGPUAsmPrinter.h

@@ -40,7 +40,8 @@ class AMDGPUAsmPrinter final : public AsmPrinter {
   unsigned CodeObjectVersion;
   void initializeTargetID(const Module &M);
 
-  AMDGPUResourceUsageAnalysisWrapperPass *ResourceUsage;
+  const AMDGPUResourceUsageAnalysisWrapperPass::FunctionResourceInfo
+      *ResourceUsage;
 
   MCResourceInfo RI;
 

llvm/lib/Target/AMDGPU/AMDGPUMCResourceInfo.cpp

@@ -164,7 +164,7 @@ void MCResourceInfo::assignResourceInfoExpr(
 
 void MCResourceInfo::gatherResourceInfo(
     const MachineFunction &MF,
-    const AMDGPUResourceUsageAnalysisWrapperPass::ResultT &FRI,
+    const AMDGPUResourceUsageAnalysisWrapperPass::FunctionResourceInfo &FRI,
     MCContext &OutContext) {
   // Worst case VGPR use for non-hardware-entrypoints.
   MCSymbol *MaxVGPRSym = getMaxVGPRSymbol(OutContext);

llvm/lib/Target/AMDGPU/AMDGPUMCResourceInfo.h

@@ -90,10 +90,10 @@ class MCResourceInfo {
   /// transitive maximum or accumulative. For example, if A calls B and B's VGPR
   /// usage exceeds A's, A should be assigned B's VGPR usage. Furthermore,
   /// functions with indirect calls should be assigned the module level maximum.
-  void
-  gatherResourceInfo(const MachineFunction &MF,
-                     const AMDGPUResourceUsageAnalysisWrapperPass::ResultT &FRI,
-                     MCContext &OutContext);
+  void gatherResourceInfo(
+      const MachineFunction &MF,
+      const AMDGPUResourceUsageAnalysisWrapperPass::FunctionResourceInfo &FRI,
+      MCContext &OutContext);
 
   const MCExpr *createTotalNumVGPRs(const MachineFunction &MF, MCContext &Ctx);
   const MCExpr *createTotalNumSGPRs(const MachineFunction &MF, bool hasXnack,

llvm/lib/Target/AMDGPU/AMDGPUResourceUsageAnalysis.h

@@ -52,16 +52,17 @@ struct AMDGPUResourceUsageAnalysisImpl {
 };
 
 struct AMDGPUResourceUsageAnalysisWrapperPass : public MachineFunctionPass {
-  using ResultT = AMDGPUResourceUsageAnalysisImpl::SIFunctionResourceInfo;
-  ResultT ResourceInfo;
+  using FunctionResourceInfo =
+      AMDGPUResourceUsageAnalysisImpl::SIFunctionResourceInfo;
+  FunctionResourceInfo ResourceInfo;
 
 public:
   static char ID;
   AMDGPUResourceUsageAnalysisWrapperPass() : MachineFunctionPass(ID) {}
 
   bool runOnMachineFunction(MachineFunction &MF) override;
 
-  const ResultT &getResourceInfo() const { return ResourceInfo; }
+  const FunctionResourceInfo &getResourceInfo() const { return ResourceInfo; }
 
   void getAnalysisUsage(AnalysisUsage &AU) const override {
     AU.setPreservesAll();