Change CFG to lower-case Cfg.

Author: rlavaee

llvm/include/llvm/CodeGen/BasicBlockSectionsProfileReader.h

@@ -42,7 +42,7 @@ struct BBClusterInfo {
   unsigned PositionInCluster;
 };
 
-// This represents the CFG profile data for a function.
+// This represents the cfg profile data for a function.
 struct CfgProfile {
   // Node counts for each basic block.
   DenseMap<UniqueBBID, uint64_t> NodeCounts;
@@ -75,7 +75,7 @@ struct FunctionProfile {
   // determines the `UniqueBBID::CloneID` of the cloned blocks in that path.
   SmallVector<SmallVector<unsigned>> ClonePaths;
   // Cfg profile data (block and edge frequencies).
-  CfgProfile CFG;
+  CfgProfile Cfg;
 };
 
 class BasicBlockSectionsProfileReader {
@@ -109,7 +109,7 @@ class BasicBlockSectionsProfileReader {
     auto It = ProgramPathAndClusterInfo.find(getAliasName(FuncName));
     if (It == ProgramPathAndClusterInfo.end())
       return nullptr;
-    return &It->second.CFG;
+    return &It->second.Cfg;
   }
 
 private:

llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp

@@ -1542,11 +1542,11 @@ void AsmPrinter::emitBBAddrMapSection(const MachineFunction &MF) {
 
     // We will emit the BBSPR profile data if requested and availale. Otherwise,
     // we fall back to MBFI and MBPI.
-    const CfgProfile *FuncCFGProfile = nullptr;
+    const CfgProfile *FuncCfgProfile = nullptr;
     if (PgoAnalysisMapUsePropellerCfg) {
       if (auto *BBSPR = getAnalysisIfAvailable<
               BasicBlockSectionsProfileReaderWrapperPass>())
-        FuncCFGProfile =
+        FuncCfgProfile =
             BBSPR->getFunctionCfgProfile(MF.getFunction().getName());
     }
 
@@ -1562,8 +1562,8 @@ void AsmPrinter::emitBBAddrMapSection(const MachineFunction &MF) {
     if (Features.FuncEntryCount) {
       OutStreamer->AddComment("function entry count");
       uint64_t EntryCount = 0;
-      if (FuncCFGProfile) {
-        EntryCount = FuncCFGProfile->getNodeCount(*MF.front().getBBID());
+      if (FuncCfgProfile) {
+        EntryCount = FuncCfgProfile->getNodeCount(*MF.front().getBBID());
       } else {
         auto MaybeEntryCount = MF.getFunction().getEntryCount();
         EntryCount = MaybeEntryCount ? MaybeEntryCount->getCount() : 0;
@@ -1577,7 +1577,7 @@ void AsmPrinter::emitBBAddrMapSection(const MachineFunction &MF) {
         if (Features.BBFreq) {
           OutStreamer->AddComment("basic block frequency");
           uint64_t BlockFrequency =
-              FuncCFGProfile ? FuncCFGProfile->getNodeCount(*MBB.getBBID())
+              FuncCfgProfile ? FuncCfgProfile->getNodeCount(*MBB.getBBID())
                              : MBFI->getBlockFreq(&MBB).getFrequency();
           OutStreamer->emitULEB128IntValue(BlockFrequency);
         }
@@ -1591,8 +1591,8 @@ void AsmPrinter::emitBBAddrMapSection(const MachineFunction &MF) {
             // For MPBI, we emit the numerator of the probability. For BBSPR, we
             // emit the raw edge count.
             uint64_t EdgeFrequency =
-                FuncCFGProfile
-                    ? FuncCFGProfile->getEdgeCount(*MBB.getBBID(),
+                FuncCfgProfile
+                    ? FuncCfgProfile->getEdgeCount(*MBB.getBBID(),
                                                    *SuccMBB->getBBID())
                     : MBPI->getEdgeProbability(&MBB, SuccMBB).getNumerator();
             OutStreamer->emitULEB128IntValue(EdgeFrequency);

llvm/lib/CodeGen/BasicBlockSectionsProfileReader.cpp

@@ -100,7 +100,7 @@ BasicBlockSectionsProfileReader::getClonePathsForFunction(
 // the edge 1->3. Within the given clusters, each cloned block is identified by
 // "<original block id>.<clone id>". For instance, 3.1 represents the first
 // clone of block 3. Original blocks are specified just with their block ids. A
-// block cloned multiple times appears with distinct clone ids. The CFG for bar
+// block cloned multiple times appears with distinct clone ids. The Cfg for bar
 // is shown below before and after cloning with its final clusters labeled.
 //
 // f main
@@ -240,12 +240,12 @@ Error BasicBlockSectionsProfileReader::ReadV1Profile() {
       }
       continue;
     }
-    case 'g': { // CFG profile specifier.
+    case 'g': { // Cfg profile specifier.
       // Skip the profile when we the profile iterator (FI) refers to the
       // past-the-end element.
       if (FI == ProgramPathAndClusterInfo.end())
         continue;
-      // For each node, its CFG profile is encoded as
+      // For each node, its Cfg profile is encoded as
       // <src>:<count>,<sink_1>:<count_1>,<sink_2>:<count_2>,...
       for (auto BasicBlockEdgeProfile : Values) {
         if (BasicBlockEdgeProfile.empty())
@@ -264,10 +264,10 @@ Error BasicBlockSectionsProfileReader::ReadV1Profile() {
                 Twine("unsigned integer expected: '") + CountStr + "'");
           if (i == 0) {
             // The first element represents the source and its total count.
-            FI->second.CFG.NodeCounts[SrcBBID = *BBID] = Count;
+            FI->second.Cfg.NodeCounts[SrcBBID = *BBID] = Count;
             continue;
           }
-          FI->second.CFG.EdgeCounts[SrcBBID][*BBID] = Count;
+          FI->second.Cfg.EdgeCounts[SrcBBID][*BBID] = Count;
         }
       }
       continue;