[DirectX][NFC] Refactoring DirectX backend to not use llvm::to_underlying in switch cases.
#151032
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
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 | ||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -19,6 +19,7 @@ | |||||||||||||
| #include "llvm/IR/Constants.h" | ||||||||||||||
| #include "llvm/MC/DXContainerRootSignature.h" | ||||||||||||||
| #include "llvm/Support/Compiler.h" | ||||||||||||||
| #include <cstdint> | ||||||||||||||
|
|
||||||||||||||
| namespace llvm { | ||||||||||||||
| class LLVMContext; | ||||||||||||||
|
|
@@ -28,9 +29,9 @@ class Metadata; | |||||||||||||
| namespace hlsl { | ||||||||||||||
| namespace rootsig { | ||||||||||||||
|
|
||||||||||||||
| template <typename T, typename ET = T> | ||||||||||||||
| class RootSignatureValidationError | ||||||||||||||
| : public ErrorInfo<RootSignatureValidationError<T, ET>> { | ||||||||||||||
| public: | ||||||||||||||
| static char ID; | ||||||||||||||
| StringRef ParamName; | ||||||||||||||
|
|
@@ -40,7 +41,7 @@ class RootSignatureValidationError | |||||||||||||
| : ParamName(ParamName), Value(Value) {} | ||||||||||||||
|
|
||||||||||||||
| void log(raw_ostream &OS) const override { | ||||||||||||||
| OS << "Invalid value for " << ParamName << ": " << static_cast<ET>(Value); | ||||||||||||||
|
There was a problem hiding this comment. We can probably eliminate the
Suggested change
|
||||||||||||||
| } | ||||||||||||||
|
|
||||||||||||||
| std::error_code convertToErrorCode() const override { | ||||||||||||||
|
|
@@ -143,7 +144,7 @@ class MetadataParser { | |||||||||||||
| MetadataParser(MDNode *Root) : Root(Root) {} | ||||||||||||||
|
|
||||||||||||||
| LLVM_ABI llvm::Expected<llvm::mcdxbc::RootSignatureDesc> | ||||||||||||||
| ParseRootSignature(dxbc::RootSignatureVersion Version); | ||||||||||||||
|
|
||||||||||||||
| private: | ||||||||||||||
| llvm::Error parseRootFlags(mcdxbc::RootSignatureDesc &RSD, | ||||||||||||||
|
|
||||||||||||||
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,7 @@ | |
| #define LLVM_FRONTEND_HLSL_ROOTSIGNATUREVALIDATIONS_H | ||
|
|
||
| #include "llvm/ADT/IntervalMap.h" | ||
| #include "llvm/BinaryFormat/DXContainer.h" | ||
| #include "llvm/Frontend/HLSL/HLSLRootSignature.h" | ||
| #include "llvm/Support/Compiler.h" | ||
|
|
||
|
|
@@ -25,20 +26,22 @@ namespace rootsig { | |
| // Basic verification of RootElements | ||
|
|
||
| LLVM_ABI bool verifyRootFlag(uint32_t Flags); | ||
| LLVM_ABI bool verifyVersion(dxbc::RootSignatureVersion Version); | ||
| LLVM_ABI bool verifyRegisterValue(uint32_t RegisterValue); | ||
| LLVM_ABI bool verifyRegisterSpace(uint32_t RegisterSpace); | ||
| LLVM_ABI bool verifyRootDescriptorFlag(dxbc::RootSignatureVersion Version, | ||
| uint32_t FlagsVal); | ||
| LLVM_ABI bool verifyRangeType(dxbc::DescriptorRangeType Type); | ||
| LLVM_ABI bool verifyDescriptorRangeFlag(dxbc::RootSignatureVersion Version, | ||
| dxbc::DescriptorRangeType Type, | ||
| uint32_t FlagsVal); | ||
| LLVM_ABI bool verifyNumDescriptors(uint32_t NumDescriptors); | ||
| LLVM_ABI bool verifySamplerFilter(dxbc::SamplerFilter Value); | ||
| LLVM_ABI bool verifyAddress(dxbc::TextureAddressMode Address); | ||
| LLVM_ABI bool verifyMipLODBias(float MipLODBias); | ||
| LLVM_ABI bool verifyMaxAnisotropy(uint32_t MaxAnisotropy); | ||
| LLVM_ABI bool verifyComparisonFunc(dxbc::ComparisonFunc ComparisonFunc); | ||
| LLVM_ABI bool verifyBorderColor(dxbc::StaticBorderColor BorderColor); | ||
| LLVM_ABI bool verifyLOD(float LOD); | ||
|
|
||
| } // namespace rootsig | ||
|
|
||
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 |
|---|---|---|
|
|
@@ -72,7 +72,7 @@ struct RootParametersContainer { | |
| Tables.push_back(Table); | ||
| } | ||
|
|
||
| std::pair<dxbc::RootParameterType, uint32_t> | ||
| getTypeAndLocForParameter(uint32_t Location) const { | ||
| const RootParameterInfo &Info = ParametersInfo[Location]; | ||
| return {Info.Header.ParameterType, Info.Location}; | ||
|
|
@@ -106,7 +106,7 @@ struct RootParametersContainer { | |
| }; | ||
| struct RootSignatureDesc { | ||
|
|
||
| dxbc::RootSignatureVersion Version = dxbc::RootSignatureVersion::V1_1; | ||
| uint32_t Flags = 0U; | ||
| uint32_t RootParameterOffset = 0U; | ||
| uint32_t StaticSamplersOffset = 0u; | ||
|
|
||
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 |
|---|---|---|
|
|
@@ -146,8 +146,7 @@ struct RootParameterView { | |
|
|
||
| struct RootConstantView : RootParameterView { | ||
| static bool classof(const RootParameterView *V) { | ||
| return V->Header.ParameterType == dxbc::RootParameterType::Constants32Bit; | ||
| } | ||
|
|
||
| llvm::Expected<dxbc::RTS0::v1::RootConstants> read() { | ||
|
|
@@ -157,25 +156,24 @@ struct RootConstantView : RootParameterView { | |
|
|
||
| struct RootDescriptorView : RootParameterView { | ||
| static bool classof(const RootParameterView *V) { | ||
| return (V->Header.ParameterType == dxbc::RootParameterType::CBV || | ||
| V->Header.ParameterType == dxbc::RootParameterType::SRV || | ||
| V->Header.ParameterType == dxbc::RootParameterType::UAV); | ||
| } | ||
|
|
||
| llvm::Expected<dxbc::RTS0::v2::RootDescriptor> | ||
| read(dxbc::RootSignatureVersion Version) { | ||
| if (Version == dxbc::RootSignatureVersion::V1_0) { | ||
| auto Descriptor = readParameter<dxbc::RTS0::v1::RootDescriptor>(); | ||
| if (Error E = Descriptor.takeError()) | ||
| return E; | ||
| return dxbc::RTS0::v2::RootDescriptor(*Descriptor); | ||
| } | ||
| if (Version != dxbc::RootSignatureVersion::V1_1) | ||
| return make_error<GenericBinaryError>( | ||
| "Invalid Root Signature version: " + | ||
| Twine(static_cast<uint32_t>(Version)), | ||
| object_error::parse_failed); | ||
| return readParameter<dxbc::RTS0::v2::RootDescriptor>(); | ||
| } | ||
| }; | ||
|
|
@@ -192,7 +190,7 @@ template <typename T> struct DescriptorTable { | |
| struct DescriptorTableView : RootParameterView { | ||
| static bool classof(const RootParameterView *V) { | ||
| return (V->Header.ParameterType == | ||
| dxbc::RootParameterType::DescriptorTable); | ||
| } | ||
|
|
||
| // Define a type alias to access the template parameter from inside classof | ||
|
|
@@ -220,7 +218,7 @@ static Error parseFailed(const Twine &Msg) { | |
|
|
||
| class RootSignature { | ||
| private: | ||
| dxbc::RootSignatureVersion Version; | ||
| uint32_t NumParameters; | ||
| uint32_t RootParametersOffset; | ||
| uint32_t NumStaticSamplers; | ||
|
|
@@ -238,7 +236,7 @@ class RootSignature { | |
| RootSignature(StringRef PD) : PartData(PD) {} | ||
|
|
||
| LLVM_ABI Error parse(); | ||
| dxbc::RootSignatureVersion getVersion() const { return Version; } | ||
| uint32_t getNumParameters() const { return NumParameters; } | ||
| uint32_t getRootParametersOffset() const { return RootParametersOffset; } | ||
| uint32_t getNumStaticSamplers() const { return NumStaticSamplers; } | ||
|
|
@@ -269,7 +267,7 @@ class RootSignature { | |
| case dxbc::RootParameterType::CBV: | ||
| case dxbc::RootParameterType::SRV: | ||
| case dxbc::RootParameterType::UAV: | ||
| if (Version == dxbc::RootSignatureVersion::V1_0) | ||
| DataSize = sizeof(dxbc::RTS0::v1::RootDescriptor); | ||
| else | ||
| DataSize = sizeof(dxbc::RTS0::v2::RootDescriptor); | ||
|
|
@@ -281,7 +279,7 @@ class RootSignature { | |
| uint32_t NumRanges = | ||
| support::endian::read<uint32_t, llvm::endianness::little>( | ||
| PartData.begin() + Header.ParameterOffset); | ||
| if (Version == dxbc::RootSignatureVersion::V1_0) | ||
| DataSize = sizeof(dxbc::RTS0::v1::DescriptorRange) * NumRanges; | ||
| else | ||
| DataSize = sizeof(dxbc::RTS0::v2::DescriptorRange) * NumRanges; | ||
|
|
||
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.
This seems like a hack used to print the minor version number. We should instead have a better enum->string conversion that can produce the correct version number.