[Flang][Driver] Add support for AsmPrinter -mmlir options

[psoni2628]

Summary

This patch adds support for AsmPrinter -mmlir options to the Flang driver.

[awarzynski]

Thanks for doing this!

I think that at this point it would make sense to extend your test and to check for options from registerMLIRContextCLOptions and registerPassManagerCLOptions as well (one from each should be sufficient). Would you mind doing that? You'll need to rename the test file as well.

[psoni2628]

• Add registerPassManagerCLOptions and registerMLIRContextCLOptions options to the test

[psoni2628]

In D130598#3681672, @awarzynski wrote:

Thanks for doing this!

I think that at this point it would make sense to extend your test and to check for options from registerMLIRContextCLOptions and registerPassManagerCLOptions as well (one from each should be sufficient). Would you mind doing that? You'll need to rename the test file as well.

Absolutely. Hope the new test file name is OK.

[awarzynski]

LGTM!

flang/test/Driver/mmlir-opts.f90

7–10

[nit] You could add a comment so that it clear that e.g. --mlir-print-local-scope is from registerAsmPrinterCLOptions (same for other groups)

[psoni2628]

• Add comment about which option comes from where

flang/test/Driver/mmlir-opts.f90

7–10

Is the added comment clear?

[awarzynski]

flang/test/Driver/mmlir-opts.f90

12–14

It is clear, thank you!

Personally, I would do it more locally, but this was just a [nit] anyway, so feel free to ignore :)

[psoni2628]

• Fix the previously added comment to make it more local

[psoni2628]

This comment has been deleted.

flang/test/Driver/mmlir-opts.f90

12–14

Ah, I like this better. Done, thanks for your feedback!

[awarzynski]

Ship it :)

flang/lib/FrontendTool/ExecuteCompilerInvocation.cpp

 // Coding style: https://mlir.llvm.org/getting_started/DeveloperGuide/
 //
 //===----------------------------------------------------------------------===//
 
 #include "flang/Frontend/CompilerInstance.h"
 #include "flang/Frontend/FrontendActions.h"
 #include "flang/Frontend/FrontendPluginRegistry.h"
 
+#include "mlir/IR/AsmState.h"
 #include "mlir/IR/MLIRContext.h"
 #include "mlir/Pass/PassManager.h"
 #include "clang/Driver/Options.h"
 #include "llvm/Option/OptTable.h"
 #include "llvm/Option/Option.h"
 #include "llvm/Support/BuryPointer.h"
 #include "llvm/Support/CommandLine.h"
 
if (!flang->getFrontendOpts().llvmArgs.empty()) {
     args[numArgs + 1] = nullptr;
     llvm::cl::ParseCommandLineOptions(numArgs + 1, args.get());
   }
 
   // Honor -mmlir. This should happen AFTER plugins have been loaded!
   if (!flang->getFrontendOpts().mlirArgs.empty()) {
     mlir::registerMLIRContextCLOptions();
     mlir::registerPassManagerCLOptions();
+    mlir::registerAsmPrinterCLOptions();
     unsigned numArgs = flang->getFrontendOpts().mlirArgs.size();
     auto args = std::make_unique<const char *[]>(numArgs + 2);
     args[0] = "flang (MLIR option parsing)";
 
     for (unsigned i = 0; i != numArgs; ++i)
       args[i + 1] = flang->getFrontendOpts().mlirArgs[i].c_str();
 
     args[numArgs + 1] = nullptr;

flang/test/Driver/mmlir-opts.f90

+! Verify that registerMLIRContextCLOptions, registerPassManagerCLOptions and
+! registerAsmPrinterCLOptions `-mmlir` options  are available to the driver.
+
+! RUN: %flang_fc1  -mmlir --help | FileCheck %s --check-prefix=MLIR
+
+! MLIR: flang (MLIR option parsing) [options]
+! Registered via registerPassManagerCLOptions
+! MLIR: --mlir-pass-pipeline-local-reproducer
+! Registered via registerAsmPrinterCLOptions
+! MLIR: --mlir-print-local-scope
+! Registered via registerMLIRContextCLOptions
+! MLIR: --mlir-print-op-on-diagnostic