[HIPSPV] Add in-tree SPIR-V backend support for chipStar #186972
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -59,8 +59,13 @@ void HIPSPV::Linker::constructLinkAndEmitSpirvCommand( | |
| // Link LLVM bitcode. | ||
| ArgStringList LinkArgs{}; | ||
|
|
||
| // The new offload driver can pass non-filename InputInfo entries (e.g. | ||
| // Nothing/InputArg placeholders) alongside the real bitcode inputs. Calling | ||
| // getFilename() on those reads garbage from the union; only forward genuine | ||
| // filename inputs to llvm-link. | ||
| for (const auto &Input : Inputs) | ||
| if (Input.isFilename()) | ||
| LinkArgs.push_back(Input.getFilename()); | ||
|
Comment on lines
+66
to
68
Contributor
There was a problem hiding this comment. This change got introduced in #187655 so a rebase maybe needed before merge. |
||
|
|
||
| // Add static device libraries using the common helper function. | ||
| // This handles unbundling archives (.a) containing bitcode bundles. | ||
|
|
@@ -72,10 +77,55 @@ void HIPSPV::Linker::constructLinkAndEmitSpirvCommand( | |
| tools::constructLLVMLinkCommand(C, *this, JA, Inputs, LinkArgs, Output, Args, | ||
| TempFile); | ||
|
|
||
| auto T = getToolChain().getTriple(); | ||
|
|
||
| if (T.getOS() == llvm::Triple::ChipStar) { | ||
| // chipStar: run HipSpvPasses via opt, then use the in-tree SPIR-V backend | ||
| // for codegen (replaces the external llvm-spirv translator). | ||
|
pvelesko marked this conversation as resolved.
|
||
|
|
||
| // Run HipSpvPasses plugin via opt (must run on LLVM IR before | ||
| // the SPIR-V backend lowers to MIR). | ||
| auto PassPluginPath = findPassPlugin(C.getDriver(), Args); | ||
| if (!PassPluginPath.empty()) { | ||
| const char *PassPathCStr = C.getArgs().MakeArgString(PassPluginPath); | ||
| const char *OptOutput = HIP::getTempFile(C, Name + "-lower", "bc"); | ||
| ArgStringList OptArgs{TempFile, "-load-pass-plugin", | ||
| PassPathCStr, "-passes=hip-post-link-passes", | ||
| "-o", OptOutput}; | ||
| const char *Opt = | ||
| Args.MakeArgString(getToolChain().GetProgramPath("opt")); | ||
| C.addCommand(std::make_unique<Command>(JA, *this, | ||
| ResponseFileSupport::None(), Opt, | ||
| OptArgs, Inputs, Output)); | ||
| TempFile = OptOutput; | ||
| } | ||
|
Comment on lines
+86
to
+101
Contributor
There was a problem hiding this comment. This portion is a duplicate from the below - could you refactor the duplication away? |
||
|
|
||
| // Compile processed bitcode to SPIR-V using the in-tree backend. | ||
| ArgStringList ClangArgs; | ||
| ClangArgs.push_back("--no-default-config"); | ||
| ClangArgs.push_back("-c"); | ||
| ClangArgs.push_back(C.getArgs().MakeArgString("--target=" + T.getTriple())); | ||
|
|
||
| ClangArgs.push_back("-mllvm"); | ||
| ClangArgs.push_back("-spirv-ext=+SPV_INTEL_function_pointers" | ||
| ",+SPV_INTEL_subgroups" | ||
| ",+SPV_EXT_relaxed_printf_string_address_space" | ||
| ",+SPV_KHR_bit_instructions" | ||
| ",+SPV_EXT_shader_atomic_float_add"); | ||
|
|
||
| ClangArgs.push_back(TempFile); | ||
| ClangArgs.push_back("-o"); | ||
| ClangArgs.push_back(Output.getFilename()); | ||
|
|
||
| const char *Clang = | ||
| C.getArgs().MakeArgString(C.getDriver().getClangProgramPath()); | ||
|
Comment on lines
+120
to
+121
Contributor
There was a problem hiding this comment. Using clang driver for emitting SPIR-V (through SPIR-V BE) seems hazarous - it think it's better to use cc1 like HIPAMD does. |
||
| C.addCommand(std::make_unique<Command>(JA, *this, | ||
| ResponseFileSupport::None(), Clang, | ||
| ClangArgs, Inputs, Output)); | ||
| return; | ||
| } | ||
|
|
||
| // Non-chipStar: run HIP passes via opt, then translate with llvm-spirv. | ||
| auto PassPluginPath = findPassPlugin(C.getDriver(), Args); | ||
| if (!PassPluginPath.empty()) { | ||
| const char *PassPathCStr = C.getArgs().MakeArgString(PassPluginPath); | ||
|
|
@@ -89,27 +139,11 @@ void HIPSPV::Linker::constructLinkAndEmitSpirvCommand( | |
| TempFile = OptOutput; | ||
| } | ||
|
|
||
| // Emit SPIR-V binary via llvm-spirv translator (non-chipStar targets). | ||
| llvm::opt::ArgStringList TrArgs; | ||
| if (T.getSubArch() == llvm::Triple::NoSubArch) | ||
| TrArgs.push_back("--spirv-max-version=1.1"); | ||
| TrArgs.push_back("--spirv-ext=+all"); | ||
|
|
||
| InputInfo TrInput = InputInfo(types::TY_LLVM_BC, TempFile, ""); | ||
| SPIRV::constructTranslateCommand(C, *this, JA, Output, TrInput, TrArgs); | ||
|
|
||
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
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 |
|---|---|---|
|
|
@@ -479,9 +479,25 @@ fatbinary(ArrayRef<std::tuple<StringRef, StringRef, StringRef>> InputFiles, | |
| SmallVector<StringRef> Targets = { | ||
| Saver.save("-targets=host-" + HostTriple.normalize())}; | ||
| for (const auto &[File, TripleRef, Arch] : InputFiles) { | ||
| llvm::Triple T(TripleRef); | ||
| // For SPIR-V targets, derive arch from triple if not provided | ||
| StringRef EffectiveArch = Arch; | ||
| if (EffectiveArch.empty() && T.isSPIRV()) { | ||
| EffectiveArch = T.getArchName(); | ||
|
Contributor
There was a problem hiding this comment. I think CPU/GPU model is expected here which is not same thing as what Triple::getArchName() returns. For SPIR-V I think we can set it to "generic" - that's the default model used elsewhere for SPIR-V targets.
Contributor
There was a problem hiding this comment. Also, is it a problem if the |
||
| } | ||
| StringRef BundleID; | ||
| if (EffectiveArch == "amdgcnspirv") { | ||
| BundleID = Saver.save("hip-spirv64-amd-amdhsa--" + EffectiveArch); | ||
| } else if (T.isSPIRV()) { | ||
| // ChipStar and other SPIR-V HIP targets: use | ||
| // hip-spirv64-<vendor>-<os>--<arch> | ||
| BundleID = Saver.save("hip-spirv64-" + T.getVendorName() + "-" + | ||
| T.getOSName() + "--" + EffectiveArch); | ||
|
Comment on lines
+493
to
+495
Contributor
There was a problem hiding this comment. I'm lost here - does this fix a breakage for chipStar? I have tested CHIP-SPV/chipStar#1219 locally on couple days old LLVM and I haven't seen issues. I'm wondering if it necessary to have this. |
||
| } else { | ||
| std::string NormalizedTriple = normalizeForBundler(T, !Arch.empty()); | ||
| BundleID = Saver.save("hip-" + NormalizedTriple + "-" + Arch); | ||
| } | ||
| Targets.push_back(BundleID); | ||
| } | ||
| CmdArgs.push_back(Saver.save(llvm::join(Targets, ","))); | ||
|
|
||
|
|
||
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
IIUC, this function is related to availability of std::aligned_alloc(). I'm wondering what this has to do with HIP. Like does HIP language support
std::aligned_alloc()to be called from device code?