Skip to content

Commit 44bfe7a

Browse files
joaosaffranjoaosaffran
committed
fixing tests
1 parent 43582d2 commit 44bfe7a

File tree

8 files changed

+40
-32
lines changed

8 files changed

+40
-32
lines changed

‎llvm/include/llvm/ObjectYAML/DXContainerYAML.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ struct RootDescriptorYaml {
9292
};
9393

9494
struct DescriptorRangeYaml {
95-
dxbc::DescriptorRangeType RangeType;
95+
dxil::ResourceClass RangeType;
9696
uint32_t NumDescriptors;
9797
uint32_t BaseShaderRegister;
9898
uint32_t RegisterSpace;
@@ -320,7 +320,7 @@ LLVM_YAML_DECLARE_ENUM_TRAITS(llvm::dxbc::D3DSystemValue)
320320
LLVM_YAML_DECLARE_ENUM_TRAITS(llvm::dxbc::SigComponentType)
321321
LLVM_YAML_DECLARE_ENUM_TRAITS(llvm::dxbc::SigMinPrecision)
322322
LLVM_YAML_DECLARE_ENUM_TRAITS(llvm::dxbc::RootParameterType)
323-
LLVM_YAML_DECLARE_ENUM_TRAITS(llvm::dxbc::DescriptorRangeType)
323+
LLVM_YAML_DECLARE_ENUM_TRAITS(dxil::ResourceClass)
324324
LLVM_YAML_DECLARE_ENUM_TRAITS(llvm::dxbc::SamplerFilter)
325325
LLVM_YAML_DECLARE_ENUM_TRAITS(llvm::dxbc::StaticBorderColor)
326326
LLVM_YAML_DECLARE_ENUM_TRAITS(llvm::dxbc::TextureAddressMode)

‎llvm/include/llvm/Support/DXILABI.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@ const unsigned MinWaveSize = 4;
101101
const unsigned MaxWaveSize = 128;
102102

103103
LLVM_ABI StringRef getResourceClassName(ResourceClass RC);
104+
LLVM_ABI StringRef getResourceClassNames();
104105

105106
} // namespace dxil
106107
} // namespace llvm

‎llvm/lib/ObjectYAML/DXContainerYAML.cpp‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ readDescriptorRanges(DXContainerYAML::RootParameterHeaderYaml &Header,
6363
if (!dxbc::isValidRangeType(R.RangeType))
6464
return createStringError(std::errc::invalid_argument,
6565
"Invalid value for descriptor range type");
66-
NewR.RangeType = dxbc::DescriptorRangeType(R.RangeType);
66+
NewR.RangeType = dxil::ResourceClass(R.RangeType);
6767
if constexpr (std::is_same_v<T, dxbc::RTS0::v2::DescriptorRange>) {
6868
// Set all flag fields for v2
6969
#define DESCRIPTOR_RANGE_FLAG(Num, Enum, Flag) \
@@ -623,9 +623,16 @@ void ScalarEnumerationTraits<dxbc::RootParameterType>::enumeration(
623623
IO.enumCase(Value, E.Name.str().c_str(), E.Value);
624624
}
625625

626-
void ScalarEnumerationTraits<dxbc::DescriptorRangeType>::enumeration(
627-
IO &IO, dxbc::DescriptorRangeType &Value) {
628-
for (const auto &E : dxbc::getDescriptorRangeTypes())
626+
void ScalarEnumerationTraits<dxil::ResourceClass>::enumeration(
627+
IO &IO, dxil::ResourceClass &Value) {
628+
const EnumEntry<dxil::ResourceClass> ResourceClasses[] = {
629+
{"CBuffer", dxil::ResourceClass::CBuffer},
630+
{"SRV", dxil::ResourceClass::SRV},
631+
{"UAV", dxil::ResourceClass::UAV},
632+
{"Sampler", dxil::ResourceClass::Sampler},
633+
};
634+
635+
for (const auto &E : ResourceClasses)
629636
IO.enumCase(Value, E.Name.str().c_str(), E.Value);
630637
}
631638

‎llvm/test/CodeGen/DirectX/ContainerData/RootSignature-DescriptorTable-AllValidFlagCombinations.ll‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ attributes #0 = { "hlsl.numthreads"="1,1,1" "hlsl.shader"="compute" }
9696
;DXC-NEXT: RegisterSpace: 6
9797
;DXC-NEXT: OffsetInDescriptorsFromTableStart: 5
9898
;DXC-NEXT: DESCRIPTORS_VOLATILE: true
99-
;DXC-NEXT: - RangeType: CBV
99+
;DXC-NEXT: - RangeType: CBuffer
100100
;DXC-NEXT: NumDescriptors: 5
101101
;DXC-NEXT: BaseShaderRegister: 1
102102
;DXC-NEXT: RegisterSpace: 7
@@ -114,7 +114,7 @@ attributes #0 = { "hlsl.numthreads"="1,1,1" "hlsl.shader"="compute" }
114114
;DXC-NEXT: RegisterSpace: 9
115115
;DXC-NEXT: OffsetInDescriptorsFromTableStart: 5
116116
;DXC-NEXT: DATA_STATIC_WHILE_SET_AT_EXECUTE: true
117-
;DXC-NEXT: - RangeType: CBV
117+
;DXC-NEXT: - RangeType: CBuffer
118118
;DXC-NEXT: NumDescriptors: 5
119119
;DXC-NEXT: BaseShaderRegister: 1
120120
;DXC-NEXT: RegisterSpace: 10
@@ -134,7 +134,7 @@ attributes #0 = { "hlsl.numthreads"="1,1,1" "hlsl.shader"="compute" }
134134
;DXC-NEXT: RegisterSpace: 12
135135
;DXC-NEXT: OffsetInDescriptorsFromTableStart: 5
136136
;DXC-NEXT: DESCRIPTORS_STATIC_KEEPING_BUFFER_BOUNDS_CHECKS: true
137-
;DXC-NEXT: - RangeType: CBV
137+
;DXC-NEXT: - RangeType: CBuffer
138138
;DXC-NEXT: NumDescriptors: 5
139139
;DXC-NEXT: BaseShaderRegister: 1
140140
;DXC-NEXT: RegisterSpace: 13

‎llvm/test/ObjectYAML/DXContainer/RootSignature-Invalid-StaticSamplersOffset.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ Parts:
2121
NumStaticSamplers: 0
2222
StaticSamplersOffset: 0
2323
Parameters:
24-
- ParameterType: 2
25-
ShaderVisibility: 3
24+
- ParameterType: SRV
25+
ShaderVisibility: Domain
2626
Descriptor:
2727
ShaderRegister: 31
2828
RegisterSpace: 32

‎llvm/test/ObjectYAML/DXContainer/RootSignature-OptionalOffsets.yaml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,24 +31,24 @@ Parts:
3131
NumRootParameters: 3
3232
NumStaticSamplers: 0
3333
Parameters:
34-
- ParameterType: 1 # RootConstants
35-
ShaderVisibility: 0
34+
- ParameterType: Constants32Bit
35+
ShaderVisibility: All
3636
Constants:
3737
Num32BitValues: 16
3838
ShaderRegister: 15
3939
RegisterSpace: 14
40-
- ParameterType: 2 # SRV
41-
ShaderVisibility: 0
40+
- ParameterType: SRV
41+
ShaderVisibility: All
4242
Descriptor:
4343
ShaderRegister: 31
4444
RegisterSpace: 32
4545
DATA_STATIC_WHILE_SET_AT_EXECUTE: true
46-
- ParameterType: 0 # Descriptor Table
47-
ShaderVisibility: 0
46+
- ParameterType: DescriptorTable
47+
ShaderVisibility: All
4848
Table:
4949
NumRanges: 1
5050
Ranges:
51-
- RangeType: 0 # CBV
51+
- RangeType: CBuffer
5252
NumDescriptors: -1
5353
BaseShaderRegister: 42
5454
RegisterSpace: 43

‎llvm/test/ObjectYAML/DXContainer/RootSignature-StaticSamplerOffset1.0.yaml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,24 +33,24 @@ Parts:
3333
NumStaticSamplers: 0
3434
StaticSamplersOffset: 108
3535
Parameters:
36-
- ParameterType: 1 # RootConstants
37-
ShaderVisibility: 0
36+
- ParameterType: Constants32Bit
37+
ShaderVisibility: All
3838
Constants:
3939
Num32BitValues: 16
4040
ShaderRegister: 15
4141
RegisterSpace: 14
42-
- ParameterType: 2 # SRV
43-
ShaderVisibility: 0
42+
- ParameterType: CBV
43+
ShaderVisibility: All
4444
Descriptor:
4545
ShaderRegister: 31
4646
RegisterSpace: 32
4747
DATA_STATIC_WHILE_SET_AT_EXECUTE: true
48-
- ParameterType: 0 # Descriptor Table
49-
ShaderVisibility: 0
48+
- ParameterType: DescriptorTable
49+
ShaderVisibility: All
5050
Table:
5151
NumRanges: 1
5252
Ranges:
53-
- RangeType: 0 # CBV
53+
- RangeType: CBuffer
5454
NumDescriptors: -1
5555
BaseShaderRegister: 42
5656
RegisterSpace: 43

‎llvm/test/ObjectYAML/DXContainer/RootSignature-StaticSamplerOffset1.1.yaml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,24 +33,24 @@ Parts:
3333
NumStaticSamplers: 0
3434
StaticSamplersOffset: 116
3535
Parameters:
36-
- ParameterType: 1 # RootConstants
37-
ShaderVisibility: 0
36+
- ParameterType: Constants32Bit
37+
ShaderVisibility: All
3838
Constants:
3939
Num32BitValues: 16
4040
ShaderRegister: 15
4141
RegisterSpace: 14
42-
- ParameterType: 2 # SRV
43-
ShaderVisibility: 0
42+
- ParameterType: SRV
43+
ShaderVisibility: All
4444
Descriptor:
4545
ShaderRegister: 31
4646
RegisterSpace: 32
4747
DATA_STATIC_WHILE_SET_AT_EXECUTE: true
48-
- ParameterType: 0 # Descriptor Table
49-
ShaderVisibility: 0
48+
- ParameterType: DescriptorTable
49+
ShaderVisibility: All
5050
Table:
5151
NumRanges: 1
5252
Ranges:
53-
- RangeType: 0 # CBV
53+
- RangeType: CBuffer
5454
NumDescriptors: -1
5555
BaseShaderRegister: 42
5656
RegisterSpace: 43

0 commit comments

Comments
 (0)