[PATCH] D15243: [PGO]: Do not use invalid Char in instrumentation variable names

[David Li via llvm-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rL255365: [PGO] Stop using invalid char in instr variable names. (authored by davidxl).

Changed prior to commit:
  http://reviews.llvm.org/D15243?vs=42498&id=42554#toc

Repository:
  rL LLVM

http://reviews.llvm.org/D15243

Files:
  llvm/trunk/include/llvm/ProfileData/InstrProf.h
  llvm/trunk/lib/ProfileData/InstrProf.cpp
  llvm/trunk/test/Transforms/PGOProfile/Inputs/criticaledge.proftext
  llvm/trunk/test/Transforms/PGOProfile/criticaledge.ll
  llvm/trunk/test/tools/llvm-profdata/Inputs/compat.profdata.v4
  llvm/trunk/test/tools/llvm-profdata/compat.proftext

Index: llvm/trunk/lib/ProfileData/InstrProf.cpp
===================================================================
--- llvm/trunk/lib/ProfileData/InstrProf.cpp
+++ llvm/trunk/lib/ProfileData/InstrProf.cpp
@@ -74,25 +74,26 @@
 
 std::string getPGOFuncName(StringRef RawFuncName,
                            GlobalValue::LinkageTypes Linkage,
-                           StringRef FileName,
-                           uint64_t Version LLVM_ATTRIBUTE_UNUSED) {
+                           StringRef FileName, uint64_t Version) {
 
   // Function names may be prefixed with a binary '1' to indicate
   // that the backend should not modify the symbols due to any platform
   // naming convention. Do not include that '1' in the PGO profile name.
   if (RawFuncName[0] == '\1')
     RawFuncName = RawFuncName.substr(1);
+  const char *Unknown = (Version <= 3 ? "<unknown>:" : "__unknown__");
+  const char *Sep = (Version <= 3 ? ":" : "__");
 
   std::string FuncName = RawFuncName;
   if (llvm::GlobalValue::isLocalLinkage(Linkage)) {
     // For local symbols, prepend the main file name to distinguish them.
     // Do not include the full path in the file name since there's no guarantee
     // that it will stay the same, e.g., if the files are checked out from
     // version control in different locations.
     if (FileName.empty())
-      FuncName = FuncName.insert(0, "<unknown>:");
+      FuncName = FuncName.insert(0, Unknown);
     else
-      FuncName = FuncName.insert(0, FileName.str() + ":");
+      FuncName = FuncName.insert(0, FileName.str() + Sep);
   }
   return FuncName;
 }
Index: llvm/trunk/include/llvm/ProfileData/InstrProf.h
===================================================================
--- llvm/trunk/include/llvm/ProfileData/InstrProf.h
+++ llvm/trunk/include/llvm/ProfileData/InstrProf.h
@@ -30,7 +30,7 @@
 #include <system_error>
 #include <vector>
 
-#define INSTR_PROF_INDEX_VERSION 3
+#define INSTR_PROF_INDEX_VERSION 4
 namespace llvm {
 
 class Function;
Index: llvm/trunk/test/tools/llvm-profdata/compat.proftext
===================================================================
--- llvm/trunk/test/tools/llvm-profdata/compat.proftext
+++ llvm/trunk/test/tools/llvm-profdata/compat.proftext
@@ -65,3 +65,10 @@
 # FORMATV2-NEXT: Maximum internal block count: 1000000
 
 
+# RUN: llvm-profdata show %S/Inputs/compat.profdata.v4 -all-functions --counts | FileCheck %s -check-prefix=FORMATV4
+# FORMATV4:  instrprof.c__foo_static:
+# FORMATV4-NEXT:    Hash: 0x000000000000000a
+# FORMATV4-NEXT:    Counters: 2
+# FORMATV4-NEXT:    Function count: 500500
+# FORMATV4-NEXT:    Block counts: [180100]
+
Index: llvm/trunk/test/Transforms/PGOProfile/criticaledge.ll
===================================================================
--- llvm/trunk/test/Transforms/PGOProfile/criticaledge.ll
+++ llvm/trunk/test/Transforms/PGOProfile/criticaledge.ll
@@ -5,7 +5,7 @@
 target triple = "x86_64-unknown-linux-gnu"
 
 ; GEN: @__llvm_profile_name_test_criticalEdge = private constant [17 x i8] c"test_criticalEdge"
-; GEN: @"__llvm_profile_name_<stdin>:bar" = private constant [11 x i8] c"<stdin>:bar"
+; GEN: @"__llvm_profile_name_<stdin>__bar" = private constant [12 x i8] c"<stdin>__bar"
 
 define i32 @test_criticalEdge(i32 %i, i32 %j) {
 entry:
@@ -99,7 +99,7 @@
 
 define internal i32 @bar(i32 %i) {
 entry:
-; GEN: call void @llvm.instrprof.increment(i8* getelementptr inbounds ([11 x i8], [11 x i8]* @"__llvm_profile_name_<stdin>:bar", i32 0, i32 0), i64 12884901887, i32 1, i32 0)
+; GEN: call void @llvm.instrprof.increment(i8* getelementptr inbounds ([12 x i8], [12 x i8]* @"__llvm_profile_name_<stdin>__bar", i32 0, i32 0), i64 12884901887, i32 1, i32 0)
   ret i32 %i
 }
 
Index: llvm/trunk/test/Transforms/PGOProfile/Inputs/criticaledge.proftext
===================================================================
--- llvm/trunk/test/Transforms/PGOProfile/Inputs/criticaledge.proftext
+++ llvm/trunk/test/Transforms/PGOProfile/Inputs/criticaledge.proftext
@@ -10,7 +10,7 @@
 2
 1
 
-<stdin>:bar
+<stdin>__bar
 12884901887
 1
 7


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D15243.42554.patch
Type: text/x-patch
Size: 4072 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20151211/27dad38e/attachment.bin>