commit d9be2c7e64a28f359433942f57756a6408ca023c
author Wei Mi <wmi@google.com> Tue Jun 12 05:53:49 2018 +0000
committer Wei Mi <wmi@google.com> Tue Jun 12 05:53:49 2018 +0000
tree 9fa75c8725a2883d29946b8e970afc864fc03327
parent 432db3b43b811f2b13286d7e0dac3284a7815335

[NFC] Change sample profile format enum name SPF_Raw_Binary to SPF_Binary.

Some out-of-tree targets depend on the enum name SPF_Binary. Keep the name
can avoid unnecessary churn to those targets.

llvm-svn: 334476

llvm/tools/llvm-profdata/llvm-profdata.cpp

diff --git a/llvm/tools/llvm-profdata/llvm-profdata.cpp b/llvm/tools/llvm-profdata/llvm-profdata.cpp
index cab1237..1a0b9e1 100644
--- a/llvm/tools/llvm-profdata/llvm-profdata.cpp
+++ b/llvm/tools/llvm-profdata/llvm-profdata.cpp
@@ -39,7 +39,7 @@
   PF_Text,
   PF_Compact_Binary,
   PF_GCC,
-  PF_Raw_Binary
+  PF_Binary
 };
 
 static void warn(Twine Message, std::string Whence = "",
@@ -242,7 +242,7 @@
   if (OutputFilename.compare("-") == 0)
     exitWithError("Cannot write indexed profdata format to stdout.");
 
-  if (OutputFormat != PF_Raw_Binary && OutputFormat != PF_Compact_Binary &&
+  if (OutputFormat != PF_Binary && OutputFormat != PF_Compact_Binary &&
       OutputFormat != PF_Text)
     exitWithError("Unknown format is specified.");
 
@@ -324,7 +324,7 @@
 
 static sampleprof::SampleProfileFormat FormatMap[] = {
     sampleprof::SPF_None, sampleprof::SPF_Text, sampleprof::SPF_Compact_Binary,
-    sampleprof::SPF_GCC, sampleprof::SPF_Raw_Binary};
+    sampleprof::SPF_GCC, sampleprof::SPF_Binary};
 
 static void mergeSampleProfile(const WeightedFileVector &Inputs,
                                StringRef OutputFilename,
@@ -471,14 +471,13 @@
       cl::values(clEnumVal(instr, "Instrumentation profile (default)"),
                  clEnumVal(sample, "Sample profile")));
   cl::opt<ProfileFormat> OutputFormat(
-      cl::desc("Format of output profile"), cl::init(PF_Raw_Binary),
-      cl::values(
-          clEnumValN(PF_Raw_Binary, "binary", "Binary encoding (default)"),
-          clEnumValN(PF_Compact_Binary, "compbinary",
-                     "Compact binary encoding"),
-          clEnumValN(PF_Text, "text", "Text encoding"),
-          clEnumValN(PF_GCC, "gcc",
-                     "GCC encoding (only meaningful for -sample)")));
+      cl::desc("Format of output profile"), cl::init(PF_Binary),
+      cl::values(clEnumValN(PF_Binary, "binary", "Binary encoding (default)"),
+                 clEnumValN(PF_Compact_Binary, "compbinary",
+                            "Compact binary encoding"),
+                 clEnumValN(PF_Text, "text", "Text encoding"),
+                 clEnumValN(PF_GCC, "gcc",
+                            "GCC encoding (only meaningful for -sample)")));
   cl::opt<bool> OutputSparse("sparse", cl::init(false),
       cl::desc("Generate a sparse profile (only meaningful for -instr)"));
   cl::opt<unsigned> NumThreads(