[Driver][SYCL] Keep the option value of -o option as the output directory name (#3912)

When enabling FPGA AOT, the name of the output project report is not correct when using -o.
Only when user does not use "-o" option, the output directory name is from the
source file and the original extension is replaced with ".prj".
However, if user uses "-o" option, the output directory name should be the value
of the option with extension ".prj".

Signed-off-by: Qichao Gu <[email protected]>

Author: qichaogu

clang/lib/Driver/ToolChains/SYCL.cpp

@@ -494,7 +494,7 @@ void SYCL::fpga::BackendCompiler::ConstructJob(
   if (Arg *FinalOutput = Args.getLastArg(options::OPT_o, options::OPT__SLASH_o,
                                          options::OPT__SLASH_Fe)) {
     SmallString<128> FN(FinalOutput->getValue());
-    llvm::sys::path::replace_extension(FN, "prj");
+    FN.append(".prj");
     const char *FolderName = Args.MakeArgString(FN);
     ReportOptArg += FolderName;
   } else {

clang/test/Driver/sycl-offload-intelfpga.cpp

@@ -366,7 +366,7 @@
 // RUN:  | FileCheck -DOUTDIR=%t_dir -check-prefix=CHK-FPGA-REPORT-OPT %s
 // RUN: %clang_cl -### -fsycl -fintelfpga -Xshardware %s -Fe%t_dir/file.out 2>&1 \
 // RUN:  | FileCheck -DOUTDIR=%t_dir -check-prefix=CHK-FPGA-REPORT-OPT %s
-// CHK-FPGA-REPORT-OPT: aoc{{.*}} "-sycl" {{.*}} "-output-report-folder={{.*}}{{(/|\\\\)}}file.prj"
+// CHK-FPGA-REPORT-OPT: aoc{{.*}} "-sycl" {{.*}} "-output-report-folder={{.*}}{{(/|\\\\)}}file.out.prj"
 
 /// -fintelfpga output report file from dir/source
 /// check dependency file from dir/source