[DirectX] adding support to read/write descriptor table data using obj2yaml/yaml2obj #138315
making read work
- Loading branch information
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 |
|---|---|---|
|
|
@@ -73,7 +73,7 @@ ROOT_ELEMENT_FLAG(11, SamplerHeapDirectlyIndexed) | |
| #endif // ROOT_ELEMENT_FLAG | ||
|
|
||
|
|
||
| // ROOT_DESCRIPTOR_FLAG(bit offset for the flag, name). | ||
| #ifdef ROOT_DESCRIPTOR_FLAG | ||
|
|
||
| ROOT_DESCRIPTOR_FLAG(0, NONE) | ||
|
|
@@ -84,15 +84,38 @@ ROOT_DESCRIPTOR_FLAG(3, DATA_STATIC) | |
| #endif // ROOT_DESCRIPTOR_FLAG | ||
|
|
||
|
|
||
| // DESCRIPTOR_RANGE_FLAG(bit offset for the flag, name). | ||
| #ifdef DESCRIPTOR_RANGE_FLAG | ||
|
|
||
| DESCRIPTOR_RANGE_FLAG(0, NONE) | ||
| DESCRIPTOR_RANGE_FLAG(1, DESCRIPTORS_VOLATILE) | ||
| DESCRIPTOR_RANGE_FLAG(2, DATA_VOLATILE) | ||
| DESCRIPTOR_RANGE_FLAG(3, DATA_STATIC_WHILE_SET_AT_EXECUTE) | ||
| DESCRIPTOR_RANGE_FLAG(4, DATA_STATIC) | ||
| DESCRIPTOR_RANGE_FLAG(16, DESCRIPTORS_STATIC_KEEPING_BUFFER_BOUNDS_CHECKS) | ||
|
Comment on lines
+92
to
+97
There was a problem hiding this comment. These values are wrong - when we turn these into an enum in DXContainer.h, we do There was a problem hiding this comment. True, will fix that There was a problem hiding this comment. As noted here: #143041 (review). Maybe reusing the values will address this as well? |
||
| #undef DESCRIPTOR_RANGE_FLAG | ||
| #endif // DESCRIPTOR_RANGE_FLAG | ||
|
|
||
| #ifdef ROOT_PARAMETER | ||
|
|
||
| ROOT_PARAMETER(0, DescriptorTable) | ||
| ROOT_PARAMETER(1, Constants32Bit) | ||
| ROOT_PARAMETER(2, CBV) | ||
| ROOT_PARAMETER(3, SRV) | ||
| ROOT_PARAMETER(4, UAV) | ||
| #undef ROOT_PARAMETER | ||
| #endif // ROOT_PARAMETER | ||
|
|
||
|
|
||
| #ifdef DESCRIPTOR_RANGE | ||
|
|
||
| DESCRIPTOR_RANGE(0, SRV) | ||
| DESCRIPTOR_RANGE(1, UAV) | ||
| DESCRIPTOR_RANGE(2, CBV) | ||
| DESCRIPTOR_RANGE(3, Sampler) | ||
| #undef DESCRIPTOR_RANGE | ||
| #endif // DESCRIPTOR_RANGE | ||
|
|
||
| #ifdef SHADER_VISIBILITY | ||
|
|
||
| SHADER_VISIBILITY(0, All) | ||
|
|
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 |
|---|---|---|
|
|
@@ -15,6 +15,8 @@ | |
| #ifndef LLVM_OBJECTYAML_DXCONTAINERYAML_H | ||
| #define LLVM_OBJECTYAML_DXCONTAINERYAML_H | ||
|
|
||
| #include "llvm/ADT/STLForwardCompat.h" | ||
| #include "llvm/ADT/SmallVector.h" | ||
| #include "llvm/ADT/StringRef.h" | ||
| #include "llvm/BinaryFormat/DXContainer.h" | ||
| #include "llvm/Object/DXContainer.h" | ||
|
|
@@ -91,6 +93,25 @@ struct RootDescriptorYaml { | |
| #include "llvm/BinaryFormat/DXContainerConstants.def" | ||
| }; | ||
|
|
||
| struct DescriptorRangeYaml { | ||
| uint32_t RangeType; | ||
| uint32_t NumDescriptors; | ||
| uint32_t BaseShaderRegister; | ||
| uint32_t RegisterSpace; | ||
| int32_t OffsetInDescriptorsFromTableStart; | ||
|
|
||
| uint32_t getEncodedFlags() const; | ||
|
|
||
| #define DESCRIPTOR_RANGE_FLAG(Num, Val) bool Val = false; | ||
| #include "llvm/BinaryFormat/DXContainerConstants.def" | ||
| }; | ||
|
|
||
| struct DescriptorTableYaml { | ||
| uint32_t NumRanges; | ||
| uint32_t RangesOffset; | ||
| SmallVector<DescriptorRangeYaml> Ranges; | ||
| }; | ||
|
|
||
| struct RootParameterYamlDesc { | ||
| uint32_t Type; | ||
| uint32_t Visibility; | ||
|
|
@@ -107,12 +128,80 @@ struct RootParameterYamlDesc { | |
| case llvm::to_underlying(dxbc::RootParameterType::UAV): | ||
| Descriptor = RootDescriptorYaml(); | ||
| break; | ||
| case llvm::to_underlying(dxbc::RootParameterType::DescriptorTable): | ||
| Table = DescriptorTableYaml(); | ||
| break; | ||
| } | ||
| } | ||
|
|
||
| ~RootParameterYamlDesc() { | ||
| switch (Type) { | ||
|
|
||
| case llvm::to_underlying(dxbc::RootParameterType::Constants32Bit): | ||
| Constants.~RootConstantsYaml(); | ||
| break; | ||
| case llvm::to_underlying(dxbc::RootParameterType::CBV): | ||
| case llvm::to_underlying(dxbc::RootParameterType::SRV): | ||
| case llvm::to_underlying(dxbc::RootParameterType::UAV): | ||
| Descriptor.~RootDescriptorYaml(); | ||
| break; | ||
| case llvm::to_underlying(dxbc::RootParameterType::DescriptorTable): | ||
| Table.~DescriptorTableYaml(); | ||
| break; | ||
| } | ||
| } | ||
|
|
||
| RootParameterYamlDesc(const RootParameterYamlDesc &Other) | ||
| : Type(Other.Type), Visibility(Other.Visibility), Offset(Other.Offset) { | ||
| // Initialize the appropriate union member based on Type | ||
| switch (Type) { | ||
| case llvm::to_underlying(dxbc::RootParameterType::Constants32Bit): | ||
| // Placement new to construct the union member | ||
| new (&Constants) RootConstantsYaml(Other.Constants); | ||
| break; | ||
| case llvm::to_underlying(dxbc::RootParameterType::CBV): | ||
| case llvm::to_underlying(dxbc::RootParameterType::SRV): | ||
| case llvm::to_underlying(dxbc::RootParameterType::UAV): | ||
| new (&Descriptor) RootDescriptorYaml(Other.Descriptor); | ||
| break; | ||
| case llvm::to_underlying(dxbc::RootParameterType::DescriptorTable): | ||
| new (&Table) DescriptorTableYaml(Other.Table); | ||
| break; | ||
| } | ||
| } | ||
|
|
||
| RootParameterYamlDesc &operator=(const RootParameterYamlDesc &other) { | ||
| if (this != &other) { | ||
| // First, destroy the current union member | ||
| this->~RootParameterYamlDesc(); | ||
|
|
||
| // Copy the basic members | ||
| Type = other.Type; | ||
| Visibility = other.Visibility; | ||
| Offset = other.Offset; | ||
|
|
||
| // Initialize the new union member based on the Type from 'other' | ||
| switch (Type) { | ||
| case llvm::to_underlying(dxbc::RootParameterType::Constants32Bit): | ||
| new (&Constants) RootConstantsYaml(other.Constants); | ||
| break; | ||
| case llvm::to_underlying(dxbc::RootParameterType::CBV): | ||
| case llvm::to_underlying(dxbc::RootParameterType::SRV): | ||
| case llvm::to_underlying(dxbc::RootParameterType::UAV): | ||
| new (&Descriptor) RootDescriptorYaml(other.Descriptor); | ||
| break; | ||
| case llvm::to_underlying(dxbc::RootParameterType::DescriptorTable): | ||
| new (&Table) DescriptorTableYaml(other.Table); | ||
| break; | ||
| } | ||
| } | ||
| return *this; | ||
| } | ||
|
|
||
| union { | ||
| RootConstantsYaml Constants; | ||
| RootDescriptorYaml Descriptor; | ||
| DescriptorTableYaml Table; | ||
| }; | ||
| }; | ||
|
|
||
|
|
@@ -244,6 +333,7 @@ LLVM_YAML_IS_SEQUENCE_VECTOR(llvm::DXContainerYAML::SignatureElement) | |
| LLVM_YAML_IS_SEQUENCE_VECTOR(llvm::DXContainerYAML::PSVInfo::MaskVector) | ||
| LLVM_YAML_IS_SEQUENCE_VECTOR(llvm::DXContainerYAML::SignatureParameter) | ||
| LLVM_YAML_IS_SEQUENCE_VECTOR(llvm::DXContainerYAML::RootParameterYamlDesc) | ||
| LLVM_YAML_IS_SEQUENCE_VECTOR(llvm::DXContainerYAML::DescriptorRangeYaml) | ||
| LLVM_YAML_DECLARE_ENUM_TRAITS(llvm::dxbc::PSV::SemanticKind) | ||
| LLVM_YAML_DECLARE_ENUM_TRAITS(llvm::dxbc::PSV::ComponentType) | ||
| LLVM_YAML_DECLARE_ENUM_TRAITS(llvm::dxbc::PSV::InterpolationMode) | ||
|
|
@@ -328,6 +418,14 @@ template <> struct MappingTraits<llvm::DXContainerYAML::RootDescriptorYaml> { | |
| static void mapping(IO &IO, llvm::DXContainerYAML::RootDescriptorYaml &D); | ||
| }; | ||
|
|
||
| template <> struct MappingTraits<llvm::DXContainerYAML::DescriptorTableYaml> { | ||
| static void mapping(IO &IO, llvm::DXContainerYAML::DescriptorTableYaml &D); | ||
| }; | ||
|
|
||
| template <> struct MappingTraits<llvm::DXContainerYAML::DescriptorRangeYaml> { | ||
| static void mapping(IO &IO, llvm::DXContainerYAML::DescriptorRangeYaml &D); | ||
| }; | ||
|
|
||
| } // namespace yaml | ||
|
|
||
| } // namespace llvm | ||
|
|
Oops, something went wrong.
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.
I would have expected this to also be
uint32_t?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.
OffsetInDescriptorsFromTableStart, supports -1 to represent unboundedThere 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.
Are other negative numbers (that is, unsigned values between 2147483648 and 4294967294) impossible / invalid, or do we need to treat them as large numbers?
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.
Just checked the spec, I made a mistake
NumDescriptorsallows -1 to describe unbounded UINT_MAX .According to the spec: "Use -1 or UINT_MAX to specify an unbounded size.", my understanding is that only -1 is a valid here.
Since folks are annoyed with this I will make it
uint32_t.