revert the changes for enabling new offloading model by default

Author: YixingZhang007

clang/include/clang/Driver/Driver.h

@@ -626,13 +626,6 @@ class Driver {
   /// @name Helper Methods
   /// @{
 
-  /// Utility function to parse all devices passed via -fsycl-targets.
-  /// Return 'true' for JIT, AOT Intel CPU/GPUs and NVidia/AMD targets.
-  /// Otherwise return 'false'.
-  bool
-  GetUseNewOffloadDriverForSYCLOffload(Compilation &C,
-                                       const llvm::opt::ArgList &Args) const;
-
   /// getSYCLDeviceTriple - Returns the SYCL device triple for the
   /// specified subarch
   // TODO: Additional Arg input parameter is for diagnostic output information

clang/lib/Driver/Driver.cpp

@@ -1556,32 +1556,6 @@ static void appendOneArg(InputArgList &Args, const Arg *Opt) {
   }
 }
 
-// Utility function to parse all devices passed via -fsycl-targets.
-// Return 'true' for JIT, AOT Intel CPU/GPUs and NVidia/AMD targets.
-// Otherwise return 'false'.
-bool Driver::GetUseNewOffloadDriverForSYCLOffload(Compilation &C,
-                                                  const ArgList &Args) const {
-  // Check only if enabled with -fsycl
-  if (!Args.hasFlag(options::OPT_fsycl, options::OPT_fno_sycl, false))
-    return false;
-
-  if (Args.hasFlag(options::OPT_no_offload_new_driver,
-                   options::OPT_offload_new_driver, false))
-    return false;
-
-  if (Args.hasArg(options::OPT_fintelfpga))
-    return false;
-
-  if (const Arg *A = Args.getLastArg(options::OPT_fsycl_targets_EQ)) {
-    for (const char *Val : A->getValues()) {
-      llvm::Triple TT(C.getDriver().getSYCLDeviceTriple(Val));
-      if ((!TT.isSPIROrSPIRV()) || TT.isSPIRAOT())
-        return false;
-    }
-  }
-  return true;
-}
-
 bool Driver::readConfigFile(StringRef FileName,
                             llvm::cl::ExpansionContext &ExpCtx) {
   // Try opening the given file.
@@ -2212,12 +2186,12 @@ Compilation *Driver::BuildCompilation(ArrayRef<const char *> ArgList) {
   // Use new offloading path for OpenMP.  This is disabled as the SYCL
   // offloading path is not properly setup to use the updated device linking
   // scheme.
-  if (C->isOffloadingHostKind(Action::OFK_OpenMP) ||
+  if ((C->isOffloadingHostKind(Action::OFK_OpenMP) &&
+       TranslatedArgs->hasFlag(options::OPT_fopenmp_new_driver,
+                               options::OPT_no_offload_new_driver, true)) ||
       TranslatedArgs->hasFlag(options::OPT_offload_new_driver,
-                              options::OPT_no_offload_new_driver, false) ||
-      GetUseNewOffloadDriverForSYCLOffload(*C, *TranslatedArgs)) {
+                              options::OPT_no_offload_new_driver, false))
     setUseNewOffloadingDriver();
-  }
 
   // Construct the list of abstract actions to perform for this compilation. On
   // MachO targets this uses the driver-driver and universal actions.
@@ -7106,8 +7080,7 @@ void Driver::BuildDefaultActions(Compilation &C, DerivedArgList &Args,
                    options::OPT_fno_offload_via_llvm, false) ||
       Args.hasFlag(options::OPT_offload_new_driver,
                    options::OPT_no_offload_new_driver,
-                   C.isOffloadingHostKind(Action::OFK_Cuda)) ||
-      GetUseNewOffloadDriverForSYCLOffload(C, Args);
+                   C.isOffloadingHostKind(Action::OFK_Cuda));
 
   bool HIPNoRDC =
       C.isOffloadingHostKind(Action::OFK_HIP) &&

clang/lib/Driver/ToolChains/Clang.cpp

@@ -5243,9 +5243,7 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
       (JA.isHostOffloading(C.getActiveOffloadKinds()) &&
        Args.hasFlag(options::OPT_offload_new_driver,
                     options::OPT_no_offload_new_driver,
-                    C.isOffloadingHostKind(Action::OFK_Cuda))) ||
-      (JA.isHostOffloading(Action::OFK_SYCL) &&
-       C.getDriver().GetUseNewOffloadDriverForSYCLOffload(C, Args));
+                    C.isOffloadingHostKind(Action::OFK_Cuda)));
 
   bool IsRDCMode =
       Args.hasFlag(options::OPT_fgpu_rdc, options::OPT_fno_gpu_rdc, IsSYCL);