[SYCL][SPIR-V Backend] Add SPIR-V backend support inside clang-sycl-linker #3
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,10 @@ | ||
| set(LLVM_LINK_COMPONENTS | ||
| ${LLVM_TARGETS_TO_BUILD} | ||
| BinaryFormat | ||
| MC | ||
| Option | ||
| Object | ||
| Target | ||
| TargetParser | ||
| Support | ||
| ) | ||
|
|
||
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -23,6 +23,7 @@ | |
| #include "llvm/IR/DiagnosticPrinter.h" | ||
| #include "llvm/IRReader/IRReader.h" | ||
| #include "llvm/LTO/LTO.h" | ||
| #include "llvm/MC/TargetRegistry.h" | ||
| #include "llvm/Object/Archive.h" | ||
| #include "llvm/Object/ArchiveWriter.h" | ||
| #include "llvm/Object/Binary.h" | ||
|
|
@@ -46,6 +47,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; | ||
|
|
@@ -77,6 +79,17 @@ static const char *Executable; | |
| static SmallVector<SmallString<128>> TempFiles; | ||
|
|
||
| namespace { | ||
|
|
||
| std::once_flag InitOnceFlag; | ||
| void InitializeSPIRVTarget() { | ||
| std::call_once(InitOnceFlag, []() { | ||
| LLVMInitializeSPIRVTargetInfo(); | ||
| LLVMInitializeSPIRVTarget(); | ||
| LLVMInitializeSPIRVTargetMC(); | ||
| LLVMInitializeSPIRVAsmPrinter(); | ||
| }); | ||
| } | ||
|
|
||
| // Must not overlap with llvm::opt::DriverFlag. | ||
| enum LinkerFlags { LinkerOnlyOption = (1 << 4) }; | ||
|
|
||
|
|
@@ -206,7 +219,7 @@ Expected<SmallVector<std::string>> getInput(const ArgList &Args) { | |
| /// be parsed to generate options required to be passed into llvm-link. | ||
| Expected<StringRef> linkDeviceInputFiles(ArrayRef<std::string> InputFiles, | ||
| const ArgList &Args) { | ||
| llvm::TimeTraceScope TimeScope("Link device input files"); | ||
|
|
||
| assert(InputFiles.size() && "No inputs to llvm-link"); | ||
| // Early check to see if there is only one input. | ||
|
|
@@ -271,7 +284,7 @@ Expected<SmallVector<std::string>> getSYCLDeviceLibs(const ArgList &Args) { | |
| /// be parsed to generate options required to be passed into llvm-link tool. | ||
| static Expected<StringRef> linkDeviceLibFiles(StringRef InputFile, | ||
| const ArgList &Args) { | ||
| llvm::TimeTraceScope TimeScope("Link device library files"); | ||
|
|
||
| auto SYCLDeviceLibFiles = getSYCLDeviceLibs(Args); | ||
| if (!SYCLDeviceLibFiles) | ||
|
|
@@ -304,126 +317,70 @@ static Expected<StringRef> linkDeviceLibFiles(StringRef InputFile, | |
| return *OutFileOrErr; | ||
| } | ||
|
|
||
| /// Run LLVM to SPIR-V translation. | ||
| /// Converts 'File' from LLVM bitcode to SPIR-V format using SPIR-V backend. | ||
|
There was a problem hiding this comment. I think we need to stack this on top of the #4.
There was a problem hiding this comment. Hmm. A good point. We might want to hold off this change (to use LLVM Module) as we will be introducing a PR soon to incorporate sycl-post-link based calls The test won't fail as both the tests do not have any symbols in them. Thanks There was a problem hiding this comment. I will wait for the llvm-linker changes to be merged upstream before proceeding with this one. Thanks |
||
| /// 'Args' encompasses all arguments required for linking device code and will | ||
| /// be parsed to generate options required to be passed into the backend. | ||
| static Expected<StringRef> runSPIRVCodeGen(StringRef File, | ||
| const ArgList &Args) { | ||
| llvm::TimeTraceScope TimeScope("SPIR-V code generation"); | ||
| if (Verbose || DryRun) { | ||
| errs() << formatv("LLVM-SPIRV-Backend: input: {0}, output: {1}\n", File, | ||
| OutputFile); | ||
| if (DryRun) | ||
| return OutputFile; | ||
| } | ||
|
|
||
| // SPIR-V-specific target initialization. | ||
| InitializeSPIRVTarget(); | ||
|
|
||
| SMDiagnostic Err; | ||
| LLVMContext C; | ||
| std::unique_ptr<Module> M = parseIRFile(File, Err, C); | ||
| if (!M) | ||
| return createStringError(inconvertibleErrorCode(), Err.getMessage()); | ||
|
|
||
| static const std::string DefaultTriple = "spirv64v1.6-unknown-unknown"; | ||
| Triple TargetTriple(M->getTargetTriple()); | ||
| if (TargetTriple.getTriple().empty()) | ||
asudarsa marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| TargetTriple.setTriple(DefaultTriple); | ||
| TargetTriple.setArch(TargetTriple.getArch(), Triple::SPIRVSubArch_v16); | ||
asudarsa marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| M->setTargetTriple(TargetTriple); | ||
| assert(TargetTriple.isSPIROrSPIRV() && "Target triple is not SPIR or SPIR-V"); | ||
|
|
||
| std::string Msg; | ||
| const Target *T = TargetRegistry::lookupTarget(M->getTargetTriple(), Msg); | ||
| if (!T) | ||
| return createStringError(Msg + ": " + M->getTargetTriple().str()); | ||
|
|
||
| TargetOptions Options; | ||
| std::optional<Reloc::Model> RM; | ||
| std::optional<CodeModel::Model> CM; | ||
| std::unique_ptr<TargetMachine> TM(T->createTargetMachine( | ||
| M->getTargetTriple().str(), "", "", Options, RM, CM)); | ||
asudarsa marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| if (!TM) | ||
| return createStringError("Could not allocate target machine!"); | ||
|
|
||
| if (M->getDataLayout().isDefault()) | ||
| M->setDataLayout(TM->createDataLayout()); | ||
|
|
||
| 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); | ||
|
|
||
| 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); | ||
| return OutputFile; | ||
| } | ||
|
|
||
| Error runSYCLLink(ArrayRef<std::string> Files, const ArgList &Args) { | ||
| llvm::TimeTraceScope TimeScope("SYCL device linking"); | ||
| // First llvm-link step | ||
| auto LinkedFile = linkDeviceInputFiles(Files, Args); | ||
| if (!LinkedFile) | ||
|
|
@@ -434,8 +391,8 @@ Error runSYCLLink(ArrayRef<std::string> Files, const ArgList &Args) { | |
| if (!DeviceLinkedFile) | ||
| reportError(DeviceLinkedFile.takeError()); | ||
|
|
||
| // SPIR-V code generation step | ||
| auto SPVFile = runSPIRVCodeGen(*DeviceLinkedFile, Args); | ||
| if (!SPVFile) | ||
| return SPVFile.takeError(); | ||
| return Error::success(); | ||
|
|
||
This file contains hidden or 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
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.
Uh oh!
There was an error while loading. Please reload this page.