Allow for -fsyclbin to imply -fsycl enabling behaviors

Author: mdtoguchi

clang/lib/Driver/Driver.cpp

@@ -1201,9 +1201,11 @@ void Driver::CreateOffloadingDeviceToolChains(Compilation &C,
   // We need to generate a SYCL toolchain if the user specified -fsycl.
   // If -fsycl is supplied without any of these we will assume SPIR-V.
   // Use of -fsycl-device-only overrides -fsycl.
+  // Use of -fsyclbin also enables SYCL offloading compialtion.
   bool IsSYCL = C.getInputArgs().hasFlag(options::OPT_fsycl,
                                          options::OPT_fno_sycl, false) ||
-                C.getInputArgs().hasArg(options::OPT_fsycl_device_only);
+                C.getInputArgs().hasArg(options::OPT_fsycl_device_only,
+                                        options::OPT_fsyclbin);
 
   auto argSYCLIncompatible = [&](OptSpecifier OptId) {
     if (!IsSYCL)
@@ -3482,7 +3484,7 @@ void Driver::BuildInputs(const ToolChain &TC, DerivedArgList &Args,
   Arg *InputTypeArg = nullptr;
   bool IsSYCL =
       Args.hasFlag(options::OPT_fsycl, options::OPT_fno_sycl, false) ||
-      Args.hasArg(options::OPT_fsycl_device_only);
+      Args.hasArg(options::OPT_fsycl_device_only, options::OPT_fsyclbin);
 
   // The last /TC or /TP option sets the input type to C or C++ globally.
   if (Arg *TCTP = Args.getLastArgNoClaim(options::OPT__SLASH_TC,

clang/test/Driver/fsyclbin.cpp

@@ -8,6 +8,8 @@
 /// Check tool invocation contents.
 // RUN: %clangxx -fsycl -fsyclbin --offload-new-driver %s -### 2>&1 \
 // RUN: | FileCheck %s --check-prefix=CHECK_TOOLS
+// RUN: %clangxx -fsyclbin --offload-new-driver %s -### 2>&1 \
+// RUN: | FileCheck %s --check-prefix=CHECK_TOOLS
 // RUN: %clang_cl -fsycl -fsyclbin --offload-new-driver %s -### 2>&1 \
 // RUN: | FileCheck %s --check-prefix=CHECK_TOOLS
 // CHECK_TOOLS: clang-offload-packager
@@ -20,6 +22,9 @@
 // RUN: %clangxx --target=x86_64-unknown-linux-gnu -fsycl -fsyclbin \
 // RUN:   --offload-new-driver %s -ccc-print-phases 2>&1 \
 // RUN: | FileCheck %s --check-prefix=CHECK_PHASES
+// RUN: %clangxx --target=x86_64-unknown-linux-gnu -fsyclbin \
+// RUN:   --offload-new-driver %s -ccc-print-phases 2>&1 \
+// RUN: | FileCheck %s --check-prefix=CHECK_PHASES
 // CHECK_PHASES: 0: input, "{{.*}}", c++, (device-sycl)
 // CHECK_PHASES: 1: preprocessor, {0}, c++-cpp-output, (device-sycl)
 // CHECK_PHASES: 2: compiler, {1}, ir, (device-sycl)