[OpenMP][Clang][Driver] Removes opaque-offload-linker (#507)

Author: nicebert

clang/include/clang/Driver/Options.td

@@ -1005,9 +1005,6 @@ def Xoffload_linker : JoinedAndSeparate<["-"], "Xoffload-linker">,
   Visibility<[ClangOption, FlangOption]>,
   HelpText<"Pass <arg> to the offload linkers or the ones identified by -<triple>">,
   MetaVarName<"<triple> <arg>">, Group<Link_Group>;
-def Xopaque_offload_opt : Separate<["-"], "Xopaque-offload-opt">,
-  HelpText<"Pass <arg> to the opaque offload optimizer">,
-  MetaVarName<"<arg>">, Visibility<[ClangOption, FlangOption]>;
 def Xpreprocessor : Separate<["-"], "Xpreprocessor">, Group<Preprocessor_Group>,
   HelpText<"Pass <arg> to the preprocessor">, MetaVarName<"<arg>">;
 def X_Flag : Flag<["-"], "X">, Group<Link_Group>;
@@ -4031,17 +4028,6 @@ defm openmp_optimistic_collapse : BoolFOption<"openmp-optimistic-collapse",
   NegFlag<SetFalse>, BothFlags<[NoArgumentUnused, HelpHidden], []>>;
 def static_openmp: Flag<["-"], "static-openmp">,
   HelpText<"Use the static host OpenMP runtime while linking.">;
-def opaque_offload_linker
-    : Flag<["--"], "opaque-offload-linker">,
-      Visibility<[ClangOption, FlangOption]>,
-      Group<f_Group>,
-      HelpText<"Build/link omp offload binary, construct opaque cmd list "
-               "instead of single clang-linker-wrapper cmd.">;
-def no_opaque_offload_linker : Flag<["--"], "no-opaque-offload-linker">,
-                               Visibility<[ClangOption, FlangOption]>,
-                               Group<f_Group>,
-                               HelpText<"Build/link omp offload binary, using "
-                                        "single clang-linker-wrapper cmd.">;
 def fopenmp_new_driver : Flag<["-"], "fopenmp-new-driver">, Flags<[HelpHidden]>,
   HelpText<"Use the new driver for OpenMP offloading.">;
 def fno_openmp_new_driver : Flag<["-"], "fno-openmp-new-driver">,

clang/lib/Driver/CMakeLists.txt

@@ -48,7 +48,6 @@ add_clang_library(clangDriver
   ToolChains/AVR.cpp
   ToolChains/BareMetal.cpp
   ToolChains/Clang.cpp
-  ToolChains/OpaqueOffloadLinker.cpp
   ToolChains/CommonArgs.cpp
   ToolChains/CrossWindows.cpp
   ToolChains/CSKYToolChain.cpp

clang/lib/Driver/ToolChains/Clang.cpp

@@ -9233,12 +9233,6 @@ void LinkerWrapper::ConstructJob(Compilation &C, const JobAction &JA,
       break;
     }
   }
-  if (isAMDGPU && Args.hasFlag(options::OPT_opaque_offload_linker,
-                               options::OPT_no_opaque_offload_linker, false)) {
-    ConstructOpaqueJob(C, JA, Output, Inputs, Args, OTC->getTriple(),
-                       LinkingOutput);
-    return;
-  }
 
   using namespace options;
 

clang/lib/Driver/ToolChains/Clang.h

@@ -185,11 +185,6 @@ class LLVM_LIBRARY_VISIBILITY LinkerWrapper final : public Tool {
                     const InputInfo &Output, const InputInfoList &Inputs,
                     const llvm::opt::ArgList &TCArgs,
                     const char *LinkingOutput) const override;
-  void ConstructOpaqueJob(Compilation &C, const JobAction &JA,
-                          const InputInfo &Output, const InputInfoList &Inputs,
-                          const llvm::opt::ArgList &TCArgs,
-                          const llvm::Triple &TheTriple,
-                          const char *LinkingOutput) const;
 };
 
 // Calculate the output path of the module file when compiling a module unit

clang/lib/Driver/ToolChains/CommonArgs.cpp

@@ -2934,17 +2934,6 @@ static void GetSDLFromOffloadArchive(
   CC1Args.push_back(DriverArgs.MakeArgString(OutputLib));
 }
 
-// Wrapper function used by opaque-offload-linker  for adding SDLs
-// during link phase.
-void tools::AddStaticDeviceLibsLinking(
-    Compilation &C, const Tool &T, const JobAction &JA,
-    const InputInfoList &Inputs, const llvm::opt::ArgList &DriverArgs,
-    llvm::opt::ArgStringList &CC1Args, StringRef Arch, StringRef TargetID,
-    bool isBitCodeSDL, bool postClangLink, bool unpackage) {
-  AddStaticDeviceLibs(&C, &T, &JA, &Inputs, C.getDriver(), DriverArgs, CC1Args,
-                      Arch, TargetID, isBitCodeSDL, postClangLink, unpackage);
-}
-
 // Wrapper function used by driver for adding SDLs during link phase.
 void tools::AddStaticDeviceLibsLinking(Compilation &C, const Tool &T,
                                        const JobAction &JA,