awarzynski created this revision.
Herald added a reviewer: sscalpone.
Herald added subscribers: jansvoboda11, dang.
awarzynski requested review of this revision.
Herald added a project: clang.
Herald added a subscriber: cfe-commits.
Adds `-fdebug-dump-parsing-log` in the new driver. This option is
semantically identical to `-fdebug-instrumented-parse` in `f18` (the
former is added as an alias in `f18`).
As dumping the parsing log makes only sense for instrumented parses, we
set Fortran::parser::Options::instrumentedParse to `True` when
`-fdebug-dump-parsing-log` is used. This is consistent with `f18`. To
facilate tweaking the frontend based on the action being run,
`setUpFrontendBasedOnAction` in CompilerInvocation.cpp is introduced.
Repository:
rG LLVM Github Monorepo
https://reviews.llvm.org/D97457
Files:
clang/include/clang/Driver/Options.td
flang/include/flang/Frontend/FrontendActions.h
flang/include/flang/Frontend/FrontendOptions.h
flang/lib/Frontend/CompilerInvocation.cpp
flang/lib/Frontend/FrontendActions.cpp
flang/lib/FrontendTool/ExecuteCompilerInvocation.cpp
flang/test/Flang-Driver/debug-parsing-log.f90
flang/test/Flang-Driver/driver-help.f90
flang/tools/f18/f18.cpp
Index: flang/tools/f18/f18.cpp
===================================================================
--- flang/tools/f18/f18.cpp
+++ flang/tools/f18/f18.cpp
@@ -536,7 +536,8 @@
driver.debugModuleWriter = true;
} else if (arg == "-fdebug-measure-parse-tree") {
driver.measureTree = true;
- } else if (arg == "-fdebug-instrumented-parse") {
+ } else if (arg == "-fdebug-instrumented-parse" ||
+ arg == "-fdebug-dump-parsing-log") {
options.instrumentedParse = true;
} else if (arg == "-fdebug-no-semantics") {
driver.debugNoSemantics = true;
Index: flang/test/Flang-Driver/driver-help.f90
===================================================================
--- flang/test/Flang-Driver/driver-help.f90
+++ flang/test/Flang-Driver/driver-help.f90
@@ -58,6 +58,8 @@
! HELP-FC1-NEXT: Enable the old style PARAMETER statement
! HELP-FC1-NEXT: -fbackslash Specify that backslash in string introduces an escape character
! HELP-FC1-NEXT: -fdebug-dump-parse-tree Dump the parse tree
+! HELP-FC1-NEXT: -fdebug-dump-parsing-log
+! HELP-FC1-NEXT: Run instrumented parse and dump the parsing log
! HELP-FC1-NEXT: -fdebug-dump-provenance Dump provenance
! HELP-FC1-NEXT: -fdebug-dump-symbols Dump symbols after the semantic analysis
! HELP-FC1-NEXT: -fdebug-measure-parse-tree
Index: flang/test/Flang-Driver/debug-parsing-log.f90
===================================================================
--- /dev/null
+++ flang/test/Flang-Driver/debug-parsing-log.f90
@@ -0,0 +1,24 @@
+! RUN: %flang_fc1 -fdebug-dump-parsing-log %s 2>&1 | FileCheck %s
+
+!-----------------
+! EXPECTED OUTPUT
+!-----------------
+! Below are just few lines extracted from the dump. The actual output is much _much_ bigger.
+
+! CHECK: MODULE statement
+! CHECK: fail 1
+! CHECK: module
+! CHECK: fail 1
+! CHECK: END PROGRAM statement
+! CHECK: pass 1
+! CHECK: PROGRAM statement
+! CHECK: fail 1
+! CHECK: main program
+! CHECK: pass 1
+! CHECK: specification construct
+! CHECK: fail 2
+
+!-----------------
+! TEST INPUT
+!-----------------
+END PROGRAM
Index: flang/lib/FrontendTool/ExecuteCompilerInvocation.cpp
===================================================================
--- flang/lib/FrontendTool/ExecuteCompilerInvocation.cpp
+++ flang/lib/FrontendTool/ExecuteCompilerInvocation.cpp
@@ -52,6 +52,9 @@
case DebugDumpProvenance:
return std::make_unique<DebugDumpProvenanceAction>();
break;
+ case DebugDumpParsingLog:
+ return std::make_unique<DebugDumpParsingLogAction>();
+ break;
case DebugMeasureParseTree:
return std::make_unique<DebugMeasureParseTreeAction>();
break;
Index: flang/lib/Frontend/FrontendActions.cpp
===================================================================
--- flang/lib/Frontend/FrontendActions.cpp
+++ flang/lib/Frontend/FrontendActions.cpp
@@ -307,6 +307,15 @@
}
}
+void DebugDumpParsingLogAction::ExecuteAction() {
+ CompilerInstance &ci = this->instance();
+
+ // Parse
+ ci.parsing().Parse(llvm::errs());
+ // Dump parsing log
+ ci.parsing().DumpParsingLog(llvm::outs());
+}
+
void EmitObjAction::ExecuteAction() {
CompilerInstance &ci = this->instance();
unsigned DiagID = ci.diagnostics().getCustomDiagID(
Index: flang/lib/Frontend/CompilerInvocation.cpp
===================================================================
--- flang/lib/Frontend/CompilerInvocation.cpp
+++ flang/lib/Frontend/CompilerInvocation.cpp
@@ -85,6 +85,15 @@
return true;
}
+// Tweak the frontend configuration based on the frontend action
+static void setUpFrontendBasedOnAction(FrontendOptions &opts) {
+ assert(opts.programAction_ != Fortran::frontend::InvalidAction &&
+ "Fortran frontend action not set!");
+
+ if (opts.programAction_ == DebugDumpParsingLog)
+ opts.instrumentedParse_ = true;
+}
+
static InputKind ParseFrontendArgs(FrontendOptions &opts,
llvm::opt::ArgList &args, clang::DiagnosticsEngine &diags) {
@@ -125,6 +134,9 @@
case clang::driver::options::OPT_fdebug_dump_provenance:
opts.programAction_ = DebugDumpProvenance;
break;
+ case clang::driver::options::OPT_fdebug_dump_parsing_log:
+ opts.programAction_ = DebugDumpParsingLog;
+ break;
case clang::driver::options::OPT_fdebug_measure_parse_tree:
opts.programAction_ = DebugMeasureParseTree;
break;
@@ -141,6 +153,8 @@
}
}
+ setUpFrontendBasedOnAction(opts);
+
opts.outputFile_ = args.getLastArgValue(clang::driver::options::OPT_o);
opts.showHelp_ = args.hasArg(clang::driver::options::OPT_help);
opts.showVersion_ = args.hasArg(clang::driver::options::OPT_version);
@@ -447,6 +461,9 @@
// directories
if (moduleDirJ.compare(".") != 0)
fortranOptions.searchDirectories.emplace_back(moduleDirJ);
+
+ if (frontendOptions.instrumentedParse_)
+ fortranOptions.instrumentedParse = true;
}
void CompilerInvocation::setSemanticsOpts(
Index: flang/include/flang/Frontend/FrontendOptions.h
===================================================================
--- flang/include/flang/Frontend/FrontendOptions.h
+++ flang/include/flang/Frontend/FrontendOptions.h
@@ -50,6 +50,9 @@
/// Dump provenance
DebugDumpProvenance,
+ /// Parse then output the parsing log
+ DebugDumpParsingLog,
+
/// Parse then output the number of objects in the parse tree and the overall
/// size
DebugMeasureParseTree,
@@ -172,6 +175,9 @@
/// Show the -version text.
unsigned showVersion_ : 1;
+ /// Instrument the parse to get a more verbose log
+ unsigned instrumentedParse_ : 1;
+
/// The input files and their types.
std::vector<FrontendInputFile> inputs_;
Index: flang/include/flang/Frontend/FrontendActions.h
===================================================================
--- flang/include/flang/Frontend/FrontendActions.h
+++ flang/include/flang/Frontend/FrontendActions.h
@@ -54,6 +54,10 @@
void ExecuteAction() override;
};
+class DebugDumpParsingLogAction : public PrescanAction {
+ void ExecuteAction() override;
+};
+
class DebugMeasureParseTreeAction : public PrescanAction {
void ExecuteAction() override;
};
Index: clang/include/clang/Driver/Options.td
===================================================================
--- clang/include/clang/Driver/Options.td
+++ clang/include/clang/Driver/Options.td
@@ -4321,6 +4321,8 @@
HelpText<"Dump the parse tree">;
def fdebug_dump_provenance : Flag<["-"], "fdebug-dump-provenance">, Group<Action_Group>,
HelpText<"Dump provenance">;
+def fdebug_dump_parsing_log : Flag<["-"], "fdebug-dump-parsing-log">, Group<Action_Group>,
+ HelpText<"Run instrumented parse and dump the parsing log">;
def fdebug_measure_parse_tree : Flag<["-"], "fdebug-measure-parse-tree">, Group<Action_Group>,
HelpText<"Measure the parse tree">;
def fdebug_pre_fir_tree : Flag<["-"], "fdebug-pre-fir-tree">, Group<Action_Group>,
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
