Author: Andrew Gozillon Date: 2023-03-17T11:12:16-05:00 New Revision: 0cd31a7d308714d26f49391ac4ea9f6bce5fa324
URL: https://github.com/llvm/llvm-project/commit/0cd31a7d308714d26f49391ac4ea9f6bce5fa324 DIFF: https://github.com/llvm/llvm-project/commit/0cd31a7d308714d26f49391ac4ea9f6bce5fa324.diff LOG: [Flang][Driver] Add support for fopenmp-is-device and fembed-offload-object to Flang ToolChain This allows-fembed-offload-object's and -fopenmp-is-device compiler invocation arguments to be passed to the Flang frontend during split compilation when offloading in OpenMP. An example use case is when passing an offload-arch alongside -fopenmp to embed device objects compiled for the offload-arch within the host architecture. This borrows from existing clangDriver+Clang.h/.cpp work and the intent is currently to reuse as much of the existing infrastructure and design as we can to achieve offloading for Flang+OpenMP. An overview of Clang's offloading design can be found here: https://clang.llvm.org/docs/OffloadingDesign.html Reviewers: awarzynski jhuber6 Differential Revision: https://reviews.llvm.org/D145815 Added: flang/test/Driver/omp-frontend-forwarding.f90 Modified: clang/lib/Driver/ToolChains/Flang.cpp clang/lib/Driver/ToolChains/Flang.h Removed: ################################################################################ diff --git a/clang/lib/Driver/ToolChains/Flang.cpp b/clang/lib/Driver/ToolChains/Flang.cpp index 10a518c34351..0a4a0de99b89 100644 --- a/clang/lib/Driver/ToolChains/Flang.cpp +++ b/clang/lib/Driver/ToolChains/Flang.cpp @@ -114,6 +114,35 @@ void Flang::addTargetOptions(const ArgList &Args, // TODO: Add target specific flags, ABI, mtune option etc. } +void Flang::addOffloadOptions(Compilation &C, const InputInfoList &Inputs, + const JobAction &JA, const ArgList &Args, + ArgStringList &CmdArgs) const { + bool IsOpenMPDevice = JA.isDeviceOffloading(Action::OFK_OpenMP); + bool IsHostOffloadingAction = JA.isHostOffloading(Action::OFK_OpenMP) || + JA.isHostOffloading(C.getActiveOffloadKinds()); + + // Skips the primary input file, which is the input file that the compilation + // proccess will be executed upon (e.g. the host bitcode file) and + // adds the other secondary input (e.g. device bitcode files for embedding) + // to the embed offload object. This is condensed logic from the Clang driver + // for embedding offload objects during HostOffloading. + if (IsHostOffloadingAction) { + for (size_t i = 1; i < Inputs.size(); ++i) { + if (Inputs[i].getType() != types::TY_Nothing) + CmdArgs.push_back( + Args.MakeArgString("-fembed-offload-object=" + + getToolChain().getInputFilename(Inputs[i]))); + } + } + + if (IsOpenMPDevice) { + // -fopenmp-is-device is passed along to tell the frontend that it is + // generating code for a device, so that only the relevant code is + // emitted. + CmdArgs.push_back("-fopenmp-is-device"); + } +} + static void addFloatingPointOptions(const Driver &D, const ArgList &Args, ArgStringList &CmdArgs) { StringRef FPContract; @@ -327,6 +356,9 @@ void Flang::ConstructJob(Compilation &C, const JobAction &JA, // Add other compile options addOtherOptions(Args, CmdArgs); + // Offloading related options + addOffloadOptions(C, Inputs, JA, Args, CmdArgs); + // Forward -Xflang arguments to -fc1 Args.AddAllArgValues(CmdArgs, options::OPT_Xflang); diff --git a/clang/lib/Driver/ToolChains/Flang.h b/clang/lib/Driver/ToolChains/Flang.h index 4c85c602e267..0dc3cb7eeadc 100644 --- a/clang/lib/Driver/ToolChains/Flang.h +++ b/clang/lib/Driver/ToolChains/Flang.h @@ -56,6 +56,17 @@ class LLVM_LIBRARY_VISIBILITY Flang : public Tool { void addTargetOptions(const llvm::opt::ArgList &Args, llvm::opt::ArgStringList &CmdArgs) const; + /// Extract offload options from the driver arguments and add them to + /// the command arguments. + /// \param [in] C The current compilation for the driver invocation + /// \param [in] Inputs The input infomration on the current file inputs + /// \param [in] JA The job action + /// \param [in] Args The list of input driver arguments + /// \param [out] CmdArgs The list of output command arguments + void addOffloadOptions(Compilation &C, const InputInfoList &Inputs, + const JobAction &JA, const llvm::opt::ArgList &Args, + llvm::opt::ArgStringList &CmdArgs) const; + /// Extract other compilation options from the driver arguments and add them /// to the command arguments. /// diff --git a/flang/test/Driver/omp-frontend-forwarding.f90 b/flang/test/Driver/omp-frontend-forwarding.f90 new file mode 100644 index 000000000000..063e20b1bee3 --- /dev/null +++ b/flang/test/Driver/omp-frontend-forwarding.f90 @@ -0,0 +1,22 @@ +! Test that flang-new OpenMP and OpenMP offload related +! commands forward or expand to the appropriate commands +! for flang-new -fc1 as expected. + +! Test regular -fopenmp with no offload +! RUN: %flang -### -fopenmp %s 2>&1 | FileCheck --check-prefixes=CHECK-OPENMP %s +! CHECK-OPENMP: "{{[^"]*}}flang-new" "-fc1" {{.*}} "-fopenmp" {{.*}}.f90" +! CHECK-OPENMP-NOT: "{{[^"]*}}flang-new" "-fc1" {{.*}} "-fopenmp" {{.*}} "-fopenmp-is-device" {{.*}}.f90" + +! Test regular -fopenmp with offload for basic fopenmp-is-device flag addition and correct fopenmp +! RUN: %flang -### -fopenmp -fopenmp-targets=amdgcn-amd-amdhsa %s 2>&1 | FileCheck --check-prefixes=CHECK-OPENMP-IS-DEVICE %s +! CHECK-OPENMP-IS-DEVICE: "{{[^"]*}}flang-new" "-fc1" {{.*}} "-fopenmp" {{.*}} "-fopenmp-is-device" {{.*}}.f90" + +! Testing fembed-offload-object and fopenmp-is-device +! RUN: %flang -S -### %s -o %t 2>&1 \ +! RUN: -fopenmp --offload-arch=gfx90a \ +! RUN: --target=aarch64-unknown-linux-gnu \ +! RUN: | FileCheck %s --check-prefixes=CHECK-OPENMP-EMBED +! CHECK-OPENMP-EMBED: "{{[^"]*}}flang-new" "-fc1" "-triple" "aarch64-unknown-linux-gnu" {{.*}} "-fopenmp" {{.*}}.f90" +! CHECK-OPENMP-EMBED-NEXT: "{{[^"]*}}flang-new" "-fc1" "-triple" "amdgcn-amd-amdhsa" {{.*}} "-fopenmp" {{.*}} "-fopenmp-is-device" {{.*}}.f90" +! CHECK-OPENMP-EMBED: "{{[^"]*}}clang-offload-packager" {{.*}} "--image=file={{.*}}.bc,triple=amdgcn-amd-amdhsa,arch=gfx90a,kind=openmp" +! CHECK-OPENMP-EMBED-NEXT: "{{[^"]*}}flang-new" "-fc1" "-triple" "aarch64-unknown-linux-gnu" {{.*}} "-fopenmp" {{.*}} "-fembed-offload-object={{.*}}.out" {{.*}}.bc" _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
