[llvm-spirv] Cherry pick Khronos changes to expand collection of entry point interfaces (PR #1334) #10623
Conversation
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
Signed-off-by: Arvind Sudarsanam <arvind.sudarsanam@intel.com>
asudarsa
commented
Jul 29, 2023
| if (isKernel(F)) | ||
| BM->addEntryPoint(ExecutionModelKernel, BF->getId()); | ||
| else if (F->getLinkage() != GlobalValue::InternalLinkage) | ||
| if (!isKernel(F) && F->getLinkage() != GlobalValue::InternalLinkage) |
There was a problem hiding this comment.
We no longer add entry point for function decls.
asudarsa
commented
Jul 29, 2023
| SPIRVWord ModuleVersion = static_cast<SPIRVWord>(BM->getSPIRVVersion()); | ||
| if (AS != SPIRAS_Input && AS != SPIRAS_Output && | ||
| ModuleVersion < static_cast<SPIRVWord>(VersionNumber::SPIRV_1_4)) | ||
| BM->setMinSPIRVVersion(VersionNumber::SPIRV_1_4); |
There was a problem hiding this comment.
We now pass Version number directly without converting to SPIRVWord
asudarsa
commented
Jul 29, 2023
| @@ -248,6 +248,8 @@ class LLVMToSPIRVBase : protected BuiltinCallHelper { | |||
| const Function *FS, | |||
| const std::unordered_set<const Function *> Funcs) const; | |||
| void collectInputOutputVariables(SPIRVFunction *SF, Function *F); | |||
| std::vector<SPIRVId> collectEntryPointInterfaces(SPIRVFunction *BF, | |||
There was a problem hiding this comment.
This function declaration was missing in the original patch.
Signed-off-by: Arvind Sudarsanam <arvind.sudarsanam@intel.com>
|
Just curious, why can't we get this patch with a regular pulldown? |
This was part of an earlier pulldown and was removed due to issues in CI testing. We are trying to reintroduce it. Thanks |
AlexeySachkov
approved these changes
Jul 31, 2023
sarnex
approved these changes
Jul 31, 2023
|
Sorry. I pushed the wrong button which caused close/reopen. |
|
I think this is ready to land. Can you please help with merging when convenient? Thanks |
mdtoguchi
pushed a commit
to mdtoguchi/llvm
that referenced
this pull request
Oct 18, 2023
…y point interfaces (PR intel#1334) (intel#10623) This PR pulls in the following PR from upstream Khronos SPIRV-LLVM-Translator repo: KhronosGroup/SPIRV-LLVM-Translator#1334 ` This is a patch to expand the collection of entry point interfaces. In SPIR-V 1.4 and later OpEntryPoint must list all global variables in the interface. ` In addition, a couple of minor changes have been added to sync with latest code. This patch addresses intel#9958 Updated the following tests to sync with upstream as well: llvm-spirv/test/extensions/INTEL/SPV_INTEL_inline_assembly/inline_asm_clobbers.cl llvm-spirv/test/extensions/INTEL/SPV_INTEL_inline_assembly/inline_asm_constraints.cl Thanks --------- Signed-off-by: Arvind Sudarsanam <arvind.sudarsanam@intel.com>
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 pulls in the following PR from upstream Khronos SPIRV-LLVM-Translator repo:
KhronosGroup/SPIRV-LLVM-Translator#1334
This is a patch to expand the collection of entry point interfaces. In SPIR-V 1.4 and later OpEntryPoint must list all global variables in the interface.In addition, a couple of minor changes have been added to sync with latest code.
This patch addresses #9958
Updated the following tests to sync with upstream as well:
llvm-spirv/test/extensions/INTEL/SPV_INTEL_inline_assembly/inline_asm_clobbers.cl
llvm-spirv/test/extensions/INTEL/SPV_INTEL_inline_assembly/inline_asm_constraints.cl
Thanks