[SYCL][SPIR-V Backend][clang-sycl-linker] Add SPIR-V backend support inside clang-sycl-linker #133967
+81
−181
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…inside clang-sycl-linker This PR does the following: 1. Use SPIR-V backend to do LLVM to SPIR-V translation inside clang-sycl-linker 2. Remove llvm-spirv translator from clang-sycl-linker Currently, no SPIR-V extensions are enabled for SYCL compilation flow. This will be updated in subsequent commits. Thanks Signed-off-by: Arvind Sudarsanam <[email protected]>
Signed-off-by: Arvind Sudarsanam <[email protected]>
asudarsa
force-pushed
the
add_spirv_backend_to_clang_sycl_linker_upstream
branch
from
5f7c3ab to
5853448
Compare
jhuber6
approved these changes
Apr 1, 2025
| LLVMContext C; | ||
| std::unique_ptr<Module> M = parseIRFile(File, Err, C); | ||
| if (!M) | ||
| return createStringError(inconvertibleErrorCode(), Err.getMessage()); |
There was a problem hiding this comment.
I think you can omit the error code in one of the constructors.
| if (!M) | ||
| return createStringError(inconvertibleErrorCode(), Err.getMessage()); | ||
|
|
||
| Triple TargetTriple(Args.getLastArgValue(OPT_triple_EQ)); |
There was a problem hiding this comment.
Guessing this varies between spirv-unknown-unknown or something?
There was a problem hiding this comment.
Yes. This is set by the user. It can take the following values: spirv32-unknown-unknown, spirv64-unknown-unknown, and also spirv64v1.4-unknown-unknown (v1.4 means SPIR-V version 1.4 code is generated; v1.6 is default).
Thanks
| return createStringError("Failed to execute SPIR-V Backend"); | ||
| CodeGenPasses.run(*M); | ||
|
|
||
| if (Verbose) { |
Signed-off-by: Arvind Sudarsanam <[email protected]>
Signed-off-by: Arvind Sudarsanam <[email protected]>
VyacheslavLevytskyy
approved these changes
Apr 2, 2025
Signed-off-by: Arvind Sudarsanam <[email protected]>
llvmbot
added
clang
|
@llvm/pr-subscribers-clang-driver @llvm/pr-subscribers-clang Author: Arvind Sudarsanam (asudarsa) ChangesThis PR does the following:
Thanks Note: This is one of the many PRs being introduced to add SYCL programming model support to LLVM (RFC). Full diff: https://github.com/llvm/llvm-project/pull/133967.diff 9 Files Affected:
diff --git a/clang/test/Driver/Inputs/SYCL/bar.ll b/clang/test/Driver/Inputs/SYCL/bar.ll
index d17221b8dca18..9f86b8aa54827 100644
--- a/clang/test/Driver/Inputs/SYCL/bar.ll
+++ b/clang/test/Driver/Inputs/SYCL/bar.ll
@@ -1,3 +1,4 @@
+target datalayout = "e-i64:64-v16:16-v24:32-v32:32-v48:64-v96:128-v192:256-v256:256-v512:512-v1024:1024-n8:16:32:64-G1"
target triple = "spirv64"
define spir_func i32 @bar_func1(i32 %a, i32 %b) {
diff --git a/clang/test/Driver/Inputs/SYCL/baz.ll b/clang/test/Driver/Inputs/SYCL/baz.ll
index 6cdf3735ed77e..1fd7e44881981 100644
--- a/clang/test/Driver/Inputs/SYCL/baz.ll
+++ b/clang/test/Driver/Inputs/SYCL/baz.ll
@@ -1,3 +1,4 @@
+target datalayout = "e-i64:64-v16:16-v24:32-v32:32-v48:64-v96:128-v192:256-v256:256-v512:512-v1024:1024-n8:16:32:64-G1"
target triple = "spirv64"
define spir_func i32 @bar_func1(i32 %a, i32 %b) {
diff --git a/clang/test/Driver/Inputs/SYCL/foo.ll b/clang/test/Driver/Inputs/SYCL/foo.ll
index 43aaf1424ee2d..fbfd8c53bff9c 100644
--- a/clang/test/Driver/Inputs/SYCL/foo.ll
+++ b/clang/test/Driver/Inputs/SYCL/foo.ll
@@ -1,3 +1,4 @@
+target datalayout = "e-i64:64-v16:16-v24:32-v32:32-v48:64-v96:128-v192:256-v256:256-v512:512-v1024:1024-n8:16:32:64-G1"
target triple = "spirv64"
define spir_func i32 @foo_func1(i32 %a, i32 %b) {
diff --git a/clang/test/Driver/Inputs/SYCL/libsycl.ll b/clang/test/Driver/Inputs/SYCL/libsycl.ll
index fdc4643e97b6a..b161bde3b0c1e 100644
--- a/clang/test/Driver/Inputs/SYCL/libsycl.ll
+++ b/clang/test/Driver/Inputs/SYCL/libsycl.ll
@@ -1,3 +1,4 @@
+target datalayout = "e-i64:64-v16:16-v24:32-v32:32-v48:64-v96:128-v192:256-v256:256-v512:512-v1024:1024-n8:16:32:64-G1"
target triple = "spirv64"
define spir_func i32 @addFive(i32 %a) {
diff --git a/clang/test/Driver/clang-sycl-linker-test.cpp b/clang/test/Driver/clang-sycl-linker-test.cpp
index 729561bd09cd8..2f860ae74e97d 100644
--- a/clang/test/Driver/clang-sycl-linker-test.cpp
+++ b/clang/test/Driver/clang-sycl-linker-test.cpp
@@ -6,7 +6,7 @@
// RUN: clang-sycl-linker --dry-run -v -triple=spirv64 %t_1.bc %t_2.bc -o a.spv 2>&1 \
// RUN: | FileCheck %s --check-prefix=SIMPLE-FO
// SIMPLE-FO: sycl-device-link: inputs: {{.*}}.bc, {{.*}}.bc libfiles: output: [[LLVMLINKOUT:.*]].bc
-// SIMPLE-FO-NEXT: "{{.*}}llvm-spirv{{.*}}" {{.*}}-o a.spv [[LLVMLINKOUT]].bc
+// SIMPLE-FO-NEXT: SPIR-V Backend: input: [[LLVMLINKOUT]].bc, output: a.spv
//
// Test the dry run of a simple case with device library files specified.
// RUN: touch %T/lib1.bc
@@ -14,7 +14,7 @@
// RUN: clang-sycl-linker --dry-run -v -triple=spirv64 %t_1.bc %t_2.bc --library-path=%T --device-libs=lib1.bc,lib2.bc -o a.spv 2>&1 \
// RUN: | FileCheck %s --check-prefix=DEVLIBS
// DEVLIBS: sycl-device-link: inputs: {{.*}}.bc libfiles: {{.*}}lib1.bc, {{.*}}lib2.bc output: [[LLVMLINKOUT:.*]].bc
-// DEVLIBS-NEXT: "{{.*}}llvm-spirv{{.*}}" {{.*}}-o a.spv [[LLVMLINKOUT]].bc
+// DEVLIBS-NEXT: SPIR-V Backend: input: [[LLVMLINKOUT]].bc, output: a.spv
//
// Test a simple case with a random file (not bitcode) as input.
// RUN: touch %t.o
@@ -29,13 +29,3 @@
// RUN: not clang-sycl-linker --dry-run -triple=spirv64 %t_1.bc %t_2.bc --library-path=%T --device-libs=lib1.bc,lib2.bc,lib3.bc -o a.spv 2>&1 \
// RUN: | FileCheck %s --check-prefix=DEVLIBSERR2
// DEVLIBSERR2: '{{.*}}lib3.bc' SYCL device library file is not found
-//
-// Test if correct set of llvm-spirv options are emitted for windows environment.
-// RUN: clang-sycl-linker --dry-run -v -triple=spirv64 --is-windows-msvc-env %t_1.bc %t_2.bc -o a.spv 2>&1 \
-// RUN: | FileCheck %s --check-prefix=LLVMOPTSWIN
-// LLVMOPTSWIN: -spirv-debug-info-version=ocl-100 -spirv-allow-extra-diexpressions -spirv-allow-unknown-intrinsics=llvm.genx. -spirv-ext=
-//
-// Test if correct set of llvm-spirv options are emitted for linux environment.
-// RUN: clang-sycl-linker --dry-run -v -triple=spirv64 %t_1.bc %t_2.bc -o a.spv 2>&1 \
-// RUN: | FileCheck %s --check-prefix=LLVMOPTSLIN
-// LLVMOPTSLIN: -spirv-debug-info-version=nonsemantic-shader-200 -spirv-allow-unknown-intrinsics=llvm.genx. -spirv-ext=
diff --git a/clang/test/Driver/sycl-link-spirv-target.cpp b/clang/test/Driver/sycl-link-spirv-target.cpp
index 7585ef8b14a59..586adae619165 100644
--- a/clang/test/Driver/sycl-link-spirv-target.cpp
+++ b/clang/test/Driver/sycl-link-spirv-target.cpp
@@ -3,7 +3,7 @@
//
// Test that -Xlinker options are being passed to clang-sycl-linker.
// RUN: touch %t.bc
-// RUN: %clangxx -### --target=spirv64 --sycl-link -Xlinker --llvm-spirv-path=/tmp \
-// RUN: -Xlinker -triple=spirv64 -Xlinker --library-path=/tmp -Xlinker --device-libs=lib1.bc,lib2.bc %t.bc 2>&1 \
+// RUN: %clangxx -### --target=spirv64 --sycl-link -Xlinker -triple=spirv64 -Xlinker --library-path=/tmp \
+// RUN: -Xlinker --device-libs=lib1.bc,lib2.bc %t.bc 2>&1 \
// RUN: | FileCheck %s -check-prefix=XLINKEROPTS
-// XLINKEROPTS: "{{.*}}clang-sycl-linker{{.*}}" "--llvm-spirv-path=/tmp" "-triple=spirv64" "--library-path=/tmp" "--device-libs=lib1.bc,lib2.bc" "{{.*}}.bc" "-o" "a.out"
+// XLINKEROPTS: "{{.*}}clang-sycl-linker{{.*}}" "-triple=spirv64" "--library-path=/tmp" "--device-libs=lib1.bc,lib2.bc" "{{.*}}.bc" "-o" "a.out"
diff --git a/clang/tools/clang-sycl-linker/CMakeLists.txt b/clang/tools/clang-sycl-linker/CMakeLists.txt
index 382c0ca441940..ee89e8b0a5570 100644
--- a/clang/tools/clang-sycl-linker/CMakeLists.txt
+++ b/clang/tools/clang-sycl-linker/CMakeLists.txt
@@ -1,14 +1,17 @@
set(LLVM_LINK_COMPONENTS
${LLVM_TARGETS_TO_BUILD}
+ Analysis
BinaryFormat
BitWriter
Core
IRReader
Linker
+ MC
Option
Object
- TargetParser
Support
+ Target
+ TargetParser
)
set(LLVM_TARGET_DEFINITIONS SYCLLinkOpts.td)
diff --git a/clang/tools/clang-sycl-linker/ClangSYCLLinker.cpp b/clang/tools/clang-sycl-linker/ClangSYCLLinker.cpp
index 8dd0394e9610e..d8952158ae21c 100644
--- a/clang/tools/clang-sycl-linker/ClangSYCLLinker.cpp
+++ b/clang/tools/clang-sycl-linker/ClangSYCLLinker.cpp
@@ -25,6 +25,7 @@
#include "llvm/IRReader/IRReader.h"
#include "llvm/LTO/LTO.h"
#include "llvm/Linker/Linker.h"
+#include "llvm/MC/TargetRegistry.h"
#include "llvm/Object/Archive.h"
#include "llvm/Object/ArchiveWriter.h"
#include "llvm/Object/Binary.h"
@@ -48,6 +49,7 @@
#include "llvm/Support/TargetSelect.h"
#include "llvm/Support/TimeProfiler.h"
#include "llvm/Support/WithColor.h"
+#include "llvm/Target/TargetMachine.h"
using namespace llvm;
using namespace llvm::opt;
@@ -124,12 +126,6 @@ const OptTable &getOptTable() {
exit(EXIT_FAILURE);
}
-std::string getMainExecutable(const char *Name) {
- void *Ptr = (void *)(intptr_t)&getMainExecutable;
- auto COWPath = sys::fs::getMainExecutable(Name, Ptr);
- return sys::path::parent_path(COWPath).str();
-}
-
Expected<StringRef> createTempFile(const ArgList &Args, const Twine &Prefix,
StringRef Extension) {
SmallString<128> OutputFile;
@@ -147,40 +143,6 @@ Expected<StringRef> createTempFile(const ArgList &Args, const Twine &Prefix,
return TempFiles.back();
}
-Expected<std::string> findProgram(const ArgList &Args, StringRef Name,
- ArrayRef<StringRef> Paths) {
- if (Args.hasArg(OPT_dry_run))
- return Name.str();
- ErrorOr<std::string> Path = sys::findProgramByName(Name, Paths);
- if (!Path)
- Path = sys::findProgramByName(Name);
- if (!Path)
- return createStringError(Path.getError(),
- "Unable to find '" + Name + "' in path");
- return *Path;
-}
-
-void printCommands(ArrayRef<StringRef> CmdArgs) {
- if (CmdArgs.empty())
- return;
-
- llvm::errs() << " \"" << CmdArgs.front() << "\" ";
- llvm::errs() << llvm::join(std::next(CmdArgs.begin()), CmdArgs.end(), " ")
- << "\n";
-}
-
-/// Execute the command \p ExecutablePath with the arguments \p Args.
-Error executeCommands(StringRef ExecutablePath, ArrayRef<StringRef> Args) {
- if (Verbose || DryRun)
- printCommands(Args);
-
- if (!DryRun)
- if (sys::ExecuteAndWait(ExecutablePath, Args))
- return createStringError(
- "'%s' failed", sys::path::filename(ExecutablePath).str().c_str());
- return Error::success();
-}
-
Expected<SmallVector<std::string>> getInput(const ArgList &Args) {
// Collect all input bitcode files to be passed to the device linking stage.
SmallVector<std::string> BitcodeFiles;
@@ -211,7 +173,7 @@ Expected<std::unique_ptr<Module>> getBitcodeModule(StringRef File,
auto M = getLazyIRFileModule(File, Err, C);
if (M)
- return M;
+ return std::move(M);
return createStringError(Err.getMessage());
}
@@ -249,12 +211,11 @@ Expected<SmallVector<std::string>> getSYCLDeviceLibs(const ArgList &Args) {
/// 3. Link all the images gathered in Step 2 with the output of Step 1 using
/// linkInModule API. LinkOnlyNeeded flag is used.
Expected<StringRef> linkDeviceCode(ArrayRef<std::string> InputFiles,
- const ArgList &Args) {
+ const ArgList &Args, LLVMContext &C) {
llvm::TimeTraceScope TimeScope("SYCL link device code");
assert(InputFiles.size() && "No inputs to link");
- LLVMContext C;
auto LinkerOutput = std::make_unique<Module>("sycl-device-link", C);
Linker L(*LinkerOutput);
// Link SYCL device input files.
@@ -313,120 +274,61 @@ Expected<StringRef> linkDeviceCode(ArrayRef<std::string> InputFiles,
return *BitcodeOutput;
}
-/// Add any llvm-spirv option that relies on a specific Triple in addition
-/// to user supplied options.
-static void getSPIRVTransOpts(const ArgList &Args,
- SmallVector<StringRef, 8> &TranslatorArgs,
- const llvm::Triple Triple) {
- // Enable NonSemanticShaderDebugInfo.200 for non-Windows
- const bool IsWindowsMSVC =
- Triple.isWindowsMSVCEnvironment() || Args.hasArg(OPT_is_windows_msvc_env);
- const bool EnableNonSemanticDebug = !IsWindowsMSVC;
- if (EnableNonSemanticDebug) {
- TranslatorArgs.push_back(
- "-spirv-debug-info-version=nonsemantic-shader-200");
- } else {
- TranslatorArgs.push_back("-spirv-debug-info-version=ocl-100");
- // Prevent crash in the translator if input IR contains DIExpression
- // operations which don't have mapping to OpenCL.DebugInfo.100 spec.
- TranslatorArgs.push_back("-spirv-allow-extra-diexpressions");
- }
- std::string UnknownIntrinsics("-spirv-allow-unknown-intrinsics=llvm.genx.");
-
- TranslatorArgs.push_back(Args.MakeArgString(UnknownIntrinsics));
-
- // Disable all the extensions by default
- std::string ExtArg("-spirv-ext=-all");
- std::string DefaultExtArg =
- ",+SPV_EXT_shader_atomic_float_add,+SPV_EXT_shader_atomic_float_min_max"
- ",+SPV_KHR_no_integer_wrap_decoration,+SPV_KHR_float_controls"
- ",+SPV_KHR_expect_assume,+SPV_KHR_linkonce_odr";
- std::string INTELExtArg =
- ",+SPV_INTEL_subgroups,+SPV_INTEL_media_block_io"
- ",+SPV_INTEL_device_side_avc_motion_estimation"
- ",+SPV_INTEL_fpga_loop_controls,+SPV_INTEL_unstructured_loop_controls"
- ",+SPV_INTEL_fpga_reg,+SPV_INTEL_blocking_pipes"
- ",+SPV_INTEL_function_pointers,+SPV_INTEL_kernel_attributes"
- ",+SPV_INTEL_io_pipes,+SPV_INTEL_inline_assembly"
- ",+SPV_INTEL_arbitrary_precision_integers"
- ",+SPV_INTEL_float_controls2,+SPV_INTEL_vector_compute"
- ",+SPV_INTEL_fast_composite"
- ",+SPV_INTEL_arbitrary_precision_fixed_point"
- ",+SPV_INTEL_arbitrary_precision_floating_point"
- ",+SPV_INTEL_variable_length_array,+SPV_INTEL_fp_fast_math_mode"
- ",+SPV_INTEL_long_composites"
- ",+SPV_INTEL_arithmetic_fence"
- ",+SPV_INTEL_global_variable_decorations"
- ",+SPV_INTEL_cache_controls"
- ",+SPV_INTEL_fpga_buffer_location"
- ",+SPV_INTEL_fpga_argument_interfaces"
- ",+SPV_INTEL_fpga_invocation_pipelining_attributes"
- ",+SPV_INTEL_fpga_latency_control"
- ",+SPV_INTEL_task_sequence"
- ",+SPV_KHR_shader_clock"
- ",+SPV_INTEL_bindless_images";
- ExtArg = ExtArg + DefaultExtArg + INTELExtArg;
- ExtArg += ",+SPV_INTEL_token_type"
- ",+SPV_INTEL_bfloat16_conversion"
- ",+SPV_INTEL_joint_matrix"
- ",+SPV_INTEL_hw_thread_queries"
- ",+SPV_KHR_uniform_group_instructions"
- ",+SPV_INTEL_masked_gather_scatter"
- ",+SPV_INTEL_tensor_float32_conversion"
- ",+SPV_INTEL_optnone"
- ",+SPV_KHR_non_semantic_info"
- ",+SPV_KHR_cooperative_matrix";
- TranslatorArgs.push_back(Args.MakeArgString(ExtArg));
-}
-
/// Run LLVM to SPIR-V translation.
-/// Converts 'File' from LLVM bitcode to SPIR-V format using llvm-spirv tool.
+/// Converts 'File' from LLVM bitcode to SPIR-V format using SPIR-V backend.
/// 'Args' encompasses all arguments required for linking device code and will
-/// be parsed to generate options required to be passed into llvm-spirv tool.
-static Expected<StringRef> runLLVMToSPIRVTranslation(StringRef File,
- const ArgList &Args) {
- llvm::TimeTraceScope TimeScope("LLVMToSPIRVTranslation");
- StringRef LLVMSPIRVPath = Args.getLastArgValue(OPT_llvm_spirv_path_EQ);
- Expected<std::string> LLVMToSPIRVProg =
- findProgram(Args, "llvm-spirv", {LLVMSPIRVPath});
- if (!LLVMToSPIRVProg)
- return LLVMToSPIRVProg.takeError();
-
- SmallVector<StringRef, 8> CmdArgs;
- CmdArgs.push_back(*LLVMToSPIRVProg);
- const llvm::Triple Triple(Args.getLastArgValue(OPT_triple_EQ));
- getSPIRVTransOpts(Args, CmdArgs, Triple);
- StringRef LLVMToSPIRVOptions;
- if (Arg *A = Args.getLastArg(OPT_llvm_spirv_options_EQ))
- LLVMToSPIRVOptions = A->getValue();
- LLVMToSPIRVOptions.split(CmdArgs, " ", /* MaxSplit = */ -1,
- /* KeepEmpty = */ false);
- CmdArgs.append({"-o", OutputFile});
- CmdArgs.push_back(File);
- if (Error Err = executeCommands(*LLVMToSPIRVProg, CmdArgs))
- return std::move(Err);
-
- if (!SPIRVDumpDir.empty()) {
- std::error_code EC =
- llvm::sys::fs::create_directory(SPIRVDumpDir, /*IgnoreExisting*/ true);
- if (EC)
- return createStringError(
- EC,
- formatv("failed to create dump directory. path: {0}, error_code: {1}",
- SPIRVDumpDir, EC.value()));
-
- StringRef Path = OutputFile;
- StringRef Filename = llvm::sys::path::filename(Path);
- SmallString<128> CopyPath = SPIRVDumpDir;
- CopyPath.append(Filename);
- EC = llvm::sys::fs::copy_file(Path, CopyPath);
- if (EC)
- return createStringError(
- EC,
- formatv(
- "failed to copy file. original: {0}, copy: {1}, error_code: {2}",
- Path, CopyPath, EC.value()));
- }
+/// be parsed to generate options required to be passed into the backend.
+static Expected<StringRef> runSPIRVCodeGen(StringRef File,
+ const ArgList &Args, LLVMContext &C) {
+ llvm::TimeTraceScope TimeScope("SPIR-V code generation");
+
+ // Parse input module.
+ SMDiagnostic Err;
+ std::unique_ptr<Module> M = parseIRFile(File, Err, C);
+ if (!M)
+ return createStringError(Err.getMessage());
+
+ Triple TargetTriple(Args.getLastArgValue(OPT_triple_EQ));
+ M->setTargetTriple(TargetTriple);
+
+ // Get a handle to SPIR-V target backend.
+ std::string Msg;
+ const Target *T = TargetRegistry::lookupTarget(M->getTargetTriple(), Msg);
+ if (!T)
+ return createStringError(Msg + ": " + M->getTargetTriple().str());
+
+ // Allocate SPIR-V target machine.
+ TargetOptions Options;
+ std::optional<Reloc::Model> RM;
+ std::optional<CodeModel::Model> CM;
+ std::unique_ptr<TargetMachine> TM(
+ T->createTargetMachine(M->getTargetTriple(), /* CPU */ "",
+ /* Features */ "", Options, RM, CM));
+ if (!TM)
+ return createStringError("Could not allocate target machine!");
+
+ // Set data layout if needed.
+ if (M->getDataLayout().isDefault())
+ M->setDataLayout(TM->createDataLayout());
+
+ // Open output file for writing.
+ 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,
+ 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,
+ OutputFile);
return OutputFile;
}
@@ -435,15 +337,17 @@ static Expected<StringRef> runLLVMToSPIRVTranslation(StringRef File,
/// 1. Link input device code (user code and SYCL device library code).
/// 2. Run SPIR-V code generation.
Error runSYCLLink(ArrayRef<std::string> Files, const ArgList &Args) {
- llvm::TimeTraceScope TimeScope("SYCLDeviceLink");
+ llvm::TimeTraceScope TimeScope("SYCL device linking");
+
+ LLVMContext C;
// Link all input bitcode files and SYCL device library files, if any.
- auto LinkedFile = linkDeviceCode(Files, Args);
+ auto LinkedFile = linkDeviceCode(Files, Args, C);
if (!LinkedFile)
reportError(LinkedFile.takeError());
- // LLVM to SPIR-V translation step
- auto SPVFile = runLLVMToSPIRVTranslation(*LinkedFile, Args);
+ // SPIR-V code generation step.
+ auto SPVFile = runSPIRVCodeGen(*LinkedFile, Args, C);
if (!SPVFile)
return SPVFile.takeError();
return Error::success();
@@ -453,6 +357,11 @@ Error runSYCLLink(ArrayRef<std::string> Files, const ArgList &Args) {
int main(int argc, char **argv) {
InitLLVM X(argc, argv);
+ InitializeAllTargetInfos();
+ InitializeAllTargets();
+ InitializeAllTargetMCs();
+ InitializeAllAsmParsers();
+ InitializeAllAsmPrinters();
Executable = argv[0];
sys::PrintStackTraceOnErrorSignal(argv[0]);
diff --git a/clang/tools/clang-sycl-linker/SYCLLinkOpts.td b/clang/tools/clang-sycl-linker/SYCLLinkOpts.td
index 40c7310076045..1006784973b87 100644
--- a/clang/tools/clang-sycl-linker/SYCLLinkOpts.td
+++ b/clang/tools/clang-sycl-linker/SYCLLinkOpts.td
@@ -27,7 +27,7 @@ def device_libs_EQ : CommaJoined<["--", "-"], "device-libs=">,
def arch_EQ : Joined<["--", "-"], "arch=">,
Flags<[LinkerOnlyOption]>,
MetaVarName<"<arch>">,
- HelpText<"The device subarchitecture">;
+ HelpText<"The device architecture">;
def triple_EQ : Joined<["--", "-"], "triple=">,
Flags<[LinkerOnlyOption]>,
MetaVarName<"<triple>">,
@@ -43,18 +43,6 @@ def spirv_dump_device_code_EQ : Joined<["--", "-"], "spirv-dump-device-code=">,
Flags<[LinkerOnlyOption]>,
HelpText<"Path to the folder where the tool dumps SPIR-V device code. Other formats aren't dumped.">;
-def is_windows_msvc_env : Flag<["--", "-"], "is-windows-msvc-env">,
- Flags<[LinkerOnlyOption, HelpHidden]>;
-
-def llvm_spirv_path_EQ : Joined<["--"], "llvm-spirv-path=">,
- Flags<[LinkerOnlyOption]>, MetaVarName<"<dir>">,
- HelpText<"Set the system llvm-spirv path">;
-
-// Options to pass to llvm-spirv tool
-def llvm_spirv_options_EQ : Joined<["--", "-"], "llvm-spirv-options=">,
- Flags<[LinkerOnlyOption]>,
- HelpText<"Options that will control llvm-spirv step">;
-
def print_linked_module : Flag<["--"], "print-linked-module">,
Flags<[LinkerOnlyOption]>,
HelpText<"Print the linked module's IR for testing">;
|
|
✅ With the latest revision this PR passed the C/C++ code formatter. |
Signed-off-by: Arvind Sudarsanam <[email protected]>
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/144/builds/21835 Here is the relevant piece of the build log for the reference |
|
@asudarsa Can you please investigate the above failure immediately? |
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/140/builds/20355 Here is the relevant piece of the build log for the reference |
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/10/builds/2698 Here is the relevant piece of the build log for the reference |
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/46/builds/14555 Here is the relevant piece of the build log for the reference |
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/190/builds/17571 Here is the relevant piece of the build log for the reference |
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/133/builds/13870 Here is the relevant piece of the build log for the reference |
|
Working on a fix...Thanks |
sarnex
pushed a commit
that referenced
this pull request
Apr 2, 2025
This should fix failures caused by #133967 Attn: @sarnex Thanks Signed-off-by: Arvind Sudarsanam <[email protected]>
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/154/builds/14300 Here is the relevant piece of the build log for the reference |
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/3/builds/13987 Here is the relevant piece of the build log for the reference |
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/27/builds/8047 Here is the relevant piece of the build log for the reference |
sarnex
pushed a commit
that referenced
this pull request
Apr 2, 2025
) This should fix failures caused by #133967 Attn: @sarnex Thanks Signed-off-by: Arvind Sudarsanam <[email protected]>
llvm-sync bot
pushed a commit
to arm/arm-toolchain
that referenced
this pull request
Apr 2, 2025
…34125) This should fix failures caused by llvm/llvm-project#133967 Attn: @sarnex Thanks Signed-off-by: Arvind Sudarsanam <[email protected]>
llvm-sync bot
pushed a commit
to arm/arm-toolchain
that referenced
this pull request
Apr 2, 2025
…#2) (#134130) This should fix failures caused by llvm/llvm-project#133967 Attn: @sarnex Thanks Signed-off-by: Arvind Sudarsanam <[email protected]>
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/23/builds/8990 Here is the relevant piece of the build log for the reference |
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/65/builds/14771 Here is the relevant piece of the build log for the reference |
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/193/builds/6724 Here is the relevant piece of the build log for the reference |
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/161/builds/5156 Here is the relevant piece of the build log for the reference |
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/64/builds/2751 Here is the relevant piece of the build log for the reference |
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/13/builds/6357 Here is the relevant piece of the build log for the reference |
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/38/builds/2834 Here is the relevant piece of the build log for the reference |
sarnex
pushed a commit
that referenced
this pull request
Apr 17, 2025
… SYCL offloads (#135683) This PR is one of the many PRs in the SYCL upstreaming effort focusing on device code linking during the SYCL offload compilation process. RFC: https://discourse.llvm.org/t/rfc-offloading-design-for-sycl-offload-kind-and-spir-targets/74088 Approved PRs so far: 1. [Clang][SYCL] Introduce clang-sycl-linker to link SYCL offloading device code (Part 1 of many) - [Link](#112245) 2. [clang-sycl-linker] Replace llvm-link with API calls - [Link](#133797) 3. [SYCL][SPIR-V Backend][clang-sycl-linker] Add SPIR-V backend support inside clang-sycl-linker - [Link](#133967) This PR adds SYCL device code linking support to clang-linker-wrapper. ### Summary for this PR Device code linking happens inside clang-linker-wrapper. In the current implementation, clang-linker-wrapper does the following: 1. Extracts device code. Input_1, Input_2,..... 5. Group device code according to target devices Inputs[triple_1] = .... Inputs[triple_2] = .... 6. For each group, i.e. Inputs[triple_i], a. Gather all the offload kinds found inside those inputs in ActiveOffloadKinds b. Link all images inside Inputs[triple_i] by calling clang --target=triple_i .... c. Create a copy of that linked image for each offload kind and add it to Output[Kind] list. In SYCL compilation flow, there is a deviation in Step 3b. We call device code splitting inside the 'clang --target=triple_i ....' call and the output is now a 'packaged' file containing multiple device images. This deviation requires us to capture the OffloadKind during the linking stage and pass it along to the linking function (clang), so that clang can be called with a unique option '--sycl-link' that will help us to call 'clang-sycl-linker' under the hood (clang-sycl-linker will do SYCL specific linking). Our current objective is to implement an end-to-end SYCL offloading flow and get it working. We will eventually merge our approach with the community flow. Thanks --------- Signed-off-by: Arvind Sudarsanam <[email protected]>
llvm-sync bot
pushed a commit
to arm/arm-toolchain
that referenced
this pull request
Apr 17, 2025
…-linker for SYCL offloads (#135683) This PR is one of the many PRs in the SYCL upstreaming effort focusing on device code linking during the SYCL offload compilation process. RFC: https://discourse.llvm.org/t/rfc-offloading-design-for-sycl-offload-kind-and-spir-targets/74088 Approved PRs so far: 1. [Clang][SYCL] Introduce clang-sycl-linker to link SYCL offloading device code (Part 1 of many) - [Link](llvm/llvm-project#112245) 2. [clang-sycl-linker] Replace llvm-link with API calls - [Link](llvm/llvm-project#133797) 3. [SYCL][SPIR-V Backend][clang-sycl-linker] Add SPIR-V backend support inside clang-sycl-linker - [Link](llvm/llvm-project#133967) This PR adds SYCL device code linking support to clang-linker-wrapper. ### Summary for this PR Device code linking happens inside clang-linker-wrapper. In the current implementation, clang-linker-wrapper does the following: 1. Extracts device code. Input_1, Input_2,..... 5. Group device code according to target devices Inputs[triple_1] = .... Inputs[triple_2] = .... 6. For each group, i.e. Inputs[triple_i], a. Gather all the offload kinds found inside those inputs in ActiveOffloadKinds b. Link all images inside Inputs[triple_i] by calling clang --target=triple_i .... c. Create a copy of that linked image for each offload kind and add it to Output[Kind] list. In SYCL compilation flow, there is a deviation in Step 3b. We call device code splitting inside the 'clang --target=triple_i ....' call and the output is now a 'packaged' file containing multiple device images. This deviation requires us to capture the OffloadKind during the linking stage and pass it along to the linking function (clang), so that clang can be called with a unique option '--sycl-link' that will help us to call 'clang-sycl-linker' under the hood (clang-sycl-linker will do SYCL specific linking). Our current objective is to implement an end-to-end SYCL offloading flow and get it working. We will eventually merge our approach with the community flow. Thanks --------- Signed-off-by: Arvind Sudarsanam <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR does the following:
Thanks
Note: This is one of the many PRs being introduced to add SYCL programming model support to LLVM (RFC).