aboutsummaryrefslogtreecommitdiff
path: root/flang/lib
diff options
context:
space:
mode:
authorVictor Kingi <victor.kingi@arm.com>2023-08-17 11:19:12 +0000
committerVictor Kingi <victor.kingi@arm.com>2023-08-23 10:19:56 +0000
commit91989c67483c37bbcee4404eea789e39dd3470d9 (patch)
tree53197f74e551a28f2cede3926f5fb6aa61de8bda /flang/lib
parent8d24b7322ee55eb780fc8115bfa8af07b6ee66b7 (diff)
downloadllvm-91989c67483c37bbcee4404eea789e39dd3470d9.zip
llvm-91989c67483c37bbcee4404eea789e39dd3470d9.tar.gz
llvm-91989c67483c37bbcee4404eea789e39dd3470d9.tar.bz2
[Flang][Driver] Implement OPT_R_Joined options
Add a BackendRemarkConsumer class, responsible for handling diagnostics received from LLVM. The diagnostics being information on middle and backend passes used or not used. Clang by default has all remarks ignored but manually sets the severity of `R_Group` to visible(`clang::diag::clang::Severity::Remark`). This patch does the same for Flang. Depends on D157410. That patch adds the R family of options to `FlangOption` and `FC1Option` in `clang/include/clang/Driver/Options.td` Reviewed By: awarzynski Differential Revision: https://reviews.llvm.org/D158174
Diffstat (limited to 'flang/lib')
-rw-r--r--flang/lib/Frontend/CompilerInvocation.cpp54
-rw-r--r--flang/lib/Frontend/FrontendActions.cpp107
-rw-r--r--flang/lib/FrontendTool/ExecuteCompilerInvocation.cpp32
3 files changed, 193 insertions, 0 deletions
diff --git a/flang/lib/Frontend/CompilerInvocation.cpp b/flang/lib/Frontend/CompilerInvocation.cpp
index ecafa4e..f2a7ffd 100644
--- a/flang/lib/Frontend/CompilerInvocation.cpp
+++ b/flang/lib/Frontend/CompilerInvocation.cpp
@@ -153,6 +153,38 @@ static bool parseDebugArgs(Fortran::frontend::CodeGenOptions &opts,
return true;
}
+// Generate an OptRemark object containing info on if the -Rgroup
+// specified is enabled or not.
+static CodeGenOptions::OptRemark
+parseOptimizationRemark(llvm::opt::ArgList &args,
+ llvm::StringRef remarkOptName) {
+ assert((remarkOptName == "pass" || remarkOptName == "pass-missed" ||
+ remarkOptName == "pass-analysis") &&
+ "Unknown group name provided.");
+ CodeGenOptions::OptRemark result;
+
+ for (llvm::opt::Arg *a : args) {
+ if (a->getOption().matches(clang::driver::options::OPT_R_Joined)) {
+ llvm::StringRef value = a->getValue();
+
+ if (value == remarkOptName) {
+ result.Kind = CodeGenOptions::RemarkKind::RK_Enabled;
+ // Enable everything
+ result.Pattern = ".*";
+ result.Regex = std::make_shared<llvm::Regex>(result.Pattern);
+
+ } else if (value.split('-') ==
+ std::make_pair(llvm::StringRef("no"), remarkOptName)) {
+ result.Kind = CodeGenOptions::RemarkKind::RK_Disabled;
+ // Disable everything
+ result.Pattern = "";
+ result.Regex = nullptr;
+ }
+ }
+ }
+ return result;
+}
+
static void parseCodeGenArgs(Fortran::frontend::CodeGenOptions &opts,
llvm::opt::ArgList &args,
clang::DiagnosticsEngine &diags) {
@@ -194,14 +226,30 @@ static void parseCodeGenArgs(Fortran::frontend::CodeGenOptions &opts,
args.getLastArg(clang::driver::options::OPT_opt_record_file))
opts.OptRecordFile = a->getValue();
+ // Optimization file format. Defaults to yaml
if (const llvm::opt::Arg *a =
args.getLastArg(clang::driver::options::OPT_opt_record_format))
opts.OptRecordFormat = a->getValue();
+ // Specifies, using a regex, which successful optimization passes(middle and
+ // backend), to include in the final optimization record file generated. If
+ // not provided -fsave-optimization-record will include all passes.
if (const llvm::opt::Arg *a =
args.getLastArg(clang::driver::options::OPT_opt_record_passes))
opts.OptRecordPasses = a->getValue();
+ // Create OptRemark that allows printing of all successful optimization
+ // passes applied.
+ opts.OptimizationRemark = parseOptimizationRemark(args, "pass");
+
+ // Create OptRemark that allows all missed optimization passes to be printed.
+ opts.OptimizationRemarkMissed = parseOptimizationRemark(args, "pass-missed");
+
+ // Create OptRemark that allows all optimization decisions made by LLVM
+ // to be printed.
+ opts.OptimizationRemarkAnalysis =
+ parseOptimizationRemark(args, "pass-analysis");
+
if (auto *a = args.getLastArg(clang::driver::options::OPT_save_temps_EQ))
opts.SaveTempsDir = a->getValue();
@@ -959,6 +1007,12 @@ bool CompilerInvocation::createFromArgs(
res.loweringOpts.setNoPPCNativeVecElemOrder(true);
}
+ // Preserve all the remark options requested, i.e. -Rpass, -Rpass-missed or
+ // -Rpass-analysis. This will be used later when processing and outputting the
+ // remarks generated by LLVM in ExecuteCompilerInvocation.cpp.
+ for (auto *a : args.filtered(clang::driver::options::OPT_R_Group))
+ res.getDiagnosticOpts().Remarks.push_back(a->getValue());
+
success &= parseFrontendArgs(res.getFrontendOpts(), args, diags);
parseTargetArgs(res.getTargetOpts(), args);
parsePreprocessorArgs(res.getPreprocessorOpts(), args);
diff --git a/flang/lib/Frontend/FrontendActions.cpp b/flang/lib/Frontend/FrontendActions.cpp
index d2c6e51..9e5efb8 100644
--- a/flang/lib/Frontend/FrontendActions.cpp
+++ b/flang/lib/Frontend/FrontendActions.cpp
@@ -919,6 +919,108 @@ void CodeGenAction::runOptimizationPipeline(llvm::raw_pwrite_stream &os) {
mpm.run(*llvmModule, mam);
}
+// This class handles optimization remark messages requested if
+// any of -Rpass, -Rpass-analysis or -Rpass-missed flags were provided
+class BackendRemarkConsumer : public llvm::DiagnosticHandler {
+
+ const CodeGenOptions &codeGenOpts;
+ clang::DiagnosticsEngine &diags;
+
+public:
+ BackendRemarkConsumer(clang::DiagnosticsEngine &diags,
+ const CodeGenOptions &codeGenOpts)
+ : codeGenOpts(codeGenOpts), diags(diags) {}
+
+ bool isAnalysisRemarkEnabled(llvm::StringRef passName) const override {
+ return codeGenOpts.OptimizationRemarkAnalysis.patternMatches(passName);
+ }
+ bool isMissedOptRemarkEnabled(llvm::StringRef passName) const override {
+ return codeGenOpts.OptimizationRemarkMissed.patternMatches(passName);
+ }
+ bool isPassedOptRemarkEnabled(llvm::StringRef passName) const override {
+ return codeGenOpts.OptimizationRemark.patternMatches(passName);
+ }
+
+ bool isAnyRemarkEnabled() const override {
+ return codeGenOpts.OptimizationRemarkAnalysis.hasValidPattern() ||
+ codeGenOpts.OptimizationRemarkMissed.hasValidPattern() ||
+ codeGenOpts.OptimizationRemark.hasValidPattern();
+ }
+
+ void
+ emitOptimizationMessage(const llvm::DiagnosticInfoOptimizationBase &diagInfo,
+ unsigned diagID) {
+ // We only support warnings and remarks.
+ assert(diagInfo.getSeverity() == llvm::DS_Remark ||
+ diagInfo.getSeverity() == llvm::DS_Warning);
+
+ std::string msg;
+ llvm::raw_string_ostream msgStream(msg);
+ msgStream << diagInfo.getMsg();
+
+ // Emit message.
+ diags.Report(diagID) << clang::AddFlagValue(diagInfo.getPassName())
+ << msgStream.str();
+ }
+
+ void optimizationRemarkHandler(
+ const llvm::DiagnosticInfoOptimizationBase &diagInfo) {
+ auto passName = diagInfo.getPassName();
+ if (diagInfo.isPassed()) {
+ if (codeGenOpts.OptimizationRemark.patternMatches(passName))
+ // Optimization remarks are active only if the -Rpass flag has a regular
+ // expression that matches the name of the pass name in \p d.
+ emitOptimizationMessage(
+ diagInfo, clang::diag::remark_fe_backend_optimization_remark);
+
+ return;
+ }
+
+ if (diagInfo.isMissed()) {
+ if (codeGenOpts.OptimizationRemarkMissed.patternMatches(passName))
+ // Missed optimization remarks are active only if the -Rpass-missed
+ // flag has a regular expression that matches the name of the pass
+ // name in \p d.
+ emitOptimizationMessage(
+ diagInfo,
+ clang::diag::remark_fe_backend_optimization_remark_missed);
+
+ return;
+ }
+
+ assert(diagInfo.isAnalysis() && "Unknown remark type");
+
+ bool shouldAlwaysPrint = false;
+ auto *ora = llvm::dyn_cast<llvm::OptimizationRemarkAnalysis>(&diagInfo);
+ if (ora)
+ shouldAlwaysPrint = ora->shouldAlwaysPrint();
+
+ if (shouldAlwaysPrint ||
+ codeGenOpts.OptimizationRemarkAnalysis.patternMatches(passName))
+ emitOptimizationMessage(
+ diagInfo,
+ clang::diag::remark_fe_backend_optimization_remark_analysis);
+ }
+
+ bool handleDiagnostics(const llvm::DiagnosticInfo &di) override {
+ switch (di.getKind()) {
+ case llvm::DK_OptimizationRemark:
+ optimizationRemarkHandler(llvm::cast<llvm::OptimizationRemark>(di));
+ break;
+ case llvm::DK_OptimizationRemarkMissed:
+ optimizationRemarkHandler(llvm::cast<llvm::OptimizationRemarkMissed>(di));
+ break;
+ case llvm::DK_OptimizationRemarkAnalysis:
+ optimizationRemarkHandler(
+ llvm::cast<llvm::OptimizationRemarkAnalysis>(di));
+ break;
+ default:
+ break;
+ }
+ return true;
+ }
+};
+
void CodeGenAction::embedOffloadObjects() {
CompilerInstance &ci = this->getInstance();
const auto &cgOpts = ci.getInvocation().getCodeGenOpts();
@@ -1029,6 +1131,11 @@ void CodeGenAction::executeAction() {
if (!codeGenOpts.OffloadObjects.empty())
embedOffloadObjects();
+ BackendRemarkConsumer remarkConsumer(diags, codeGenOpts);
+
+ llvmModule->getContext().setDiagnosticHandler(
+ std::make_unique<BackendRemarkConsumer>(remarkConsumer));
+
// write optimization-record
llvm::Expected<std::unique_ptr<llvm::ToolOutputFile>> optRecordFileOrErr =
setupLLVMOptimizationRemarks(
diff --git a/flang/lib/FrontendTool/ExecuteCompilerInvocation.cpp b/flang/lib/FrontendTool/ExecuteCompilerInvocation.cpp
index 883f109..e1de344 100644
--- a/flang/lib/FrontendTool/ExecuteCompilerInvocation.cpp
+++ b/flang/lib/FrontendTool/ExecuteCompilerInvocation.cpp
@@ -22,6 +22,7 @@
#include "mlir/IR/AsmState.h"
#include "mlir/IR/MLIRContext.h"
#include "mlir/Pass/PassManager.h"
+#include "clang/Basic/DiagnosticFrontend.h"
#include "clang/Driver/Options.h"
#include "llvm/Option/OptTable.h"
#include "llvm/Option/Option.h"
@@ -100,6 +101,34 @@ createFrontendAction(CompilerInstance &ci) {
llvm_unreachable("Invalid program action!");
}
+// Remarks are ignored by default in Diagnostic.td, hence, we have to
+// enable them here before execution. Clang follows same idea using
+// ProcessWarningOptions in Warnings.cpp
+// This function is also responsible for emitting early warnings for
+// invalid -R options.
+static void
+updateDiagEngineForOptRemarks(clang::DiagnosticsEngine &diagsEng,
+ const clang::DiagnosticOptions &opts) {
+ llvm::SmallVector<clang::diag::kind, 10> diags;
+ const llvm::IntrusiveRefCntPtr<clang::DiagnosticIDs> diagIDs =
+ diagsEng.getDiagnosticIDs();
+
+ for (unsigned i = 0; i < opts.Remarks.size(); i++) {
+ llvm::StringRef remarkOpt = opts.Remarks[i];
+ const auto flavor = clang::diag::Flavor::Remark;
+
+ // Check to see if this opt starts with "no-", if so, this is a
+ // negative form of the option.
+ bool isPositive = !remarkOpt.startswith("no-");
+ if (!isPositive)
+ remarkOpt = remarkOpt.substr(3);
+
+ diagsEng.setSeverityForGroup(flavor, remarkOpt,
+ isPositive ? clang::diag::Severity::Remark
+ : clang::diag::Severity::Ignored);
+ }
+}
+
bool executeCompilerInvocation(CompilerInstance *flang) {
// Honor -help.
if (flang->getFrontendOpts().showHelp) {
@@ -165,6 +194,9 @@ bool executeCompilerInvocation(CompilerInstance *flang) {
// Honor color diagnostics.
flang->getDiagnosticOpts().ShowColors = flang->getFrontendOpts().showColors;
+ updateDiagEngineForOptRemarks(flang->getDiagnostics(),
+ flang->getDiagnosticOpts());
+
// Create and execute the frontend action.
std::unique_ptr<FrontendAction> act(createFrontendAction(*flang));
if (!act)