CarolineConcatto created this revision.
Herald added subscribers: cfe-commits, kristof.beyls.
Herald added a project: clang.
This patch adds more logic to Flang.cpp to search for the
flang frontend.
A new flag(ffc-fortran-name) was created in this patch to
implement the logic in Flang driver.
The patch searches for the appropriated flang frontend path according to:
-if the flag ffc-fortran-name is being set use the name given by
the flag to search for the flang frontend path
- esle the frontend name is hard-coded to "flang", use that to
search the frontend path.
To set the custom fortran frontend this patch created a new internal driver
flag named "ffc-fortran-name" in Options.td.
The flag sets flang frontend for a custom fortran compiler. The logic for
ffc-fortran-name is the same as the one used by GNU to set ccc-gcc-name.
Signed-off-by: Caroline Concatto <caroline.conca...@arm.com>
Repository:
rG LLVM Github Monorepo
https://reviews.llvm.org/D73951
Files:
clang/include/clang/Driver/Driver.h
clang/include/clang/Driver/Options.td
clang/lib/Driver/Driver.cpp
clang/lib/Driver/ToolChains/Flang.cpp
clang/test/Driver/flang/clang-driver-2-frontend01.f90
clang/test/Driver/flang/driver-2-frontend01.f90
clang/test/Driver/flang/driver-2-frontend02.f90
clang/test/Driver/flang/flang-driver-2-frontend01.f90
clang/test/Driver/flang/flang-driver-2-frontend02.f90
Index: clang/test/Driver/flang/flang-driver-2-frontend02.f90
===================================================================
--- /dev/null
+++ clang/test/Driver/flang/flang-driver-2-frontend02.f90
@@ -0,0 +1,19 @@
+! Check wich name of flang frontend is invoked by the driver
+
+! Driver name has flang, but the flag -ffc-fortran-name is passed by the driver.
+! The flag has preference over any other name that the Driver may have.
+! Therefore the driver invokes the FE given by the flag.
+
+! The invocations should begin with <test-file-name>.tmp2 -fc1.
+! ALL-LABEL: "{{[^"]*}}flang-driver-2-frontend02.f90.tmp2" "-fc1"
+
+! Copy clang to two temporary file.
+! t1 is the driver name. %t2 is the frontend name
+! RUN: cp %clang %t1
+! RUN: cp %clang %t2
+! RUN: %t1 --driver-mode=flang -ffc-fortran-name %basename_t.tmp2 -### %s 2>&1 | FileCheck --check-prefixes=ALL,CHECK-EMIT-OBJ %s
+! CHECK-EMIT-OBJ-DAG: "-emit-obj"
+! CHECK-EMIT-OBJ-DAG: "-o" "{{[^"]*}}.o
+
+! Should end in the input file.
+! ALL: "{{.*}}flang-driver-2-frontend02.f90"{{$}}
Index: clang/test/Driver/flang/flang-driver-2-frontend01.f90
===================================================================
--- /dev/null
+++ clang/test/Driver/flang/flang-driver-2-frontend01.f90
@@ -0,0 +1,16 @@
+! Check wich name of flang frontend is invoked by the driver
+
+! Driver name has flang, therefore the Driver invokes FE
+! with the same name as the driver.
+
+! The invocations should begin with <test-file-name>.tmp1 -fc1.
+! ALL-LABEL: "{{[^"]*}}flang" "-fc1"
+
+! Copy clang to a temporary file to be the driver name
+! RUN: cp %clang %t1
+! RUN: %t1 --driver-mode=flang -### %s 2>&1 | FileCheck --check-prefixes=ALL,CHECK-EMIT-OBJ %s
+! CHECK-EMIT-OBJ-DAG: "-emit-obj"
+! CHECK-EMIT-OBJ-DAG: "-o" "{{[^"]*}}.o
+
+! Should end in the input file.
+! ALL: "{{.*}}flang-driver-2-frontend01.f90"{{$}}
Index: clang/test/Driver/flang/driver-2-frontend02.f90
===================================================================
--- /dev/null
+++ clang/test/Driver/flang/driver-2-frontend02.f90
@@ -0,0 +1,19 @@
+! Check wich name of flang frontend is invoked by the driver
+
+! Driver name is a randon name. It does not contain flang or clang,
+! but the driver gives a flag with the desired FE to be used.
+! Therefore it should use the FE given by the flag.
+
+! The invocations should begin with <path-test-name>.tmp2 -fc1.
+! ALL-LABEL: "{{[^"]*}}driver-2-frontend02.f90.tmp2" "-fc1"
+
+! Copy clang to two temporary file.
+! t1 is the driver name. t2 is the frontend name
+! RUN: cp %clang %t1
+! RUN: cp %clang %t2
+! RUN: %t1 --driver-mode=flang -### -ffc-fortran-name %basename_t.tmp2 %s 2>&1 | FileCheck --check-prefixes=ALL,CHECK-EMIT-OBJ %s
+! CHECK-EMIT-OBJ-DAG: "-emit-obj"
+! CHECK-EMIT-OBJ-DAG: "-o" "{{[^"]*}}.o
+
+! Should end in the input file.
+! ALL: "{{.*}}driver-2-frontend02.f90"{{$}}
Index: clang/test/Driver/flang/driver-2-frontend01.f90
===================================================================
--- /dev/null
+++ clang/test/Driver/flang/driver-2-frontend01.f90
@@ -0,0 +1,18 @@
+! Check wich name of flang frontend is invoked by the driver
+
+! Driver name is a randon name. It does not contain flag, flang or clang,
+! therefore the driver invokes flang FE.
+
+! The invocations should begin with flang -fc1.
+! ALL-LABEL: "{{[^"]*}}flang" "-fc1"
+
+! Copy clang to two temporary file
+! t1 is the new driver name.
+! RUN: cp %clang %t1
+! RUN: %t1 --driver-mode=flang -### %s 2>&1 | FileCheck --check-prefixes=ALL,CHECK-EMIT-OBJ %s
+! CHECK-EMIT-OBJ-DAG: "-emit-obj"
+! CHECK-EMIT-OBJ-DAG: "-o" "{{[^"]*}}.o
+
+! Should end in the input file.
+! ALL: "{{.*}}driver-2-frontend01.f90"{{$}}
+
Index: clang/test/Driver/flang/clang-driver-2-frontend01.f90
===================================================================
--- /dev/null
+++ clang/test/Driver/flang/clang-driver-2-frontend01.f90
@@ -0,0 +1,18 @@
+! Check wich name of flang frontend is invoked by the driver
+
+! Driver name has clang, but the flag -ffc-fortran-name is passed by the driver.
+! The flag has preference over any other name that the Driver may have.
+! Therefore the driver invokes the FE given by the flag.
+
+! The invocations should begin with <test-file-name>.tmp1 -fc1.
+! ALL-LABEL: "{{[^"]*}}clang-driver-2-frontend01.f90.tmp1" "-fc1"
+
+! Copy clang to two temporary file
+! t1 is the new frontend name.
+! RUN: cp %clang %t1
+! RUN: %clang --driver-mode=flang -ffc-fortran-name %basename_t.tmp1 -### %s 2>&1 | FileCheck --check-prefixes=ALL,CHECK-EMIT-OBJ %s
+! CHECK-EMIT-OBJ-DAG: "-emit-obj"
+! CHECK-EMIT-OBJ-DAG: "-o" "{{[^"]*}}.o
+
+! Should end in the input file.
+! ALL: "{{.*}}clang-driver-2-frontend01.f90"{{$}}
Index: clang/lib/Driver/ToolChains/Flang.cpp
===================================================================
--- clang/lib/Driver/ToolChains/Flang.cpp
+++ clang/lib/Driver/ToolChains/Flang.cpp
@@ -11,7 +11,6 @@
#include "CommonArgs.h"
#include "clang/Driver/Options.h"
-
#include <cassert>
using namespace clang::driver;
@@ -69,7 +68,13 @@
CmdArgs.push_back(Input.getFilename());
const auto& D = C.getDriver();
- const char* Exec = Args.MakeArgString(D.GetProgramPath("flang", TC));
+ const std::string &customFortranName = D.getFFCGenericFortranName();
+ const char *FortranName;
+ if (!customFortranName.empty())
+ FortranName = customFortranName.c_str();
+ else FortranName = "flang";
+
+ const char *Exec = Args.MakeArgString(getToolChain().GetProgramPath(FortranName));
C.addCommand(std::make_unique<Command>(JA, *this, Exec, CmdArgs, Inputs));
}
Index: clang/lib/Driver/Driver.cpp
===================================================================
--- clang/lib/Driver/Driver.cpp
+++ clang/lib/Driver/Driver.cpp
@@ -128,8 +128,8 @@
CCPrintHeadersFilename(nullptr), CCLogDiagnosticsFilename(nullptr),
CCCPrintBindings(false), CCPrintOptions(false), CCPrintHeaders(false),
CCLogDiagnostics(false), CCGenDiagnostics(false),
- TargetTriple(TargetTriple), CCCGenericGCCName(""), Saver(Alloc),
- CheckInputsExist(true), GenReproducer(false),
+ TargetTriple(TargetTriple), CCCGenericGCCName(""), FFCGenericFortranName(""),
+ Saver(Alloc), CheckInputsExist(true), GenReproducer(false),
SuppressMissingInputWarning(false) {
// Provide a sane fallback if no VFS is specified.
@@ -1085,6 +1085,10 @@
.Default(SaveTempsCwd);
}
+ // Extract -ffc args.
+ if (const Arg *A = Args.getLastArg(options::OPT_fcc_fortran_name))
+ FFCGenericFortranName = A->getValue();
+
setLTOMode(Args);
// Process -fembed-bitcode= flags.
Index: clang/include/clang/Driver/Options.td
===================================================================
--- clang/include/clang/Driver/Options.td
+++ clang/include/clang/Driver/Options.td
@@ -261,6 +261,8 @@
def ccc_gcc_name : Separate<["-"], "ccc-gcc-name">, InternalDriverOpt,
HelpText<"Name for native GCC compiler">,
MetaVarName<"<gcc-path>">;
+def fcc_fortran_name : Separate<["-"], "ffc-fortran-name">, InternalDriverOpt,
+ HelpText<"Name for native Fortran compiler">;
class InternalDebugOpt : Group<internal_debug_Group>,
Flags<[DriverOption, HelpHidden, CoreOption]>;
Index: clang/include/clang/Driver/Driver.h
===================================================================
--- clang/include/clang/Driver/Driver.h
+++ clang/include/clang/Driver/Driver.h
@@ -218,6 +218,9 @@
/// Name to use when invoking gcc/g++.
std::string CCCGenericGCCName;
+ /// Name to use when invoking flang.
+ std::string FFCGenericFortranName;
+
/// Name of configuration file if used.
std::string ConfigFile;
@@ -310,6 +313,9 @@
/// Name to use when invoking gcc/g++.
const std::string &getCCCGenericGCCName() const { return CCCGenericGCCName; }
+ /// Name to use when invoking flang.
+ const std::string &getFFCGenericFortranName() const { return FFCGenericFortranName; }
+
const std::string &getConfigFile() const { return ConfigFile; }
const llvm::opt::OptTable &getOpts() const { return getDriverOptTable(); }
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
