Resolve merge conflicts

Author: jzc

clang/test/Driver/clang-sycl-linker-test.cpp

@@ -33,34 +33,34 @@
 // DEVLIBSERR2: '{{.*}}lib3.bc' SYCL device library file is not found
 //
 // Test AOT compilation for an Intel GPU.
-// RUN: clang-sycl-linker --dry-run -v -triple=spirv64 -arch=pvc %t_1.bc %t_2.bc -o a.out 2>&1 \
+// RUN: clang-sycl-linker --dry-run -v -triple=spirv64 -arch=bmg_g21 %t_1.bc %t_2.bc -o a.out 2>&1 \
 // RUN:   | FileCheck %s --check-prefix=AOT-INTEL-GPU
 // AOT-INTEL-GPU:      sycl-device-link: inputs: {{.*}}.bc, {{.*}}.bc libfiles: output: [[LLVMLINKOUT:.*]].bc
-// AOT-INTEL-GPU-NEXT: SPIR-V Backend: input: [[LLVMLINKOUT]].bc, output: [[SPIRVTRANSLATIONOUT:.*]].spv
-// AOT-INTEL-GPU-NEXT: "{{.*}}ocloc{{.*}}" {{.*}}-device pvc {{.*}}-output a.out -file [[SPIRVTRANSLATIONOUT]]
+// AOT-INTEL-GPU-NEXT: SPIR-V Backend: input: [[LLVMLINKOUT]].bc, output: [[SPIRVTRANSLATIONOUT:.*]]_0.spv
+// AOT-INTEL-GPU-NEXT: "{{.*}}ocloc{{.*}}" {{.*}}-device bmg_g21 {{.*}}-output a_0.out -file [[SPIRVTRANSLATIONOUT]]_0.spv
 //
 // Test AOT compilation for an Intel GPU with additional options.
-// RUN: clang-sycl-linker --dry-run -v -triple=spirv64 -arch=pvc %t_1.bc %t_2.bc -o a.out 2>&1 \
+// RUN: clang-sycl-linker --dry-run -v -triple=spirv64 -arch=bmg_g21 %t_1.bc %t_2.bc -o a.out 2>&1 \
 // RUN:     --ocloc-options="-a -b" \
 // RUN:   | FileCheck %s --check-prefix=AOT-INTEL-GPU-2
 // AOT-INTEL-GPU-2:      sycl-device-link: inputs: {{.*}}.bc, {{.*}}.bc libfiles: output: [[LLVMLINKOUT:.*]].bc
-// AOT-INTEL-GPU-2-NEXT: SPIR-V Backend: input: [[LLVMLINKOUT]].bc, output: [[SPIRVTRANSLATIONOUT:.*]].spv
-// AOT-INTEL-GPU-2-NEXT: "{{.*}}ocloc{{.*}}" {{.*}}-device pvc -a -b {{.*}}-output a.out -file [[SPIRVTRANSLATIONOUT]]
+// AOT-INTEL-GPU-2-NEXT: SPIR-V Backend: input: [[LLVMLINKOUT]].bc, output: [[SPIRVTRANSLATIONOUT:.*]]_0.spv
+// AOT-INTEL-GPU-2-NEXT: "{{.*}}ocloc{{.*}}" {{.*}}-device bmg_g21 -a -b {{.*}}-output a_0.out -file [[SPIRVTRANSLATIONOUT]]_0.spv
 //
 // Test AOT compilation for an Intel CPU.
-// RUN: clang-sycl-linker --dry-run -v -triple=spirv64 -arch=corei7 %t_1.bc %t_2.bc -o a.out 2>&1 \
+// RUN: clang-sycl-linker --dry-run -v -triple=spirv64 -arch=graniterapids %t_1.bc %t_2.bc -o a.out 2>&1 \
 // RUN:   | FileCheck %s --check-prefix=AOT-INTEL-CPU
 // AOT-INTEL-CPU:      sycl-device-link: inputs: {{.*}}.bc, {{.*}}.bc libfiles: output: [[LLVMLINKOUT:.*]].bc
-// AOT-INTEL-CPU-NEXT: SPIR-V Backend: input: [[LLVMLINKOUT]].bc, output: [[SPIRVTRANSLATIONOUT:.*]].spv
-// AOT-INTEL-CPU-NEXT: "{{.*}}opencl-aot{{.*}}" {{.*}}--device=cpu {{.*}}-o a.out [[SPIRVTRANSLATIONOUT]]
+// AOT-INTEL-CPU-NEXT: SPIR-V Backend: input: [[LLVMLINKOUT]].bc, output: [[SPIRVTRANSLATIONOUT:.*]]_0.spv
+// AOT-INTEL-CPU-NEXT: "{{.*}}opencl-aot{{.*}}" {{.*}}--device=cpu {{.*}}-o a_0.out [[SPIRVTRANSLATIONOUT]]_0.spv
 //
 // Test AOT compilation for an Intel CPU with additional options.
-// RUN: clang-sycl-linker --dry-run -v -triple=spirv64 -arch=corei7 %t_1.bc %t_2.bc -o a.out 2>&1 \
+// RUN: clang-sycl-linker --dry-run -v -triple=spirv64 -arch=graniterapids %t_1.bc %t_2.bc -o a.out 2>&1 \
 // RUN:     --opencl-aot-options="-a -b" \
 // RUN:   | FileCheck %s --check-prefix=AOT-INTEL-CPU-2
 // AOT-INTEL-CPU-2:      sycl-device-link: inputs: {{.*}}.bc, {{.*}}.bc libfiles: output: [[LLVMLINKOUT:.*]].bc
-// AOT-INTEL-CPU-2-NEXT: SPIR-V Backend: input: [[LLVMLINKOUT]].bc, output: [[SPIRVTRANSLATIONOUT:.*]].spv
-// AOT-INTEL-CPU-2-NEXT: "{{.*}}opencl-aot{{.*}}" {{.*}}--device=cpu -a -b {{.*}}-o a.out [[SPIRVTRANSLATIONOUT]]
+// AOT-INTEL-CPU-2-NEXT: SPIR-V Backend: input: [[LLVMLINKOUT]].bc, output: [[SPIRVTRANSLATIONOUT:.*]]_0.spv
+// AOT-INTEL-CPU-2-NEXT: "{{.*}}opencl-aot{{.*}}" {{.*}}--device=cpu -a -b {{.*}}-o a_0.out [[SPIRVTRANSLATIONOUT]]_0.spv
 //
 // Check that the output file must be specified.
 // RUN: not clang-sycl-linker --dry-run %t_1.bc %t_2.bc 2>& 1 \

clang/tools/clang-sycl-linker/ClangSYCLLinker.cpp

@@ -14,7 +14,7 @@
 // target-specific device code.
 //===---------------------------------------------------------------------===//
 
-#include "clang/Basic/Cuda.h"
+#include "clang/Basic/OffloadArch.h"
 #include "clang/Basic/Version.h"
 
 #include "llvm/ADT/StringExtras.h"
@@ -72,11 +72,9 @@ static StringRef OutputFile;
 /// Directory to dump SPIR-V IR if requested by user.
 static SmallString<128> SPIRVDumpDir;
 
-<<<<<<< HEAD
 static bool IsAOTCompileNeeded = false;
-=======
+
 using OffloadingImage = OffloadBinary::OffloadingImage;
->>>>>>> llvm/main
 
 static void printVersion(raw_ostream &OS) {
   OS << clang::getClangToolFullVersion("clang-sycl-linker") << '\n';
@@ -363,32 +361,25 @@ static Error runSPIRVCodeGen(StringRef File, const ArgList &Args,
     M->setDataLayout(TM->createDataLayout());
 
   // Open output file for writing.
-  Expected<StringRef> OutFileOrErr =
-      IsAOTCompileNeeded
-          ? createTempFile(Args, sys::path::filename(OutputFile), "spv")
-          : OutputFile;
-  if (!OutFileOrErr)
-    return OutFileOrErr.takeError();
-  std::error_code EC;
-  raw_fd_ostream OS(*OutFileOrErr, EC);
-  if (EC)
-    return createStringError(EC, "Could not open file " + *OutFileOrErr);
+  int FD = -1;
+  if (std::error_code EC = sys::fs::openFileForWrite(OutputFile, FD))
+    return errorCodeToError(EC);
+  auto OS = std::make_unique<llvm::raw_fd_ostream>(FD, true);
 
   // Run SPIR-V codegen passes to generate SPIR-V file.
   legacy::PassManager CodeGenPasses;
   TargetLibraryInfoImpl TLII(M->getTargetTriple());
   CodeGenPasses.add(new TargetLibraryInfoWrapperPass(TLII));
-  if (TM->addPassesToEmitFile(CodeGenPasses, OS, nullptr,
+  if (TM->addPassesToEmitFile(CodeGenPasses, *OS, nullptr,
                               CodeGenFileType::ObjectFile))
     return createStringError("Failed to execute SPIR-V Backend");
   CodeGenPasses.run(*M);
 
   if (Verbose)
     errs() << formatv("SPIR-V Backend: input: {0}, output: {1}\n", File,
-                      *OutFileOrErr);
+                      OutputFile);
 
-<<<<<<< HEAD
-  return *OutFileOrErr;
+  return Error::success();
 }
 
 /// Run AOT compilation for Intel CPU.
@@ -397,7 +388,8 @@ static Error runSPIRVCodeGen(StringRef File, const ArgList &Args,
 /// 'Args' encompasses all arguments required for linking and wrapping device
 /// code and will be parsed to generate options required to be passed into the
 /// SYCL AOT compilation step.
-static Error runAOTCompileIntelCPU(StringRef InputFile, const ArgList &Args) {
+static Error runAOTCompileIntelCPU(StringRef InputFile, StringRef OutputFile,
+                                   const ArgList &Args) {
   SmallVector<StringRef, 8> CmdArgs;
   Expected<std::string> OpenCLAOTPath =
       findProgram(Args, "opencl-aot", {getMainExecutable("opencl-aot")});
@@ -422,7 +414,8 @@ static Error runAOTCompileIntelCPU(StringRef InputFile, const ArgList &Args) {
 /// 'Args' encompasses all arguments required for linking and wrapping device
 /// code and will be parsed to generate options required to be passed into the
 /// SYCL AOT compilation step.
-static Error runAOTCompileIntelGPU(StringRef InputFile, const ArgList &Args) {
+static Error runAOTCompileIntelGPU(StringRef InputFile, StringRef OutputFile,
+                                   const ArgList &Args) {
   SmallVector<StringRef, 8> CmdArgs;
   Expected<std::string> OclocPath =
       findProgram(Args, "ocloc", {getMainExecutable("ocloc")});
@@ -458,18 +451,16 @@ static Error runAOTCompileIntelGPU(StringRef InputFile, const ArgList &Args) {
 /// 'Args' encompasses all arguments required for linking and wrapping device
 /// code and will be parsed to generate options required to be passed into the
 /// SYCL AOT compilation step.
-static Error runAOTCompile(StringRef InputFile, const ArgList &Args) {
+static Error runAOTCompile(StringRef InputFile, StringRef OutputFile,
+                           const ArgList &Args) {
   StringRef Arch = Args.getLastArgValue(OPT_arch_EQ);
   OffloadArch OffloadArch = StringToOffloadArch(Arch);
-  if (IsIntelGPUArch(OffloadArch))
-    return runAOTCompileIntelGPU(InputFile, Args);
-  if (IsIntelCPUArch(OffloadArch))
-    return runAOTCompileIntelCPU(InputFile, Args);
+  if (IsIntelGPUOffloadArch(OffloadArch))
+    return runAOTCompileIntelGPU(InputFile, OutputFile, Args);
+  if (IsIntelCPUOffloadArch(OffloadArch))
+    return runAOTCompileIntelCPU(InputFile, OutputFile, Args);
 
   return createStringError(inconvertibleErrorCode(), "Unsupported arch");
-=======
-  return Error::success();
->>>>>>> llvm/main
 }
 
 /// Performs the following steps:
@@ -492,26 +483,20 @@ Error runSYCLLink(ArrayRef<std::string> Files, const ArgList &Args) {
   SmallVector<std::string> SplitModules;
   SplitModules.emplace_back(*LinkedFile);
 
-  // SPIR-V code generation step.
-<<<<<<< HEAD
-  auto SPVFile = runSPIRVCodeGen(*LinkedFile, Args, C);
-  if (!SPVFile)
-    return SPVFile.takeError();
-
-  if (IsAOTCompileNeeded) {
-    if (Error Err = runAOTCompile(*SPVFile, Args))
-      return Err;
-  }
-
-=======
+  // SPIR-V code generation step and AOT compilation step.
   for (size_t I = 0, E = SplitModules.size(); I != E; ++I) {
-    auto Stem = OutputFile.rsplit('.').first;
-    std::string SPVFile(Stem);
-    SPVFile.append("_" + utostr(I) + ".spv");
-    auto Err = runSPIRVCodeGen(SplitModules[I], Args, SPVFile, C);
-    if (Err)
+    StringRef Stem = OutputFile.rsplit('.').first;
+    std::string SPVFile = (Stem + "_" + Twine(I) + ".spv").str();
+    if (Error Err = runSPIRVCodeGen(SplitModules[I], Args, SPVFile, C))
       return Err;
-    SplitModules[I] = SPVFile;
+    if (!IsAOTCompileNeeded) {
+      SplitModules[I] = SPVFile;
+    } else {
+      std::string AOTFile = (Stem + "_" + Twine(I) + ".out").str();
+      if (Error Err = runAOTCompile(SPVFile, AOTFile, Args))
+        return Err;
+      SplitModules[I] = AOTFile;
+    }
   }
 
   // Write the final output into file.
@@ -544,7 +529,6 @@ Error runSYCLLink(ArrayRef<std::string> Files, const ArgList &Args) {
       return createStringError("Offload binary has invalid size alignment");
     FS << Buffer;
   }
->>>>>>> llvm/main
   return Error::success();
 }
 
@@ -586,20 +570,15 @@ int main(int argc, char **argv) {
   DryRun = Args.hasArg(OPT_dry_run);
   SaveTemps = Args.hasArg(OPT_save_temps);
 
-<<<<<<< HEAD
-  IsAOTCompileNeeded = Args.hasArg(OPT_arch_EQ);
+  IsAOTCompileNeeded = IsIntelOffloadArch(
+      StringToOffloadArch(Args.getLastArgValue(OPT_arch_EQ)));
 
   if (!Args.hasArg(OPT_o))
     reportError(createStringError("Output file must be specified"));
   OutputFile = Args.getLastArgValue(OPT_o);
 
   if (!Args.hasArg(OPT_triple_EQ))
     reportError(createStringError("Target triple must be specified"));
-=======
-  OutputFile = "a.out";
-  if (Args.hasArg(OPT_o))
-    OutputFile = Args.getLastArgValue(OPT_o);
->>>>>>> llvm/main
 
   if (Args.hasArg(OPT_spirv_dump_device_code_EQ)) {
     Arg *A = Args.getLastArg(OPT_spirv_dump_device_code_EQ);