From 467db6f5992514a4db2c9980407f22c394a36c57 Mon Sep 17 00:00:00 2001 From: Bob Wilson Date: Thu, 6 Mar 2014 04:55:37 +0000 Subject: [PATCH] PGO: Rename variables to avoid referring to the "MangledName" of a function. For C++ functions, we will continue to use the mangled name to identify functions in the PGO profile data, but this name is confusing for things like Objective-C methods. For functions with local linkage, we're also going to include the file name to help distinguish those functions, so this changes to use more generic variable names. No functional changes. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@203074 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/CodeGen/CodeGenPGO.cpp | 31 +++++++++++++++---------------- lib/CodeGen/CodeGenPGO.h | 6 +++--- 2 files changed, 18 insertions(+), 19 deletions(-) diff --git a/lib/CodeGen/CodeGenPGO.cpp b/lib/CodeGen/CodeGenPGO.cpp index a918658b47..658fb2c998 100644 --- a/lib/CodeGen/CodeGenPGO.cpp +++ b/lib/CodeGen/CodeGenPGO.cpp @@ -47,15 +47,14 @@ PGOProfileData::PGOProfileData(CodeGenModule &CGM, std::string Path) const char *CurPtr = BufferStart; uint64_t MaxCount = 0; while (CurPtr < BufferEnd) { - // Read the mangled function name. - const char *FuncName = CurPtr; - // FIXME: Something will need to be added to distinguish static functions. + // Read the function name. + const char *FuncStart = CurPtr; CurPtr = strchr(CurPtr, ' '); if (!CurPtr) { ReportBadPGOData(CGM, "pgo data file has malformed function entry"); return; } - StringRef MangledName(FuncName, CurPtr - FuncName); + StringRef FuncName(FuncStart, CurPtr - FuncStart); // Read the number of counters. char *EndPtr; @@ -73,7 +72,7 @@ PGOProfileData::PGOProfileData(CodeGenModule &CGM, std::string Path) return; } CurPtr = EndPtr; // Point to '\n'. - FunctionCounts[MangledName] = Count; + FunctionCounts[FuncName] = Count; MaxCount = Count > MaxCount ? Count : MaxCount; // There is one line for each counter; skip over those lines. @@ -89,16 +88,16 @@ PGOProfileData::PGOProfileData(CodeGenModule &CGM, std::string Path) // Skip over the blank line separating functions. CurPtr += 2; - DataOffsets[MangledName] = FuncName - BufferStart; + DataOffsets[FuncName] = FuncStart - BufferStart; } MaxFunctionCount = MaxCount; } /// Return true if a function is hot. If we know nothing about the function, /// return false. -bool PGOProfileData::isHotFunction(StringRef MangledName) { +bool PGOProfileData::isHotFunction(StringRef FuncName) { llvm::StringMap::const_iterator CountIter = - FunctionCounts.find(MangledName); + FunctionCounts.find(FuncName); // If we know nothing about the function, return false. if (CountIter == FunctionCounts.end()) return false; @@ -109,9 +108,9 @@ bool PGOProfileData::isHotFunction(StringRef MangledName) { /// Return true if a function is cold. If we know nothing about the function, /// return false. -bool PGOProfileData::isColdFunction(StringRef MangledName) { +bool PGOProfileData::isColdFunction(StringRef FuncName) { llvm::StringMap::const_iterator CountIter = - FunctionCounts.find(MangledName); + FunctionCounts.find(FuncName); // If we know nothing about the function, return false. if (CountIter == FunctionCounts.end()) return false; @@ -120,11 +119,11 @@ bool PGOProfileData::isColdFunction(StringRef MangledName) { return CountIter->getValue() <= (uint64_t)(0.01 * (double)MaxFunctionCount); } -bool PGOProfileData::getFunctionCounts(StringRef MangledName, +bool PGOProfileData::getFunctionCounts(StringRef FuncName, std::vector &Counts) { // Find the relevant section of the pgo-data file. llvm::StringMap::const_iterator OffsetIter = - DataOffsets.find(MangledName); + DataOffsets.find(FuncName); if (OffsetIter == DataOffsets.end()) return true; const char *CurPtr = DataBuffer->getBufferStart() + OffsetIter->getValue(); @@ -197,7 +196,7 @@ void CodeGenPGO::emitWriteoutFunction(StringRef Name) { llvm::Type *Int64PtrTy = llvm::Type::getInt64PtrTy(Ctx); llvm::Type *Args[] = { - Int8PtrTy, // const char *MangledName + Int8PtrTy, // const char *FuncName Int32Ty, // uint32_t NumCounters Int64PtrTy // uint64_t *Counters }; @@ -206,10 +205,10 @@ void CodeGenPGO::emitWriteoutFunction(StringRef Name) { llvm::Constant *EmitFunc = CGM.getModule().getOrInsertFunction("llvm_pgo_emit", FTy); - llvm::Constant *MangledName = + llvm::Constant *NameString = CGM.GetAddrOfConstantCString(Name, "__llvm_pgo_name"); - MangledName = llvm::ConstantExpr::getBitCast(MangledName, Int8PtrTy); - PGOBuilder.CreateCall3(EmitFunc, MangledName, + NameString = llvm::ConstantExpr::getBitCast(NameString, Int8PtrTy); + PGOBuilder.CreateCall3(EmitFunc, NameString, PGOBuilder.getInt32(NumRegionCounters), PGOBuilder.CreateBitCast(RegionCounters, Int64PtrTy)); } diff --git a/lib/CodeGen/CodeGenPGO.h b/lib/CodeGen/CodeGenPGO.h index 6af25b4205..c9c0e8b004 100644 --- a/lib/CodeGen/CodeGenPGO.h +++ b/lib/CodeGen/CodeGenPGO.h @@ -42,13 +42,13 @@ public: PGOProfileData(CodeGenModule &CGM, std::string Path); /// Fill Counts with the profile data for the given function name. Returns /// false on success. - bool getFunctionCounts(StringRef MangledName, std::vector &Counts); + bool getFunctionCounts(StringRef FuncName, std::vector &Counts); /// Return true if a function is hot. If we know nothing about the function, /// return false. - bool isHotFunction(StringRef MangledName); + bool isHotFunction(StringRef FuncName); /// Return true if a function is cold. If we know nothing about the function, /// return false. - bool isColdFunction(StringRef MangledName); + bool isColdFunction(StringRef FuncName); }; /// Per-function PGO state. This class should generally not be used directly, -- 2.40.0