resolve comments

Author: mingmingl-llvm

llvm/include/llvm/Analysis/StaticDataProfileInfo.h

@@ -47,15 +47,17 @@ class StaticDataProfileInfo {
   LLVM_ABI std::optional<uint64_t>
   getConstantProfileCount(const Constant *C) const;
 
-  enum class StaticDataHotness : uint8_t {
-    Cold = 0,
-    LukewarmOrUnknown = 1,
-    Hot = 2,
+  /// Use signed enums for enum value comparison, and make 'LukewarmOrUnknown'
+  /// as 0 so any accidentally uninitialized value will default to unknown.
+  enum class StaticDataHotness : int8_t {
+    Cold = -1,
+    LukewarmOrUnknown = 0,
+    Hot = 1,
   };
 
   /// Return the hotness of the constant \p C based on its profile count \p
   /// Count.
-  LLVM_ABI StaticDataHotness getSectionHotnessUsingProfileCount(
+  LLVM_ABI StaticDataHotness getConstantHotnessUsingProfileCount(
       const Constant *C, const ProfileSummaryInfo *PSI, uint64_t Count) const;
 
   /// Return the string representation of the hotness enum \p Hotness.

llvm/lib/Analysis/StaticDataProfileInfo.cpp

@@ -61,30 +61,29 @@ void StaticDataProfileInfo::addConstantProfileCount(
 }
 
 StaticDataProfileInfo::StaticDataHotness
-StaticDataProfileInfo::getSectionHotnessUsingProfileCount(
+StaticDataProfileInfo::getConstantHotnessUsingProfileCount(
     const Constant *C, const ProfileSummaryInfo *PSI, uint64_t Count) const {
-  // The accummulated counter shows the constant is hot. Return 'hot' whether
-  // this variable is seen by unprofiled functions or not.
+  // The accummulated counter shows the constant is hot. Return enum 'hot'
+  // whether this variable is seen by unprofiled functions or not.
   if (PSI->isHotCount(Count))
     return StaticDataHotness::Hot;
   // The constant is not hot, and seen by unprofiled functions. We don't want to
   // assign it to unlikely sections, even if the counter says 'cold'. So return
-  // an empty prefix before checking whether the counter is cold.
+  // enum 'LukewarmOrUnknown'.
   if (ConstantWithoutCounts.count(C))
     return StaticDataHotness::LukewarmOrUnknown;
-  // The accummulated counter shows the constant is cold. Return 'unlikely'.
+  // The accummulated counter shows the constant is cold so return enum 'cold'.
   if (PSI->isColdCount(Count))
     return StaticDataHotness::Cold;
 
   return StaticDataHotness::LukewarmOrUnknown;
 }
 
-StringRef StaticDataProfileInfo::hotnessToStr(
-    StaticDataProfileInfo::StaticDataHotness Hotness) const {
+StringRef StaticDataProfileInfo::hotnessToStr(StaticDataHotness Hotness) const {
   switch (Hotness) {
-  case StaticDataProfileInfo::StaticDataHotness::Cold:
+  case StaticDataHotness::Cold:
     return "unlikely";
-  case StaticDataProfileInfo::StaticDataHotness::Hot:
+  case StaticDataHotness::Hot:
     return "hot";
   default:
     return "";
@@ -104,7 +103,7 @@ StringRef StaticDataProfileInfo::getConstantSectionPrefix(
   std::optional<uint64_t> Count = getConstantProfileCount(C);
   if (!Count)
     return "";
-  return hotnessToStr(getSectionHotnessUsingProfileCount(C, PSI, *Count));
+  return hotnessToStr(getConstantHotnessUsingProfileCount(C, PSI, *Count));
 }
 
 bool StaticDataProfileInfoWrapperPass::doInitialization(Module &M) {