Recommit r354930 "[PGO] Context sensitive PGO (part 1)"
Fixed UBSan failures.
llvm-svn: 355005
diff --git a/llvm/tools/gold/gold-plugin.cpp b/llvm/tools/gold/gold-plugin.cpp
index 626fb5f..fbf78b0 100644
--- a/llvm/tools/gold/gold-plugin.cpp
+++ b/llvm/tools/gold/gold-plugin.cpp
@@ -209,6 +209,10 @@
static std::string OptRemarksFilename;
static bool OptRemarksWithHotness = false;
+ // Context sensitive PGO options.
+ static std::string cs_profile_path;
+ static bool cs_pgo_gen = false;
+
static void process_plugin_option(const char *opt_)
{
if (opt_ == nullptr)
@@ -268,7 +272,11 @@
} else if (opt == "disable-verify") {
DisableVerify = true;
} else if (opt.startswith("sample-profile=")) {
- sample_profile= opt.substr(strlen("sample-profile="));
+ sample_profile = opt.substr(strlen("sample-profile="));
+ } else if (opt == "cs-profile-generate") {
+ cs_pgo_gen = true;
+ } else if (opt.startswith("cs-profile-path=")) {
+ cs_profile_path = opt.substr(strlen("cs-profile-path="));
} else if (opt == "new-pass-manager") {
new_pass_manager = true;
} else if (opt == "debug-pass-manager") {
@@ -892,6 +900,10 @@
if (!options::sample_profile.empty())
Conf.SampleProfile = options::sample_profile;
+ if (!options::cs_profile_path.empty())
+ Conf.CSIRProfile = options::cs_profile_path;
+ Conf.RunCSIRInstr = options::cs_pgo_gen;
+
Conf.DwoDir = options::dwo_dir;
// Set up optimization remarks handling.
diff --git a/llvm/tools/llvm-lto2/llvm-lto2.cpp b/llvm/tools/llvm-lto2/llvm-lto2.cpp
index d995081..6cceb8e 100644
--- a/llvm/tools/llvm-lto2/llvm-lto2.cpp
+++ b/llvm/tools/llvm-lto2/llvm-lto2.cpp
@@ -104,6 +104,15 @@
SamplePGOFile("lto-sample-profile-file",
cl::desc("Specify a SamplePGO profile file"));
+static cl::opt<std::string>
+ CSPGOFile("lto-cspgo-profile-file",
+ cl::desc("Specify a context sensitive PGO profile file"));
+
+static cl::opt<bool>
+ RunCSIRInstr("lto-cspgo-gen",
+ cl::desc("Run PGO context sensitive IR instrumentation"),
+ cl::init(false), cl::Hidden);
+
static cl::opt<bool>
UseNewPM("use-new-pm",
cl::desc("Run LTO passes using the new pass manager"),
@@ -214,6 +223,8 @@
Conf.RemarksWithHotness = OptRemarksWithHotness;
Conf.SampleProfile = SamplePGOFile;
+ Conf.CSIRProfile = CSPGOFile;
+ Conf.RunCSIRInstr = RunCSIRInstr;
// Run a custom pipeline, if asked for.
Conf.OptPipeline = OptPipeline;