Skip to content

[HLSL] Collect explicit resource binding information #111203

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.

Sign up for GitHub

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 10 commits into from
Oct 17, 2024
Merged

[HLSL] Collect explicit resource binding information #111203

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
f545a14
[HLSL] Collect explicit resource binding information (part 1)
hekota Oct 4, 2024
a6c0694
clang-format
hekota Oct 4, 2024
a6a5232
Collect all resource binding requirements and analyze explicit bindin…
hekota Oct 9, 2024
aa6247f
removed unused variable, cleanup
hekota Oct 10, 2024
77252e5
Merge branch 'main' into update-resource-binding-attr
hekota Oct 11, 2024
a6edabe
Code review feedback
hekota Oct 16, 2024
0c7806e
Merge branch 'main' of https://github.com/llvm/llvm-project into upda…
hekota Oct 16, 2024
a7fbeae
More cleanup - rename function to lowerCase and remove one overload, …
hekota Oct 16, 2024
1e79dcf
cr feedback - add const, rearrange loop, add debug-only checks
hekota Oct 16, 2024
4087f69
Merge branch 'main' of https://github.com/llvm/llvm-project into upda…
hekota Oct 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion clang/include/clang/Sema/SemaHLSL.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ class ResourceBindings {
ResourceClass ResClass);
DeclBindingInfo *getDeclBindingInfo(const VarDecl *VD,
ResourceClass ResClass);
bool hasBindingInfoForDecl(const VarDecl *VD);
bool hasBindingInfoForDecl(const VarDecl *VD) const;

private:
// List of all resource bindings required by the shader.
Expand Down
21 changes: 17 additions & 4 deletions clang/lib/Sema/SemaHLSL.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,19 @@ DeclBindingInfo *ResourceBindings::addDeclBindingInfo(const VarDecl *VD,
ResourceClass ResClass) {
assert(getDeclBindingInfo(VD, ResClass) == nullptr &&
"DeclBindingInfo already added");
#ifndef NDEBUG
// Verify that existing bindings for this decl are stored sequentially
// and at the end of the BindingsList
auto I = DeclToBindingListIndex.find(VD);
if (I != DeclToBindingListIndex.end()) {
for (unsigned Index = I->getSecond(); Index < BindingsList.size(); ++Index)
assert(BindingsList[Index].Decl == VD);
}
#endif
Comment on lines +113 to +121
Copy link
Contributor

@damyanp damyanp Oct 16, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was thinking that assert(!hasBindingInfoForDecl(VD) || BindingsList.back().Decl == VD); would cover most bases?

Copy link
Member Author

@hekota hekota Oct 17, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

True

Copy link
Member Author

@hekota hekota Oct 17, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shoot! I have completed this PR before realizing I did not push this change up.
Here is a separate PR: #112661

// VarDecl may have multiple entries for different resource classes.
// DeclToBindingListIndex stores the index of the first binding we saw
// for this decl. If there are any additional ones then that index
// shouldn't be updated.
DeclToBindingListIndex.try_emplace(VD, BindingsList.size());
return &BindingsList.emplace_back(VD, ResClass);
}
Expand All @@ -118,17 +131,17 @@ DeclBindingInfo *ResourceBindings::getDeclBindingInfo(const VarDecl *VD,
ResourceClass ResClass) {
auto Entry = DeclToBindingListIndex.find(VD);
if (Entry != DeclToBindingListIndex.end()) {
unsigned Index = Entry->getSecond();
while (Index < BindingsList.size() && BindingsList[Index].Decl == VD) {
for (unsigned Index = Entry->getSecond();
Index < BindingsList.size() && BindingsList[Index].Decl == VD;
++Index) {
if (BindingsList[Index].ResClass == ResClass)
return &BindingsList[Index];
Index++;
}
}
return nullptr;
}

bool ResourceBindings::hasBindingInfoForDecl(const VarDecl *VD) {
bool ResourceBindings::hasBindingInfoForDecl(const VarDecl *VD) const {
return DeclToBindingListIndex.contains(VD);
}

Expand Down