Replace -emit-fir with -emit-mlir

Also included changes that I forgot to include in the previous commit
(fix CMake dependencies, clang-format).

Author: banach-space

clang/include/clang/Driver/Options.td

@@ -4468,8 +4468,8 @@ def fintrinsic_modules_path : Separate<["-"], "fintrinsic-modules-path">,  Group
   DocBrief<[{This option specifies the location of pre-compiled intrinsic modules, 
   if they are not in the default location expected by the compiler.}]>;
 
-def emit_fir : Flag<["-"], "emit-fir">, Group<Action_Group>,
-  HelpText<"Build the parse tree, then convert to FIR and dump">;
+def emit_mlir : Flag<["-"], "emit-mlir">, Group<Action_Group>,
+  HelpText<"Build the parse tree, then lower it to MLIR and dump">;
 }
 
 def J : JoinedOrSeparate<["-"], "J">,

flang/include/flang/Frontend/FrontendActions.h

@@ -136,7 +136,7 @@ class CodeGenAction : public FrontendAction {
   bool BeginSourceFileAction() override;
 };
 
-class EmitFirAction : public CodeGenAction {
+class EmitMLIRAction : public CodeGenAction {
   void ExecuteAction() override;
 };
 

flang/include/flang/Frontend/FrontendOptions.h

@@ -32,7 +32,7 @@ enum ActionKind {
   ParseSyntaxOnly,
 
   /// Emit a .mlir file
-  EmitFir,
+  EmitMLIR,
 
   /// Emit a .o file.
   EmitObj,

flang/lib/Frontend/CMakeLists.txt

@@ -24,12 +24,8 @@ add_flang_library(flangFrontend
   FIRDialect
   FIRAnalysis
   FIRSupport
-  FIRTransforms
   FIRBuilder
-  FIRRuntime
   ${dialect_libs}
-  MLIRAffineToStandard
-  MLIRSCFToStandard
 
   LINK_COMPONENTS
   Option

flang/lib/Frontend/CompilerInvocation.cpp

@@ -124,7 +124,7 @@ static bool ParseFrontendArgs(FrontendOptions &opts, llvm::opt::ArgList &args,
       opts.programAction = ParseSyntaxOnly;
       break;
     case clang::driver::options::OPT_emit_fir:
-      opts.programAction = EmitFir;
+      opts.programAction = EmitMLIR;
       break;
     case clang::driver::options::OPT_emit_obj:
       opts.programAction = EmitObj;

flang/lib/Frontend/FrontendActions.cpp

@@ -7,13 +7,19 @@
 //===----------------------------------------------------------------------===//
 
 #include "flang/Frontend/FrontendActions.h"
+#include "mlir/IR/Dialect.h"
+#include "mlir/Pass/PassManager.h"
+#include "mlir/Support/LogicalResult.h"
 #include "flang/Common/default-kinds.h"
 #include "flang/Frontend/CompilerInstance.h"
 #include "flang/Frontend/FrontendOptions.h"
 #include "flang/Frontend/PreprocessorOptions.h"
 #include "flang/Lower/Bridge.h"
 #include "flang/Lower/PFTBuilder.h"
+#include "flang/Lower/Support/Verifier.h"
 #include "flang/Optimizer/Dialect/FIRType.h"
+#include "flang/Optimizer/Support/InitFIR.h"
+#include "flang/Optimizer/Support/KindMapping.h"
 #include "flang/Parser/dump-parse-tree.h"
 #include "flang/Parser/parsing.h"
 #include "flang/Parser/provenance.h"
@@ -27,13 +33,6 @@
 #include "llvm/Support/raw_ostream.h"
 #include <clang/Basic/Diagnostic.h>
 #include <memory>
-#include "mlir/IR/Dialect.h"
-#include "flang/Optimizer/Support/InitFIR.h"
-#include "flang/Optimizer/Support/KindMapping.h"
-#include "flang/Lower/Bridge.h"
-#include "mlir/Pass/PassManager.h"
-#include "mlir/Support/LogicalResult.h"
-#include "flang/Lower/Support/Verifier.h"
 
 using namespace Fortran::frontend;
 
@@ -382,7 +381,7 @@ fromDefaultKinds(const Fortran::common::IntrinsicTypeDefaultKinds &defKinds) {
               defKinds.GetDefaultKind(Fortran::common::TypeCategory::Real))};
 }
 
-void EmitFirAction::ExecuteAction() {
+void EmitMLIRAction::ExecuteAction() {
   CompilerInstance &ci = this->instance();
 
   // Load the MLIR dialects required by Flang

flang/lib/FrontendTool/ExecuteCompilerInvocation.cpp

@@ -32,8 +32,8 @@ static std::unique_ptr<FrontendAction> CreateFrontendBaseAction(
     return std::make_unique<PrintPreprocessedAction>();
   case ParseSyntaxOnly:
     return std::make_unique<ParseSyntaxOnlyAction>();
-  case EmitFir:
-    return std::make_unique<EmitFirAction>();
+  case EmitMLIR:
+    return std::make_unique<EmitMLIRAction>();
   case EmitObj:
     return std::make_unique<EmitObjAction>();
   case DebugUnparse:

flang/unittests/Frontend/FrontendActionTest.cpp

@@ -162,13 +162,13 @@ TEST_F(FrontendActionTest, ParseSyntaxOnly) {
               ":1:14: error: IF statement is not allowed in IF statement\n"));
 }
 
-TEST_F(FrontendActionTest, EmitFir) {
+TEST_F(FrontendActionTest, EmitMLIR) {
   // Populate the input file with the pre-defined input and flush it.
   *(inputFileOs_) << "end program";
   inputFileOs_.reset();
 
   // Set-up the action kind.
-  compInst_.invocation().frontendOpts().programAction = EmitFir;
+  compInst_.invocation().frontendOpts().programAction = EmitMLIR;
   compInst_.invocation().preprocessorOpts().noReformat = true;
 
   // Set-up the output stream. We are using output buffer wrapped as an output