[PGO] change the interface for createPGOFuncNameMetadata()

[xur]

Summary

This patch changes the interface for createPGOFuncNameMetadata() where we add another PGOFuncName argument. This is needed because clang instrumentation and IR instrumentation use slight different prefix in PGOFuncName if the source file name containing directories:
(1) clang instrumentation strips out all the directories.
(2) IR instrumentation keeps the directories path.
To accommodate both usage, we need to have this extra argument.

[davidxl]

lgtm

lib/Transforms/Instrumentation/PGOInstrumentation.cpp

735 ↗

(On Diff #54709)

I suggest changing FuncInfo.FuncName to FuncInfo.PGOFuncName for clarity, but that can be done later.

[anemet]

As a follow-on change, is there a way to add a testcase for these changes?

llvm/trunk/include/llvm/ProfileData/InstrProf.h

 inline StringRef getPGOFuncNameMetadataName() { return "PGOFuncName"; }
 
 /// Return the PGOFuncName meta data associated with a function.
 MDNode *getPGOFuncNameMetadata(const Function &F);
 
 /// Create the PGOFuncName meta data if PGOFuncName is different from
 /// function's raw name. This should only apply to internal linkage functions
 /// declared by users only.
-void createPGOFuncNameMetadata(Function &F);
+void createPGOFuncNameMetadata(Function &F, const std::string &PGOFuncName);
 
 const std::error_category &instrprof_category();
 
 enum class instrprof_error {
   success = 0,
   eof,
   unrecognized_format,
   bad_magic,

llvm/trunk/lib/ProfileData/InstrProf.cpp

bool getValueProfDataFromInst(const Instruction &Inst,
   }
   return true;
 }
 
 MDNode *getPGOFuncNameMetadata(const Function &F) {
   return F.getMetadata(getPGOFuncNameMetadataName());
 }
 
-void createPGOFuncNameMetadata(Function &F) {
-  const std::string &FuncName = getPGOFuncName(F);
-  if (FuncName == F.getName())
+void createPGOFuncNameMetadata(Function &F, const std::string &PGOFuncName) {
+  // Only for internal linkage functions.
+  if (PGOFuncName == F.getName())
+      return;
+  // Don't create duplicated meta-data.
+  if (getPGOFuncNameMetadata(F))
     return;
-
   LLVMContext &C = F.getContext();
-  MDNode *N = MDNode::get(C, MDString::get(C, FuncName.c_str()));
+  MDNode *N = MDNode::get(C, MDString::get(C, PGOFuncName.c_str()));
   F.setMetadata(getPGOFuncNameMetadataName(), N);
 }
 
 } // end namespace llvm

llvm/trunk/lib/Transforms/Instrumentation/PGOInstrumentation.cpp

 }
 
 // Traverse all the indirect callsites and annotate the instructions.
 void PGOUseFunc::annotateIndirectCallSites() {
   if (DisableValueProfiling)
     return;
 
   // Create the PGOFuncName meta data.
-  createPGOFuncNameMetadata(F);
+  createPGOFuncNameMetadata(F, FuncInfo.FuncName);
 
   unsigned IndirectCallSiteIndex = 0;
   auto IndirectCallSites = findIndirectCallSites(F);
   unsigned NumValueSites =
       ProfileRecord.getNumValueSites(IPVK_IndirectCallTarget);
   if (NumValueSites != IndirectCallSites.size()) {
     std::string Msg =
         std::string("Inconsistent number of indirect call sites: ") +