Thanks to visit codestin.com
Credit goes to github.com

Skip to content

[HLSL] Adding support for root descriptors in root signature metadata representation #139781

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 38 commits into from
Jun 4, 2025
Merged

[HLSL] Adding support for root descriptors in root signature metadata representation #139781

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
0abacfc
adding support for Root Descriptors
Apr 24, 2025
8b8c02a
clean up
Apr 24, 2025
7ac9641
addressing comments
Apr 25, 2025
c105458
formating
Apr 26, 2025
efe76aa
try fix test
Apr 26, 2025
a928e9d
addressing comments
Apr 26, 2025
a38f10b
refactoring mcdxbc struct to store root parameters out of order
Apr 25, 2025
9a7c359
changing name
Apr 28, 2025
d6c2b55
changing variant to host pointers
Apr 28, 2025
93e4cf2
clean up
Apr 28, 2025
b45b1b6
fix
Apr 28, 2025
f804a23
fix
Apr 28, 2025
15eb6f5
fix naming
May 5, 2025
b9d7f07
fix naming
May 5, 2025
46cc8c1
addressing comments
May 8, 2025
1b3e10a
addressing comments
May 8, 2025
1f31957
addressing comments
May 8, 2025
e8fbfce
clean up
May 8, 2025
a31e5a5
removing v parameter
May 9, 2025
a394ad0
Merge branch 'obj2yaml/root-descriptors' into refactoring/remove-union
May 9, 2025
ad415a7
clean up
May 9, 2025
8ff4845
Merge branch 'main' into refactoring/remove-union
May 9, 2025
f875555
adding support for root descriptors
May 13, 2025
4f7f998
removing none as a flag option
May 13, 2025
3eb5e10
adding tests
May 13, 2025
58e1789
clean up and add more tests
May 13, 2025
81915ad
addressing comments
May 30, 2025
a515e28
Merge branch 'main' into metadata/root-descriptors
Jun 2, 2025
0d54162
clean
Jun 2, 2025
7f70dc5
cleanup
Jun 2, 2025
0c570c8
adding requested comment
Jun 2, 2025
d1ca37d
addressing PR comments
Jun 3, 2025
cb0780b
formating
Jun 3, 2025
eeffded
addressing PR comments
Jun 3, 2025
3cbe0cf
formating
Jun 3, 2025
92b766b
formating
Jun 3, 2025
8732594
adding test
Jun 3, 2025
fdb8b98
clean up
Jun 3, 2025
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
Prev Previous commit
Next Next commit
addressing comments
  • Loading branch information
joaosaffran committed May 30, 2025
commit 81915ad5d9cb44a65cbdcd7945233519d395232f
12 changes: 7 additions & 5 deletions llvm/lib/Target/DirectX/DXILRootSignature.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,11 +118,13 @@ static bool parseRootDescriptors(LLVMContext *Ctx,
MDNode *RootDescriptorNode) {

if (RootDescriptorNode->getNumOperands() != 5)
return reportError(Ctx, "Invalid format for RootConstants Element");
return reportError(Ctx, "Invalid format for Root Descriptor Element");

std::optional<StringRef> ElementText =
extractMdStringValue(RootDescriptorNode, 0);
Copy link
Contributor

Choose a reason for hiding this comment

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

We should add a check that this is not std::nullopt here and create an error. Otherwise, the below assert or the deference below will caush a crash.

Copy link
Contributor

Choose a reason for hiding this comment

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

Thanks, can we also add a test case to cover it?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

There is this test that covers it already: llvm/test/CodeGen/DirectX/ContainerData/RootSignature-RootDescriptor-Invalid-RegisterSpace.ll

Copy link
Contributor

Choose a reason for hiding this comment

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

I don't see how that test would cover this. That test checks that the register space is in range (ie, it tests the verifyRegisterSpace function. The "first element is not a string" error here isn't reached in the current tests.

assert(!ElementText->empty());

if (!ElementText.has_value())
return reportError(Ctx, "Root Descriptor, first element is not a string.");

dxbc::RootParameterHeader Header;
Header.ParameterType =
Expand Down Expand Up @@ -273,9 +275,9 @@ static bool validate(LLVMContext *Ctx, const mcdxbc::RootSignatureDesc &RSD) {
if (!verifyRegisterSpace(Descriptor->RegisterSpace))
return reportValueError(Ctx, "RegisterSpace",
Descriptor->RegisterSpace);

if (!verifyDescriptorFlag(Descriptor->Flags))
return reportValueError(Ctx, "DescriptorFlag", Descriptor->Flags);
if (RSD.Version > 1)
if (!verifyDescriptorFlag(Descriptor->Flags))
return reportValueError(Ctx, "DescriptorFlag", Descriptor->Flags);
}
}

Expand Down
10 changes: 8 additions & 2 deletions llvm/test/CodeGen/DirectX/ContainerData/RootSignature-Parameters.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,25 @@ attributes #0 = { "hlsl.numthreads"="1,1,1" "hlsl.shader"="compute" }

!dx.rootsignatures = !{!2} ; list of function/root signature pairs
!2 = !{ ptr @main, !3 } ; function, root signature
!3 = !{ !4, !5 } ; list of root signature elements
!3 = !{ !4, !5, !6 } ; list of root signature elements
!4 = !{ !"RootFlags", i32 1 } ; 1 = allow_input_assembler_input_layout
!5 = !{ !"RootConstants", i32 0, i32 1, i32 2, i32 3 }
!6 = !{ !"RootSRV", i32 1, i32 4, i32 5, i32 6 }

;CHECK-LABEL: Definition for 'main':
;CHECK-NEXT: Flags: 0x000001
;CHECK-NEXT: Version: 2
;CHECK-NEXT: RootParametersOffset: 24
;CHECK-NEXT: NumParameters: 1
;CHECK-NEXT: NumParameters: 2
;CHECK-NEXT: - Parameter Type: 1
;CHECK-NEXT: Shader Visibility: 0
;CHECK-NEXT: Register Space: 2
;CHECK-NEXT: Shader Register: 1
;CHECK-NEXT: Num 32 Bit Values: 3
;CHECK-NEXT: - Parameter Type: 3
;CHECK-NEXT: Shader Visibility: 1
;CHECK-NEXT: Register Space: 5
;CHECK-NEXT: Shader Register: 4
;CHECK-NEXT: Flags: 6
;CHECK-NEXT: NumStaticSamplers: 0
;CHECK-NEXT: StaticSamplersOffset: 0