use -fprofile-generate to specify the profile path

Author: wlei-llvm

clang/include/clang/Driver/Options.td

@@ -1787,10 +1787,7 @@ defm debug_info_for_profiling : BoolFOption<"debug-info-for-profiling",
   NegFlag<SetFalse>>;
 def fprofile_sample_cold_function : Flag<["-"], "fprofile-sample-cold-function">, 
     Group<f_Group>, Visibility<[ClangOption, CLOption]>,
-    HelpText<"Generate instrumented code to cold functions guided by sampling-based profile into default.profraw file (overridden by '=' form of option or LLVM_PROFILE_FILE env var)">;
-def fprofile_sample_cold_function_EQ : Joined<["-"], "fprofile-sample-cold-function=">, 
-    Group<f_Group>, Visibility<[ClangOption, CLOption]>, MetaVarName<"<file>">,
-    HelpText<"Generate instrumented code to cold functions guided by sampling-based profile into <file> (overridden by LLVM_PROFILE_FILE env var)">; 
+    HelpText<"Generate instrumented code to cold functions guided by sampling-based profile">;
 def fprofile_instr_generate : Flag<["-"], "fprofile-instr-generate">,
     Group<f_Group>, Visibility<[ClangOption, CLOption]>,
     HelpText<"Generate instrumented code to collect execution counts into default.profraw file (overridden by '=' form of option or LLVM_PROFILE_FILE env var)">;

clang/lib/Driver/ToolChain.cpp

@@ -889,9 +889,7 @@ bool ToolChain::needsProfileRT(const ArgList &Args) {
          Args.hasArg(options::OPT_fprofile_instr_generate) ||
          Args.hasArg(options::OPT_fprofile_instr_generate_EQ) ||
          Args.hasArg(options::OPT_fcreate_profile) ||
-         Args.hasArg(options::OPT_forder_file_instrumentation) ||
-         Args.hasArg(options::OPT_fprofile_sample_cold_function) ||
-         Args.hasArg(options::OPT_fprofile_sample_cold_function_EQ);
+         Args.hasArg(options::OPT_forder_file_instrumentation);
 }
 
 bool ToolChain::needsGCovInstrumentation(const llvm::opt::ArgList &Args) {

clang/lib/Driver/ToolChains/Clang.cpp

@@ -649,26 +649,24 @@ static void addPGOAndCoverageFlags(const ToolChain &TC, Compilation &C,
     }
   }
 
-  if (auto *SampleColdArg =
-          Args.getLastArg(options::OPT_fprofile_sample_cold_function,
-                          options::OPT_fprofile_sample_cold_function_EQ)) {
-    SmallString<128> Path(SampleColdArg->getOption().matches(
-                              options::OPT_fprofile_sample_cold_function_EQ)
-                              ? SampleColdArg->getValue()
-                              : "");
-    llvm::sys::path::append(Path, "default_%m.profraw");
+  auto *SampleColdArg =
+      Args.getLastArg(options::OPT_fprofile_sample_cold_function);
+
+  Arg *PGOGenArg = nullptr;
+  if (SampleColdArg) {
+    SmallString<128> Path(
+        PGOGenerateArg->getOption().matches(options::OPT_fprofile_generate_EQ)
+            ? PGOGenerateArg->getValue()
+            : "");
+    Path.append("default_%m.profraw");
     CmdArgs.push_back("-mllvm");
     CmdArgs.push_back(Args.MakeArgString(
         Twine("--instrument-sample-cold-function-path=") + Path));
-  }
-
-  Arg *PGOGenArg = nullptr;
-  if (PGOGenerateArg) {
+  } else if (PGOGenerateArg) {
     assert(!CSPGOGenerateArg);
     PGOGenArg = PGOGenerateArg;
     CmdArgs.push_back("-fprofile-instrument=llvm");
-  }
-  if (CSPGOGenerateArg) {
+  } else if (CSPGOGenerateArg) {
     assert(!PGOGenerateArg);
     PGOGenArg = CSPGOGenerateArg;
     CmdArgs.push_back("-fprofile-instrument=csllvm");
@@ -7037,7 +7035,9 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
           options::OPT_fcs_profile_generate,
           options::OPT_fcs_profile_generate_EQ, options::OPT_fprofile_use,
           options::OPT_fprofile_use_EQ);
-      if (PGOArg)
+      auto *SampleColdArg =
+          Args.getLastArg(options::OPT_fprofile_sample_cold_function);
+      if (PGOArg && !SampleColdArg)
         D.Diag(diag::err_drv_argument_not_allowed_with)
             << "SampleUse with PGO options";