-
Notifications
You must be signed in to change notification settings - Fork 15.2k
[HLSL][NFC] Add helper struct to simplify dealing with resource binding attributes #161254
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,75 @@ | ||
| //===- HLSLResource.h - Routines for HLSL resources and bindings ----------===// | ||
| // | ||
| // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. | ||
| // See https://llvm.org/LICENSE.txt for license information. | ||
| // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception | ||
| // | ||
| //===----------------------------------------------------------------------===// | ||
| // | ||
| // This file provides shared routines to help analyze HLSL resources and | ||
| // theirs bindings during Sema and CodeGen. | ||
| // | ||
| //===----------------------------------------------------------------------===// | ||
|
|
||
| #ifndef LLVM_CLANG_AST_HLSLRESOURCE_H | ||
| #define LLVM_CLANG_AST_HLSLRESOURCE_H | ||
|
|
||
| #include "clang/AST/ASTContext.h" | ||
| #include "clang/AST/Attrs.inc" | ||
| #include "clang/AST/DeclBase.h" | ||
| #include "clang/Basic/TargetInfo.h" | ||
|
|
||
| namespace clang { | ||
|
|
||
| class HLSLResourceBindingAttr; | ||
| class HLSLRVkBindingAttr; | ||
|
|
||
| namespace hlsl { | ||
|
|
||
| struct ResourceBindingAttrs { | ||
| HLSLResourceBindingAttr *RegBinding; | ||
| HLSLVkBindingAttr *VkBinding; | ||
|
|
||
| ResourceBindingAttrs(const Decl *D) { | ||
| RegBinding = D->getAttr<HLSLResourceBindingAttr>(); | ||
| bool IsSpirv = D->getASTContext().getTargetInfo().getTriple().isSPIRV(); | ||
| VkBinding = IsSpirv ? D->getAttr<HLSLVkBindingAttr>() : nullptr; | ||
| } | ||
|
|
||
| bool hasBinding() const { return RegBinding || VkBinding; } | ||
| bool isExplicit() const { | ||
| return (RegBinding && RegBinding->hasRegisterSlot()) || VkBinding; | ||
| } | ||
|
|
||
| unsigned getSlot() const { | ||
| assert(isExplicit() && "no explicit binding"); | ||
| if (VkBinding) | ||
| return VkBinding->getBinding(); | ||
| if (RegBinding && RegBinding->hasRegisterSlot()) | ||
| return RegBinding->getSlotNumber(); | ||
| llvm_unreachable("no explicit binding"); | ||
| } | ||
|
|
||
| unsigned getSpace() const { | ||
| if (VkBinding) | ||
| return VkBinding->getSet(); | ||
| if (RegBinding) | ||
| return RegBinding->getSpaceNumber(); | ||
| return 0; | ||
| } | ||
|
|
||
| bool hasImplicitOrderID() const { | ||
| return RegBinding && RegBinding->hasImplicitBindingOrderID(); | ||
| } | ||
|
|
||
| unsigned getImplicitOrderID() const { | ||
| assert(hasImplicitOrderID()); | ||
| return RegBinding->getImplicitBindingOrderID(); | ||
| } | ||
| }; | ||
|
|
||
| } // namespace hlsl | ||
|
|
||
| } // namespace clang | ||
|
|
||
| #endif // LLVM_CLANG_AST_HLSLRESOURCE_H | ||
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
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.
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.
I think getAttr should return a nullptr if the attr isn't available, which should make IsSpirv and this ternary unnecessary.
i.e, consider
VkBinding = D->getAttr<HLSLVkBindingAttr>();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.
There can still be
[[vk::binding]]attribute in HLSL that is compiled for DirectX and we need to handle that.BTW SemaHLSL currently does not add the parsed attribute to the AST if the target is DirectX, which is not correct. The attribute needs to be preserved in the AST as is even if it is not used for rewriter scenarios. I will fix that in a follow-up PR.