diff --git a/clang/include/clang/Driver/Options.td b/clang/include/clang/Driver/Options.td --- a/clang/include/clang/Driver/Options.td +++ b/clang/include/clang/Driver/Options.td @@ -855,7 +855,7 @@ def cxx_isystem : JoinedOrSeparate<["-"], "cxx-isystem">, Group, HelpText<"Add directory to the C++ SYSTEM include search path">, Flags<[CC1Option]>, MetaVarName<"">; -def c : Flag<["-"], "c">, Flags<[NoXarchOption]>, Group, +def c : Flag<["-"], "c">, Flags<[NoXarchOption, FlangOption]>, Group, HelpText<"Only run preprocess, compile, and assemble steps">; def fconvergent_functions : Flag<["-"], "fconvergent-functions">, Group, Flags<[CC1Option]>, HelpText<"Assume functions may be convergent">; @@ -4749,8 +4749,6 @@ HelpText<"Build ASTs and convert to LLVM, discarding output">; def emit_codegen_only : Flag<["-"], "emit-codegen-only">, HelpText<"Generate machine code, but discard output">; -def emit_obj : Flag<["-"], "emit-obj">, - HelpText<"Emit native object files">; def rewrite_test : Flag<["-"], "rewrite-test">, HelpText<"Rewriter playground">; def rewrite_macros : Flag<["-"], "rewrite-macros">, @@ -5083,6 +5081,18 @@ } // let Flags = [CC1Option, NoDriverOption] +//===----------------------------------------------------------------------===// +// Frontend Options - cc1 + fc1 +//===----------------------------------------------------------------------===// +let Flags = [CC1Option, FC1Option, NoDriverOption] in { +let Group = Action_Group in { + +def emit_obj : Flag<["-"], "emit-obj">, + HelpText<"Emit native object files">; + +} // let Group = Action_Group +} // let Flags = [CC1Option, FC1Option, NoDriverOption] + //===----------------------------------------------------------------------===// // cc1as-only Options //===----------------------------------------------------------------------===// diff --git a/clang/lib/Driver/ToolChains/Flang.cpp b/clang/lib/Driver/ToolChains/Flang.cpp --- a/clang/lib/Driver/ToolChains/Flang.cpp +++ b/clang/lib/Driver/ToolChains/Flang.cpp @@ -23,17 +23,22 @@ const InputInfo &Output, const InputInfoList &Inputs, const ArgList &Args, const char *LinkingOutput) const { const auto &TC = getToolChain(); - const llvm::Triple &Triple = TC.getEffectiveTriple(); - const std::string &TripleStr = Triple.getTriple(); + // TODO: Once code-generation is available, this will need to be commented + // out. + // const llvm::Triple &Triple = TC.getEffectiveTriple(); + // const std::string &TripleStr = Triple.getTriple(); ArgStringList CmdArgs; + // Invoke ourselves in -fc1 mode. CmdArgs.push_back("-fc1"); - // TODO: Eventually all actions will require a triple (e.g. `-triple - // aarch64-unknown-linux-gnu`). However, `-triple` is currently not supported - // by `flang-new -fc1`, so we only add it selectively to actions that we - // don't support/execute just yet. + // TODO: Once code-generation is available, this will need to be commented + // out. + // Add the "effective" target triple. + // CmdArgs.push_back("-triple"); + // CmdArgs.push_back(Args.MakeArgString(TripleStr)); + if (isa(JA)) { if (C.getArgs().hasArg(options::OPT_test_io)) CmdArgs.push_back("-test-io"); @@ -56,8 +61,6 @@ assert(false && "Unexpected output type!"); } } else if (isa(JA)) { - CmdArgs.push_back("-triple"); - CmdArgs.push_back(Args.MakeArgString(TripleStr)); CmdArgs.push_back("-emit-obj"); } else { assert(false && "Unexpected action class for Flang tool."); diff --git a/flang/include/flang/Frontend/FrontendActions.h b/flang/include/flang/Frontend/FrontendActions.h --- a/flang/include/flang/Frontend/FrontendActions.h +++ b/flang/include/flang/Frontend/FrontendActions.h @@ -30,6 +30,10 @@ void ExecuteAction() override; }; +class EmitObjAction : public FrontendAction { + void ExecuteAction() override; +}; + } // namespace Fortran::frontend #endif // LLVM_FLANG_FRONTEND_FRONTENDACTIONS_H diff --git a/flang/include/flang/Frontend/FrontendOptions.h b/flang/include/flang/Frontend/FrontendOptions.h --- a/flang/include/flang/Frontend/FrontendOptions.h +++ b/flang/include/flang/Frontend/FrontendOptions.h @@ -28,6 +28,9 @@ /// -fsyntax-only ParseSyntaxOnly, + /// Emit a .o file. + EmitObj, + /// TODO: RunPreprocessor, EmitLLVM, EmitLLVMOnly, /// EmitCodeGenOnly, EmitAssembly, (...) }; diff --git a/flang/lib/Frontend/CompilerInvocation.cpp b/flang/lib/Frontend/CompilerInvocation.cpp --- a/flang/lib/Frontend/CompilerInvocation.cpp +++ b/flang/lib/Frontend/CompilerInvocation.cpp @@ -96,9 +96,11 @@ case clang::driver::options::OPT_fsyntax_only: opts.programAction_ = ParseSyntaxOnly; break; + case clang::driver::options::OPT_emit_obj: + opts.programAction_ = EmitObj; + break; // TODO: - // case clang::driver::options::OPT_emit_obj: // case calng::driver::options::OPT_emit_llvm: // case clang::driver::options::OPT_emit_llvm_only: // case clang::driver::options::OPT_emit_codegen_only: diff --git a/flang/lib/Frontend/FrontendActions.cpp b/flang/lib/Frontend/FrontendActions.cpp --- a/flang/lib/Frontend/FrontendActions.cpp +++ b/flang/lib/Frontend/FrontendActions.cpp @@ -99,3 +99,10 @@ ci.diagnostics().Report(DiagID) << GetCurrentFileOrBufferName(); } } + +void EmitObjAction::ExecuteAction() { + CompilerInstance &ci = this->instance(); + unsigned DiagID = ci.diagnostics().getCustomDiagID( + clang::DiagnosticsEngine::Error, "code-generation is not available yet"); + ci.diagnostics().Report(DiagID); +} diff --git a/flang/lib/FrontendTool/ExecuteCompilerInvocation.cpp b/flang/lib/FrontendTool/ExecuteCompilerInvocation.cpp --- a/flang/lib/FrontendTool/ExecuteCompilerInvocation.cpp +++ b/flang/lib/FrontendTool/ExecuteCompilerInvocation.cpp @@ -34,6 +34,8 @@ break; case ParseSyntaxOnly: return std::make_unique(); + case EmitObj: + return std::make_unique(); break; default: break; diff --git a/flang/test/Flang-Driver/code-gen.f90 b/flang/test/Flang-Driver/code-gen.f90 new file mode 100644 --- /dev/null +++ b/flang/test/Flang-Driver/code-gen.f90 @@ -0,0 +1,15 @@ +! RUN: not %flang-new %s 2>&1 | FileCheck %s --check-prefix=ERROR +! RUN: not %flang-new -c %s 2>&1 | FileCheck %s --check-prefix=ERROR +! RUN: not %flang-new -emit-obj %s 2>&1 | FileCheck %s --check-prefix=ERROR +! RUN: not %flang-new -fc1 -emit-obj %s 2>&1 | FileCheck %s --check-prefix=ERROR + +! REQUIRES: new-flang-driver + +! Although code-generation is not yet available, we do have frontend actions +! that correspond to `-c` and `-emit-obj`. For now these actions are just a +! placeholder and running them leads to a driver error. This test makes sure +! that these actions are indeed run (rather than `-c` or `-emit-obj` being +! rejected earlier). +! TODO: Replace this file with a proper test once code-generation is available. + +! ERROR: code-generation is not available yet diff --git a/flang/test/Flang-Driver/driver-help-hidden.f90 b/flang/test/Flang-Driver/driver-help-hidden.f90 --- a/flang/test/Flang-Driver/driver-help-hidden.f90 +++ b/flang/test/Flang-Driver/driver-help-hidden.f90 @@ -19,6 +19,7 @@ ! CHECK-EMPTY: ! CHECK-NEXT:OPTIONS: ! CHECK-NEXT: -### Print (but do not run) the commands to run for this compilation +! CHECK-NEXT: -c Only run preprocess, compile, and assemble steps ! CHECK-NEXT: -E Only run the preprocessor ! CHECK-NEXT: -fcolor-diagnostics Enable colors in diagnostics ! CHECK-NEXT: -fno-color-diagnostics Disable colors in diagnostics diff --git a/flang/test/Flang-Driver/driver-help.f90 b/flang/test/Flang-Driver/driver-help.f90 --- a/flang/test/Flang-Driver/driver-help.f90 +++ b/flang/test/Flang-Driver/driver-help.f90 @@ -19,6 +19,7 @@ ! HELP-EMPTY: ! HELP-NEXT:OPTIONS: ! HELP-NEXT: -### Print (but do not run) the commands to run for this compilation +! HELP-NEXT: -c Only run preprocess, compile, and assemble steps ! HELP-NEXT: -E Only run the preprocessor ! HELP-NEXT: -fcolor-diagnostics Enable colors in diagnostics ! HELP-NEXT: -fno-color-diagnostics Disable colors in diagnostics @@ -32,6 +33,7 @@ ! HELP-FC1:USAGE: flang-new ! HELP-FC1-EMPTY: ! HELP-FC1-NEXT:OPTIONS: +! HELP-FC1-NEXT: -emit-obj Emit native object files ! HELP-FC1-NEXT: -E Only run the preprocessor ! HELP-FC1-NEXT: -help Display available options ! HELP-FC1-NEXT: -o Write output to diff --git a/flang/test/Flang-Driver/emit-obj.f90 b/flang/test/Flang-Driver/emit-obj.f90 deleted file mode 100644 --- a/flang/test/Flang-Driver/emit-obj.f90 +++ /dev/null @@ -1,14 +0,0 @@ -! RUN: not %flang-new %s 2>&1 | FileCheck %s --check-prefix=ERROR -! RUN: not %flang-new -emit-obj %s 2>&1 | FileCheck %s --check-prefix=ERROR -! RUN: not %flang-new -fc1 -emit-obj %s 2>&1 | FileCheck %s --check-prefix=ERROR-FC1 - -! REQUIRES: new-flang-driver - -! By default (e.g. when no options like `-E` are passed) flang-new -! creates a job that corresponds to `-emit-obj`. This option/action is -! not yet supported. Verify that this is correctly reported as error. - -! ERROR: error: unknown argument: '-triple' -! ERROR: error: unknown argument: '-emit-obj' - -! ERROR-FC1: error: unknown argument: '-emit-obj' diff --git a/flang/test/Flang-Driver/phases.f90 b/flang/test/Flang-Driver/phases.f90 new file mode 100644 --- /dev/null +++ b/flang/test/Flang-Driver/phases.f90 @@ -0,0 +1,20 @@ +! RUN: %flang-new -E -ccc-print-phases %s 2>&1 | FileCheck %s --check-prefix=PP +! RUN: %flang-new -fsyntax-only -ccc-print-phases %s 2>&1 | FileCheck %s --check-prefix=COMPILE +! RUN: %flang-new -c -ccc-print-phases %s 2>&1 | FileCheck %s --check-prefix=EMIT_OBJ + +! REQUIRES: new-flang-driver + +! This test verifies the phase control in Flang compiler driver. + +! PP: +- 0: input, "{{.*}}phases.f90", f95-cpp-input +! PP-NEXT: 1: preprocessor, {0}, f95 + +! COMPILE: +- 0: input, "{{.*}}phases.f90", f95-cpp-input +! COMPILE-NEXT: 1: preprocessor, {0}, f95 +! COMPILE-NEXT: 2: compiler, {1}, none + +! EMIT_OBJ: +- 0: input, "{{.*}}phases.f90", f95-cpp-input +! EMIT_OBJ-NEXT: 1: preprocessor, {0}, f95 +! EMIT_OBJ-NEXT: 2: compiler, {1}, ir +! EMIT_OBJ-NEXT: +- 3: backend, {2}, assembler +! EMIT_OBJ-NEXT: 4: assembler, {3}, object