[Driver][SYCL] Add support for -fsyclbin

clang/lib/Driver/Driver.cpp

@@ -9351,8 +9351,10 @@ const char *Driver::GetNamedOutputPath(Compilation &C, const JobAction &JA,
   if (AtTopLevel && !isa<DsymutilJobAction>(JA) && !isa<VerifyJobAction>(JA)) {
     if (Arg *FinalOutput = C.getArgs().getLastArg(options::OPT_o))
       return C.addResultFile(FinalOutput->getValue(), &JA);
-    // Output to destination for -fsycl-device-only and Windows -o
-    if (offloadDeviceOnly() && JA.getOffloadingDeviceKind() == Action::OFK_SYCL)
+    // Output to destination for -fsycl-device-only/-fsyclbin and Windows -o
+    if ((offloadDeviceOnly() ||
+         C.getArgs().hasArgNoClaim(options::OPT_fsyclbin)) &&
+        JA.getOffloadingDeviceKind() == Action::OFK_SYCL)
       if (Arg *FinalOutput = C.getArgs().getLastArg(options::OPT__SLASH_o))
         return C.addResultFile(FinalOutput->getValue(), &JA);
   }
@@ -9522,21 +9524,17 @@ const char *Driver::GetNamedOutputPath(Compilation &C, const JobAction &JA,
     BaseName = llvm::sys::path::filename(BasePath);
 
   // When compiling with -fsyclbin, maintain a simple output file name for the
-  // resulting image.  A '.syclbin' extension is intended to be added during
-  // the linking step with the clang-linker-wrapper.
+  // resulting image.  A '.syclbin' extension is used to represent the resulting
+  // output file.
   if (JA.getOffloadingDeviceKind() == Action::OFK_SYCL &&
       C.getArgs().hasArgNoClaim(options::OPT_fsyclbin) &&
       JA.getType() == types::TY_Image) {
-    const char *SYCLBinOutput;
-    if (IsCLMode()) {
-      // clang-cl uses BaseName for the executable name.
-      SYCLBinOutput =
-          MakeCLOutputFilename(C.getArgs(), "", BaseName, types::TY_Image);
-    } else {
-      SmallString<128> Output(getDefaultImageName());
-      SYCLBinOutput = C.getArgs().MakeArgString(Output.c_str());
-    }
-    return C.addResultFile(SYCLBinOutput, &JA);
+    SmallString<128> SYCLBinOutput(getDefaultImageName());
+    if (IsCLMode())
+      // Use BaseName for the syclbin output name.
+      SYCLBinOutput = BaseName;
+    llvm::sys::path::replace_extension(SYCLBinOutput, ".syclbin");
+    return C.addResultFile(C.getArgs().MakeArgString(SYCLBinOutput), &JA);
   }
 
   // Determine what the derived output name should be.

clang/test/Driver/fsyclbin.cpp

@@ -41,3 +41,27 @@
 // CHECK_PHASES: 5: clang-offload-packager, {4}, image, (device-sycl)
 // CHECK_PHASES: 6: clang-linker-wrapper, {5}, image, (device-sycl)
 // CHECK_PHASES: 7: offload, "device-sycl (x86_64-unknown-linux-gnu)" {6}, none
+
+/// Check the output file names (file.syclbin, or -o <file>)
+// RUN: %clangxx -fsyclbin --offload-new-driver -o file.syclbin %s -### 2>&1 \
+// RUN: | FileCheck %s --check-prefix=CHECK_NAMED_OUTPUT
+// CHECK_NAMED_OUTPUT: clang-linker-wrapper
+// CHECK_NAMED_OUTPUT-SAME: "-o" "file.syclbin"
+
+// RUN: %clang_cl -fsyclbin --offload-new-driver -o file.syclbin %s -### 2>&1 \
+// RUN: | FileCheck %s --check-prefix=CHECK_NAMED_OUTPUT_WIN
+// CHECK_NAMED_OUTPUT_WIN: clang-linker-wrapper
+// CHECK_NAMED_OUTPUT_WIN-SAME: "-out:file.syclbin"
+
+/// For Linux - the default is 'a.out' so the syclbin file is 'a.syclbin'
+// RUN: %clangxx -fsyclbin --offload-new-driver %s -### 2>&1 \
+// RUN: | FileCheck %s --check-prefix=CHECK_LINUX_DEFAULT_OUTPUT
+// CHECK_LINUX_DEFAULT_OUTPUT: clang-linker-wrapper
+// CHECK_LINUX_DEFAULT_OUTPUT-SAME: "-o" "a.syclbin"
+
+/// For Windows - the default is based on the source file so the syclbin file
+/// is 'fsyclbin.syclbin'
+// RUN: %clang_cl -fsyclbin --offload-new-driver %s -### 2>&1 \
+// RUN: | FileCheck %s --check-prefix=CHECK_WIN_DEFAULT_OUTPUT
+// CHECK_WIN_DEFAULT_OUTPUT: clang-linker-wrapper
+// CHECK_WIN_DEFAULT_OUTPUT-SAME: "-out:{{.*}}fsyclbin.syclbin"